5 files changed, 27 insertions, 8 deletions

diff --git a/devel/dbus/files/dbus.in b/devel/dbus/files/dbus.in
index 9717b6a05da9..a9b4ff8085fd 100644
--- a/devel/dbus/files/dbus.in
+++ b/devel/dbus/files/dbus.in
@@ -19,7 +19,7 @@ dbus_flags=${dbus_flags-"--system"}
 name=dbus
 rcvar=`set_rcvar`
 
-command="%%PREFIX%%/bin/dbus-daemon-1"
+command="%%PREFIX%%/bin/dbus-daemon"
 pidfile="/var/run/${name}.pid"
 
 stop_postcmd=stop_postcmd
diff --git a/devel/dbus/files/dbus.sh b/devel/dbus/files/dbus.sh
index 9717b6a05da9..a9b4ff8085fd 100644
--- a/devel/dbus/files/dbus.sh
+++ b/devel/dbus/files/dbus.sh
@@ -19,7 +19,7 @@ dbus_flags=${dbus_flags-"--system"}
 name=dbus
 rcvar=`set_rcvar`
 
-command="%%PREFIX%%/bin/dbus-daemon-1"
+command="%%PREFIX%%/bin/dbus-daemon"
 pidfile="/var/run/${name}.pid"
 
 stop_postcmd=stop_postcmd
diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-util.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-util.c
new file mode 100644
index 000000000000..7d726aef87d4
--- /dev/null
+++ b/devel/dbus/files/patch-dbus_dbus-sysdeps-util.c
@@ -0,0 +1,11 @@
+--- dbus/dbus-sysdeps-util.c.orig	Sat Apr  2 15:29:28 2005
++++ dbus/dbus-sysdeps-util.c	Sat Apr  2 15:29:45 2005
+@@ -142,7 +142,7 @@ _dbus_become_daemon (const DBusString *p
+ 	      return FALSE;
+ 	    }
+ 	  
+-	  if (!_dbus_string_append_int (&pid, _dbus_getpid ()) ||
++	  if (!_dbus_string_append_int (&pid, child_pid) ||
+ 	      !_dbus_string_append (&pid, "\n"))
+ 	    {
+ 	      _dbus_string_free (&pid);
diff --git a/devel/dbus/files/patch-tools_Makefile.in b/devel/dbus/files/patch-tools_Makefile.in
index 8144c8a9888b..c13b0ce17e17 100644
--- a/devel/dbus/files/patch-tools_Makefile.in
+++ b/devel/dbus/files/patch-tools_Makefile.in
@@ -1,11 +1,11 @@
---- tools/Makefile.in.orig	Mon Jan 24 19:22:29 2005
-+++ tools/Makefile.in	Mon Jan 24 19:22:47 2005
-@@ -314,7 +314,7 @@
+--- tools/Makefile.in.orig	Sat Apr  2 14:50:00 2005
++++ tools/Makefile.in	Sat Apr  2 14:50:40 2005
+@@ -335,7 +335,7 @@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
--INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_X_CFLAGS) $(DBUS_GTK_CFLAGS) -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
-+INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_X_CFLAGS) $(DBUS_GTK_CFLAGS) -DDBUS_LOCALEDIR=\"$(prefix)/share/locale\"
+-INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_X_CFLAGS) $(DBUS_GTK_THREADS_CFLAGS) -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
++INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_X_CFLAGS) $(DBUS_GTK_THREADS_CFLAGS) -DDBUS_LOCALEDIR=\"$(prefix)/share/locale\"
  @HAVE_GLIB_FALSE@GLIB_TOOLS = 
  @HAVE_GLIB_TRUE@GLIB_TOOLS = dbus-monitor
- @HAVE_GTK_FALSE@GTK_TOOLS = 
+ @HAVE_GLIB_TRUE@nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h
diff --git a/devel/dbus/files/patch-tools_run-with-tmp-session-bus.sh b/devel/dbus/files/patch-tools_run-with-tmp-session-bus.sh
new file mode 100644
index 000000000000..ab5d6bc38a44
--- /dev/null
+++ b/devel/dbus/files/patch-tools_run-with-tmp-session-bus.sh
@@ -0,0 +1,8 @@
+--- tools/run-with-tmp-session-bus.sh.orig	Sat Apr  2 14:52:51 2005
++++ tools/run-with-tmp-session-bus.sh	Sat Apr  2 14:53:05 2005
+@@ -1,4 +1,4 @@
+-#! /bin/bash
++#! %%LOCALBASE%%/bin/bash
+ 
+ SCRIPTNAME=$0
+ WRAPPED_SCRIPT=$1