<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/b19edce10ed149ab07c56e1cca373159af2c65dc">https://github.com/macports/macports-ports/commit/b19edce10ed149ab07c56e1cca373159af2c65dc</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 b19edce10ed avahi: cleanup python-related copy-pasta
</span>b19edce10ed is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b19edce10ed149ab07c56e1cca373159af2c65dc
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Mon Jun 5 12:40:10 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> avahi: cleanup python-related copy-pasta
</span>---
net/avahi/Portfile | 102 ++++++++++++++++++++++++-----------------------------
1 file changed, 47 insertions(+), 55 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 3d417566e51..61432a371a0 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;'>@@ -181,63 +181,65 @@ 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 python39 python310 python311 description {Build with Python 2.7} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:dbus-python27 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py27-gdbm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py27-gobject3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pkg_config_path-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${frameworks_dir}/Python.framework/Versions/2.7/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|PYTHON_PREFIX=\'\${prefix}\'|PYTHON_PREFIX=\'${frameworks_dir}/Python.framework/Versions/2.7\'|" ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_versions [list \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2.7 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3.8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3.9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3.10 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3.11 \
</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;'>+proc py_ver_set {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global py_versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach py_ver ${py_versions} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set py_ver_nodot [string map {. {}} ${py_ver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set py_variant python${py_ver_nodot}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset ${py_variant}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ${py_ver}
</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;'>+ return ""
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python38 conflicts python27 python39 python310 python311 description {Build with Python 3.8} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python3.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:dbus-python38 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py38-gdbm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py38-gobject3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc py_setup {py_ver} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global prefix frameworks_dir worksrcpath python_framework
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set py_ver_nodot [string map {"." ""} ${py_ver}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set python_framework ${frameworks_dir}/Python.framework/Versions/${py_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${prefix}/bin/python${py_ver}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:dbus-python${py_ver_nodot} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${py_ver_nodot}-gdbm \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${py_ver_nodot}-gobject3
</span> configure.pkg_config_path-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${frameworks_dir}/Python.framework/Versions/3.8/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${python_framework}/lib/pkgconfig
</span> post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|PYTHON_PREFIX=\'\${prefix}\'|PYTHON_PREFIX=\'${frameworks_dir}/Python.framework/Versions/3.8\'|" ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|PYTHON_PREFIX=\'\${prefix}\'|PYTHON_PREFIX=\'${python_framework}\'|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/configure
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python39 conflicts python27 python38 python310 python311 description {Build with Python 3.9} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python3.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:dbus-python39 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py39-gdbm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py39-gobject3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pkg_config_path-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${frameworks_dir}/Python.framework/Versions/3.9/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|PYTHON_PREFIX=\'\${prefix}\'|PYTHON_PREFIX=\'${frameworks_dir}/Python.framework/Versions/3.9\'|" ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python27 conflicts python38 python39 python310 python311 description {Build with Python 2.7} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 conflicts python27 python39 python310 python311 description {Build with Python 3.8} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python39 conflicts python27 python38 python310 python311 description {Build with Python 3.9} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python310 conflicts python27 python38 python39 python311 description {Build with Python 3.10} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python311 conflicts python27 python38 python39 python310 description {Build with Python 3.11} {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[py_ver_set] eq ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +python311
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python310 conflicts python27 python38 python39 python311 description {Build with Python 3.10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python3.10
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:dbus-python310 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py310-gdbm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py310-gobject3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pkg_config_path-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${frameworks_dir}/Python.framework/Versions/3.10/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|PYTHON_PREFIX=\'\${prefix}\'|PYTHON_PREFIX=\'${frameworks_dir}/Python.framework/Versions/3.10\'|" ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set py_ver [py_ver_set]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${py_ver} ne ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ py_setup ${py_ver}
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python311 conflicts python27 python38 python39 python310 description {Build with Python 3.10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${prefix}/bin/python3.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:dbus-python311 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py311-gdbm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py311-gobject3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.pkg_config_path-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${frameworks_dir}/Python.framework/Versions/3.11/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|PYTHON_PREFIX=\'\${prefix}\'|PYTHON_PREFIX=\'${frameworks_dir}/Python.framework/Versions/3.11\'|" ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${py_ver} eq ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error "This port requires that one python variant be enabled"
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -257,13 +259,3 @@ 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] && ![variant_isset python38] && ![variant_isset python39] && ![variant_isset python310]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +python311
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset python311] && ![variant_isset python310] && ![variant_isset python39] && ![variant_isset python38] && ![variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "avahi requires Python, please use a Python variant."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span></pre><pre style='margin:0'>
</pre>