<pre style='margin:0'>
Vincent (Veence) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6f8ef90c5b5acf61d3c01b5d05a419a35b51a426">https://github.com/macports/macports-ports/commit/6f8ef90c5b5acf61d3c01b5d05a419a35b51a426</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 6f8ef90c5b5 osm2pgrouting: initial commit
</span>6f8ef90c5b5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6f8ef90c5b5acf61d3c01b5d05a419a35b51a426
</span>Author: Veence <vince@macports.org>
AuthorDate: Tue Mar 23 19:19:13 2021 +0100
<span style='display:block; white-space:pre;color:#404040;'> osm2pgrouting: initial commit
</span>---
gis/osm2pgrouting/Portfile | 76 ++++++++++++++++++++++
gis/osm2pgrouting/files/patch-cmakelists_txt.diff | 31 +++++++++
.../files/patch-osm2pgrouting_cpp.diff | 11 ++++
3 files changed, 118 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/osm2pgrouting/Portfile b/gis/osm2pgrouting/Portfile
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..934bf00e083
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/osm2pgrouting/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,76 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup active_variants 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup pgRouting osm2pgrouting 2.3.7 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+categories gis
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {vince @Veence} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description osm2pgrouting is an OSM data injector for PGrouting
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description osm2pgrouting is a command line tool to import\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Open Street Map (a.k.a OSM) data\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ into a PostGreSQL/PgRouting spatial database \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ in order to solve graph problems (shortest path, TSP…)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platforms darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+license GPL-2+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://pgrouting.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 9f912dc56758861b104003acdce96512865868f7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 69eef32ec72b382b19ef329cd3c123ad595240a5d76409d56b6e1b75e35099dd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 185895
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-cmakelists_txt.diff patch-osm2pgrouting_cpp.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.cxx_standard 2017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:expat\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:boost\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libpqxx\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:postgis3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Database variants (from the GDAL port)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set postgresql_suffixes {12 13}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set postgresql_variants {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach suffix ${postgresql_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lappend postgresql_variants postgresql${suffix}
</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;background:#e0ffe0;'>+foreach suffix ${postgresql_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set vrt postgresql${suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set index [lsearch -exact ${postgresql_variants} ${vrt}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set conf [lreplace ${postgresql_variants} ${index} ${index}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant ${vrt} description "Use ${vrt}" conflicts {*}${conf} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${vrt}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPOSTGRESQL_PG_CONFIG=${prefix}/lib/${vrt}/bin/pg_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DPOSTGRESQL_LIBRARIES=${prefix}/lib/${vrt}/libpq.dylib
</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;background:#e0ffe0;'>+ if {[variant_isset ${vrt}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![catch {set result [active_variants postgis3 ${vrt}]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {!$result} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_msg "Error: postgis3 isn't installed on the required postgresql version!"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "Variant mismatch."
</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;background:#e0ffe0;'>+ }
</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;background:#e0ffe0;'>+# postgresql default
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pgdefault "if {"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach suffix ${postgresql_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set pgdefault "${pgdefault}!\[variant_isset postgresql${suffix}\] && "
</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;background:#e0ffe0;'>+set pgdefault [string range ${pgdefault} 0 end-4]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pgdefault "${pgdefault}} { default_variants +postgresql${suffix} }"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+eval ${pgdefault}
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..73ff4eb477d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/osm2pgrouting/files/patch-cmakelists_txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,31 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2021-02-01 18:37:16.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2021-03-23 19:03:25.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,6 +37,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CHECK_CXX_COMPILER_FLAG("-std=c++0x" COMPILER_SUPPORTS_CXX0X)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CHECK_CXX_COMPILER_FLAG("-std=c++11" COMPILER_SUPPORTS_CXX11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CHECK_CXX_COMPILER_FLAG("-std=c++14" COMPILER_SUPPORTS_CXX14)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CHECK_CXX_COMPILER_FLAG("-std=c++17" COMPILER_SUPPORTS_CXX17)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS GNU_CXX_MINIMUM_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(FATAL_ERROR "GCC version must be at least ${GNU_CXX_MINIMUM_VERSION}!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,7 +51,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "Unknown compiler minimum version for ${CMAKE_CXX_COMPILER_ID}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if(COMPILER_SUPPORTS_CXX14)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if(COMPILER_SUPPORTS_CXX17)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(STATUS "Using -std=c++17.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++elseif(COMPILER_SUPPORTS_CXX14)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "Using -std=c++14.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif(COMPILER_SUPPORTS_CXX11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,7 +64,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ message(STATUS "Using -std=c++0x.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 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:#e0ffe0;'>++ 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:#e0ffe0;'>+ endif()
</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-osm2pgrouting_cpp.diff b/gis/osm2pgrouting/files/patch-osm2pgrouting_cpp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a2744492b06
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/osm2pgrouting/files/patch-osm2pgrouting_cpp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/osm_elements/osm2pgrouting.cpp.orig 2021-02-01 18:37:16.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/osm_elements/osm2pgrouting.cpp 2021-03-23 19:09:31.000000000 +0100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -140,7 +140,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cout << "Can't open database" << endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- C.disconnect ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ C.close ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }catch (const std::exception &e){
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cerr << e.what() << std::endl;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span></pre><pre style='margin:0'>
</pre>