Apply patch from Bernd Ernesti in PR 43392, updating the package

for recent changes in NetBSD-current's xsrc.

Bump version.

20 files changed, 148 insertions, 61 deletions

diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index 8f0763a4bea..cf03b44f101 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.112 2010/05/30 12:55:17 martin Exp $
+# $NetBSD: Makefile,v 1.113 2010/05/31 21:20:02 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.48
+DISTNAME=	x11-links-0.49
 CATEGORIES=	pkgtools x11
 PKGREVISION=	1
 MASTER_SITES=	# empty
diff --git a/pkgtools/x11-links/buildlink3.mk b/pkgtools/x11-links/buildlink3.mk
index 63244db54ef..55f049dc358 100644
--- a/pkgtools/x11-links/buildlink3.mk
+++ b/pkgtools/x11-links/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2010/04/30 03:37:44 sbd Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2010/05/31 21:20:02 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.48
+BUILDLINK_API_DEPENDS.x11-links+=	x11-links>=0.49
 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 bfea078da3f..c0f6bb4f5c1 100644
--- a/pkgtools/x11-links/files/xfree.MesaLib
+++ b/pkgtools/x11-links/files/xfree.MesaLib
@@ -1,18 +1,23 @@
-# $NetBSD: xfree.MesaLib,v 1.5 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: xfree.MesaLib,v 1.6 2010/05/31 21:20:02 wiz Exp $
 #
 include/GL/GLwDrawA.h
 include/GL/GLwDrawAP.h
 include/GL/GLwMDrawA.h
 include/GL/GLwMDrawAP.h
 include/GL/gl.h
+include/GL/gl_mangle.h
 include/GL/glext.h
 include/GL/glx.h
+include/GL/glx_mangle.h
 include/GL/glxext.h
 include/GL/glxint.h
 include/GL/glxmd.h
 include/GL/glxproto.h
 include/GL/glxtokens.h
 include/GL/osmesa.h
+include/GL/xmesa.h
+include/GL/xmesa_x.h
+include/GL/xmesa_xf86.h
 lib/libGL.a
 lib/libGL.so
 lib/libGL.so.1
@@ -37,3 +42,5 @@ lib/libOSMesa.so.6.5.3
 lib/libOSMesa.dylib
 lib/libOSMesa.4.dylib
 lib/libOSMesa.4.0.dylib
+lib/pkgconfig/gl.pc
+lib/pkgconfig/glw.pc
diff --git a/pkgtools/x11-links/files/xorg b/pkgtools/x11-links/files/xorg
index 72b09055c88..41562a339b1 100644
--- a/pkgtools/x11-links/files/xorg
+++ b/pkgtools/x11-links/files/xorg
@@ -1,4 +1,4 @@
-# $NetBSD: xorg,v 1.13 2009/12/30 17:10:32 tron Exp $
+# $NetBSD: xorg,v 1.14 2010/05/31 21:20:02 wiz 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
@@ -249,8 +249,6 @@ include/X11/extensions/XKBui.h
 include/X11/extensions/XKM.h
 include/X11/extensions/XKMformat.h
 include/X11/extensions/XResproto.h
-include/X11/extensions/Xevie.h
-include/X11/extensions/Xeviestr.h
 include/X11/extensions/Xinerama.h
 include/X11/extensions/XvMClib.h
 include/X11/extensions/damageproto.h
@@ -264,19 +262,11 @@ include/X11/extensions/panoramiXext.h
 include/X11/extensions/panoramiXproto.h
 include/X11/extensions/panoramiXwrap.h
 include/X11/extensions/record.h
-include/X11/extensions/recordstr.h
 include/X11/extensions/scrnsaver.h
 include/X11/extensions/xevieplaceholder.h
-include/X11/extensions/xf86bigfont.h
-include/X11/extensions/xf86bigfstr.h
-include/X11/extensions/xf86dga.h
-include/X11/extensions/xf86dga1.h
-include/X11/extensions/xf86dga1str.h
-include/X11/extensions/xf86dgastr.h
 include/X11/extensions/xf86misc.h
 include/X11/extensions/xf86mscstr.h
 include/X11/extensions/xf86vmode.h
-include/X11/extensions/xf86vmstr.h
 include/X11/extensions/xtrapbits.h
 include/X11/extensions/xtrapddmi.h
 include/X11/extensions/xtrapdi.h
@@ -460,13 +450,6 @@ lib/libXxf86misc.dylib
 lib/libXxf86vm.1.0.0.dylib
 lib/libXxf86vm.1.dylib
 lib/libXxf86vm.dylib
-lib/libXxf86dga.a
-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/libXxf86misc.a
 lib/libXxf86misc.so
 lib/libXxf86misc.so.1
@@ -540,6 +523,8 @@ lib/libxkbui.so.1
 lib/libxkbui.so.1.0
 lib/libxkbui.so.2
 lib/libxkbui.so.2.0
+lib/pkgconfig/xaw6.pc
+lib/pkgconfig/xaw7.pc
 lib/pkgconfig/xfontcache.pc
 lib/pkgconfig/xi.pc
 lib/pkgconfig/xkbfile.pc
@@ -547,6 +532,5 @@ lib/pkgconfig/xkbui.pc
 lib/pkgconfig/xp.pc
 lib/pkgconfig/xprintapputil.pc
 lib/pkgconfig/xvmc.pc
-lib/pkgconfig/xxf86dga.pc
 lib/pkgconfig/xxf86misc.pc
 lib/pkgconfig/xxf86vm.pc
diff --git a/pkgtools/x11-links/files/xorg.bigreqsproto b/pkgtools/x11-links/files/xorg.bigreqsproto
index 76ef20dd043..d9921f56ab4 100644
--- a/pkgtools/x11-links/files/xorg.bigreqsproto
+++ b/pkgtools/x11-links/files/xorg.bigreqsproto
@@ -1,3 +1,5 @@
-# $NetBSD: xorg.bigreqsproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: xorg.bigreqsproto,v 1.3 2010/05/31 21:20:02 wiz Exp $
 #
+include/X11/extensions/bigreqsproto.h
+include/X11/extensions/bigreqstr.h
 lib/pkgconfig/bigreqsproto.pc
diff --git a/pkgtools/x11-links/files/xorg.evieext b/pkgtools/x11-links/files/xorg.evieext
index 3759623d3ee..54278069fb8 100644
--- a/pkgtools/x11-links/files/xorg.evieext
+++ b/pkgtools/x11-links/files/xorg.evieext
@@ -1,3 +1,5 @@
-# $NetBSD: xorg.evieext,v 1.2 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: xorg.evieext,v 1.3 2010/05/31 21:20:02 wiz Exp $
 #
+include/X11/extensions/Xeviestr.h
+include/X11/extensions/evieproto.h
 lib/pkgconfig/evieproto.pc
diff --git a/pkgtools/x11-links/files/xorg.glu b/pkgtools/x11-links/files/xorg.glu
index e287ff86a75..6f7b6c7b66b 100644
--- a/pkgtools/x11-links/files/xorg.glu
+++ b/pkgtools/x11-links/files/xorg.glu
@@ -1,6 +1,7 @@
-# $NetBSD: xorg.glu,v 1.3 2010/02/18 12:32:19 obache Exp $
+# $NetBSD: xorg.glu,v 1.4 2010/05/31 21:20:02 wiz Exp $
 #
 include/GL/glu.h
+include/GL/glu_mangle.h
 lib/libGLU.a
 lib/libGLU.so
 lib/libGLU.so.1
diff --git a/pkgtools/x11-links/files/xorg.inputproto b/pkgtools/x11-links/files/xorg.inputproto
index 94a4c21a246..5e4d03b759d 100644
--- a/pkgtools/x11-links/files/xorg.inputproto
+++ b/pkgtools/x11-links/files/xorg.inputproto
@@ -1,6 +1,9 @@
-# $NetBSD: xorg.inputproto,v 1.1 2008/01/05 16:08:53 tron Exp $
+# $NetBSD: xorg.inputproto,v 1.2 2010/05/31 21:20:02 wiz Exp $
 #
 include/X11/extensions/XI.h
+include/X11/extensions/XI2.h
+include/X11/extensions/XI2proto.h
 include/X11/extensions/XInput.h
+include/X11/extensions/XInput2.h
 include/X11/extensions/XIproto.h
 lib/pkgconfig/inputproto.pc
diff --git a/pkgtools/x11-links/files/xorg.libX11 b/pkgtools/x11-links/files/xorg.libX11
index 2f36fd384b7..e7ec14b2a4f 100644
--- a/pkgtools/x11-links/files/xorg.libX11
+++ b/pkgtools/x11-links/files/xorg.libX11
@@ -1,8 +1,10 @@
-# $NetBSD: xorg.libX11,v 1.3 2010/02/18 12:32:19 obache Exp $
+# $NetBSD: xorg.libX11,v 1.4 2010/05/31 21:20:02 wiz Exp $
 #
 include/X11/ImUtil.h
 include/X11/XKBlib.h
 include/X11/Xcms.h
+include/X11/Xcmsint.h
+include/X11/Xlcint.h
 include/X11/Xlib.h
 include/X11/XlibConf.h
 include/X11/Xlibint.h
diff --git a/pkgtools/x11-links/files/xorg.libXevie b/pkgtools/x11-links/files/xorg.libXevie
index f1656e22cbc..28b68edeb65 100644
--- a/pkgtools/x11-links/files/xorg.libXevie
+++ b/pkgtools/x11-links/files/xorg.libXevie
@@ -1,5 +1,6 @@
-# $NetBSD: xorg.libXevie,v 1.3 2009/12/30 17:10:33 tron Exp $
+# $NetBSD: xorg.libXevie,v 1.4 2010/05/31 21:20:02 wiz Exp $
 #
+include/X11/extensions/Xevie.h
 lib/libXevie.1.0.0.dylib
 lib/libXevie.1.dylib
 lib/libXevie.dylib
diff --git a/pkgtools/x11-links/files/xorg.libXext b/pkgtools/x11-links/files/xorg.libXext
index 80be60499db..bca63473b8b 100644
--- a/pkgtools/x11-links/files/xorg.libXext
+++ b/pkgtools/x11-links/files/xorg.libXext
@@ -1,5 +1,24 @@
-# $NetBSD: xorg.libXext,v 1.3 2010/02/18 12:32:19 obache Exp $
+# $NetBSD: xorg.libXext,v 1.4 2010/05/31 21:20:02 wiz Exp $
 #
+include/X11/extensions/MITMisc.h
+include/X11/extensions/XEVI.h
+include/X11/extensions/XLbx.h
+include/X11/extensions/XShm.h
+include/X11/extensions/Xag.h
+include/X11/extensions/Xcup.h
+include/X11/extensions/Xdbe.h
+include/X11/extensions/Xext.h
+include/X11/extensions/Xge.h
+include/X11/extensions/dpms.h
+include/X11/extensions/extutil.h
+include/X11/extensions/lbxbuf.h
+include/X11/extensions/lbxbufstr.h
+include/X11/extensions/lbximage.h
+include/X11/extensions/multibuf.h
+include/X11/extensions/security.h
+include/X11/extensions/shape.h
+include/X11/extensions/sync.h
+include/X11/extensions/xtestext1.h
 lib/libXext.6.3.dylib
 lib/libXext.6.4.0.dylib
 lib/libXext.6.4.dylib
diff --git a/pkgtools/x11-links/files/xorg.libdrm b/pkgtools/x11-links/files/xorg.libdrm
index e6d32ceadb5..fcc55a0cdb3 100644
--- a/pkgtools/x11-links/files/xorg.libdrm
+++ b/pkgtools/x11-links/files/xorg.libdrm
@@ -1,5 +1,27 @@
-# $NetBSD: xorg.libdrm,v 1.3 2009/12/30 17:10:33 tron Exp $
+# $NetBSD: xorg.libdrm,v 1.4 2010/05/31 21:20:02 wiz Exp $
 #
+include/libdrm/drm.h
+include/libdrm/drm_mode.h
+include/libdrm/drm_sarea.h
+include/libdrm/i915_drm.h
+include/libdrm/intel_bufmgr.h
+include/libdrm/mach64_drm.h
+include/libdrm/mga_drm.h
+include/libdrm/nouveau_drm.h
+include/libdrm/r128_drm.h
+include/libdrm/radeon_bo.h
+include/libdrm/radeon_bo_gem.h
+include/libdrm/radeon_bo_int.h
+include/libdrm/radeon_cs.h
+include/libdrm/radeon_cs_gem.h
+include/libdrm/radeon_cs_int.h
+include/libdrm/radeon_drm.h
+include/libdrm/savage_drm.h
+include/libdrm/sis_drm.h
+include/libdrm/via_drm.h
+include/libkms/libkms.h
+include/xf86drm.h
+include/xf86drmMode.h
 include/X11/xf86drm.h
 include/X11/xf86mm.h
 lib/libdrm.a
@@ -9,4 +31,7 @@ lib/libdrm.so.2.3
 lib/libdrm.so.2.4
 lib/libdrm.so.3
 lib/libdrm.so.3.1
+lib/libdrm.so.3.2
 lib/pkgconfig/libdrm.pc
+lib/pkgconfig/libdrm_intel.pc
+lib/pkgconfig/libdrm_radeon.pc
diff --git a/pkgtools/x11-links/files/xorg.pixman b/pkgtools/x11-links/files/xorg.pixman
index b4ace00ce96..9956116bcb6 100644
--- a/pkgtools/x11-links/files/xorg.pixman
+++ b/pkgtools/x11-links/files/xorg.pixman
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.pixman,v 1.5 2010/02/18 12:32:19 obache Exp $
+# $NetBSD: xorg.pixman,v 1.6 2010/05/31 21:20:02 wiz Exp $
 #
 include/pixman-1/pixman.h
 include/pixman-1/pixman-version.h
@@ -14,5 +14,6 @@ lib/libpixman-1.so.1
 lib/libpixman-1.so.1.0
 lib/libpixman-1.so.2
 lib/libpixman-1.so.2.0
+lib/libpixman-1.so.2.1
 lib/libpixman-1.so.15.0
 lib/pkgconfig/pixman-1.pc
diff --git a/pkgtools/x11-links/files/xorg.recordproto b/pkgtools/x11-links/files/xorg.recordproto
index a0afb0cef2a..faf1834da93 100644
--- a/pkgtools/x11-links/files/xorg.recordproto
+++ b/pkgtools/x11-links/files/xorg.recordproto
@@ -1,3 +1,6 @@
-# $NetBSD: xorg.recordproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: xorg.recordproto,v 1.3 2010/05/31 21:20:02 wiz Exp $
 #
+include/X11/extensions/recordconst.h
+include/X11/extensions/recordproto.h
+include/X11/extensions/recordstr.h
 lib/pkgconfig/recordproto.pc
diff --git a/pkgtools/x11-links/files/xorg.xcmiscproto b/pkgtools/x11-links/files/xorg.xcmiscproto
index d93f8e4a4f8..505bc5a119a 100644
--- a/pkgtools/x11-links/files/xorg.xcmiscproto
+++ b/pkgtools/x11-links/files/xorg.xcmiscproto
@@ -1,3 +1,5 @@
-# $NetBSD: xorg.xcmiscproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: xorg.xcmiscproto,v 1.3 2010/05/31 21:20:02 wiz Exp $
 #
+include/X11/extensions/xcmiscproto.h
+include/X11/extensions/xcmiscstr.h
 lib/pkgconfig/xcmiscproto.pc
diff --git a/pkgtools/x11-links/files/xorg.xextproto b/pkgtools/x11-links/files/xorg.xextproto
index e6349bdd281..d324452199f 100644
--- a/pkgtools/x11-links/files/xorg.xextproto
+++ b/pkgtools/x11-links/files/xorg.xextproto
@@ -1,6 +1,7 @@
-# $NetBSD: xorg.xextproto,v 1.3 2010/05/30 12:55:17 martin Exp $
-include/X11/extensions/MITMisc.h
-include/X11/extensions/XEVI.h
+# $NetBSD: xorg.xextproto,v 1.4 2010/05/31 21:20:02 wiz Exp $
+#
+include/X11/extensions/EVI.h
+include/X11/extensions/EVIproto.h
 include/X11/extensions/XEVIstr.h
 include/X11/extensions/XI.h
 include/X11/extensions/XInput.h
@@ -10,50 +11,56 @@ include/X11/extensions/XKBgeom.h
 include/X11/extensions/XKBproto.h
 include/X11/extensions/XKBsrv.h
 include/X11/extensions/XKBstr.h
-include/X11/extensions/XLbx.h
-include/X11/extensions/XShm.h
 include/X11/extensions/XTest.h
-include/X11/extensions/Xag.h
 include/X11/extensions/Xagsrv.h
 include/X11/extensions/Xagstr.h
-include/X11/extensions/Xcup.h
 include/X11/extensions/Xcupstr.h
-include/X11/extensions/Xdbe.h
 include/X11/extensions/Xdbeproto.h
-include/X11/extensions/Xext.h
-include/X11/extensions/Xge.h
 include/X11/extensions/Xv.h
 include/X11/extensions/XvMC.h
 include/X11/extensions/XvMCproto.h
 include/X11/extensions/Xvproto.h
-include/X11/extensions/bigreqstr.h
-include/X11/extensions/dpms.h
+include/X11/extensions/ag.h
+include/X11/extensions/agproto.h
+include/X11/extensions/cup.h
+include/X11/extensions/cupproto.h
+include/X11/extensions/dbe.h
+include/X11/extensions/dbeproto.h
+include/X11/extensions/dpmsconst.h
+include/X11/extensions/dpmsproto.h
 include/X11/extensions/dpmsstr.h
-include/X11/extensions/extutil.h
 include/X11/extensions/ge.h
 include/X11/extensions/geproto.h
-include/X11/extensions/lbxbuf.h
-include/X11/extensions/lbxbufstr.h
+include/X11/extensions/lbx.h
 include/X11/extensions/lbxdeltastr.h
-include/X11/extensions/lbximage.h
 include/X11/extensions/lbxopts.h
+include/X11/extensions/lbxproto.h
 include/X11/extensions/lbxstr.h
 include/X11/extensions/lbxzlib.h
+include/X11/extensions/mitmiscconst.h
+include/X11/extensions/mitmiscproto.h
 include/X11/extensions/mitmiscstr.h
-include/X11/extensions/multibuf.h
+include/X11/extensions/multibufconst.h
+include/X11/extensions/multibufproto.h
 include/X11/extensions/multibufst.h
 include/X11/extensions/saver.h
 include/X11/extensions/saverproto.h
-include/X11/extensions/security.h
+include/X11/extensions/secur.h
+include/X11/extensions/securproto.h
 include/X11/extensions/securstr.h
-include/X11/extensions/shape.h
 include/X11/extensions/shapeconst.h
+include/X11/extensions/shapeproto.h
 include/X11/extensions/shapestr.h
+include/X11/extensions/shm.h
+include/X11/extensions/shmproto.h
 include/X11/extensions/shmstr.h
-include/X11/extensions/sync.h
+include/X11/extensions/syncconst.h
+include/X11/extensions/syncproto.h
 include/X11/extensions/syncstr.h
-include/X11/extensions/xcmiscstr.h
-include/X11/extensions/xtestext1.h
+include/X11/extensions/xtestconst.h
 include/X11/extensions/xteststr.h
+include/X11/extensions/xtestext1const.h
+include/X11/extensions/xtestext1proto.h
+include/X11/extensions/xtestproto.h
 lib/pkgconfig/xextensions.pc
 lib/pkgconfig/xextproto.pc
diff --git a/pkgtools/x11-links/files/xorg.xf86bigfontproto b/pkgtools/x11-links/files/xorg.xf86bigfontproto
index f79e13b3341..0694e89f287 100644
--- a/pkgtools/x11-links/files/xorg.xf86bigfontproto
+++ b/pkgtools/x11-links/files/xorg.xf86bigfontproto
@@ -1,3 +1,6 @@
-# $NetBSD: xorg.xf86bigfontproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: xorg.xf86bigfontproto,v 1.3 2010/05/31 21:20:02 wiz Exp $
 #
+include/X11/extensions/xf86bigfont.h
+include/X11/extensions/xf86bigfproto.h
+include/X11/extensions/xf86bigfstr.h
 lib/pkgconfig/xf86bigfontproto.pc
diff --git a/pkgtools/x11-links/files/xorg.xf86dgaproto b/pkgtools/x11-links/files/xorg.xf86dgaproto
index 741ba29f8c3..ab99107e0c2 100644
--- a/pkgtools/x11-links/files/xorg.xf86dgaproto
+++ b/pkgtools/x11-links/files/xorg.xf86dgaproto
@@ -1,3 +1,20 @@
-# $NetBSD: xorg.xf86dgaproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: xorg.xf86dgaproto,v 1.3 2010/05/31 21:20:02 wiz Exp $
 #
+include/X11/extensions/Xxf86dga.h
+include/X11/extensions/xf86dga.h
+include/X11/extensions/xf86dga1.h
+include/X11/extensions/xf86dga1const.h
+include/X11/extensions/xf86dga1proto.h
+include/X11/extensions/xf86dga1str.h
+include/X11/extensions/xf86dgaconst.h
+include/X11/extensions/xf86dgaproto.h
+include/X11/extensions/xf86dgastr.h
+lib/libXxf86dga.a
+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/pkgconfig/xf86dgaproto.pc
+lib/pkgconfig/xxf86dga.pc
diff --git a/pkgtools/x11-links/files/xorg.xf86driproto b/pkgtools/x11-links/files/xorg.xf86driproto
index 0721ce45812..cd22bbf5f01 100644
--- a/pkgtools/x11-links/files/xorg.xf86driproto
+++ b/pkgtools/x11-links/files/xorg.xf86driproto
@@ -1,5 +1,9 @@
-# $NetBSD: xorg.xf86driproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: xorg.xf86driproto,v 1.3 2010/05/31 21:20:02 wiz Exp $
 #
 include/X11/dri/xf86dri.h
+include/X11/dri/xf86driproto.h
 include/X11/dri/xf86dristr.h
+include/X11/extensions/dri2proto.h
+include/X11/extensions/dri2tokens.h
+lib/pkgconfig/dri2proto.pc
 lib/pkgconfig/xf86driproto.pc
diff --git a/pkgtools/x11-links/files/xorg.xf86vidmodeproto b/pkgtools/x11-links/files/xorg.xf86vidmodeproto
index 150c4cdcc6a..2e7f255fbd3 100644
--- a/pkgtools/x11-links/files/xorg.xf86vidmodeproto
+++ b/pkgtools/x11-links/files/xorg.xf86vidmodeproto
@@ -1,3 +1,7 @@
-# $NetBSD: xorg.xf86vidmodeproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+# $NetBSD: xorg.xf86vidmodeproto,v 1.3 2010/05/31 21:20:02 wiz Exp $
 #
+include/X11/extensions/xf86vm.h
+include/X11/extensions/xf86vmstr.h
+include/X11/extensions/xf86vmproto.h
 lib/pkgconfig/xf86vidmode.pc
+lib/pkgconfig/xf86vidmodeproto.pc