[45298] trunk/dports/devel/dbus

[blb at macports.org]

Revision: 45298
          http://trac.macports.org/changeset/45298
Author:   blb at macports.org
Date:     2009-01-13 00:23:16 -0800 (Tue, 13 Jan 2009)
Log Message:
-----------
devel/dbus - patch to make sure dbus always tries to use ${prefix}/share
instead of /usr/local/share, so XDG_DATA_DIRS doesn't have to be set when
launching the startupitem; this works around an issue with startupitems
having an init without start and stop (ticket #17979); otherwise you'll just
get

org.macports.dbus[76132]: sh: /opt/local/etc/startup/dbus.sh: No such file or directory
com.apple.launchd[1] (org.macports.dbus): Throttling respawn: Will start in 10 seconds

in system.log when trying to start system dbus daemon

Modified Paths:
--------------
    trunk/dports/devel/dbus/Portfile
    trunk/dports/devel/dbus/files/patch-dbus-sysdeps-unix.c.diff

Modified: trunk/dports/devel/dbus/Portfile
===================================================================
--- trunk/dports/devel/dbus/Portfile	2009-01-13 06:52:04 UTC (rev 45297)
+++ trunk/dports/devel/dbus/Portfile	2009-01-13 08:23:16 UTC (rev 45298)
@@ -5,7 +5,7 @@
 
 name            dbus
 version         1.2.12
-revision        1
+revision        2
 maintainers     nomaintainer
 categories      devel
 platforms       darwin
@@ -26,6 +26,10 @@
                 patch-launchd-integration-dist.diff \
                 patch-configure-int64.diff
 
+post-patch {
+   reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/dbus/dbus-sysdeps-unix.c
+}
+
 depends_build   port:pkgconfig
 
 depends_lib     port:expat
@@ -79,7 +83,6 @@
 
 startupitem.create  yes
 startupitem.name    dbus
-startupitem.init    XDG_DATA_DIRS=${prefix}/share
 startupitem.executable   ${prefix}/bin/dbus-daemon --system --nofork
 
 pre-activate {

Modified: trunk/dports/devel/dbus/files/patch-dbus-sysdeps-unix.c.diff
===================================================================
--- trunk/dports/devel/dbus/files/patch-dbus-sysdeps-unix.c.diff	2009-01-13 06:52:04 UTC (rev 45297)
+++ trunk/dports/devel/dbus/files/patch-dbus-sysdeps-unix.c.diff	2009-01-13 08:23:16 UTC (rev 45298)
@@ -1,5 +1,5 @@
---- dbus/dbus-sysdeps-unix.c.orig	2008-12-28 12:03:48.000000000 -0500
-+++ dbus/dbus-sysdeps-unix.c	2008-12-28 12:13:00.000000000 -0500
+--- dbus/dbus-sysdeps-unix.c.orig	2009-01-06 15:38:11.000000000 -0700
++++ dbus/dbus-sysdeps-unix.c	2009-01-13 01:12:07.000000000 -0700
 @@ -1591,8 +1591,10 @@
      gid_t *buf;
      int buf_count;
@@ -72,3 +72,21 @@
            }
        }
  
+@@ -3111,7 +3140,7 @@
+     }
+   else
+     {
+-      if (!_dbus_string_append (&servicedir_path, "/usr/local/share:/usr/share:"))
++      if (!_dbus_string_append (&servicedir_path, "@@PREFIX@@/share:/usr/share:"))
+         goto oom;
+     }
+ 
+@@ -3198,7 +3227,7 @@
+     }
+   else
+     {
+-      if (!_dbus_string_append (&servicedir_path, "/usr/local/share:/usr/share:"))
++      if (!_dbus_string_append (&servicedir_path, "@@PREFIX@@/share:/usr/share:"))
+         goto oom;
+     }
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090113/2d4fe4ce/attachment.html>