<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/d95d7d094ecb0852a4971c2561a79f37af2e111a">https://github.com/macports/macports-ports/commit/d95d7d094ecb0852a4971c2561a79f37af2e111a</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 d95d7d0 add python38 variant, make default. Based on PR #6730, adjusted for variant conflicts with other python variants.
</span>d95d7d0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d95d7d094ecb0852a4971c2561a79f37af2e111a
</span>Author: Eric Hall <ricci@macports.org>
AuthorDate: Mon Mar 30 10:23:21 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> add python38 variant, make default.
</span><span style='display:block; white-space:pre;color:#404040;'> Based on PR #6730, adjusted for variant conflicts with other python variants.
</span>---
net/wireshark3/Portfile | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 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 67fc7db..38c3f26 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;'>@@ -127,18 +127,22 @@ variant chmodbpf description {Enable Wireshark to acces macOS capture devices} {
</span> depends_run port:wireshark-chmodbpf
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python35 conflicts python36 python37 description {Use python35 during build} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python35 conflicts python36 python37 python38 description {Use python35 during build} {
</span> depends_build-append port:python35
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python36 conflicts python35 python37 description {Use python36 during build} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python36 conflicts python35 python37 python38 description {Use python36 during build} {
</span> depends_build-append port:python36
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python37 conflicts python35 python36 description {Use python37 during build} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python37 conflicts python35 python36 python38 description {Use python37 during build} {
</span> depends_build-append port:python37
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 conflicts python35 python36 python37 description {Use python38 during build} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:python38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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;'>@@ -149,11 +153,11 @@ 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 +python37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+## if no python3* variant is specified, add +python38
</span> ## XYZZY: it would be better to detect which python3* is already installed and use that...
if {![variant_isset python35] && ![variant_isset python36] && \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ![variant_isset python37]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +python37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ![variant_isset python37] && ![variant_isset python38] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +python38
</span> }
post-destroot {
</pre><pre style='margin:0'>
</pre>