diff --git a/converters/osm2pgrouting/Makefile b/converters/osm2pgrouting/Makefile index fd4d5a1df5c7..04c9e005cb7e 100644 --- a/converters/osm2pgrouting/Makefile +++ b/converters/osm2pgrouting/Makefile @@ -1,30 +1,32 @@ PORTNAME= osm2pgrouting DISTVERSIONPREFIX= v DISTVERSION= 3.0.0 +PORTREVISION= 1 CATEGORIES= converters databases geography MAINTAINER= lbartoletti@FreeBSD.org COMMENT= Import OSM data into pgRouting database 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 OPTIONS_DEFINE= DOCS PORTDOCS= README.md post-patch: @${REINPLACE_CMD} -e 's|/usr/share/osm2pgrouting/mapconfig.xml|${PREFIX}/etc/${PORTNAME}/mapconfig.xml|' \ ${WRKSRC}/src/utilities/prog_options.cpp \ ${WRKSRC}/README.md .include 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,34 +1,43 @@ ---- 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") +SET(DOC_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/osm2pgrouting") +SET(ETC_DIR "${CMAKE_INSTALL_PREFIX}/etc/osm2pgrouting") 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 - "${CMAKE_SOURCE_DIR}/COPYING" "${CMAKE_SOURCE_DIR}/README.md" - "${CMAKE_SOURCE_DIR}/mapconfig.xml" - "${CMAKE_SOURCE_DIR}/mapconfig_for_cars.xml" - "${CMAKE_SOURCE_DIR}/mapconfig_for_bicycles.xml" - "${CMAKE_SOURCE_DIR}/mapconfig_for_pedestrian.xml" - DESTINATION "${SHARE_DIR}") + DESTINATION "${DOC_DIR}") +FOREACH(i mapconfig.xml mapconfig_for_cars.xml mapconfig_for_bicycles.xml mapconfig_for_pedestrian.xml) + INSTALL(FILES + "${CMAKE_SOURCE_DIR}/${i}" + RENAME ${i}.sample + DESTINATION "${ETC_DIR}") +ENDFOREACH() #INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} ) #TARGET_LINK_LIBRARIES( osm2pgrouting ${Boost_LIBRARIES} )