<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/42c890affd07fd81c2a3ceac89fc6bce00bee906">https://github.com/macports/macports-ports/commit/42c890affd07fd81c2a3ceac89fc6bce00bee906</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 42c890affd07fd81c2a3ceac89fc6bce00bee906
</span>Author: i0ntempest <szf1234@me.com>
AuthorDate: Wed Dec 30 14:06:14 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> avahi: support and default to python39
</span>---
net/avahi/Portfile | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/avahi/Portfile b/net/avahi/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fc1bcee53ed..0f8b1fa7bbf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/avahi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/avahi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortGroup gobject_introspection 1.0
</span> github.setup lathiat avahi 0.8 v
revision 1
categories net devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {@i0ntempest me.com:szf1234} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {i0ntempest @i0ntempest} openmaintainer
</span> license LGPL-2.1+
platforms darwin
description Avahi is an Implementation of the DNS Service Discovery and Multicast DNS \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -175,7 +175,7 @@ variant qt5 description {Build with Qt5} {
</span> configure.args-delete --disable-qt5
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 conflicts python38 description {Build with Python 2.7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python27 conflicts python38 python39 description {Build with Python 2.7} {
</span> configure.python ${prefix}/bin/python2.7
depends_lib-append port:dbus-python27 \
port:py27-gdbm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -183,7 +183,7 @@ variant python27 conflicts python38 description {Build with Python 2.7} {
</span> configure.pkg_config_path-append ${frameworks_dir}/Python.framework/Versions/2.7/lib/pkgconfig
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python38 conflicts python27 description {Build with Python 3.8} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 conflicts python27 python39 description {Build with Python 3.8} {
</span> configure.python ${prefix}/bin/python3.8
depends_lib-append port:dbus-python38 \
port:py38-gdbm
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -191,6 +191,14 @@ variant python38 conflicts python27 description {Build with Python 3.8} {
</span> configure.pkg_config_path-append ${frameworks_dir}/Python.framework/Versions/3.8/lib/pkgconfig
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python39 conflicts python27 python38 description {Build with Python 3.9} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${prefix}/bin/python3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:dbus-python39 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py39-gdbm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py39-gobject3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pkg_config_path-append ${frameworks_dir}/Python.framework/Versions/3.9/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant x11 conflicts quartz {
require_active_variants gtk3 x11
require_active_variants gtk2 x11
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -207,12 +215,12 @@ if {![variant_isset quartz]} {
</span> if {![variant_isset gtk]} {
default_variants-append +gtk3
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +python38
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python27] && ![variant_isset python38]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +python39
</span> }
pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset python38] && ![variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset python39] && ![variant_isset python38] && ![variant_isset python27]} {
</span> ui_error "avahi requires Python, please use a Python variant."
return -code error
}
</pre><pre style='margin:0'>
</pre>