converters/osm2pgsql: update 1.9.2 → 1.10.0

3 files changed, 28 insertions, 27 deletions

diff --git a/converters/osm2pgsql/Makefile b/converters/osm2pgsql/Makefile
index 545840c08d89..fbb44e85d7fa 100644
--- a/converters/osm2pgsql/Makefile
+++ b/converters/osm2pgsql/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	osm2pgsql
-PORTVERSION=	1.9.2
-PORTREVISION=	1
+PORTVERSION=	1.10.0
 CATEGORIES=	converters geography
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -12,6 +11,9 @@ WWW=		https://osm2pgsql.org/ \
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+NOT_FOR_ARCHS=	i386
+NOT_FOR_ARCHS_REASON=	needs a 64 bit architecture
+
 LIB_DEPENDS=	libproj.so:graphics/proj \
 		libboost_system.so:devel/boost-libs \
 		libexpat.so:textproc/expat2
@@ -19,10 +21,9 @@ BUILD_DEPENDS=	${LOCALBASE}/include/osmium/version.hpp:astro/libosmium \
 		${LOCALBASE}/include/protozero/version.hpp:devel/protozero \
 		${LOCALBASE}/include/nlohmann/json.hpp:devel/nlohmann-json
 
+USES=		cmake compiler:c++17-lang pgsql python:run shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	openstreetmap
-
-USES=		cmake compiler:c++17-lang pgsql python:run shebangfix
 SHEBANG_FILES=	scripts/osm2pgsql-replication
 CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_Git \
 		EXTERNAL_LIBOSMIUM \
@@ -34,6 +35,7 @@ PORTDOCS=	AUTHORS CONTRIBUTING.md README.md
 PORTDATA=	*
 
 OPTIONS_DEFINE=	DOCS LUAJIT TEST # GEN (utility built with this option is not installed)
+OPTIONS_DEFAULT=GEN
 
 LUAJIT_DESC=		Build with LuaJIT support
 LUAJIT_CMAKE_BOOL=	WITH_LUAJIT
@@ -45,14 +47,15 @@ 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
-#GEN_BUILD_DEPENDS=	${LOCALBASE}/include/CImg.h:graphics/cimg
+#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
-	@${REINPLACE_CMD} -Ee '/find_(path|library)/ s,(potrace|CImg),no&,' \
+	@${REINPLACE_CMD} -Ee '/find_(path|library)/ s,(potrace|opencv),no&,' \
 		${WRKSRC}/CMakeLists.txt
 
 post-install-DOCS-on:
diff --git a/converters/osm2pgsql/distinfo b/converters/osm2pgsql/distinfo
index a774ca8c7ab2..438317a122a6 100644
--- a/converters/osm2pgsql/distinfo
+++ b/converters/osm2pgsql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1694017795
-SHA256 (openstreetmap-osm2pgsql-1.9.2_GH0.tar.gz) = dc30a3ad9a27f944e4169be9a8e07ee09711901536ddc8fcf4a292bd3aec51d9
-SIZE (openstreetmap-osm2pgsql-1.9.2_GH0.tar.gz) = 2598971
+TIMESTAMP = 1699378317
+SHA256 (openstreetmap-osm2pgsql-1.10.0_GH0.tar.gz) = 33849d8edacbca5ab5492fed32ac954de14f92ab6b3028c03ef88bb7ab596d20
+SIZE (openstreetmap-osm2pgsql-1.10.0_GH0.tar.gz) = 2599615
diff --git a/converters/osm2pgsql/files/patch-CMakeLists.txt b/converters/osm2pgsql/files/patch-CMakeLists.txt
index 85ffb9b888f4..0e047aebe443 100644
--- a/converters/osm2pgsql/files/patch-CMakeLists.txt
+++ b/converters/osm2pgsql/files/patch-CMakeLists.txt
@@ -1,20 +1,18 @@
---- CMakeLists.txt.orig	2022-11-10 19:15:49 UTC
+--- CMakeLists.txt.orig	2023-11-07 15:25:19 UTC
 +++ CMakeLists.txt
-@@ -173,7 +173,7 @@ if (NOT EXTERNAL_PROTOZERO)
- endif()
+@@ -28,6 +28,7 @@ endif()
  
- if (NOT EXTERNAL_FMT)
--    set(FMT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/contrib/fmt/include")
-+	include_directories("${CMAKE_CURRENT_SOURCE_DIR}/contrib/fmt/include")
- endif()
+ option(BUILD_TESTS    "Build test suite" OFF)
+ option(BUILD_COVERAGE "Build with coverage" OFF)
++option(BUILD_GEN      "Build gen" OFF)
+ option(WITH_LUA       "Build with Lua support" ON)
+ option(WITH_LUAJIT    "Build with LuaJIT support" OFF)
  
- if (NOT EXTERNAL_RAPIDJSON)
-@@ -183,7 +183,7 @@ endif()
- include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR})
- 
- find_package(Osmium 2.17.3 REQUIRED COMPONENTS io)
--include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS} ${PROTOZERO_INCLUDE_DIR} ${FMT_INCLUDE_DIR})
-+include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS} ${PROTOZERO_INCLUDE_DIR})
- 
- if (WITH_LUA)
-     if (WITH_LUAJIT)
+@@ -289,7 +290,6 @@ if (${POTRACE_LIBRARY} STREQUAL "POTRACE_LIBRARY-NOTFO
+ else()
+     if (WITH_LUA)
+         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