Update to 0.71:

D-Bus GLib Bindings 0.71 (24 July 2006)
==
- Correctly installs a few missing headers
- Build was cleaned up a bit

D-Bus GLib Bindings 0.70 (17 July 2006)
==
- First release after bindings split
- dbus-binding-tool heeds org.freedesktop.DBus.GLib.ClientCSymbol C symbol
  name annotations when generating glib client bindings
- DBusGProxy can now be inherited from
- Support added for generating bindings to arrays that are represented as
  GPtrArrays rather than GArrays (ie size-variable things, such as strings,
  objects, structs, etc).
- Modification of the existing specialised types to have N type parameters
  (rather than the current 1 or 2 for arrays and dictionaries respectively).
  You can then use this to get a glib type to represent any arbitrary
  D-Bus struct type using dbus_g_type_get_struct. The only implementation of
  these types is with GValueArrays as before, but it's now possible to store
  these in arrays, emit them in signals, etc.
- New methodbus_g_connection_open provides a way to open connections to an
  arbitrary address
- Various bugs and memory leaks fixed

5 files changed, 60 insertions, 32 deletions

diff --git a/sysutils/dbus-glib/Makefile b/sysutils/dbus-glib/Makefile
index 6c4f2691ec8..12cacd5712d 100644
--- a/sysutils/dbus-glib/Makefile
+++ b/sysutils/dbus-glib/Makefile
@@ -1,33 +1,43 @@
-# $NetBSD: Makefile,v 1.7 2006/04/08 20:50:35 reed Exp $
+# $NetBSD: Makefile,v 1.8 2006/08/23 09:45:16 jmmv Exp $
 #
 
-DBUS_INTERFACE=	glib
-DBUS_DIRS=	dbus bus glib tools
-
-.include "../../sysutils/dbus/Makefile.common"
-CONFIGURE_ARGS+=--enable-tests
-# We can't install from within the 'dbus' nor 'tools' directory automatically
-# because we'd get a lot of other stuff installed (overriding files in the
-# dbus package).
-INSTALL_DIRS=	${WRKSRC}/glib
-
-INSTALLATION_DIRS=	bin lib/pkgconfig ${PKGMANDIR}/man1
-
-PRINT_PLIST_AWK+=	/^@dirrm include\/dbus-1.0\/dbus$$/ \
-				{ print "@comment in dbus: " $$0; next; }
-
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/include/dbus-1.0/dbus
-	${INSTALL_DATA} ${WRKSRC}/dbus/dbus-glib*.h \
-		${PREFIX}/include/dbus-1.0/dbus
-	${INSTALL_DATA} ${WRKSRC}/tools/dbus-glib-bindings.h \
-		${PREFIX}/include/dbus-1.0/dbus
-	${INSTALL_DATA} ${WRKSRC}/dbus-glib-1.pc \
-		${PREFIX}/lib/pkgconfig/dbus-glib-1.pc
-	cd ${WRKSRC}/tools && ${LIBTOOL} --mode=install \
-		${INSTALL_PROGRAM} dbus-monitor ${PREFIX}/bin/dbus-monitor
-	${INSTALL_DATA} ${WRKSRC}/tools/dbus-monitor.1 \
-		${PREFIX}/${PKGMANDIR}/man1/dbus-monitor.1
+DISTNAME=	dbus-glib-0.71
+CATEGORIES=	sysutils
+MASTER_SITES=	http://freedesktop.org/software/dbus/releases/
 
+MAINTAINER=	jmmv@NetBSD.org
+HOMEPAGE=	http://www.freedesktop.org/Software/dbus
+COMMENT=	GLib bindings for the D-BUS message bus system
+
+GNU_CONFIGURE=		YES
+USE_TOOLS+=		gmake msgfmt pkg-config
+USE_LIBTOOL=		YES
+
+PKGCONFIG_OVERRIDE=	dbus-glib-1.pc.in
+
+CONFIGURE_ARGS+=	--disable-ansi
+CONFIGURE_ARGS+=	--disable-asserts
+CONFIGURE_ARGS+=	--disable-doxygen-docs
+CONFIGURE_ARGS+=	--disable-gcov
+CONFIGURE_ARGS+=	--disable-tests
+CONFIGURE_ARGS+=	--disable-verbose-mode
+CONFIGURE_ARGS+=	--disable-xml-docs
+CONFIGURE_ARGS+=	--enable-checks
+CONFIGURE_ARGS+=	--with-xml=expat
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.dbus-glib
+PKG_SUPPORTED_OPTIONS+=	debug
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mdebug)
+CONFIGURE_ARGS+=	--enable-asserts
+CONFIGURE_ARGS+=	--enable-tests
+CONFIGURE_ARGS+=	--enable-verbose-mode
+.endif
+
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../sysutils/dbus/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/dbus-glib/PLIST b/sysutils/dbus-glib/PLIST
index ada232ddab3..54485701bdd 100644
--- a/sysutils/dbus-glib/PLIST
+++ b/sysutils/dbus-glib/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2006/03/30 20:57:08 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/08/23 09:45:16 jmmv Exp $
 bin/dbus-binding-tool
-bin/dbus-monitor
 include/dbus-1.0/dbus/dbus-glib-bindings.h
 include/dbus-1.0/dbus/dbus-glib-error-enum.h
 include/dbus-1.0/dbus/dbus-glib-lowlevel.h
@@ -8,5 +7,4 @@ include/dbus-1.0/dbus/dbus-glib.h
 include/dbus-1.0/dbus/dbus-gtype-specialized.h
 lib/libdbus-glib-1.la
 lib/pkgconfig/dbus-glib-1.pc
-man/man1/dbus-monitor.1
 @comment in dbus: @dirrm include/dbus-1.0/dbus
diff --git a/sysutils/dbus-glib/buildlink3.mk b/sysutils/dbus-glib/buildlink3.mk
index f754230438e..9f19fc902df 100644
--- a/sysutils/dbus-glib/buildlink3.mk
+++ b/sysutils/dbus-glib/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2006/07/08 23:11:08 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2006/08/23 09:45:16 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 DBUS_GLIB_BUILDLINK3_MK:=	${DBUS_GLIB_BUILDLINK3_MK}+
@@ -13,6 +13,7 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}dbus-glib
 
 .if !empty(DBUS_GLIB_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.dbus-glib+=	dbus-glib>=0.61
+BUILDLINK_ABI_DEPENDS.dbus-glib+=	dbus-glib>=0.71
 BUILDLINK_PKGSRCDIR.dbus-glib?=	../../sysutils/dbus-glib
 .endif	# DBUS_GLIB_BUILDLINK3_MK
 
diff --git a/sysutils/dbus-glib/distinfo b/sysutils/dbus-glib/distinfo
new file mode 100644
index 00000000000..b2de76b87ff
--- /dev/null
+++ b/sysutils/dbus-glib/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2006/08/23 09:45:16 jmmv Exp $
+
+SHA1 (dbus-glib-0.71.tar.gz) = 3493225f8dc53d98b40c3237ffa1be020dcc0f76
+RMD160 (dbus-glib-0.71.tar.gz) = 086ca10c8fd56c2575670fee5cff573ac4a465c4
+Size (dbus-glib-0.71.tar.gz) = 566889 bytes
+SHA1 (patch-aa) = 678054bfbfa35228b5c6bfd3c3f2cec9f68e898f
diff --git a/sysutils/dbus-glib/patches/patch-aa b/sysutils/dbus-glib/patches/patch-aa
new file mode 100644
index 00000000000..26a4db653b7
--- /dev/null
+++ b/sysutils/dbus-glib/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2006/08/23 09:45:16 jmmv Exp $
+
+--- tools/Makefile.in.orig	2006-07-24 20:41:57.000000000 +0200
++++ tools/Makefile.in
+@@ -487,7 +487,7 @@ dbus-glib-bindings.h: dbus-bus-introspec
+ 	$(top_builddir)/dbus/dbus-binding-tool --mode=glib-client --output=dbus-glib-bindings.h dbus-bus-introspect.xml
+ 
+ dbus-bus-introspect.xml:
+-	DBUS_TOP_BUILDDIR=$(top_builddir) dbus-send --system --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml
++	DBUS_TOP_BUILDDIR=$(top_builddir) dbus-launch dbus-send --session --print-reply=literal --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.Introspectable.Introspect > dbus-bus-introspect.xml.tmp && mv dbus-bus-introspect.xml.tmp dbus-bus-introspect.xml
+ # 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.
+ .NOEXPORT: