Update x11-links to 0.69.

* Move some MesaLib files from files/xorg to files/xfree.MesaLib,
  or unwanted MesaLib may be buildlinked (and result in build failure).
* Add some files from OpenBSD-5.0.

23 files changed, 69 insertions, 40 deletions

diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index f19aa31dc63..2527439e3b4 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.130 2011/09/21 14:58:37 joerg Exp $
+# $NetBSD: Makefile,v 1.131 2012/04/08 05:55:48 obache 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.68
+DISTNAME=	x11-links-0.69
 CATEGORIES=	pkgtools x11
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/pkgtools/x11-links/buildlink3.mk b/pkgtools/x11-links/buildlink3.mk
index 4e996f53b45..8d2ae8e89ba 100644
--- a/pkgtools/x11-links/buildlink3.mk
+++ b/pkgtools/x11-links/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.41 2012/01/01 14:41:44 joerg Exp $
+# $NetBSD: buildlink3.mk,v 1.42 2012/04/08 05:55:48 obache 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.66
+BUILDLINK_API_DEPENDS.x11-links+=	x11-links>=0.69
 BUILDLINK_PKGSRCDIR.x11-links?=	../../pkgtools/x11-links
 BUILDLINK_DEPMETHOD.x11-links?=	build
 
diff --git a/pkgtools/x11-links/files/xfree.MesaLib b/pkgtools/x11-links/files/xfree.MesaLib
index c0f6bb4f5c1..9b0353817b7 100644
--- a/pkgtools/x11-links/files/xfree.MesaLib
+++ b/pkgtools/x11-links/files/xfree.MesaLib
@@ -1,4 +1,4 @@
-# $NetBSD: xfree.MesaLib,v 1.6 2010/05/31 21:20:02 wiz Exp $
+# $NetBSD: xfree.MesaLib,v 1.7 2012/04/08 05:55:48 obache Exp $
 #
 include/GL/GLwDrawA.h
 include/GL/GLwDrawAP.h
@@ -23,6 +23,11 @@ lib/libGL.so
 lib/libGL.so.1
 lib/libGL.so.1.0.2
 lib/libGL.so.1.2
+lib/libGL.so.2
+lib/libGL.so.2.0
+lib/libGL.so.9.0
+lib/libGL.so.9.1
+lib/libGL.so.10.0
 lib/libGL.dylib
 lib/libGL.1.dylib
 lib/libGL.1.2.dylib
@@ -30,6 +35,9 @@ lib/libGLw.a
 lib/libGLw.so
 lib/libGLw.so.1
 lib/libGLw.so.1.0
+lib/libGLw.so.2
+lib/libGLw.so.2.0
+lib/libGLw.so.5.1
 lib/libGLw.dylib
 lib/libGLw.1.dylib
 lib/libGLw.1.0.dylib
@@ -39,8 +47,12 @@ lib/libOSMesa.so.4
 lib/libOSMesa.so.4.0
 lib/libOSMesa.so.6
 lib/libOSMesa.so.6.5.3
+lib/libOSMesa.so.7
+lib/libOSMesa.so.7.0
 lib/libOSMesa.dylib
 lib/libOSMesa.4.dylib
 lib/libOSMesa.4.0.dylib
+lib/libOSMesa.7.8.dylib
+lib/libOSMesa.7.dylib
 lib/pkgconfig/gl.pc
 lib/pkgconfig/glw.pc
diff --git a/pkgtools/x11-links/files/xorg b/pkgtools/x11-links/files/xorg
index 57e61f89424..6b1b3f51be8 100644
--- a/pkgtools/x11-links/files/xorg
+++ b/pkgtools/x11-links/files/xorg
@@ -1,4 +1,4 @@
-# $NetBSD: xorg,v 1.19 2011/09/09 09:08:07 abs Exp $
+# $NetBSD: xorg,v 1.20 2012/04/08 05:55:48 obache Exp $
 #
 # The files listed below are the union of the sets of files installed by
 # the supported Xorg (and some XFree) distributions, minus the set of files
@@ -290,21 +290,6 @@ lib/libFS.so.7
 lib/libFS.so.7.0
 lib/libFS.so.8.0
 lib/libFS.so.9.0
-lib/libGL.1.2.dylib
-lib/libGL.1.dylib
-lib/libGL.dylib
-lib/libGL.so.2
-lib/libGL.so.2.0
-lib/libGL.so.9.0
-lib/libGL.so.9.1
-lib/libGLw.so.2
-lib/libGLw.so.2.0
-lib/libGLw.so.5.1
-lib/libOSMesa.7.8.dylib
-lib/libOSMesa.7.dylib
-lib/libOSMesa.dylib
-lib/libOSMesa.so.7
-lib/libOSMesa.so.7.0
 lib/libPEX5.6.0.dylib
 lib/libPEX5.6.dylib
 lib/libPEX5.a
@@ -350,6 +335,7 @@ lib/libXaw7.so.7.0
 lib/libXaw7.so.10
 lib/libXaw7.so.10.0
 lib/libXaw7.so.12.0
+lib/libXaw7.so.14.0
 lib/libXaw7.7.0.0.dylib
 lib/libXaw7.7.dylib
 lib/libXaw8.a
@@ -370,6 +356,7 @@ lib/libXaw.so.7.0
 lib/libXaw.so.8
 lib/libXaw.so.8.0
 lib/libXaw.so.13.0
+lib/libXaw.so.14.0
 lib/libXaw6.6.dylib
 lib/libXaw7.7.dylib
 lib/libXaw8.8.dylib
@@ -413,6 +400,7 @@ lib/libXi.so.6.0
 lib/libXi.so.7
 lib/libXi.so.7.0
 lib/libXi.so.10.1
+lib/libXi.so.11.0
 lib/libXp.6.2.0.dylib
 lib/libXp.6.2.dylib
 lib/libXp.6.dylib
@@ -540,6 +528,8 @@ lib/libpsres.dylib
 lib/libpsres.so
 lib/libpsres.so.1
 lib/libpsres.so.1.0
+lib/libpthread-stubs.a
+lib/libpthread-stubs.so.1.0
 lib/libxf86config.a
 lib/libxkbfile.1.0.2.dylib
 lib/libxkbfile.1.dylib
@@ -553,6 +543,7 @@ lib/libxkbfile.so.1.0.2
 lib/libxkbfile.so.2
 lib/libxkbfile.so.2.0
 lib/libxkbfile.so.4.0
+lib/libxkbfile.so.5.0
 lib/libxkbui.1.0.0.dylib
 lib/libxkbui.1.dylib
 lib/libxkbui.dylib
diff --git a/pkgtools/x11-links/files/xorg.Xcomposite b/pkgtools/x11-links/files/xorg.Xcomposite
index 4aae6dc42e7..d2997be8ce9 100644
--- a/pkgtools/x11-links/files/xorg.Xcomposite
+++ b/pkgtools/x11-links/files/xorg.Xcomposite
@@ -1,8 +1,9 @@
-# $NetBSD: xorg.Xcomposite,v 1.5 2010/02/18 12:32:19 obache Exp $
+# $NetBSD: xorg.Xcomposite,v 1.6 2012/04/08 05:55:48 obache Exp $
 include/X11/extensions/Xcomposite.h
 lib/libXcomposite.1.0.0.dylib
 lib/libXcomposite.1.dylib
 lib/libXcomposite.dylib
+lib/libXcomposite.la
 lib/libXcomposite.so
 lib/libXcomposite.so.1
 lib/libXcomposite.so.1.0
diff --git a/pkgtools/x11-links/files/xorg.Xfixes b/pkgtools/x11-links/files/xorg.Xfixes
index fbce5c8cb74..81c14e404a3 100644
--- a/pkgtools/x11-links/files/xorg.Xfixes
+++ b/pkgtools/x11-links/files/xorg.Xfixes
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.Xfixes,v 1.5 2010/02/18 12:32:19 obache Exp $
+# $NetBSD: xorg.Xfixes,v 1.6 2012/04/08 05:55:48 obache Exp $
 #
 include/X11/extensions/Xfixes.h
 lib/libXfixes.3.1.0.dylib
@@ -13,4 +13,5 @@ lib/libXfixes.so.3.1
 lib/libXfixes.so.4
 lib/libXfixes.so.4.0
 lib/libXfixes.so.5.0
+lib/libXfixes.so.5.1
 lib/pkgconfig/xfixes.pc
diff --git a/pkgtools/x11-links/files/xorg.fontconfig b/pkgtools/x11-links/files/xorg.fontconfig
index 639764c07cf..02ea32b3a4a 100644
--- a/pkgtools/x11-links/files/xorg.fontconfig
+++ b/pkgtools/x11-links/files/xorg.fontconfig
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.fontconfig,v 1.6 2011/09/09 09:08:07 abs Exp $
+# $NetBSD: xorg.fontconfig,v 1.7 2012/04/08 05:55:48 obache Exp $
 #
 include/fontconfig/fcfreetype.h
 include/fontconfig/fcprivate.h
@@ -16,4 +16,5 @@ lib/libfontconfig.so.1.3
 lib/libfontconfig.so.2
 lib/libfontconfig.so.2.0
 lib/libfontconfig.so.6.0
+lib/libfontconfig.so.7.0
 lib/pkgconfig/fontconfig.pc
diff --git a/pkgtools/x11-links/files/xorg.freetype2 b/pkgtools/x11-links/files/xorg.freetype2
index f1875022c89..7111eca2241 100644
--- a/pkgtools/x11-links/files/xorg.freetype2
+++ b/pkgtools/x11-links/files/xorg.freetype2
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.freetype2,v 1.8 2011/08/01 15:09:28 wiz Exp $
+# $NetBSD: xorg.freetype2,v 1.9 2012/04/08 05:55:48 obache Exp $
 #
 bin/freetype-config
 include/freetype2/freetype/config/ftconfig.h
@@ -62,5 +62,6 @@ lib/libfreetype.so.7.1
 lib/libfreetype.so.7.2
 lib/libfreetype.so.7.3
 lib/libfreetype.so.17.0
+lib/libfreetype.so.18.0
 lib/pkgconfig/freetype2.pc
 share/aclocal/freetype2.m4
diff --git a/pkgtools/x11-links/files/xorg.libX11 b/pkgtools/x11-links/files/xorg.libX11
index 60cbe5a3d45..203874846ae 100644
--- a/pkgtools/x11-links/files/xorg.libX11
+++ b/pkgtools/x11-links/files/xorg.libX11
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.libX11,v 1.10 2011/09/09 09:08:07 abs Exp $
+# $NetBSD: xorg.libX11,v 1.11 2012/04/08 05:55:48 obache Exp $
 #
 include/X11/ImUtil.h
 include/X11/XKBlib.h
@@ -17,6 +17,7 @@ include/X11/cursorfont.h
 lib/libX11-xcb.1.0.0.dylib
 lib/libX11-xcb.1.dylib
 lib/libX11-xcb.dylib
+lib/libX11-xcb.la
 lib/libX11-xcb.so
 lib/libX11-xcb.so.1
 lib/libX11-xcb.so.1.0
@@ -31,6 +32,7 @@ lib/libX11.la
 lib/libX11.so
 lib/libX11.so.11.2
 lib/libX11.so.12.0
+lib/libX11.so.15.0
 lib/libX11.so.6
 lib/libX11.so.6.1
 lib/libX11.so.6.2
diff --git a/pkgtools/x11-links/files/xorg.libXdamage b/pkgtools/x11-links/files/xorg.libXdamage
index 1fa81ea2f44..eae0ce21082 100644
--- a/pkgtools/x11-links/files/xorg.libXdamage
+++ b/pkgtools/x11-links/files/xorg.libXdamage
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.libXdamage,v 1.5 2011/09/09 09:08:07 abs Exp $
+# $NetBSD: xorg.libXdamage,v 1.6 2012/04/08 05:55:48 obache Exp $
 #
 include/X11/extensions/Xdamage.h
 lib/libXdamage.1.1.0.dylib
@@ -6,6 +6,7 @@ lib/libXdamage.1.0.0.dylib
 lib/libXdamage.1.dylib
 lib/libXdamage.a
 lib/libXdamage.dylib
+lib/libXdamage.la
 lib/libXdamage.so
 lib/libXdamage.so.1
 lib/libXdamage.so.1.0
diff --git a/pkgtools/x11-links/files/xorg.libXevie b/pkgtools/x11-links/files/xorg.libXevie
index 28b68edeb65..000bba482f5 100644
--- a/pkgtools/x11-links/files/xorg.libXevie
+++ b/pkgtools/x11-links/files/xorg.libXevie
@@ -1,10 +1,11 @@
-# $NetBSD: xorg.libXevie,v 1.4 2010/05/31 21:20:02 wiz Exp $
+# $NetBSD: xorg.libXevie,v 1.5 2012/04/08 05:55:48 obache Exp $
 #
 include/X11/extensions/Xevie.h
 lib/libXevie.1.0.0.dylib
 lib/libXevie.1.dylib
 lib/libXevie.dylib
 lib/libXevie.a
+lib/libXevie.la
 lib/libXevie.so
 lib/libXevie.so.1
 lib/libXevie.so.1.0
diff --git a/pkgtools/x11-links/files/xorg.libXext b/pkgtools/x11-links/files/xorg.libXext
index 6b131251b26..6836e572b15 100644
--- a/pkgtools/x11-links/files/xorg.libXext
+++ b/pkgtools/x11-links/files/xorg.libXext
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.libXext,v 1.5 2011/02/26 08:14:58 mrg Exp $
+# $NetBSD: xorg.libXext,v 1.6 2012/04/08 05:55:48 obache Exp $
 #
 include/X11/extensions/MITMisc.h
 include/X11/extensions/XEVI.h
@@ -34,4 +34,5 @@ lib/libXext.so.7
 lib/libXext.so.7.0
 lib/libXext.so.7.1
 lib/libXext.so.10.0
+lib/libXext.so.12.0
 lib/pkgconfig/xext.pc
diff --git a/pkgtools/x11-links/files/xorg.libXfont b/pkgtools/x11-links/files/xorg.libXfont
index 28d4489e340..2422580b14a 100644
--- a/pkgtools/x11-links/files/xorg.libXfont
+++ b/pkgtools/x11-links/files/xorg.libXfont
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.libXfont,v 1.5 2010/06/09 09:33:42 obache Exp $
+# $NetBSD: xorg.libXfont,v 1.6 2012/04/08 05:55:48 obache Exp $
 #
 include/X11/fonts/bdfint.h
 include/X11/fonts/bitmap.h
@@ -22,6 +22,7 @@ lib/libXfont.1.4.1.dylib
 lib/libXfont.1.dylib
 lib/libXfont.a
 lib/libXfont.dylib
+lib/libXfont.la
 lib/libXfont.so
 lib/libXfont.so.1
 lib/libXfont.so.1.3
diff --git a/pkgtools/x11-links/files/xorg.libXpm b/pkgtools/x11-links/files/xorg.libXpm
index f6f3b21d0e2..f016665affd 100644
--- a/pkgtools/x11-links/files/xorg.libXpm
+++ b/pkgtools/x11-links/files/xorg.libXpm
@@ -1,7 +1,8 @@
-# $NetBSD: xorg.libXpm,v 1.3 2011/09/09 09:08:07 abs Exp $
+# $NetBSD: xorg.libXpm,v 1.4 2012/04/08 05:55:48 obache Exp $
 #
 include/X11/xpm.h
 lib/libXpm.a
+lib/libXpm.la
 lib/libXpm.so
 lib/libXpm.so.4
 lib/libXpm.so.4.11
diff --git a/pkgtools/x11-links/files/xorg.libXres b/pkgtools/x11-links/files/xorg.libXres
index e9aadc8a4c0..ebdbcea4a4c 100644
--- a/pkgtools/x11-links/files/xorg.libXres
+++ b/pkgtools/x11-links/files/xorg.libXres
@@ -1,10 +1,11 @@
-# $NetBSD: xorg.libXres,v 1.4 2010/02/18 12:32:19 obache Exp $
+# $NetBSD: xorg.libXres,v 1.5 2012/04/08 05:55:48 obache Exp $
 #
 include/X11/extensions/XRes.h
 lib/libXRes.a
 lib/libXRes.1.0.0.dylib
 lib/libXRes.1.dylib
 lib/libXRes.dylib
+lib/libXRes.la
 lib/libXRes.so
 lib/libXRes.so.1
 lib/libXRes.so.1.0
diff --git a/pkgtools/x11-links/files/xorg.libXtst b/pkgtools/x11-links/files/xorg.libXtst
index c2956c71d8f..0b7a4401010 100644
--- a/pkgtools/x11-links/files/xorg.libXtst
+++ b/pkgtools/x11-links/files/xorg.libXtst
@@ -1,8 +1,9 @@
-# $NetBSD: xorg.libXtst,v 1.3 2010/02/18 12:32:19 obache Exp $
+# $NetBSD: xorg.libXtst,v 1.4 2012/04/08 05:55:48 obache Exp $
 lib/libXtst.6.1.0.dylib
 lib/libXtst.6.1.dylib
 lib/libXtst.6.dylib
 lib/libXtst.a
+lib/libXtst.la
 lib/libXtst.dylib
 lib/libXtst.so
 lib/libXtst.so.6
diff --git a/pkgtools/x11-links/files/xorg.libXv b/pkgtools/x11-links/files/xorg.libXv
index 499dbbb6ee0..da17d8578b4 100644
--- a/pkgtools/x11-links/files/xorg.libXv
+++ b/pkgtools/x11-links/files/xorg.libXv
@@ -1,10 +1,11 @@
-# $NetBSD: xorg.libXv,v 1.3 2010/02/18 12:32:19 obache Exp $
+# $NetBSD: xorg.libXv,v 1.4 2012/04/08 05:55:48 obache Exp $
 #
 include/X11/extensions/Xvlib.h
 lib/libXv.1.0.0.dylib
 lib/libXv.1.0.dylib
 lib/libXv.1.dylib
 lib/libXv.a
+lib/libXv.la
 lib/libXv.dylib
 lib/libXv.so
 lib/libXv.so.1
diff --git a/pkgtools/x11-links/files/xorg.libdrm b/pkgtools/x11-links/files/xorg.libdrm
index bcd6b43dfd3..90d8ba70063 100644
--- a/pkgtools/x11-links/files/xorg.libdrm
+++ b/pkgtools/x11-links/files/xorg.libdrm
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.libdrm,v 1.5 2011/01/19 03:39:13 jmcneill Exp $
+# $NetBSD: xorg.libdrm,v 1.6 2012/04/08 05:55:48 obache Exp $
 #
 include/libdrm/drm.h
 include/libdrm/drm_mode.h
@@ -29,6 +29,7 @@ lib/libdrm.so
 lib/libdrm.so.2
 lib/libdrm.so.2.3
 lib/libdrm.so.2.4
+lib/libdrm.so.2.6
 lib/libdrm.so.3
 lib/libdrm.so.3.1
 lib/libdrm.so.3.2
@@ -36,10 +37,12 @@ lib/libdrm_intel.a
 lib/libdrm_intel.so
 lib/libdrm_intel.so.0
 lib/libdrm_intel.so.0.0
+lib/libdrm_intel.so.1.3
 lib/libdrm_radeon.a
 lib/libdrm_radeon.so
 lib/libdrm_radeon.so.0
 lib/libdrm_radeon.so.0.0
+lib/libdrm_radeon.so.1.0
 lib/pkgconfig/libdrm.pc
 lib/pkgconfig/libdrm_intel.pc
 lib/pkgconfig/libdrm_radeon.pc
diff --git a/pkgtools/x11-links/files/xorg.liblbxutil b/pkgtools/x11-links/files/xorg.liblbxutil
index 1b51171078c..ecaa4fb602b 100644
--- a/pkgtools/x11-links/files/xorg.liblbxutil
+++ b/pkgtools/x11-links/files/xorg.liblbxutil
@@ -1,6 +1,7 @@
-# $NetBSD: xorg.liblbxutil,v 1.3 2009/12/30 17:10:33 tron Exp $
+# $NetBSD: xorg.liblbxutil,v 1.4 2012/04/08 05:55:48 obache Exp $
 #
 lib/liblbxutil.a
+lib/liblbxutil.la
 lib/liblbxutil.so
 lib/liblbxutil.so.1
 lib/liblbxutil.so.1.0
diff --git a/pkgtools/x11-links/files/xorg.libxcb b/pkgtools/x11-links/files/xorg.libxcb
index 883ed3254dd..2d78e4328ad 100644
--- a/pkgtools/x11-links/files/xorg.libxcb
+++ b/pkgtools/x11-links/files/xorg.libxcb
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.libxcb,v 1.4 2011/09/09 09:08:07 abs Exp $
+# $NetBSD: xorg.libxcb,v 1.5 2012/04/08 05:55:48 obache Exp $
 #
 include/xcb/bigreq.h
 include/xcb/composite.h
@@ -78,6 +78,7 @@ lib/libxcb-randr.la
 lib/libxcb-randr.so
 lib/libxcb-randr.so.0
 lib/libxcb-randr.so.0.0
+lib/libxcb-randr.so.1.0
 lib/libxcb-record.0.0.0.dylib
 lib/libxcb-record.0.dylib
 lib/libxcb-record.a
@@ -153,6 +154,7 @@ lib/libxcb-xf86dri.la
 lib/libxcb-xf86dri.so
 lib/libxcb-xf86dri.so.0
 lib/libxcb-xf86dri.so.0.0
+lib/libxcb-xf86dri.so.1.0
 lib/libxcb-xfixes.0.0.0.dylib
 lib/libxcb-xfixes.0.dylib
 lib/libxcb-xfixes.a
@@ -173,6 +175,7 @@ lib/libxcb-xprint.0.0.0.dylib
 lib/libxcb-xprint.0.dylib
 lib/libxcb-xprint.dylib
 lib/libxcb-xprint.la
+lib/libxcb-xprint.so.0.0
 lib/libxcb-xtest.0.0.0.dylib
 lib/libxcb-xtest.0.dylib
 lib/libxcb-xtest.a
@@ -205,6 +208,7 @@ lib/libxcb.la
 lib/libxcb.so
 lib/libxcb.so.1
 lib/libxcb.so.1.1
+lib/libxcb.so.2.2
 lib/pkgconfig/xcb-composite.pc
 lib/pkgconfig/xcb-damage.pc
 lib/pkgconfig/xcb-dpms.pc
diff --git a/pkgtools/x11-links/files/xorg.pixman b/pkgtools/x11-links/files/xorg.pixman
index 84dc5d3d319..4e14b10b57f 100644
--- a/pkgtools/x11-links/files/xorg.pixman
+++ b/pkgtools/x11-links/files/xorg.pixman
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.pixman,v 1.7 2011/09/09 09:08:07 abs Exp $
+# $NetBSD: xorg.pixman,v 1.8 2012/04/08 05:55:48 obache Exp $
 #
 include/pixman-1/pixman.h
 include/pixman-1/pixman-version.h
@@ -17,4 +17,5 @@ lib/libpixman-1.so.2
 lib/libpixman-1.so.2.0
 lib/libpixman-1.so.2.1
 lib/libpixman-1.so.15.0
+lib/libpixman-1.so.22.2
 lib/pkgconfig/pixman-1.pc
diff --git a/pkgtools/x11-links/files/xorg.xcb-util b/pkgtools/x11-links/files/xorg.xcb-util
index b6c9ea10024..8a75e1dc78b 100644
--- a/pkgtools/x11-links/files/xorg.xcb-util
+++ b/pkgtools/x11-links/files/xorg.xcb-util
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.xcb-util,v 1.2 2010/09/11 20:39:22 wiz Exp $
+# $NetBSD: xorg.xcb-util,v 1.3 2012/04/08 05:55:48 obache Exp $
 include/xcb/xcb_atom.h
 include/xcb/xcb_aux.h
 include/xcb/xcb_bitops.h
@@ -42,6 +42,7 @@ lib/libxcb-icccm.la
 lib/libxcb-icccm.so
 lib/libxcb-icccm.so.1
 lib/libxcb-icccm.so.1.0
+lib/libxcb-icccm.so.1.1
 lib/libxcb-image.0.0.0.dylib
 lib/libxcb-image.0.dylib
 lib/libxcb-image.a
diff --git a/pkgtools/x11-links/files/xorg.xf86dgaproto b/pkgtools/x11-links/files/xorg.xf86dgaproto
index ab99107e0c2..fb6360194a9 100644
--- a/pkgtools/x11-links/files/xorg.xf86dgaproto
+++ b/pkgtools/x11-links/files/xorg.xf86dgaproto
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.xf86dgaproto,v 1.3 2010/05/31 21:20:02 wiz Exp $
+# $NetBSD: xorg.xf86dgaproto,v 1.4 2012/04/08 05:55:48 obache Exp $
 #
 include/X11/extensions/Xxf86dga.h
 include/X11/extensions/xf86dga.h
@@ -10,11 +10,13 @@ include/X11/extensions/xf86dgaconst.h
 include/X11/extensions/xf86dgaproto.h
 include/X11/extensions/xf86dgastr.h
 lib/libXxf86dga.a
+lib/libXxf86dga.la
 lib/libXxf86dga.so
 lib/libXxf86dga.so.1
 lib/libXxf86dga.so.1.0
 lib/libXxf86dga.so.1.1
 lib/libXxf86dga.so.2
 lib/libXxf86dga.so.2.0
+lib/libXxf86dga.so.5.0
 lib/pkgconfig/xf86dgaproto.pc
 lib/pkgconfig/xxf86dga.pc