<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/ea76a65b57a46f4c16a8a00621b36b52190923d5">https://github.com/macports/macports-ports/commit/ea76a65b57a46f4c16a8a00621b36b52190923d5</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 ea76a65b57a postgis3, gdal: fix an erroneous sticky port6 dependency
</span>ea76a65b57a is described below

<span style='display:block; white-space:pre;color:#808000;'>commit ea76a65b57a46f4c16a8a00621b36b52190923d5
</span>Author: Veence <vince@macports.org>
AuthorDate: Mon Aug 24 22:07:22 2020 +0200

<span style='display:block; white-space:pre;color:#404040;'>    postgis3, gdal: fix an erroneous sticky port6 dependency
</span>---
 databases/postgis3/Portfile | 16 +++++++++++++---
 gis/gdal/Portfile           |  4 +---
 2 files changed, 14 insertions(+), 6 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/postgis3/Portfile b/databases/postgis3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1eb6f3931e2..41a5cc2a5f6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/postgis3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/postgis3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ name                postgis3
</span> categories          databases gis
 license             GPL-2+
 version             3.0.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            2
</span> platforms           darwin
 maintainers         {vince @Veence} openmaintainer
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +32,6 @@ depends_build       port:autoconf \
</span>                     port:libxslt
 
 depends_lib         port:geos\
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:proj6\
</span>                     port:libiconv\
                     port:libxml2\
                     port:json-c
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,9 +97,20 @@ variant sfcgal              description {Uses SFCGAL for 3D queries} {
</span>     configure.args-append   --with-sfcgal=${prefix}/bin/sfcgal-config
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append       --with-projdir=${prefix}/lib/proj6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant proj6 conflicts proj7 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append      port:proj6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append   --with-projdir=${prefix}/lib/proj6
</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;'>+variant proj7 conflicts proj6 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_lib-append      port:proj7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.args-append   --with-projdir=${prefix}/lib/proj7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> 
 default_variants            +raster +topology
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset proj6] && ![variant_isset proj7]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    default_variants        +proj7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> 
 # Port phases
 
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/gdal/Portfile b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c23e9c02858..1808d8405d3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/gdal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ PortGroup           debug 1.0
</span> mpi.setup
 
 github.setup        OSGeo gdal 3.1.2 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            2
</span> checksums           rmd160  444c7c2d2f12037c7454c150e89f7ec597e8fa90 \
                     sha256  767c8d0dfa20ba3283de05d23a1d1c03a7e805d0ce2936beaff0bb7d11450641 \
                     size    12083768
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +56,6 @@ depends_lib-append  port:zlib \
</span>                     port:libxml2 \
                     port:webp \
                     port:giflib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:proj6 \
</span>                     port:qhull \
                     port:sqlite3 \
                     port:spatialite \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,7 +79,6 @@ configure.args-append \
</span>                     --with-jpeg=internal\
                     --with-charls=yes \
                     --with-gif=yes \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    --with-proj=${prefix}/lib/proj6 \
</span>                     --with-qhull=yes \
                     --with-pam \
                     --with-sqlite3=${prefix} \
</pre><pre style='margin:0'>

</pre>