<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/8874ac38da67a673c5552d457a0779cf6fc0bdf4">https://github.com/macports/macports-ports/commit/8874ac38da67a673c5552d457a0779cf6fc0bdf4</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 8874ac3 avahi: use base support for multiple startupitems
</span>8874ac3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8874ac38da67a673c5552d457a0779cf6fc0bdf4
</span>Author: Marcus Calhoun-Lopez <marcuscalhounlopez@gmail.com>
AuthorDate: Tue Jun 12 21:28:46 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> avahi: use base support for multiple startupitems
</span>---
net/avahi/Portfile | 83 ++++++++++++++++--------------------------------------
1 file changed, 25 insertions(+), 58 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 ce3e8ee..9dbc098 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;'>@@ -6,7 +6,7 @@ PortGroup github 1.0
</span> PortGroup gobject_introspection 1.0
github.setup lathiat avahi 0.7 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories net devel
maintainers nomaintainer
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,12 +53,12 @@ depends_lib port:expat \
</span>
gobject_introspection yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset underscore]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set avahi_user avahi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set avahi_group avahi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} >= 9} {
</span> set avahi_user _avahi
set avahi_group _avahi
<span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set avahi_user avahi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set avahi_group avahi
</span> }
add_users ${avahi_user} group=${avahi_group} realname=Avahi\ Service
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,33 +89,28 @@ configure.args --disable-autoipd \
</span> # __APPLE_USE_RFC_2292 should be removed once avhi is updated to support RFC 3542
configure.cppflags-append -L${prefix}/lib -D__APPLE_USE_RFC_2292
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set launch_daemons {org.freedesktop.avahi-daemon.plist org.freedesktop.avahi-dnsconfd.plist}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d -m 0755 ${destroot}${prefix}/Library/LaunchDaemons
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach fl ${launch_daemons} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file attributes ${destroot}/Library/LaunchDaemons/${fl} -permissions 0644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}/Library/LaunchDaemons/${fl} ${destroot}${prefix}/Library/LaunchDaemons
</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;'>- # previous command should move all LaunchDaemons
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach fl [glob -nocomplain -tails -directory ${destroot}/Library/LaunchDaemons *] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${destroot}/Library/LaunchDaemons should be empty"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${fl} should not exist in ${destroot}/Library/LaunchDaemons"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "unaccounted for file in LaunchDaemons"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set daemon_uniquename org.freedesktop.avahi-daemon
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set dnsconfd_uniquename org.freedesktop.avahi-dnsconfd
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${startupitem.install}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach fl ${launch_daemons} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/Library/LaunchDaemons/${fl} ${destroot}/Library/LaunchDaemons/${fl}
</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;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.type launchd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.create no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitems name avahi-daemon \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ location LaunchDaemons \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uniquename ${daemon_uniquename} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ plist ${daemon_uniquename}.plist \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name avahi-dnsconfd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ location LaunchDaemons \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uniquename ${dnsconfd_uniquename} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ plist ${dnsconfd_uniquename}.plist
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-activate {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${startupitem.install}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach fl ${launch_daemons} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file attributes ${prefix}/Library/LaunchDaemons/${fl} -owner root -group wheel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach uniquename "${daemon_uniquename} ${dnsconfd_uniquename}" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${destroot}${prefix}/etc/LaunchDaemons/${uniquename}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}/Library/LaunchDaemons/${uniquename}.plist ${destroot}${prefix}/etc/LaunchDaemons/${uniquename}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${startupitem.install} && [geteuid] == 0} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/etc/LaunchDaemons/${uniquename}/${uniquename}.plist ${destroot}/Library/LaunchDaemons/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s ${prefix}/etc/LaunchDaemons/${uniquename}/${uniquename}.plist ${destroot}${prefix}/etc/LaunchDaemons
</span> }
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -197,31 +192,3 @@ variant quartz conflicts x11 {
</span> if {![variant_isset quartz]} {
default_variants-append +x11
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant underscore description {Put underscore in front of Avahi daemon user} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # For darwin ${os.major} > 8, daemon users have an underscore in front of the usernames and groups.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This variant allows the user to follow that convention.
</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;'>-if {${startupitem.install}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notes "############################################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Startup items have been generated that will aid in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# starting ${name} with launchd. They are disabled
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# by default. Execute the following commands to start them,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# and to cause them to launch at startup:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach fl ${launch_daemons} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notes-append "# sudo launchctl load -w /Library/LaunchDaemons/${fl}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notes-append "############################################################################"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notes "############################################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Startup items were not installed for ${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Some programs which depend on ${name} might not function properly.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# To load ${name} manually, run
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach fl ${launch_daemons} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notes-append "# sudo launchctl load -w ${prefix}/Library/LaunchDaemons/${fl}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notes-append "############################################################################"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span></pre><pre style='margin:0'>
</pre>