Update to 0.3.9 and depend on this version, since the libraries were

merged.

xcb-util 0.3.9:

Arnaud Fontaine (4):
      Remove xcb_bitops.h.
      Do not rely anymore on gperf and m4 following removal of deprecated atoms.
      Add autogen.sh to EXTRA_DIST.
      Release 0.3.9

xcb-util 0.3.8:

Alan Coopersmith (2):
      Fix typos in various header comments
      Rename XCB_EVENT_ERROR_SUCESS to XCB_EVENT_ERROR_SUCCESS

Arnaud Fontaine (8):
      Add AM_MAINTAINER_MODE for vendors
      Split up atom, aux event into their own repository
      Create a single shared library and header file and reset SONAME
      Remove deprecated atoms.
      Remove synchronous xcb_atom_get()
      Remove useless xcb_atom_get_fast*() and xcb_atom_get_name().
      Bump version to 0.3.8
      Release 0.3.8

Dirk Wallenstein (1):
      Use an absolute URL for the m4 submodule

Gaetan Nadon (5):
      config: use the default xorg .gitignore file
      config: generate ChangeLog and INSTALL
      Fix distcheck due to xcb_atom.h
      Remove the Doxyfile which is unused, out dated and wrong.
      pkg-config files: remove LIBS which is unrequired and undesirable

Jamey Sharp (2):
      Delete redundant core-protocol error codes.
      Delete callback-based APIs for events, properties, and replies.

Jon TURNEY (2):
      Update autogen.sh to one that does builddir != srcdir
      Link with -no-undefined

Peter Harris (1):
      Deprecate namespaceless pre-defined atoms

4 files changed, 16 insertions, 41 deletions

diff --git a/x11/xcb-util/Makefile b/x11/xcb-util/Makefile
index 22e48ae5b61..84048b9c44f 100644
--- a/x11/xcb-util/Makefile
+++ b/x11/xcb-util/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2011/02/28 14:53:09 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2012/07/13 14:21:58 wiz Exp $
 #
 
-DISTNAME=	xcb-util-0.3.6
+DISTNAME=	xcb-util-0.3.9
 CATEGORIES=	x11
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 EXTRACT_SUFX=	.tar.bz2
@@ -16,15 +16,10 @@ GNU_CONFIGURE=	yes
 USE_TOOLS+=	pkg-config gmake gm4
 USE_LIBTOOL=	yes
 
-PKGCONFIG_OVERRIDE+=	atom/xcb-atom.pc.in
-PKGCONFIG_OVERRIDE+=	aux/xcb-aux.pc.in
-PKGCONFIG_OVERRIDE+=	event/xcb-event.pc.in
-PKGCONFIG_OVERRIDE+=	icccm/xcb-icccm.pc.in
-PKGCONFIG_OVERRIDE+=	image/xcb-image.pc.in
-PKGCONFIG_OVERRIDE+=	keysyms/xcb-keysyms.pc.in
-PKGCONFIG_OVERRIDE+=	property/xcb-property.pc.in
-PKGCONFIG_OVERRIDE+=	renderutil/xcb-renderutil.pc.in
-PKGCONFIG_OVERRIDE+=	reply/xcb-reply.pc.in
+PKGCONFIG_OVERRIDE+=	xcb-util.pc.in
+PKGCONFIG_OVERRIDE+=	xcb-atom.pc.in
+PKGCONFIG_OVERRIDE+=	xcb-event.pc.in
+PKGCONFIG_OVERRIDE+=	xcb-aux.pc.in
 
 .include "../../devel/gperf/buildlink3.mk"
 .include "../../x11/libxcb/buildlink3.mk"
diff --git a/x11/xcb-util/PLIST b/x11/xcb-util/PLIST
index eeb6b786e24..0bc58c9b1df 100644
--- a/x11/xcb-util/PLIST
+++ b/x11/xcb-util/PLIST
@@ -1,30 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:25:10 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/07/13 14:21:58 wiz Exp $
 include/xcb/xcb_atom.h
 include/xcb/xcb_aux.h
-include/xcb/xcb_bitops.h
 include/xcb/xcb_event.h
-include/xcb/xcb_icccm.h
-include/xcb/xcb_image.h
-include/xcb/xcb_keysyms.h
-include/xcb/xcb_pixel.h
-include/xcb/xcb_property.h
-include/xcb/xcb_renderutil.h
-include/xcb/xcb_reply.h
-lib/libxcb-atom.la
-lib/libxcb-aux.la
-lib/libxcb-event.la
-lib/libxcb-icccm.la
-lib/libxcb-image.la
-lib/libxcb-keysyms.la
-lib/libxcb-property.la
-lib/libxcb-render-util.la
-lib/libxcb-reply.la
+include/xcb/xcb_util.h
+lib/libxcb-util.la
 lib/pkgconfig/xcb-atom.pc
 lib/pkgconfig/xcb-aux.pc
 lib/pkgconfig/xcb-event.pc
-lib/pkgconfig/xcb-icccm.pc
-lib/pkgconfig/xcb-image.pc
-lib/pkgconfig/xcb-keysyms.pc
-lib/pkgconfig/xcb-property.pc
-lib/pkgconfig/xcb-renderutil.pc
-lib/pkgconfig/xcb-reply.pc
+lib/pkgconfig/xcb-util.pc
diff --git a/x11/xcb-util/buildlink3.mk b/x11/xcb-util/buildlink3.mk
index c8e3530b1f5..e0792265d13 100644
--- a/x11/xcb-util/buildlink3.mk
+++ b/x11/xcb-util/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.2 2012/05/07 02:45:48 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2012/07/13 14:21:58 wiz Exp $
 
 BUILDLINK_TREE+=	xcb-util
 
 .if !defined(XCB_UTIL_BUILDLINK3_MK)
 XCB_UTIL_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.xcb-util+=	xcb-util>=0.3.3
+BUILDLINK_API_DEPENDS.xcb-util+=	xcb-util>=0.3.9
 BUILDLINK_PKGSRCDIR.xcb-util?=		../../x11/xcb-util
 
 .include "../../x11/libxcb/buildlink3.mk"
diff --git a/x11/xcb-util/distinfo b/x11/xcb-util/distinfo
index 52611241ea3..2ae6986124a 100644
--- a/x11/xcb-util/distinfo
+++ b/x11/xcb-util/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2009/08/26 12:17:28 wiz Exp $
+$NetBSD: distinfo,v 1.5 2012/07/13 14:21:58 wiz Exp $
 
-SHA1 (xcb-util-0.3.6.tar.bz2) = 8585a421c077382937d181b921263fac2e448d31
-RMD160 (xcb-util-0.3.6.tar.bz2) = 853e53493c67d56a4ce368cc6b9512c247fc840f
-Size (xcb-util-0.3.6.tar.bz2) = 293408 bytes
+SHA1 (xcb-util-0.3.9.tar.bz2) = 02060d8e2e70838fc41cd3a27c7f2909090d8c20
+RMD160 (xcb-util-0.3.9.tar.bz2) = 949b2d8666914185b106c2d0bafb4c625cd450c6
+Size (xcb-util-0.3.9.tar.bz2) = 287855 bytes