sync

20 files changed, 571 insertions, 44 deletions

diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index 34dcb5788..5b5838cfc 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -17,6 +17,8 @@
 ./usr/X11R6/include/X11/Xlib-xcb.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
+./usr/X11R6/include/X11/extensions/dri2proto.h
+./usr/X11R6/include/X11/extensions/dri2tokens.h
 ./usr/X11R6/include/xcb/bigreq.h
 ./usr/X11R6/include/xcb/composite.h
 ./usr/X11R6/include/xcb/damage.h
@@ -95,6 +97,8 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
+./usr/X11R6/lib/libX11-xcb.a
+./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11-xcb.so.1.0
 ./usr/X11R6/lib/libX11.so.12.0
 ./usr/X11R6/lib/libXRes.so.4.0
@@ -143,75 +147,108 @@
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.15.8
+./usr/X11R6/lib/libpthread-stubs.a
 ./usr/X11R6/lib/libpthread-stubs.so.0.0
 ./usr/X11R6/lib/libpthread-stubs_pic.a
+./usr/X11R6/lib/libxcb-atom.a
 ./usr/X11R6/lib/libxcb-atom.so.1.0
 ./usr/X11R6/lib/libxcb-atom_pic.a
+./usr/X11R6/lib/libxcb-aux.a
 ./usr/X11R6/lib/libxcb-aux.so.0.0
 ./usr/X11R6/lib/libxcb-aux_pic.a
+./usr/X11R6/lib/libxcb-composite.a
 ./usr/X11R6/lib/libxcb-composite.so.0.0
 ./usr/X11R6/lib/libxcb-composite_pic.a
+./usr/X11R6/lib/libxcb-damage.a
 ./usr/X11R6/lib/libxcb-damage.so.0.0
 ./usr/X11R6/lib/libxcb-damage_pic.a
+./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
+./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
+./usr/X11R6/lib/libxcb-glx.a
 ./usr/X11R6/lib/libxcb-glx.so.0.0
 ./usr/X11R6/lib/libxcb-glx_pic.a
+./usr/X11R6/lib/libxcb-icccm.a
 ./usr/X11R6/lib/libxcb-icccm.so.1.1
 ./usr/X11R6/lib/libxcb-icccm_pic.a
+./usr/X11R6/lib/libxcb-image.a
 ./usr/X11R6/lib/libxcb-image.so.0.0
 ./usr/X11R6/lib/libxcb-image_pic.a
+./usr/X11R6/lib/libxcb-keysyms.a
 ./usr/X11R6/lib/libxcb-keysyms.so.1.0
 ./usr/X11R6/lib/libxcb-keysyms_pic.a
+./usr/X11R6/lib/libxcb-property.a
 ./usr/X11R6/lib/libxcb-property.so.1.0
 ./usr/X11R6/lib/libxcb-property_pic.a
+./usr/X11R6/lib/libxcb-randr.a
 ./usr/X11R6/lib/libxcb-randr.so.1.0
 ./usr/X11R6/lib/libxcb-randr_pic.a
+./usr/X11R6/lib/libxcb-record.a
 ./usr/X11R6/lib/libxcb-record.so.0.0
 ./usr/X11R6/lib/libxcb-record_pic.a
+./usr/X11R6/lib/libxcb-render-util.a
 ./usr/X11R6/lib/libxcb-render-util.so.0.0
 ./usr/X11R6/lib/libxcb-render-util_pic.a
+./usr/X11R6/lib/libxcb-render.a
 ./usr/X11R6/lib/libxcb-render.so.0.0
 ./usr/X11R6/lib/libxcb-render_pic.a
+./usr/X11R6/lib/libxcb-reply.a
 ./usr/X11R6/lib/libxcb-reply.so.1.0
 ./usr/X11R6/lib/libxcb-reply_pic.a
+./usr/X11R6/lib/libxcb-res.a
 ./usr/X11R6/lib/libxcb-res.so.0.0
 ./usr/X11R6/lib/libxcb-res_pic.a
+./usr/X11R6/lib/libxcb-screensaver.a
 ./usr/X11R6/lib/libxcb-screensaver.so.0.0
 ./usr/X11R6/lib/libxcb-screensaver_pic.a
+./usr/X11R6/lib/libxcb-shape.a
 ./usr/X11R6/lib/libxcb-shape.so.0.0
 ./usr/X11R6/lib/libxcb-shape_pic.a
+./usr/X11R6/lib/libxcb-shm.a
 ./usr/X11R6/lib/libxcb-shm.so.0.0
 ./usr/X11R6/lib/libxcb-shm_pic.a
+./usr/X11R6/lib/libxcb-sync.a
 ./usr/X11R6/lib/libxcb-sync.so.0.0
 ./usr/X11R6/lib/libxcb-sync_pic.a
+./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
+./usr/X11R6/lib/libxcb-xf86dri.a
 ./usr/X11R6/lib/libxcb-xf86dri.so.0.0
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
+./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
 ./usr/X11R6/lib/libxcb-xfixes_pic.a
+./usr/X11R6/lib/libxcb-xinerama.a
 ./usr/X11R6/lib/libxcb-xinerama.so.0.0
 ./usr/X11R6/lib/libxcb-xinerama_pic.a
+./usr/X11R6/lib/libxcb-xprint.a
 ./usr/X11R6/lib/libxcb-xprint.so.0.0
 ./usr/X11R6/lib/libxcb-xprint_pic.a
+./usr/X11R6/lib/libxcb-xtest.a
 ./usr/X11R6/lib/libxcb-xtest.so.0.0
 ./usr/X11R6/lib/libxcb-xtest_pic.a
+./usr/X11R6/lib/libxcb-xv.a
 ./usr/X11R6/lib/libxcb-xv.so.0.0
 ./usr/X11R6/lib/libxcb-xv_pic.a
+./usr/X11R6/lib/libxcb-xvmc.a
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
+./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.2.0
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
+./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./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/pthread-stubs.pc
 ./usr/X11R6/lib/pkgconfig/x11-xcb.pc
 ./usr/X11R6/lib/pkgconfig/xcb-atom.pc
 ./usr/X11R6/lib/pkgconfig/xcb-aux.pc
@@ -306,6 +343,7 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
+./usr/X11R6/share/doc/dri2proto/dri2proto.txt
 ./usr/X11R6/share/xcb/bigreq.xml
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 571dd5222..af82d8114 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -17,6 +17,8 @@
 ./usr/X11R6/include/X11/Xlib-xcb.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
+./usr/X11R6/include/X11/extensions/dri2proto.h
+./usr/X11R6/include/X11/extensions/dri2tokens.h
 ./usr/X11R6/include/intel_bufmgr.h
 ./usr/X11R6/include/xcb/bigreq.h
 ./usr/X11R6/include/xcb/composite.h
@@ -100,6 +102,8 @@
 ./usr/X11R6/lib/libIntelXvMC.la
 ./usr/X11R6/lib/libIntelXvMC.so.1.0
 ./usr/X11R6/lib/libSM.so.8.0
+./usr/X11R6/lib/libX11-xcb.a
+./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11-xcb.so.1.0
 ./usr/X11R6/lib/libX11.so.12.0
 ./usr/X11R6/lib/libXRes.so.4.0
@@ -151,76 +155,109 @@
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.15.8
+./usr/X11R6/lib/libpthread-stubs.a
 ./usr/X11R6/lib/libpthread-stubs.so.0.0
 ./usr/X11R6/lib/libpthread-stubs_pic.a
+./usr/X11R6/lib/libxcb-atom.a
 ./usr/X11R6/lib/libxcb-atom.so.1.0
 ./usr/X11R6/lib/libxcb-atom_pic.a
+./usr/X11R6/lib/libxcb-aux.a
 ./usr/X11R6/lib/libxcb-aux.so.0.0
 ./usr/X11R6/lib/libxcb-aux_pic.a
+./usr/X11R6/lib/libxcb-composite.a
 ./usr/X11R6/lib/libxcb-composite.so.0.0
 ./usr/X11R6/lib/libxcb-composite_pic.a
+./usr/X11R6/lib/libxcb-damage.a
 ./usr/X11R6/lib/libxcb-damage.so.0.0
 ./usr/X11R6/lib/libxcb-damage_pic.a
+./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
+./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
+./usr/X11R6/lib/libxcb-glx.a
 ./usr/X11R6/lib/libxcb-glx.so.0.0
 ./usr/X11R6/lib/libxcb-glx_pic.a
+./usr/X11R6/lib/libxcb-icccm.a
 ./usr/X11R6/lib/libxcb-icccm.so.1.1
 ./usr/X11R6/lib/libxcb-icccm_pic.a
+./usr/X11R6/lib/libxcb-image.a
 ./usr/X11R6/lib/libxcb-image.so.0.0
 ./usr/X11R6/lib/libxcb-image_pic.a
+./usr/X11R6/lib/libxcb-keysyms.a
 ./usr/X11R6/lib/libxcb-keysyms.so.1.0
 ./usr/X11R6/lib/libxcb-keysyms_pic.a
+./usr/X11R6/lib/libxcb-property.a
 ./usr/X11R6/lib/libxcb-property.so.1.0
 ./usr/X11R6/lib/libxcb-property_pic.a
+./usr/X11R6/lib/libxcb-randr.a
 ./usr/X11R6/lib/libxcb-randr.so.1.0
 ./usr/X11R6/lib/libxcb-randr_pic.a
+./usr/X11R6/lib/libxcb-record.a
 ./usr/X11R6/lib/libxcb-record.so.0.0
 ./usr/X11R6/lib/libxcb-record_pic.a
+./usr/X11R6/lib/libxcb-render-util.a
 ./usr/X11R6/lib/libxcb-render-util.so.0.0
 ./usr/X11R6/lib/libxcb-render-util_pic.a
+./usr/X11R6/lib/libxcb-render.a
 ./usr/X11R6/lib/libxcb-render.so.0.0
 ./usr/X11R6/lib/libxcb-render_pic.a
+./usr/X11R6/lib/libxcb-reply.a
 ./usr/X11R6/lib/libxcb-reply.so.1.0
 ./usr/X11R6/lib/libxcb-reply_pic.a
+./usr/X11R6/lib/libxcb-res.a
 ./usr/X11R6/lib/libxcb-res.so.0.0
 ./usr/X11R6/lib/libxcb-res_pic.a
+./usr/X11R6/lib/libxcb-screensaver.a
 ./usr/X11R6/lib/libxcb-screensaver.so.0.0
 ./usr/X11R6/lib/libxcb-screensaver_pic.a
+./usr/X11R6/lib/libxcb-shape.a
 ./usr/X11R6/lib/libxcb-shape.so.0.0
 ./usr/X11R6/lib/libxcb-shape_pic.a
+./usr/X11R6/lib/libxcb-shm.a
 ./usr/X11R6/lib/libxcb-shm.so.0.0
 ./usr/X11R6/lib/libxcb-shm_pic.a
+./usr/X11R6/lib/libxcb-sync.a
 ./usr/X11R6/lib/libxcb-sync.so.0.0
 ./usr/X11R6/lib/libxcb-sync_pic.a
+./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
+./usr/X11R6/lib/libxcb-xf86dri.a
 ./usr/X11R6/lib/libxcb-xf86dri.so.0.0
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
+./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
 ./usr/X11R6/lib/libxcb-xfixes_pic.a
+./usr/X11R6/lib/libxcb-xinerama.a
 ./usr/X11R6/lib/libxcb-xinerama.so.0.0
 ./usr/X11R6/lib/libxcb-xinerama_pic.a
+./usr/X11R6/lib/libxcb-xprint.a
 ./usr/X11R6/lib/libxcb-xprint.so.0.0
 ./usr/X11R6/lib/libxcb-xprint_pic.a
+./usr/X11R6/lib/libxcb-xtest.a
 ./usr/X11R6/lib/libxcb-xtest.so.0.0
 ./usr/X11R6/lib/libxcb-xtest_pic.a
+./usr/X11R6/lib/libxcb-xv.a
 ./usr/X11R6/lib/libxcb-xv.so.0.0
 ./usr/X11R6/lib/libxcb-xv_pic.a
+./usr/X11R6/lib/libxcb-xvmc.a
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
+./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.2.0
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
+./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./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/libdrm_intel.pc
+./usr/X11R6/lib/pkgconfig/pthread-stubs.pc
 ./usr/X11R6/lib/pkgconfig/x11-xcb.pc
 ./usr/X11R6/lib/pkgconfig/xcb-atom.pc
 ./usr/X11R6/lib/pkgconfig/xcb-aux.pc
@@ -315,6 +352,7 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
+./usr/X11R6/share/doc/dri2proto/dri2proto.txt
 ./usr/X11R6/share/xcb/bigreq.xml
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish
index 2aa83b55c..e3baabd63 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -17,6 +17,8 @@
 ./usr/X11R6/include/X11/Xlib-xcb.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
+./usr/X11R6/include/X11/extensions/dri2proto.h
+./usr/X11R6/include/X11/extensions/dri2tokens.h
 ./usr/X11R6/include/xcb/bigreq.h
 ./usr/X11R6/include/xcb/composite.h
 ./usr/X11R6/include/xcb/damage.h
@@ -94,6 +96,8 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
+./usr/X11R6/lib/libX11-xcb.a
+./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11-xcb.so.1.0
 ./usr/X11R6/lib/libX11.so.12.0
 ./usr/X11R6/lib/libXRes.so.4.0
@@ -142,75 +146,108 @@
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.15.8
+./usr/X11R6/lib/libpthread-stubs.a
 ./usr/X11R6/lib/libpthread-stubs.so.0.0
 ./usr/X11R6/lib/libpthread-stubs_pic.a
+./usr/X11R6/lib/libxcb-atom.a
 ./usr/X11R6/lib/libxcb-atom.so.1.0
 ./usr/X11R6/lib/libxcb-atom_pic.a
+./usr/X11R6/lib/libxcb-aux.a
 ./usr/X11R6/lib/libxcb-aux.so.0.0
 ./usr/X11R6/lib/libxcb-aux_pic.a
+./usr/X11R6/lib/libxcb-composite.a
 ./usr/X11R6/lib/libxcb-composite.so.0.0
 ./usr/X11R6/lib/libxcb-composite_pic.a
+./usr/X11R6/lib/libxcb-damage.a
 ./usr/X11R6/lib/libxcb-damage.so.0.0
 ./usr/X11R6/lib/libxcb-damage_pic.a
+./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
+./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
+./usr/X11R6/lib/libxcb-glx.a
 ./usr/X11R6/lib/libxcb-glx.so.0.0
 ./usr/X11R6/lib/libxcb-glx_pic.a
+./usr/X11R6/lib/libxcb-icccm.a
 ./usr/X11R6/lib/libxcb-icccm.so.1.1
 ./usr/X11R6/lib/libxcb-icccm_pic.a
+./usr/X11R6/lib/libxcb-image.a
 ./usr/X11R6/lib/libxcb-image.so.0.0
 ./usr/X11R6/lib/libxcb-image_pic.a
+./usr/X11R6/lib/libxcb-keysyms.a
 ./usr/X11R6/lib/libxcb-keysyms.so.1.0
 ./usr/X11R6/lib/libxcb-keysyms_pic.a
+./usr/X11R6/lib/libxcb-property.a
 ./usr/X11R6/lib/libxcb-property.so.1.0
 ./usr/X11R6/lib/libxcb-property_pic.a
+./usr/X11R6/lib/libxcb-randr.a
 ./usr/X11R6/lib/libxcb-randr.so.1.0
 ./usr/X11R6/lib/libxcb-randr_pic.a
+./usr/X11R6/lib/libxcb-record.a
 ./usr/X11R6/lib/libxcb-record.so.0.0
 ./usr/X11R6/lib/libxcb-record_pic.a
+./usr/X11R6/lib/libxcb-render-util.a
 ./usr/X11R6/lib/libxcb-render-util.so.0.0
 ./usr/X11R6/lib/libxcb-render-util_pic.a
+./usr/X11R6/lib/libxcb-render.a
 ./usr/X11R6/lib/libxcb-render.so.0.0
 ./usr/X11R6/lib/libxcb-render_pic.a
+./usr/X11R6/lib/libxcb-reply.a
 ./usr/X11R6/lib/libxcb-reply.so.1.0
 ./usr/X11R6/lib/libxcb-reply_pic.a
+./usr/X11R6/lib/libxcb-res.a
 ./usr/X11R6/lib/libxcb-res.so.0.0
 ./usr/X11R6/lib/libxcb-res_pic.a
+./usr/X11R6/lib/libxcb-screensaver.a
 ./usr/X11R6/lib/libxcb-screensaver.so.0.0
 ./usr/X11R6/lib/libxcb-screensaver_pic.a
+./usr/X11R6/lib/libxcb-shape.a
 ./usr/X11R6/lib/libxcb-shape.so.0.0
 ./usr/X11R6/lib/libxcb-shape_pic.a
+./usr/X11R6/lib/libxcb-shm.a
 ./usr/X11R6/lib/libxcb-shm.so.0.0
 ./usr/X11R6/lib/libxcb-shm_pic.a
+./usr/X11R6/lib/libxcb-sync.a
 ./usr/X11R6/lib/libxcb-sync.so.0.0
 ./usr/X11R6/lib/libxcb-sync_pic.a
+./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
+./usr/X11R6/lib/libxcb-xf86dri.a
 ./usr/X11R6/lib/libxcb-xf86dri.so.0.0
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
+./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
 ./usr/X11R6/lib/libxcb-xfixes_pic.a
+./usr/X11R6/lib/libxcb-xinerama.a
 ./usr/X11R6/lib/libxcb-xinerama.so.0.0
 ./usr/X11R6/lib/libxcb-xinerama_pic.a
+./usr/X11R6/lib/libxcb-xprint.a
 ./usr/X11R6/lib/libxcb-xprint.so.0.0
 ./usr/X11R6/lib/libxcb-xprint_pic.a
+./usr/X11R6/lib/libxcb-xtest.a
 ./usr/X11R6/lib/libxcb-xtest.so.0.0
 ./usr/X11R6/lib/libxcb-xtest_pic.a
+./usr/X11R6/lib/libxcb-xv.a
 ./usr/X11R6/lib/libxcb-xv.so.0.0
 ./usr/X11R6/lib/libxcb-xv_pic.a
+./usr/X11R6/lib/libxcb-xvmc.a
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
+./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.2.0
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
+./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./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/pthread-stubs.pc
 ./usr/X11R6/lib/pkgconfig/x11-xcb.pc
 ./usr/X11R6/lib/pkgconfig/xcb-atom.pc
 ./usr/X11R6/lib/pkgconfig/xcb-aux.pc
@@ -304,6 +341,7 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
+./usr/X11R6/share/doc/dri2proto/dri2proto.txt
 ./usr/X11R6/share/xcb/bigreq.xml
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
diff --git a/distrib/sets/lists/xbase/md.hp300 b/distrib/sets/lists/xbase/md.hp300
index 160fd66b2..5da6dac6c 100644
--- a/distrib/sets/lists/xbase/md.hp300
+++ b/distrib/sets/lists/xbase/md.hp300
@@ -13,6 +13,8 @@
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/osmesa.h
 ./usr/X11R6/include/X11/Xlib-xcb.h
+./usr/X11R6/include/X11/extensions/dri2proto.h
+./usr/X11R6/include/X11/extensions/dri2tokens.h
 ./usr/X11R6/include/xcb/bigreq.h
 ./usr/X11R6/include/xcb/composite.h
 ./usr/X11R6/include/xcb/damage.h
@@ -78,6 +80,8 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
+./usr/X11R6/lib/libX11-xcb.a
+./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11-xcb.so.1.0
 ./usr/X11R6/lib/libX11.so.12.0
 ./usr/X11R6/lib/libXRes.so.4.0
@@ -124,74 +128,107 @@
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.15.8
+./usr/X11R6/lib/libpthread-stubs.a
 ./usr/X11R6/lib/libpthread-stubs.so.0.0
 ./usr/X11R6/lib/libpthread-stubs_pic.a
+./usr/X11R6/lib/libxcb-atom.a
 ./usr/X11R6/lib/libxcb-atom.so.1.0
 ./usr/X11R6/lib/libxcb-atom_pic.a
+./usr/X11R6/lib/libxcb-aux.a
 ./usr/X11R6/lib/libxcb-aux.so.0.0
 ./usr/X11R6/lib/libxcb-aux_pic.a
+./usr/X11R6/lib/libxcb-composite.a
 ./usr/X11R6/lib/libxcb-composite.so.0.0
 ./usr/X11R6/lib/libxcb-composite_pic.a
+./usr/X11R6/lib/libxcb-damage.a
 ./usr/X11R6/lib/libxcb-damage.so.0.0
 ./usr/X11R6/lib/libxcb-damage_pic.a
+./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
+./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
+./usr/X11R6/lib/libxcb-glx.a
 ./usr/X11R6/lib/libxcb-glx.so.0.0
 ./usr/X11R6/lib/libxcb-glx_pic.a
+./usr/X11R6/lib/libxcb-icccm.a
 ./usr/X11R6/lib/libxcb-icccm.so.1.1
 ./usr/X11R6/lib/libxcb-icccm_pic.a
+./usr/X11R6/lib/libxcb-image.a
 ./usr/X11R6/lib/libxcb-image.so.0.0
 ./usr/X11R6/lib/libxcb-image_pic.a
+./usr/X11R6/lib/libxcb-keysyms.a
 ./usr/X11R6/lib/libxcb-keysyms.so.1.0
 ./usr/X11R6/lib/libxcb-keysyms_pic.a
+./usr/X11R6/lib/libxcb-property.a
 ./usr/X11R6/lib/libxcb-property.so.1.0
 ./usr/X11R6/lib/libxcb-property_pic.a
+./usr/X11R6/lib/libxcb-randr.a
 ./usr/X11R6/lib/libxcb-randr.so.1.0
 ./usr/X11R6/lib/libxcb-randr_pic.a
+./usr/X11R6/lib/libxcb-record.a
 ./usr/X11R6/lib/libxcb-record.so.0.0
 ./usr/X11R6/lib/libxcb-record_pic.a
+./usr/X11R6/lib/libxcb-render-util.a
 ./usr/X11R6/lib/libxcb-render-util.so.0.0
 ./usr/X11R6/lib/libxcb-render-util_pic.a
+./usr/X11R6/lib/libxcb-render.a
 ./usr/X11R6/lib/libxcb-render.so.0.0
 ./usr/X11R6/lib/libxcb-render_pic.a
+./usr/X11R6/lib/libxcb-reply.a
 ./usr/X11R6/lib/libxcb-reply.so.1.0
 ./usr/X11R6/lib/libxcb-reply_pic.a
+./usr/X11R6/lib/libxcb-res.a
 ./usr/X11R6/lib/libxcb-res.so.0.0
 ./usr/X11R6/lib/libxcb-res_pic.a
+./usr/X11R6/lib/libxcb-screensaver.a
 ./usr/X11R6/lib/libxcb-screensaver.so.0.0
 ./usr/X11R6/lib/libxcb-screensaver_pic.a
+./usr/X11R6/lib/libxcb-shape.a
 ./usr/X11R6/lib/libxcb-shape.so.0.0
 ./usr/X11R6/lib/libxcb-shape_pic.a
+./usr/X11R6/lib/libxcb-shm.a
 ./usr/X11R6/lib/libxcb-shm.so.0.0
 ./usr/X11R6/lib/libxcb-shm_pic.a
+./usr/X11R6/lib/libxcb-sync.a
 ./usr/X11R6/lib/libxcb-sync.so.0.0
 ./usr/X11R6/lib/libxcb-sync_pic.a
+./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
+./usr/X11R6/lib/libxcb-xf86dri.a
 ./usr/X11R6/lib/libxcb-xf86dri.so.0.0
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
+./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
 ./usr/X11R6/lib/libxcb-xfixes_pic.a
+./usr/X11R6/lib/libxcb-xinerama.a
 ./usr/X11R6/lib/libxcb-xinerama.so.0.0
 ./usr/X11R6/lib/libxcb-xinerama_pic.a
+./usr/X11R6/lib/libxcb-xprint.a
 ./usr/X11R6/lib/libxcb-xprint.so.0.0
 ./usr/X11R6/lib/libxcb-xprint_pic.a
+./usr/X11R6/lib/libxcb-xtest.a
 ./usr/X11R6/lib/libxcb-xtest.so.0.0
 ./usr/X11R6/lib/libxcb-xtest_pic.a
+./usr/X11R6/lib/libxcb-xv.a
 ./usr/X11R6/lib/libxcb-xv.so.0.0
 ./usr/X11R6/lib/libxcb-xv_pic.a
+./usr/X11R6/lib/libxcb-xvmc.a
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
+./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.2.0
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
+./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/gl.pc
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
+./usr/X11R6/lib/pkgconfig/pthread-stubs.pc
 ./usr/X11R6/lib/pkgconfig/x11-xcb.pc
 ./usr/X11R6/lib/pkgconfig/xcb-atom.pc
 ./usr/X11R6/lib/pkgconfig/xcb-aux.pc
@@ -230,6 +267,7 @@
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/man1/bdftruncate.1
 ./usr/X11R6/man/man1/xfs.1
+./usr/X11R6/share/doc/dri2proto/dri2proto.txt
 ./usr/X11R6/share/xcb/bigreq.xml
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index aba186551..3f08eab9b 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -16,6 +16,8 @@
 ./usr/X11R6/include/X11/Xlib-xcb.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
+./usr/X11R6/include/X11/extensions/dri2proto.h
+./usr/X11R6/include/X11/extensions/dri2tokens.h
 ./usr/X11R6/include/xcb/bigreq.h
 ./usr/X11R6/include/xcb/composite.h
 ./usr/X11R6/include/xcb/damage.h
@@ -67,6 +69,8 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
+./usr/X11R6/lib/libX11-xcb.a
+./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11-xcb.so.1.0
 ./usr/X11R6/lib/libX11.so.12.0
 ./usr/X11R6/lib/libXRes.so.4.0
@@ -115,75 +119,108 @@
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.15.8
+./usr/X11R6/lib/libpthread-stubs.a
 ./usr/X11R6/lib/libpthread-stubs.so.0.0
 ./usr/X11R6/lib/libpthread-stubs_pic.a
+./usr/X11R6/lib/libxcb-atom.a
 ./usr/X11R6/lib/libxcb-atom.so.1.0
 ./usr/X11R6/lib/libxcb-atom_pic.a
+./usr/X11R6/lib/libxcb-aux.a
 ./usr/X11R6/lib/libxcb-aux.so.0.0
 ./usr/X11R6/lib/libxcb-aux_pic.a
+./usr/X11R6/lib/libxcb-composite.a
 ./usr/X11R6/lib/libxcb-composite.so.0.0
 ./usr/X11R6/lib/libxcb-composite_pic.a
+./usr/X11R6/lib/libxcb-damage.a
 ./usr/X11R6/lib/libxcb-damage.so.0.0
 ./usr/X11R6/lib/libxcb-damage_pic.a
+./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
+./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
+./usr/X11R6/lib/libxcb-glx.a
 ./usr/X11R6/lib/libxcb-glx.so.0.0
 ./usr/X11R6/lib/libxcb-glx_pic.a
+./usr/X11R6/lib/libxcb-icccm.a
 ./usr/X11R6/lib/libxcb-icccm.so.1.1
 ./usr/X11R6/lib/libxcb-icccm_pic.a
+./usr/X11R6/lib/libxcb-image.a
 ./usr/X11R6/lib/libxcb-image.so.0.0
 ./usr/X11R6/lib/libxcb-image_pic.a
+./usr/X11R6/lib/libxcb-keysyms.a
 ./usr/X11R6/lib/libxcb-keysyms.so.1.0
 ./usr/X11R6/lib/libxcb-keysyms_pic.a
+./usr/X11R6/lib/libxcb-property.a
 ./usr/X11R6/lib/libxcb-property.so.1.0
 ./usr/X11R6/lib/libxcb-property_pic.a
+./usr/X11R6/lib/libxcb-randr.a
 ./usr/X11R6/lib/libxcb-randr.so.1.0
 ./usr/X11R6/lib/libxcb-randr_pic.a
+./usr/X11R6/lib/libxcb-record.a
 ./usr/X11R6/lib/libxcb-record.so.0.0
 ./usr/X11R6/lib/libxcb-record_pic.a
+./usr/X11R6/lib/libxcb-render-util.a
 ./usr/X11R6/lib/libxcb-render-util.so.0.0
 ./usr/X11R6/lib/libxcb-render-util_pic.a
+./usr/X11R6/lib/libxcb-render.a
 ./usr/X11R6/lib/libxcb-render.so.0.0
 ./usr/X11R6/lib/libxcb-render_pic.a
+./usr/X11R6/lib/libxcb-reply.a
 ./usr/X11R6/lib/libxcb-reply.so.1.0
 ./usr/X11R6/lib/libxcb-reply_pic.a
+./usr/X11R6/lib/libxcb-res.a
 ./usr/X11R6/lib/libxcb-res.so.0.0
 ./usr/X11R6/lib/libxcb-res_pic.a
+./usr/X11R6/lib/libxcb-screensaver.a
 ./usr/X11R6/lib/libxcb-screensaver.so.0.0
 ./usr/X11R6/lib/libxcb-screensaver_pic.a
+./usr/X11R6/lib/libxcb-shape.a
 ./usr/X11R6/lib/libxcb-shape.so.0.0
 ./usr/X11R6/lib/libxcb-shape_pic.a
+./usr/X11R6/lib/libxcb-shm.a
 ./usr/X11R6/lib/libxcb-shm.so.0.0
 ./usr/X11R6/lib/libxcb-shm_pic.a
+./usr/X11R6/lib/libxcb-sync.a
 ./usr/X11R6/lib/libxcb-sync.so.0.0
 ./usr/X11R6/lib/libxcb-sync_pic.a
+./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
+./usr/X11R6/lib/libxcb-xf86dri.a
 ./usr/X11R6/lib/libxcb-xf86dri.so.0.0
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
+./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
 ./usr/X11R6/lib/libxcb-xfixes_pic.a
+./usr/X11R6/lib/libxcb-xinerama.a
 ./usr/X11R6/lib/libxcb-xinerama.so.0.0
 ./usr/X11R6/lib/libxcb-xinerama_pic.a
+./usr/X11R6/lib/libxcb-xprint.a
 ./usr/X11R6/lib/libxcb-xprint.so.0.0
 ./usr/X11R6/lib/libxcb-xprint_pic.a
+./usr/X11R6/lib/libxcb-xtest.a
 ./usr/X11R6/lib/libxcb-xtest.so.0.0
 ./usr/X11R6/lib/libxcb-xtest_pic.a
+./usr/X11R6/lib/libxcb-xv.a
 ./usr/X11R6/lib/libxcb-xv.so.0.0
 ./usr/X11R6/lib/libxcb-xv_pic.a
+./usr/X11R6/lib/libxcb-xvmc.a
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
+./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.2.0
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
+./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./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/pthread-stubs.pc
 ./usr/X11R6/lib/pkgconfig/x11-xcb.pc
 ./usr/X11R6/lib/pkgconfig/xcb-atom.pc
 ./usr/X11R6/lib/pkgconfig/xcb-aux.pc
@@ -221,6 +258,7 @@
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/man1/xfs.1
+./usr/X11R6/share/doc/dri2proto/dri2proto.txt
 ./usr/X11R6/share/xcb/bigreq.xml
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index c84d874e6..b8414809a 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -17,6 +17,8 @@
 ./usr/X11R6/include/X11/Xlib-xcb.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
+./usr/X11R6/include/X11/extensions/dri2proto.h
+./usr/X11R6/include/X11/extensions/dri2tokens.h
 ./usr/X11R6/include/intel_bufmgr.h
 ./usr/X11R6/include/xcb/bigreq.h
 ./usr/X11R6/include/xcb/composite.h
@@ -100,6 +102,8 @@
 ./usr/X11R6/lib/libIntelXvMC.la
 ./usr/X11R6/lib/libIntelXvMC.so.1.0
 ./usr/X11R6/lib/libSM.so.8.0
+./usr/X11R6/lib/libX11-xcb.a
+./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11-xcb.so.1.0
 ./usr/X11R6/lib/libX11.so.12.0
 ./usr/X11R6/lib/libXRes.so.4.0
@@ -151,76 +155,109 @@
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.15.8
+./usr/X11R6/lib/libpthread-stubs.a
 ./usr/X11R6/lib/libpthread-stubs.so.0.0
 ./usr/X11R6/lib/libpthread-stubs_pic.a
+./usr/X11R6/lib/libxcb-atom.a
 ./usr/X11R6/lib/libxcb-atom.so.1.0
 ./usr/X11R6/lib/libxcb-atom_pic.a
+./usr/X11R6/lib/libxcb-aux.a
 ./usr/X11R6/lib/libxcb-aux.so.0.0
 ./usr/X11R6/lib/libxcb-aux_pic.a
+./usr/X11R6/lib/libxcb-composite.a
 ./usr/X11R6/lib/libxcb-composite.so.0.0
 ./usr/X11R6/lib/libxcb-composite_pic.a
+./usr/X11R6/lib/libxcb-damage.a
 ./usr/X11R6/lib/libxcb-damage.so.0.0
 ./usr/X11R6/lib/libxcb-damage_pic.a
+./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
+./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
+./usr/X11R6/lib/libxcb-glx.a
 ./usr/X11R6/lib/libxcb-glx.so.0.0
 ./usr/X11R6/lib/libxcb-glx_pic.a
+./usr/X11R6/lib/libxcb-icccm.a
 ./usr/X11R6/lib/libxcb-icccm.so.1.1
 ./usr/X11R6/lib/libxcb-icccm_pic.a
+./usr/X11R6/lib/libxcb-image.a
 ./usr/X11R6/lib/libxcb-image.so.0.0
 ./usr/X11R6/lib/libxcb-image_pic.a
+./usr/X11R6/lib/libxcb-keysyms.a
 ./usr/X11R6/lib/libxcb-keysyms.so.1.0
 ./usr/X11R6/lib/libxcb-keysyms_pic.a
+./usr/X11R6/lib/libxcb-property.a
 ./usr/X11R6/lib/libxcb-property.so.1.0
 ./usr/X11R6/lib/libxcb-property_pic.a
+./usr/X11R6/lib/libxcb-randr.a
 ./usr/X11R6/lib/libxcb-randr.so.1.0
 ./usr/X11R6/lib/libxcb-randr_pic.a
+./usr/X11R6/lib/libxcb-record.a
 ./usr/X11R6/lib/libxcb-record.so.0.0
 ./usr/X11R6/lib/libxcb-record_pic.a
+./usr/X11R6/lib/libxcb-render-util.a
 ./usr/X11R6/lib/libxcb-render-util.so.0.0
 ./usr/X11R6/lib/libxcb-render-util_pic.a
+./usr/X11R6/lib/libxcb-render.a
 ./usr/X11R6/lib/libxcb-render.so.0.0
 ./usr/X11R6/lib/libxcb-render_pic.a
+./usr/X11R6/lib/libxcb-reply.a
 ./usr/X11R6/lib/libxcb-reply.so.1.0
 ./usr/X11R6/lib/libxcb-reply_pic.a
+./usr/X11R6/lib/libxcb-res.a
 ./usr/X11R6/lib/libxcb-res.so.0.0
 ./usr/X11R6/lib/libxcb-res_pic.a
+./usr/X11R6/lib/libxcb-screensaver.a
 ./usr/X11R6/lib/libxcb-screensaver.so.0.0
 ./usr/X11R6/lib/libxcb-screensaver_pic.a
+./usr/X11R6/lib/libxcb-shape.a
 ./usr/X11R6/lib/libxcb-shape.so.0.0
 ./usr/X11R6/lib/libxcb-shape_pic.a
+./usr/X11R6/lib/libxcb-shm.a
 ./usr/X11R6/lib/libxcb-shm.so.0.0
 ./usr/X11R6/lib/libxcb-shm_pic.a
+./usr/X11R6/lib/libxcb-sync.a
 ./usr/X11R6/lib/libxcb-sync.so.0.0
 ./usr/X11R6/lib/libxcb-sync_pic.a
+./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
+./usr/X11R6/lib/libxcb-xf86dri.a
 ./usr/X11R6/lib/libxcb-xf86dri.so.0.0
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
+./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
 ./usr/X11R6/lib/libxcb-xfixes_pic.a
+./usr/X11R6/lib/libxcb-xinerama.a
 ./usr/X11R6/lib/libxcb-xinerama.so.0.0
 ./usr/X11R6/lib/libxcb-xinerama_pic.a
+./usr/X11R6/lib/libxcb-xprint.a
 ./usr/X11R6/lib/libxcb-xprint.so.0.0
 ./usr/X11R6/lib/libxcb-xprint_pic.a
+./usr/X11R6/lib/libxcb-xtest.a
 ./usr/X11R6/lib/libxcb-xtest.so.0.0
 ./usr/X11R6/lib/libxcb-xtest_pic.a
+./usr/X11R6/lib/libxcb-xv.a
 ./usr/X11R6/lib/libxcb-xv.so.0.0
 ./usr/X11R6/lib/libxcb-xv_pic.a
+./usr/X11R6/lib/libxcb-xvmc.a
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
+./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.2.0
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
+./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./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/libdrm_intel.pc
+./usr/X11R6/lib/pkgconfig/pthread-stubs.pc
 ./usr/X11R6/lib/pkgconfig/x11-xcb.pc
 ./usr/X11R6/lib/pkgconfig/xcb-atom.pc
 ./usr/X11R6/lib/pkgconfig/xcb-aux.pc
@@ -315,6 +352,7 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
+./usr/X11R6/share/doc/dri2proto/dri2proto.txt
 ./usr/X11R6/share/xcb/bigreq.xml
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index 8a4fac8b2..186f4e289 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -17,6 +17,8 @@
 ./usr/X11R6/include/X11/Xlib-xcb.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
+./usr/X11R6/include/X11/extensions/dri2proto.h
+./usr/X11R6/include/X11/extensions/dri2tokens.h
 ./usr/X11R6/include/xcb/bigreq.h
 ./usr/X11R6/include/xcb/composite.h
 ./usr/X11R6/include/xcb/damage.h
@@ -68,6 +70,8 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
+./usr/X11R6/lib/libX11-xcb.a
+./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11-xcb.so.1.0
 ./usr/X11R6/lib/libX11.so.12.0
 ./usr/X11R6/lib/libXRes.so.4.0
@@ -116,75 +120,108 @@
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.15.8
+./usr/X11R6/lib/libpthread-stubs.a
 ./usr/X11R6/lib/libpthread-stubs.so.0.0
 ./usr/X11R6/lib/libpthread-stubs_pic.a
+./usr/X11R6/lib/libxcb-atom.a
 ./usr/X11R6/lib/libxcb-atom.so.1.0
 ./usr/X11R6/lib/libxcb-atom_pic.a
+./usr/X11R6/lib/libxcb-aux.a
 ./usr/X11R6/lib/libxcb-aux.so.0.0
 ./usr/X11R6/lib/libxcb-aux_pic.a
+./usr/X11R6/lib/libxcb-composite.a
 ./usr/X11R6/lib/libxcb-composite.so.0.0
 ./usr/X11R6/lib/libxcb-composite_pic.a
+./usr/X11R6/lib/libxcb-damage.a
 ./usr/X11R6/lib/libxcb-damage.so.0.0
 ./usr/X11R6/lib/libxcb-damage_pic.a
+./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
+./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
+./usr/X11R6/lib/libxcb-glx.a
 ./usr/X11R6/lib/libxcb-glx.so.0.0
 ./usr/X11R6/lib/libxcb-glx_pic.a
+./usr/X11R6/lib/libxcb-icccm.a
 ./usr/X11R6/lib/libxcb-icccm.so.1.1
 ./usr/X11R6/lib/libxcb-icccm_pic.a
+./usr/X11R6/lib/libxcb-image.a
 ./usr/X11R6/lib/libxcb-image.so.0.0
 ./usr/X11R6/lib/libxcb-image_pic.a
+./usr/X11R6/lib/libxcb-keysyms.a
 ./usr/X11R6/lib/libxcb-keysyms.so.1.0
 ./usr/X11R6/lib/libxcb-keysyms_pic.a
+./usr/X11R6/lib/libxcb-property.a
 ./usr/X11R6/lib/libxcb-property.so.1.0
 ./usr/X11R6/lib/libxcb-property_pic.a
+./usr/X11R6/lib/libxcb-randr.a
 ./usr/X11R6/lib/libxcb-randr.so.1.0
 ./usr/X11R6/lib/libxcb-randr_pic.a
+./usr/X11R6/lib/libxcb-record.a
 ./usr/X11R6/lib/libxcb-record.so.0.0
 ./usr/X11R6/lib/libxcb-record_pic.a
+./usr/X11R6/lib/libxcb-render-util.a
 ./usr/X11R6/lib/libxcb-render-util.so.0.0
 ./usr/X11R6/lib/libxcb-render-util_pic.a
+./usr/X11R6/lib/libxcb-render.a
 ./usr/X11R6/lib/libxcb-render.so.0.0
 ./usr/X11R6/lib/libxcb-render_pic.a
+./usr/X11R6/lib/libxcb-reply.a
 ./usr/X11R6/lib/libxcb-reply.so.1.0
 ./usr/X11R6/lib/libxcb-reply_pic.a
+./usr/X11R6/lib/libxcb-res.a
 ./usr/X11R6/lib/libxcb-res.so.0.0
 ./usr/X11R6/lib/libxcb-res_pic.a
+./usr/X11R6/lib/libxcb-screensaver.a
 ./usr/X11R6/lib/libxcb-screensaver.so.0.0
 ./usr/X11R6/lib/libxcb-screensaver_pic.a
+./usr/X11R6/lib/libxcb-shape.a
 ./usr/X11R6/lib/libxcb-shape.so.0.0
 ./usr/X11R6/lib/libxcb-shape_pic.a
+./usr/X11R6/lib/libxcb-shm.a
 ./usr/X11R6/lib/libxcb-shm.so.0.0
 ./usr/X11R6/lib/libxcb-shm_pic.a
+./usr/X11R6/lib/libxcb-sync.a
 ./usr/X11R6/lib/libxcb-sync.so.0.0
 ./usr/X11R6/lib/libxcb-sync_pic.a
+./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
+./usr/X11R6/lib/libxcb-xf86dri.a
 ./usr/X11R6/lib/libxcb-xf86dri.so.0.0
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
+./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
 ./usr/X11R6/lib/libxcb-xfixes_pic.a
+./usr/X11R6/lib/libxcb-xinerama.a
 ./usr/X11R6/lib/libxcb-xinerama.so.0.0
 ./usr/X11R6/lib/libxcb-xinerama_pic.a
+./usr/X11R6/lib/libxcb-xprint.a
 ./usr/X11R6/lib/libxcb-xprint.so.0.0
 ./usr/X11R6/lib/libxcb-xprint_pic.a
+./usr/X11R6/lib/libxcb-xtest.a
 ./usr/X11R6/lib/libxcb-xtest.so.0.0
 ./usr/X11R6/lib/libxcb-xtest_pic.a
+./usr/X11R6/lib/libxcb-xv.a
 ./usr/X11R6/lib/libxcb-xv.so.0.0
 ./usr/X11R6/lib/libxcb-xv_pic.a
+./usr/X11R6/lib/libxcb-xvmc.a
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
+./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.2.0
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
+./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./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/pthread-stubs.pc
 ./usr/X11R6/lib/pkgconfig/x11-xcb.pc
 ./usr/X11R6/lib/pkgconfig/xcb-atom.pc
 ./usr/X11R6/lib/pkgconfig/xcb-aux.pc
@@ -276,6 +313,7 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchMode.3
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
+./usr/X11R6/share/doc/dri2proto/dri2proto.txt
 ./usr/X11R6/share/xcb/bigreq.xml
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
diff --git a/distrib/sets/lists/xbase/md.mac68k b/distrib/sets/lists/xbase/md.mac68k
index 6fd8c2239..8a9fcf140 100644
--- a/distrib/sets/lists/xbase/md.mac68k
+++ b/distrib/sets/lists/xbase/md.mac68k
@@ -14,6 +14,8 @@
 ./usr/X11R6/include/GL/glxext.h
 ./usr/X11R6/include/GL/osmesa.h
 ./usr/X11R6/include/X11/Xlib-xcb.h
+./usr/X11R6/include/X11/extensions/dri2proto.h
+./usr/X11R6/include/X11/extensions/dri2tokens.h
 ./usr/X11R6/include/xcb/bigreq.h
 ./usr/X11R6/include/xcb/composite.h
 ./usr/X11R6/include/xcb/damage.h
@@ -86,6 +88,8 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
+./usr/X11R6/lib/libX11-xcb.a
+./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11-xcb.so.1.0
 ./usr/X11R6/lib/libX11.so.12.0
 ./usr/X11R6/lib/libXRes.so.4.0
@@ -132,74 +136,107 @@
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.15.8
+./usr/X11R6/lib/libpthread-stubs.a
 ./usr/X11R6/lib/libpthread-stubs.so.0.0
 ./usr/X11R6/lib/libpthread-stubs_pic.a
+./usr/X11R6/lib/libxcb-atom.a
 ./usr/X11R6/lib/libxcb-atom.so.1.0
 ./usr/X11R6/lib/libxcb-atom_pic.a
+./usr/X11R6/lib/libxcb-aux.a
 ./usr/X11R6/lib/libxcb-aux.so.0.0
 ./usr/X11R6/lib/libxcb-aux_pic.a
+./usr/X11R6/lib/libxcb-composite.a
 ./usr/X11R6/lib/libxcb-composite.so.0.0
 ./usr/X11R6/lib/libxcb-composite_pic.a
+./usr/X11R6/lib/libxcb-damage.a
 ./usr/X11R6/lib/libxcb-damage.so.0.0
 ./usr/X11R6/lib/libxcb-damage_pic.a
+./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
+./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
+./usr/X11R6/lib/libxcb-glx.a
 ./usr/X11R6/lib/libxcb-glx.so.0.0
 ./usr/X11R6/lib/libxcb-glx_pic.a
+./usr/X11R6/lib/libxcb-icccm.a
 ./usr/X11R6/lib/libxcb-icccm.so.1.1
 ./usr/X11R6/lib/libxcb-icccm_pic.a
+./usr/X11R6/lib/libxcb-image.a
 ./usr/X11R6/lib/libxcb-image.so.0.0
 ./usr/X11R6/lib/libxcb-image_pic.a
+./usr/X11R6/lib/libxcb-keysyms.a
 ./usr/X11R6/lib/libxcb-keysyms.so.1.0
 ./usr/X11R6/lib/libxcb-keysyms_pic.a
+./usr/X11R6/lib/libxcb-property.a
 ./usr/X11R6/lib/libxcb-property.so.1.0
 ./usr/X11R6/lib/libxcb-property_pic.a
+./usr/X11R6/lib/libxcb-randr.a
 ./usr/X11R6/lib/libxcb-randr.so.1.0
 ./usr/X11R6/lib/libxcb-randr_pic.a
+./usr/X11R6/lib/libxcb-record.a
 ./usr/X11R6/lib/libxcb-record.so.0.0
 ./usr/X11R6/lib/libxcb-record_pic.a
+./usr/X11R6/lib/libxcb-render-util.a
 ./usr/X11R6/lib/libxcb-render-util.so.0.0
 ./usr/X11R6/lib/libxcb-render-util_pic.a
+./usr/X11R6/lib/libxcb-render.a
 ./usr/X11R6/lib/libxcb-render.so.0.0
 ./usr/X11R6/lib/libxcb-render_pic.a
+./usr/X11R6/lib/libxcb-reply.a
 ./usr/X11R6/lib/libxcb-reply.so.1.0
 ./usr/X11R6/lib/libxcb-reply_pic.a
+./usr/X11R6/lib/libxcb-res.a
 ./usr/X11R6/lib/libxcb-res.so.0.0
 ./usr/X11R6/lib/libxcb-res_pic.a
+./usr/X11R6/lib/libxcb-screensaver.a
 ./usr/X11R6/lib/libxcb-screensaver.so.0.0
 ./usr/X11R6/lib/libxcb-screensaver_pic.a
+./usr/X11R6/lib/libxcb-shape.a
 ./usr/X11R6/lib/libxcb-shape.so.0.0
 ./usr/X11R6/lib/libxcb-shape_pic.a
+./usr/X11R6/lib/libxcb-shm.a
 ./usr/X11R6/lib/libxcb-shm.so.0.0
 ./usr/X11R6/lib/libxcb-shm_pic.a
+./usr/X11R6/lib/libxcb-sync.a
 ./usr/X11R6/lib/libxcb-sync.so.0.0
 ./usr/X11R6/lib/libxcb-sync_pic.a
+./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
+./usr/X11R6/lib/libxcb-xf86dri.a
 ./usr/X11R6/lib/libxcb-xf86dri.so.0.0
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
+./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
 ./usr/X11R6/lib/libxcb-xfixes_pic.a
+./usr/X11R6/lib/libxcb-xinerama.a
 ./usr/X11R6/lib/libxcb-xinerama.so.0.0
 ./usr/X11R6/lib/libxcb-xinerama_pic.a
+./usr/X11R6/lib/libxcb-xprint.a
 ./usr/X11R6/lib/libxcb-xprint.so.0.0
 ./usr/X11R6/lib/libxcb-xprint_pic.a
+./usr/X11R6/lib/libxcb-xtest.a
 ./usr/X11R6/lib/libxcb-xtest.so.0.0
 ./usr/X11R6/lib/libxcb-xtest_pic.a
+./usr/X11R6/lib/libxcb-xv.a
 ./usr/X11R6/lib/libxcb-xv.so.0.0
 ./usr/X11R6/lib/libxcb-xv_pic.a
+./usr/X11R6/lib/libxcb-xvmc.a
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
+./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.2.0
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
+./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/gl.pc
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
+./usr/X11R6/lib/pkgconfig/pthread-stubs.pc
 ./usr/X11R6/lib/pkgconfig/x11-xcb.pc
 ./usr/X11R6/lib/pkgconfig/xcb-atom.pc
 ./usr/X11R6/lib/pkgconfig/xcb-aux.pc
@@ -240,6 +277,7 @@
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
 ./usr/X11R6/man/man1/xfs.1
+./usr/X11R6/share/doc/dri2proto/dri2proto.txt
 ./usr/X11R6/share/xcb/bigreq.xml
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index 9137de449..216abb20d 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -17,6 +17,8 @@
 ./usr/X11R6/include/X11/Xlib-xcb.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
+./usr/X11R6/include/X11/extensions/dri2proto.h
+./usr/X11R6/include/X11/extensions/dri2tokens.h
 ./usr/X11R6/include/xcb/bigreq.h
 ./usr/X11R6/include/xcb/composite.h
 ./usr/X11R6/include/xcb/damage.h
@@ -95,6 +97,8 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
+./usr/X11R6/lib/libX11-xcb.a
+./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11-xcb.so.1.0
 ./usr/X11R6/lib/libX11.so.12.0
 ./usr/X11R6/lib/libXRes.so.4.0
@@ -143,75 +147,108 @@
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.15.8
+./usr/X11R6/lib/libpthread-stubs.a
 ./usr/X11R6/lib/libpthread-stubs.so.0.0
 ./usr/X11R6/lib/libpthread-stubs_pic.a
+./usr/X11R6/lib/libxcb-atom.a
 ./usr/X11R6/lib/libxcb-atom.so.1.0
 ./usr/X11R6/lib/libxcb-atom_pic.a
+./usr/X11R6/lib/libxcb-aux.a
 ./usr/X11R6/lib/libxcb-aux.so.0.0
 ./usr/X11R6/lib/libxcb-aux_pic.a
+./usr/X11R6/lib/libxcb-composite.a
 ./usr/X11R6/lib/libxcb-composite.so.0.0
 ./usr/X11R6/lib/libxcb-composite_pic.a
+./usr/X11R6/lib/libxcb-damage.a
 ./usr/X11R6/lib/libxcb-damage.so.0.0
 ./usr/X11R6/lib/libxcb-damage_pic.a
+./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
+./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
+./usr/X11R6/lib/libxcb-glx.a
 ./usr/X11R6/lib/libxcb-glx.so.0.0
 ./usr/X11R6/lib/libxcb-glx_pic.a
+./usr/X11R6/lib/libxcb-icccm.a
 ./usr/X11R6/lib/libxcb-icccm.so.1.1
 ./usr/X11R6/lib/libxcb-icccm_pic.a
+./usr/X11R6/lib/libxcb-image.a
 ./usr/X11R6/lib/libxcb-image.so.0.0
 ./usr/X11R6/lib/libxcb-image_pic.a
+./usr/X11R6/lib/libxcb-keysyms.a
 ./usr/X11R6/lib/libxcb-keysyms.so.1.0
 ./usr/X11R6/lib/libxcb-keysyms_pic.a
+./usr/X11R6/lib/libxcb-property.a
 ./usr/X11R6/lib/libxcb-property.so.1.0
 ./usr/X11R6/lib/libxcb-property_pic.a
+./usr/X11R6/lib/libxcb-randr.a
 ./usr/X11R6/lib/libxcb-randr.so.1.0
 ./usr/X11R6/lib/libxcb-randr_pic.a
+./usr/X11R6/lib/libxcb-record.a
 ./usr/X11R6/lib/libxcb-record.so.0.0
 ./usr/X11R6/lib/libxcb-record_pic.a
+./usr/X11R6/lib/libxcb-render-util.a
 ./usr/X11R6/lib/libxcb-render-util.so.0.0
 ./usr/X11R6/lib/libxcb-render-util_pic.a
+./usr/X11R6/lib/libxcb-render.a
 ./usr/X11R6/lib/libxcb-render.so.0.0
 ./usr/X11R6/lib/libxcb-render_pic.a
+./usr/X11R6/lib/libxcb-reply.a
 ./usr/X11R6/lib/libxcb-reply.so.1.0
 ./usr/X11R6/lib/libxcb-reply_pic.a
+./usr/X11R6/lib/libxcb-res.a
 ./usr/X11R6/lib/libxcb-res.so.0.0
 ./usr/X11R6/lib/libxcb-res_pic.a
+./usr/X11R6/lib/libxcb-screensaver.a
 ./usr/X11R6/lib/libxcb-screensaver.so.0.0
 ./usr/X11R6/lib/libxcb-screensaver_pic.a
+./usr/X11R6/lib/libxcb-shape.a
 ./usr/X11R6/lib/libxcb-shape.so.0.0
 ./usr/X11R6/lib/libxcb-shape_pic.a
+./usr/X11R6/lib/libxcb-shm.a
 ./usr/X11R6/lib/libxcb-shm.so.0.0
 ./usr/X11R6/lib/libxcb-shm_pic.a
+./usr/X11R6/lib/libxcb-sync.a
 ./usr/X11R6/lib/libxcb-sync.so.0.0
 ./usr/X11R6/lib/libxcb-sync_pic.a
+./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
+./usr/X11R6/lib/libxcb-xf86dri.a
 ./usr/X11R6/lib/libxcb-xf86dri.so.0.0
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
+./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
 ./usr/X11R6/lib/libxcb-xfixes_pic.a
+./usr/X11R6/lib/libxcb-xinerama.a
 ./usr/X11R6/lib/libxcb-xinerama.so.0.0
 ./usr/X11R6/lib/libxcb-xinerama_pic.a
+./usr/X11R6/lib/libxcb-xprint.a
 ./usr/X11R6/lib/libxcb-xprint.so.0.0
 ./usr/X11R6/lib/libxcb-xprint_pic.a
+./usr/X11R6/lib/libxcb-xtest.a
 ./usr/X11R6/lib/libxcb-xtest.so.0.0
 ./usr/X11R6/lib/libxcb-xtest_pic.a
+./usr/X11R6/lib/libxcb-xv.a
 ./usr/X11R6/lib/libxcb-xv.so.0.0
 ./usr/X11R6/lib/libxcb-xv_pic.a
+./usr/X11R6/lib/libxcb-xvmc.a
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
+./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.2.0
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
+./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./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/pthread-stubs.pc
 ./usr/X11R6/lib/pkgconfig/x11-xcb.pc
 ./usr/X11R6/lib/pkgconfig/xcb-atom.pc
 ./usr/X11R6/lib/pkgconfig/xcb-aux.pc
@@ -306,6 +343,7 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
+./usr/X11R6/share/doc/dri2proto/dri2proto.txt
 ./usr/X11R6/share/xcb/bigreq.xml
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
diff --git a/distrib/sets/lists/xbase/md.mvme68k b/distrib/sets/lists/xbase/md.mvme68k
index 6aef27579..d16f8a0a6 100644
--- a/distrib/sets/lists/xbase/md.mvme68k
+++ b/distrib/sets/lists/xbase/md.mvme68k
@@ -17,6 +17,8 @@
 ./usr/X11R6/include/X11/Xlib-xcb.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
+./usr/X11R6/include/X11/extensions/dri2proto.h
+./usr/X11R6/include/X11/extensions/dri2tokens.h
 ./usr/X11R6/include/xcb/bigreq.h
 ./usr/X11R6/include/xcb/composite.h
 ./usr/X11R6/include/xcb/damage.h
@@ -68,6 +70,8 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
+./usr/X11R6/lib/libX11-xcb.a
+./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11-xcb.so.1.0
 ./usr/X11R6/lib/libX11.so.12.0
 ./usr/X11R6/lib/libXRes.so.4.0
@@ -116,75 +120,108 @@
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.15.8
+./usr/X11R6/lib/libpthread-stubs.a
 ./usr/X11R6/lib/libpthread-stubs.so.0.0
 ./usr/X11R6/lib/libpthread-stubs_pic.a
+./usr/X11R6/lib/libxcb-atom.a
 ./usr/X11R6/lib/libxcb-atom.so.1.0
 ./usr/X11R6/lib/libxcb-atom_pic.a
+./usr/X11R6/lib/libxcb-aux.a
 ./usr/X11R6/lib/libxcb-aux.so.0.0
 ./usr/X11R6/lib/libxcb-aux_pic.a
+./usr/X11R6/lib/libxcb-composite.a
 ./usr/X11R6/lib/libxcb-composite.so.0.0
 ./usr/X11R6/lib/libxcb-composite_pic.a
+./usr/X11R6/lib/libxcb-damage.a
 ./usr/X11R6/lib/libxcb-damage.so.0.0
 ./usr/X11R6/lib/libxcb-damage_pic.a
+./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
+./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
+./usr/X11R6/lib/libxcb-glx.a
 ./usr/X11R6/lib/libxcb-glx.so.0.0
 ./usr/X11R6/lib/libxcb-glx_pic.a
+./usr/X11R6/lib/libxcb-icccm.a
 ./usr/X11R6/lib/libxcb-icccm.so.1.1
 ./usr/X11R6/lib/libxcb-icccm_pic.a
+./usr/X11R6/lib/libxcb-image.a
 ./usr/X11R6/lib/libxcb-image.so.0.0
 ./usr/X11R6/lib/libxcb-image_pic.a
+./usr/X11R6/lib/libxcb-keysyms.a
 ./usr/X11R6/lib/libxcb-keysyms.so.1.0
 ./usr/X11R6/lib/libxcb-keysyms_pic.a
+./usr/X11R6/lib/libxcb-property.a
 ./usr/X11R6/lib/libxcb-property.so.1.0
 ./usr/X11R6/lib/libxcb-property_pic.a
+./usr/X11R6/lib/libxcb-randr.a
 ./usr/X11R6/lib/libxcb-randr.so.1.0
 ./usr/X11R6/lib/libxcb-randr_pic.a
+./usr/X11R6/lib/libxcb-record.a
 ./usr/X11R6/lib/libxcb-record.so.0.0
 ./usr/X11R6/lib/libxcb-record_pic.a
+./usr/X11R6/lib/libxcb-render-util.a
 ./usr/X11R6/lib/libxcb-render-util.so.0.0
 ./usr/X11R6/lib/libxcb-render-util_pic.a
+./usr/X11R6/lib/libxcb-render.a
 ./usr/X11R6/lib/libxcb-render.so.0.0
 ./usr/X11R6/lib/libxcb-render_pic.a
+./usr/X11R6/lib/libxcb-reply.a
 ./usr/X11R6/lib/libxcb-reply.so.1.0
 ./usr/X11R6/lib/libxcb-reply_pic.a
+./usr/X11R6/lib/libxcb-res.a
 ./usr/X11R6/lib/libxcb-res.so.0.0
 ./usr/X11R6/lib/libxcb-res_pic.a
+./usr/X11R6/lib/libxcb-screensaver.a
 ./usr/X11R6/lib/libxcb-screensaver.so.0.0
 ./usr/X11R6/lib/libxcb-screensaver_pic.a
+./usr/X11R6/lib/libxcb-shape.a
 ./usr/X11R6/lib/libxcb-shape.so.0.0
 ./usr/X11R6/lib/libxcb-shape_pic.a
+./usr/X11R6/lib/libxcb-shm.a
 ./usr/X11R6/lib/libxcb-shm.so.0.0
 ./usr/X11R6/lib/libxcb-shm_pic.a
+./usr/X11R6/lib/libxcb-sync.a
 ./usr/X11R6/lib/libxcb-sync.so.0.0
 ./usr/X11R6/lib/libxcb-sync_pic.a
+./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
+./usr/X11R6/lib/libxcb-xf86dri.a
 ./usr/X11R6/lib/libxcb-xf86dri.so.0.0
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
+./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
 ./usr/X11R6/lib/libxcb-xfixes_pic.a
+./usr/X11R6/lib/libxcb-xinerama.a
 ./usr/X11R6/lib/libxcb-xinerama.so.0.0
 ./usr/X11R6/lib/libxcb-xinerama_pic.a
+./usr/X11R6/lib/libxcb-xprint.a
 ./usr/X11R6/lib/libxcb-xprint.so.0.0
 ./usr/X11R6/lib/libxcb-xprint_pic.a
+./usr/X11R6/lib/libxcb-xtest.a
 ./usr/X11R6/lib/libxcb-xtest.so.0.0
 ./usr/X11R6/lib/libxcb-xtest_pic.a
+./usr/X11R6/lib/libxcb-xv.a
 ./usr/X11R6/lib/libxcb-xv.so.0.0
 ./usr/X11R6/lib/libxcb-xv_pic.a
+./usr/X11R6/lib/libxcb-xvmc.a
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
+./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.2.0
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/modules/dri/swrast_dri.so
 ./usr/X11R6/lib/pkgconfig/dri.pc
+./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./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/pthread-stubs.pc
 ./usr/X11R6/lib/pkgconfig/x11-xcb.pc
 ./usr/X11R6/lib/pkgconfig/xcb-atom.pc
 ./usr/X11R6/lib/pkgconfig/xcb-aux.pc
@@ -226,6 +263,7 @@
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
 ./usr/X11R6/man/man1/xfs.1
+./usr/X11R6/share/doc/dri2proto/dri2proto.txt
 ./usr/X11R6/share/xcb/bigreq.xml
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
diff --git a/distrib/sets/lists/xbase/md.mvme88k b/distrib/sets/lists/xbase/md.mvme88k
index 03f6321f9..df76bee31 100644
--- a/distrib/sets/lists/xbase/md.mvme88k
+++ b/distrib/sets/lists/xbase/md.mvme88k
@@ -1,5 +1,7 @@
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/include/X11/Xlib-xcb.h
+./usr/X11R6/include/X11/extensions/dri2proto.h
+./usr/X11R6/include/X11/extensions/dri2tokens.h
 ./usr/X11R6/include/xcb/bigreq.h
 ./usr/X11R6/include/xcb/composite.h
 ./usr/X11R6/include/xcb/damage.h
@@ -45,69 +47,104 @@
 ./usr/X11R6/include/xorg/ws-properties.h
 ./usr/X11R6/include/xorg/xkbrules.h
 ./usr/X11R6/include/xorg/xserver-properties.h
+./usr/X11R6/lib/libX11-xcb.a
+./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11-xcb.so.1.0
+./usr/X11R6/lib/libpthread-stubs.a
 ./usr/X11R6/lib/libpthread-stubs.so.0.0
 ./usr/X11R6/lib/libpthread-stubs_pic.a
+./usr/X11R6/lib/libxcb-atom.a
 ./usr/X11R6/lib/libxcb-atom.so.1.0
 ./usr/X11R6/lib/libxcb-atom_pic.a
+./usr/X11R6/lib/libxcb-aux.a
 ./usr/X11R6/lib/libxcb-aux.so.0.0
 ./usr/X11R6/lib/libxcb-aux_pic.a
+./usr/X11R6/lib/libxcb-composite.a
 ./usr/X11R6/lib/libxcb-composite.so.0.0
 ./usr/X11R6/lib/libxcb-composite_pic.a
+./usr/X11R6/lib/libxcb-damage.a
 ./usr/X11R6/lib/libxcb-damage.so.0.0
 ./usr/X11R6/lib/libxcb-damage_pic.a
+./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
+./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
+./usr/X11R6/lib/libxcb-glx.a
 ./usr/X11R6/lib/libxcb-glx.so.0.0
 ./usr/X11R6/lib/libxcb-glx_pic.a
+./usr/X11R6/lib/libxcb-icccm.a
 ./usr/X11R6/lib/libxcb-icccm.so.1.1
 ./usr/X11R6/lib/libxcb-icccm_pic.a
+./usr/X11R6/lib/libxcb-image.a
 ./usr/X11R6/lib/libxcb-image.so.0.0
 ./usr/X11R6/lib/libxcb-image_pic.a
+./usr/X11R6/lib/libxcb-keysyms.a
 ./usr/X11R6/lib/libxcb-keysyms.so.1.0
 ./usr/X11R6/lib/libxcb-keysyms_pic.a
+./usr/X11R6/lib/libxcb-property.a
 ./usr/X11R6/lib/libxcb-property.so.1.0
 ./usr/X11R6/lib/libxcb-property_pic.a
+./usr/X11R6/lib/libxcb-randr.a
 ./usr/X11R6/lib/libxcb-randr.so.1.0
 ./usr/X11R6/lib/libxcb-randr_pic.a
+./usr/X11R6/lib/libxcb-record.a
 ./usr/X11R6/lib/libxcb-record.so.0.0
 ./usr/X11R6/lib/libxcb-record_pic.a
+./usr/X11R6/lib/libxcb-render-util.a
 ./usr/X11R6/lib/libxcb-render-util.so.0.0
 ./usr/X11R6/lib/libxcb-render-util_pic.a
+./usr/X11R6/lib/libxcb-render.a
 ./usr/X11R6/lib/libxcb-render.so.0.0
 ./usr/X11R6/lib/libxcb-render_pic.a
+./usr/X11R6/lib/libxcb-reply.a
 ./usr/X11R6/lib/libxcb-reply.so.1.0
 ./usr/X11R6/lib/libxcb-reply_pic.a
+./usr/X11R6/lib/libxcb-res.a
 ./usr/X11R6/lib/libxcb-res.so.0.0
 ./usr/X11R6/lib/libxcb-res_pic.a
+./usr/X11R6/lib/libxcb-screensaver.a
 ./usr/X11R6/lib/libxcb-screensaver.so.0.0
 ./usr/X11R6/lib/libxcb-screensaver_pic.a
+./usr/X11R6/lib/libxcb-shape.a
 ./usr/X11R6/lib/libxcb-shape.so.0.0
 ./usr/X11R6/lib/libxcb-shape_pic.a
+./usr/X11R6/lib/libxcb-shm.a
 ./usr/X11R6/lib/libxcb-shm.so.0.0
 ./usr/X11R6/lib/libxcb-shm_pic.a
+./usr/X11R6/lib/libxcb-sync.a
 ./usr/X11R6/lib/libxcb-sync.so.0.0
 ./usr/X11R6/lib/libxcb-sync_pic.a
+./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
+./usr/X11R6/lib/libxcb-xf86dri.a
 ./usr/X11R6/lib/libxcb-xf86dri.so.0.0
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
+./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
 ./usr/X11R6/lib/libxcb-xfixes_pic.a
+./usr/X11R6/lib/libxcb-xinerama.a
 ./usr/X11R6/lib/libxcb-xinerama.so.0.0
 ./usr/X11R6/lib/libxcb-xinerama_pic.a
+./usr/X11R6/lib/libxcb-xprint.a
 ./usr/X11R6/lib/libxcb-xprint.so.0.0
 ./usr/X11R6/lib/libxcb-xprint_pic.a
+./usr/X11R6/lib/libxcb-xtest.a
 ./usr/X11R6/lib/libxcb-xtest.so.0.0
 ./usr/X11R6/lib/libxcb-xtest_pic.a
+./usr/X11R6/lib/libxcb-xv.a
 ./usr/X11R6/lib/libxcb-xv.so.0.0
 ./usr/X11R6/lib/libxcb-xv_pic.a
+./usr/X11R6/lib/libxcb-xvmc.a
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
+./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.2.0
 ./usr/X11R6/lib/libxcb_pic.a
+./usr/X11R6/lib/pkgconfig/dri2proto.pc
+./usr/X11R6/lib/pkgconfig/pthread-stubs.pc
 ./usr/X11R6/lib/pkgconfig/x11-xcb.pc
 ./usr/X11R6/lib/pkgconfig/xcb-atom.pc
 ./usr/X11R6/lib/pkgconfig/xcb-aux.pc
@@ -197,6 +234,7 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/man/man7/Xprint.7
+./usr/X11R6/share/doc/dri2proto/dri2proto.txt
 ./usr/X11R6/share/xcb/bigreq.xml
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index 3fff93132..334dee871 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -17,6 +17,8 @@
 ./usr/X11R6/include/X11/Xlib-xcb.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
+./usr/X11R6/include/X11/extensions/dri2proto.h
+./usr/X11R6/include/X11/extensions/dri2tokens.h
 ./usr/X11R6/include/xcb/bigreq.h
 ./usr/X11R6/include/xcb/composite.h
 ./usr/X11R6/include/xcb/damage.h
@@ -92,6 +94,8 @@
 ./usr/X11R6/lib/libGLw.so.5.1
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
+./usr/X11R6/lib/libX11-xcb.a
+./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11-xcb.so.1.0
 ./usr/X11R6/lib/libX11.so.12.0
 ./usr/X11R6/lib/libXRes.so.4.0
@@ -138,44 +142,77 @@
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.15.8
+./usr/X11R6/lib/libpthread-stubs.a
 ./usr/X11R6/lib/libpthread-stubs.so.0.0
+./usr/X11R6/lib/libxcb-atom.a
 ./usr/X11R6/lib/libxcb-atom.so.1.0
+./usr/X11R6/lib/libxcb-aux.a
 ./usr/X11R6/lib/libxcb-aux.so.0.0
+./usr/X11R6/lib/libxcb-composite.a
 ./usr/X11R6/lib/libxcb-composite.so.0.0
+./usr/X11R6/lib/libxcb-damage.a
 ./usr/X11R6/lib/libxcb-damage.so.0.0
+./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
+./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
+./usr/X11R6/lib/libxcb-glx.a
 ./usr/X11R6/lib/libxcb-glx.so.0.0
+./usr/X11R6/lib/libxcb-icccm.a
 ./usr/X11R6/lib/libxcb-icccm.so.1.1
+./usr/X11R6/lib/libxcb-image.a
 ./usr/X11R6/lib/libxcb-image.so.0.0
+./usr/X11R6/lib/libxcb-keysyms.a
 ./usr/X11R6/lib/libxcb-keysyms.so.1.0
+./usr/X11R6/lib/libxcb-property.a
 ./usr/X11R6/lib/libxcb-property.so.1.0
+./usr/X11R6/lib/libxcb-randr.a
 ./usr/X11R6/lib/libxcb-randr.so.1.0
+./usr/X11R6/lib/libxcb-record.a
 ./usr/X11R6/lib/libxcb-record.so.0.0
+./usr/X11R6/lib/libxcb-render-util.a
 ./usr/X11R6/lib/libxcb-render-util.so.0.0
+./usr/X11R6/lib/libxcb-render.a
 ./usr/X11R6/lib/libxcb-render.so.0.0
+./usr/X11R6/lib/libxcb-reply.a
 ./usr/X11R6/lib/libxcb-reply.so.1.0
+./usr/X11R6/lib/libxcb-res.a
 ./usr/X11R6/lib/libxcb-res.so.0.0
+./usr/X11R6/lib/libxcb-screensaver.a
 ./usr/X11R6/lib/libxcb-screensaver.so.0.0
+./usr/X11R6/lib/libxcb-shape.a
 ./usr/X11R6/lib/libxcb-shape.so.0.0
+./usr/X11R6/lib/libxcb-shm.a
 ./usr/X11R6/lib/libxcb-shm.so.0.0
+./usr/X11R6/lib/libxcb-sync.a
 ./usr/X11R6/lib/libxcb-sync.so.0.0
+./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
+./usr/X11R6/lib/libxcb-xf86dri.a
 ./usr/X11R6/lib/libxcb-xf86dri.so.0.0
+./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
+./usr/X11R6/lib/libxcb-xinerama.a
 ./usr/X11R6/lib/libxcb-xinerama.so.0.0
+./usr/X11R6/lib/libxcb-xprint.a
 ./usr/X11R6/lib/libxcb-xprint.so.0.0
+./usr/X11R6/lib/libxcb-xtest.a
 ./usr/X11R6/lib/libxcb-xtest.so.0.0
+./usr/X11R6/lib/libxcb-xv.a
 ./usr/X11R6/lib/libxcb-xv.so.0.0
+./usr/X11R6/lib/libxcb-xvmc.a
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
+./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.2.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
+./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./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/pthread-stubs.pc
 ./usr/X11R6/lib/pkgconfig/x11-xcb.pc
 ./usr/X11R6/lib/pkgconfig/xcb-atom.pc
 ./usr/X11R6/lib/pkgconfig/xcb-aux.pc
@@ -269,6 +306,7 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
+./usr/X11R6/share/doc/dri2proto/dri2proto.txt
 ./usr/X11R6/share/xcb/bigreq.xml
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
diff --git a/distrib/sets/lists/xbase/md.sparc b/distrib/sets/lists/xbase/md.sparc
index 7b309b9b3..64e51a3a7 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -17,6 +17,8 @@
 ./usr/X11R6/include/X11/Xlib-xcb.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
+./usr/X11R6/include/X11/extensions/dri2proto.h
+./usr/X11R6/include/X11/extensions/dri2tokens.h
 ./usr/X11R6/include/xcb/bigreq.h
 ./usr/X11R6/include/xcb/composite.h
 ./usr/X11R6/include/xcb/damage.h
@@ -94,6 +96,8 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
+./usr/X11R6/lib/libX11-xcb.a
+./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11-xcb.so.1.0
 ./usr/X11R6/lib/libX11.so.12.0
 ./usr/X11R6/lib/libXRes.so.4.0
@@ -142,75 +146,108 @@
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.15.8
+./usr/X11R6/lib/libpthread-stubs.a
 ./usr/X11R6/lib/libpthread-stubs.so.0.0
 ./usr/X11R6/lib/libpthread-stubs_pic.a
+./usr/X11R6/lib/libxcb-atom.a
 ./usr/X11R6/lib/libxcb-atom.so.1.0
 ./usr/X11R6/lib/libxcb-atom_pic.a
+./usr/X11R6/lib/libxcb-aux.a
 ./usr/X11R6/lib/libxcb-aux.so.0.0
 ./usr/X11R6/lib/libxcb-aux_pic.a
+./usr/X11R6/lib/libxcb-composite.a
 ./usr/X11R6/lib/libxcb-composite.so.0.0
 ./usr/X11R6/lib/libxcb-composite_pic.a
+./usr/X11R6/lib/libxcb-damage.a
 ./usr/X11R6/lib/libxcb-damage.so.0.0
 ./usr/X11R6/lib/libxcb-damage_pic.a
+./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
+./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
+./usr/X11R6/lib/libxcb-glx.a
 ./usr/X11R6/lib/libxcb-glx.so.0.0
 ./usr/X11R6/lib/libxcb-glx_pic.a
+./usr/X11R6/lib/libxcb-icccm.a
 ./usr/X11R6/lib/libxcb-icccm.so.1.1
 ./usr/X11R6/lib/libxcb-icccm_pic.a
+./usr/X11R6/lib/libxcb-image.a
 ./usr/X11R6/lib/libxcb-image.so.0.0
 ./usr/X11R6/lib/libxcb-image_pic.a
+./usr/X11R6/lib/libxcb-keysyms.a
 ./usr/X11R6/lib/libxcb-keysyms.so.1.0
 ./usr/X11R6/lib/libxcb-keysyms_pic.a
+./usr/X11R6/lib/libxcb-property.a
 ./usr/X11R6/lib/libxcb-property.so.1.0
 ./usr/X11R6/lib/libxcb-property_pic.a
+./usr/X11R6/lib/libxcb-randr.a
 ./usr/X11R6/lib/libxcb-randr.so.1.0
 ./usr/X11R6/lib/libxcb-randr_pic.a
+./usr/X11R6/lib/libxcb-record.a
 ./usr/X11R6/lib/libxcb-record.so.0.0
 ./usr/X11R6/lib/libxcb-record_pic.a
+./usr/X11R6/lib/libxcb-render-util.a
 ./usr/X11R6/lib/libxcb-render-util.so.0.0
 ./usr/X11R6/lib/libxcb-render-util_pic.a
+./usr/X11R6/lib/libxcb-render.a
 ./usr/X11R6/lib/libxcb-render.so.0.0
 ./usr/X11R6/lib/libxcb-render_pic.a
+./usr/X11R6/lib/libxcb-reply.a
 ./usr/X11R6/lib/libxcb-reply.so.1.0
 ./usr/X11R6/lib/libxcb-reply_pic.a
+./usr/X11R6/lib/libxcb-res.a
 ./usr/X11R6/lib/libxcb-res.so.0.0
 ./usr/X11R6/lib/libxcb-res_pic.a
+./usr/X11R6/lib/libxcb-screensaver.a
 ./usr/X11R6/lib/libxcb-screensaver.so.0.0
 ./usr/X11R6/lib/libxcb-screensaver_pic.a
+./usr/X11R6/lib/libxcb-shape.a
 ./usr/X11R6/lib/libxcb-shape.so.0.0
 ./usr/X11R6/lib/libxcb-shape_pic.a
+./usr/X11R6/lib/libxcb-shm.a
 ./usr/X11R6/lib/libxcb-shm.so.0.0
 ./usr/X11R6/lib/libxcb-shm_pic.a
+./usr/X11R6/lib/libxcb-sync.a
 ./usr/X11R6/lib/libxcb-sync.so.0.0
 ./usr/X11R6/lib/libxcb-sync_pic.a
+./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
+./usr/X11R6/lib/libxcb-xf86dri.a
 ./usr/X11R6/lib/libxcb-xf86dri.so.0.0
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
+./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
 ./usr/X11R6/lib/libxcb-xfixes_pic.a
+./usr/X11R6/lib/libxcb-xinerama.a
 ./usr/X11R6/lib/libxcb-xinerama.so.0.0
 ./usr/X11R6/lib/libxcb-xinerama_pic.a
+./usr/X11R6/lib/libxcb-xprint.a
 ./usr/X11R6/lib/libxcb-xprint.so.0.0
 ./usr/X11R6/lib/libxcb-xprint_pic.a
+./usr/X11R6/lib/libxcb-xtest.a
 ./usr/X11R6/lib/libxcb-xtest.so.0.0
 ./usr/X11R6/lib/libxcb-xtest_pic.a
+./usr/X11R6/lib/libxcb-xv.a
 ./usr/X11R6/lib/libxcb-xv.so.0.0
 ./usr/X11R6/lib/libxcb-xv_pic.a
+./usr/X11R6/lib/libxcb-xvmc.a
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
+./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.2.0
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
+./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./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/pthread-stubs.pc
 ./usr/X11R6/lib/pkgconfig/x11-xcb.pc
 ./usr/X11R6/lib/pkgconfig/xcb-atom.pc
 ./usr/X11R6/lib/pkgconfig/xcb-aux.pc
@@ -304,6 +341,7 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
+./usr/X11R6/share/doc/dri2proto/dri2proto.txt
 ./usr/X11R6/share/xcb/bigreq.xml
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index 5115aec92..837ac6871 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -17,6 +17,8 @@
 ./usr/X11R6/include/X11/Xlib-xcb.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
+./usr/X11R6/include/X11/extensions/dri2proto.h
+./usr/X11R6/include/X11/extensions/dri2tokens.h
 ./usr/X11R6/include/xcb/bigreq.h
 ./usr/X11R6/include/xcb/composite.h
 ./usr/X11R6/include/xcb/damage.h
@@ -95,6 +97,8 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
+./usr/X11R6/lib/libX11-xcb.a
+./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11-xcb.so.1.0
 ./usr/X11R6/lib/libX11.so.12.0
 ./usr/X11R6/lib/libXRes.so.4.0
@@ -143,75 +147,108 @@
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.15.8
+./usr/X11R6/lib/libpthread-stubs.a
 ./usr/X11R6/lib/libpthread-stubs.so.0.0
 ./usr/X11R6/lib/libpthread-stubs_pic.a
+./usr/X11R6/lib/libxcb-atom.a
 ./usr/X11R6/lib/libxcb-atom.so.1.0
 ./usr/X11R6/lib/libxcb-atom_pic.a
+./usr/X11R6/lib/libxcb-aux.a
 ./usr/X11R6/lib/libxcb-aux.so.0.0
 ./usr/X11R6/lib/libxcb-aux_pic.a
+./usr/X11R6/lib/libxcb-composite.a
 ./usr/X11R6/lib/libxcb-composite.so.0.0
 ./usr/X11R6/lib/libxcb-composite_pic.a
+./usr/X11R6/lib/libxcb-damage.a
 ./usr/X11R6/lib/libxcb-damage.so.0.0
 ./usr/X11R6/lib/libxcb-damage_pic.a
+./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
+./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
+./usr/X11R6/lib/libxcb-glx.a
 ./usr/X11R6/lib/libxcb-glx.so.0.0
 ./usr/X11R6/lib/libxcb-glx_pic.a
+./usr/X11R6/lib/libxcb-icccm.a
 ./usr/X11R6/lib/libxcb-icccm.so.1.1
 ./usr/X11R6/lib/libxcb-icccm_pic.a
+./usr/X11R6/lib/libxcb-image.a
 ./usr/X11R6/lib/libxcb-image.so.0.0
 ./usr/X11R6/lib/libxcb-image_pic.a
+./usr/X11R6/lib/libxcb-keysyms.a
 ./usr/X11R6/lib/libxcb-keysyms.so.1.0
 ./usr/X11R6/lib/libxcb-keysyms_pic.a
+./usr/X11R6/lib/libxcb-property.a
 ./usr/X11R6/lib/libxcb-property.so.1.0
 ./usr/X11R6/lib/libxcb-property_pic.a
+./usr/X11R6/lib/libxcb-randr.a
 ./usr/X11R6/lib/libxcb-randr.so.1.0
 ./usr/X11R6/lib/libxcb-randr_pic.a
+./usr/X11R6/lib/libxcb-record.a
 ./usr/X11R6/lib/libxcb-record.so.0.0
 ./usr/X11R6/lib/libxcb-record_pic.a
+./usr/X11R6/lib/libxcb-render-util.a
 ./usr/X11R6/lib/libxcb-render-util.so.0.0
 ./usr/X11R6/lib/libxcb-render-util_pic.a
+./usr/X11R6/lib/libxcb-render.a
 ./usr/X11R6/lib/libxcb-render.so.0.0
 ./usr/X11R6/lib/libxcb-render_pic.a
+./usr/X11R6/lib/libxcb-reply.a
 ./usr/X11R6/lib/libxcb-reply.so.1.0
 ./usr/X11R6/lib/libxcb-reply_pic.a
+./usr/X11R6/lib/libxcb-res.a
 ./usr/X11R6/lib/libxcb-res.so.0.0
 ./usr/X11R6/lib/libxcb-res_pic.a
+./usr/X11R6/lib/libxcb-screensaver.a
 ./usr/X11R6/lib/libxcb-screensaver.so.0.0
 ./usr/X11R6/lib/libxcb-screensaver_pic.a
+./usr/X11R6/lib/libxcb-shape.a
 ./usr/X11R6/lib/libxcb-shape.so.0.0
 ./usr/X11R6/lib/libxcb-shape_pic.a
+./usr/X11R6/lib/libxcb-shm.a
 ./usr/X11R6/lib/libxcb-shm.so.0.0
 ./usr/X11R6/lib/libxcb-shm_pic.a
+./usr/X11R6/lib/libxcb-sync.a
 ./usr/X11R6/lib/libxcb-sync.so.0.0
 ./usr/X11R6/lib/libxcb-sync_pic.a
+./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
+./usr/X11R6/lib/libxcb-xf86dri.a
 ./usr/X11R6/lib/libxcb-xf86dri.so.0.0
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
+./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
 ./usr/X11R6/lib/libxcb-xfixes_pic.a
+./usr/X11R6/lib/libxcb-xinerama.a
 ./usr/X11R6/lib/libxcb-xinerama.so.0.0
 ./usr/X11R6/lib/libxcb-xinerama_pic.a
+./usr/X11R6/lib/libxcb-xprint.a
 ./usr/X11R6/lib/libxcb-xprint.so.0.0
 ./usr/X11R6/lib/libxcb-xprint_pic.a
+./usr/X11R6/lib/libxcb-xtest.a
 ./usr/X11R6/lib/libxcb-xtest.so.0.0
 ./usr/X11R6/lib/libxcb-xtest_pic.a
+./usr/X11R6/lib/libxcb-xv.a
 ./usr/X11R6/lib/libxcb-xv.so.0.0
 ./usr/X11R6/lib/libxcb-xv_pic.a
+./usr/X11R6/lib/libxcb-xvmc.a
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
+./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.2.0
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
+./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./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/pthread-stubs.pc
 ./usr/X11R6/lib/pkgconfig/x11-xcb.pc
 ./usr/X11R6/lib/pkgconfig/xcb-atom.pc
 ./usr/X11R6/lib/pkgconfig/xcb-aux.pc
@@ -306,6 +343,7 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
+./usr/X11R6/share/doc/dri2proto/dri2proto.txt
 ./usr/X11R6/share/xcb/bigreq.xml
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
diff --git a/distrib/sets/lists/xbase/md.vax b/distrib/sets/lists/xbase/md.vax
index 33f74d8bc..fd1177ab8 100644
--- a/distrib/sets/lists/xbase/md.vax
+++ b/distrib/sets/lists/xbase/md.vax
@@ -1,7 +1,5 @@
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/include/xorg
-./usr/X11R6/include/xorg/ws-properties.h
-./usr/X11R6/lib/xorg/protocol.txt
 ./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 2aa83b55c..e3baabd63 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -17,6 +17,8 @@
 ./usr/X11R6/include/X11/Xlib-xcb.h
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
+./usr/X11R6/include/X11/extensions/dri2proto.h
+./usr/X11R6/include/X11/extensions/dri2tokens.h
 ./usr/X11R6/include/xcb/bigreq.h
 ./usr/X11R6/include/xcb/composite.h
 ./usr/X11R6/include/xcb/damage.h
@@ -94,6 +96,8 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
+./usr/X11R6/lib/libX11-xcb.a
+./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11-xcb.so.1.0
 ./usr/X11R6/lib/libX11.so.12.0
 ./usr/X11R6/lib/libXRes.so.4.0
@@ -142,75 +146,108 @@
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.15.8
+./usr/X11R6/lib/libpthread-stubs.a
 ./usr/X11R6/lib/libpthread-stubs.so.0.0
 ./usr/X11R6/lib/libpthread-stubs_pic.a
+./usr/X11R6/lib/libxcb-atom.a
 ./usr/X11R6/lib/libxcb-atom.so.1.0
 ./usr/X11R6/lib/libxcb-atom_pic.a
+./usr/X11R6/lib/libxcb-aux.a
 ./usr/X11R6/lib/libxcb-aux.so.0.0
 ./usr/X11R6/lib/libxcb-aux_pic.a
+./usr/X11R6/lib/libxcb-composite.a
 ./usr/X11R6/lib/libxcb-composite.so.0.0
 ./usr/X11R6/lib/libxcb-composite_pic.a
+./usr/X11R6/lib/libxcb-damage.a
 ./usr/X11R6/lib/libxcb-damage.so.0.0
 ./usr/X11R6/lib/libxcb-damage_pic.a
+./usr/X11R6/lib/libxcb-dpms.a
 ./usr/X11R6/lib/libxcb-dpms.so.0.0
 ./usr/X11R6/lib/libxcb-dpms_pic.a
+./usr/X11R6/lib/libxcb-event.a
 ./usr/X11R6/lib/libxcb-event.so.1.0
 ./usr/X11R6/lib/libxcb-event_pic.a
+./usr/X11R6/lib/libxcb-glx.a
 ./usr/X11R6/lib/libxcb-glx.so.0.0
 ./usr/X11R6/lib/libxcb-glx_pic.a
+./usr/X11R6/lib/libxcb-icccm.a
 ./usr/X11R6/lib/libxcb-icccm.so.1.1
 ./usr/X11R6/lib/libxcb-icccm_pic.a
+./usr/X11R6/lib/libxcb-image.a
 ./usr/X11R6/lib/libxcb-image.so.0.0
 ./usr/X11R6/lib/libxcb-image_pic.a
+./usr/X11R6/lib/libxcb-keysyms.a
 ./usr/X11R6/lib/libxcb-keysyms.so.1.0
 ./usr/X11R6/lib/libxcb-keysyms_pic.a
+./usr/X11R6/lib/libxcb-property.a
 ./usr/X11R6/lib/libxcb-property.so.1.0
 ./usr/X11R6/lib/libxcb-property_pic.a
+./usr/X11R6/lib/libxcb-randr.a
 ./usr/X11R6/lib/libxcb-randr.so.1.0
 ./usr/X11R6/lib/libxcb-randr_pic.a
+./usr/X11R6/lib/libxcb-record.a
 ./usr/X11R6/lib/libxcb-record.so.0.0
 ./usr/X11R6/lib/libxcb-record_pic.a
+./usr/X11R6/lib/libxcb-render-util.a
 ./usr/X11R6/lib/libxcb-render-util.so.0.0
 ./usr/X11R6/lib/libxcb-render-util_pic.a
+./usr/X11R6/lib/libxcb-render.a
 ./usr/X11R6/lib/libxcb-render.so.0.0
 ./usr/X11R6/lib/libxcb-render_pic.a
+./usr/X11R6/lib/libxcb-reply.a
 ./usr/X11R6/lib/libxcb-reply.so.1.0
 ./usr/X11R6/lib/libxcb-reply_pic.a
+./usr/X11R6/lib/libxcb-res.a
 ./usr/X11R6/lib/libxcb-res.so.0.0
 ./usr/X11R6/lib/libxcb-res_pic.a
+./usr/X11R6/lib/libxcb-screensaver.a
 ./usr/X11R6/lib/libxcb-screensaver.so.0.0
 ./usr/X11R6/lib/libxcb-screensaver_pic.a
+./usr/X11R6/lib/libxcb-shape.a
 ./usr/X11R6/lib/libxcb-shape.so.0.0
 ./usr/X11R6/lib/libxcb-shape_pic.a
+./usr/X11R6/lib/libxcb-shm.a
 ./usr/X11R6/lib/libxcb-shm.so.0.0
 ./usr/X11R6/lib/libxcb-shm_pic.a
+./usr/X11R6/lib/libxcb-sync.a
 ./usr/X11R6/lib/libxcb-sync.so.0.0
 ./usr/X11R6/lib/libxcb-sync_pic.a
+./usr/X11R6/lib/libxcb-xevie.a
 ./usr/X11R6/lib/libxcb-xevie.so.0.0
 ./usr/X11R6/lib/libxcb-xevie_pic.a
+./usr/X11R6/lib/libxcb-xf86dri.a
 ./usr/X11R6/lib/libxcb-xf86dri.so.0.0
 ./usr/X11R6/lib/libxcb-xf86dri_pic.a
+./usr/X11R6/lib/libxcb-xfixes.a
 ./usr/X11R6/lib/libxcb-xfixes.so.0.0
 ./usr/X11R6/lib/libxcb-xfixes_pic.a
+./usr/X11R6/lib/libxcb-xinerama.a
 ./usr/X11R6/lib/libxcb-xinerama.so.0.0
 ./usr/X11R6/lib/libxcb-xinerama_pic.a
+./usr/X11R6/lib/libxcb-xprint.a
 ./usr/X11R6/lib/libxcb-xprint.so.0.0
 ./usr/X11R6/lib/libxcb-xprint_pic.a
+./usr/X11R6/lib/libxcb-xtest.a
 ./usr/X11R6/lib/libxcb-xtest.so.0.0
 ./usr/X11R6/lib/libxcb-xtest_pic.a
+./usr/X11R6/lib/libxcb-xv.a
 ./usr/X11R6/lib/libxcb-xv.so.0.0
 ./usr/X11R6/lib/libxcb-xv_pic.a
+./usr/X11R6/lib/libxcb-xvmc.a
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb-xvmc_pic.a
+./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.2.0
 ./usr/X11R6/lib/libxcb_pic.a
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
+./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./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/pthread-stubs.pc
 ./usr/X11R6/lib/pkgconfig/x11-xcb.pc
 ./usr/X11R6/lib/pkgconfig/xcb-atom.pc
 ./usr/X11R6/lib/pkgconfig/xcb-aux.pc
@@ -304,6 +341,7 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
+./usr/X11R6/share/doc/dri2proto/dri2proto.txt
 ./usr/X11R6/share/xcb/bigreq.xml
 ./usr/X11R6/share/xcb/composite.xml
 ./usr/X11R6/share/xcb/damage.xml
diff --git a/distrib/sets/lists/xbase/mi b/distrib/sets/lists/xbase/mi
index 8e4560eeb..b6e92d5de 100644
--- a/distrib/sets/lists/xbase/mi
+++ b/distrib/sets/lists/xbase/mi
@@ -581,8 +581,6 @@
 ./usr/X11R6/lib/libICE.la
 ./usr/X11R6/lib/libSM.a
 ./usr/X11R6/lib/libSM.la
-./usr/X11R6/lib/libX11-xcb.a
-./usr/X11R6/lib/libX11-xcb.la
 ./usr/X11R6/lib/libX11.a
 ./usr/X11R6/lib/libX11.la
 ./usr/X11R6/lib/libXRes.a
@@ -667,37 +665,6 @@
 ./usr/X11R6/lib/libpciaccess.la
 ./usr/X11R6/lib/libpixman-1.a
 ./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpthread-stubs.a
-./usr/X11R6/lib/libxcb-atom.a
-./usr/X11R6/lib/libxcb-aux.a
-./usr/X11R6/lib/libxcb-composite.a
-./usr/X11R6/lib/libxcb-damage.a
-./usr/X11R6/lib/libxcb-dpms.a
-./usr/X11R6/lib/libxcb-event.a
-./usr/X11R6/lib/libxcb-glx.a
-./usr/X11R6/lib/libxcb-icccm.a
-./usr/X11R6/lib/libxcb-image.a
-./usr/X11R6/lib/libxcb-keysyms.a
-./usr/X11R6/lib/libxcb-property.a
-./usr/X11R6/lib/libxcb-randr.a
-./usr/X11R6/lib/libxcb-record.a
-./usr/X11R6/lib/libxcb-render-util.a
-./usr/X11R6/lib/libxcb-render.a
-./usr/X11R6/lib/libxcb-reply.a
-./usr/X11R6/lib/libxcb-res.a
-./usr/X11R6/lib/libxcb-screensaver.a
-./usr/X11R6/lib/libxcb-shape.a
-./usr/X11R6/lib/libxcb-shm.a
-./usr/X11R6/lib/libxcb-sync.a
-./usr/X11R6/lib/libxcb-xevie.a
-./usr/X11R6/lib/libxcb-xf86dri.a
-./usr/X11R6/lib/libxcb-xfixes.a
-./usr/X11R6/lib/libxcb-xinerama.a
-./usr/X11R6/lib/libxcb-xprint.a
-./usr/X11R6/lib/libxcb-xtest.a
-./usr/X11R6/lib/libxcb-xv.a
-./usr/X11R6/lib/libxcb-xvmc.a
-./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxkbfile.a
 ./usr/X11R6/lib/libxkbfile.la
 ./usr/X11R6/lib/libxkbui.a
diff --git a/distrib/sets/lists/xserv/md.landisk b/distrib/sets/lists/xserv/md.landisk
index f982a8a2c..95590756c 100644
--- a/distrib/sets/lists/xserv/md.landisk
+++ b/distrib/sets/lists/xserv/md.landisk
@@ -1,10 +1,7 @@
 ./usr/X11R6/bin/Xephyr
 ./usr/X11R6/lib/modules/dri/swrast_dri.so
-./usr/X11R6/lib/modules/drivers/wsudl_drv.la
-./usr/X11R6/lib/modules/drivers/wsudl_drv.so
 ./usr/X11R6/man/man1/Xephyr.1
 ./usr/X11R6/man/man3/XFree86-DGA.3
-./usr/X11R6/man/man4/wsudl.4
 ./usr/X11R6/man/man7/Xprint.7
 ./var/db/xkb
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.vax b/distrib/sets/lists/xserv/md.vax
index 78d280e88..16e758664 100644
--- a/distrib/sets/lists/xserv/md.vax
+++ b/distrib/sets/lists/xserv/md.vax
@@ -1,2 +1,2 @@
+./usr/X11R6/man/man7/Xprint.7
 ./var/db/xkb
-./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi
index e5e2fc873..a305d8dc8 100644
--- a/distrib/sets/lists/xshare/mi
+++ b/distrib/sets/lists/xshare/mi
@@ -359,8 +359,6 @@
 ./usr/X11R6/include/X11/extensions/dmxproto.h
 ./usr/X11R6/include/X11/extensions/dpms.h
 ./usr/X11R6/include/X11/extensions/dpmsstr.h
-./usr/X11R6/include/X11/extensions/dri2proto.h
-./usr/X11R6/include/X11/extensions/dri2tokens.h
 ./usr/X11R6/include/X11/extensions/extutil.h
 ./usr/X11R6/include/X11/extensions/fontcache.h
 ./usr/X11R6/include/X11/extensions/fontcacheP.h
@@ -823,7 +821,6 @@
 ./usr/X11R6/lib/pkgconfig/damageproto.pc
 ./usr/X11R6/lib/pkgconfig/dmx.pc
 ./usr/X11R6/lib/pkgconfig/dmxproto.pc
-./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/evieproto.pc
 ./usr/X11R6/lib/pkgconfig/fixesproto.pc
 ./usr/X11R6/lib/pkgconfig/fontcacheproto.pc
@@ -840,7 +837,6 @@
 ./usr/X11R6/lib/pkgconfig/libfs.pc
 ./usr/X11R6/lib/pkgconfig/pciaccess.pc
 ./usr/X11R6/lib/pkgconfig/printproto.pc
-./usr/X11R6/lib/pkgconfig/pthread-stubs.pc
 ./usr/X11R6/lib/pkgconfig/randrproto.pc
 ./usr/X11R6/lib/pkgconfig/recordproto.pc
 ./usr/X11R6/lib/pkgconfig/renderproto.pc
@@ -2848,7 +2844,6 @@
 ./usr/X11R6/share/doc/damageproto
 ./usr/X11R6/share/doc/damageproto/damageproto.txt
 ./usr/X11R6/share/doc/dri2proto
-./usr/X11R6/share/doc/dri2proto/dri2proto.txt
 ./usr/X11R6/share/doc/fontconfig
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel.pdf