Date: Thu, 19 Sep 2024 20:27:15 GMT From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 9188e28a24f3 - main - converters/osm2pgsql: update 1.11.0 =?utf-8?Q?=E2=86=92?= 2.0.0 Message-ID: <202409192027.48JKRFEw053611@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=9188e28a24f3badd1cb872ddd46c2fdeac90b608 commit 9188e28a24f3badd1cb872ddd46c2fdeac90b608 Author: Dmitry Marakasov <amdmi3@FreeBSD.org> AuthorDate: 2024-09-19 20:20:40 +0000 Commit: Dmitry Marakasov <amdmi3@FreeBSD.org> CommitDate: 2024-09-19 20:22:20 +0000 converters/osm2pgsql: update 1.11.0 → 2.0.0 --- converters/osm2pgsql/Makefile | 7 +++---- converters/osm2pgsql/distinfo | 6 +++--- converters/osm2pgsql/files/patch-CMakeLists.txt | 22 +++++++++++----------- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/converters/osm2pgsql/Makefile b/converters/osm2pgsql/Makefile index 8d0253f6c20b..478b01eaf2e9 100644 --- a/converters/osm2pgsql/Makefile +++ b/converters/osm2pgsql/Makefile @@ -1,6 +1,5 @@ PORTNAME= osm2pgsql -PORTVERSION= 1.11.0 -PORTREVISION= 2 +PORTVERSION= 2.0.0 CATEGORIES= converters geography MAINTAINER= amdmi3@FreeBSD.org @@ -16,12 +15,12 @@ NOT_FOR_ARCHS= armv7 i386 powerpc 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 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/CLI/Version.hpp:devel/cli11 \ + ${LOCALBASE}/include/boost/geometry.hpp:devel/boost-libs USES= cmake compiler:c++17-lang pgsql python:run shebangfix USE_GITHUB= yes diff --git a/converters/osm2pgsql/distinfo b/converters/osm2pgsql/distinfo index d9f27f95afc8..a43023cf98cc 100644 --- a/converters/osm2pgsql/distinfo +++ b/converters/osm2pgsql/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1709050981 -SHA256 (openstreetmap-osm2pgsql-1.11.0_GH0.tar.gz) = 6b46313813b816f15ce906c04cd4108bbb05362740e0a1a8889055f4e25977d2 -SIZE (openstreetmap-osm2pgsql-1.11.0_GH0.tar.gz) = 2722008 +TIMESTAMP = 1726776348 +SHA256 (openstreetmap-osm2pgsql-2.0.0_GH0.tar.gz) = 05c2355b4a59d03a0f9855b4234a3bdc717b078faee625e73357947d1a82fe89 +SIZE (openstreetmap-osm2pgsql-2.0.0_GH0.tar.gz) = 2712209 diff --git a/converters/osm2pgsql/files/patch-CMakeLists.txt b/converters/osm2pgsql/files/patch-CMakeLists.txt index 0e047aebe443..a51af717ff99 100644 --- a/converters/osm2pgsql/files/patch-CMakeLists.txt +++ b/converters/osm2pgsql/files/patch-CMakeLists.txt @@ -1,18 +1,18 @@ ---- CMakeLists.txt.orig 2023-11-07 15:25:19 UTC +--- CMakeLists.txt.orig 2024-09-19 13:10:47 UTC +++ CMakeLists.txt -@@ -28,6 +28,7 @@ endif() +@@ -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 gen" OFF) - option(WITH_LUA "Build with Lua support" ON) ++option(BUILD_GEN "Build osm2pgsql-gen" OFF) option(WITH_LUAJIT "Build with LuaJIT support" OFF) + option(WITH_PROJ "Build with Projection support" ON) -@@ -289,7 +290,6 @@ if (${POTRACE_LIBRARY} STREQUAL "POTRACE_LIBRARY-NOTFO +@@ -253,7 +254,6 @@ else() + message(STATUS "Did not find opencv and/or potrace library. Not building osm2pgsql-gen.") 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 + 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409192027.48JKRFEw053611>