<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/20af02a34bbc266f98c97b98e9afdb16e69d8587">https://github.com/macports/macports-ports/commit/20af02a34bbc266f98c97b98e9afdb16e69d8587</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 20af02a34bbc266f98c97b98e9afdb16e69d8587
</span>Author: Nicklas Larsson <n_larsson@yahoo.com>
AuthorDate: Thu Nov 2 16:13:11 2023 +0100
<span style='display:block; white-space:pre;color:#404040;'> osm2pgrouting: update to version 2.3.8
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> and add PostgreSQL variants for versions 14-15.
</span>---
gis/osm2pgrouting/Portfile | 19 ++++++-------
gis/osm2pgrouting/files/patch-cmakelists_txt.diff | 31 ----------------------
.../files/patch-osm2pgrouting_cpp.diff | 11 --------
3 files changed, 8 insertions(+), 53 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/osm2pgrouting/Portfile b/gis/osm2pgrouting/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c628908c062..2256ac3e612 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/osm2pgrouting/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/osm2pgrouting/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,8 @@ PortGroup github 1.0
</span> PortGroup active_variants 1.1
PortGroup boost 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup pgRouting osm2pgrouting 2.3.7 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup pgRouting osm2pgrouting 2.3.8 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories gis
maintainers {vince @Veence} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,16 +17,13 @@ long_description osm2pgrouting is a command line tool to import\
</span> into a PostGreSQL/PgRouting spatial database \
in order to solve graph problems (shortest path, TSP…)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span> license GPL-2+
homepage https://pgrouting.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9f912dc56758861b104003acdce96512865868f7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 69eef32ec72b382b19ef329cd3c123ad595240a5d76409d56b6e1b75e35099dd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 185895
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-cmakelists_txt.diff patch-osm2pgrouting_cpp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 23e84043453e05df87fbac45673c6cf39beb0ed6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 59f871c4b43080eba440b87a2a0331d84fd45666f2ead8ef8cf627623bb7c83f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 187064
</span>
compiler.cxx_standard 2017
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +32,7 @@ depends_lib-append port:expat\
</span> port:postgis3
# Database variants (from the GDAL port)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set postgresql_suffixes {12 13}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set postgresql_suffixes {12 13 14 15}
</span>
set postgresql_variants {}
foreach suffix ${postgresql_suffixes} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,8 +55,8 @@ foreach suffix ${postgresql_suffixes} {
</span> if {!$result} {
ui_msg "Error: postgis3 isn't installed on the required postgresql version!"
return -code error "Variant mismatch."
<span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/osm2pgrouting/files/patch-cmakelists_txt.diff b/gis/osm2pgrouting/files/patch-cmakelists_txt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 73ff4eb477d..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/osm2pgrouting/files/patch-cmakelists_txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,31 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2021-02-01 18:37:16.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2021-03-23 19:03:25.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,6 +37,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CHECK_CXX_COMPILER_FLAG("-std=c++14" COMPILER_SUPPORTS_CXX14)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CHECK_CXX_COMPILER_FLAG("-std=c++17" COMPILER_SUPPORTS_CXX17)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS GNU_CXX_MINIMUM_VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- message(FATAL_ERROR "GCC version must be at least ${GNU_CXX_MINIMUM_VERSION}!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -50,7 +51,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- message(STATUS "Unknown compiler minimum version for ${CMAKE_CXX_COMPILER_ID}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--if(COMPILER_SUPPORTS_CXX14)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+if(COMPILER_SUPPORTS_CXX17)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ message(STATUS "Using -std=c++17.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+elseif(COMPILER_SUPPORTS_CXX14)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- message(STATUS "Using -std=c++14.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elseif(COMPILER_SUPPORTS_CXX11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -60,7 +64,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- message(STATUS "Using -std=c++0x.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++0x or C++11 or C++14 flags support.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ message(STATUS "The compiler ${CMAKE_CXX_COMPILER} has no C++0x or C++11 or C++14 or C++17 flags support.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/osm2pgrouting/files/patch-osm2pgrouting_cpp.diff b/gis/osm2pgrouting/files/patch-osm2pgrouting_cpp.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a2744492b06..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/osm2pgrouting/files/patch-osm2pgrouting_cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/osm_elements/osm2pgrouting.cpp.orig 2021-02-01 18:37:16.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/osm_elements/osm2pgrouting.cpp 2021-03-23 19:09:31.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -140,7 +140,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cout << "Can't open database" << endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- C.disconnect ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ C.close ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }catch (const std::exception &e){
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cerr << e.what() << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1;
</span></pre><pre style='margin:0'>
</pre>