<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/293985a19322240cace8d91070917078b277d6fe">https://github.com/macports/macports-ports/commit/293985a19322240cace8d91070917078b277d6fe</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 293985a  qgis3: change some variable names to avoid side effects
</span>293985a is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 293985a19322240cace8d91070917078b277d6fe
</span>Author: Veence <vince@macports.org>
AuthorDate: Sun Dec 3 15:59:02 2017 +0100

<span style='display:block; white-space:pre;color:#404040;'>    qgis3: change some variable names to avoid side effects
</span>---
 gis/qgis3/Portfile | 35 +++++++++++++++++------------------
 1 file changed, 17 insertions(+), 18 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/qgis3/Portfile b/gis/qgis3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e72535d..48ff4ae 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/qgis3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/qgis3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,12 +35,13 @@ depends_lib-append  port:libiconv \
</span>                     port:expat \
                     port:libzip \
                     path:lib/libssl.dylib:openssl \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:gsl \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:fcgi \
</span>                     port:proj \
                     port:geos \
                     port:gdal \
                     port:sqlite3 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:gsl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:fcgi \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:spatialite \
</span>                     port:spatialindex \
                     port:postgis2 \
                     port:qt5-qtwebkit \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,9 +55,7 @@ depends_lib-append  port:libiconv \
</span> 
 depends_build-append \
                     port:bison \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:ld64 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:ld64 
</span> 
 post-extract {
     system -W ${worksrcpath} "mkdir build"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,15 +104,15 @@ foreach suffix ${postgresql_suffixes} {
</span> }
 
 foreach suffix ${postgresql_suffixes} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set variant postgresql${suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set vrt postgresql${suffix}
</span>     set pgversion [string index ${suffix} 0].[string index ${suffix} 1]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set index [lsearch -exact ${portsgresql_variants} ${variant}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set conflicts [lreplace ${portsgresql_variants} ${index} ${index}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set index [lsearch -exact ${portsgresql_variants} ${vrt}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set conf [lreplace ${portsgresql_variants} ${index} ${index}]
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    variant ${variant} description "Use PostgreSQL ${pgversion}" conflicts {*}${conflicts} "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        depends_lib-append      port:${variant}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    variant ${vrt} description "Use PostgreSQL ${pgversion}" conflicts ${conf} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_lib-append      port:${vrt}
</span>         configure.args-append   \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            -DPOSTGRES_CONFIG=${prefix}/lib/${variant}/bin/pg_config
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            -DPOSTGRES_CONFIG=${prefix}/lib/${vrt}/bin/pg_config
</span>     "
 }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -138,12 +137,12 @@ foreach pyver ${python_suffixes} {
</span> }
 
 foreach pyver ${python_suffixes} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set variant python${pyver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set vrt python${pyver}
</span>     set pyversion [string index ${pyver} 0].[string index ${pyver} 1]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set index [lsearch -exact ${python_variants} ${variant}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set conflicts [lreplace ${python_variants} ${index} ${index}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set index [lsearch -exact ${python_variants} ${vrt}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set conf [lreplace ${python_variants} ${index} ${index}]
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        variant ${variant} description "Use Python ${pyversion}" conflicts {*}${conflicts} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        variant ${vrt} description "Use Python ${pyversion}" conflicts ${conf} "
</span>             depends_lib-append      port:python${pyver} \
                                     port:py${pyver}-pyqt5 \
                                     port:py${pyver}-qscintilla-qt5 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -208,10 +207,10 @@ configure.args-append  "-DCMAKE_BUILD_TYPE=RELEASE"
</span> 
 post-destroot {
     # qgis_bench app doesn’t link properly. Who uses this anyway????
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    system -W ${destroot}/Applications/MacPorts/Qgis3.app/Contents/MacOS/bin "rm -rf qgis_bench.app"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # system -W ${destroot}/Applications/MacPorts "mv QGIS.app QGIS3.app"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    delete ${destroot}${applications_dir}/Qgis3.app/Contents/MacOS/bin/qgis_bench.app
</span> }
 
 use_parallel_build          yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.dir                   ${worksrcpath}/build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#build.dir                   ${worksrcpath}/build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+cmake.out_of_source         yes
</span> destroot.target             install
</pre><pre style='margin:0'>

</pre>