Update to 0.91:

D-Bus 0.91 (24 July 2006)
==
- Remove some lingering bits left over from the bindings split
- Fix assertion causing D-Bus applications to crash when checks are enabled
- Fix a timeout bug which would block applications from being auto started

D-Bus 0.90 (17 July 2006)
==
- API/ABI freeze for 1.0
- Bindings are now split out into seperate packages
- ListActivatableNames added as a method on the bus
- Removed deprecated dbus_connection_disconnect (use dbus_connection_close)
- Shared connections are now unreffed on disconnect
- Fixed pending calls for threaded enviornments
- Pending calls get timed out on connection disconnect
- dbus_connection_send_with_reply returns TRUE and a NULL pending call
  if you call it on a connection object which has been disconnected already
  (it returns FALSE on Out of Memory errors only)
- dbus-monitor now correctly catches methods, not just signals
- dbus-monitor now prints object paths

D-BUS 0.62 (12 June 2006)
==
- Doc fixes
- Added support for all data-types for the dbus tools
- Fixed eavesdropping on method calls (dbus-monitor)
- Fixed silent dropping of method calls with interface=NULL
- Fixed console ownership problems in Solaris
- Fixed installation of dbus-signature.h and #include it in dbus/dbus.h
- Flush the user database cache on config reload
- GLib bindings:
  - Fix memory leaks
  - Fix properties in DBusGProxy so that they can be given in any
    order
  - Added lots of assertions to ensure correct use
  - Remove duplicated code
  - Fix static string pointer uses in GPtrArray-based collections
- Python bindings:
  - Remove reference to sys/cdefs.h
- Qt4 bindings:
  - Code reorganized
  - Added the dbusidl2cpp, dbuscpp2xml and dbus tools
  - Added example programs (ping-pong, complex ping-pong, listnames, chat)
  - Updated selftests
  - Fixed compilation and .moc- and .ui-file processing and cleaning
  - Made central classes derive from QObject
  - Enhance error reporting
  - Many bugfixes
- Mono bindings:
  - Minor bugfixes

8 files changed, 71 insertions, 134 deletions

diff --git a/sysutils/dbus/Makefile b/sysutils/dbus/Makefile
index d9baa35c254..f299e0680d7 100644
--- a/sysutils/dbus/Makefile
+++ b/sysutils/dbus/Makefile
@@ -1,25 +1,66 @@
-# $NetBSD: Makefile,v 1.12 2006/04/23 00:12:42 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/08/23 09:44:27 jmmv Exp $
 #
 
-.include "Makefile.common"
+DISTNAME=	dbus-0.91
+CATEGORIES=	sysutils
+MASTER_SITES=	http://freedesktop.org/software/dbus/releases/
 
-PKGREVISION=	1
+MAINTAINER=	jmmv@NetBSD.org
+HOMEPAGE=	http://www.freedesktop.org/Software/dbus
+COMMENT=	Message bus system
 
-PKG_GROUPS=	messagebus
-PKG_USERS=	messagebus:messagebus
+CONFLICTS+=	dbus-glib<0.71
+CONFLICTS+=	py*-dbus<0.71
 
-PKG_GECOS.messagebus=	System message bus
-PKG_HOME.messagebus=	${VARBASE}/run/dbus
+GNU_CONFIGURE=		YES
+USE_TOOLS+=		gmake msgfmt pkg-config
+USE_LIBTOOL=		YES
 
-MAKE_DIRS=	${PKG_SYSCONFDIR}/event.d
-MAKE_DIRS+=	${PKG_SYSCONFDIR}/system.d
+PKGCONFIG_OVERRIDE=	dbus-1.pc.in
 
-RCD_SCRIPTS=	dbus
+CONFIGURE_ARGS+=	--disable-abstract-sockets
+CONFIGURE_ARGS+=	--disable-ansi
+CONFIGURE_ARGS+=	--disable-asserts
+CONFIGURE_ARGS+=	--disable-console-owner-file
+CONFIGURE_ARGS+=	--disable-dnotify
+CONFIGURE_ARGS+=	--disable-doxygen-docs
+CONFIGURE_ARGS+=	--disable-gcov
+CONFIGURE_ARGS+=	--disable-selinux
+CONFIGURE_ARGS+=	--disable-tests
+CONFIGURE_ARGS+=	--disable-verbose-mode
+CONFIGURE_ARGS+=	--disable-xml-docs
+CONFIGURE_ARGS+=	--enable-checks
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--with-xml=expat
+CONFIGURE_ARGS+=	--without-x
 
-EGDIR=		${PREFIX}/share/examples/dbus
-CONF_FILES=	${EGDIR}/session.conf ${PKG_SYSCONFDIR}/session.conf
-CONF_FILES+=	${EGDIR}/system.conf ${PKG_SYSCONFDIR}/system.conf
+PKG_OPTIONS_VAR=	PKG_OPTIONS.dbus
+PKG_SUPPORTED_OPTIONS+=	debug
 
-.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mdebug)
+CONFIGURE_ARGS+=	--enable-asserts
+CONFIGURE_ARGS+=	--enable-tests
+CONFIGURE_ARGS+=	--enable-verbose-mode
+.endif
+
+PKG_SYSCONFSUBDIR=	dbus-1
+MAKE_DIRS=		${PKG_SYSCONFDIR}/event.d
+MAKE_DIRS+=		${PKG_SYSCONFDIR}/system.d
+
+EGDIR=			${PREFIX}/share/examples/dbus
+CONF_FILES=		${EGDIR}/session.conf ${PKG_SYSCONFDIR}/session.conf
+CONF_FILES+=		${EGDIR}/system.conf ${PKG_SYSCONFDIR}/system.conf
 
+RCD_SCRIPTS=		dbus
+
+PKG_GROUPS=		messagebus
+PKG_USERS=		messagebus:messagebus
+PKG_GECOS.messagebus=	System message bus
+PKG_HOME.messagebus=	${VARBASE}/run/dbus
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/dbus/Makefile.common b/sysutils/dbus/Makefile.common
deleted file mode 100644
index 32a5db8ea80..00000000000
--- a/sysutils/dbus/Makefile.common
+++ /dev/null
@@ -1,82 +0,0 @@
-# $NetBSD: Makefile.common,v 1.16 2006/06/06 21:49:35 minskim Exp $
-#
-
-DBUS_VERSION=	0.61
-
-DISTNAME=	dbus-${DBUS_VERSION}
-CATEGORIES=	sysutils
-MASTER_SITES=	http://freedesktop.org/software/dbus/releases/
-
-MAINTAINER=	jmmv@NetBSD.org
-HOMEPAGE=	http://www.freedesktop.org/Software/dbus
-COMMENT=	Message bus system
-
-DISTINFO_FILE=	${.CURDIR}/../../sysutils/dbus/distinfo
-PATCHDIR=	${.CURDIR}/../../sysutils/dbus/patches
-
-GNU_CONFIGURE=		YES
-USE_TOOLS+=		gmake msgfmt pkg-config
-USE_LIBTOOL=		YES
-
-PKGCONFIG_OVERRIDE=	dbus-1.pc.in
-PKGCONFIG_OVERRIDE+=	dbus-glib-1.pc.in
-PKGCONFIG_OVERRIDE+=	dbus-sharp.pc.in
-
-CONFIGURE_ARGS+=	--disable-asserts
-CONFIGURE_ARGS+=	--disable-dnotify
-CONFIGURE_ARGS+=	--disable-doxygen-docs
-CONFIGURE_ARGS+=	--disable-gcj
-CONFIGURE_ARGS+=	--disable-gcov
-CONFIGURE_ARGS+=	--disable-glib
-CONFIGURE_ARGS+=	--disable-gtk
-CONFIGURE_ARGS+=	--disable-mono
-CONFIGURE_ARGS+=	--disable-mono-docs
-CONFIGURE_ARGS+=	--disable-python
-CONFIGURE_ARGS+=	--disable-qt
-CONFIGURE_ARGS+=	--disable-qt-debug
-CONFIGURE_ARGS+=	--disable-qt3
-CONFIGURE_ARGS+=	--disable-selinux
-CONFIGURE_ARGS+=	--disable-tests
-CONFIGURE_ARGS+=	--disable-xml-docs
-CONFIGURE_ARGS+=	--enable-checks
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=	--with-xml=expat
-CONFIGURE_ARGS+=	--without-x
-
-PKG_SYSCONFSUBDIR=	dbus-1
-
-# gcc 2.95 does not understand -Wfloat-equal
-BUILDLINK_TRANSFORM+=	rm:-Wfloat-equal
-
-.if defined(DBUS_INTERFACE)
-DBUS_ARGS?=		${DBUS_INTERFACE}
-DBUS_DIRS?=		${DBUS_INTERFACE}
-
-PKGNAME?=		${DISTNAME:S/dbus/dbus-${DBUS_INTERFACE}/}
-COMMENT+=		(${DBUS_INTERFACE} interface)
-
-SUBST_CLASSES+=		paths
-SUBST_STAGE.paths=	pre-configure
-SUBST_MESSAGE.paths=	Fixing paths to installed dbus\' libraries.
-SUBST_SED.paths=	-e 's|$$(top_builddir)/dbus/libdbus-1.la|${BUILDLINK_PREFIX.dbus}/lib/libdbus-1.la|g'
-SUBST_FILES.paths=
-
-BUILD_DIRS=
-INSTALL_DIRS=
-
-.  for f in ${DBUS_ARGS}
-CONFIGURE_ARGS:=	${CONFIGURE_ARGS:S/--disable-${f}/--enable-${f}/}
-.  endfor
-
-.  for f in ${DBUS_DIRS}
-BUILD_DIRS+=		${WRKSRC}/${f}
-INSTALL_DIRS+=		${WRKSRC}/${f}
-SUBST_FILES.paths+=	${f}/Makefile.in
-.  endfor
-
-BUILDLINK_API_DEPENDS.dbus+=	dbus>=${DBUS_VERSION}
-.  include "../../sysutils/dbus/buildlink3.mk"
-.endif
-
-.include "../../textproc/expat/buildlink3.mk"
diff --git a/sysutils/dbus/PLIST b/sysutils/dbus/PLIST
index d45b047d793..a1d27c401e7 100644
--- a/sysutils/dbus/PLIST
+++ b/sysutils/dbus/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2006/03/30 20:57:08 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/08/23 09:44:27 jmmv Exp $
 bin/dbus-cleanup-sockets
 bin/dbus-daemon
 bin/dbus-launch
+bin/dbus-monitor
 bin/dbus-send
 include/dbus-1.0/dbus/dbus-address.h
 include/dbus-1.0/dbus/dbus-bus.h
@@ -14,6 +15,7 @@ include/dbus-1.0/dbus/dbus-pending-call.h
 include/dbus-1.0/dbus/dbus-protocol.h
 include/dbus-1.0/dbus/dbus-server.h
 include/dbus-1.0/dbus/dbus-shared.h
+include/dbus-1.0/dbus/dbus-signature.h
 include/dbus-1.0/dbus/dbus-threads.h
 include/dbus-1.0/dbus/dbus-types.h
 include/dbus-1.0/dbus/dbus.h
@@ -23,6 +25,7 @@ lib/pkgconfig/dbus-1.pc
 man/man1/dbus-cleanup-sockets.1
 man/man1/dbus-daemon.1
 man/man1/dbus-launch.1
+man/man1/dbus-monitor.1
 man/man1/dbus-send.1
 share/examples/dbus/session.conf
 share/examples/dbus/system.conf
diff --git a/sysutils/dbus/buildlink3.mk b/sysutils/dbus/buildlink3.mk
index c89fce6c640..783105a3bd8 100644
--- a/sysutils/dbus/buildlink3.mk
+++ b/sysutils/dbus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2006/07/08 23:11:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2006/08/23 09:44:27 jmmv Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 DBUS_BUILDLINK3_MK:=	${DBUS_BUILDLINK3_MK}+
@@ -12,9 +12,11 @@ BUILDLINK_PACKAGES+=	dbus
 BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}dbus
 
 .if !empty(DBUS_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.dbus+=	dbus>=0.61
+BUILDLINK_API_DEPENDS.dbus+=	dbus>=0.91
 BUILDLINK_PKGSRCDIR.dbus?=	../../sysutils/dbus
 
+PRINT_PLIST_AWK+=	/^@dirrm include\/dbus-1.0\/dbus$$/ \
+				{ print "@comment in dbus: " $$0; next; }
 PRINT_PLIST_AWK+=	/^@dirrm share\/dbus-1\/services/ \
 				{ print "@comment in dbus: " $$0; next }
 .endif	# DBUS_BUILDLINK3_MK
diff --git a/sysutils/dbus/distinfo b/sysutils/dbus/distinfo
index d083e6bb093..24310b5fbcb 100644
--- a/sysutils/dbus/distinfo
+++ b/sysutils/dbus/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.9 2006/07/14 15:55:02 rillig Exp $
+$NetBSD: distinfo,v 1.10 2006/08/23 09:44:27 jmmv Exp $
 
-SHA1 (dbus-0.61.tar.gz) = fdddc695dad64974fb4138fcb04a77a66f1f47f8
-RMD160 (dbus-0.61.tar.gz) = 67306e1a632c1986460e8ead311ae642447cdcc3
-Size (dbus-0.61.tar.gz) = 1735729 bytes
+SHA1 (dbus-0.91.tar.gz) = 9d05a23383162c08e2800e8577129ec841d8ff17
+RMD160 (dbus-0.91.tar.gz) = 8b57e3e3896d6db53e4daddee518d1236c3704c6
+Size (dbus-0.91.tar.gz) = 1379544 bytes
 SHA1 (patch-aa) = 9dd1f74cbed3ef973612f9a1b1336732a88cd819
-SHA1 (patch-ab) = 302e0fe5c1f8482de43de2ad09ba4f15d1ce935d
 SHA1 (patch-ac) = 4e49a5b2139583540be5f1fc445d61946ddc0ef8
-SHA1 (patch-ad) = 31f0321c85296d6431d2db157ff8cc53f8351a04
 SHA1 (patch-ae) = c73bed4ec4cca5e7bcdec749ac85ba2c56d8469a
diff --git a/sysutils/dbus/hacks.mk b/sysutils/dbus/hacks.mk
new file mode 100644
index 00000000000..1dbae21caf7
--- /dev/null
+++ b/sysutils/dbus/hacks.mk
@@ -0,0 +1,4 @@
+# $NetBSD: hacks.mk,v 1.1 2006/08/23 09:44:27 jmmv Exp $
+
+# gcc 2.95 does not understand -Wfloat-equal
+BUILDLINK_TRANSFORM+=	rm:-Wfloat-equal
diff --git a/sysutils/dbus/patches/patch-ab b/sysutils/dbus/patches/patch-ab
deleted file mode 100644
index 6d98f97ebb4..00000000000
--- a/sysutils/dbus/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2006/03/30 20:57:08 jmmv Exp $
-
---- tools/Makefile.in.orig	2006-02-24 17:36:59.000000000 +0100
-+++ tools/Makefile.in
-@@ -395,7 +395,7 @@ dbus_send_LDADD = $(top_builddir)/dbus/l
- dbus_monitor_LDADD = $(top_builddir)/glib/libdbus-glib-1.la
- dbus_launch_LDADD = $(DBUS_X_LIBS)
- dbus_viewer_LDADD = $(top_builddir)/glib/libdbus-gtool.la $(DBUS_GTK_THREADS_LIBS) $(DBUS_GLIB_TOOL_LIBS)
--man_MANS = dbus-send.1 dbus-monitor.1 dbus-launch.1 dbus-cleanup-sockets.1
-+man_MANS = dbus-send.1 dbus-launch.1 dbus-cleanup-sockets.1
- EXTRA_DIST = $(man_MANS) run-with-tmp-session-bus.sh
- CLEANFILES = \
- 	run-with-tmp-session-bus.conf	\
diff --git a/sysutils/dbus/patches/patch-ad b/sysutils/dbus/patches/patch-ad
deleted file mode 100644
index 6833dd0f8a4..00000000000
--- a/sysutils/dbus/patches/patch-ad
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/02/26 21:42:33 joerg Exp $
-
---- python/extract.py.orig	2006-02-18 14:40:04.000000000 +0000
-+++ python/extract.py
-@@ -228,7 +228,10 @@ fd = open(filename)
- for line in fd.readlines():
-     if line.startswith('#include'):
-         filename = line.split(' ')[1][1:-2]
--        command = "echo '%s'|cpp %s" % (line, cppflags)
-+	if sys.platform[:-1] in ("freebsd", "dragonfly"):
-+            command = "echo '%s'|cpp -Dlint %s" % (line, cppflags)
-+	else:
-+            command = "echo '%s'|cpp %s" % (line, cppflags)
-         sys.stderr.write('running %s' % (command))
-         output = commands.getoutput(command)
-         do_buffer(filename, output)