sync

17 files changed, 127 insertions, 14 deletions

diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index 163e2fc3c..1b8fb09c8 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -13,7 +13,10 @@
 ./usr/X11R6/include/GL/glx.h
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/hotplug.h
+./usr/X11R6/include/xorg/privates.h
+./usr/X11R6/include/xorg/registry.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
 ./usr/X11R6/include/xorg/xf86Modes.h
@@ -21,12 +24,14 @@
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86Rename.h
+./usr/X11R6/include/xorg/xkbfile.h
 ./usr/X11R6/include/xorg/xkbsrv.h
+./usr/X11R6/include/xorg/xkbstr.h
 ./usr/X11R6/lib/X11/Cards
 ./usr/X11R6/lib/X11/Options
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.7.3
+./usr/X11R6/lib/libGL.so.8.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -79,6 +84,7 @@
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
+./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.12.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 3107a85d8..524946d88 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -29,9 +29,12 @@
 ./usr/X11R6/include/drm/via_3d_reg.h
 ./usr/X11R6/include/drm/via_drm.h
 ./usr/X11R6/include/xf86drm.h
+./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/dri.h
 ./usr/X11R6/include/xorg/dristruct.h
 ./usr/X11R6/include/xorg/hotplug.h
+./usr/X11R6/include/xorg/privates.h
+./usr/X11R6/include/xorg/registry.h
 ./usr/X11R6/include/xorg/sarea.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
@@ -40,12 +43,14 @@
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86Rename.h
+./usr/X11R6/include/xorg/xkbfile.h
 ./usr/X11R6/include/xorg/xkbsrv.h
+./usr/X11R6/include/xorg/xkbstr.h
 ./usr/X11R6/lib/X11/Cards
 ./usr/X11R6/lib/X11/Options
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.7.3
+./usr/X11R6/lib/libGL.so.8.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -108,6 +113,7 @@
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
+./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.12.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish
index ad5e76f0f..9793115d7 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -13,7 +13,10 @@
 ./usr/X11R6/include/GL/glx.h
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/hotplug.h
+./usr/X11R6/include/xorg/privates.h
+./usr/X11R6/include/xorg/registry.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
 ./usr/X11R6/include/xorg/xf86Modes.h
@@ -21,12 +24,14 @@
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86Rename.h
+./usr/X11R6/include/xorg/xkbfile.h
 ./usr/X11R6/include/xorg/xkbsrv.h
+./usr/X11R6/include/xorg/xkbstr.h
 ./usr/X11R6/lib/X11/Cards
 ./usr/X11R6/lib/X11/Options
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.7.3
+./usr/X11R6/lib/libGL.so.8.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -79,6 +84,7 @@
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
+./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.12.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
diff --git a/distrib/sets/lists/xbase/md.hp300 b/distrib/sets/lists/xbase/md.hp300
index 232c30d74..fa058cbcb 100644
--- a/distrib/sets/lists/xbase/md.hp300
+++ b/distrib/sets/lists/xbase/md.hp300
@@ -12,10 +12,15 @@
 ./usr/X11R6/include/GL/glx.h
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/xorg/dixaccess.h
+./usr/X11R6/include/xorg/privates.h
+./usr/X11R6/include/xorg/registry.h
+./usr/X11R6/include/xorg/xkbfile.h
+./usr/X11R6/include/xorg/xkbstr.h
 ./usr/X11R6/lib/X11/Options
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.7.3
+./usr/X11R6/lib/libGL.so.8.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -68,6 +73,7 @@
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
+./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.12.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index f0cdbf1b4..21111cbe7 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -11,11 +11,27 @@
 ./usr/X11R6/include/GL/glu.h
 ./usr/X11R6/include/GL/glx.h
 ./usr/X11R6/include/GL/glxext.h
+./usr/X11R6/include/GL/internal/dri_interface.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/X11/dri/xf86dri.h
+./usr/X11R6/include/X11/dri/xf86dristr.h
+./usr/X11R6/include/drm/drm.h
+./usr/X11R6/include/drm/drm_sarea.h
+./usr/X11R6/include/drm/i915_drm.h
+./usr/X11R6/include/drm/mach64_drm.h
+./usr/X11R6/include/drm/mga_drm.h
+./usr/X11R6/include/drm/r128_drm.h
+./usr/X11R6/include/drm/r300_reg.h
+./usr/X11R6/include/drm/radeon_drm.h
+./usr/X11R6/include/drm/savage_drm.h
+./usr/X11R6/include/drm/sis_drm.h
+./usr/X11R6/include/drm/via_3d_reg.h
+./usr/X11R6/include/drm/via_drm.h
+./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xorg
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.7.3
+./usr/X11R6/lib/libGL.so.8.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -62,18 +78,23 @@
 ./usr/X11R6/lib/libXxf86misc.so.5.0
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
+./usr/X11R6/lib/libdrm.la
+./usr/X11R6/lib/libdrm.so.2.3
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.16.1
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
+./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.12.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/gl.pc
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
+./usr/X11R6/lib/pkgconfig/libdrm.pc
+./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/man1/xfs.1
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index 11aa3b9d9..e3f3743cb 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -29,9 +29,12 @@
 ./usr/X11R6/include/drm/via_3d_reg.h
 ./usr/X11R6/include/drm/via_drm.h
 ./usr/X11R6/include/xf86drm.h
+./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/dri.h
 ./usr/X11R6/include/xorg/dristruct.h
 ./usr/X11R6/include/xorg/hotplug.h
+./usr/X11R6/include/xorg/privates.h
+./usr/X11R6/include/xorg/registry.h
 ./usr/X11R6/include/xorg/sarea.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
@@ -40,12 +43,14 @@
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86Rename.h
+./usr/X11R6/include/xorg/xkbfile.h
 ./usr/X11R6/include/xorg/xkbsrv.h
+./usr/X11R6/include/xorg/xkbstr.h
 ./usr/X11R6/lib/X11/Cards
 ./usr/X11R6/lib/X11/Options
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.7.3
+./usr/X11R6/lib/libGL.so.8.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -108,6 +113,7 @@
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
+./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.12.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index 6fecbd805..ff9505b05 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -14,9 +14,14 @@
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/osmesa.h
 ./usr/X11R6/include/xorg
+./usr/X11R6/include/xorg/dixaccess.h
+./usr/X11R6/include/xorg/privates.h
+./usr/X11R6/include/xorg/registry.h
+./usr/X11R6/include/xorg/xkbfile.h
+./usr/X11R6/include/xorg/xkbstr.h
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.7.3
+./usr/X11R6/lib/libGL.so.8.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -69,6 +74,7 @@
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
+./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.12.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
diff --git a/distrib/sets/lists/xbase/md.mac68k b/distrib/sets/lists/xbase/md.mac68k
index cb84d9725..7e42e4e56 100644
--- a/distrib/sets/lists/xbase/md.mac68k
+++ b/distrib/sets/lists/xbase/md.mac68k
@@ -13,7 +13,10 @@
 ./usr/X11R6/include/GL/glx.h
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/hotplug.h
+./usr/X11R6/include/xorg/privates.h
+./usr/X11R6/include/xorg/registry.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
 ./usr/X11R6/include/xorg/xf86Modes.h
@@ -21,10 +24,12 @@
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86Rename.h
+./usr/X11R6/include/xorg/xkbfile.h
 ./usr/X11R6/include/xorg/xkbsrv.h
+./usr/X11R6/include/xorg/xkbstr.h
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.7.3
+./usr/X11R6/lib/libGL.so.8.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -77,6 +82,7 @@
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
+./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.12.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index dc53a21d8..2b5423518 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -13,7 +13,10 @@
 ./usr/X11R6/include/GL/glx.h
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/hotplug.h
+./usr/X11R6/include/xorg/privates.h
+./usr/X11R6/include/xorg/registry.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
 ./usr/X11R6/include/xorg/xf86Modes.h
@@ -21,12 +24,14 @@
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86Rename.h
+./usr/X11R6/include/xorg/xkbfile.h
 ./usr/X11R6/include/xorg/xkbsrv.h
+./usr/X11R6/include/xorg/xkbstr.h
 ./usr/X11R6/lib/X11/Cards
 ./usr/X11R6/lib/X11/Options
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.7.3
+./usr/X11R6/lib/libGL.so.8.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -79,6 +84,7 @@
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
+./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.12.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
diff --git a/distrib/sets/lists/xbase/md.mvme68k b/distrib/sets/lists/xbase/md.mvme68k
index 4f6243bdb..c035e64e1 100644
--- a/distrib/sets/lists/xbase/md.mvme68k
+++ b/distrib/sets/lists/xbase/md.mvme68k
@@ -13,9 +13,14 @@
 ./usr/X11R6/include/GL/glx.h
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/xorg/dixaccess.h
+./usr/X11R6/include/xorg/privates.h
+./usr/X11R6/include/xorg/registry.h
+./usr/X11R6/include/xorg/xkbfile.h
+./usr/X11R6/include/xorg/xkbstr.h
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.7.3
+./usr/X11R6/lib/libGL.so.8.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -68,6 +73,7 @@
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
+./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.12.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/pkgconfig/gl.pc
diff --git a/distrib/sets/lists/xbase/md.mvme88k b/distrib/sets/lists/xbase/md.mvme88k
index 3485b6e1d..768c0cce3 100644
--- a/distrib/sets/lists/xbase/md.mvme88k
+++ b/distrib/sets/lists/xbase/md.mvme88k
@@ -1,4 +1,11 @@
 ./usr/X11R6/bin/ucs2any
+./usr/X11R6/include/xorg/dixaccess.h
+./usr/X11R6/include/xorg/privates.h
+./usr/X11R6/include/xorg/registry.h
+./usr/X11R6/include/xorg/xkbfile.h
+./usr/X11R6/include/xorg/xkbstr.h
+./usr/X11R6/lib/libGL.so.8.0
+./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/man/man1/bdftruncate.1
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/ucs2any.1
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index e2b6d91dd..aa7033715 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -14,7 +14,10 @@
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/osmesa.h
 ./usr/X11R6/include/xorg
+./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/hotplug.h
+./usr/X11R6/include/xorg/privates.h
+./usr/X11R6/include/xorg/registry.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
 ./usr/X11R6/include/xorg/xf86Modes.h
@@ -22,11 +25,13 @@
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86Rename.h
+./usr/X11R6/include/xorg/xkbfile.h
 ./usr/X11R6/include/xorg/xkbsrv.h
+./usr/X11R6/include/xorg/xkbstr.h
 ./usr/X11R6/lib/X11/Options
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.7.3
+./usr/X11R6/lib/libGL.so.8.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLw.a
@@ -75,6 +80,7 @@
 ./usr/X11R6/lib/libfreetype.so.16.1
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
+./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.12.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
diff --git a/distrib/sets/lists/xbase/md.sparc b/distrib/sets/lists/xbase/md.sparc
index d9d1040cc..672f2922e 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -13,7 +13,10 @@
 ./usr/X11R6/include/GL/glx.h
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/hotplug.h
+./usr/X11R6/include/xorg/privates.h
+./usr/X11R6/include/xorg/registry.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
 ./usr/X11R6/include/xorg/xf86Modes.h
@@ -21,11 +24,13 @@
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86Rename.h
+./usr/X11R6/include/xorg/xkbfile.h
 ./usr/X11R6/include/xorg/xkbsrv.h
+./usr/X11R6/include/xorg/xkbstr.h
 ./usr/X11R6/lib/X11/Options
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.7.3
+./usr/X11R6/lib/libGL.so.8.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -78,6 +83,7 @@
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
+./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.12.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index 73b96bc63..94c452f44 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -13,7 +13,10 @@
 ./usr/X11R6/include/GL/glx.h
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/hotplug.h
+./usr/X11R6/include/xorg/privates.h
+./usr/X11R6/include/xorg/registry.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
 ./usr/X11R6/include/xorg/xf86Modes.h
@@ -21,12 +24,14 @@
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86Rename.h
+./usr/X11R6/include/xorg/xkbfile.h
 ./usr/X11R6/include/xorg/xkbsrv.h
+./usr/X11R6/include/xorg/xkbstr.h
 ./usr/X11R6/lib/X11/Cards
 ./usr/X11R6/lib/X11/Options
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.7.3
+./usr/X11R6/lib/libGL.so.8.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -79,6 +84,7 @@
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
+./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.12.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
diff --git a/distrib/sets/lists/xbase/md.vax b/distrib/sets/lists/xbase/md.vax
index f183b75ff..f70612d90 100644
--- a/distrib/sets/lists/xbase/md.vax
+++ b/distrib/sets/lists/xbase/md.vax
@@ -1,5 +1,10 @@
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/include/xorg
+./usr/X11R6/include/xorg/dixaccess.h
+./usr/X11R6/include/xorg/privates.h
+./usr/X11R6/include/xorg/registry.h
+./usr/X11R6/include/xorg/xkbfile.h
+./usr/X11R6/include/xorg/xkbstr.h
 ./usr/X11R6/man/man1/bdftruncate.1
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/ucs2any.1
diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus
index ad5e76f0f..9793115d7 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -13,7 +13,10 @@
 ./usr/X11R6/include/GL/glx.h
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/hotplug.h
+./usr/X11R6/include/xorg/privates.h
+./usr/X11R6/include/xorg/registry.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
 ./usr/X11R6/include/xorg/xf86Modes.h
@@ -21,12 +24,14 @@
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86Rename.h
+./usr/X11R6/include/xorg/xkbfile.h
 ./usr/X11R6/include/xorg/xkbsrv.h
+./usr/X11R6/include/xorg/xkbstr.h
 ./usr/X11R6/lib/X11/Cards
 ./usr/X11R6/lib/X11/Options
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.7.3
+./usr/X11R6/lib/libGL.so.8.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -79,6 +84,7 @@
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
+./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.12.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
diff --git a/distrib/sets/lists/xbase/mi b/distrib/sets/lists/xbase/mi
index a54d45e17..2c48d3a37 100644
--- a/distrib/sets/lists/xbase/mi
+++ b/distrib/sets/lists/xbase/mi
@@ -676,6 +676,8 @@
 ./usr/X11R6/lib/liblbxutil.la
 ./usr/X11R6/lib/liboldX.a
 ./usr/X11R6/lib/liboldX.la
+./usr/X11R6/lib/libpciaccess.a
+./usr/X11R6/lib/libpciaccess.la
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
 ./usr/X11R6/lib/libxkbfile.a