kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

converters/osm2pgrouting: Update to 2.3.8

Browse source 
Changes:
  - https://github.com/pgRouting/osm2pgrouting/releases/tag/v2.3.8
This commit is contained in:
Loïc Bartoletti 2021-06-06 08:09:54 +02:00
parent faa55ca69a
commit 7b972a701b
4 changed files with 10 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
converters/osm2pgrouting/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= osm2pgrouting
DISTVERSIONPREFIX= v
DISTVERSION= 2.3.7
DISTVERSION= 2.3.8
CATEGORIES= converters databases geography
MAINTAINER= lbartoletti@FreeBSD.org

6
converters/osm2pgrouting/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1612377637
SHA256 (pgRouting-osm2pgrouting-v2.3.7_GH0.tar.gz) = afbe3ff74c9b9b7b1350362fc839e1466335d57f84941af19b5a663fd58aba0c
SIZE (pgRouting-osm2pgrouting-v2.3.7_GH0.tar.gz) = 185875
TIMESTAMP = 1622957337
SHA256 (pgRouting-osm2pgrouting-v2.3.8_GH0.tar.gz) = e3a58bcacf0c8811e0dcf3cf3791a4a7cc5ea2a901276133eacf227b30fd8355
SIZE (pgRouting-osm2pgrouting-v2.3.8_GH0.tar.gz) = 187051

32
converters/osm2pgrouting/files/patch-CMakeLists.txt
View file

@ -1,36 +1,16 @@
--- CMakeLists.txt.orig 2021-02-04 06:38:35 UTC
--- CMakeLists.txt.orig 2021-06-06 05:46:00 UTC
+++ CMakeLists.txt
@@ -8,7 +8,8 @@ if ( ${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}
endif()
@@ -9,7 +9,8 @@ endif()
PROJECT(osm2pgrouting)
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,15 @@ if(WIN32)
find_package(PostgreSQL REQUIRED)
find_package(PQXX REQUIRED)
@@ -92,14 +93,15 @@ if(WIN32)
endif()
INSTALL(FILES

11
converters/osm2pgrouting/files/patch-src_osm__elements_osm2pgrouting.cpp
View file

@ -1,11 +0,0 @@
--- src/osm_elements/osm2pgrouting.cpp.orig 2020-08-20 05:44:56 UTC
+++ src/osm_elements/osm2pgrouting.cpp
@@ -140,7 +140,7 @@ int main(int argc, char* argv[]) {
cout << "Can't open database" << endl;
return 1;
}
- C.disconnect ();
+ C.close ();
}catch (const std::exception &e){
cerr << e.what() << std::endl;
return 1;