6 files changed, 31 insertions, 53 deletions

diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index c4b9b5b04ecc..296f744d3077 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -6,19 +6,19 @@
 #
 
 PORTNAME=	dbus
-PORTVERSION?=	0.93
-PORTREVISION?=	3
+PORTVERSION?=	0.94
+PORTREVISION?=	0
 CATEGORIES=	devel gnome
-MASTER_SITES=	http://dbus.freedesktop.org/releases/
+MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A message bus system for inter-application communication
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
-USE_GNOME=	gnomehack gnometarget libxml2
+USE_GNOME=	gnomehack gnometarget libxml2 ltverhack
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=--localstatedir=/var \
 	        --with-test-socket-dir=${WRKDIR} \
@@ -37,7 +37,7 @@ USE_RC_SUBR=	dbus
 PLIST_SUB=	VERSION="1.0"
 
 MAN1=		dbus-cleanup-sockets.1 dbus-daemon.1 dbus-launch.1 \
-		dbus-monitor.1 dbus-send.1
+		dbus-monitor.1 dbus-send.1 dbus-uuidgen.1
 
 .if !defined(WITHOUT_X11)
 USE_XLIB=	yes
diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo
index 6f41a76bd3bf..30279d774b4d 100644
--- a/devel/dbus/distinfo
+++ b/devel/dbus/distinfo
@@ -1,3 +1,3 @@
-MD5 (dbus-0.93.tar.gz) = 0770dce874c76f7364d055e4648900fb
-SHA256 (dbus-0.93.tar.gz) = bdb6a229bc87944e46b656d6e568f9bf9e8fedcb0e1ca53f48f3ed333915168b
-SIZE (dbus-0.93.tar.gz) = 1340600
+MD5 (dbus-0.94.tar.gz) = 85653cafbcfc7edfbad9639459758ed3
+SHA256 (dbus-0.94.tar.gz) = 11b259e2cef5a12db59a13cb8f2625f22ff32bbd368bb615fc22c575a00b6ccb
+SIZE (dbus-0.94.tar.gz) = 1372266
diff --git a/devel/dbus/files/patch-configure b/devel/dbus/files/patch-configure
index 0f19547d7d66..06e076299880 100644
--- a/devel/dbus/files/patch-configure
+++ b/devel/dbus/files/patch-configure
@@ -1,15 +1,15 @@
---- configure.orig	Sun Oct  8 02:48:06 2006
-+++ configure	Sun Oct  8 02:50:34 2006
+--- configure.orig	Sat Oct 28 21:07:14 2006
++++ configure	Sat Oct 28 21:08:23 2006
 @@ -463,7 +463,7 @@ ac_includes_default="\
  # include <unistd.h>
  #endif"
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar GETTEXT_PACKAGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LT_CURRENT LT_REVISION LT_AGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP DBUS_BUILD_TESTS_TRUE DBUS_BUILD_TESTS_FALSE SED LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL DBUS_GCOV_ENABLED_TRUE DBUS_GCOV_ENABLED_FALSE DBUS_INT64_TYPE DBUS_INT64_CONSTANT DBUS_UINT64_CONSTANT DBUS_HAVE_INT64 DBUS_INT32_TYPE DBUS_INT16_TYPE DBUS_PATH_OR_ABSTRACT PKG_CONFIG LIBXML_CFLAGS LIBXML_LIBS DBUS_USE_EXPAT_TRUE DBUS_USE_EXPAT_FALSE DBUS_USE_LIBXML_TRUE DBUS_USE_LIBXML_FALSE HAVE_SELINUX_TRUE HAVE_SELINUX_FALSE DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_TRUE DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_FALSE DBUS_BUS_ENABLE_KQUEUE_TRUE DBUS_BUS_ENABLE_KQUEUE_FALSE HAVE_CONSOLE_OWNER_FILE_TRUE HAVE_CONSOLE_OWNER_FILE_FALSE DBUS_CLIENT_CFLAGS DBUS_CLIENT_LIBS DBUS_BUS_CFLAGS DBUS_BUS_LIBS DBUS_TEST_CFLAGS DBUS_TEST_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS DBUS_X_CFLAGS DBUS_X_LIBS DOXYGEN DBUS_DOXYGEN_DOCS_ENABLED_TRUE DBUS_DOXYGEN_DOCS_ENABLED_FALSE XMLTO DBUS_XML_DOCS_ENABLED_TRUE DBUS_XML_DOCS_ENABLED_FALSE EXPANDED_LOCALSTATEDIR EXPANDED_SYSCONFDIR EXPANDED_BINDIR EXPANDED_LIBDIR EXPANDED_DATADIR DBUS_INIT_SCRIPTS_RED_HAT_TRUE DBUS_INIT_SCRIPTS_RED_HAT_FALSE DBUS_INIT_SCRIPTS_SLACKWARE_TRUE DBUS_INIT_SCRIPTS_SLACKWARE_FALSE DBUS_SYSTEM_SOCKET DBUS_SYSTEM_BUS_DEFAULT_ADDRESS DBUS_SYSTEM_PID_FILE DBUS_CONSOLE_AUTH_DIR DBUS_CONSOLE_OWNER_FILE DBUS_USER DBUS_DAEMONDIR TEST_SERVICE_DIR TEST_SERVICE_BINARY TEST_SHELL_SERVICE_BINARY TEST_EXIT_BINARY TEST_SEGFAULT_BINARY TEST_SLEEP_FOREVER_BINARY TEST_SOCKET_DIR DBUS_SESSION_SOCKET_DIR LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar GETTEXT_PACKAGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LT_CURRENT LT_REVISION LT_AGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP DBUS_BUILD_TESTS_TRUE DBUS_BUILD_TESTS_FALSE SED LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL DBUS_GCOV_ENABLED_TRUE DBUS_GCOV_ENABLED_FALSE DBUS_INT64_TYPE DBUS_INT64_CONSTANT DBUS_UINT64_CONSTANT DBUS_HAVE_INT64 DBUS_INT32_TYPE DBUS_INT16_TYPE DBUS_PATH_OR_ABSTRACT PKG_CONFIG LIBXML_CFLAGS LIBXML_LIBS DBUS_USE_EXPAT_TRUE DBUS_USE_EXPAT_FALSE DBUS_USE_LIBXML_TRUE DBUS_USE_LIBXML_FALSE HAVE_SELINUX_TRUE HAVE_SELINUX_FALSE DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_TRUE DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_FALSE DBUS_BUS_ENABLE_KQUEUE_TRUE DBUS_BUS_ENABLE_KQUEUE_FALSE HAVE_CONSOLE_OWNER_FILE_TRUE HAVE_CONSOLE_OWNER_FILE_FALSE DBUS_CLIENT_CFLAGS DBUS_CLIENT_LIBS DBUS_BUS_CFLAGS DBUS_BUS_LIBS DBUS_TEST_CFLAGS DBUS_TEST_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS DBUS_X_CFLAGS DBUS_X_LIBS DOXYGEN DBUS_DOXYGEN_DOCS_ENABLED_TRUE DBUS_DOXYGEN_DOCS_ENABLED_FALSE XMLTO DBUS_XML_DOCS_ENABLED_TRUE DBUS_XML_DOCS_ENABLED_FALSE EXPANDED_LOCALSTATEDIR EXPANDED_SYSCONFDIR EXPANDED_BINDIR EXPANDED_LIBDIR EXPANDED_DATADIR DBUS_INIT_SCRIPTS_RED_HAT_TRUE DBUS_INIT_SCRIPTS_RED_HAT_FALSE DBUS_INIT_SCRIPTS_SLACKWARE_TRUE DBUS_INIT_SCRIPTS_SLACKWARE_FALSE DBUS_SYSTEM_SOCKET DBUS_SYSTEM_BUS_DEFAULT_ADDRESS DBUS_SYSTEM_PID_FILE DBUS_CONSOLE_AUTH_DIR DBUS_CONSOLE_OWNER_FILE DBUS_USER DBUS_DAEMONDIR TEST_SERVICE_DIR TEST_SERVICE_BINARY TEST_SHELL_SERVICE_BINARY TEST_EXIT_BINARY TEST_SEGFAULT_BINARY TEST_SLEEP_FOREVER_BINARY TEST_SOCKET_DIR DBUS_SESSION_SOCKET_DIR LIBOBJS LTLIBOBJS PTHREAD_LIBS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar GETTEXT_PACKAGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LT_CURRENT LT_REVISION LT_AGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP DBUS_BUILD_TESTS_TRUE DBUS_BUILD_TESTS_FALSE R_DYNAMIC_LDFLAG SED LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL DBUS_GCOV_ENABLED_TRUE DBUS_GCOV_ENABLED_FALSE DBUS_INT64_TYPE DBUS_INT64_CONSTANT DBUS_UINT64_CONSTANT DBUS_HAVE_INT64 DBUS_INT32_TYPE DBUS_INT16_TYPE DBUS_PATH_OR_ABSTRACT PKG_CONFIG LIBXML_CFLAGS LIBXML_LIBS DBUS_USE_EXPAT_TRUE DBUS_USE_EXPAT_FALSE DBUS_USE_LIBXML_TRUE DBUS_USE_LIBXML_FALSE HAVE_SELINUX_TRUE HAVE_SELINUX_FALSE DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_TRUE DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_FALSE DBUS_BUS_ENABLE_KQUEUE_TRUE DBUS_BUS_ENABLE_KQUEUE_FALSE HAVE_CONSOLE_OWNER_FILE_TRUE HAVE_CONSOLE_OWNER_FILE_FALSE DBUS_CLIENT_CFLAGS DBUS_CLIENT_LIBS DBUS_BUS_CFLAGS DBUS_BUS_LIBS DBUS_TEST_CFLAGS DBUS_TEST_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS DBUS_X_CFLAGS DBUS_X_LIBS DOXYGEN DBUS_DOXYGEN_DOCS_ENABLED_TRUE DBUS_DOXYGEN_DOCS_ENABLED_FALSE XMLTO DBUS_XML_DOCS_ENABLED_TRUE DBUS_XML_DOCS_ENABLED_FALSE EXPANDED_LOCALSTATEDIR EXPANDED_SYSCONFDIR EXPANDED_BINDIR EXPANDED_LIBDIR EXPANDED_DATADIR DBUS_INIT_SCRIPTS_RED_HAT_TRUE DBUS_INIT_SCRIPTS_RED_HAT_FALSE DBUS_INIT_SCRIPTS_SLACKWARE_TRUE DBUS_INIT_SCRIPTS_SLACKWARE_FALSE DBUS_SYSTEM_SOCKET DBUS_SYSTEM_BUS_DEFAULT_ADDRESS DBUS_SYSTEM_PID_FILE DBUS_CONSOLE_AUTH_DIR DBUS_CONSOLE_OWNER_FILE DBUS_USER DBUS_DAEMONDIR DBUS_BINDIR TEST_SERVICE_DIR TEST_SERVICE_BINARY TEST_SHELL_SERVICE_BINARY TEST_EXIT_BINARY TEST_SEGFAULT_BINARY TEST_SLEEP_FOREVER_BINARY TEST_SOCKET_DIR DBUS_SESSION_SOCKET_DIR LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar GETTEXT_PACKAGE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LT_CURRENT LT_REVISION LT_AGE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CPP EGREP DBUS_BUILD_TESTS_TRUE DBUS_BUILD_TESTS_FALSE R_DYNAMIC_LDFLAG SED LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL DBUS_GCOV_ENABLED_TRUE DBUS_GCOV_ENABLED_FALSE DBUS_INT64_TYPE DBUS_INT64_CONSTANT DBUS_UINT64_CONSTANT DBUS_HAVE_INT64 DBUS_INT32_TYPE DBUS_INT16_TYPE DBUS_PATH_OR_ABSTRACT PKG_CONFIG LIBXML_CFLAGS LIBXML_LIBS DBUS_USE_EXPAT_TRUE DBUS_USE_EXPAT_FALSE DBUS_USE_LIBXML_TRUE DBUS_USE_LIBXML_FALSE HAVE_SELINUX_TRUE HAVE_SELINUX_FALSE DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_TRUE DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX_FALSE DBUS_BUS_ENABLE_KQUEUE_TRUE DBUS_BUS_ENABLE_KQUEUE_FALSE HAVE_CONSOLE_OWNER_FILE_TRUE HAVE_CONSOLE_OWNER_FILE_FALSE DBUS_CLIENT_CFLAGS DBUS_CLIENT_LIBS DBUS_BUS_CFLAGS DBUS_BUS_LIBS DBUS_TEST_CFLAGS DBUS_TEST_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS DBUS_X_CFLAGS DBUS_X_LIBS DOXYGEN DBUS_DOXYGEN_DOCS_ENABLED_TRUE DBUS_DOXYGEN_DOCS_ENABLED_FALSE XMLTO DBUS_XML_DOCS_ENABLED_TRUE DBUS_XML_DOCS_ENABLED_FALSE EXPANDED_LOCALSTATEDIR EXPANDED_SYSCONFDIR EXPANDED_BINDIR EXPANDED_LIBDIR EXPANDED_DATADIR DBUS_INIT_SCRIPTS_RED_HAT_TRUE DBUS_INIT_SCRIPTS_RED_HAT_FALSE DBUS_INIT_SCRIPTS_SLACKWARE_TRUE DBUS_INIT_SCRIPTS_SLACKWARE_FALSE DBUS_SYSTEM_SOCKET DBUS_SYSTEM_BUS_DEFAULT_ADDRESS DBUS_SYSTEM_PID_FILE DBUS_CONSOLE_AUTH_DIR DBUS_CONSOLE_OWNER_FILE DBUS_USER DBUS_DAEMONDIR DBUS_BINDIR TEST_SERVICE_DIR TEST_SERVICE_BINARY TEST_SHELL_SERVICE_BINARY TEST_EXIT_BINARY TEST_SEGFAULT_BINARY TEST_SLEEP_FOREVER_BINARY TEST_SOCKET_DIR DBUS_SESSION_SOCKET_DIR LIBOBJS LTLIBOBJS PTHREAD_LIBS'
  ac_subst_files=''
  
  # Initialize some variables set by options.
-@@ -25187,7 +25187,7 @@ DBUS_CLIENT_LIBS=
+@@ -25531,7 +25531,7 @@ DBUS_CLIENT_LIBS=
  
  
  DBUS_BUS_CFLAGS=$XML_CFLAGS
@@ -18,7 +18,7 @@
  
  
  
-@@ -27929,6 +27929,7 @@ s,@X_LIBS@,$X_LIBS,;t t
+@@ -28283,6 +28283,7 @@ s,@X_LIBS@,$X_LIBS,;t t
  s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
  s,@DBUS_X_CFLAGS@,$DBUS_X_CFLAGS,;t t
  s,@DBUS_X_LIBS@,$DBUS_X_LIBS,;t t
diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
deleted file mode 100644
index 2372578ee8b9..000000000000
--- a/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- dbus/dbus-sysdeps-util-unix.c.orig	Thu Oct 26 22:02:29 2006
-+++ dbus/dbus-sysdeps-util-unix.c	Thu Oct 26 22:02:52 2006
-@@ -42,6 +42,7 @@
- #include <sys/socket.h>
- #include <dirent.h>
- #include <sys/un.h>
-+#include <limits.h>
- 
- #ifndef O_BINARY
- #define O_BINARY 0
-@@ -502,7 +503,7 @@ static dbus_bool_t
- dirent_buf_size(DIR * dirp, size_t *size)
- {
-  long name_max;
--#   if defined(HAVE_FPATHCONF) && defined(HAVE_DIRFD) \
-+#   if defined(HAVE_FPATHCONF) && ( defined(HAVE_DIRFD) || defined(dirfd) )\
-     && defined(_PC_NAME_MAX)
-      name_max = fpathconf(dirfd(dirp), _PC_NAME_MAX);
-      if (name_max == -1)
diff --git a/devel/dbus/files/patch-tools_Makefile.in b/devel/dbus/files/patch-tools_Makefile.in
index 41a417ecfc30..6d23d4e0f1b4 100644
--- a/devel/dbus/files/patch-tools_Makefile.in
+++ b/devel/dbus/files/patch-tools_Makefile.in
@@ -1,6 +1,6 @@
---- tools/Makefile.in.orig	Sun Oct  8 02:49:22 2006
-+++ tools/Makefile.in	Sun Oct  8 02:51:10 2006
-@@ -150,6 +150,7 @@ DBUS_XML_DOCS_ENABLED_FALSE = @DBUS_XML_
+--- tools/Makefile.in.orig	Sat Oct 28 21:10:56 2006
++++ tools/Makefile.in	Sat Oct 28 21:13:39 2006
+@@ -158,6 +158,7 @@ DBUS_XML_DOCS_ENABLED_FALSE = @DBUS_XML_
  DBUS_XML_DOCS_ENABLED_TRUE = @DBUS_XML_DOCS_ENABLED_TRUE@
  DBUS_X_CFLAGS = @DBUS_X_CFLAGS@
  DBUS_X_LIBS = @DBUS_X_LIBS@
@@ -8,25 +8,21 @@
  DEFS = @DEFS@
  DEPDIR = @DEPDIR@
  DOXYGEN = @DOXYGEN@
-@@ -264,7 +265,7 @@ target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\"
-+INCLUDES = -I$(top_srcdir) $(DBUS_CLIENT_CFLAGS) $(DBUS_X_CFLAGS) -DDBUS_LOCALEDIR=\"$(prefix)/share/locale\" -DDBUS_COMPILATION -DDBUS_DAEMONDIR=\"@DBUS_DAEMONDIR@\"
- dbus_send_SOURCES = \
- 	dbus-print-message.c			\
- 	dbus-print-message.h			\
-@@ -281,9 +282,9 @@ dbus_launch_SOURCES = \
- dbus_cleanup_sockets_SOURCES = \
- 	dbus-cleanup-sockets.c
+@@ -296,13 +297,13 @@ dbus_cleanup_sockets_SOURCES = \
+ dbus_uuidgen_SOURCES = \
+ 	dbus-uuidgen.c
  
 -dbus_send_LDADD = $(top_builddir)/dbus/libdbus-1.la
--dbus_monitor_LDADD = $(top_builddir)/dbus/libdbus-1.la
--dbus_launch_LDADD = $(DBUS_X_LIBS)
 +dbus_send_LDADD = $(top_builddir)/dbus/libdbus-1.la $(PTHREAD_LIBS)
+ dbus_send_LDFLAGS = @R_DYNAMIC_LDFLAG@
+-dbus_monitor_LDADD = $(top_builddir)/dbus/libdbus-1.la
 +dbus_monitor_LDADD = $(top_builddir)/dbus/libdbus-1.la $(PTHREAD_LIBS)
+ dbus_monitor_LDFLAGS = @R_DYNAMIC_LDFLAG@
+-dbus_uuidgen_LDADD = $(top_builddir)/dbus/libdbus-1.la
++dbus_uuidgen_LDADD = $(top_builddir)/dbus/libdbus-1.la $(PTHREAD_LIBS)
+ dbus_uuidgen_LDFLAGS = @R_DYNAMIC_LDFLAG@
+-dbus_launch_LDADD = $(DBUS_X_LIBS)
 +dbus_launch_LDADD = $(DBUS_X_LIBS) $(PTHREAD_LIBS)
- man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1 dbus-cleanup-sockets.1
+ dbus_launch_LDFLAGS = @R_DYNAMIC_LDFLAG@
+ man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1 dbus-cleanup-sockets.1 dbus-uuidgen.1
  EXTRA_DIST = $(man_MANS) run-with-tmp-session-bus.sh
- CLEANFILES = \
diff --git a/devel/dbus/pkg-plist b/devel/dbus/pkg-plist
index e1703343c567..01f88950af93 100644
--- a/devel/dbus/pkg-plist
+++ b/devel/dbus/pkg-plist
@@ -3,6 +3,7 @@ bin/dbus-daemon
 bin/dbus-launch
 bin/dbus-monitor
 bin/dbus-send
+bin/dbus-uuidgen
 etc/dbus-1/session.conf
 etc/dbus-1/system.conf
 include/dbus-%%VERSION%%/dbus/dbus-address.h