5 files changed, 13 insertions, 29 deletions

diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index 8a1cb0649de4..b25cc06b1fd7 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dbus
-PORTVERSION=	0.21
-PORTREVISION?=	2
+PORTVERSION=	0.22
 CATEGORIES?=	devel gnome
 MASTER_SITES=	http://freedesktop.org/Software/dbus/releases/
 
@@ -25,6 +24,7 @@ CONFIGURE_ARGS?=--enable-gtk \
 		--disable-python \
 		--disable-gcj \
 		--disable-mono \
+		--disable-mono-docs \
 		--with-system-pid-file=/var/run/dbus.pid \
 		--with-system-socket=/var/run/dbus \
 		--with-session-socket-dir=/var/tmp \
diff --git a/devel/dbus/distinfo b/devel/dbus/distinfo
index bc074ce5503a..286a214b50ea 100644
--- a/devel/dbus/distinfo
+++ b/devel/dbus/distinfo
@@ -1,2 +1,2 @@
-MD5 (dbus-0.21.tar.gz) = 311229d60154334ee3f908badc56747d
-SIZE (dbus-0.21.tar.gz) = 1152107
+MD5 (dbus-0.22.tar.gz) = 6b1c2476ea8b82dd9fb7f29ef857cb9f
+SIZE (dbus-0.22.tar.gz) = 1248780
diff --git a/devel/dbus/files/patch-configure b/devel/dbus/files/patch-configure
index 0e4169c27367..98ece7edce20 100644
--- a/devel/dbus/files/patch-configure
+++ b/devel/dbus/files/patch-configure
@@ -1,27 +1,6 @@
---- configure.orig	Sun Jul 25 03:43:08 2004
-+++ configure	Sun Jul 25 03:54:07 2004
-@@ -23359,17 +23359,15 @@
- if test x$have_abstract_sockets = xyes ; then
-    abstract_sockets=1
-    DBUS_PATH_OR_ABSTRACT=abstract
-+   cat >>confdefs.h <<_ACEOF
-+#define HAVE_ABSTRACT_SOCKETS $abstract_sockets
-+_ACEOF
- else
-    abstract_sockets=0
-    DBUS_PATH_OR_ABSTRACT=path
- fi
- 
- 
--cat >>confdefs.h <<_ACEOF
--#define HAVE_ABSTRACT_SOCKETS $abstract_sockets
--_ACEOF
--
--
- # this is used in addresses to prefer abstract, e.g.
- # unix:path=/foo or unix:abstract=/foo
- 
-@@ -24198,14 +24196,14 @@
+--- configure.orig	Sat Aug 14 00:37:06 2004
++++ configure	Sat Aug 14 00:37:06 2004
+@@ -26181,14 +26181,14 @@
  echo "${ECHO_T}not found" >&6
  fi
  
diff --git a/devel/dbus/pkg-plist b/devel/dbus/pkg-plist
index 5596a89e9928..33e8bd6309db 100644
--- a/devel/dbus/pkg-plist
+++ b/devel/dbus/pkg-plist
@@ -12,6 +12,8 @@ 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-error-enum.h
+include/dbus-%%VERSION%%/dbus/dbus-glib-lowlevel.h
 include/dbus-%%VERSION%%/dbus/dbus-glib.h
 include/dbus-%%VERSION%%/dbus/dbus-macros.h
 include/dbus-%%VERSION%%/dbus/dbus-memory.h
@@ -19,6 +21,7 @@ include/dbus-%%VERSION%%/dbus/dbus-message.h
 include/dbus-%%VERSION%%/dbus/dbus-pending-call.h
 include/dbus-%%VERSION%%/dbus/dbus-protocol.h
 include/dbus-%%VERSION%%/dbus/dbus-server.h
+include/dbus-%%VERSION%%/dbus/dbus-shared.h
 include/dbus-%%VERSION%%/dbus/dbus-threads.h
 include/dbus-%%VERSION%%/dbus/dbus-types.h
 include/dbus-%%VERSION%%/dbus/dbus.h
diff --git a/devel/py-dbus/Makefile b/devel/py-dbus/Makefile
index 217a611b4af8..7a5c18b787cb 100644
--- a/devel/py-dbus/Makefile
+++ b/devel/py-dbus/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	3
+PORTREVISION=	0
 CATEGORIES=	devel gnome python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -29,7 +29,9 @@ USE_PYTHON=	yes
 CONFIGURE_ARGS=	--enable-python \
 		--disable-gcj \
 		--disable-mono \
+		--disable-mono-docs \
 		--disable-gtk \
+		--disable-qt \
 		--with-system-pid-file=/var/run/dbus.pid \
 		--with-system-socket=/var/run/dbus \
 		--with-session-socket-dir=/var/tmp \