From e07ce9589c15cd2f4503dc2938c505deb9578fd0 Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Sun, 12 Oct 2008 22:09:20 +0000
Subject: [PATCH] Update to DBus-glib 0.76.

ok jasper@ ajacoutot@
---
 x11/dbus-glib/Makefile  | 21 ++++++++++-----------
 x11/dbus-glib/distinfo  | 10 +++++-----
 x11/dbus-glib/pkg/PLIST |  5 ++---
 3 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/x11/dbus-glib/Makefile b/x11/dbus-glib/Makefile
index eee87e1e315..b087dbeb62f 100644
--- a/x11/dbus-glib/Makefile
+++ b/x11/dbus-glib/Makefile
@@ -1,15 +1,14 @@
-# $OpenBSD: Makefile,v 1.9 2008/05/27 08:02:51 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.10 2008/10/12 22:09:20 brad Exp $
 
 COMMENT=	glib bindings for dbus message system
 
-DISTNAME=	dbus-glib-0.74
-PKGNAME=	${DISTNAME}p1
-SHARED_LIBS +=	dbus-glib-1          3.0      # .3.0
+DISTNAME=	dbus-glib-0.76
+SHARED_LIBS+=	dbus-glib-1	4.0
 CATEGORIES=	x11
 
 HOMEPAGE=	http://dbus.freedesktop.org/
 
-# GPL
+# GPLv2+
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
@@ -20,19 +19,19 @@ WANTLIB=	expat c pthread pcre
 MASTER_SITES=	${HOMEPAGE}releases/dbus-glib/
 
 MODULES=	devel/gettext
-LIB_DEPENDS=	dbus-1.>=5::x11/dbus \
+LIB_DEPENDS=	dbus-1.>=7::x11/dbus \
 		glib-2.0,gobject-2.0::devel/glib2
 
+#CFLAGS+=	-I${LOCALBASE}/include -pthread
+
 SEPARATE_BUILD=	simple
 USE_GMAKE=	Yes
 USE_LIBTOOL=	Yes
-
 CONFIGURE_STYLE=gnu
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
-		LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
-		CFLAGS="${CFLAGS} -I${LOCALBASE}/include -pthread"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 pre-build:
-	cp ${FILESDIR}/dbus-bus-introspect.xml ${WRKBUILD}/tools/
+	@cp ${FILESDIR}/dbus-bus-introspect.xml ${WRKBUILD}/tools
 
 .include <bsd.port.mk>
diff --git a/x11/dbus-glib/distinfo b/x11/dbus-glib/distinfo
index 706df48ef0d..fe861b3ed75 100644
--- a/x11/dbus-glib/distinfo
+++ b/x11/dbus-glib/distinfo
@@ -1,5 +1,5 @@
-MD5 (dbus-glib-0.74.tar.gz) = CSPYJaCv8uTrIzOLYwKG+w==
-RMD160 (dbus-glib-0.74.tar.gz) = CnixOL/h29/uDX++vL5wHGNRGoY=
-SHA1 (dbus-glib-0.74.tar.gz) = 6oockmn+a19j5lcaLIpTelWPAhE=
-SHA256 (dbus-glib-0.74.tar.gz) = 6HDYzWGYNO2gZuN/5ptEHWKfmtOoce8oVPu811Ozq+I=
-SIZE (dbus-glib-0.74.tar.gz) = 654853
+MD5 (dbus-glib-0.76.tar.gz) = 07cWp+eY+qHGqGdnXwAwag==
+RMD160 (dbus-glib-0.76.tar.gz) = 0Bte+Fw+JxdJWEn9+DeLzxbAfzE=
+SHA1 (dbus-glib-0.76.tar.gz) = 97/nw5RVm+4S8K3//TMzBNRxd5o=
+SHA256 (dbus-glib-0.76.tar.gz) = i8CD+q8+/dREqKRLvL/qUBp7VHc2/aPC2Dv9ybW2cqM=
+SIZE (dbus-glib-0.76.tar.gz) = 667547
diff --git a/x11/dbus-glib/pkg/PLIST b/x11/dbus-glib/pkg/PLIST
index 4734f18680e..5d13397221b 100644
--- a/x11/dbus-glib/pkg/PLIST
+++ b/x11/dbus-glib/pkg/PLIST
@@ -1,6 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.3 2008/02/09 17:37:14 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.4 2008/10/12 22:09:20 brad Exp $
 %%SHARED%%
-bin/dbus-binding-tool
+@bin bin/dbus-binding-tool
 include/dbus-1.0/
 include/dbus-1.0/dbus/
 include/dbus-1.0/dbus/dbus-glib-bindings.h
@@ -19,7 +19,6 @@ share/gtk-doc/html/dbus-glib/ch01.html
 share/gtk-doc/html/dbus-glib/ch02.html
 share/gtk-doc/html/dbus-glib/ch03.html
 share/gtk-doc/html/dbus-glib/dbus-binding-tool.html
-share/gtk-doc/html/dbus-glib/dbus-glib-DBus-GLib-low-level.html
 share/gtk-doc/html/dbus-glib/dbus-glib-DBus-GObject-related-functions.html
 share/gtk-doc/html/dbus-glib/dbus-glib-DBusGConnection.html
 share/gtk-doc/html/dbus-glib/dbus-glib-DBusGError.html