<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/d3a43cdd0b2aea6bed868a5a4dc67e83117c345f">https://github.com/macports/macports-ports/commit/d3a43cdd0b2aea6bed868a5a4dc67e83117c345f</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 d3a43cdd0b2 gdal: add proj7 support and make it the default, remove proj4 support and add default postgresql variant
</span>d3a43cdd0b2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d3a43cdd0b2aea6bed868a5a4dc67e83117c345f
</span>Author: Veence <vince@macports.org>
AuthorDate: Mon Aug 24 19:23:16 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> gdal: add proj7 support and make it the default, remove proj4 support and add default postgresql variant
</span>---
gis/gdal/Portfile | 25 +++++++++++++++++++------
1 file changed, 19 insertions(+), 6 deletions(-)
<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 d0acdf8e84a..c23e9c02858 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 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> checksums rmd160 444c7c2d2f12037c7454c150e89f7ec597e8fa90 \
sha256 767c8d0dfa20ba3283de05d23a1d1c03a7e805d0ce2936beaff0bb7d11450641 \
size 12083768
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -334,10 +334,17 @@ variant xerces description {Enable xerces XML support for GML file format} {
</span> set postgresql_suffixes {95 96 10 11 12}
set portsgresql_variants {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set postgresql_default_variant "if {"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> foreach s ${postgresql_suffixes} {
lappend portsgresql_variants postgresql${s}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ set postgresql_default_variant "${postgresql_default_variant}!\[variant_isset postgresql${s}] && "
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set postgresql_default_variant [string range ${postgresql_default_variant} 0 end-4]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set postgresql_default_variant "${postgresql_default_variant}} {default_variants +postgresql${s}}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+eval $postgresql_default_variant
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> foreach s ${postgresql_suffixes} {
set p postgresql${s}
set v [string index ${s} 0].[string index ${s} 1]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -392,12 +399,18 @@ variant cfitsio description {Enable fits support} {
</span> configure.optflags -DGDAL_COMPILATION
# Proj version
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant proj4 description {Use Proj4 4.9 instead of Proj 6+} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant proj6 conflicts proj7 description {Use proj 6} {
</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-proj=${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 description {Use proj 7} {
</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-proj=${prefix}/lib/proj7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete port:proj6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:proj4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --with-proj=${prefix}/lib/proj6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-static-proj4=${prefix}/lib/proj49
</span><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> }
# Can be removed after June 2021.
</pre><pre style='margin:0'>
</pre>