<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/cab4af8ea4bb1341f77d13816d630b33eabd1888">https://github.com/macports/macports-ports/commit/cab4af8ea4bb1341f77d13816d630b33eabd1888</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 cab4af8ea4b osm2pgsql: bump to version 1.4.1 and other changes
</span>cab4af8ea4b is described below

<span style='display:block; white-space:pre;color:#808000;'>commit cab4af8ea4bb1341f77d13816d630b33eabd1888
</span>Author: Veence <vince@macports.org>
AuthorDate: Tue Mar 23 14:48:59 2021 +0100

<span style='display:block; white-space:pre;color:#404040;'>    osm2pgsql: bump to version 1.4.1 and other changes
</span>---
 gis/osm2pgsql/Portfile | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 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 87cbad5aafc..16a92ac5121 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;'>@@ -5,7 +5,7 @@ PortGroup           cmake                       1.1
</span> PortGroup           github                      1.0
 PortGroup           active_variants             1.1
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup        openstreetmap osm2pgsql 0.96.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup        openstreetmap osm2pgsql 1.4.1
</span> categories          gis
 maintainers         {vince @Veence} openmaintainer
 description         osm2pgsql is an OSM data injector for PostGIS
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,21 +18,21 @@ license             GPL-2+
</span> 
 homepage            https://wiki.openstreetmap.org/wiki/Osm2pgsql
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  180e37e673adf0c5459eb3f7cc224a67e0bf3ab8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  e45a3c2761116474edaf06ed263fdc8bbf23e1c3cf30705663ebc456aa02d12d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    1219280
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  522b46ee33369bd0ac16d6935245cb23691935dd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  9ba864584890e37cb813bbab1b3e360704cbaf25c394a0d213537debd8d9f923 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    2463451
</span> 
 compiler.cxx_standard 2011
 
 depends_lib-append  port:zlib\
                     port:expat\
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:proj\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:proj8\
</span>                     port:bzip2\
                     port:boost\
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:postgis2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:postgis3
</span> 
 # Database variants (from the GDAL port)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set postgresql_suffixes {11 10 95 96}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set postgresql_suffixes {12 13}
</span> 
 set postgresql_variants {}
 foreach suffix ${postgresql_suffixes} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,12 +40,11 @@ foreach suffix ${postgresql_suffixes} {
</span> }
 
 foreach suffix ${postgresql_suffixes} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set vrt postgresql${suffix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set pgversion [string index ${suffix} 0].[string index ${suffix} 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set index [lsearch -exact ${postgresql_variants} ${vrt}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set conf [lreplace ${postgresql_variants} ${index} ${index}]
</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:#ffe0e0;'>-    variant ${vrt} description "Use PostgreSQL ${pgversion}" conflicts {*}${conf} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    variant ${vrt} description "Use ${vrt}" conflicts {*}${conf} "
</span>         depends_lib-append      port:${vrt}
         configure.args-append   -DPostgreSQL_INCLUDE_DIR=${prefix}/include/${vrt}
         configure.args-append   -DPostgreSQL_TYPE_INCLUDE_DIR=${prefix}/include/${vrt}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,9 +52,9 @@ foreach suffix ${postgresql_suffixes} {
</span>     "
 
     if {[variant_isset ${vrt}]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        if {![catch {set result [active_variants postgis2 ${vrt}]}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        if {![catch {set result [active_variants postgis3 ${vrt}]}]} {
</span>             if {!$result} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                ui_msg "Error: postgis2 isn't installed on the required postgresql version!"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                ui_msg "Error: postgis3 isn't installed on the required postgresql version!"
</span>                 return -code error "Variant mismatch."
             }   
         } 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,11 +69,11 @@ foreach suffix ${postgresql_suffixes} {
</span> }
 
 set pgdefault [string range ${pgdefault} 0 end-4]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set pgdefault "${pgdefault}} { default_variants +postgresql10 }"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pgdefault "${pgdefault}} { default_variants +postgresql${suffix} }"
</span> 
 eval ${pgdefault}
 
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append   "-DPROJ_INCLUDE_DIR=${prefix}/lib/proj5/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append   "-DPROJ_LIBRARY=${prefix}/lib/proj5/lib/libproj.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append   "-DPROJ6_INCLUDE_DIR=${prefix}/lib/proj8/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append   "-DPROJ_LIBRARY=${prefix}/lib/proj8/lib/libproj.dylib"
</span> configure.args-append   "-DWITH_LUA=OFF"
</pre><pre style='margin:0'>

</pre>