[92726] trunk/dports/devel/dbus/Portfile

[pixilla at macports.org]

Revision: 92726
          https://trac.macports.org/changeset/92726
Author:   pixilla at macports.org
Date:     2012-05-04 18:45:09 -0700 (Fri, 04 May 2012)
Log Message:
-----------
devel/dbus:
- Upgrade to version 1.4.20.
- Convert old style no_startupitem variant to startupitem.
- Make +startupitem variant the default.
  If legacy +no_startupitem is passed in then -startuptime is made the default.
- Have the dbus port honor the macports.conf startupitem.install directive when linking
  launchd plists into /Library/Launch{Agent,Daemon}.

Modified Paths:
--------------
    trunk/dports/devel/dbus/Portfile

Modified: trunk/dports/devel/dbus/Portfile
===================================================================
--- trunk/dports/devel/dbus/Portfile	2012-05-05 01:05:59 UTC (rev 92725)
+++ trunk/dports/devel/dbus/Portfile	2012-05-05 01:45:09 UTC (rev 92726)
@@ -6,7 +6,7 @@
 
 name            dbus
 conflicts       dbus-devel
-version         1.4.18
+version         1.4.20
 maintainers     mcalhoun openmaintainer
 categories      devel
 platforms       darwin
@@ -19,8 +19,8 @@
 homepage        http://www.freedesktop.org/Software/dbus
 master_sites    http://dbus.freedesktop.org/releases/dbus
 
-checksums       rmd160  cca7fd10a0e958ee5ada0bc0a591f567242dd959 \
-                sha256  b5e0c3bd37fa0ca5e86e8d17c375d754de6cd5c1d46d5f2158a36ddd51de18cf
+checksums           rmd160  c0e88ab6bf6afe93a243a42d26f3b6c03e7892cd \
+                    sha256  103bdcd261a13140730b5fa69f56a98ab5c89ba3f0116ea62fcfd639520d5aaf
 
 # See r59386
 # See r68276
@@ -54,7 +54,7 @@
     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 { ! [variant_isset no_startupitem] } {
+    if { [variant_isset startupitem] } {
         # 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
@@ -118,7 +118,7 @@
         puts ${plist} "<key>KeepAlive</key><true/>"
     }
 
-    if { ! [variant_isset no_startupitem] } {
+    if { [variant_isset startupitem] } {
         puts ${plist} "<key>Disabled</key><true/>"
     }
     
@@ -127,7 +127,8 @@
     
     close ${plist}
     
-    if { ! [variant_isset no_startupitem] } {
+    if { [variant_isset startupitem]
+    && ${startupitem.install} != "no" } {
         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
@@ -155,12 +156,19 @@
     file attributes ${prefix}/var/run/dbus -group ${dbus_group} -owner ${dbus_user}
     file attributes ${prefix}/libexec/dbus-daemon-launch-helper -group ${dbus_group}
     
-    if { ![variant_isset no_startupitem] && ![variant_isset no_root] } {
+    if { [variant_isset startupitem] && ![variant_isset no_root] } {
         file attributes /Library/LaunchAgents/org.freedesktop.dbus-session.plist -owner root -group wheel
         file attributes /Library/LaunchDaemons/[file tail ${plistFl}] -owner root -group wheel
     }
 }
 
+# Set default variants taking the old no_startupitem into consideration.
+if {[variant_isset no_startupitem]} {
+    default_variants    -startupitem
+} else {
+    default_variants    +startupitem
+}
+
 # XXX Building with tests enabled causes dbus to link with dbus-glib,
 # which it shouldn't do because that port depends on this one: see #30088
 variant test description {enable tests} {
@@ -168,8 +176,10 @@
     configure.args-append   --enable-tests
 }
 
-variant no_startupitem description {Do not install startup files.} {}
-if {![variant_isset no_startupitem]} {
+variant startupitem description {Install startup files.} {}
+
+if { [variant_isset startupitem]
+&& ${startupitem.install} != "no" } {
     notes "############################################################################
 # Startup items have been generated that will aid in
 # starting ${name} with launchd. They are disabled
@@ -194,7 +204,7 @@
     set startup_root  [join [lrange [exec /usr/bin/dscl . -read Users/${install.user} NFSHomeDirectory] 1 end]]
     
     # Files are installed into user's startup directory.
-    if { ![variant_isset no_startupitem] } {
+    if { [variant_isset startupitem] } {
         destroot.violate_mtree  yes
     }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120504/b32883d3/attachment-0001.html>