<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/23c4d2c67b3a222f678a2b7f3e4e673e0303ca18">https://github.com/macports/macports-ports/commit/23c4d2c67b3a222f678a2b7f3e4e673e0303ca18</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 23c4d2c67b3a222f678a2b7f3e4e673e0303ca18
</span>Author: Veence <vince@macports.org>
AuthorDate: Tue May 7 07:23:46 2019 +0200

<span style='display:block; white-space:pre;color:#404040;'>    osm2pgsql: check postgresql/postgis variants
</span>---
 gis/osm2pgsql/Portfile | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/osm2pgsql/Portfile b/gis/osm2pgsql/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index af2e52c..51fdcd0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/osm2pgsql/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/osm2pgsql/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,11 @@
</span> # -*- 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 style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem          1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup           cmake   1.1
</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> PortGroup           compiler_blacklist_versions 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup           cxx11   1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup           github  1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup           cxx11                       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> 
 github.setup        openstreetmap osm2pgsql 0.96.0
 categories          gis
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,10 +30,11 @@ depends_lib-append  port:zlib\
</span>                     port:expat\
                     port:proj\
                     port:bzip2\
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:boost
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:boost\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:postgis2
</span> 
 # Database variants (from the GDAL port)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set postgresql_suffixes {10 95 96}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set postgresql_suffixes {11 10 95 96}
</span> 
 set postgresql_variants {}
 foreach suffix ${postgresql_suffixes} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,6 +53,15 @@ foreach suffix ${postgresql_suffixes} {
</span>         configure.args-append   -DPostgreSQL_TYPE_INCLUDE_DIR=${prefix}/include/${vrt}
         configure.args-append   -DPostgreSQL_LIBRARY=${prefix}/lib/${vrt}/libpq.dylib
     "
<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 postgis2 ${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: postgis2 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> }
 
 # postgresql default
</pre><pre style='margin:0'>

</pre>