Add support for xcb-util.

Bump to 0.54.

While here, remove two _pic.a files from two other file lists -- no other
file list included any _pic.a.

6 files changed, 101 insertions, 9 deletions

diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index c32971f6d58..725b34dcacd 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.118 2010/09/11 20:15:20 wiz Exp $
+# $NetBSD: Makefile,v 1.119 2010/09/11 20:26:11 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.53
+DISTNAME=	x11-links-0.54
 CATEGORIES=	pkgtools x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/pkgtools/x11-links/buildlink3.mk b/pkgtools/x11-links/buildlink3.mk
index 1be8e5af109..a906fa62a11 100644
--- a/pkgtools/x11-links/buildlink3.mk
+++ b/pkgtools/x11-links/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.30 2010/09/11 20:15:20 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.31 2010/09/11 20:26:11 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.53
+BUILDLINK_API_DEPENDS.x11-links+=	x11-links>=0.54
 BUILDLINK_PKGSRCDIR.x11-links?=	../../pkgtools/x11-links
 BUILDLINK_DEPMETHOD.x11-links?=	build
 
diff --git a/pkgtools/x11-links/files/xorg.freetype2 b/pkgtools/x11-links/files/xorg.freetype2
index 826e4404a29..c7a9acf2143 100644
--- a/pkgtools/x11-links/files/xorg.freetype2
+++ b/pkgtools/x11-links/files/xorg.freetype2
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.freetype2,v 1.5 2010/02/18 12:32:19 obache Exp $
+# $NetBSD: xorg.freetype2,v 1.6 2010/09/11 20:26:11 wiz Exp $
 #
 bin/freetype-config
 include/freetype2/freetype/config/ftconfig.h
@@ -59,6 +59,5 @@ lib/libfreetype.so.6.3.17
 lib/libfreetype.so.7
 lib/libfreetype.so.7.1
 lib/libfreetype.so.17.0
-lib/libfreetype_pic.a
 lib/pkgconfig/freetype2.pc
 share/aclocal/freetype2.m4
diff --git a/pkgtools/x11-links/files/xorg.glu b/pkgtools/x11-links/files/xorg.glu
index 6f7b6c7b66b..6af6de9b3a1 100644
--- a/pkgtools/x11-links/files/xorg.glu
+++ b/pkgtools/x11-links/files/xorg.glu
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.glu,v 1.4 2010/05/31 21:20:02 wiz Exp $
+# $NetBSD: xorg.glu,v 1.5 2010/09/11 20:26:11 wiz Exp $
 #
 include/GL/glu.h
 include/GL/glu_mangle.h
@@ -13,5 +13,4 @@ lib/libGLU.so.7.0
 lib/libGLU.dylib
 lib/libGLU.1.dylib
 lib/libGLU.1.3.dylib
-lib/libGLU_pic.a
 lib/pkgconfig/glu.pc
diff --git a/pkgtools/x11-links/files/xorg.xcb-util b/pkgtools/x11-links/files/xorg.xcb-util
new file mode 100644
index 00000000000..ec5a73b1d1d
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.xcb-util
@@ -0,0 +1,93 @@
+@comment $NetBSD: xorg.xcb-util,v 1.1 2010/09/11 20:26:11 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.1.0.0.dylib
+lib/libxcb-atom.1.dylib
+lib/libxcb-atom.a
+lib/libxcb-atom.dylib
+lib/libxcb-atom.la
+lib/libxcb-atom.so
+lib/libxcb-atom.so.1
+lib/libxcb-atom.so.1.0
+lib/libxcb-aux.0.0.0.dylib
+lib/libxcb-aux.0.dylib
+lib/libxcb-aux.a
+lib/libxcb-aux.dylib
+lib/libxcb-aux.la
+lib/libxcb-aux.so
+lib/libxcb-aux.so.0
+lib/libxcb-aux.so.0.0
+lib/libxcb-event.1.0.0.dylib
+lib/libxcb-event.1.dylib
+lib/libxcb-event.a
+lib/libxcb-event.dylib
+lib/libxcb-event.la
+lib/libxcb-event.so
+lib/libxcb-event.so.1
+lib/libxcb-event.so.1.0
+lib/libxcb-icccm.1.0.0.dylib
+lib/libxcb-icccm.1.dylib
+lib/libxcb-icccm.a
+lib/libxcb-icccm.dylib
+lib/libxcb-icccm.la
+lib/libxcb-icccm.so
+lib/libxcb-icccm.so.1
+lib/libxcb-icccm.so.1.0
+lib/libxcb-image.0.0.0.dylib
+lib/libxcb-image.0.dylib
+lib/libxcb-image.a
+lib/libxcb-image.dylib
+lib/libxcb-image.la
+lib/libxcb-image.so
+lib/libxcb-image.so.0
+lib/libxcb-image.so.0.0
+lib/libxcb-keysyms.0.0.0.dylib
+lib/libxcb-keysyms.0.dylib
+lib/libxcb-keysyms.a
+lib/libxcb-keysyms.dylib
+lib/libxcb-keysyms.la
+lib/libxcb-keysyms.so
+lib/libxcb-keysyms.so.1
+lib/libxcb-keysyms.so.1.0
+lib/libxcb-property.1.0.0.dylib
+lib/libxcb-property.1.dylib
+lib/libxcb-property.a
+lib/libxcb-property.dylib
+lib/libxcb-property.la
+lib/libxcb-property.so
+lib/libxcb-property.so.1
+lib/libxcb-property.so.1.0
+lib/libxcb-render-util.0.0.0.dylib
+lib/libxcb-render-util.0.dylib
+lib/libxcb-render-util.a
+lib/libxcb-render-util.dylib
+lib/libxcb-render-util.la
+lib/libxcb-render-util.so
+lib/libxcb-render-util.so.0
+lib/libxcb-render-util.so.0.0
+lib/libxcb-reply.1.0.0.dylib
+lib/libxcb-reply.1.dylib
+lib/libxcb-reply.a
+lib/libxcb-reply.dylib
+lib/libxcb-reply.la
+lib/libxcb-reply.so
+lib/libxcb-reply.so.1
+lib/libxcb-reply.so.1.0
+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
diff --git a/pkgtools/x11-links/xorg.mk b/pkgtools/x11-links/xorg.mk
index 042c8d28043..ae1d2250865 100644
--- a/pkgtools/x11-links/xorg.mk
+++ b/pkgtools/x11-links/xorg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.mk,v 1.18 2010/09/11 19:47:31 tron Exp $
+# $NetBSD: xorg.mk,v 1.19 2010/09/11 20:26:11 wiz Exp $
 #
 # This is for X.org, but use "xfree" files also.
 
@@ -62,6 +62,7 @@ FILES_LIST=	${FILESDIR}/xorg
 .include "../../x11/videoproto/buildlink3.mk"
 .include "../../x11/xcmiscproto/buildlink3.mk"
 .include "../../x11/xcb-proto/buildlink3.mk"
+.include "../../x11/xcb-util/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/xf86bigfontproto/buildlink3.mk"
 .include "../../x11/xf86dgaproto/buildlink3.mk"