Merge cube-native-xorg, so that pkgsrc-current can be used with the native

X.Org found in NetBSD-current.

Thanks a lot to all who helped, especially Matthias Scheler who did
repeated tests on Mac OS X and older versions of NetBSD to make sure the
support for those platforms wouldn't be broken (or at least, not fatally,
as I would still expect a few hiccups here and there, because there is
only so much one can test in such limited time).

On the infrastructure side, this branch brings pkgconfig-builtin.mk, in
order to write very easily new builtin.mk files.  It can actually handle
more than just pkgconfig files, but it will provide a version if it finds
such a file.  x11.builtin.mk has also been made more useful and now all
existing (and future!) native-X11-related builtin.mk files should include
it.

49 files changed, 268 insertions, 90 deletions

diff --git a/pkgtools/x11-links/files/xfree.MesaLib b/pkgtools/x11-links/files/xfree.MesaLib
index 2a4d4797cf9..bfea078da3f 100644
--- a/pkgtools/x11-links/files/xfree.MesaLib
+++ b/pkgtools/x11-links/files/xfree.MesaLib
@@ -1,4 +1,4 @@
-# $NetBSD: xfree.MesaLib,v 1.4 2003/12/19 19:19:15 veego Exp $
+# $NetBSD: xfree.MesaLib,v 1.5 2008/10/05 21:36:35 cube Exp $
 #
 include/GL/GLwDrawA.h
 include/GL/GLwDrawAP.h
@@ -16,6 +16,7 @@ include/GL/osmesa.h
 lib/libGL.a
 lib/libGL.so
 lib/libGL.so.1
+lib/libGL.so.1.0.2
 lib/libGL.so.1.2
 lib/libGL.dylib
 lib/libGL.1.dylib
@@ -31,6 +32,8 @@ lib/libOSMesa.a
 lib/libOSMesa.so
 lib/libOSMesa.so.4
 lib/libOSMesa.so.4.0
+lib/libOSMesa.so.6
+lib/libOSMesa.so.6.5.3
 lib/libOSMesa.dylib
 lib/libOSMesa.4.dylib
 lib/libOSMesa.4.0.dylib
diff --git a/pkgtools/x11-links/files/xfree.Xft2 b/pkgtools/x11-links/files/xfree.Xft2
index 4c8bbfb22d5..e312938dae3 100644
--- a/pkgtools/x11-links/files/xfree.Xft2
+++ b/pkgtools/x11-links/files/xfree.Xft2
@@ -1,4 +1,4 @@
-# $NetBSD: xfree.Xft2,v 1.1 2004/02/17 16:50:26 jlam Exp $
+# $NetBSD: xfree.Xft2,v 1.2 2008/10/05 21:36:35 cube Exp $
 #
 include/X11/Xft/Xft.h
 include/X11/Xft/XftCompat.h
@@ -7,6 +7,8 @@ lib/libXft.so
 lib/libXft.so.2
 lib/libXft.so.2.0
 lib/libXft.so.2.1
+lib/libXft.so.2.1.2
 lib/libXft.dylib
 lib/libXft.2.dylib
 lib/libXft.2.0.dylib
+lib/pkgconfig/xft.pc
diff --git a/pkgtools/x11-links/files/xfree.xpm b/pkgtools/x11-links/files/xfree.xpm
index c1ddf9f8ea6..1fe9d9a165e 100644
--- a/pkgtools/x11-links/files/xfree.xpm
+++ b/pkgtools/x11-links/files/xfree.xpm
@@ -1,4 +1,4 @@
-# $NetBSD: xfree.xpm,v 1.2 2003/09/07 21:53:03 jlam Exp $
+# $NetBSD: xfree.xpm,v 1.3 2008/10/05 21:36:35 cube Exp $
 #
 include/X11/xpm.h
 lib/libXpm.a
@@ -8,3 +8,4 @@ lib/libXpm.so.4.11
 lib/libXpm.dylib
 lib/libXpm.4.dylib
 lib/libXpm.4.11.dylib
+lib/pkgconfig/xpm.pc
diff --git a/pkgtools/x11-links/files/xorg b/pkgtools/x11-links/files/xorg
index 0fc47ca264f..3cfa3b2ee42 100644
--- a/pkgtools/x11-links/files/xorg
+++ b/pkgtools/x11-links/files/xorg
@@ -1,4 +1,4 @@
-# $NetBSD: xorg,v 1.8 2008/09/16 12:38:38 tron Exp $
+# $NetBSD: xorg,v 1.9 2008/10/05 21:36:35 cube 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
@@ -248,9 +248,7 @@ include/X11/extensions/XKBrules.h
 include/X11/extensions/XKBui.h
 include/X11/extensions/XKM.h
 include/X11/extensions/XKMformat.h
-include/X11/extensions/XRes.h
 include/X11/extensions/XResproto.h
-include/X11/extensions/Xdamage.h
 include/X11/extensions/Xevie.h
 include/X11/extensions/Xeviestr.h
 include/X11/extensions/Xinerama.h
@@ -334,13 +332,6 @@ lib/libXIE.dylib
 lib/libXIE.so
 lib/libXIE.so.6
 lib/libXIE.so.6.0
-lib/libXRes.1.0.0.dylib
-lib/libXRes.1.dylib
-lib/libXRes.dylib
-lib/libXRes.a
-lib/libXRes.so
-lib/libXRes.so.1
-lib/libXRes.so.1.0
 lib/libXTrap.6.4.0.dylib
 lib/libXTrap.6.4.dylib
 lib/libXTrap.6.dylib
@@ -364,12 +355,11 @@ lib/libXaw.so.6
 lib/libXaw.so.6.1
 lib/libXaw.so.7
 lib/libXaw.so.7.0
+lib/libXaw.so.8
 lib/libXaw.so.8.0
-lib/libXdamage.1.0.0.dylib
-lib/libXdamage.1.dylib
-lib/libXdamage.dylib
-lib/libXdamage.a
-lib/libXdamage.so.1.0
+lib/libXaw6.6.dylib
+lib/libXaw7.7.dylib
+lib/libXaw8.8.dylib
 lib/libXevie.1.0.0.dylib
 lib/libXevie.1.dylib
 lib/libXevie.dylib
@@ -529,9 +519,9 @@ lib/libxkbfile.a
 lib/libxkbfile.so
 lib/libxkbfile.so.1
 lib/libxkbfile.so.1.0
+lib/libxkbfile.so.1.0.2
 lib/libxkbui.a
 lib/libxkbui.so
 lib/libxkbui.so.1
 lib/libxkbui.so.1.0
-lib/pkgconfig/xdamage.pc
 lib/pkgconfig/xevie.pc
diff --git a/pkgtools/x11-links/files/xorg.Xcomposite b/pkgtools/x11-links/files/xorg.Xcomposite
index df153ecf785..da815923a55 100644
--- a/pkgtools/x11-links/files/xorg.Xcomposite
+++ b/pkgtools/x11-links/files/xorg.Xcomposite
@@ -1,8 +1,10 @@
-# $NetBSD: xorg.Xcomposite,v 1.2 2008/08/22 13:34:39 tron Exp $
+# $NetBSD: xorg.Xcomposite,v 1.3 2008/10/05 21:36:35 cube Exp $
 include/X11/extensions/Xcomposite.h
 lib/libXcomposite.1.0.0.dylib
 lib/libXcomposite.1.dylib
 lib/libXcomposite.dylib
+lib/libXcomposite.so
+lib/libXcomposite.so.1
 lib/libXcomposite.so.1.0
 lib/libXcomposite.a
 lib/pkgconfig/xcomposite.pc
diff --git a/pkgtools/x11-links/files/xorg.Xfixes b/pkgtools/x11-links/files/xorg.Xfixes
index 06684e1e0da..8961554ad85 100644
--- a/pkgtools/x11-links/files/xorg.Xfixes
+++ b/pkgtools/x11-links/files/xorg.Xfixes
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.Xfixes,v 1.2 2007/12/17 18:20:19 tron Exp $
+# $NetBSD: xorg.Xfixes,v 1.3 2008/10/05 21:36:35 cube Exp $
 #
 include/X11/extensions/Xfixes.h
 lib/libXfixes.3.1.0.dylib
@@ -9,4 +9,5 @@ lib/libXfixes.la
 lib/libXfixes.so
 lib/libXfixes.so.3
 lib/libXfixes.so.3.0
+lib/libXfixes.so.3.1
 lib/pkgconfig/xfixes.pc
diff --git a/pkgtools/x11-links/files/xorg.bigreqsproto b/pkgtools/x11-links/files/xorg.bigreqsproto
new file mode 100644
index 00000000000..76ef20dd043
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.bigreqsproto
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.bigreqsproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/bigreqsproto.pc
diff --git a/pkgtools/x11-links/files/xorg.compositeproto b/pkgtools/x11-links/files/xorg.compositeproto
index 69fff625310..367b5d77a3a 100644
--- a/pkgtools/x11-links/files/xorg.compositeproto
+++ b/pkgtools/x11-links/files/xorg.compositeproto
@@ -1,4 +1,5 @@
-# $NetBSD: xorg.compositeproto,v 1.1 2006/04/19 15:56:38 reed Exp $
+# $NetBSD: xorg.compositeproto,v 1.2 2008/10/05 21:36:35 cube Exp $
 include/X11/extensions/composite.h
 include/X11/extensions/compositeproto.h
 lib/pkgconfig/compositeext.pc
+lib/pkgconfig/compositeproto.pc
diff --git a/pkgtools/x11-links/files/xorg.damageproto b/pkgtools/x11-links/files/xorg.damageproto
new file mode 100644
index 00000000000..7177ea6e26b
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.damageproto
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.damageproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/damageproto.pc
diff --git a/pkgtools/x11-links/files/xorg.evieext b/pkgtools/x11-links/files/xorg.evieext
new file mode 100644
index 00000000000..3759623d3ee
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.evieext
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.evieext,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/evieproto.pc
diff --git a/pkgtools/x11-links/files/xorg.expat b/pkgtools/x11-links/files/xorg.expat
index 40ade3c36b0..fa01626e940 100644
--- a/pkgtools/x11-links/files/xorg.expat
+++ b/pkgtools/x11-links/files/xorg.expat
@@ -1,8 +1,12 @@
-# $NetBSD: xorg.expat,v 1.1 2007/12/15 17:53:40 tron Exp $
+# $NetBSD: xorg.expat,v 1.2 2008/10/05 21:36:35 cube Exp $
 #
 include/expat.h
 include/expat_external.h
 lib/libexpat.1.5.0.dylib
 lib/libexpat.1.dylib
+lib/libexpat.a
 lib/libexpat.dylib
 lib/libexpat.la
+lib/libexpat.so.1.5.2
+lib/libexpat.so.1
+lib/libexpat.so
diff --git a/pkgtools/x11-links/files/xorg.fixesproto b/pkgtools/x11-links/files/xorg.fixesproto
index c7523f3ac68..415822c5b23 100644
--- a/pkgtools/x11-links/files/xorg.fixesproto
+++ b/pkgtools/x11-links/files/xorg.fixesproto
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.fixesproto,v 1.1 2006/04/19 15:56:38 reed Exp $
+# $NetBSD: xorg.fixesproto,v 1.2 2008/10/05 21:36:35 cube Exp $
 include/X11/extensions/xfixesproto.h
 include/X11/extensions/xfixeswire.h
-lib/pkgconfig/fixesext.pc
+lib/pkgconfig/fixesproto.pc
diff --git a/pkgtools/x11-links/files/xorg.fontcacheproto b/pkgtools/x11-links/files/xorg.fontcacheproto
new file mode 100644
index 00000000000..d1dff8dc19a
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.fontcacheproto
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.fontcacheproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+include/X11/extensions/fontcachstr.h
+lib/pkgconfig/fontcacheproto.pc
diff --git a/pkgtools/x11-links/files/xorg.fontconfig b/pkgtools/x11-links/files/xorg.fontconfig
index d3534e81718..a835a239c23 100644
--- a/pkgtools/x11-links/files/xorg.fontconfig
+++ b/pkgtools/x11-links/files/xorg.fontconfig
@@ -1,12 +1,15 @@
-# $NetBSD: xorg.fontconfig,v 1.2 2008/08/22 13:34:39 tron Exp $
+# $NetBSD: xorg.fontconfig,v 1.3 2008/10/05 21:36:35 cube Exp $
 #
 include/fontconfig/fcfreetype.h
 include/fontconfig/fcprivate.h
 include/fontconfig/fontconfig.h
-lib/libfontconfig.la
+lib/libfontconfig.a
 lib/libfontconfig.1.3.0.dylib
 lib/libfontconfig.1.1.0.dylib
 lib/libfontconfig.1.dylib
 lib/libfontconfig.dylib
 lib/libfontconfig.la
+lib/libfontconfig.so
+lib/libfontconfig.so.1
+lib/libfontconfig.so.1.3
 lib/pkgconfig/fontconfig.pc
diff --git a/pkgtools/x11-links/files/xorg.fontsproto b/pkgtools/x11-links/files/xorg.fontsproto
new file mode 100644
index 00000000000..9f2eceec030
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.fontsproto
@@ -0,0 +1,6 @@
+# $NetBSD: xorg.fontsproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+include/X11/fonts/font.h
+include/X11/fonts/fontproto.h
+include/X11/fonts/fontstruct.h
+lib/pkgconfig/fontsproto.pc
diff --git a/pkgtools/x11-links/files/xorg.freetype2 b/pkgtools/x11-links/files/xorg.freetype2
index 232807415ad..3951ab7bf08 100644
--- a/pkgtools/x11-links/files/xorg.freetype2
+++ b/pkgtools/x11-links/files/xorg.freetype2
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.freetype2,v 1.1 2007/12/15 17:53:40 tron Exp $
+# $NetBSD: xorg.freetype2,v 1.2 2008/10/05 21:36:35 cube Exp $
 #
 bin/freetype-config
 include/freetype2/freetype/config/ftconfig.h
@@ -50,5 +50,8 @@ lib/libfreetype.la
 lib/libfreetype.6.3.16.dylib
 lib/libfreetype.6.dylib
 lib/libfreetype.dylib
+lib/libfreetype.so
+lib/libfreetype.so.6
+lib/libfreetype.so.6.3.17
 lib/pkgconfig/freetype2.pc
 share/aclocal/freetype2.m4
diff --git a/pkgtools/x11-links/files/xorg.glproto b/pkgtools/x11-links/files/xorg.glproto
new file mode 100644
index 00000000000..73cd4eb3677
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.glproto
@@ -0,0 +1,7 @@
+# $NetBSD: xorg.glproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+include/GL/glxint.h
+include/GL/glxmd.h
+include/GL/glxproto.h
+include/GL/glxtokens.h
+lib/pkgconfig/glproto.pc
diff --git a/pkgtools/x11-links/files/xorg.libFS b/pkgtools/x11-links/files/xorg.libFS
new file mode 100644
index 00000000000..119ccd70a87
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libFS
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.libFS,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/libfs.pc
diff --git a/pkgtools/x11-links/files/xorg.libXScrnSaver b/pkgtools/x11-links/files/xorg.libXScrnSaver
new file mode 100644
index 00000000000..055f5cc140d
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libXScrnSaver
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.libXScrnSaver,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/xscrnsaver.pc
diff --git a/pkgtools/x11-links/files/xorg.libXTrap b/pkgtools/x11-links/files/xorg.libXTrap
new file mode 100644
index 00000000000..0989be62bea
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libXTrap
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.libXTrap,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/xtrap.pc
diff --git a/pkgtools/x11-links/files/xorg.libXdamage b/pkgtools/x11-links/files/xorg.libXdamage
new file mode 100644
index 00000000000..711bbf1d13e
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libXdamage
@@ -0,0 +1,12 @@
+# $NetBSD: xorg.libXdamage,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+include/X11/extensions/Xdamage.h
+lib/libXdamage.1.0.0.dylib
+lib/libXdamage.1.dylib
+lib/libXdamage.a
+lib/libXdamage.dylib
+lib/libXdamage.so
+lib/libXdamage.so.1
+lib/libXdamage.so.1.0
+lib/libXdamage.so.1.1
+lib/pkgconfig/xdamage.pc
diff --git a/pkgtools/x11-links/files/xorg.libXevie b/pkgtools/x11-links/files/xorg.libXevie
new file mode 100644
index 00000000000..cdfbdfac3d0
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libXevie
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.libXevie,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/xevie.pc
diff --git a/pkgtools/x11-links/files/xorg.libXfont b/pkgtools/x11-links/files/xorg.libXfont
new file mode 100644
index 00000000000..cf58e9af5dc
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libXfont
@@ -0,0 +1,20 @@
+# $NetBSD: xorg.libXfont,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+include/X11/fonts/bdfint.h
+include/X11/fonts/bitmap.h
+include/X11/fonts/bufio.h
+include/X11/fonts/fntfil.h
+include/X11/fonts/fntfilio.h
+include/X11/fonts/fntfilst.h
+include/X11/fonts/fontconf.h
+include/X11/fonts/fontencc.h
+include/X11/fonts/fontmisc.h
+include/X11/fonts/fontmod.h
+include/X11/fonts/fontshow.h
+include/X11/fonts/fontutil.h
+include/X11/fonts/fontxlfd.h
+include/X11/fonts/ft.h
+include/X11/fonts/ftfuncs.h
+include/X11/fonts/pcf.h
+lib/libXfont.so.1.4.1
+lib/pkgconfig/xfont.pc
diff --git a/pkgtools/x11-links/files/xorg.libXprintUtil b/pkgtools/x11-links/files/xorg.libXprintUtil
new file mode 100644
index 00000000000..9f465b2014e
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libXprintUtil
@@ -0,0 +1,6 @@
+# $NetBSD: xorg.libXprintUtil,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/libXprintUtil.so
+lib/libXprintUtil.so.1
+lib/libXprintUtil.so.1.0.0
+lib/pkgconfig/xprintutil.pc
diff --git a/pkgtools/x11-links/files/xorg.libXrandr b/pkgtools/x11-links/files/xorg.libXrandr
index 472cef82554..5b2e3609480 100644
--- a/pkgtools/x11-links/files/xorg.libXrandr
+++ b/pkgtools/x11-links/files/xorg.libXrandr
@@ -1,10 +1,14 @@
-# $NetBSD: xorg.libXrandr,v 1.3 2008/08/22 13:34:39 tron Exp $
+# $NetBSD: xorg.libXrandr,v 1.4 2008/10/05 21:36:35 cube Exp $
 #
 include/X11/extensions/Xrandr.h
 lib/libXrandr.2.1.0.dylib
 lib/libXrandr.2.0.0.dylib
 lib/libXrandr.2.1.0.dylib
 lib/libXrandr.2.dylib
+lib/libXrandr.a
 lib/libXrandr.dylib
 lib/libXrandr.la
+lib/libXrandr.so
+lib/libXrandr.so.2
+lib/libXrandr.so.2.1
 lib/pkgconfig/xrandr.pc
diff --git a/pkgtools/x11-links/files/xorg.libXrender b/pkgtools/x11-links/files/xorg.libXrender
index 8da8d985a95..8925b37b354 100644
--- a/pkgtools/x11-links/files/xorg.libXrender
+++ b/pkgtools/x11-links/files/xorg.libXrender
@@ -1,8 +1,12 @@
-# $NetBSD: xorg.libXrender,v 1.1 2007/12/17 18:20:20 tron Exp $
+# $NetBSD: xorg.libXrender,v 1.2 2008/10/05 21:36:35 cube Exp $
 #
 include/X11/extensions/Xrender.h
 lib/libXrender.1.3.0.dylib
 lib/libXrender.1.dylib
+lib/libXrender.a
 lib/libXrender.dylib
 lib/libXrender.la
+lib/libXrender.so
+lib/libXrender.so.1
+lib/libXrender.so.1.3
 lib/pkgconfig/xrender.pc
diff --git a/pkgtools/x11-links/files/xorg.libXres b/pkgtools/x11-links/files/xorg.libXres
new file mode 100644
index 00000000000..c50d2d69263
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libXres
@@ -0,0 +1,11 @@
+# $NetBSD: xorg.libXres,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+include/X11/extensions/XRes.h
+lib/libXRes.a
+lib/libXRes.1.0.0.dylib
+lib/libXRes.1.dylib
+lib/libXRes.dylib
+lib/libXRes.so
+lib/libXRes.so.1
+lib/libXRes.so.1.0
+lib/pkgconfig/xres.pc
diff --git a/pkgtools/x11-links/files/xorg.libdrm b/pkgtools/x11-links/files/xorg.libdrm
new file mode 100644
index 00000000000..25d0f9ea6a8
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libdrm
@@ -0,0 +1,9 @@
+# $NetBSD: xorg.libdrm,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+include/X11/xf86drm.h
+include/X11/xf86mm.h
+lib/libdrm.a
+lib/libdrm.so
+lib/libdrm.so.2
+lib/libdrm.so.2.3
+lib/pkgconfig/libdrm.pc
diff --git a/pkgtools/x11-links/files/xorg.libfontenc b/pkgtools/x11-links/files/xorg.libfontenc
new file mode 100644
index 00000000000..9f7b03e202b
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.libfontenc
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.libfontenc,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/fontenc.pc
diff --git a/pkgtools/x11-links/files/xorg.liblbxutil b/pkgtools/x11-links/files/xorg.liblbxutil
new file mode 100644
index 00000000000..7f9b2670ddc
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.liblbxutil
@@ -0,0 +1,6 @@
+# $NetBSD: xorg.liblbxutil,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/liblbxutil.so
+lib/liblbxutil.so.1
+lib/liblbxutil.so.1.0
+lib/pkgconfig/lbxutil.pc
diff --git a/pkgtools/x11-links/files/xorg.pixman b/pkgtools/x11-links/files/xorg.pixman
index 150c9b29235..ca517770088 100644
--- a/pkgtools/x11-links/files/xorg.pixman
+++ b/pkgtools/x11-links/files/xorg.pixman
@@ -1,4 +1,19 @@
-# $NetBSD: xorg.pixman,v 1.2 2008/09/16 12:38:38 tron Exp $
+# $NetBSD: xorg.pixman,v 1.3 2008/10/05 21:36:35 cube Exp $
+#
+# NB:  The .la file is not listed here because it is bogus in some
+#      versions of MacOS X, so we don't want it buildlinked.  Everything
+#      is happy with just the pkgconfig file.
+include/pixman-1/pixman.h
+include/pixman-1/pixman-version.h
+lib/libpixman-1.a
+lib/libpixman-1.0.11.8.dylib
+lib/libpixman-1.0.dylib
+lib/libpixman-1.dylib
+lib/libpixman-1.so
+lib/libpixman-1.so.0
+lib/libpixman-1.so.0.11.2
+lib/pkgconfig/pixman-1.pc
+# $NetBSD: xorg.pixman,v 1.3 2008/10/05 21:36:35 cube Exp $
 #
 include/pixman-1/pixman.h
 include/pixman-1/pixman-version.h
diff --git a/pkgtools/x11-links/files/xorg.printproto b/pkgtools/x11-links/files/xorg.printproto
new file mode 100644
index 00000000000..9c78caf598e
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.printproto
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.printproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/printproto.pc
diff --git a/pkgtools/x11-links/files/xorg.recordproto b/pkgtools/x11-links/files/xorg.recordproto
new file mode 100644
index 00000000000..a0afb0cef2a
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.recordproto
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.recordproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/recordproto.pc
diff --git a/pkgtools/x11-links/files/xorg.resourceproto b/pkgtools/x11-links/files/xorg.resourceproto
new file mode 100644
index 00000000000..c66d09c6dad
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.resourceproto
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.resourceproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/resourceproto.pc
diff --git a/pkgtools/x11-links/files/xorg.scrnsaverproto b/pkgtools/x11-links/files/xorg.scrnsaverproto
new file mode 100644
index 00000000000..bd6bb60c34f
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.scrnsaverproto
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.scrnsaverproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/scrnsaverproto.pc
diff --git a/pkgtools/x11-links/files/xorg.trapproto b/pkgtools/x11-links/files/xorg.trapproto
new file mode 100644
index 00000000000..6be84e47f21
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.trapproto
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.trapproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/trapproto.pc
diff --git a/pkgtools/x11-links/files/xorg.videoproto b/pkgtools/x11-links/files/xorg.videoproto
new file mode 100644
index 00000000000..5e43bfc970e
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.videoproto
@@ -0,0 +1,4 @@
+# $NetBSD: xorg.videoproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+include/X11/extensions/vldXvMC.h
+lib/pkgconfig/videoproto.pc
diff --git a/pkgtools/x11-links/files/xorg.xcmiscproto b/pkgtools/x11-links/files/xorg.xcmiscproto
new file mode 100644
index 00000000000..d93f8e4a4f8
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.xcmiscproto
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.xcmiscproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/xcmiscproto.pc
diff --git a/pkgtools/x11-links/files/xorg.xcursor b/pkgtools/x11-links/files/xorg.xcursor
index 20b47279ea6..efc2cb49471 100644
--- a/pkgtools/x11-links/files/xorg.xcursor
+++ b/pkgtools/x11-links/files/xorg.xcursor
@@ -1,8 +1,12 @@
-# $NetBSD: xorg.xcursor,v 1.1 2007/12/17 18:20:21 tron Exp $
+# $NetBSD: xorg.xcursor,v 1.2 2008/10/05 21:36:35 cube Exp $
 #
 include/X11/Xcursor/Xcursor.h
 lib/libXcursor.1.0.2.dylib
 lib/libXcursor.1.dylib
+lib/libXcursor.a
 lib/libXcursor.dylib
 lib/libXcursor.la
+lib/libXcursor.so
+lib/libXcursor.so.1
+lib/libXcursor.so.1.0.2
 lib/pkgconfig/xcursor.pc
diff --git a/pkgtools/x11-links/files/xorg.xextensions b/pkgtools/x11-links/files/xorg.xextensions
deleted file mode 100644
index 27b778dfc89..00000000000
--- a/pkgtools/x11-links/files/xorg.xextensions
+++ /dev/null
@@ -1,54 +0,0 @@
-# $NetBSD: xorg.xextensions,v 1.1 2005/07/25 20:50:25 reed Exp $
-include/X11/extensions/MITMisc.h
-include/X11/extensions/XEVI.h
-include/X11/extensions/XEVIstr.h
-include/X11/extensions/XI.h
-include/X11/extensions/XInput.h
-include/X11/extensions/XIproto.h
-include/X11/extensions/XKB.h
-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/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/dpmsstr.h
-include/X11/extensions/extutil.h
-include/X11/extensions/lbxbuf.h
-include/X11/extensions/lbxbufstr.h
-include/X11/extensions/lbxdeltastr.h
-include/X11/extensions/lbximage.h
-include/X11/extensions/lbxopts.h
-include/X11/extensions/lbxstr.h
-include/X11/extensions/lbxzlib.h
-include/X11/extensions/mitmiscstr.h
-include/X11/extensions/multibuf.h
-include/X11/extensions/multibufst.h
-include/X11/extensions/saver.h
-include/X11/extensions/saverproto.h
-include/X11/extensions/security.h
-include/X11/extensions/securstr.h
-include/X11/extensions/shape.h
-include/X11/extensions/shapestr.h
-include/X11/extensions/shmstr.h
-include/X11/extensions/sync.h
-include/X11/extensions/syncstr.h
-include/X11/extensions/xcmiscstr.h
-include/X11/extensions/xtestext1.h
-include/X11/extensions/xteststr.h
-lib/pkgconfig/xextensions.pc
diff --git a/pkgtools/x11-links/files/xorg.xextproto b/pkgtools/x11-links/files/xorg.xextproto
index a47e3b06c5e..e26cdc6e101 100644
--- a/pkgtools/x11-links/files/xorg.xextproto
+++ b/pkgtools/x11-links/files/xorg.xextproto
@@ -1,4 +1,4 @@
-# $NetBSD: xorg.xextproto,v 1.1 2006/04/19 15:56:38 reed Exp $
+# $NetBSD: xorg.xextproto,v 1.2 2008/10/05 21:36:35 cube Exp $
 include/X11/extensions/MITMisc.h
 include/X11/extensions/XEVI.h
 include/X11/extensions/XEVIstr.h
@@ -21,6 +21,7 @@ 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
@@ -29,6 +30,8 @@ include/X11/extensions/bigreqstr.h
 include/X11/extensions/dpms.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/lbxdeltastr.h
@@ -52,3 +55,4 @@ include/X11/extensions/xcmiscstr.h
 include/X11/extensions/xtestext1.h
 include/X11/extensions/xteststr.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
new file mode 100644
index 00000000000..f79e13b3341
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.xf86bigfontproto
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.xf86bigfontproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/xf86bigfontproto.pc
diff --git a/pkgtools/x11-links/files/xorg.xf86dgaproto b/pkgtools/x11-links/files/xorg.xf86dgaproto
new file mode 100644
index 00000000000..741ba29f8c3
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.xf86dgaproto
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.xf86dgaproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/xf86dgaproto.pc
diff --git a/pkgtools/x11-links/files/xorg.xf86driproto b/pkgtools/x11-links/files/xorg.xf86driproto
new file mode 100644
index 00000000000..0721ce45812
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.xf86driproto
@@ -0,0 +1,5 @@
+# $NetBSD: xorg.xf86driproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+include/X11/dri/xf86dri.h
+include/X11/dri/xf86dristr.h
+lib/pkgconfig/xf86driproto.pc
diff --git a/pkgtools/x11-links/files/xorg.xf86miscproto b/pkgtools/x11-links/files/xorg.xf86miscproto
new file mode 100644
index 00000000000..6806c154a7d
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.xf86miscproto
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.xf86miscproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/xf86miscproto.pc
diff --git a/pkgtools/x11-links/files/xorg.xf86vidmodeproto b/pkgtools/x11-links/files/xorg.xf86vidmodeproto
new file mode 100644
index 00000000000..150c4cdcc6a
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.xf86vidmodeproto
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.xf86vidmodeproto,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/xf86vidmode.pc
diff --git a/pkgtools/x11-links/files/xorg.xproxymanagementprotocol b/pkgtools/x11-links/files/xorg.xproxymanagementprotocol
new file mode 100644
index 00000000000..4bdd0d1b31d
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.xproxymanagementprotocol
@@ -0,0 +1,3 @@
+# $NetBSD: xorg.xproxymanagementprotocol,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+lib/pkgconfig/xproxymngproto.pc
diff --git a/pkgtools/x11-links/files/xorg.xtrans b/pkgtools/x11-links/files/xorg.xtrans
new file mode 100644
index 00000000000..e3003ff06ce
--- /dev/null
+++ b/pkgtools/x11-links/files/xorg.xtrans
@@ -0,0 +1,13 @@
+# $NetBSD: xorg.xtrans,v 1.2 2008/10/05 21:36:35 cube Exp $
+#
+include/X11/Xtrans/Xtrans.c
+include/X11/Xtrans/Xtrans.h
+include/X11/Xtrans/Xtransdnet.c
+include/X11/Xtrans/Xtransint.h
+include/X11/Xtrans/Xtranslcl.c
+include/X11/Xtrans/Xtransos2.c
+include/X11/Xtrans/Xtranssock.c
+include/X11/Xtrans/Xtranstli.c
+include/X11/Xtrans/Xtransutil.c
+include/X11/Xtrans/transport.c
+lib/pkgconfig/xtrans.pc
diff --git a/pkgtools/x11-links/xorg.mk b/pkgtools/x11-links/xorg.mk
index 254ded1782a..0afdce272ac 100644
--- a/pkgtools/x11-links/xorg.mk
+++ b/pkgtools/x11-links/xorg.mk
@@ -1,39 +1,71 @@
-# $NetBSD: xorg.mk,v 1.10 2008/09/16 12:38:38 tron Exp $
+# $NetBSD: xorg.mk,v 1.11 2008/10/05 21:36:35 cube Exp $
 #
 # This is for X.org, but use "xfree" files also.
 
 FILES_LIST=	${FILESDIR}/xorg
 
-# libXdamage and damageext only in pkgsrc-wip so not used here
 # XXX: what about xaw?
 
 .include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../fonts/libfontenc/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
+.include "../../x11/bigreqsproto/buildlink3.mk"
 .include "../../x11/compositeproto/buildlink3.mk"
+.include "../../x11/damageproto/buildlink3.mk"
+.include "../../x11/evieext/buildlink3.mk"
 .include "../../x11/fixesproto/buildlink3.mk"
+.include "../../x11/fontcacheproto/buildlink3.mk"
+.include "../../x11/fontsproto/buildlink3.mk"
+.include "../../x11/glproto/buildlink3.mk"
 .include "../../x11/inputproto/buildlink3.mk"
+.include "../../x11/libFS/buildlink3.mk"
 .include "../../x11/libICE/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXScrnSaver/buildlink3.mk"
+.include "../../x11/libXTrap/buildlink3.mk"
+.include "../../x11/libXau/buildlink3.mk"
 .include "../../x11/libXcomposite/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXdamage/buildlink3.mk"
+.include "../../x11/libXdmcp/buildlink3.mk"
+.include "../../x11/libXevie/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXfixes/buildlink3.mk"
+.include "../../x11/libXfont/buildlink3.mk"
 .include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/libXprintUtil/buildlink3.mk"
 .include "../../x11/libXrandr/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
+.include "../../x11/libXres/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
+.include "../../x11/libdrm/buildlink3.mk"
+.include "../../x11/liblbxutil/buildlink3.mk"
 .include "../../x11/pixman/buildlink3.mk"
-.include "../../x11/renderproto/buildlink3.mk"
+.include "../../x11/printproto/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
+.include "../../x11/recordproto/buildlink3.mk"
+.include "../../x11/renderproto/buildlink3.mk"
+.include "../../x11/resourceproto/buildlink3.mk"
+.include "../../x11/scrnsaverproto/buildlink3.mk"
+.include "../../x11/trapproto/buildlink3.mk"
+.include "../../x11/videoproto/buildlink3.mk"
+.include "../../x11/xcmiscproto/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
+.include "../../x11/xf86bigfontproto/buildlink3.mk"
+.include "../../x11/xf86dgaproto/buildlink3.mk"
+.include "../../x11/xf86driproto/buildlink3.mk"
+.include "../../x11/xf86miscproto/buildlink3.mk"
+.include "../../x11/xf86vidmodeproto/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xproxymanagementprotocol/buildlink3.mk"
+.include "../../x11/xtrans/buildlink3.mk"
 
 # XXX  what is ${X11_MODULES} ?