git: 526e37bd3320 - main - converters/osm2pgsql: update 1.5.1 → 1.6.0

The branch main has been updated by amdmi3:

URL: https://cgit.FreeBSD.org/ports/commit/?id=526e37bd3320fd720c728bb3e2749a1cfddaa69b

commit 526e37bd3320fd720c728bb3e2749a1cfddaa69b
Author:     Dmitry Marakasov <amdmi3@FreeBSD.org>
AuthorDate: 2022-03-14 19:27:59 +0000
Commit:     Dmitry Marakasov <amdmi3@FreeBSD.org>
CommitDate: 2022-03-15 11:50:06 +0000

    converters/osm2pgsql: update 1.5.1 → 1.6.0
    
    - Switch to latest lua
    - Tweak depends
---
 converters/osm2pgsql/Makefile                        | 18 +++++++++---------
 converters/osm2pgsql/distinfo                        |  6 +++---
 converters/osm2pgsql/files/patch-src_output-flex.cpp | 11 +++++++++++
 converters/osm2pgsql/pkg-plist                       |  4 ++++
 4 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/converters/osm2pgsql/Makefile b/converters/osm2pgsql/Makefile
index 6ffd8439a343..a74df657dc95 100644
--- a/converters/osm2pgsql/Makefile
+++ b/converters/osm2pgsql/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	osm2pgsql
-PORTVERSION=	1.5.1
+PORTVERSION=	1.6.0
 CATEGORIES=	converters geography
 
 MAINTAINER=	amdmi3@FreeBSD.org
@@ -10,24 +10,23 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libproj.so:graphics/proj \
 		libboost_system.so:devel/boost-libs \
-		libexpat.so:textproc/expat2 \
-		libfmt.so:devel/libfmt
+		libexpat.so:textproc/expat2
 BUILD_DEPENDS=	${LOCALBASE}/include/osmium/version.hpp:astro/libosmium \
 		${LOCALBASE}/include/protozero/version.hpp:devel/protozero \
-		${LOCALBASE}/include/rapidjson/stringbuffer.h:devel/rapidjson
+		${LOCALBASE}/include/rapidjson/stringbuffer.h:devel/rapidjson \
+		${LOCALBASE}/include/fmt/core.h:devel/libfmt
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	openstreetmap
 
-USES=		cmake compiler:c++14-lang pgsql
+USES=		cmake compiler:c++14-lang pgsql python:run shebangfix
+SHEBANG_FILES=	scripts/osm2pgsql-replication
 CMAKE_ON=	CMAKE_DISABLE_FIND_PACKAGE_Git \
 		EXTERNAL_LIBOSMIUM \
 		EXTERNAL_PROTOZERO \
 		EXTERNAL_FMT \
 		EXTERNAL_RAPIDJSON
-
-PLIST_FILES=	bin/osm2pgsql \
-		share/man/man1/osm2pgsql.1.gz
+CMAKE_ARGS=	LUA_EXE="${LUA_CMD}"
 
 PORTDOCS=	AUTHORS CONTRIBUTING.md README.md
 PORTDATA=	*
@@ -37,7 +36,8 @@ OPTIONS_DEFINE=	DOCS LUAJIT TEST
 LUAJIT_DESC=		Build with LuaJIT support
 LUAJIT_CMAKE_BOOL=	WITH_LUAJIT
 LUAJIT_LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
-LUAJIT_USES_OFF=	lua:53
+LUAJIT_USES=		lua:54:build  # just for running tests in fact
+LUAJIT_USES_OFF=	lua:54
 TEST_CMAKE_BOOL=	BUILD_TESTS
 TEST_TEST_TARGET=	test
 TEST_CMAKE_ON=		-DCMAKE_CTEST_ARGUMENTS="--label-regex;NoDB;--output-on-failure"
diff --git a/converters/osm2pgsql/distinfo b/converters/osm2pgsql/distinfo
index 80bb88b7ea0d..1e8a7e16d8ce 100644
--- a/converters/osm2pgsql/distinfo
+++ b/converters/osm2pgsql/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1629133137
-SHA256 (openstreetmap-osm2pgsql-1.5.1_GH0.tar.gz) = 4df0d332e5d77a9d363f2f06f199da0ac23a0dc7890b3472ea1b5123ac363f6e
-SIZE (openstreetmap-osm2pgsql-1.5.1_GH0.tar.gz) = 2577801
+TIMESTAMP = 1647270699
+SHA256 (openstreetmap-osm2pgsql-1.6.0_GH0.tar.gz) = 0ec8b58ab972ac8356185af4161270c1b625a77299f09e5fb7f45e616ef1a9a5
+SIZE (openstreetmap-osm2pgsql-1.6.0_GH0.tar.gz) = 2592649
diff --git a/converters/osm2pgsql/files/patch-src_output-flex.cpp b/converters/osm2pgsql/files/patch-src_output-flex.cpp
new file mode 100644
index 000000000000..c170668f2a34
--- /dev/null
+++ b/converters/osm2pgsql/files/patch-src_output-flex.cpp
@@ -0,0 +1,11 @@
+--- src/output-flex.cpp.orig	2022-01-24 15:04:03 UTC
++++ src/output-flex.cpp
+@@ -636,7 +636,7 @@ void output_flex_t::write_column(
+         }
+     } else {
+         throw std::runtime_error{
+-            "Column type {} not implemented."_format(column.type())};
++            "Column type {} not implemented."_format(static_cast<uint8_t>(column.type()))};
+     }
+ 
+     lua_pop(lua_state(), 1);
diff --git a/converters/osm2pgsql/pkg-plist b/converters/osm2pgsql/pkg-plist
new file mode 100644
index 000000000000..040cb3369780
--- /dev/null
+++ b/converters/osm2pgsql/pkg-plist
@@ -0,0 +1,4 @@
+bin/osm2pgsql
+bin/osm2pgsql-replication
+share/man/man1/osm2pgsql.1.gz
+share/man/man1/osm2pgsql-replication.1.gz