git: 44916f86f434 - 2026Q2 - converters/osm2pgrouting: fix build with recent libpqxx
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 14 Apr 2026 12:03:06 UTC
The branch 2026Q2 has been updated by fuz:
URL: https://cgit.FreeBSD.org/ports/commit/?id=44916f86f434d8631b8859dd9c4e6c605517678d
commit 44916f86f434d8631b8859dd9c4e6c605517678d
Author: Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2026-04-10 22:39:43 +0000
Commit: Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2026-04-14 12:02:41 +0000
converters/osm2pgrouting: fix build with recent libpqxx
Recent versions of libpqxx require C++20 to be used.
Adjust the requested C++ standard in CMakeLists.txt.
Approved by: portmgr (build fix blanket)
MFH: 2026Q2
(cherry picked from commit 7bfaddbcafafd8fc1d5649d75f64af46b4a095e3)
---
converters/osm2pgrouting/Makefile | 8 +++++---
converters/osm2pgrouting/files/patch-CMakeLists.txt | 17 +++++++++++++----
2 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/converters/osm2pgrouting/Makefile b/converters/osm2pgrouting/Makefile
index fd4d5a1df5c7..04c9e005cb7e 100644
--- a/converters/osm2pgrouting/Makefile
+++ b/converters/osm2pgrouting/Makefile
@@ -1,6 +1,7 @@
PORTNAME= osm2pgrouting
DISTVERSIONPREFIX= v
DISTVERSION= 3.0.0
+PORTREVISION= 1
CATEGORIES= converters databases geography
MAINTAINER= lbartoletti@FreeBSD.org
@@ -10,11 +11,12 @@ WWW= https://pgrouting.org/docs/tools/osm2pgrouting.html
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE
-LIB_DEPENDS= libboost_thread.so:devel/boost-libs \
+LIB_DEPENDS= libboost_program_options.so:devel/boost-libs \
libexpat.so:textproc/expat2 \
- libpqxx.so:databases/postgresql-libpqxx
+ libpqxx.so:databases/postgresql-libpqxx \
+ libpq.so:databases/postgresql18-client
-USES= cmake compiler:c++17-lang
+USES= cmake compiler:c++20-lang
USE_GITHUB= yes
GH_ACCOUNT= pgRouting
diff --git a/converters/osm2pgrouting/files/patch-CMakeLists.txt b/converters/osm2pgrouting/files/patch-CMakeLists.txt
index 36b7e13b5684..0b7891167d65 100644
--- a/converters/osm2pgrouting/files/patch-CMakeLists.txt
+++ b/converters/osm2pgrouting/files/patch-CMakeLists.txt
@@ -1,7 +1,7 @@
---- CMakeLists.txt.orig 2021-06-06 05:46:00 UTC
+--- CMakeLists.txt.orig 2025-10-30 16:20:18 UTC
+++ CMakeLists.txt
-@@ -9,7 +9,8 @@ endif()
- PROJECT(osm2pgrouting)
+@@ -12,7 +12,8 @@ LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cma
+ LANGUAGES C CXX)
LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
-SET(SHARE_DIR "${CMAKE_INSTALL_PREFIX}/share/osm2pgrouting")
@@ -10,7 +10,16 @@
find_package(PostgreSQL REQUIRED)
find_package(PQXX REQUIRED)
-@@ -92,14 +93,15 @@ if(WIN32)
+@@ -42,7 +43,7 @@ if (PQXX_VERSION VERSION_GREATER_EQUAL "7.0.0")
+
+ message(STATUS "PQXX_VERSION=${PQXX_VERSION}")
+ if (PQXX_VERSION VERSION_GREATER_EQUAL "7.0.0")
+- set(CMAKE_CXX_STANDARD 17)
++ set(CMAKE_CXX_STANDARD 20)
+ else()
+ add_definitions(-DPQXX_DISCONNECT)
+ set(CMAKE_CXX_STANDARD 14)
+@@ -95,14 +96,15 @@ INSTALL(FILES
endif()
INSTALL(FILES