<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f476b9ca3850dcec9e5c201e10bc7137b82faaea">https://github.com/macports/macports-ports/commit/f476b9ca3850dcec9e5c201e10bc7137b82faaea</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f476b9ca3850dcec9e5c201e10bc7137b82faaea
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sun Oct 3 22:56:15 2021 -0400

<span style='display:block; white-space:pre;color:#404040;'>    qgis3: fix build failure
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    - add PATH to pyuic5 binary (not sure if it's needed in all three
</span><span style='display:block; white-space:pre;color:#404040;'>      phases, but it takes forever to build/test and it doesn't hurt)
</span><span style='display:block; white-space:pre;color:#404040;'>    - revert to building with py-sip4
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Closes: https://trac.macports.org/ticket/63568
</span>---
 gis/qgis3/Portfile | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 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 bc7e42ff302..530f65ab257 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;'>@@ -9,7 +9,7 @@ PortGroup           active_variants 1.1
</span> github.setup        qgis QGIS 3_20_3 final-
 name                qgis3
 version             [string map {_ .} ${github.version}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            3
</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;'>@@ -21,7 +21,7 @@ long_description    QGIS is an open-source alternative to ArcGIS or other commer
</span> platforms           darwin
 license             GPL-2+
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage            http://www.qgis.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage            https://www.qgis.org/
</span> 
 checksums           rmd160  87bc5f349413a31f548c241ec9d9ba4bb1cc95a4 \
                     sha256  42f03339831242ddea34c93fc7754906fe6285dd199c07258e77aa4f51c4eb18 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,6 +64,8 @@ patchfiles          patch-app_info_plist_in.diff \
</span>                     patch-MacBundleMacros.cmake.diff
 
 post-patch {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace -E \"s|@PYVERSION@|${pyversion}|\" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${worksrcpath}/cmake/FindPyQt5.py
</span>     reinplace -E "s|@PREFIX@|${prefix}|g" \
         ${worksrcpath}/mac/app.info.plist.in
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -189,7 +191,7 @@ foreach pyver ${python_suffixes} {
</span>                                     port:py${pyver}-six \
                                     port:py${pyver}-protobuf3
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-            depends_build-append    port:py${pyver}-sip
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            depends_build-append    port:py${pyver}-sip4
</span> 
             depends_run-append      port:py${pyver}-psycopg2 \
                                     port:py${pyver}-requests \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -198,6 +200,9 @@ foreach pyver ${python_suffixes} {
</span>                                     port:py${pyver}-jinja2 \
                                     port:py${pyver}-pygments
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+            configure.env-append    PATH=${frameworks_dir}/Python.framework/Versions/${pyversion}/bin:$env(PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            build.env-append        PATH=${frameworks_dir}/Python.framework/Versions/${pyversion}/bin:$env(PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            destroot.env-append     PATH=${frameworks_dir}/Python.framework/Versions/${pyversion}/bin:$env(PATH)
</span> 
             configure.args-append   -DPython_EXECUTABLE=${prefix}/bin/python${pyversion}
             configure.args-append   -DWITH_BINDINGS=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -206,8 +211,6 @@ foreach pyver ${python_suffixes} {
</span>             configure.args-append   -DQSCI_SIP_DIR=${frameworks_dir}/Python.framework/Versions/${pyversion}/lib/python${pyversion}/site-packages/PyQt5/bindings
 
             post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                reinplace -E \"s|@PYVERSION@|${pyversion}|\" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    ${worksrcpath}/cmake/FindPyQt5.py
</span>                 # Complies with py-gdal layout
                 set gdal_py_prefix \"${worksrcpath}/python/plugins/processing/algs/gdal\"
                 foreach file    {\"AssignProjection\" \
</pre><pre style='margin:0'>

</pre>