Presenting GNOME 2.16.1 for FreeBSD. This release represents a massive

amount of work by the FreeBSD GNOME Team and our testers.

On top of the usual GNOME update, we have taken this opportunity to move
GNOME from X11BASE to LOCALBASE.  This means roughly 600 ports NOT part of
the GNOME Desktop also need to be changed.  The bulk of the move was carried
out by ahze, mezz, and pav, but it would not have been possible without
cooperation from the FreeBSD KDE team who worked with us to make sure
GNOME and KDE can still coexist happily.  We would also like to send a
shout out to kris and pointyhat for putting up with multiple test runs
until we got something that was solid.

Back to GNOME 2.16.  This release brings a huge amount of new functionality
to FreeBSD.  The standard release notes can be read at
http://www.gnome.org/start/2.16/ .  But on top of what you will read there,
jylefort and marcus have completed work on a port of HAL to FreeBSD.  This
will allow FreeBSD to take advantage of closer hardware interaction such
as auto-mounting CD-ROMs, USB drives, and music players; auto-playing
audio CDs; and managing laptop power consumption.

But where would this all be without our loyal testers and contributors?
Therefore, the FreeBSD GNOME team would like to thank the following users:

Phillip Neumann <pneumann@gmail.com>
tmclaugh
mux
Yuri Pankov <yuri.pankov@gmail.com>
chinsan
Thomas <freebsdlists@bsdunix.ch>
Brian Gruber <knightbg@yahoo.com>
Franz Klammer <klammer@webonaut.com>
Dominique Goncalves <dominique.goncalves@gmail.com>
Pascal Hofstee <caelian@gmail.com>
Yasuda Keisuke <kysd@po.harenet.ne.jp>
backyard <backyard1454-bsd@yahoo.com>
Andris Raugulis <endrju@null.lv> <endrju@null.lv>
Eric L. Chen <d9364104@mail.nchu.edu.tw>
Pawel Worach <pawel.worach@gmail.com>
QuiRK on #freebsd-gnome
Shane Bell <decept0@gmail.com>
luigi
sajd on #freebsd-gnome
sat
Chris Coleman <chrisc@vmunix.com>
kaeru on #freebsd-gnome
crsd_ via irc.freenode.org/#FreeBSD-GNOME
Joel Diaz <joeldiaz@mac.com>

Enjoy!

Approved by:	portmgr (implicit, kris)

15 files changed, 108 insertions, 504 deletions

diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index 47b86af15f4e..590c3fea87a4 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -6,88 +6,58 @@
 #
 
 PORTNAME=	dbus
-PORTVERSION=	0.62
-PORTREVISION?=	1
-CATEGORIES?=	devel gnome
+PORTVERSION?=	0.93
+PORTREVISION?=	2
+CATEGORIES=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/
 
-MAINTAINER?=	gnome@FreeBSD.org
-COMMENT?=	A message bus system for inter-application communication
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	A message bus system for inter-application communication
 
-LIB_DEPENDS?=	expat.6:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
-USE_GNOME?=	gnomehack glib20 libxml2
+USE_GNOME=	gnomehack gnometarget libxml2
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS?=--disable-gtk \
-		--disable-python \
-		--disable-gcj \
-		--disable-qt \
-		--disable-mono \
-		--disable-mono-docs \
-		--localstatedir=/var \
+USE_LDCONFIG=	yes
+CONFIGURE_ARGS=--localstatedir=/var \
+	        --with-test-socket-dir=${WRKDIR} \
 		--with-system-pid-file=/var/run/dbus/dbus.pid \
 		--with-system-socket=/var/run/dbus/dbus.pipe \
 		--with-session-socket-dir=/var/tmp \
 		--disable-doxygen-docs \
 		--disable-xml-docs
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
 .if !defined(DBUS_SLAVE)
 USE_RC_SUBR=	dbus
-OPTIONS=	QT "Enable Qt client support" off
 
 PLIST_SUB=	VERSION="1.0"
 
 MAN1=		dbus-cleanup-sockets.1 dbus-daemon.1 dbus-launch.1 \
 		dbus-monitor.1 dbus-send.1
+
+.if !defined(WITHOUT_X11)
+USE_XLIB=	yes
+.endif
 .endif
 
 .include <bsd.port.pre.mk>
 
-.if !defined(DBUS_SLAVE)
-.if defined(WITH_QT) && !defined(WITHOUT_QT)
-CONFIGURE_ARGS+=--enable-qt3
-CONFIGURE_ENV+=	QTDIR=${X11BASE}
-LIB_DEPENDS+=	qt-mt:${PORTSDIR}/x11-toolkits/qt33
-PLIST_SUB+=	QT=""
-.else
-PLIST_SUB+=	QT="@comment "
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|' \
 		${WRKSRC}/bus/session.conf.in \
 		${WRKSRC}/bus/system.conf.in
 
 .if !defined(DBUS_SLAVE)
-pre-su-install:
-	@for i in 15 9 ; do \
-		if [ -f /var/run/dbus/dbus.pid ]; then \
-			kill -$${i} $$(${CAT} /var/run/dbus/dbus.pid) 2>/dev/null || ${TRUE} ; \
-			sleep 3 ; \
-		fi ; \
-	done
-	@if [ -f /var/run/dbus/dbus.pid ]; then \
-		${RM} -f /var/run/dbus/dbus.pid ; \
-	fi
-.endif
-
 post-install:
 .if !defined(PACKAGE_BUILDING)
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
 	${MKDIR} ${X11BASE}/etc/dbus-1/system.d
 	${MKDIR} ${X11BASE}/share/dbus-1/services
-.else
-.if defined(PKGNAMEPREFIX)
-.if ${PKGNAMEPREFIX}==${PYTHON_PKGNAMEPREFIX} && ${OSVERSION} < 500000
-# Ignore for py-dbus
-IGNORE=	does not build on 4.X
-.endif
-.endif
 
 .endif
 
diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo
index 363c5a579806..6f41a76bd3bf 100644
--- a/devel/dbus/distinfo
+++ b/devel/dbus/distinfo
@@ -1,3 +1,3 @@
-MD5 (dbus-0.62.tar.gz) = ba7692f63d0e9f1ef06703dff56cb650
-SHA256 (dbus-0.62.tar.gz) = 884cc2083add655df57acc7bb144c61e9beeabf08ef76fa86929a58d7bc96707
-SIZE (dbus-0.62.tar.gz) = 1737361
+MD5 (dbus-0.93.tar.gz) = 0770dce874c76f7364d055e4648900fb
+SHA256 (dbus-0.93.tar.gz) = bdb6a229bc87944e46b656d6e568f9bf9e8fedcb0e1ca53f48f3ed333915168b
+SIZE (dbus-0.93.tar.gz) = 1340600
diff --git a/devel/dbus/files/patch-bus_dir-watch.c b/devel/dbus/files/patch-bus_dir-watch.c
deleted file mode 100644
index c848f1fd9746..000000000000
--- a/devel/dbus/files/patch-bus_dir-watch.c
+++ /dev/null
@@ -1,178 +0,0 @@
---- bus/dir-watch.c.orig	Tue Jun 14 22:31:38 2005
-+++ bus/dir-watch.c	Tue May  2 12:52:08 2006
-@@ -28,17 +28,25 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <fcntl.h>
-+#elif defined(DBUS_BUS_ENABLE_KQUEUE_ON_FREEBSD)
-+#include <sys/types.h>
-+#include <sys/event.h>
-+#include <sys/time.h>
-+#include <signal.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+#include "bus.h"
-+#include <dbus/dbus-watch.h>
- #endif /* DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX */
- 
- #include <dbus/dbus-internals.h>
- #include "dir-watch.h"
- 
-+#define MAX_DIRS_TO_WATCH 128
- 
- /* D_NOTIFY is available on Linux 2.4 or greater - the actual SIGIO signal is handled in main.c:signal_handler() */
- #ifdef DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX 
- 
--#define MAX_DIRS_TO_WATCH 128
--
- /* use a static array to avoid handling OOM */
- static int fds[MAX_DIRS_TO_WATCH];
- static int num_fds = 0;
-@@ -92,6 +100,147 @@ bus_drop_all_directory_watches (void)
- 	}
-     }
-   
-+  num_fds = 0;
-+}
-+
-+#elif defined(DBUS_BUS_ENABLE_KQUEUE_ON_FREEBSD)
-+
-+static int kq = -1;
-+static int fds[MAX_DIRS_TO_WATCH];
-+static int num_fds = 0;
-+static DBusWatch *watch = NULL;
-+static DBusLoop *loop = NULL;
-+
-+static dbus_bool_t
-+_kqueue_watch_callback (DBusWatch *watch, unsigned int condition, void *data)
-+{
-+  return dbus_watch_handle (watch, condition);
-+}
-+
-+static dbus_bool_t
-+_handle_kqueue_watch (DBusWatch *watch, unsigned int flags, void *data)
-+{
-+  struct kevent ev;
-+  struct timespec nullts = { 0, 0 };
-+  int res;
-+  pid_t pid;
-+
-+  res = kevent (kq, NULL, 0, &ev, 1, &nullts);
-+
-+  /* Sleep for half a second to avoid a race when files are install(1)'d
-+   * to system.d. */
-+  usleep(500000);
-+
-+  if (res > 0)
-+    {
-+      pid = getpid ();
-+      _dbus_verbose ("Sending SIGHUP signal on reception of a kevent\n");
-+      (void) kill (pid, SIGHUP);
-+    }
-+  else if (res < 0 && errno == EBADF)
-+    {
-+      kq = -1;
-+      if (watch != NULL)
-+	{
-+	  _dbus_loop_remove_watch (loop, watch, _kqueue_watch_callback, NULL);
-+          _dbus_watch_unref (watch);
-+	  watch = NULL;
-+	}
-+      pid = getpid ();
-+      _dbus_verbose ("Sending SIGHUP signal since kqueue has been closed\n");
-+      (void) kill (pid, SIGHUP);
-+    }
-+
-+  return TRUE;
-+}
-+
-+void
-+bus_watch_directory (const char *dir, void *userdata)
-+{
-+  int fd;
-+  struct kevent ev;
-+
-+  _dbus_assert (dir != NULL);
-+
-+  if (kq < 0)
-+    {
-+
-+      kq = kqueue ();
-+      if (kq < 0)
-+        {
-+          _dbus_warn ("Cannot create kqueue; error '%s'\n", _dbus_strerror (errno));
-+	  goto out;
-+	}
-+
-+        loop = userdata;
-+
-+        watch = _dbus_watch_new (kq, DBUS_WATCH_READABLE, TRUE,
-+                                 _handle_kqueue_watch, NULL, NULL);
-+
-+	if (watch == NULL)
-+          {
-+            _dbus_warn ("Unable to create kqueue watch\n");
-+	    close (kq);
-+	    kq = -1;
-+	    goto out;
-+	  }
-+
-+	if (!_dbus_loop_add_watch (loop, watch, _kqueue_watch_callback,
-+                                   NULL, NULL))
-+          {
-+            _dbus_warn ("Unable to add reload watch to main loop");
-+	    close (kq);
-+	    kq = -1;
-+	    _dbus_watch_unref (watch);
-+	    watch = NULL;
-+            goto out;
-+	  }
-+    }
-+
-+  if (num_fds >= MAX_DIRS_TO_WATCH )
-+    {
-+      _dbus_warn ("Cannot watch config directory '%s'. Already watching %d directories\n", dir, MAX_DIRS_TO_WATCH);
-+      goto out;
-+    }
-+
-+  fd = open (dir, O_RDONLY);
-+  if (fd < 0)
-+    {
-+      _dbus_warn ("Cannot open directory '%s'; error '%s'\n", dir, _dbus_strerror (errno));
-+      goto out;
-+    }
-+
-+  EV_SET (&ev, fd, EVFILT_VNODE, EV_ADD | EV_ENABLE | EV_CLEAR,
-+          NOTE_DELETE | NOTE_EXTEND | NOTE_WRITE | NOTE_RENAME, 0, 0);
-+  if (kevent (kq, &ev, 1, NULL, 0, NULL) == -1)
-+    {
-+      _dbus_warn ("Cannot setup a kevent for '%s'; error '%s'\n", dir, _dbus_strerror (errno));
-+      close (fd);
-+      goto out;
-+    }
-+
-+  fds[num_fds++] = fd;
-+  _dbus_verbose ("Added kqueue watch on config directory '%s'\n", dir);
-+
-+ out:
-+  ;
-+}
-+
-+void
-+bus_drop_all_directory_watches (void)
-+{
-+  int i;
-+
-+  _dbus_verbose ("Dropping all watches on config directories\n");
-+
-+  for (i = 0; i < num_fds; i++)
-+    {
-+      if (close (fds[i]) != 0)
-+        {
-+          _dbus_verbose ("Error closing fd %d for config directory watch\n", fds[i]);
-+	}
-+    }
-+
-   num_fds = 0;
- }
- 
diff --git a/devel/dbus/files/patch-config.h.in b/devel/dbus/files/patch-config.h.in
deleted file mode 100644
index 479d32470af5..000000000000
--- a/devel/dbus/files/patch-config.h.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- config.h.in.orig	Fri Jul  1 00:48:36 2005
-+++ config.h.in	Fri Jul  1 00:48:56 2005
-@@ -9,6 +9,9 @@
- /* Use dnotify on Linux */
- #undef DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX
- 
-+/* Use kqueue on FreeBSD */
-+#undef DBUS_BUS_ENABLE_KQUEUE_ON_FREEBSD
-+
- /* Disable assertion checking */
- #undef DBUS_DISABLE_ASSERT
- 
diff --git a/devel/dbus/files/patch-configure b/devel/dbus/files/patch-configure
index 13e08d566774..0f19547d7d66 100644
--- a/devel/dbus/files/patch-configure
+++ b/devel/dbus/files/patch-configure
@@ -1,51 +1,28 @@
---- configure.orig	Wed Jun 14 00:57:48 2006
-+++ configure	Wed Jun 14 00:58:20 2006
-@@ -1057,6 +1057,7 @@ Optional Features:
-   --enable-python         build python bindings
-   --enable-selinux        build with SELinux support
-   --enable-dnotify        build with dnotify support (linux only)
-+  --enable-kqueue         build with kqueue support (FreeBSD only)
-   --enable-console-owner-file
-                           enable console owner file
-   --enable-shared[=PKGS]
-@@ -4550,7 +4551,7 @@ if test "x$GCC" = "xyes"; then
+--- configure.orig	Sun Oct  8 02:48:06 2006
++++ configure	Sun Oct  8 02:50:34 2006
+@@ -463,7 +463,7 @@ ac_includes_default="\
+ # include <unistd.h>
+ #endif"
  
-   case " $CFLAGS " in
-   *[\ \	]-Wfloat-equal[\ \	]*) ;;
--  *) CFLAGS="$CFLAGS -Wfloat-equal" ;;
-+  *) CFLAGS="$CFLAGS" ;;
-   esac
+-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_files=''
  
-   case " $CFLAGS " in
-@@ -28332,6 +28333,31 @@ if test x$have_dnotify = xyes; then
+ # Initialize some variables set by options.
+@@ -25187,7 +25187,7 @@ DBUS_CLIENT_LIBS=
  
- cat >>confdefs.h <<\_ACEOF
- #define DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX 1
-+_ACEOF
-+
-+fi
-+
-+# kqueue checks
-+case "${target_os}" in
-+    freebsd*)
-+    	# Check whether --enable-kqueue or --disable-kqueue was given.
-+    if test "${enable_kqueue+set}" = set; then
-+        enableval="$enable_kqueue"
-+        enable_kqueue=$enableval
-+    else
-+        enable_kqueue=auto
-+    fi;
-+    if test x$enable_kqueue = xno ; then
-+	have_kqueue=no;
-+    else
-+	have_kqueue=yes;
-+    fi
-+;;
-+esac
-+if test x$have_kqueue = xyes; then
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define DBUS_BUS_ENABLE_KQUEUE_ON_FREEBSD 1
- _ACEOF
  
- fi
+ DBUS_BUS_CFLAGS=$XML_CFLAGS
+-DBUS_BUS_LIBS="$XML_LIBS $SELINUX_LIBS $INTLLIBS"
++DBUS_BUS_LIBS="$XML_LIBS $SELINUX_LIBS $INTLLIBS $PTHREAD_LIBS"
+ 
+ 
+ 
+@@ -27929,6 +27929,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
++s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t
+ s,@DOXYGEN@,$DOXYGEN,;t t
+ s,@DBUS_DOXYGEN_DOCS_ENABLED_TRUE@,$DBUS_DOXYGEN_DOCS_ENABLED_TRUE,;t t
+ s,@DBUS_DOXYGEN_DOCS_ENABLED_FALSE@,$DBUS_DOXYGEN_DOCS_ENABLED_FALSE,;t t
diff --git a/devel/dbus/files/patch-dbus-1.pc.in b/devel/dbus/files/patch-dbus-1.pc.in
index 1b96c24f5857..b9c5fdcc2333 100644
--- a/devel/dbus/files/patch-dbus-1.pc.in
+++ b/devel/dbus/files/patch-dbus-1.pc.in
@@ -1,9 +1,11 @@
---- dbus-1.pc.in.orig	Tue Jun 22 14:50:57 2004
-+++ dbus-1.pc.in	Tue Jun 22 14:54:24 2004
-@@ -7,5 +7,5 @@
+--- ./dbus-1.pc.in.orig	Thu Mar 16 22:20:14 2006
++++ ./dbus-1.pc.in	Sun Oct  8 02:02:33 2006
+@@ -9,6 +9,6 @@ session_bus_services_dir=@EXPANDED_DATAD
+ Name: dbus
  Description: Free desktop message bus
  Version: @VERSION@
- Libs: -L${libdir} -ldbus-1
+-Libs: -L${libdir} -ldbus-1
 -Cflags: -I${includedir}/dbus-1.0 -I${libdir}/dbus-1.0/include
++Libs: -L${libdir} -ldbus-1 @PTHREAD_LIBS@
 +Cflags: -I${includedir}/dbus-1.0 -I${includedir}/dbus-1.0/include
  
diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c
index d7182118603b..42a7509663bc 100644
--- a/devel/dbus/files/patch-dbus_dbus-sysdeps.c
+++ b/devel/dbus/files/patch-dbus_dbus-sysdeps-unix.c
@@ -1,6 +1,6 @@
---- dbus/dbus-sysdeps.c.orig	Tue Nov 22 15:37:00 2005
-+++ dbus/dbus-sysdeps.c	Sat Dec 31 13:08:04 2005
-@@ -781,16 +781,16 @@ write_credentials_byte (int             
+--- dbus/dbus-sysdeps-unix.c.orig	Thu Sep 14 01:07:11 2006
++++ dbus/dbus-sysdeps-unix.c	Sat Oct  7 12:23:40 2006
+@@ -719,16 +719,16 @@ write_credentials_byte (int             
  {
    int bytes_written;
    char buf[1] = { '\0' };
@@ -21,7 +21,7 @@
    iov.iov_base = buf;
    iov.iov_len = 1;
  
-@@ -798,10 +798,10 @@ write_credentials_byte (int             
+@@ -736,10 +736,10 @@ write_credentials_byte (int             
    msg.msg_iov = &iov;
    msg.msg_iovlen = 1;
  
@@ -35,7 +35,7 @@
    cmsg.hdr.cmsg_level = SOL_SOCKET;
    cmsg.hdr.cmsg_type = SCM_CREDS;
  #endif
-@@ -810,7 +810,7 @@ write_credentials_byte (int             
+@@ -748,7 +748,7 @@ write_credentials_byte (int             
    
   again:
  
@@ -44,7 +44,7 @@
    bytes_written = sendmsg (server_fd, &msg, 0);
  #else
    bytes_written = write (server_fd, buf, 1);
-@@ -868,9 +868,10 @@ _dbus_read_credentials_unix_socket  (int
+@@ -806,9 +806,10 @@ _dbus_read_credentials_unix_socket  (int
    char buf;
  
  #ifdef HAVE_CMSGCRED 
@@ -55,20 +55,11 @@
 -	  struct cmsgcred cred;
 +	  char cred[CMSG_SPACE (sizeof (struct cmsgcred))];
    } cmsg;
- #endif
- 
-@@ -886,7 +887,7 @@ _dbus_read_credentials_unix_socket  (int
- 
-   _dbus_credentials_clear (credentials);
  
--#if defined(LOCAL_CREDS) && defined(HAVE_CMSGCRED)
-+#if defined(LOCAL_CREDS) && !defined(HAVE_CMSGCRED)
-   /* Set the socket to receive credentials on the next message */
-   {
-     int on = 1;
-@@ -907,8 +908,8 @@ _dbus_read_credentials_unix_socket  (int
+ #elif defined(LOCAL_CREDS)
+@@ -845,8 +846,8 @@ _dbus_read_credentials_unix_socket  (int
  
- #ifdef HAVE_CMSGCRED
+ #if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
    memset (&cmsg, 0, sizeof (cmsg));
 -  msg.msg_control = &cmsg;
 -  msg.msg_controllen = sizeof (cmsg);
@@ -77,17 +68,17 @@
  #endif
  
   again:
-@@ -931,7 +932,8 @@ _dbus_read_credentials_unix_socket  (int
+@@ -869,7 +870,8 @@ _dbus_read_credentials_unix_socket  (int
      }
  
- #ifdef HAVE_CMSGCRED
+ #if defined(HAVE_CMSGCRED) || defined(LOCAL_CREDS)
 -  if (cmsg.hdr.cmsg_len < sizeof (cmsg) || cmsg.hdr.cmsg_type != SCM_CREDS)
 +  if (cmsg.hdr.cmsg_len < CMSG_LEN (sizeof (struct cmsgcred))
 +		  || cmsg.hdr.cmsg_type != SCM_CREDS)
      {
        dbus_set_error (error, DBUS_ERROR_FAILED,
                        "Message from recvmsg() was not SCM_CREDS");
-@@ -959,9 +961,10 @@ _dbus_read_credentials_unix_socket  (int
+@@ -897,9 +899,10 @@ _dbus_read_credentials_unix_socket  (int
  		       cr_len, (int) sizeof (cr), _dbus_strerror (errno));
        }
  #elif defined(HAVE_CMSGCRED)
@@ -98,6 +89,6 @@
 +    credentials->pid = cred->cmcred_pid;
 +    credentials->uid = cred->cmcred_euid;
 +    credentials->gid = cred->cmcred_groups[0];
- #elif defined(HAVE_GETPEEREID)
-     uid_t euid;
-     gid_t egid;
+ #elif defined(LOCAL_CREDS)
+     credentials->pid = DBUS_PID_UNSET;
+     credentials->uid = cmsg.cred.sc_uid;
diff --git a/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c b/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
new file mode 100644
index 000000000000..28701094bd8b
--- /dev/null
+++ b/devel/dbus/files/patch-dbus_dbus-sysdeps-util-unix.c
@@ -0,0 +1,11 @@
+--- dbus/dbus-sysdeps-util-unix.c.orig	Sat Oct  7 12:33:47 2006
++++ dbus/dbus-sysdeps-util-unix.c	Sat Oct  7 12:34:13 2006
+@@ -502,7 +502,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-mono_Makefile.in b/devel/dbus/files/patch-mono_Makefile.in
deleted file mode 100644
index 7f1d7026cf22..000000000000
--- a/devel/dbus/files/patch-mono_Makefile.in
+++ /dev/null
@@ -1,108 +0,0 @@
---- mono/Makefile.in.orig	Thu Jun 30 23:27:19 2005
-+++ mono/Makefile.in	Thu Jun 30 23:27:43 2005
-@@ -299,7 +299,7 @@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
--SUBDIRS = . doc example
-+SUBDIRS = . example
- TARGET = $(ASSEMBLY)
- NOINST_EXES = test-dbus-sharp.exe
- ASSEMBLY_NAME = dbus-sharp
-@@ -345,6 +345,10 @@
- 	$(ASSEMBLY).config.in   \
- 	dbus-sharp.snk
- 
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
-+pkgconfigDATA_INSTALL = $(INSTALL_DATA)
-+pkgconfig_DATA = ../dbus-sharp.pc
-+
- all: all-recursive
- 
- .SUFFIXES:
-@@ -391,6 +395,23 @@
- distclean-libtool:
- 	-rm -f libtool
- uninstall-info-am:
-+install-pkgconfigDATA: $(pkgconfig_DATA)
-+	@$(NORMAL_INSTALL)
-+	test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
-+	@list='$(pkgconfig_DATA)'; for p in $$list; do \
-+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-+	  echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
-+	 $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
-+	done
-+
-+uninstall-pkgconfigDATA:
-+	@$(NORMAL_UNINSTALL)
-+	@list='$(pkgconfig_DATA)'; for p in $$list; do \
-+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
-+	  echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
-+	  rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
-+	done
- 
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
-@@ -569,7 +590,7 @@
- 	done
- check-am: all-am
- check: check-recursive
--all-am: Makefile
-+all-am: Makefile $(pkgconfig_DATA)
- installdirs: installdirs-recursive
- installdirs-am:
- install: install-recursive
-@@ -614,7 +635,7 @@
- 
- info-am:
- 
--install-data-am: install-data-local
-+install-data-am: install-data-local install-pkgconfigDATA
- 
- install-exec-am:
- 
-@@ -640,7 +661,7 @@
- 
- ps-am:
- 
--uninstall-am: uninstall-info-am uninstall-local
-+uninstall-am: uninstall-info-am uninstall-local uninstall-pkgconfigDATA
- 
- uninstall-info: uninstall-info-recursive
- 
-@@ -651,12 +672,13 @@
- 	html-am info info-am install install-am install-data \
- 	install-data-am install-data-local install-exec \
- 	install-exec-am install-info install-info-am install-man \
--	install-strip installcheck installcheck-am installdirs \
-+	install-pkgconfigDATA install-strip installcheck \
-+	installcheck-am installdirs \
- 	installdirs-am maintainer-clean maintainer-clean-generic \
- 	maintainer-clean-recursive mostlyclean mostlyclean-generic \
- 	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
- 	tags tags-recursive uninstall uninstall-am uninstall-info-am \
--	uninstall-local
-+	uninstall-pkgconfigDATA uninstall-local
- 
- 
- all-am: $(TARGET)
-@@ -672,14 +694,14 @@
- 
- install-data-local:
- 	@if test -n '$(TARGET)'; then                       \
--	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package dbus-sharp /gacdir $(DESTDIR)$(libdir)";    \
--	  $(GACUTIL) /i $(ASSEMBLY) /f /package dbus-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir) || exit 1; \
-+	  echo "$(GACUTIL) /i $(ASSEMBLY) /f /package dbus-sharp /gacdir $(DESTDIR)$(libdir) /root $(DESTDIR)$(libdir)";    \
-+	  $(GACUTIL) /i $(ASSEMBLY) /f /package dbus-sharp /gacdir $(DESTDIR)$(libdir) /root $(DESTDIR)$(libdir) || exit 1; \
- 	fi
- 
- uninstall-local:
- 	@if test -n '$(TARGET)'; then                       \
--	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package dbus-sharp /gacdir $(DESTDIR)$(libdir)";  \
--	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package dbus-sharp /gacdir $(libdir) /root $(DESTDIR)$(libdir) || exit 1;   \
-+	  echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package dbus-sharp /gacdir $(DESTDIR)$(libdir) /root $(DESTDIR)$(libdir)";  \
-+	  $(GACUTIL) /u $(ASSEMBLY_NAME) /package dbus-sharp /gacdir $(DESTDIR)$(libdir) /root $(DESTDIR)$(libdir)|| exit 1;   \
- 	fi
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/devel/dbus/files/patch-mono_dbus-sharp.dll.config.in b/devel/dbus/files/patch-mono_dbus-sharp.dll.config.in
deleted file mode 100644
index b7c0032aad1f..000000000000
--- a/devel/dbus/files/patch-mono_dbus-sharp.dll.config.in
+++ /dev/null
@@ -1,9 +0,0 @@
---- mono/dbus-sharp.dll.config.in.orig	Sat Mar 12 20:56:29 2005
-+++ mono/dbus-sharp.dll.config.in	Wed Apr 13 21:19:06 2005
-@@ -1,4 +1,4 @@
- <configuration>
--  <dllmap dll="dbus-1" target="libdbus-1@LIB_PREFIX@.@LT_CURRENT@@LIB_SUFFIX@"/>
--  <dllmap dll="dbus-glib-1" target="libdbus-glib-1@LIB_PREFIX@.@LT_CURRENT@@LIB_SUFFIX@"/>
-+  <dllmap dll="dbus-1" target="libdbus-1@LIB_PREFIX@@LIB_SUFFIX@"/>
-+  <dllmap dll="dbus-glib-1" target="libdbus-glib-1@LIB_PREFIX@@LIB_SUFFIX@"/>
- </configuration>
diff --git a/devel/dbus/files/patch-python_Makefile.in b/devel/dbus/files/patch-python_Makefile.in
deleted file mode 100644
index 98f8f61041f8..000000000000
--- a/devel/dbus/files/patch-python_Makefile.in
+++ /dev/null
@@ -1,31 +0,0 @@
---- python/Makefile.in.orig	Sat Jul 16 13:21:22 2005
-+++ python/Makefile.in	Sat Jul 16 13:22:22 2005
-@@ -60,12 +60,12 @@
- 	"$(DESTDIR)$(dbusdir)"
- dbusbindingsLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(dbusbindings_LTLIBRARIES)
--dbus_bindings_la_DEPENDENCIES = $(top_builddir)/dbus/libdbus-1.la
-+dbus_bindings_la_DEPENDENCIES = -ldbus-1
- nodist_dbus_bindings_la_OBJECTS = dbus_bindings.lo
- dbus_bindings_la_OBJECTS = $(nodist_dbus_bindings_la_OBJECTS)
- dbus_glib_bindings_la_DEPENDENCIES =  \
--	$(top_builddir)/dbus/libdbus-1.la \
--	$(top_builddir)/glib/libdbus-glib-1.la
-+	-ldbus-1 \
-+	-ldbus-glib-1
- nodist_dbus_glib_bindings_la_OBJECTS =  \
- 	dbus_glib_bindings_la-dbus_glib_bindings.lo
- dbus_glib_bindings_la_OBJECTS =  \
-@@ -345,10 +345,10 @@
- dbusbindingsdir = $(pyexecdir)/dbus
- dbusbindings_LTLIBRARIES = dbus_bindings.la dbus_glib_bindings.la
- dbus_bindings_la_LDFLAGS = -module -avoid-version -fPIC -export-symbols-regex initdbus_bindings
--dbus_bindings_la_LIBADD = $(top_builddir)/dbus/libdbus-1.la
-+dbus_bindings_la_LIBADD = -ldbus-1
- nodist_dbus_bindings_la_SOURCES = dbus_bindings.c
- dbus_glib_bindings_la_LDFLAGS = -module -avoid-version -fPIC -export-symbols-regex initdbus_glib_bindings 
--dbus_glib_bindings_la_LIBADD = $(top_builddir)/dbus/libdbus-1.la $(top_builddir)/glib/libdbus-glib-1.la
-+dbus_glib_bindings_la_LIBADD = -ldbus-1 -ldbus-glib-1
- dbus_glib_bindings_la_CFLAGS = $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS)
- nodist_dbus_glib_bindings_la_SOURCES = dbus_glib_bindings.c
- EXTRA_DIST = \
diff --git a/devel/dbus/files/patch-python_dbus_h_wrapper.h b/devel/dbus/files/patch-python_dbus_h_wrapper.h
deleted file mode 100644
index b8c6cd9fd747..000000000000
--- a/devel/dbus/files/patch-python_dbus_h_wrapper.h
+++ /dev/null
@@ -1,7 +0,0 @@
---- python/dbus_h_wrapper.h.orig	Sat Jul 16 03:30:40 2005
-+++ python/dbus_h_wrapper.h	Sat Jul 16 03:28:47 2005
-@@ -1,3 +1,4 @@
- #define DBUS_API_SUBJECT_TO_CHANGE 1
-+#define lint 1
- #include <dbus/dbus.h>
- 
diff --git a/devel/dbus/files/patch-tools_Makefile.in b/devel/dbus/files/patch-tools_Makefile.in
new file mode 100644
index 000000000000..41a417ecfc30
--- /dev/null
+++ b/devel/dbus/files/patch-tools_Makefile.in
@@ -0,0 +1,32 @@
+--- 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_
+ DBUS_XML_DOCS_ENABLED_TRUE = @DBUS_XML_DOCS_ENABLED_TRUE@
+ DBUS_X_CFLAGS = @DBUS_X_CFLAGS@
+ DBUS_X_LIBS = @DBUS_X_LIBS@
++PTHREAD_LIBS = @PTHREAD_LIBS@
+ 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
+ 
+-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_monitor_LDADD = $(top_builddir)/dbus/libdbus-1.la $(PTHREAD_LIBS)
++dbus_launch_LDADD = $(DBUS_X_LIBS) $(PTHREAD_LIBS)
+ man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1 dbus-cleanup-sockets.1
+ EXTRA_DIST = $(man_MANS) run-with-tmp-session-bus.sh
+ CLEANFILES = \
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
deleted file mode 100644
index 064503a1aaa0..000000000000
--- a/devel/dbus/files/patch-tools_run-with-tmp-session-bus.sh
+++ /dev/null
@@ -1,15 +0,0 @@
---- tools/run-with-tmp-session-bus.sh.orig	Fri Mar 18 02:48:29 2005
-+++ tools/run-with-tmp-session-bus.sh	Tue Apr  4 20:40:12 2006
-@@ -1,10 +1,10 @@
--#! /bin/bash
-+#! /bin/sh
- 
- SCRIPTNAME=$0
- WRAPPED_SCRIPT=$1
- shift
- 
--function die() 
-+die() 
- {
-     if ! test -z "$DBUS_SESSION_BUS_PID" ; then
-         echo "killing message bus "$DBUS_SESSION_BUS_PID >&2
diff --git a/devel/dbus/pkg-plist b/devel/dbus/pkg-plist
index b165f80b1f2b..e1703343c567 100644
--- a/devel/dbus/pkg-plist
+++ b/devel/dbus/pkg-plist
@@ -1,4 +1,3 @@
-bin/dbus-binding-tool
 bin/dbus-cleanup-sockets
 bin/dbus-daemon
 bin/dbus-launch
@@ -6,45 +5,27 @@ bin/dbus-monitor
 bin/dbus-send
 etc/dbus-1/session.conf
 etc/dbus-1/system.conf
-%%QT%%include/dbus-%%VERSION%%/dbus/connection.h
 include/dbus-%%VERSION%%/dbus/dbus-address.h
 include/dbus-%%VERSION%%/dbus/dbus-bus.h
 include/dbus-%%VERSION%%/dbus/dbus-connection.h
 include/dbus-%%VERSION%%/dbus/dbus-errors.h
-include/dbus-%%VERSION%%/dbus/dbus-glib-bindings.h
-include/dbus-%%VERSION%%/dbus/dbus-glib-error-enum.h
-include/dbus-%%VERSION%%/dbus/dbus-glib-lowlevel.h
-include/dbus-%%VERSION%%/dbus/dbus-glib.h
-include/dbus-%%VERSION%%/dbus/dbus-gtype-specialized.h
 include/dbus-%%VERSION%%/dbus/dbus-macros.h
 include/dbus-%%VERSION%%/dbus/dbus-memory.h
 include/dbus-%%VERSION%%/dbus/dbus-message.h
 include/dbus-%%VERSION%%/dbus/dbus-pending-call.h
 include/dbus-%%VERSION%%/dbus/dbus-protocol.h
-%%QT%%include/dbus-%%VERSION%%/dbus/dbus-qt.h
 include/dbus-%%VERSION%%/dbus/dbus-server.h
 include/dbus-%%VERSION%%/dbus/dbus-shared.h
 include/dbus-%%VERSION%%/dbus/dbus-signature.h
 include/dbus-%%VERSION%%/dbus/dbus-threads.h
 include/dbus-%%VERSION%%/dbus/dbus-types.h
 include/dbus-%%VERSION%%/dbus/dbus.h
-%%QT%%include/dbus-%%VERSION%%/dbus/message.h
-%%QT%%include/dbus-%%VERSION%%/dbus/server.h
 include/dbus-%%VERSION%%/include/dbus/dbus-arch-deps.h
 lib/libdbus-1.a
 lib/libdbus-1.la
 lib/libdbus-1.so
-lib/libdbus-1.so.2
-lib/libdbus-glib-1.a
-lib/libdbus-glib-1.la
-lib/libdbus-glib-1.so
-lib/libdbus-glib-1.so.2
-%%QT%%lib/libdbus-qt-1.a
-%%QT%%lib/libdbus-qt-1.la
-%%QT%%lib/libdbus-qt-1.so
-%%QT%%lib/libdbus-qt-1.so.1
+lib/libdbus-1.so.3
 libdata/pkgconfig/dbus-1.pc
-libdata/pkgconfig/dbus-glib-1.pc
 @exec mkdir -p %D/etc/dbus-1/system.d
 @exec mkdir -p %%X11BASE%%/etc/dbus-1/system.d
 @exec mkdir -p %D/share/dbus-1/services