Revision: 145290 https://trac.macports.org/changeset/145290 Author: mcalhoun@macports.org Date: 2016-01-30 18:43:51 -0800 (Sat, 30 Jan 2016) Log Message: ----------- dbus: whitespace changes only Modified Paths: -------------- trunk/dports/devel/dbus/Portfile Modified: trunk/dports/devel/dbus/Portfile =================================================================== --- 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) @@ -42,7 +42,7 @@ if { [variant_isset no_root] } { set dbus_user ${install.user} set dbus_group ${install.group} - + # look for place to install startup files if { [tbool startupitem.install] } { # See #28121 and #42994 @@ -62,7 +62,7 @@ ui_debug "Unable to find a valid home directory, but user disallows startup items." } else { ui_warn "Unable to find a valid home directory even though user requested startup items be installed." - } + } } } } else { @@ -72,7 +72,7 @@ set dbus_user messagebus } set dbus_group ${dbus_user} - + if { [tbool startupitem.install] } { set startup_root "" } @@ -120,7 +120,7 @@ ui_error "If you do not want to install the startup items, please change the global variable in ${prefix}/etc/macports/macports.conf" ui_error "Note: this will affect other ports" ui_error "See https://guide.macports.org/#reference.startupitems" - return -code error "invalid obsolete variant" + return -code error "invalid obsolete variant" } else { ui_warn "You have requested an obsolete variant" ui_warn "Installation of startup items are now determined by ${prefix}/etc/macports/macports.conf" @@ -132,7 +132,7 @@ post-patch { reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/dbus/dbus-sysdeps-unix.c reinplace {s|broken_poll="no (cross compiling)"|broken_poll=yes|} ${worksrcpath}/configure - + if { [tbool startupitem.create] } { # Disable if installed into startup directory. reinplace "s|</array>|</array>\\\n\\\n\\\t<key>Disabled</key>\\\n\\\t<true/>|" \ @@ -179,15 +179,15 @@ # See #15081 xinstall -d -m 0755 ${destroot}${plistDir} set plist [open "${destroot}${plistFl}" w 0644] - + puts ${plist} "<?xml version='1.0' encoding='UTF-8'?>" puts ${plist} "<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\"" puts ${plist} "\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\" >" puts ${plist} "<plist version='1.0'>" puts ${plist} "<dict>" - + puts ${plist} "<key>Label</key><string>org.freedesktop.dbus-system</string>" - + puts ${plist} "<key>ProgramArguments</key>" puts ${plist} "<array>" puts ${plist} "\t<string>${prefix}/bin/dbus-daemon</string>" @@ -203,19 +203,19 @@ if { [tbool startupitem.install] } { puts ${plist} "<key>Disabled</key><true/>" } - + puts ${plist} "</dict>" puts ${plist} "</plist>" - + close ${plist} - + if { [info exists startup_root] } { xinstall -d -m 0755 ${destroot}${startup_root}/Library/LaunchDaemons xinstall -d -m 0755 ${destroot}${startup_root}/Library/LaunchAgents ln -s ${plistFl} ${destroot}${startup_root}/Library/LaunchDaemons ln -s ${prefix}/Library/LaunchAgents/org.freedesktop.dbus-session.plist ${destroot}${startup_root}/Library/LaunchAgents } - + system "env DYLD_LIBRARY_PATH=${destroot}${prefix}/lib ${destroot}${prefix}/bin/dbus-uuidgen --ensure=${destroot}${prefix}/var/lib/dbus/machine-id" } @@ -229,7 +229,7 @@ post-activate { file attributes ${prefix}/var/run/dbus -group ${dbus_group} -owner ${dbus_user} file attributes ${prefix}/libexec/dbus-daemon-launch-helper -group ${dbus_group} - + if { [tbool startupitem.install] && ![variant_isset no_root] } { file attributes ${prefix}/Library/LaunchAgents/org.freedesktop.dbus-session.plist -owner root -group wheel file attributes ${prefix}/Library/LaunchDaemons/[file tail ${plistFl}] -owner root -group wheel @@ -289,7 +289,7 @@ error "Please do not use this variant with your MacPorts configuration." } } - + # Files are installed into user's startup directory. if { [tbool startupitem.install] } { destroot.violate_mtree yes