<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/9f3777a4f2afc180693e8ee9ae98829c25fcacba">https://github.com/macports/macports-ports/commit/9f3777a4f2afc180693e8ee9ae98829c25fcacba</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 9f3777a dbus: fix test for startupitem.install
</span>9f3777a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9f3777a4f2afc180693e8ee9ae98829c25fcacba
</span>Author: Marcus Calhoun-Lopez <marcuscalhounlopez@gmail.com>
AuthorDate: Mon Jun 11 16:11:30 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> dbus: fix test for startupitem.install
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See
</span><span style='display:block; white-space:pre;color:#404040;'> https://lists.macports.org/pipermail/macports-dev/2018-June/039073.html
</span><span style='display:block; white-space:pre;color:#404040;'> https://lists.macports.org/pipermail/macports-users/2018-June/045274.html
</span>---
devel/dbus/Portfile | 14 +++++++-------
1 file changed, 7 insertions(+), 7 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 eab0dbe..cba4d80 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;'>@@ -5,7 +5,7 @@ PortGroup muniversal 1.0
</span>
name dbus
version 1.12.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> maintainers {mcalhoun @MarcusCalhoun-Lopez} openmaintainer
categories devel
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -64,7 +64,7 @@ configure.args --disable-doxygen-docs \
</span> --disable-tests
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[tbool ${startupitem.install}] && ![variant_isset no_root]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${startupitem.install} && ![variant_isset no_root]} {
</span> # Disable if installed into startup directory.
reinplace "s|</array>|</array>\\\n\\\n\\\t<key>Disabled</key>\\\n\\\t<true/>|" \
${worksrcpath}/bus/org.freedesktop.dbus-session.plist.in
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,7 +125,7 @@ post-destroot {
</span> puts ${plist} "<key>KeepAlive</key><true/>"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[tbool ${startupitem.install}] && ![variant_isset no_root]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${startupitem.install} && ![variant_isset no_root]} {
</span> puts ${plist} "<key>Disabled</key><true/>"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -134,7 +134,7 @@ post-destroot {
</span>
close ${plist}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[tbool ${startupitem.install}] && ![variant_isset no_root]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${startupitem.install} && ![variant_isset no_root]} {
</span> xinstall -d -m 0755 ${destroot}/Library/LaunchDaemons
xinstall -d -m 0755 ${destroot}/Library/LaunchAgents
ln -s ${prefix}/Library/LaunchDaemons/org.freedesktop.dbus-system.plist ${destroot}/Library/LaunchDaemons
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -148,14 +148,14 @@ post-activate {
</span> file attributes ${prefix}/var/run/dbus -group ${dbus_group} -owner ${dbus_user}
file attributes ${prefix}/libexec/dbus-daemon-launch-helper -group ${dbus_group}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [tbool startupitem.install] && ![variant_isset no_root] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${startupitem.install} && ![variant_isset no_root]} {
</span> file attributes ${prefix}/Library/LaunchAgents/org.freedesktop.dbus-session.plist -owner root -group wheel
file attributes ${prefix}/Library/LaunchDaemons/org.freedesktop.dbus-system.plist -owner root -group wheel
}
}
#pre-deactivate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# if {[tbool ${startupitem.install}] && ![variant_isset no_root]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# if {${startupitem.install} && ![variant_isset no_root]} {
</span> # catch {system "launchctl unload /Library/LaunchDaemons/org.freedesktop.dbus-system.plist"}
# catch {system "launchctl unload /Library/LaunchAgents/org.freedesktop.dbus-session.plist"}
# }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -173,7 +173,7 @@ variant test description {enable tests (Only Works if dbus is Already Installed)
</span> configure.python ${prefix}/bin/python2.7
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[tbool ${startupitem.install}] && ![variant_isset no_root]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${startupitem.install} && ![variant_isset no_root]} {
</span> notes "############################################################################
# Startup items have been generated that will aid in
# starting ${name} with launchd. They are disabled
</pre><pre style='margin:0'>
</pre>