diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2022-08-30 16:28:16 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2022-08-30 18:55:07 +0000 |
| commit | 0fe8ef97235a68478c5625f580dfc0ebecce6a69 (patch) | |
| tree | 55eacc4cad3b418b57c35fd4e2ceac4e11642c3d | |
| parent | 731f8a01724c3c29cdd8cf91b15fd7c204b88104 (diff) | |
| download | ports-0fe8ef97235a68478c5625f580dfc0ebecce6a69.tar.gz ports-0fe8ef97235a68478c5625f580dfc0ebecce6a69.zip | |
converters/osm2pgsql: update 1.6.0 → 1.7.0
| -rw-r--r-- | converters/osm2pgsql/Makefile | 9 | ||||
| -rw-r--r-- | converters/osm2pgsql/distinfo | 6 | ||||
| -rw-r--r-- | converters/osm2pgsql/files/patch-src_output-flex.cpp | 11 |
3 files changed, 8 insertions, 18 deletions
diff --git a/converters/osm2pgsql/Makefile b/converters/osm2pgsql/Makefile index c41e4b3be4fe..41473ae1127d 100644 --- a/converters/osm2pgsql/Makefile +++ b/converters/osm2pgsql/Makefile @@ -1,6 +1,5 @@ PORTNAME= osm2pgsql -PORTVERSION= 1.6.0 -PORTREVISION= 2 +PORTVERSION= 1.7.0 CATEGORIES= converters geography MAINTAINER= amdmi3@FreeBSD.org @@ -20,14 +19,14 @@ BUILD_DEPENDS= ${LOCALBASE}/include/osmium/version.hpp:astro/libosmium \ USE_GITHUB= yes GH_ACCOUNT= openstreetmap -USES= cmake compiler:c++14-lang pgsql python:run shebangfix +USES= cmake compiler:c++17-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 -CMAKE_ARGS= LUA_EXE="${LUA_CMD}" +CMAKE_ARGS= -DLUA_EXE="${LOCALBASE}/bin/${LUA_CMD}" PORTDOCS= AUTHORS CONTRIBUTING.md README.md PORTDATA= * @@ -42,6 +41,8 @@ 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" +TEST_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}behave>=0:devel/py-behave@${PY_FLAVOR} +TEST_TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}behave>=0:devel/py-behave@${PY_FLAVOR} post-patch: @${REINPLACE_CMD} -e 's|find_package(Lua |&${LUA_VER} EXACT |' \ diff --git a/converters/osm2pgsql/distinfo b/converters/osm2pgsql/distinfo index 1e8a7e16d8ce..5c066a03fcfc 100644 --- a/converters/osm2pgsql/distinfo +++ b/converters/osm2pgsql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1647270699 -SHA256 (openstreetmap-osm2pgsql-1.6.0_GH0.tar.gz) = 0ec8b58ab972ac8356185af4161270c1b625a77299f09e5fb7f45e616ef1a9a5 -SIZE (openstreetmap-osm2pgsql-1.6.0_GH0.tar.gz) = 2592649 +TIMESTAMP = 1660665094 +SHA256 (openstreetmap-osm2pgsql-1.7.0_GH0.tar.gz) = 0f722baf0f04eda387d934d86228aae07d848993900db6b9e7ab312c91fd84e5 +SIZE (openstreetmap-osm2pgsql-1.7.0_GH0.tar.gz) = 2620585 diff --git a/converters/osm2pgsql/files/patch-src_output-flex.cpp b/converters/osm2pgsql/files/patch-src_output-flex.cpp deleted file mode 100644 index c170668f2a34..000000000000 --- a/converters/osm2pgsql/files/patch-src_output-flex.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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); |