<pre style='margin:0'>
ghosthound pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/670ccacb3d6a1d1ca7c0f8124a893bb62764de50">https://github.com/macports/macports-ports/commit/670ccacb3d6a1d1ca7c0f8124a893bb62764de50</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 670ccacb3d6 Wireshark3: add python3.10 variant (#14159)
</span>670ccacb3d6 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 670ccacb3d6a1d1ca7c0f8124a893bb62764de50
</span>Author: jrabinow <5642686+jrabinow@users.noreply.github.com>
AuthorDate: Sat Mar 5 02:02:44 2022 +0000

<span style='display:block; white-space:pre;color:#404040;'>    Wireshark3: add python3.10 variant (#14159)
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    * wireshark3: refactor python variants code
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    * wireshark3: add python310 variant
</span>---
 net/wireshark3/Portfile | 42 ++++++++++++++++++++++++++----------------
 1 file changed, 26 insertions(+), 16 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/wireshark3/Portfile b/net/wireshark3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1ab340b6f1c..0607bc9f598 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/wireshark3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/wireshark3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,6 +99,7 @@ configure.args-append \
</span> 
 variant qt5 conflicts no_gui description {Build wireshark with a qt5 GUI} {
     PortGroup               qt5 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span>     configure.args-replace  -DENABLE_APPLICATION_BUNDLE=OFF -DENABLE_APPLICATION_BUNDLE=ON
     configure.args-replace  -DBUILD_wireshark=OFF -DBUILD_wireshark=ON
     configure.args-append   -DENABLE_QT5=ON
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -167,22 +168,38 @@ variant chmodbpf description {Enable Wireshark to access macOS capture devices}
</span>     depends_run             port:wireshark-chmodbpf
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python36 conflicts python37 python38 python39 description {Use python36 during build} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_build-append    port:python36
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pythons_suffixes {36 37 38 39 310}
</span> 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 conflicts python36 python38 python39 description {Use python37 during build} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_build-append    port:python37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set pythons_ports {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach py_ver_nodot ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    lappend pythons_ports python${py_ver_nodot}
</span> }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python38 conflicts python36 python37 python39 description {Use python38 during build} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_build-append    port:python38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach py_ver_nodot ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set py_port python${py_ver_nodot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set py_ver [string index ${py_ver_nodot} 0].[string range ${py_ver_nodot} 1 end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set i [lsearch -exact ${pythons_ports} ${py_port}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set py_conflicts [lreplace ${pythons_ports} ${i} ${i}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    variant ${py_port} description "Use python ${py_ver} during build" conflicts {*}${py_conflicts} "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        depends_build-append      port:${py_port}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    "
</span> }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python39 conflicts python36 python37 python38 description {Use python39 during build} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    depends_build-append    port:python39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# make sure one of the +python* variants is set
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_isset false
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach py_ver_nodot ${pythons_suffixes} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    if { [variant_isset python${py_ver_nodot}] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        set python_isset true
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        break
</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;'>+## if no python3* variant is specified, add +python310
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## XYZZY: it would be better to detect which python3* is already installed and use that...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {!${python_isset}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    default_variants-append +python310
</span> }
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> default_variants +zlib +libsmi +gnutls +geoip +kerberos5 +chmodbpf
 
 if {![variant_isset qt5] && ![variant_isset no_gui]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -193,13 +210,6 @@ if {![variant_isset adns] && ![variant_isset cares]} {
</span>     default_variants-append +cares
 }
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-## if no python3* variant is specified, add +python38
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-## XYZZY: it would be better to detect which python3* is already installed and use that...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python36] && ![variant_isset python37] && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    ![variant_isset python38] && ![variant_isset python39] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    default_variants-append +python39
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-destroot {
     xinstall -d ${destroot}${prefix}/include/wireshark/epan/crypt/
     xinstall -d ${destroot}${prefix}/include/wireshark/epan/dfilter/
</pre><pre style='margin:0'>

</pre>