<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0901783c28b42123f98a07175344158754ef9033">https://github.com/macports/macports-ports/commit/0901783c28b42123f98a07175344158754ef9033</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0901783c28b42123f98a07175344158754ef9033
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Wed Oct 11 05:21:32 2017 -0700

<span style='display:block; white-space:pre;color:#404040;'>    dbus: use one filename instead of four variables
</span>---
 devel/dbus/Portfile | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/dbus/Portfile b/devel/dbus/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 047c9ab..42b3614 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/dbus/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/dbus/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,12 +121,6 @@ destroot.keepdirs \
</span>     ${destroot}${prefix}/etc/dbus-1/system.d \
     ${destroot}${prefix}/etc/dbus-1/session.d
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set plistDir  ${prefix}/Library/LaunchDaemons
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set plistFl   ${plistDir}/org.freedesktop.dbus-system.plist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set labelDaemon [file rootname [file tail ${plistFl}]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set labelAgent [file rootname org.freedesktop.dbus-session.plist]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # universal_archs_to_use might not be set before pre-fetch.
 pre-destroot {
     global merger_dont_diff merger_configure_env
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -140,8 +134,8 @@ pre-destroot {
</span> post-destroot {
     # Simplify startup script over startupitem.install.
     # See #15081
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    xinstall -d -m 0755 ${destroot}${plistDir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    set plist [open "${destroot}${plistFl}" w 0644]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    xinstall -d -m 0755 ${destroot}${prefix}/Library/LaunchDaemons
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    set plist [open "${destroot}${prefix}/Library/LaunchDaemons/org.freedesktop.dbus-system.plist" w 0644]
</span> 
     puts ${plist} "<?xml version='1.0' encoding='UTF-8'?>"
     puts ${plist} "<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -175,7 +169,7 @@ post-destroot {
</span>     if { [info exists startup_root] } {
         xinstall -d -m 0755 ${destroot}${startup_root}/Library/LaunchDaemons
         xinstall -d -m 0755 ${destroot}${startup_root}/Library/LaunchAgents
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        ln -s ${plistFl} ${destroot}${startup_root}/Library/LaunchDaemons
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ln -s ${prefix}/Library/LaunchDaemons/org.freedesktop.dbus-system.plist ${destroot}${startup_root}/Library/LaunchDaemons
</span>         ln -s ${prefix}/Library/LaunchAgents/org.freedesktop.dbus-session.plist ${destroot}${startup_root}/Library/LaunchAgents
     }
 
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -188,13 +182,13 @@ post-activate {
</span> 
     if { [tbool startupitem.install] && ![variant_isset no_root] } {
         file attributes ${prefix}/Library/LaunchAgents/org.freedesktop.dbus-session.plist -owner root -group wheel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        file attributes ${prefix}/Library/LaunchDaemons/[file tail ${plistFl}] -owner root -group wheel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        file attributes ${prefix}/Library/LaunchDaemons/org.freedesktop.dbus-system.plist -owner root -group wheel
</span>     }
 }
 
 #pre-deactivate {
 #    if { [info exists startup_root] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#        catch {system "launchctl unload ${startup_root}/Library/LaunchDaemons/[file tail ${plistFl}]"}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#        catch {system "launchctl unload ${startup_root}/Library/LaunchDaemons/org.freedesktop.dbus-system.plist"}
</span> #        catch {system "launchctl unload ${startup_root}/Library/LaunchAgents/org.freedesktop.dbus-session.plist"}
 #    }
 #}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -218,7 +212,7 @@ if { [info exists startup_root] } {
</span> # by default. Execute the following commands to start them,
 # and to cause them to launch at startup:
 #
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# ${sudo}launchctl load -w ${startup_root}/Library/LaunchDaemons/[file tail ${plistFl}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ${sudo}launchctl load -w ${startup_root}/Library/LaunchDaemons/org.freedesktop.dbus-system.plist
</span> # launchctl load -w ${startup_root}/Library/LaunchAgents/org.freedesktop.dbus-session.plist
 ############################################################################"
 } else {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -227,7 +221,7 @@ if { [info exists startup_root] } {
</span> # Some programs which depend on ${name} might not function properly.
 # To load ${name} manually, run
 #
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# launchctl load -w ${prefix}/Library/LaunchDaemons/[file tail ${plistFl}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# launchctl load -w ${prefix}/Library/LaunchDaemons/org.freedesktop.dbus-system.plist
</span> # launchctl load -w ${prefix}/Library/LaunchAgents/org.freedesktop.dbus-session.plist
 ############################################################################"
 }
</pre><pre style='margin:0'>

</pre>