<pre style='margin:0'>
Zhenfu Shi (i0ntempest) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/abe0d1a1dfd19a5baade5aeb248fe22c9653930e">https://github.com/macports/macports-ports/commit/abe0d1a1dfd19a5baade5aeb248fe22c9653930e</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 abe0d1a1dfd qgis3: drop python35 & build with proj7 & default to python38 (#9467)
</span>abe0d1a1dfd is described below

<span style='display:block; white-space:pre;color:#808000;'>commit abe0d1a1dfd19a5baade5aeb248fe22c9653930e
</span>Author: Zhenfu Shi <szf1234@me.com>
AuthorDate: Sat Dec 19 23:59:07 2020 -0500

<span style='display:block; white-space:pre;color:#404040;'>    qgis3: drop python35 & build with proj7 & default to python38 (#9467)
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    tweak some build settings that didn't respect the python version
</span><span style='display:block; white-space:pre;color:#404040;'>    specified by chosen variant
</span>---
 gis/qgis3/Portfile | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 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 340e9ebbaa0..ac07bf319d3 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;'>@@ -10,7 +10,7 @@ PortGroup           active_variants 1.1
</span> github.setup        qgis QGIS 3_16_1 final-
 name                qgis3
 version             [string map {_ .} ${github.version}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> categories          gis
 maintainers         {vince @Veence} openmaintainer
 description         QGIS 3 is a user-friendly GIS based on Qt 5
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@ depends_lib-append  port:libiconv \
</span>                     port:libzip \
                     path:lib/libssl.dylib:openssl \
                     port:gsl \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port:proj6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port:proj7 \
</span>                     port:geos \
                     port:gdal \
                     port:exiv2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,21 +69,6 @@ post-patch {
</span>     # Handle QGIS Fix #11399 which doesn’t seem to work anymore
     reinplace -E "s|#ifdef Q_OS_MAC$|#if 0|" \
         ${worksrcpath}/src/app/layout/qgslayoutdesignerdialog.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    # Complies with py-gdal layout
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set gdal_py_prefix "${worksrcpath}/python/plugins/processing/algs/gdal"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    foreach file    {"AssignProjection" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     "fillnodata" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     "gdal2tiles" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     "gdal2xyz" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     "gdalcalc" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     "merge" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     "polygonize" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     "proximity" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     "retile" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                     "sieve" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace -E "s|\\+ '.py'|\\+ '.py-${pyversion}'|" ${gdal_py_prefix}/${file}.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span> }
 
 compiler.blacklist      {clang < 500}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -118,13 +103,12 @@ configure.ldflags       "-Wl,-rpath,${prefix}/libexec/qt5/lib"
</span> configure.args-append   "-DWITH_3D=ON"
 configure.args-append   "-DLIBZIP_CONF_INCLUDE_DIR=${prefix}/lib/pkgconfig"
 configure.args-append   "-DWITH_BINDINGS=FALSE"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append   "-DPROJ_INCLUDE_DIR=${prefix}/lib/proj6/include"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append   "-DPROJ_LIBRARY=${prefix}/lib/proj6/lib/libproj.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append   "-DPROJ_INCLUDE_DIR=${prefix}/lib/proj7/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append   "-DPROJ_LIBRARY=${prefix}/lib/proj7/lib/libproj.dylib"
</span> configure.args-append   "-DQCA_INCLUDE_DIR=${prefix}/libexec/qt5/include/QtCrypto"
 configure.args-append   "-DQCA_LIBRARY=${prefix}/libexec/qt5/lib/libqca-qt5.dylib"
 configure.args-append   "-DQSCINTILLA_INCLUDE_DIR=${prefix}/libexec/qt5/include"
 configure.args-append   "-DQSCINTILLA_LIBRARY=${prefix}/libexec/qt5/lib/libqscintilla2_qt5.dylib"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append   "-DQSCI_SIP_DIR=${frameworks_dir}/Python.framework/Versions/3.7/share/sip/PyQt5"
</span> configure.args-append   "-DQWT_LIBRARY=${prefix}/libexec/qt5/lib/qwt.framework/Versions/Current/qwt"
 configure.args-append   "-DQWT_INCLUDE_DIR=${prefix}/libexec/qt5/lib/qwt.framework/Versions/Current/Headers"
 configure.args-append   "-DWITH_QWTPOLAR=ON"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -184,7 +168,7 @@ set pgdefault "${pgdefault}} { default_variants +postgresql12 }"
</span> eval ${pgdefault}
 
 # Python variants
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_suffixes {35 36 37 38}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_suffixes {36 37 38}
</span> set python_variants {}
 
 foreach pyver ${python_suffixes} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -219,10 +203,25 @@ foreach pyver ${python_suffixes} {
</span>             configure.args-append   -DWITH_BINDINGS=ON
             configure.args-append   -DPYUIC_PROGRAM=${prefix}/bin/pyuic5-${pyversion}
             configure.args-append   -DPYRCC_PROGRAM=${prefix}/bin/pyrcc5-${pyversion}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+            configure.args-append   -DQSCI_SIP_DIR=${frameworks_dir}/Python.framework/Versions/${pyversion}/share/sip/PyQt5
</span> 
             post-patch {
                 reinplace -E \"s|@PYVERSION@|${pyversion}|\" \
                     ${worksrcpath}/cmake/FindPyQt5.py
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                # Complies with py-gdal layout
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                set gdal_py_prefix \"${worksrcpath}/python/plugins/processing/algs/gdal\"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                foreach file    {\"AssignProjection\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                 \"fillnodata\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                 \"gdal2tiles\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                 \"gdal2xyz\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                 \"gdalcalc\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                 \"merge\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                 \"polygonize\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                 \"proximity\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                 \"retile\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                 \"sieve\" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    reinplace -E \"s|\\\\+ '.py'|\\\\+ '.py-${pyversion}'|\" \${gdal_py_prefix}/\${file}.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                }
</span>             }
         "
 }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -235,7 +234,7 @@ foreach pyver ${python_suffixes} {
</span> }
 
 set python_default [string range ${python_default} 0 end-4]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_default "${python_default}} { default_variants +python36 }"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_default "${python_default}} { default_variants +python38 }"
</span> 
 eval ${python_default}
 
</pre><pre style='margin:0'>

</pre>