[59234] trunk/dports/devel/dbus

[sharky at macports.org]

Revision: 59234
          http://trac.macports.org/changeset/59234
Author:   sharky at macports.org
Date:     2009-10-12 06:39:24 -0700 (Mon, 12 Oct 2009)
Log Message:
-----------
dbus: fix launch on Snow Leopard

* fix segfault due to NULL pointer and bad string format
* disable OnDemand launching on Snow Leopard

Modified Paths:
--------------
    trunk/dports/devel/dbus/Portfile
    trunk/dports/devel/dbus/files/patch-launchd-integration.diff

Modified: trunk/dports/devel/dbus/Portfile
===================================================================
--- trunk/dports/devel/dbus/Portfile	2009-10-12 12:54:03 UTC (rev 59233)
+++ trunk/dports/devel/dbus/Portfile	2009-10-12 13:39:24 UTC (rev 59234)
@@ -6,6 +6,7 @@
 
 name            dbus
 version         1.2.14
+revision        1
 maintainers     mcalhoun openmaintainer
 categories      devel
 platforms       darwin
@@ -57,8 +58,8 @@
             ${worksrcpath}/bus/org.freedesktop.dbus-session.plist.in
     }
     
-    if { ${os.major} >= 9 } {
-        # Allow OnDemand for Leopard and above.
+    if { ${os.major} == 9 } {
+        # Allow OnDemand for Leopard.
         reinplace {s|<false />|<true />|} \
             ${worksrcpath}/bus/org.freedesktop.dbus-session.plist.in
     }

Modified: trunk/dports/devel/dbus/files/patch-launchd-integration.diff
===================================================================
--- trunk/dports/devel/dbus/files/patch-launchd-integration.diff	2009-10-12 12:54:03 UTC (rev 59233)
+++ trunk/dports/devel/dbus/files/patch-launchd-integration.diff	2009-10-12 13:39:24 UTC (rev 59234)
@@ -423,10 +423,10 @@
 +
 +  _DBUS_ASSERT_ERROR_IS_CLEAR (error);
 +
-+  if (*launchd_socket_path == '\0')
++  if (launchd_socket_path == NULL || *launchd_socket_path == '\0')
 +    {
 +      dbus_set_error (error, DBUS_ERROR_BAD_ADDRESS,
-+                      "launchd's environment variable %s is empty, but should contain a socket path");
++                      "launchd's environment variable %s is empty, but should contain a socket path", launchd_env_var);
 +      return NULL;
 +    }
 +
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091012/04185637/attachment.html>