Update to 0.53:

Remove xcb-utils files from xorg.libxcb and add symlinks for
NetBSD-current's libxcb.

3 files changed, 89 insertions, 52 deletions

diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index 60e7b8debb0..c32971f6d58 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.117 2010/09/11 19:47:31 tron Exp $
+# $NetBSD: Makefile,v 1.118 2010/09/11 20:15:20 wiz Exp $
 #
 # NOTE:	If you update this package, then you'll likely need to also update
 #	the x11-links dependency in buildlink3.mk to the correct version,
 #	usually the most recent.
 
-DISTNAME=	x11-links-0.52
+DISTNAME=	x11-links-0.53
 CATEGORIES=	pkgtools x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/pkgtools/x11-links/buildlink3.mk b/pkgtools/x11-links/buildlink3.mk
index 2168a68ca61..1be8e5af109 100644
--- a/pkgtools/x11-links/buildlink3.mk
+++ b/pkgtools/x11-links/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.29 2010/09/11 19:47:31 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2010/09/11 20:15:20 wiz Exp $
 #
 # Don't include this file manually!  It will be included as necessary
 # by bsd.buildlink3.mk.
@@ -12,7 +12,7 @@ BUILDLINK_TREE+=	x11-links
 .if !defined(X11_LINKS_BUILDLINK3_MK)
 X11_LINKS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.x11-links+=	x11-links>=0.52
+BUILDLINK_API_DEPENDS.x11-links+=	x11-links>=0.53
 BUILDLINK_PKGSRCDIR.x11-links?=	../../pkgtools/x11-links
 BUILDLINK_DEPMETHOD.x11-links?=	build
 
diff --git a/pkgtools/x11-links/files/xorg.libxcb b/pkgtools/x11-links/files/xorg.libxcb
index c6664dfe12e..a19c63a6e76 100644
--- a/pkgtools/x11-links/files/xorg.libxcb
+++ b/pkgtools/x11-links/files/xorg.libxcb
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.libxcb,v 1.2 2010/09/11 19:47:31 tron Exp $
+# $NetBSD: xorg.libxcb,v 1.3 2010/09/11 20:15:20 wiz Exp $
 #
 include/xcb/bigreq.h
 include/xcb/composite.h
@@ -16,17 +16,6 @@ include/xcb/shm.h
 include/xcb/sync.h
 include/xcb/xc_misc.h
 include/xcb/xcb.h
-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
 include/xcb/xcb_wm.h
 include/xcb/xcbext.h
 include/xcb/xevie.h
@@ -40,138 +29,186 @@ include/xcb/xselinux.h
 include/xcb/xtest.h
 include/xcb/xv.h
 include/xcb/xvmc.h
-lib/libxcb-atom.1.0.0.dylib
-lib/libxcb-atom.1.dylib
-lib/libxcb-atom.dylib
-lib/libxcb-aux.0.0.0.dylib
-lib/libxcb-aux.0.dylib
-lib/libxcb-aux.dylib
 lib/libxcb-composite.0.0.0.dylib
 lib/libxcb-composite.0.dylib
+lib/libxcb-composite.a
 lib/libxcb-composite.dylib
 lib/libxcb-composite.la
+lib/libxcb-composite.so
+lib/libxcb-composite.so.0
+lib/libxcb-composite.so.0.0
 lib/libxcb-damage.0.0.0.dylib
 lib/libxcb-damage.0.dylib
+lib/libxcb-damage.a
 lib/libxcb-damage.dylib
 lib/libxcb-damage.la
+lib/libxcb-damage.so
+lib/libxcb-damage.so.0
+lib/libxcb-damage.so.0.0
 lib/libxcb-dpms.0.0.0.dylib
 lib/libxcb-dpms.0.dylib
+lib/libxcb-dpms.a
 lib/libxcb-dpms.dylib
 lib/libxcb-dpms.la
+lib/libxcb-dpms.so
+lib/libxcb-dpms.so.0
+lib/libxcb-dpms.so.0.0
+lib/libxcb-dri2.a
 lib/libxcb-dri2.la
-lib/libxcb-event.1.0.0.dylib
-lib/libxcb-event.1.dylib
-lib/libxcb-event.dylib
+lib/libxcb-dri2.so
+lib/libxcb-dri2.so.0
+lib/libxcb-dri2.so.0.0
 lib/libxcb-glx.0.0.0.dylib
 lib/libxcb-glx.0.dylib
+lib/libxcb-glx.a
 lib/libxcb-glx.dylib
 lib/libxcb-glx.la
-lib/libxcb-icccm.1.0.0.dylib
-lib/libxcb-icccm.1.dylib
-lib/libxcb-icccm.dylib
-lib/libxcb-image.0.0.0.dylib
-lib/libxcb-image.0.dylib
-lib/libxcb-image.dylib
-lib/libxcb-keysyms.0.0.0.dylib
-lib/libxcb-keysyms.0.dylib
-lib/libxcb-keysyms.dylib
-lib/libxcb-property.1.0.0.dylib
-lib/libxcb-property.1.dylib
-lib/libxcb-property.dylib
+lib/libxcb-glx.so
+lib/libxcb-glx.so.0
+lib/libxcb-glx.so.0.0
 lib/libxcb-randr.0.0.0.dylib
 lib/libxcb-randr.0.dylib
+lib/libxcb-randr.a
 lib/libxcb-randr.dylib
 lib/libxcb-randr.la
+lib/libxcb-randr.so
+lib/libxcb-randr.so.0
+lib/libxcb-randr.so.0.0
 lib/libxcb-record.0.0.0.dylib
 lib/libxcb-record.0.dylib
+lib/libxcb-record.a
 lib/libxcb-record.dylib
 lib/libxcb-record.la
-lib/libxcb-render-util.0.0.0.dylib
-lib/libxcb-render-util.0.dylib
-lib/libxcb-render-util.dylib
+lib/libxcb-record.so
+lib/libxcb-record.so.0
+lib/libxcb-record.so.0.0
 lib/libxcb-render.0.0.0.dylib
 lib/libxcb-render.0.dylib
+lib/libxcb-render.a
 lib/libxcb-render.dylib
 lib/libxcb-render.la
-lib/libxcb-reply.1.0.0.dylib
-lib/libxcb-reply.1.dylib
-lib/libxcb-reply.dylib
+lib/libxcb-render.so
+lib/libxcb-render.so.0
+lib/libxcb-render.so.0.0
 lib/libxcb-res.0.0.0.dylib
 lib/libxcb-res.0.dylib
+lib/libxcb-res.a
 lib/libxcb-res.dylib
 lib/libxcb-res.la
+lib/libxcb-res.so
+lib/libxcb-res.so.0
+lib/libxcb-res.so.0.0
 lib/libxcb-screensaver.0.0.0.dylib
 lib/libxcb-screensaver.0.dylib
+lib/libxcb-screensaver.a
 lib/libxcb-screensaver.dylib
 lib/libxcb-screensaver.la
+lib/libxcb-screensaver.so
+lib/libxcb-screensaver.so.0
+lib/libxcb-screensaver.so.0.0
 lib/libxcb-shape.0.0.0.dylib
 lib/libxcb-shape.0.dylib
+lib/libxcb-shape.a
 lib/libxcb-shape.dylib
 lib/libxcb-shape.la
+lib/libxcb-shape.so
+lib/libxcb-shape.so.0
+lib/libxcb-shape.so.0.0
 lib/libxcb-shm.0.0.0.dylib
 lib/libxcb-shm.0.dylib
+lib/libxcb-shm.a
 lib/libxcb-shm.dylib
 lib/libxcb-shm.la
+lib/libxcb-shm.so
+lib/libxcb-shm.so.0
+lib/libxcb-shm.so.0.0
 lib/libxcb-sync.0.0.0.dylib
 lib/libxcb-sync.0.dylib
+lib/libxcb-sync.a
 lib/libxcb-sync.dylib
 lib/libxcb-sync.la
+lib/libxcb-sync.so
+lib/libxcb-sync.so.0
+lib/libxcb-sync.so.0.0
 lib/libxcb-wm.0.0.0.dylib
 lib/libxcb-wm.0.dylib
 lib/libxcb-wm.dylib
 lib/libxcb-xevie.0.0.0.dylib
 lib/libxcb-xevie.0.dylib
+lib/libxcb-xevie.a
 lib/libxcb-xevie.dylib
 lib/libxcb-xevie.la
+lib/libxcb-xevie.so
+lib/libxcb-xevie.so.0
+lib/libxcb-xevie.so.0.0
 lib/libxcb-xf86dri.0.0.0.dylib
 lib/libxcb-xf86dri.0.dylib
+lib/libxcb-xf86dri.a
 lib/libxcb-xf86dri.dylib
 lib/libxcb-xf86dri.la
+lib/libxcb-xf86dri.so
+lib/libxcb-xf86dri.so.0
+lib/libxcb-xf86dri.so.0.0
 lib/libxcb-xfixes.0.0.0.dylib
 lib/libxcb-xfixes.0.dylib
+lib/libxcb-xfixes.a
 lib/libxcb-xfixes.dylib
 lib/libxcb-xfixes.la
+lib/libxcb-xfixes.so
+lib/libxcb-xfixes.so.0
+lib/libxcb-xfixes.so.0.0
 lib/libxcb-xinerama.0.0.0.dylib
 lib/libxcb-xinerama.0.dylib
+lib/libxcb-xinerama.a
 lib/libxcb-xinerama.dylib
 lib/libxcb-xinerama.la
+lib/libxcb-xinerama.so
+lib/libxcb-xinerama.so.0
+lib/libxcb-xinerama.so.0.0
 lib/libxcb-xprint.0.0.0.dylib
 lib/libxcb-xprint.0.dylib
 lib/libxcb-xprint.dylib
 lib/libxcb-xprint.la
 lib/libxcb-xtest.0.0.0.dylib
 lib/libxcb-xtest.0.dylib
+lib/libxcb-xtest.a
 lib/libxcb-xtest.dylib
 lib/libxcb-xtest.la
+lib/libxcb-xtest.so
+lib/libxcb-xtest.so.0
+lib/libxcb-xtest.so.0.0
 lib/libxcb-xv.0.0.0.dylib
 lib/libxcb-xv.0.dylib
+lib/libxcb-xv.a
 lib/libxcb-xv.dylib
 lib/libxcb-xv.la
+lib/libxcb-xv.so
+lib/libxcb-xv.so.0
+lib/libxcb-xv.so.0.0
 lib/libxcb-xvmc.0.0.0.dylib
 lib/libxcb-xvmc.0.dylib
+lib/libxcb-xvmc.a
 lib/libxcb-xvmc.dylib
 lib/libxcb-xvmc.la
+lib/libxcb-xvmc.so
+lib/libxcb-xvmc.so.0
+lib/libxcb-xvmc.so.0.0
 lib/libxcb.1.1.0.dylib
 lib/libxcb.1.dylib
+lib/libxcb.a
 lib/libxcb.dylib
 lib/libxcb.la
-lib/pkgconfig/xcb-atom.pc
-lib/pkgconfig/xcb-aux.pc
+lib/libxcb.so
+lib/libxcb.so.1
+lib/libxcb.so.1.1
 lib/pkgconfig/xcb-composite.pc
 lib/pkgconfig/xcb-damage.pc
 lib/pkgconfig/xcb-dpms.pc
 lib/pkgconfig/xcb-dri2.pc
-lib/pkgconfig/xcb-event.pc
 lib/pkgconfig/xcb-glx.pc
-lib/pkgconfig/xcb-icccm.pc
-lib/pkgconfig/xcb-image.pc
-lib/pkgconfig/xcb-keysyms.pc
-lib/pkgconfig/xcb-property.pc
 lib/pkgconfig/xcb-randr.pc
 lib/pkgconfig/xcb-record.pc
 lib/pkgconfig/xcb-render.pc
-lib/pkgconfig/xcb-renderutil.pc
-lib/pkgconfig/xcb-reply.pc
 lib/pkgconfig/xcb-res.pc
 lib/pkgconfig/xcb-screensaver.pc
 lib/pkgconfig/xcb-shape.pc