Index: head/converters/osm2pgrouting/Makefile =================================================================== --- head/converters/osm2pgrouting/Makefile (revision 564009) +++ head/converters/osm2pgrouting/Makefile (revision 564010) @@ -1,34 +1,33 @@ # $FreeBSD$ PORTNAME= osm2pgrouting DISTVERSIONPREFIX= v -DISTVERSION= 2.3.6 -PORTREVISION= 4 +DISTVERSION= 2.3.7 CATEGORIES= converters databases geography MAINTAINER= lbartoletti@FreeBSD.org COMMENT= Import OSM data into pgRouting database LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/LICENSE.txt +LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libexpat.so:textproc/expat2 \ libpqxx.so:databases/postgresql-libpqxx USES= cmake compiler:c++17-lang pgsql USE_GITHUB= yes GH_ACCOUNT= pgRouting WANT_PGSQL= client OPTIONS_DEFINE= DOCS -PORTDOCS= Readme.md +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 + ${WRKSRC}/README.md .include Index: head/converters/osm2pgrouting/distinfo =================================================================== --- head/converters/osm2pgrouting/distinfo (revision 564009) +++ head/converters/osm2pgrouting/distinfo (revision 564010) @@ -1,3 +1,3 @@ -TIMESTAMP = 1547161773 -SHA256 (pgRouting-osm2pgrouting-v2.3.6_GH0.tar.gz) = c4b1f45ff7a9a184956182e40016fdd9455718821adb25822e2ef8182d2712a6 -SIZE (pgRouting-osm2pgrouting-v2.3.6_GH0.tar.gz) = 182168 +TIMESTAMP = 1612377637 +SHA256 (pgRouting-osm2pgrouting-v2.3.7_GH0.tar.gz) = afbe3ff74c9b9b7b1350362fc839e1466335d57f84941af19b5a663fd58aba0c +SIZE (pgRouting-osm2pgrouting-v2.3.7_GH0.tar.gz) = 185875 Index: head/converters/osm2pgrouting/files/patch-CMakeLists.txt =================================================================== --- head/converters/osm2pgrouting/files/patch-CMakeLists.txt (revision 564009) +++ head/converters/osm2pgrouting/files/patch-CMakeLists.txt (revision 564010) @@ -1,54 +1,54 @@ ---- CMakeLists.txt.orig 2020-08-20 05:32:18 UTC +--- CMakeLists.txt.orig 2021-02-04 06:38:35 UTC +++ CMakeLists.txt @@ -8,7 +8,8 @@ if ( ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR} endif() 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(LibPQXX REQUIRED) @@ -37,6 +38,7 @@ include(CheckCXXCompilerFlag) CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X) CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11) CHECK_CXX_COMPILER_FLAG("-std=c++14" COMPILER_SUPPORTS_CXX14) +CHECK_CXX_COMPILER_FLAG("-std=c++17" COMPILER_SUPPORTS_CXX17) if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS GNU_CXX_MINIMUM_VERSION) message(FATAL_ERROR "GCC version must be at least ${GNU_CXX_MINIMUM_VERSION}! @@ -50,7 +52,10 @@ else() message(STATUS "Unknown compiler minimum version for ${CMAKE_CXX_COMPILER_ID}") endif() -if(COMPILER_SUPPORTS_CXX14) +if(COMPILER_SUPPORTS_CXX17) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") + message(STATUS "Using -std=c++17.") +elseif(COMPILER_SUPPORTS_CXX14) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") message(STATUS "Using -std=c++14.") elseif(COMPILER_SUPPORTS_CXX11) -@@ -114,14 +119,14 @@ if(WIN32) +@@ -114,14 +119,15 @@ if(WIN32) endif() INSTALL(FILES - "${CMAKE_SOURCE_DIR}/COPYING" - "${CMAKE_SOURCE_DIR}/Readme.md" + "${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} )