[77154] trunk/dports/devel/dbus

[jmr at macports.org]

Revision: 77154
          http://trac.macports.org/changeset/77154
Author:   jmr at macports.org
Date:     2011-03-21 06:42:48 -0700 (Mon, 21 Mar 2011)
Log Message:
-----------
dbus: update launchd keys for 10.5+ (#23475). No rev bump since this doesn't significantly affect functionality.

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

Added Paths:
-----------
    trunk/dports/devel/dbus/files/10.5-launchd.diff

Modified: trunk/dports/devel/dbus/Portfile
===================================================================
--- trunk/dports/devel/dbus/Portfile	2011-03-21 10:51:49 UTC (rev 77153)
+++ trunk/dports/devel/dbus/Portfile	2011-03-21 13:42:48 UTC (rev 77154)
@@ -31,6 +31,11 @@
                 0006-bus_system-conf-in.patch
 patch.pre_args  -p1
 
+if { $macosx_deployment_target != "10.4" } {
+    # Allow on-demand loading for Leopard.
+    patchfiles-append 10.5-launchd.diff
+}
+
 depends_build       \
     port:pkgconfig
 
@@ -59,15 +64,9 @@
     
     if { ! [variant_isset no_startupitem] } {
         # Disable if installed into startup directory.
-        reinplace "s|<false />|<false />\\\n\\\n\\\t<key>Disabled</key>\\\n\\\t<true/>|" \
+        reinplace "s|</array>|</array>\\\n\\\n\\\t<key>Disabled</key>\\\n\\\t<true/>|" \
             ${worksrcpath}/bus/org.freedesktop.dbus-session.plist.in
     }
-    
-    if { ${os.major} == 9 } {
-        # Allow OnDemand for Leopard.
-        reinplace {s|<false />|<true />|} \
-            ${worksrcpath}/bus/org.freedesktop.dbus-session.plist.in
-    }
 }
 
 use_parallel_build  yes
@@ -121,9 +120,12 @@
     puts ${plist} "\t<string>--system</string>"
     puts ${plist} "\t<string>--nofork</string>"
     puts ${plist} "</array>"
-    
-    puts ${plist} "<key>OnDemand</key><false/>"
-    
+    if {$macosx_deployment_target == "10.4"} {
+        puts ${plist} "<key>OnDemand</key><false/>"
+    } else {
+        puts ${plist} "<key>KeepAlive</key><true/>"
+    }
+
     if { ! [variant_isset no_startupitem] } {
         puts ${plist} "<key>Disabled</key><true/>"
     }

Added: trunk/dports/devel/dbus/files/10.5-launchd.diff
===================================================================
--- trunk/dports/devel/dbus/files/10.5-launchd.diff	                        (rev 0)
+++ trunk/dports/devel/dbus/files/10.5-launchd.diff	2011-03-21 13:42:48 UTC (rev 77154)
@@ -0,0 +1,16 @@
+--- dbus-1.2.24/bus/org.freedesktop.dbus-session.plist.in.orig	2011-03-22 00:27:21.000000000 +1100
++++ dbus-1.2.24/bus/org.freedesktop.dbus-session.plist.in	2011-03-22 00:31:01.000000000 +1100
+@@ -5,13 +5,6 @@
+ 	<key>Label</key>
+ 	<string>org.freedesktop.dbus-session</string>
+ 
+-	<key>ServiceIPC</key>
+-	<true/>
+-
+-	<!-- bug in 10.4's launchd - on-demand loading does not work -->
+-	<key>OnDemand</key>
+-	<false />
+-
+ 	<key>ProgramArguments</key>
+ 	<array>
+ 		<string>@DBUS_DAEMONDIR@/dbus-daemon</string>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110321/22360626/attachment.html>