converters/osm2pgsql: update 2.2.0 → 2.3.0

4 files changed, 19 insertions, 31 deletions

diff --git a/converters/osm2pgsql/Makefile b/converters/osm2pgsql/Makefile
index 36c93d954768..ce8ba21c27d1 100644
--- a/converters/osm2pgsql/Makefile
+++ b/converters/osm2pgsql/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	osm2pgsql
-PORTVERSION=	2.2.0
-PORTREVISION=	2
+PORTVERSION=	2.3.0
 CATEGORIES=	converters geography
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -21,7 +20,8 @@ BUILD_DEPENDS=	${LOCALBASE}/include/osmium/version.hpp:astro/libosmium \
 		${LOCALBASE}/include/protozero/version.hpp:devel/protozero \
 		${LOCALBASE}/include/nlohmann/json.hpp:devel/nlohmann-json \
 		${LOCALBASE}/include/CLI/Version.hpp:devel/cli11 \
-		${LOCALBASE}/include/boost/geometry.hpp:devel/boost-libs
+		${LOCALBASE}/include/boost/geometry.hpp:devel/boost-libs \
+		${LOCALBASE}/include/fmt/format.h:devel/libfmt
 
 USES=		cmake compiler:c++17-lang pgsql python:run shebangfix
 USE_GITHUB=	yes
@@ -30,15 +30,16 @@ SHEBANG_FILES=	scripts/osm2pgsql-replication
 CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_Git \
 		EXTERNAL_LIBOSMIUM \
 		EXTERNAL_PROTOZERO \
-		EXTERNAL_CLI11
-#		EXTERNAL_FMT  # XXX: does not build with libfmt from ports, so use bundled version until upstream fixes
+		EXTERNAL_CLI11 \
+		EXTERNAL_FMT
 CMAKE_ARGS=	-DLUA_EXE="${LOCALBASE}/bin/${LUA_CMD}"
 
 PORTDOCS=	AUTHORS CONTRIBUTING.md README.md
 PORTDATA=	*
 
-OPTIONS_DEFINE=	DOCS LUAJIT TEST # GEN (utility built with this option is not installed)
+OPTIONS_DEFINE=	DOCS LUAJIT TEST GEN
 OPTIONS_DEFAULT=GEN
+OPTIONS_SUB=	yes
 
 LUAJIT_DESC=		Build with LuaJIT support
 LUAJIT_CMAKE_BOOL=	WITH_LUAJIT
@@ -49,15 +50,16 @@ TEST_TEST_TARGET=	test
 TEST_CMAKE_ON=		-DCMAKE_CTEST_ARGUMENTS="--label-regex;NoDB;--output-on-failure"
 TEST_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}behave>=0:devel/py-behave@${PY_FLAVOR}
 TEST_TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}behave>=0:devel/py-behave@${PY_FLAVOR}
-#GEN_DESC=		Build experimental osm2pgsql-gen data generalization utility
-#GEN_LIB_DEPENDS=	libpotrace.so:graphics/libpotrace \
-			#libopencv_core.so:graphics/opencv
+GEN_DESC=		Build experimental osm2pgsql-gen data generalization utility
+GEN_LIB_DEPENDS=	libpotrace.so:graphics/libpotrace \
+			libopencv_core.so:graphics/opencv
 #GEN_CMAKE_BOOL=		BUILD_GEN
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|find_package(Lua |&${LUA_VER} EXACT |' \
 		${WRKSRC}/CMakeLists.txt
-# for post-patch-GEN-off: when GEN option is implemented
+
+post-patch-GEN-off:
 	@${REINPLACE_CMD} -Ee '/find_(path|library)/ s,(potrace|opencv),no&,' \
 		${WRKSRC}/CMakeLists.txt
 
diff --git a/converters/osm2pgsql/distinfo b/converters/osm2pgsql/distinfo
index 83797661408e..566ab40abb56 100644
--- a/converters/osm2pgsql/distinfo
+++ b/converters/osm2pgsql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1758190034
-SHA256 (openstreetmap-osm2pgsql-2.2.0_GH0.tar.gz) = 567dad078f8a66d6d706ac1876b5251b688109d16974909d89ce2056d6e9f258
-SIZE (openstreetmap-osm2pgsql-2.2.0_GH0.tar.gz) = 2729137
+TIMESTAMP = 1781115368
+SHA256 (openstreetmap-osm2pgsql-2.3.0_GH0.tar.gz) = 334c19fd58140e48216ec842fd63d7a978c7a2aea034858c2a62f32ad9e94c06
+SIZE (openstreetmap-osm2pgsql-2.3.0_GH0.tar.gz) = 2854813
diff --git a/converters/osm2pgsql/files/patch-CMakeLists.txt b/converters/osm2pgsql/files/patch-CMakeLists.txt
deleted file mode 100644
index a51af717ff99..000000000000
--- a/converters/osm2pgsql/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
---- CMakeLists.txt.orig	2024-09-19 13:10:47 UTC
-+++ CMakeLists.txt
-@@ -28,6 +28,7 @@ option(BUILD_COVERAGE "Build with coverage" OFF)
- 
- option(BUILD_TESTS    "Build test suite" OFF)
- option(BUILD_COVERAGE "Build with coverage" OFF)
-+option(BUILD_GEN      "Build osm2pgsql-gen" OFF)
- option(WITH_LUAJIT    "Build with LuaJIT support" OFF)
- option(WITH_PROJ      "Build with Projection support" ON)
- 
-@@ -253,7 +254,6 @@ else()
-     message(STATUS "Did not find opencv and/or potrace library. Not building osm2pgsql-gen.")
- else()
-     message(STATUS "Found opencv and potrace library. Building osm2pgsql-gen.")
--    set(BUILD_GEN 1)
-     include_directories(SYSTEM ${POTRACE_INCLUDE_DIR})
-     add_executable(osm2pgsql-gen src/gen/osm2pgsql-gen.cpp
-                 src/gen/canvas.cpp
diff --git a/converters/osm2pgsql/pkg-plist b/converters/osm2pgsql/pkg-plist
index 040cb3369780..abd60b0f6576 100644
--- a/converters/osm2pgsql/pkg-plist
+++ b/converters/osm2pgsql/pkg-plist
@@ -1,4 +1,8 @@
+%%GEN%%bin/osm2pgsql-gen
 bin/osm2pgsql
+bin/osm2pgsql-expire
 bin/osm2pgsql-replication
 share/man/man1/osm2pgsql.1.gz
+%%GEN%%share/man/man1/osm2pgsql-gen.1.gz
 share/man/man1/osm2pgsql-replication.1.gz
+share/man/man1/osm2pgsql-test-style.1.gz