<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/f8fc5e1268ad5a93df2f89b0426604a73cca0b5d">https://github.com/macports/macports-ports/commit/f8fc5e1268ad5a93df2f89b0426604a73cca0b5d</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 f8fc5e1268a grass7: remove obsolete python35 variant and touch up variants handling code
</span>f8fc5e1268a is described below

<span style='display:block; white-space:pre;color:#808000;'>commit f8fc5e1268ad5a93df2f89b0426604a73cca0b5d
</span>Author: Veence <vince@macports.org>
AuthorDate: Tue Mar 23 11:38:11 2021 +0100

<span style='display:block; white-space:pre;color:#404040;'>    grass7: remove obsolete python35 variant and touch up variants handling code
</span>---
 gis/grass7/Portfile | 61 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 35 insertions(+), 26 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass7/Portfile b/gis/grass7/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f7aa2ee2d53..8c6ae5ac61c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/grass7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortGroup           debug 1.0
</span> github.setup        OSGeo grass 7.8.5
 name                grass7
 set main_version    [join [lrange [split ${version} "."] 0 1] ""]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision            0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> set realVersion     ${version}
 #distname           grass-${version}
 distname            grass-${realVersion}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -82,16 +82,18 @@ configure.args-append \
</span> build.target            default
 
 # Python 3 variants
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_suffixes {35 36 37 38 39}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_suffixes {36 37 38 39}
</span> set python_variants {}
 
 foreach pyver ${python_suffixes} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    set vrt python${pyver}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set pyversion [string index ${pyver} 0].[string index ${pyver} 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set index [lsearch -exact ${python_variants} ${vrt}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    lappend python_variants python${pyver}
</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;'>+foreach pyver ${python_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set index [lsearch -exact ${python_variants} python${pyver}]
</span>     set conf [lreplace ${python_variants} ${index} ${index}]
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        variant ${vrt} description "Use Python ${pyversion}" conflicts {*}${conf} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        variant python${pyver} description "Use python${pyver}" conflicts {*}${conf} "
</span>             depends_lib-append      port:python${pyver} \
                                     port:py${pyver}-Pillow \
                                     port:py${pyver}-numpy \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,31 +129,38 @@ foreach suffix ${python_suffixes} {
</span> }
 
 set pydefault [string range ${pydefault} 0 end-4]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set pydefault "${pydefault}} { default_variants +python39 }"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pydefault "${pydefault}} { default_variants +python${suffix} }"
</span> 
 eval ${pydefault}
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant proj7 conflicts proj6 description {Build with PROJ 7} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append      port:proj7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.env           PATH=$::env(PATH):${prefix}/lib/proj7/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    build.env               PATH=$::env(PATH):${prefix}/lib/proj7/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append   --with-proj-includes=${prefix}/lib/proj7/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-proj-libs=${prefix}/lib/proj7/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-proj-share=${prefix}/lib/proj7/share/proj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set proj_versions {6 7 8}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set proj_variants {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pjver ${proj_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    lappend proj_variants proj${pjver}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant proj6 conflicts proj7 description {Build with PROJ 6} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_lib-append      port:proj6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.env           PATH=$::env(PATH):${prefix}/lib/proj6/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    build.env               PATH=$::env(PATH):${prefix}/lib/proj6/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    configure.args-append   --with-proj-includes=${prefix}/lib/proj6/include \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-proj-libs=${prefix}/lib/proj6/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                            --with-proj-share=${prefix}/lib/proj6/share/proj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach proj_ver ${proj_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set index [lsearch -exact ${proj_variants} proj${proj_ver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set cflcts [lreplace ${proj_variants} ${index} ${index}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        variant proj${proj_ver} description "Use Proj${proj_ver}" conflicts {*}${cflcts} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            depends_lib-append      port:proj${proj_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            configure.env           PATH=$::env(PATH):${prefix}/lib/proj${proj_ver}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            build.env               PATH=$::env(PATH):${prefix}/lib/proj${proj_ver}/bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+            configure.args-append   --with-proj-includes=${prefix}/lib/proj${proj_ver}/include \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    --with-proj-libs=${prefix}/lib/proj${proj_ver}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                                    --with-proj-share=${prefix}/lib/proj${proj_ver}/share/proj
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "
</span> }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset proj7] && ![variant_isset proj6]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    default_variants    +proj7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set projdf "if {"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach pv ${proj_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set projdf "${projdf}!\[variant_isset proj${pv}\] && "
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set projdf [string range ${projdf} 0 end-4]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set projdf "${projdf}} { default_variants +proj${pv} }"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+eval ${projdf}
</span> 
 variant gui description {Build with wxPython GUI and application bundle} {
     wxWidgets.use           wxWidgets-3.2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -221,7 +230,7 @@ variant mysql5 description {Add MySQL 5 support} {
</span> }
 
 # PostGreSQL variants (from the GDAL port)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set postgresql_suffixes {13 12 11 10}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set postgresql_suffixes {10 11 12 13}
</span> 
 set postgresql_variants {}
 foreach suffix ${postgresql_suffixes} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -251,7 +260,7 @@ foreach suffix ${postgresql_suffixes} {
</span> }
 
 set pgdefault [string range ${pgdefault} 0 end-4]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set pgdefault "${pgdefault}} { default_variants +postgresql13 }"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pgdefault "${pgdefault}} { default_variants +postgresql${suffix} }"
</span> 
 eval ${pgdefault}
 
</pre><pre style='margin:0'>

</pre>