diff --git a/converters/osm2pgsql/Makefile b/converters/osm2pgsql/Makefile index fddfdfd7dc92..219fac18e65b 100644 --- a/converters/osm2pgsql/Makefile +++ b/converters/osm2pgsql/Makefile @@ -1,57 +1,63 @@ PORTNAME= osm2pgsql -PORTVERSION= 1.8.1 -PORTREVISION= 3 +PORTVERSION= 1.9.0 CATEGORIES= converters geography MAINTAINER= amdmi3@FreeBSD.org COMMENT= Convert OSM XML data to PostgreSQL database WWW= https://osm2pgsql.org/ \ https://wiki.openstreetmap.org/wiki/Osm2pgsql \ https://github.com/openstreetmap/osm2pgsql LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libproj.so:graphics/proj \ libboost_system.so:devel/boost-libs \ libexpat.so:textproc/expat2 BUILD_DEPENDS= ${LOCALBASE}/include/osmium/version.hpp:astro/libosmium \ - ${LOCALBASE}/include/protozero/version.hpp:devel/protozero + ${LOCALBASE}/include/protozero/version.hpp:devel/protozero \ + ${LOCALBASE}/include/nlohmann/json.hpp:devel/nlohmann-json 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 \ EXTERNAL_PROTOZERO # EXTERNAL_FMT # XXX: does not build with libfmt 9.x from ports, so use bundled version until upstream fixes CMAKE_ARGS= -DLUA_EXE="${LOCALBASE}/bin/${LUA_CMD}" PORTDOCS= AUTHORS CONTRIBUTING.md README.md PORTDATA= * -OPTIONS_DEFINE= DOCS LUAJIT TEST +OPTIONS_DEFINE= DOCS LUAJIT TEST # GEN (utility built with this option is not installed) LUAJIT_DESC= Build with LuaJIT support LUAJIT_CMAKE_BOOL= WITH_LUAJIT LUAJIT_USES= luajit lua:54:build # lua is needed just for running tests 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} +#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 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&,' \ + ${WRKSRC}/CMakeLists.txt post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/ .endfor .include diff --git a/converters/osm2pgsql/distinfo b/converters/osm2pgsql/distinfo index ca55711a8a3e..63007259b913 100644 --- a/converters/osm2pgsql/distinfo +++ b/converters/osm2pgsql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676291675 -SHA256 (openstreetmap-osm2pgsql-1.8.1_GH0.tar.gz) = 9e3cd9e13893fd7a153c7b42089bd23338867190c91b157cbdb4ff7176ecba62 -SIZE (openstreetmap-osm2pgsql-1.8.1_GH0.tar.gz) = 2545767 +TIMESTAMP = 1692617129 +SHA256 (openstreetmap-osm2pgsql-1.9.0_GH0.tar.gz) = f568618809930d550fc21a1951180b58b72c091235e4b0bc93477e4c27d54e88 +SIZE (openstreetmap-osm2pgsql-1.9.0_GH0.tar.gz) = 2598607