<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[145290] trunk/dports/devel/dbus/Portfile</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/145290">145290</a></dd>
<dt>Author</dt> <dd>mcalhoun@macports.org</dd>
<dt>Date</dt> <dd>2016-01-30 18:43:51 -0800 (Sat, 30 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>dbus: whitespace changes only</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdeveldbusPortfile">trunk/dports/devel/dbus/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdeveldbusPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/dbus/Portfile (145289 => 145290)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/dbus/Portfile 2016-01-31 02:41:34 UTC (rev 145289)
+++ trunk/dports/devel/dbus/Portfile 2016-01-31 02:43:51 UTC (rev 145290)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> if { [variant_isset no_root] } {
</span><span class="cx"> set dbus_user ${install.user}
</span><span class="cx"> set dbus_group ${install.group}
</span><del>-
</del><ins>+
</ins><span class="cx"> # look for place to install startup files
</span><span class="cx"> if { [tbool startupitem.install] } {
</span><span class="cx"> # See #28121 and #42994
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> ui_debug "Unable to find a valid home directory, but user disallows startup items."
</span><span class="cx"> } else {
</span><span class="cx"> ui_warn "Unable to find a valid home directory even though user requested startup items be installed."
</span><del>- }
</del><ins>+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> set dbus_user messagebus
</span><span class="cx"> }
</span><span class="cx"> set dbus_group ${dbus_user}
</span><del>-
</del><ins>+
</ins><span class="cx"> if { [tbool startupitem.install] } {
</span><span class="cx"> set startup_root ""
</span><span class="cx"> }
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> ui_error "If you do not want to install the startup items, please change the global variable in ${prefix}/etc/macports/macports.conf"
</span><span class="cx"> ui_error "Note: this will affect other ports"
</span><span class="cx"> ui_error "See https://guide.macports.org/#reference.startupitems"
</span><del>- return -code error "invalid obsolete variant"
</del><ins>+ return -code error "invalid obsolete variant"
</ins><span class="cx"> } else {
</span><span class="cx"> ui_warn "You have requested an obsolete variant"
</span><span class="cx"> ui_warn "Installation of startup items are now determined by ${prefix}/etc/macports/macports.conf"
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/dbus/dbus-sysdeps-unix.c
</span><span class="cx"> reinplace {s|broken_poll="no (cross compiling)"|broken_poll=yes|} ${worksrcpath}/configure
</span><del>-
</del><ins>+
</ins><span class="cx"> if { [tbool startupitem.create] } {
</span><span class="cx"> # Disable if installed into startup directory.
</span><span class="cx"> reinplace "s|</array>|</array>\\\n\\\n\\\t<key>Disabled</key>\\\n\\\t<true/>|" \
</span><span class="lines">@@ -179,15 +179,15 @@
</span><span class="cx"> # See #15081
</span><span class="cx"> xinstall -d -m 0755 ${destroot}${plistDir}
</span><span class="cx"> set plist [open "${destroot}${plistFl}" w 0644]
</span><del>-
</del><ins>+
</ins><span class="cx"> puts ${plist} "<?xml version='1.0' encoding='UTF-8'?>"
</span><span class="cx"> puts ${plist} "<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\""
</span><span class="cx"> puts ${plist} "\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\" >"
</span><span class="cx"> puts ${plist} "<plist version='1.0'>"
</span><span class="cx"> puts ${plist} "<dict>"
</span><del>-
</del><ins>+
</ins><span class="cx"> puts ${plist} "<key>Label</key><string>org.freedesktop.dbus-system</string>"
</span><del>-
</del><ins>+
</ins><span class="cx"> puts ${plist} "<key>ProgramArguments</key>"
</span><span class="cx"> puts ${plist} "<array>"
</span><span class="cx"> puts ${plist} "\t<string>${prefix}/bin/dbus-daemon</string>"
</span><span class="lines">@@ -203,19 +203,19 @@
</span><span class="cx"> if { [tbool startupitem.install] } {
</span><span class="cx"> puts ${plist} "<key>Disabled</key><true/>"
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> puts ${plist} "</dict>"
</span><span class="cx"> puts ${plist} "</plist>"
</span><del>-
</del><ins>+
</ins><span class="cx"> close ${plist}
</span><del>-
</del><ins>+
</ins><span class="cx"> if { [info exists startup_root] } {
</span><span class="cx"> xinstall -d -m 0755 ${destroot}${startup_root}/Library/LaunchDaemons
</span><span class="cx"> xinstall -d -m 0755 ${destroot}${startup_root}/Library/LaunchAgents
</span><span class="cx"> ln -s ${plistFl} ${destroot}${startup_root}/Library/LaunchDaemons
</span><span class="cx"> ln -s ${prefix}/Library/LaunchAgents/org.freedesktop.dbus-session.plist ${destroot}${startup_root}/Library/LaunchAgents
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> system "env DYLD_LIBRARY_PATH=${destroot}${prefix}/lib ${destroot}${prefix}/bin/dbus-uuidgen --ensure=${destroot}${prefix}/var/lib/dbus/machine-id"
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx"> post-activate {
</span><span class="cx"> file attributes ${prefix}/var/run/dbus -group ${dbus_group} -owner ${dbus_user}
</span><span class="cx"> file attributes ${prefix}/libexec/dbus-daemon-launch-helper -group ${dbus_group}
</span><del>-
</del><ins>+
</ins><span class="cx"> if { [tbool startupitem.install] && ![variant_isset no_root] } {
</span><span class="cx"> file attributes ${prefix}/Library/LaunchAgents/org.freedesktop.dbus-session.plist -owner root -group wheel
</span><span class="cx"> file attributes ${prefix}/Library/LaunchDaemons/[file tail ${plistFl}] -owner root -group wheel
</span><span class="lines">@@ -289,7 +289,7 @@
</span><span class="cx"> error "Please do not use this variant with your MacPorts configuration."
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> # Files are installed into user's startup directory.
</span><span class="cx"> if { [tbool startupitem.install] } {
</span><span class="cx"> destroot.violate_mtree yes
</span></span></pre>
</div>
</div>
</body>
</html>