<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/38afc75b1d9878dba0baf65092414fd1ebd11a56">https://github.com/macports/macports-ports/commit/38afc75b1d9878dba0baf65092414fd1ebd11a56</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 38afc75 avahi: update to 0.8
</span>38afc75 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 38afc75b1d9878dba0baf65092414fd1ebd11a56
</span>Author: i0ntempest <szf1234@me.com>
AuthorDate: Thu Apr 23 02:34:23 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> avahi: update to 0.8
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Added qt5 variant; use python38
</span>---
net/avahi/Portfile | 81 ++++++++++++++++++++++++++++++++----------------
net/avahi/files/build-db | 49 +++++++++++++++++++++++++++++
2 files changed, 104 insertions(+), 26 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 b01bcc6..4c09121 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;'>@@ -5,8 +5,8 @@ PortGroup active_variants 1.1
</span> PortGroup github 1.0
PortGroup gobject_introspection 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup lathiat avahi 0.7 v
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup lathiat avahi 0.8 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories net devel
maintainers nomaintainer
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,13 +21,13 @@ long_description ${description} It uses D-Bus for communication between user
</span> homepage http://avahi.org/
github.tarball_from releases
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 40a58c780a01ae03a234cd52735ba8d63c93b867 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f060e7afbc20accc6befbbe6776d3ca7956b4962 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1591458
</span>
patchfiles patch-avahi-daemon-Makefile.in.diff \
patch-avahi-dnsconfd-Makefile.in.diff \
patch-avahi-utils-Makefile.in.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure.diff \
</span> patch-initscript-darwin-org.freedesktop.avahi-daemon.plist.in.diff \
patch-initscript-darwin-org.freedesktop.avahi-dnsconfd.plist.in.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,8 @@ depends_build port:pkgconfig \
</span> depends_lib port:expat \
port:gdbm \
port:gettext \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libdaemon
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libdaemon \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libevent
</span>
gobject_introspection yes
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -73,6 +74,7 @@ configure.args --disable-autoipd \
</span> --disable-silent-rules \
--disable-qt3 \
--disable-qt4 \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-qt5 \
</span> --disable-mono \
--disable-monodoc \
--with-distro=darwin \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,7 +82,6 @@ configure.args --disable-autoipd \
</span> --disable-gtk3 \
--disable-xmltoman \
--disable-gtk \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-pygtk \
</span> --disable-tests \
--with-avahi-priv-access-group=${avahi_priv_group} \
--with-avahi-user=${avahi_user} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -103,6 +104,11 @@ startupitems name avahi-daemon \
</span> uniquename ${dnsconfd_uniquename} \
plist ${dnsconfd_uniquename}.plist
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Temporary fix for 0.8 which is missing this file causing build to fail
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${filespath}/build-db ${worksrcpath}/service-type-database/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
foreach uniquename "${daemon_uniquename} ${dnsconfd_uniquename}" {
xinstall -d -m 0755 ${destroot}${prefix}/etc/LaunchDaemons/${uniquename}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -143,32 +149,45 @@ variant test description {Build tests} {
</span> variant gtk description {Build with GTK2} {
depends_lib-append port:gtk2 \
port:libglade2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-gtk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace --disable-gtk --enable-gtk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --disable-manpages
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {delete ${destroot}${prefix}/share/man/man1/*}
</span> }
variant gtk3 description {Build with GTK3} {
depends_lib-append port:gtk3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-delete --disable-gtk3
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --disable-manpages
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +gtk +gtk3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant qt4 description {Build with Qt4} {
PortGroup qt4 1.0
configure.args-delete --disable-qt4
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# just use python27 with no python variants
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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:#e0ffe0;'>+variant qt5 description {Build with Qt5} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This configure script does not use CXXFLAGS variable for Qt5 compile test so I have to do this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.env-append QT5_CFLAGS=-std=c++11\ -DQT_CORE_LIB\ -F${qt_dir}/lib\ -I${qt_dir}/lib/QtCore.framework/Headers\ -I${qt_dir}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cxx_standard 2011
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --disable-qt5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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:#e0ffe0;'>+variant python27 conflicts python38 description {Build with Python 2.7} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${prefix}/bin/python2.7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:dbus-python27 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py27-gdbm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py27-gobject3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pkg_config_path-append ${frameworks_dir}/Python.framework/Versions/2.7/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</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 ${frameworks_dir}/Python.framework/Versions/2.7/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant python38 conflicts python27 description {Build with Python 3.8} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.python ${prefix}/bin/python3.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:dbus-python38 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py38-gdbm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:py38-gobject3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.pkg_config_path-append ${frameworks_dir}/Python.framework/Versions/3.8/lib/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
# see https://trac.macports.org/ticket/55054
pre-configure {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -176,19 +195,29 @@ pre-configure {
</span> configure.pkg_config_path
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if [variant_isset gtk] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:py27-pygtk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-pygtk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant x11 conflicts quartz {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants gtk2 x11 quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants gtk3 x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants gtk2 x11
</span> }
variant quartz conflicts x11 {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants gtk2 quartz x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants gtk3 quartz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants gtk2 quartz
</span> }
if {![variant_isset quartz]} {
default_variants-append +x11
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset gtk]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +gtk3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +python38
</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;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset python38] && ![variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_error "avahi requires Python, please use a Python variant."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error
</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;color:#808080;'>diff --git a/net/avahi/files/build-db b/net/avahi/files/build-db
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..78ee892
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/avahi/files/build-db
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,49 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#!/usr/bin/env python
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*-python-*-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This file is part of avahi.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# avahi is free software; you can redistribute it and/or modify it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# under the terms of the GNU Lesser General Public License as
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# published by the Free Software Foundation; either version 2 of the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# License, or (at your option) any later version.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# avahi is distributed in the hope that it will be useful, but WITHOUT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# License for more details.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# You should have received a copy of the GNU Lesser General Public
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# License along with avahi; if not, write to the Free Software
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# USA.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+try:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import anydbm as dbm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+except ImportError:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import dbm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+import sys
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if len(sys.argv) > 1:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ infn = sys.argv[1]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ infn = "service-types"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if len(sys.argv) > 2:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ outfn = sys.argv[2]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+else:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ outfn = infn + ".db"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+db = dbm.open(outfn, "n")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+for ln in open(infn, "r"):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln = ln.strip(" \r\n\t")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ln == "" or ln.startswith("#"):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ continue
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t, n = ln.split(":", 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ db[t.strip()] = n.strip()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+db.close()
</span></pre><pre style='margin:0'>
</pre>