sync

38 files changed, 19 insertions, 205 deletions

diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index 5bdfc4caa..f16e2ee42 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -92,7 +92,6 @@
 ./usr/X11R6/lib/libfontconfig.so.9.1
 ./usr/X11R6/lib/libfontenc.so.4.0
 ./usr/X11R6/lib/libfreetype.so.22.0
-./usr/X11R6/lib/libgbm.a
 ./usr/X11R6/lib/libgbm.so.0.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
@@ -104,25 +103,19 @@
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
 ./usr/X11R6/lib/libxcb-composite.so.1.0
-./usr/X11R6/lib/libxcb-cursor.la
 ./usr/X11R6/lib/libxcb-cursor.so.0.0
 ./usr/X11R6/lib/libxcb-damage.so.1.0
 ./usr/X11R6/lib/libxcb-dpms.so.1.0
 ./usr/X11R6/lib/libxcb-dri2.so.1.1
 ./usr/X11R6/lib/libxcb-dri3.so.0.0
-./usr/X11R6/lib/libxcb-ewmh.la
 ./usr/X11R6/lib/libxcb-ewmh.so.2.0
 ./usr/X11R6/lib/libxcb-glx.so.1.0
-./usr/X11R6/lib/libxcb-icccm.la
 ./usr/X11R6/lib/libxcb-icccm.so.4.0
-./usr/X11R6/lib/libxcb-image.la
 ./usr/X11R6/lib/libxcb-image.so.2.0
-./usr/X11R6/lib/libxcb-keysyms.la
 ./usr/X11R6/lib/libxcb-keysyms.so.3.0
 ./usr/X11R6/lib/libxcb-present.so.0.0
 ./usr/X11R6/lib/libxcb-randr.so.2.1
 ./usr/X11R6/lib/libxcb-record.so.1.0
-./usr/X11R6/lib/libxcb-render-util.la
 ./usr/X11R6/lib/libxcb-render-util.so.2.0
 ./usr/X11R6/lib/libxcb-render.so.1.0
 ./usr/X11R6/lib/libxcb-res.so.1.1
@@ -130,7 +123,6 @@
 ./usr/X11R6/lib/libxcb-shape.so.1.0
 ./usr/X11R6/lib/libxcb-shm.so.1.1
 ./usr/X11R6/lib/libxcb-sync.so.1.1
-./usr/X11R6/lib/libxcb-util.la
 ./usr/X11R6/lib/libxcb-util.so.0.0
 ./usr/X11R6/lib/libxcb-xevie.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri.so.2.0
@@ -144,8 +136,6 @@
 ./usr/X11R6/lib/libxcb.so.3.1
 ./usr/X11R6/lib/libxkbfile.so.6.0
 ./usr/X11R6/lib/libxkbui.so.5.0
-./usr/X11R6/lib/locate
-./usr/X11R6/lib/locate/xorg.db
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/egl.pc
@@ -157,7 +147,6 @@
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/pixman-1.pc
-./usr/X11R6/lib/pkgconfig/presentproto.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/man1/bdftruncate.1
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 777f27711..ae70ee7ed 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -140,7 +140,6 @@
 ./usr/X11R6/lib/libfontconfig.so.9.1
 ./usr/X11R6/lib/libfontenc.so.4.0
 ./usr/X11R6/lib/libfreetype.so.22.0
-./usr/X11R6/lib/libgbm.a
 ./usr/X11R6/lib/libgbm.so.0.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
@@ -152,25 +151,19 @@
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
 ./usr/X11R6/lib/libxcb-composite.so.1.0
-./usr/X11R6/lib/libxcb-cursor.la
 ./usr/X11R6/lib/libxcb-cursor.so.0.0
 ./usr/X11R6/lib/libxcb-damage.so.1.0
 ./usr/X11R6/lib/libxcb-dpms.so.1.0
 ./usr/X11R6/lib/libxcb-dri2.so.1.1
 ./usr/X11R6/lib/libxcb-dri3.so.0.0
-./usr/X11R6/lib/libxcb-ewmh.la
 ./usr/X11R6/lib/libxcb-ewmh.so.2.0
 ./usr/X11R6/lib/libxcb-glx.so.1.0
-./usr/X11R6/lib/libxcb-icccm.la
 ./usr/X11R6/lib/libxcb-icccm.so.4.0
-./usr/X11R6/lib/libxcb-image.la
 ./usr/X11R6/lib/libxcb-image.so.2.0
-./usr/X11R6/lib/libxcb-keysyms.la
 ./usr/X11R6/lib/libxcb-keysyms.so.3.0
 ./usr/X11R6/lib/libxcb-present.so.0.0
 ./usr/X11R6/lib/libxcb-randr.so.2.1
 ./usr/X11R6/lib/libxcb-record.so.1.0
-./usr/X11R6/lib/libxcb-render-util.la
 ./usr/X11R6/lib/libxcb-render-util.so.2.0
 ./usr/X11R6/lib/libxcb-render.so.1.0
 ./usr/X11R6/lib/libxcb-res.so.1.1
@@ -178,7 +171,6 @@
 ./usr/X11R6/lib/libxcb-shape.so.1.0
 ./usr/X11R6/lib/libxcb-shm.so.1.1
 ./usr/X11R6/lib/libxcb-sync.so.1.1
-./usr/X11R6/lib/libxcb-util.la
 ./usr/X11R6/lib/libxcb-util.so.0.0
 ./usr/X11R6/lib/libxcb-xevie.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri.so.2.0
@@ -192,8 +184,6 @@
 ./usr/X11R6/lib/libxcb.so.3.1
 ./usr/X11R6/lib/libxkbfile.so.6.0
 ./usr/X11R6/lib/libxkbui.so.5.0
-./usr/X11R6/lib/locate
-./usr/X11R6/lib/locate/xorg.db
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/egl.pc
@@ -206,7 +196,6 @@
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/libdrm_intel.pc
 ./usr/X11R6/lib/pkgconfig/pixman-1.pc
-./usr/X11R6/lib/pkgconfig/presentproto.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/pkgconfig/xorg-joystick.pc
 ./usr/X11R6/lib/xorg/protocol.txt
diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish
index 1243f2e43..d2f105648 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -129,7 +129,6 @@
 ./usr/X11R6/lib/libfontconfig.so.9.1
 ./usr/X11R6/lib/libfontenc.so.4.0
 ./usr/X11R6/lib/libfreetype.so.22.0
-./usr/X11R6/lib/libgbm.a
 ./usr/X11R6/lib/libgbm.so.0.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
@@ -141,25 +140,19 @@
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
 ./usr/X11R6/lib/libxcb-composite.so.1.0
-./usr/X11R6/lib/libxcb-cursor.la
 ./usr/X11R6/lib/libxcb-cursor.so.0.0
 ./usr/X11R6/lib/libxcb-damage.so.1.0
 ./usr/X11R6/lib/libxcb-dpms.so.1.0
 ./usr/X11R6/lib/libxcb-dri2.so.1.1
 ./usr/X11R6/lib/libxcb-dri3.so.0.0
-./usr/X11R6/lib/libxcb-ewmh.la
 ./usr/X11R6/lib/libxcb-ewmh.so.2.0
 ./usr/X11R6/lib/libxcb-glx.so.1.0
-./usr/X11R6/lib/libxcb-icccm.la
 ./usr/X11R6/lib/libxcb-icccm.so.4.0
-./usr/X11R6/lib/libxcb-image.la
 ./usr/X11R6/lib/libxcb-image.so.2.0
-./usr/X11R6/lib/libxcb-keysyms.la
 ./usr/X11R6/lib/libxcb-keysyms.so.3.0
 ./usr/X11R6/lib/libxcb-present.so.0.0
 ./usr/X11R6/lib/libxcb-randr.so.2.1
 ./usr/X11R6/lib/libxcb-record.so.1.0
-./usr/X11R6/lib/libxcb-render-util.la
 ./usr/X11R6/lib/libxcb-render-util.so.2.0
 ./usr/X11R6/lib/libxcb-render.so.1.0
 ./usr/X11R6/lib/libxcb-res.so.1.1
@@ -167,7 +160,6 @@
 ./usr/X11R6/lib/libxcb-shape.so.1.0
 ./usr/X11R6/lib/libxcb-shm.so.1.1
 ./usr/X11R6/lib/libxcb-sync.so.1.1
-./usr/X11R6/lib/libxcb-util.la
 ./usr/X11R6/lib/libxcb-util.so.0.0
 ./usr/X11R6/lib/libxcb-xevie.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri.so.2.0
@@ -181,8 +173,6 @@
 ./usr/X11R6/lib/libxcb.so.3.1
 ./usr/X11R6/lib/libxkbfile.so.6.0
 ./usr/X11R6/lib/libxkbui.so.5.0
-./usr/X11R6/lib/locate
-./usr/X11R6/lib/locate/xorg.db
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/egl.pc
@@ -194,7 +184,6 @@
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/pixman-1.pc
-./usr/X11R6/lib/pkgconfig/presentproto.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/man1/bdftruncate.1
diff --git a/distrib/sets/lists/xbase/md.armv7 b/distrib/sets/lists/xbase/md.armv7
index 1243f2e43..d2f105648 100644
--- a/distrib/sets/lists/xbase/md.armv7
+++ b/distrib/sets/lists/xbase/md.armv7
@@ -129,7 +129,6 @@
 ./usr/X11R6/lib/libfontconfig.so.9.1
 ./usr/X11R6/lib/libfontenc.so.4.0
 ./usr/X11R6/lib/libfreetype.so.22.0
-./usr/X11R6/lib/libgbm.a
 ./usr/X11R6/lib/libgbm.so.0.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
@@ -141,25 +140,19 @@
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
 ./usr/X11R6/lib/libxcb-composite.so.1.0
-./usr/X11R6/lib/libxcb-cursor.la
 ./usr/X11R6/lib/libxcb-cursor.so.0.0
 ./usr/X11R6/lib/libxcb-damage.so.1.0
 ./usr/X11R6/lib/libxcb-dpms.so.1.0
 ./usr/X11R6/lib/libxcb-dri2.so.1.1
 ./usr/X11R6/lib/libxcb-dri3.so.0.0
-./usr/X11R6/lib/libxcb-ewmh.la
 ./usr/X11R6/lib/libxcb-ewmh.so.2.0
 ./usr/X11R6/lib/libxcb-glx.so.1.0
-./usr/X11R6/lib/libxcb-icccm.la
 ./usr/X11R6/lib/libxcb-icccm.so.4.0
-./usr/X11R6/lib/libxcb-image.la
 ./usr/X11R6/lib/libxcb-image.so.2.0
-./usr/X11R6/lib/libxcb-keysyms.la
 ./usr/X11R6/lib/libxcb-keysyms.so.3.0
 ./usr/X11R6/lib/libxcb-present.so.0.0
 ./usr/X11R6/lib/libxcb-randr.so.2.1
 ./usr/X11R6/lib/libxcb-record.so.1.0
-./usr/X11R6/lib/libxcb-render-util.la
 ./usr/X11R6/lib/libxcb-render-util.so.2.0
 ./usr/X11R6/lib/libxcb-render.so.1.0
 ./usr/X11R6/lib/libxcb-res.so.1.1
@@ -167,7 +160,6 @@
 ./usr/X11R6/lib/libxcb-shape.so.1.0
 ./usr/X11R6/lib/libxcb-shm.so.1.1
 ./usr/X11R6/lib/libxcb-sync.so.1.1
-./usr/X11R6/lib/libxcb-util.la
 ./usr/X11R6/lib/libxcb-util.so.0.0
 ./usr/X11R6/lib/libxcb-xevie.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri.so.2.0
@@ -181,8 +173,6 @@
 ./usr/X11R6/lib/libxcb.so.3.1
 ./usr/X11R6/lib/libxkbfile.so.6.0
 ./usr/X11R6/lib/libxkbui.so.5.0
-./usr/X11R6/lib/locate
-./usr/X11R6/lib/locate/xorg.db
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/egl.pc
@@ -194,7 +184,6 @@
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/pixman-1.pc
-./usr/X11R6/lib/pkgconfig/presentproto.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/man1/bdftruncate.1
diff --git a/distrib/sets/lists/xbase/md.aviion b/distrib/sets/lists/xbase/md.aviion
index 15d3d8b21..d62ae5898 100644
--- a/distrib/sets/lists/xbase/md.aviion
+++ b/distrib/sets/lists/xbase/md.aviion
@@ -92,7 +92,6 @@
 ./usr/X11R6/lib/libfontconfig.so.9.1
 ./usr/X11R6/lib/libfontenc.so.4.0
 ./usr/X11R6/lib/libfreetype.so.22.0
-./usr/X11R6/lib/libgbm.a
 ./usr/X11R6/lib/libgbm.so.0.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
@@ -104,25 +103,19 @@
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
 ./usr/X11R6/lib/libxcb-composite.so.1.0
-./usr/X11R6/lib/libxcb-cursor.la
 ./usr/X11R6/lib/libxcb-cursor.so.0.0
 ./usr/X11R6/lib/libxcb-damage.so.1.0
 ./usr/X11R6/lib/libxcb-dpms.so.1.0
 ./usr/X11R6/lib/libxcb-dri2.so.1.1
 ./usr/X11R6/lib/libxcb-dri3.so.0.0
-./usr/X11R6/lib/libxcb-ewmh.la
 ./usr/X11R6/lib/libxcb-ewmh.so.2.0
 ./usr/X11R6/lib/libxcb-glx.so.1.0
-./usr/X11R6/lib/libxcb-icccm.la
 ./usr/X11R6/lib/libxcb-icccm.so.4.0
-./usr/X11R6/lib/libxcb-image.la
 ./usr/X11R6/lib/libxcb-image.so.2.0
-./usr/X11R6/lib/libxcb-keysyms.la
 ./usr/X11R6/lib/libxcb-keysyms.so.3.0
 ./usr/X11R6/lib/libxcb-present.so.0.0
 ./usr/X11R6/lib/libxcb-randr.so.2.1
 ./usr/X11R6/lib/libxcb-record.so.1.0
-./usr/X11R6/lib/libxcb-render-util.la
 ./usr/X11R6/lib/libxcb-render-util.so.2.0
 ./usr/X11R6/lib/libxcb-render.so.1.0
 ./usr/X11R6/lib/libxcb-res.so.1.1
@@ -130,7 +123,6 @@
 ./usr/X11R6/lib/libxcb-shape.so.1.0
 ./usr/X11R6/lib/libxcb-shm.so.1.1
 ./usr/X11R6/lib/libxcb-sync.so.1.1
-./usr/X11R6/lib/libxcb-util.la
 ./usr/X11R6/lib/libxcb-util.so.0.0
 ./usr/X11R6/lib/libxcb-xevie.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri.so.2.0
@@ -144,8 +136,6 @@
 ./usr/X11R6/lib/libxcb.so.3.1
 ./usr/X11R6/lib/libxkbfile.so.6.0
 ./usr/X11R6/lib/libxkbui.so.5.0
-./usr/X11R6/lib/locate
-./usr/X11R6/lib/locate/xorg.db
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/egl.pc
@@ -157,7 +147,6 @@
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/pixman-1.pc
-./usr/X11R6/lib/pkgconfig/presentproto.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/man1/bdftruncate.1
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index 1ff117ab4..680c5f4f6 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -93,7 +93,6 @@
 ./usr/X11R6/lib/libfontconfig.so.9.1
 ./usr/X11R6/lib/libfontenc.so.4.0
 ./usr/X11R6/lib/libfreetype.so.22.0
-./usr/X11R6/lib/libgbm.a
 ./usr/X11R6/lib/libgbm.so.0.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
@@ -105,25 +104,19 @@
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
 ./usr/X11R6/lib/libxcb-composite.so.1.0
-./usr/X11R6/lib/libxcb-cursor.la
 ./usr/X11R6/lib/libxcb-cursor.so.0.0
 ./usr/X11R6/lib/libxcb-damage.so.1.0
 ./usr/X11R6/lib/libxcb-dpms.so.1.0
 ./usr/X11R6/lib/libxcb-dri2.so.1.1
 ./usr/X11R6/lib/libxcb-dri3.so.0.0
-./usr/X11R6/lib/libxcb-ewmh.la
 ./usr/X11R6/lib/libxcb-ewmh.so.2.0
 ./usr/X11R6/lib/libxcb-glx.so.1.0
-./usr/X11R6/lib/libxcb-icccm.la
 ./usr/X11R6/lib/libxcb-icccm.so.4.0
-./usr/X11R6/lib/libxcb-image.la
 ./usr/X11R6/lib/libxcb-image.so.2.0
-./usr/X11R6/lib/libxcb-keysyms.la
 ./usr/X11R6/lib/libxcb-keysyms.so.3.0
 ./usr/X11R6/lib/libxcb-present.so.0.0
 ./usr/X11R6/lib/libxcb-randr.so.2.1
 ./usr/X11R6/lib/libxcb-record.so.1.0
-./usr/X11R6/lib/libxcb-render-util.la
 ./usr/X11R6/lib/libxcb-render-util.so.2.0
 ./usr/X11R6/lib/libxcb-render.so.1.0
 ./usr/X11R6/lib/libxcb-res.so.1.1
@@ -131,7 +124,6 @@
 ./usr/X11R6/lib/libxcb-shape.so.1.0
 ./usr/X11R6/lib/libxcb-shm.so.1.1
 ./usr/X11R6/lib/libxcb-sync.so.1.1
-./usr/X11R6/lib/libxcb-util.la
 ./usr/X11R6/lib/libxcb-util.so.0.0
 ./usr/X11R6/lib/libxcb-xevie.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri.so.2.0
@@ -145,8 +137,6 @@
 ./usr/X11R6/lib/libxcb.so.3.1
 ./usr/X11R6/lib/libxkbfile.so.6.0
 ./usr/X11R6/lib/libxkbui.so.5.0
-./usr/X11R6/lib/locate
-./usr/X11R6/lib/locate/xorg.db
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/egl.pc
@@ -158,7 +148,6 @@
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/pixman-1.pc
-./usr/X11R6/lib/pkgconfig/presentproto.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/man1/glxgears.1
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index 44b905f08..123d6acc9 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -140,7 +140,6 @@
 ./usr/X11R6/lib/libfontconfig.so.9.1
 ./usr/X11R6/lib/libfontenc.so.4.0
 ./usr/X11R6/lib/libfreetype.so.22.0
-./usr/X11R6/lib/libgbm.a
 ./usr/X11R6/lib/libgbm.so.0.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
@@ -152,25 +151,19 @@
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
 ./usr/X11R6/lib/libxcb-composite.so.1.0
-./usr/X11R6/lib/libxcb-cursor.la
 ./usr/X11R6/lib/libxcb-cursor.so.0.0
 ./usr/X11R6/lib/libxcb-damage.so.1.0
 ./usr/X11R6/lib/libxcb-dpms.so.1.0
 ./usr/X11R6/lib/libxcb-dri2.so.1.1
 ./usr/X11R6/lib/libxcb-dri3.so.0.0
-./usr/X11R6/lib/libxcb-ewmh.la
 ./usr/X11R6/lib/libxcb-ewmh.so.2.0
 ./usr/X11R6/lib/libxcb-glx.so.1.0
-./usr/X11R6/lib/libxcb-icccm.la
 ./usr/X11R6/lib/libxcb-icccm.so.4.0
-./usr/X11R6/lib/libxcb-image.la
 ./usr/X11R6/lib/libxcb-image.so.2.0
-./usr/X11R6/lib/libxcb-keysyms.la
 ./usr/X11R6/lib/libxcb-keysyms.so.3.0
 ./usr/X11R6/lib/libxcb-present.so.0.0
 ./usr/X11R6/lib/libxcb-randr.so.2.1
 ./usr/X11R6/lib/libxcb-record.so.1.0
-./usr/X11R6/lib/libxcb-render-util.la
 ./usr/X11R6/lib/libxcb-render-util.so.2.0
 ./usr/X11R6/lib/libxcb-render.so.1.0
 ./usr/X11R6/lib/libxcb-res.so.1.1
@@ -178,7 +171,6 @@
 ./usr/X11R6/lib/libxcb-shape.so.1.0
 ./usr/X11R6/lib/libxcb-shm.so.1.1
 ./usr/X11R6/lib/libxcb-sync.so.1.1
-./usr/X11R6/lib/libxcb-util.la
 ./usr/X11R6/lib/libxcb-util.so.0.0
 ./usr/X11R6/lib/libxcb-xevie.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri.so.2.0
@@ -192,8 +184,6 @@
 ./usr/X11R6/lib/libxcb.so.3.1
 ./usr/X11R6/lib/libxkbfile.so.6.0
 ./usr/X11R6/lib/libxkbui.so.5.0
-./usr/X11R6/lib/locate
-./usr/X11R6/lib/locate/xorg.db
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/egl.pc
@@ -206,7 +196,6 @@
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/libdrm_intel.pc
 ./usr/X11R6/lib/pkgconfig/pixman-1.pc
-./usr/X11R6/lib/pkgconfig/presentproto.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/pkgconfig/xorg-joystick.pc
 ./usr/X11R6/lib/xorg/protocol.txt
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index 0b8961d64..ff75234a5 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -93,7 +93,6 @@
 ./usr/X11R6/lib/libfontconfig.so.9.1
 ./usr/X11R6/lib/libfontenc.so.4.0
 ./usr/X11R6/lib/libfreetype.so.22.0
-./usr/X11R6/lib/libgbm.a
 ./usr/X11R6/lib/libgbm.so.0.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
@@ -105,25 +104,19 @@
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
 ./usr/X11R6/lib/libxcb-composite.so.1.0
-./usr/X11R6/lib/libxcb-cursor.la
 ./usr/X11R6/lib/libxcb-cursor.so.0.0
 ./usr/X11R6/lib/libxcb-damage.so.1.0
 ./usr/X11R6/lib/libxcb-dpms.so.1.0
 ./usr/X11R6/lib/libxcb-dri2.so.1.1
 ./usr/X11R6/lib/libxcb-dri3.so.0.0
-./usr/X11R6/lib/libxcb-ewmh.la
 ./usr/X11R6/lib/libxcb-ewmh.so.2.0
 ./usr/X11R6/lib/libxcb-glx.so.1.0
-./usr/X11R6/lib/libxcb-icccm.la
 ./usr/X11R6/lib/libxcb-icccm.so.4.0
-./usr/X11R6/lib/libxcb-image.la
 ./usr/X11R6/lib/libxcb-image.so.2.0
-./usr/X11R6/lib/libxcb-keysyms.la
 ./usr/X11R6/lib/libxcb-keysyms.so.3.0
 ./usr/X11R6/lib/libxcb-present.so.0.0
 ./usr/X11R6/lib/libxcb-randr.so.2.1
 ./usr/X11R6/lib/libxcb-record.so.1.0
-./usr/X11R6/lib/libxcb-render-util.la
 ./usr/X11R6/lib/libxcb-render-util.so.2.0
 ./usr/X11R6/lib/libxcb-render.so.1.0
 ./usr/X11R6/lib/libxcb-res.so.1.1
@@ -131,7 +124,6 @@
 ./usr/X11R6/lib/libxcb-shape.so.1.0
 ./usr/X11R6/lib/libxcb-shm.so.1.1
 ./usr/X11R6/lib/libxcb-sync.so.1.1
-./usr/X11R6/lib/libxcb-util.la
 ./usr/X11R6/lib/libxcb-util.so.0.0
 ./usr/X11R6/lib/libxcb-xevie.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri.so.2.0
@@ -145,8 +137,6 @@
 ./usr/X11R6/lib/libxcb.so.3.1
 ./usr/X11R6/lib/libxkbfile.so.6.0
 ./usr/X11R6/lib/libxkbui.so.5.0
-./usr/X11R6/lib/locate
-./usr/X11R6/lib/locate/xorg.db
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/egl.pc
@@ -158,7 +148,6 @@
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/pixman-1.pc
-./usr/X11R6/lib/pkgconfig/presentproto.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/man1/bdftruncate.1
diff --git a/distrib/sets/lists/xbase/md.loongson b/distrib/sets/lists/xbase/md.loongson
index 7be478e11..74cd3c476 100644
--- a/distrib/sets/lists/xbase/md.loongson
+++ b/distrib/sets/lists/xbase/md.loongson
@@ -130,7 +130,6 @@
 ./usr/X11R6/lib/libfontconfig.so.9.1
 ./usr/X11R6/lib/libfontenc.so.4.0
 ./usr/X11R6/lib/libfreetype.so.22.0
-./usr/X11R6/lib/libgbm.a
 ./usr/X11R6/lib/libgbm.so.0.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
@@ -142,25 +141,19 @@
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
 ./usr/X11R6/lib/libxcb-composite.so.1.0
-./usr/X11R6/lib/libxcb-cursor.la
 ./usr/X11R6/lib/libxcb-cursor.so.0.0
 ./usr/X11R6/lib/libxcb-damage.so.1.0
 ./usr/X11R6/lib/libxcb-dpms.so.1.0
 ./usr/X11R6/lib/libxcb-dri2.so.1.1
 ./usr/X11R6/lib/libxcb-dri3.so.0.0
-./usr/X11R6/lib/libxcb-ewmh.la
 ./usr/X11R6/lib/libxcb-ewmh.so.2.0
 ./usr/X11R6/lib/libxcb-glx.so.1.0
-./usr/X11R6/lib/libxcb-icccm.la
 ./usr/X11R6/lib/libxcb-icccm.so.4.0
-./usr/X11R6/lib/libxcb-image.la
 ./usr/X11R6/lib/libxcb-image.so.2.0
-./usr/X11R6/lib/libxcb-keysyms.la
 ./usr/X11R6/lib/libxcb-keysyms.so.3.0
 ./usr/X11R6/lib/libxcb-present.so.0.0
 ./usr/X11R6/lib/libxcb-randr.so.2.1
 ./usr/X11R6/lib/libxcb-record.so.1.0
-./usr/X11R6/lib/libxcb-render-util.la
 ./usr/X11R6/lib/libxcb-render-util.so.2.0
 ./usr/X11R6/lib/libxcb-render.so.1.0
 ./usr/X11R6/lib/libxcb-res.so.1.1
@@ -168,7 +161,6 @@
 ./usr/X11R6/lib/libxcb-shape.so.1.0
 ./usr/X11R6/lib/libxcb-shm.so.1.1
 ./usr/X11R6/lib/libxcb-sync.so.1.1
-./usr/X11R6/lib/libxcb-util.la
 ./usr/X11R6/lib/libxcb-util.so.0.0
 ./usr/X11R6/lib/libxcb-xevie.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri.so.2.0
@@ -182,8 +174,6 @@
 ./usr/X11R6/lib/libxcb.so.3.1
 ./usr/X11R6/lib/libxkbfile.so.6.0
 ./usr/X11R6/lib/libxkbui.so.5.0
-./usr/X11R6/lib/locate
-./usr/X11R6/lib/locate/xorg.db
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/egl.pc
@@ -195,7 +185,6 @@
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/pixman-1.pc
-./usr/X11R6/lib/pkgconfig/presentproto.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/man1/bdftruncate.1
diff --git a/distrib/sets/lists/xbase/md.luna88k b/distrib/sets/lists/xbase/md.luna88k
index 15d3d8b21..d62ae5898 100644
--- a/distrib/sets/lists/xbase/md.luna88k
+++ b/distrib/sets/lists/xbase/md.luna88k
@@ -92,7 +92,6 @@
 ./usr/X11R6/lib/libfontconfig.so.9.1
 ./usr/X11R6/lib/libfontenc.so.4.0
 ./usr/X11R6/lib/libfreetype.so.22.0
-./usr/X11R6/lib/libgbm.a
 ./usr/X11R6/lib/libgbm.so.0.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
@@ -104,25 +103,19 @@
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
 ./usr/X11R6/lib/libxcb-composite.so.1.0
-./usr/X11R6/lib/libxcb-cursor.la
 ./usr/X11R6/lib/libxcb-cursor.so.0.0
 ./usr/X11R6/lib/libxcb-damage.so.1.0
 ./usr/X11R6/lib/libxcb-dpms.so.1.0
 ./usr/X11R6/lib/libxcb-dri2.so.1.1
 ./usr/X11R6/lib/libxcb-dri3.so.0.0
-./usr/X11R6/lib/libxcb-ewmh.la
 ./usr/X11R6/lib/libxcb-ewmh.so.2.0
 ./usr/X11R6/lib/libxcb-glx.so.1.0
-./usr/X11R6/lib/libxcb-icccm.la
 ./usr/X11R6/lib/libxcb-icccm.so.4.0
-./usr/X11R6/lib/libxcb-image.la
 ./usr/X11R6/lib/libxcb-image.so.2.0
-./usr/X11R6/lib/libxcb-keysyms.la
 ./usr/X11R6/lib/libxcb-keysyms.so.3.0
 ./usr/X11R6/lib/libxcb-present.so.0.0
 ./usr/X11R6/lib/libxcb-randr.so.2.1
 ./usr/X11R6/lib/libxcb-record.so.1.0
-./usr/X11R6/lib/libxcb-render-util.la
 ./usr/X11R6/lib/libxcb-render-util.so.2.0
 ./usr/X11R6/lib/libxcb-render.so.1.0
 ./usr/X11R6/lib/libxcb-res.so.1.1
@@ -130,7 +123,6 @@
 ./usr/X11R6/lib/libxcb-shape.so.1.0
 ./usr/X11R6/lib/libxcb-shm.so.1.1
 ./usr/X11R6/lib/libxcb-sync.so.1.1
-./usr/X11R6/lib/libxcb-util.la
 ./usr/X11R6/lib/libxcb-util.so.0.0
 ./usr/X11R6/lib/libxcb-xevie.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri.so.2.0
@@ -144,8 +136,6 @@
 ./usr/X11R6/lib/libxcb.so.3.1
 ./usr/X11R6/lib/libxkbfile.so.6.0
 ./usr/X11R6/lib/libxkbui.so.5.0
-./usr/X11R6/lib/locate
-./usr/X11R6/lib/locate/xorg.db
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/egl.pc
@@ -157,7 +147,6 @@
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/pixman-1.pc
-./usr/X11R6/lib/pkgconfig/presentproto.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/man1/bdftruncate.1
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index 463a54c06..6ed5124d1 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -130,7 +130,6 @@
 ./usr/X11R6/lib/libfontconfig.so.9.1
 ./usr/X11R6/lib/libfontenc.so.4.0
 ./usr/X11R6/lib/libfreetype.so.22.0
-./usr/X11R6/lib/libgbm.a
 ./usr/X11R6/lib/libgbm.so.0.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
@@ -142,25 +141,19 @@
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
 ./usr/X11R6/lib/libxcb-composite.so.1.0
-./usr/X11R6/lib/libxcb-cursor.la
 ./usr/X11R6/lib/libxcb-cursor.so.0.0
 ./usr/X11R6/lib/libxcb-damage.so.1.0
 ./usr/X11R6/lib/libxcb-dpms.so.1.0
 ./usr/X11R6/lib/libxcb-dri2.so.1.1
 ./usr/X11R6/lib/libxcb-dri3.so.0.0
-./usr/X11R6/lib/libxcb-ewmh.la
 ./usr/X11R6/lib/libxcb-ewmh.so.2.0
 ./usr/X11R6/lib/libxcb-glx.so.1.0
-./usr/X11R6/lib/libxcb-icccm.la
 ./usr/X11R6/lib/libxcb-icccm.so.4.0
-./usr/X11R6/lib/libxcb-image.la
 ./usr/X11R6/lib/libxcb-image.so.2.0
-./usr/X11R6/lib/libxcb-keysyms.la
 ./usr/X11R6/lib/libxcb-keysyms.so.3.0
 ./usr/X11R6/lib/libxcb-present.so.0.0
 ./usr/X11R6/lib/libxcb-randr.so.2.1
 ./usr/X11R6/lib/libxcb-record.so.1.0
-./usr/X11R6/lib/libxcb-render-util.la
 ./usr/X11R6/lib/libxcb-render-util.so.2.0
 ./usr/X11R6/lib/libxcb-render.so.1.0
 ./usr/X11R6/lib/libxcb-res.so.1.1
@@ -168,7 +161,6 @@
 ./usr/X11R6/lib/libxcb-shape.so.1.0
 ./usr/X11R6/lib/libxcb-shm.so.1.1
 ./usr/X11R6/lib/libxcb-sync.so.1.1
-./usr/X11R6/lib/libxcb-util.la
 ./usr/X11R6/lib/libxcb-util.so.0.0
 ./usr/X11R6/lib/libxcb-xevie.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri.so.2.0
@@ -182,8 +174,6 @@
 ./usr/X11R6/lib/libxcb.so.3.1
 ./usr/X11R6/lib/libxkbfile.so.6.0
 ./usr/X11R6/lib/libxkbui.so.5.0
-./usr/X11R6/lib/locate
-./usr/X11R6/lib/locate/xorg.db
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/egl.pc
@@ -195,7 +185,6 @@
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/pixman-1.pc
-./usr/X11R6/lib/pkgconfig/presentproto.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/pkgconfig/xorg-joystick.pc
 ./usr/X11R6/lib/xorg/protocol.txt
diff --git a/distrib/sets/lists/xbase/md.octeon b/distrib/sets/lists/xbase/md.octeon
index 720e8ca98..2dd4d3664 100644
--- a/distrib/sets/lists/xbase/md.octeon
+++ b/distrib/sets/lists/xbase/md.octeon
@@ -40,7 +40,6 @@
 ./usr/X11R6/lib/libfontconfig.so.9.1
 ./usr/X11R6/lib/libfontenc.so.4.0
 ./usr/X11R6/lib/libfreetype.so.22.0
-./usr/X11R6/lib/libgbm.a
 ./usr/X11R6/lib/libgbm.so.0.0
 ./usr/X11R6/lib/libpciaccess.so.2.0
 ./usr/X11R6/lib/libpixman-1.a
@@ -48,25 +47,19 @@
 ./usr/X11R6/lib/libpixman-1.so.32.6
 ./usr/X11R6/lib/libpthread-stubs.so.2.0
 ./usr/X11R6/lib/libxcb-composite.so.1.0
-./usr/X11R6/lib/libxcb-cursor.la
 ./usr/X11R6/lib/libxcb-cursor.so.0.0
 ./usr/X11R6/lib/libxcb-damage.so.1.0
 ./usr/X11R6/lib/libxcb-dpms.so.1.0
 ./usr/X11R6/lib/libxcb-dri2.so.1.1
 ./usr/X11R6/lib/libxcb-dri3.so.0.0
-./usr/X11R6/lib/libxcb-ewmh.la
 ./usr/X11R6/lib/libxcb-ewmh.so.2.0
 ./usr/X11R6/lib/libxcb-glx.so.1.0
-./usr/X11R6/lib/libxcb-icccm.la
 ./usr/X11R6/lib/libxcb-icccm.so.4.0
-./usr/X11R6/lib/libxcb-image.la
 ./usr/X11R6/lib/libxcb-image.so.2.0
-./usr/X11R6/lib/libxcb-keysyms.la
 ./usr/X11R6/lib/libxcb-keysyms.so.3.0
 ./usr/X11R6/lib/libxcb-present.so.0.0
 ./usr/X11R6/lib/libxcb-randr.so.2.1
 ./usr/X11R6/lib/libxcb-record.so.1.0
-./usr/X11R6/lib/libxcb-render-util.la
 ./usr/X11R6/lib/libxcb-render-util.so.2.0
 ./usr/X11R6/lib/libxcb-render.so.1.0
 ./usr/X11R6/lib/libxcb-res.so.1.1
@@ -74,7 +67,6 @@
 ./usr/X11R6/lib/libxcb-shape.so.1.0
 ./usr/X11R6/lib/libxcb-shm.so.1.1
 ./usr/X11R6/lib/libxcb-sync.so.1.1
-./usr/X11R6/lib/libxcb-util.la
 ./usr/X11R6/lib/libxcb-util.so.0.0
 ./usr/X11R6/lib/libxcb-xevie.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri.so.2.0
@@ -88,10 +80,7 @@
 ./usr/X11R6/lib/libxcb.so.3.1
 ./usr/X11R6/lib/libxkbfile.so.6.0
 ./usr/X11R6/lib/libxkbui.so.5.0
-./usr/X11R6/lib/locate
-./usr/X11R6/lib/locate/xorg.db
 ./usr/X11R6/lib/pkgconfig/pixman-1.pc
-./usr/X11R6/lib/pkgconfig/presentproto.pc
 ./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/man1/bdftruncate.1
 ./usr/X11R6/man/man1/dga.1
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index 2a138c1d1..6399554b9 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -130,7 +130,6 @@
 ./usr/X11R6/lib/libfontconfig.so.9.1
 ./usr/X11R6/lib/libfontenc.so.4.0
 ./usr/X11R6/lib/libfreetype.so.22.0
-./usr/X11R6/lib/libgbm.a
 ./usr/X11R6/lib/libgbm.so.0.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
@@ -142,25 +141,19 @@
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
 ./usr/X11R6/lib/libxcb-composite.so.1.0
-./usr/X11R6/lib/libxcb-cursor.la
 ./usr/X11R6/lib/libxcb-cursor.so.0.0
 ./usr/X11R6/lib/libxcb-damage.so.1.0
 ./usr/X11R6/lib/libxcb-dpms.so.1.0
 ./usr/X11R6/lib/libxcb-dri2.so.1.1
 ./usr/X11R6/lib/libxcb-dri3.so.0.0
-./usr/X11R6/lib/libxcb-ewmh.la
 ./usr/X11R6/lib/libxcb-ewmh.so.2.0
 ./usr/X11R6/lib/libxcb-glx.so.1.0
-./usr/X11R6/lib/libxcb-icccm.la
 ./usr/X11R6/lib/libxcb-icccm.so.4.0
-./usr/X11R6/lib/libxcb-image.la
 ./usr/X11R6/lib/libxcb-image.so.2.0
-./usr/X11R6/lib/libxcb-keysyms.la
 ./usr/X11R6/lib/libxcb-keysyms.so.3.0
 ./usr/X11R6/lib/libxcb-present.so.0.0
 ./usr/X11R6/lib/libxcb-randr.so.2.1
 ./usr/X11R6/lib/libxcb-record.so.1.0
-./usr/X11R6/lib/libxcb-render-util.la
 ./usr/X11R6/lib/libxcb-render-util.so.2.0
 ./usr/X11R6/lib/libxcb-render.so.1.0
 ./usr/X11R6/lib/libxcb-res.so.1.1
@@ -168,7 +161,6 @@
 ./usr/X11R6/lib/libxcb-shape.so.1.0
 ./usr/X11R6/lib/libxcb-shm.so.1.1
 ./usr/X11R6/lib/libxcb-sync.so.1.1
-./usr/X11R6/lib/libxcb-util.la
 ./usr/X11R6/lib/libxcb-util.so.0.0
 ./usr/X11R6/lib/libxcb-xevie.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri.so.2.0
@@ -182,8 +174,6 @@
 ./usr/X11R6/lib/libxcb.so.3.1
 ./usr/X11R6/lib/libxkbfile.so.6.0
 ./usr/X11R6/lib/libxkbui.so.5.0
-./usr/X11R6/lib/locate
-./usr/X11R6/lib/locate/xorg.db
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/egl.pc
@@ -195,7 +185,6 @@
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/pixman-1.pc
-./usr/X11R6/lib/pkgconfig/presentproto.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/man1/bdftruncate.1
diff --git a/distrib/sets/lists/xbase/md.socppc b/distrib/sets/lists/xbase/md.socppc
index 4ebc1b13f..0586cb304 100644
--- a/distrib/sets/lists/xbase/md.socppc
+++ b/distrib/sets/lists/xbase/md.socppc
@@ -129,7 +129,6 @@
 ./usr/X11R6/lib/libfontconfig.so.9.1
 ./usr/X11R6/lib/libfontenc.so.4.0
 ./usr/X11R6/lib/libfreetype.so.22.0
-./usr/X11R6/lib/libgbm.a
 ./usr/X11R6/lib/libgbm.so.0.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
@@ -141,25 +140,19 @@
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
 ./usr/X11R6/lib/libxcb-composite.so.1.0
-./usr/X11R6/lib/libxcb-cursor.la
 ./usr/X11R6/lib/libxcb-cursor.so.0.0
 ./usr/X11R6/lib/libxcb-damage.so.1.0
 ./usr/X11R6/lib/libxcb-dpms.so.1.0
 ./usr/X11R6/lib/libxcb-dri2.so.1.1
 ./usr/X11R6/lib/libxcb-dri3.so.0.0
-./usr/X11R6/lib/libxcb-ewmh.la
 ./usr/X11R6/lib/libxcb-ewmh.so.2.0
 ./usr/X11R6/lib/libxcb-glx.so.1.0
-./usr/X11R6/lib/libxcb-icccm.la
 ./usr/X11R6/lib/libxcb-icccm.so.4.0
-./usr/X11R6/lib/libxcb-image.la
 ./usr/X11R6/lib/libxcb-image.so.2.0
-./usr/X11R6/lib/libxcb-keysyms.la
 ./usr/X11R6/lib/libxcb-keysyms.so.3.0
 ./usr/X11R6/lib/libxcb-present.so.0.0
 ./usr/X11R6/lib/libxcb-randr.so.2.1
 ./usr/X11R6/lib/libxcb-record.so.1.0
-./usr/X11R6/lib/libxcb-render-util.la
 ./usr/X11R6/lib/libxcb-render-util.so.2.0
 ./usr/X11R6/lib/libxcb-render.so.1.0
 ./usr/X11R6/lib/libxcb-res.so.1.1
@@ -167,7 +160,6 @@
 ./usr/X11R6/lib/libxcb-shape.so.1.0
 ./usr/X11R6/lib/libxcb-shm.so.1.1
 ./usr/X11R6/lib/libxcb-sync.so.1.1
-./usr/X11R6/lib/libxcb-util.la
 ./usr/X11R6/lib/libxcb-util.so.0.0
 ./usr/X11R6/lib/libxcb-xevie.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri.so.2.0
@@ -181,8 +173,6 @@
 ./usr/X11R6/lib/libxcb.so.3.1
 ./usr/X11R6/lib/libxkbfile.so.6.0
 ./usr/X11R6/lib/libxkbui.so.5.0
-./usr/X11R6/lib/locate
-./usr/X11R6/lib/locate/xorg.db
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/egl.pc
@@ -194,7 +184,6 @@
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/pixman-1.pc
-./usr/X11R6/lib/pkgconfig/presentproto.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/man1/bdftruncate.1
diff --git a/distrib/sets/lists/xbase/md.sparc b/distrib/sets/lists/xbase/md.sparc
index 4ebc1b13f..0586cb304 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -129,7 +129,6 @@
 ./usr/X11R6/lib/libfontconfig.so.9.1
 ./usr/X11R6/lib/libfontenc.so.4.0
 ./usr/X11R6/lib/libfreetype.so.22.0
-./usr/X11R6/lib/libgbm.a
 ./usr/X11R6/lib/libgbm.so.0.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
@@ -141,25 +140,19 @@
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
 ./usr/X11R6/lib/libxcb-composite.so.1.0
-./usr/X11R6/lib/libxcb-cursor.la
 ./usr/X11R6/lib/libxcb-cursor.so.0.0
 ./usr/X11R6/lib/libxcb-damage.so.1.0
 ./usr/X11R6/lib/libxcb-dpms.so.1.0
 ./usr/X11R6/lib/libxcb-dri2.so.1.1
 ./usr/X11R6/lib/libxcb-dri3.so.0.0
-./usr/X11R6/lib/libxcb-ewmh.la
 ./usr/X11R6/lib/libxcb-ewmh.so.2.0
 ./usr/X11R6/lib/libxcb-glx.so.1.0
-./usr/X11R6/lib/libxcb-icccm.la
 ./usr/X11R6/lib/libxcb-icccm.so.4.0
-./usr/X11R6/lib/libxcb-image.la
 ./usr/X11R6/lib/libxcb-image.so.2.0
-./usr/X11R6/lib/libxcb-keysyms.la
 ./usr/X11R6/lib/libxcb-keysyms.so.3.0
 ./usr/X11R6/lib/libxcb-present.so.0.0
 ./usr/X11R6/lib/libxcb-randr.so.2.1
 ./usr/X11R6/lib/libxcb-record.so.1.0
-./usr/X11R6/lib/libxcb-render-util.la
 ./usr/X11R6/lib/libxcb-render-util.so.2.0
 ./usr/X11R6/lib/libxcb-render.so.1.0
 ./usr/X11R6/lib/libxcb-res.so.1.1
@@ -167,7 +160,6 @@
 ./usr/X11R6/lib/libxcb-shape.so.1.0
 ./usr/X11R6/lib/libxcb-shm.so.1.1
 ./usr/X11R6/lib/libxcb-sync.so.1.1
-./usr/X11R6/lib/libxcb-util.la
 ./usr/X11R6/lib/libxcb-util.so.0.0
 ./usr/X11R6/lib/libxcb-xevie.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri.so.2.0
@@ -181,8 +173,6 @@
 ./usr/X11R6/lib/libxcb.so.3.1
 ./usr/X11R6/lib/libxkbfile.so.6.0
 ./usr/X11R6/lib/libxkbui.so.5.0
-./usr/X11R6/lib/locate
-./usr/X11R6/lib/locate/xorg.db
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/egl.pc
@@ -194,7 +184,6 @@
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/pixman-1.pc
-./usr/X11R6/lib/pkgconfig/presentproto.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/man1/bdftruncate.1
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index 8d1a343e6..4276df5cf 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -130,7 +130,6 @@
 ./usr/X11R6/lib/libfontconfig.so.9.1
 ./usr/X11R6/lib/libfontenc.so.4.0
 ./usr/X11R6/lib/libfreetype.so.22.0
-./usr/X11R6/lib/libgbm.a
 ./usr/X11R6/lib/libgbm.so.0.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
@@ -142,25 +141,19 @@
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
 ./usr/X11R6/lib/libxcb-composite.so.1.0
-./usr/X11R6/lib/libxcb-cursor.la
 ./usr/X11R6/lib/libxcb-cursor.so.0.0
 ./usr/X11R6/lib/libxcb-damage.so.1.0
 ./usr/X11R6/lib/libxcb-dpms.so.1.0
 ./usr/X11R6/lib/libxcb-dri2.so.1.1
 ./usr/X11R6/lib/libxcb-dri3.so.0.0
-./usr/X11R6/lib/libxcb-ewmh.la
 ./usr/X11R6/lib/libxcb-ewmh.so.2.0
 ./usr/X11R6/lib/libxcb-glx.so.1.0
-./usr/X11R6/lib/libxcb-icccm.la
 ./usr/X11R6/lib/libxcb-icccm.so.4.0
-./usr/X11R6/lib/libxcb-image.la
 ./usr/X11R6/lib/libxcb-image.so.2.0
-./usr/X11R6/lib/libxcb-keysyms.la
 ./usr/X11R6/lib/libxcb-keysyms.so.3.0
 ./usr/X11R6/lib/libxcb-present.so.0.0
 ./usr/X11R6/lib/libxcb-randr.so.2.1
 ./usr/X11R6/lib/libxcb-record.so.1.0
-./usr/X11R6/lib/libxcb-render-util.la
 ./usr/X11R6/lib/libxcb-render-util.so.2.0
 ./usr/X11R6/lib/libxcb-render.so.1.0
 ./usr/X11R6/lib/libxcb-res.so.1.1
@@ -168,7 +161,6 @@
 ./usr/X11R6/lib/libxcb-shape.so.1.0
 ./usr/X11R6/lib/libxcb-shm.so.1.1
 ./usr/X11R6/lib/libxcb-sync.so.1.1
-./usr/X11R6/lib/libxcb-util.la
 ./usr/X11R6/lib/libxcb-util.so.0.0
 ./usr/X11R6/lib/libxcb-xevie.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri.so.2.0
@@ -182,8 +174,6 @@
 ./usr/X11R6/lib/libxcb.so.3.1
 ./usr/X11R6/lib/libxkbfile.so.6.0
 ./usr/X11R6/lib/libxkbui.so.5.0
-./usr/X11R6/lib/locate
-./usr/X11R6/lib/locate/xorg.db
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/egl.pc
@@ -195,7 +185,6 @@
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/pixman-1.pc
-./usr/X11R6/lib/pkgconfig/presentproto.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/pkgconfig/xorg-joystick.pc
 ./usr/X11R6/lib/xorg/protocol.txt
diff --git a/distrib/sets/lists/xbase/md.vax b/distrib/sets/lists/xbase/md.vax
index b4d49f5be..fa9909312 100644
--- a/distrib/sets/lists/xbase/md.vax
+++ b/distrib/sets/lists/xbase/md.vax
@@ -1,6 +1,13 @@
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/include/xorg
 ./usr/X11R6/lib/libgbm.a
+./usr/X11R6/lib/libxcb-cursor.la
+./usr/X11R6/lib/libxcb-ewmh.la
+./usr/X11R6/lib/libxcb-icccm.la
+./usr/X11R6/lib/libxcb-image.la
+./usr/X11R6/lib/libxcb-keysyms.la
+./usr/X11R6/lib/libxcb-render-util.la
+./usr/X11R6/lib/libxcb-util.la
 ./usr/X11R6/lib/locate
 ./usr/X11R6/lib/locate/xorg.db
 ./usr/X11R6/lib/pkgconfig/presentproto.pc
diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus
index 1243f2e43..d2f105648 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -129,7 +129,6 @@
 ./usr/X11R6/lib/libfontconfig.so.9.1
 ./usr/X11R6/lib/libfontenc.so.4.0
 ./usr/X11R6/lib/libfreetype.so.22.0
-./usr/X11R6/lib/libgbm.a
 ./usr/X11R6/lib/libgbm.so.0.0
 ./usr/X11R6/lib/libglapi.a
 ./usr/X11R6/lib/libglapi.so.0.0
@@ -141,25 +140,19 @@
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
 ./usr/X11R6/lib/libxcb-composite.so.1.0
-./usr/X11R6/lib/libxcb-cursor.la
 ./usr/X11R6/lib/libxcb-cursor.so.0.0
 ./usr/X11R6/lib/libxcb-damage.so.1.0
 ./usr/X11R6/lib/libxcb-dpms.so.1.0
 ./usr/X11R6/lib/libxcb-dri2.so.1.1
 ./usr/X11R6/lib/libxcb-dri3.so.0.0
-./usr/X11R6/lib/libxcb-ewmh.la
 ./usr/X11R6/lib/libxcb-ewmh.so.2.0
 ./usr/X11R6/lib/libxcb-glx.so.1.0
-./usr/X11R6/lib/libxcb-icccm.la
 ./usr/X11R6/lib/libxcb-icccm.so.4.0
-./usr/X11R6/lib/libxcb-image.la
 ./usr/X11R6/lib/libxcb-image.so.2.0
-./usr/X11R6/lib/libxcb-keysyms.la
 ./usr/X11R6/lib/libxcb-keysyms.so.3.0
 ./usr/X11R6/lib/libxcb-present.so.0.0
 ./usr/X11R6/lib/libxcb-randr.so.2.1
 ./usr/X11R6/lib/libxcb-record.so.1.0
-./usr/X11R6/lib/libxcb-render-util.la
 ./usr/X11R6/lib/libxcb-render-util.so.2.0
 ./usr/X11R6/lib/libxcb-render.so.1.0
 ./usr/X11R6/lib/libxcb-res.so.1.1
@@ -167,7 +160,6 @@
 ./usr/X11R6/lib/libxcb-shape.so.1.0
 ./usr/X11R6/lib/libxcb-shm.so.1.1
 ./usr/X11R6/lib/libxcb-sync.so.1.1
-./usr/X11R6/lib/libxcb-util.la
 ./usr/X11R6/lib/libxcb-util.so.0.0
 ./usr/X11R6/lib/libxcb-xevie.so.1.0
 ./usr/X11R6/lib/libxcb-xf86dri.so.2.0
@@ -181,8 +173,6 @@
 ./usr/X11R6/lib/libxcb.so.3.1
 ./usr/X11R6/lib/libxkbfile.so.6.0
 ./usr/X11R6/lib/libxkbui.so.5.0
-./usr/X11R6/lib/locate
-./usr/X11R6/lib/locate/xorg.db
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/egl.pc
@@ -194,7 +184,6 @@
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/lib/pkgconfig/pixman-1.pc
-./usr/X11R6/lib/pkgconfig/presentproto.pc
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/man1/bdftruncate.1
diff --git a/distrib/sets/lists/xbase/mi b/distrib/sets/lists/xbase/mi
index eb666c574..ec7020983 100644
--- a/distrib/sets/lists/xbase/mi
+++ b/distrib/sets/lists/xbase/mi
@@ -421,3 +421,14 @@
 ./var/cache
 ./var/cache/fontconfig
 ./var/cache/fontconfig/CACHEDIR.TAG
+./usr/X11R6/lib/libgbm.a
+./usr/X11R6/lib/libxcb-cursor.la
+./usr/X11R6/lib/libxcb-ewmh.la
+./usr/X11R6/lib/libxcb-icccm.la
+./usr/X11R6/lib/libxcb-image.la
+./usr/X11R6/lib/libxcb-keysyms.la
+./usr/X11R6/lib/libxcb-render-util.la
+./usr/X11R6/lib/libxcb-util.la
+./usr/X11R6/lib/locate
+./usr/X11R6/lib/locate/xorg.db
+./usr/X11R6/lib/pkgconfig/presentproto.pc
diff --git a/distrib/sets/lists/xserv/md.alpha b/distrib/sets/lists/xserv/md.alpha
index 93c6035fa..0f7df6366 100644
--- a/distrib/sets/lists/xserv/md.alpha
+++ b/distrib/sets/lists/xserv/md.alpha
@@ -9,4 +9,3 @@
 ./usr/X11R6/man/man1/Xvfb.1
 ./var/db/xkb
 ./var/db/xkb/README.compiled
-./var/log
diff --git a/distrib/sets/lists/xserv/md.amd64 b/distrib/sets/lists/xserv/md.amd64
index e11f62c84..05a681394 100644
--- a/distrib/sets/lists/xserv/md.amd64
+++ b/distrib/sets/lists/xserv/md.amd64
@@ -344,4 +344,3 @@
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
-./var/log
diff --git a/distrib/sets/lists/xserv/md.armish b/distrib/sets/lists/xserv/md.armish
index 2c64058bc..32a0ec9d3 100644
--- a/distrib/sets/lists/xserv/md.armish
+++ b/distrib/sets/lists/xserv/md.armish
@@ -212,4 +212,3 @@
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
-./var/log
diff --git a/distrib/sets/lists/xserv/md.armv7 b/distrib/sets/lists/xserv/md.armv7
index f95bd26e8..cf518652c 100644
--- a/distrib/sets/lists/xserv/md.armv7
+++ b/distrib/sets/lists/xserv/md.armv7
@@ -209,4 +209,3 @@
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
-./var/log
diff --git a/distrib/sets/lists/xserv/md.aviion b/distrib/sets/lists/xserv/md.aviion
index 93c6035fa..0f7df6366 100644
--- a/distrib/sets/lists/xserv/md.aviion
+++ b/distrib/sets/lists/xserv/md.aviion
@@ -9,4 +9,3 @@
 ./usr/X11R6/man/man1/Xvfb.1
 ./var/db/xkb
 ./var/db/xkb/README.compiled
-./var/log
diff --git a/distrib/sets/lists/xserv/md.hppa b/distrib/sets/lists/xserv/md.hppa
index 7ec6daba4..cb42ffa28 100644
--- a/distrib/sets/lists/xserv/md.hppa
+++ b/distrib/sets/lists/xserv/md.hppa
@@ -303,4 +303,3 @@
 ./usr/X11R6/man/man5/xorg.conf.d.5
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb/README.compiled
-./var/log
diff --git a/distrib/sets/lists/xserv/md.i386 b/distrib/sets/lists/xserv/md.i386
index 643c598a1..eacad3b64 100644
--- a/distrib/sets/lists/xserv/md.i386
+++ b/distrib/sets/lists/xserv/md.i386
@@ -352,4 +352,3 @@
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
-./var/log
diff --git a/distrib/sets/lists/xserv/md.landisk b/distrib/sets/lists/xserv/md.landisk
index 361b28955..ac5664c37 100644
--- a/distrib/sets/lists/xserv/md.landisk
+++ b/distrib/sets/lists/xserv/md.landisk
@@ -9,4 +9,3 @@
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./var/db/xkb
 ./var/db/xkb/README.compiled
-./var/log
diff --git a/distrib/sets/lists/xserv/md.loongson b/distrib/sets/lists/xserv/md.loongson
index db0526331..9f26a03ee 100644
--- a/distrib/sets/lists/xserv/md.loongson
+++ b/distrib/sets/lists/xserv/md.loongson
@@ -208,4 +208,3 @@
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
-./var/log
diff --git a/distrib/sets/lists/xserv/md.luna88k b/distrib/sets/lists/xserv/md.luna88k
index fd370eaa0..3dd590268 100644
--- a/distrib/sets/lists/xserv/md.luna88k
+++ b/distrib/sets/lists/xserv/md.luna88k
@@ -242,4 +242,3 @@
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
-./var/log
diff --git a/distrib/sets/lists/xserv/md.macppc b/distrib/sets/lists/xserv/md.macppc
index 36fe7a0c3..3790a6db4 100644
--- a/distrib/sets/lists/xserv/md.macppc
+++ b/distrib/sets/lists/xserv/md.macppc
@@ -261,4 +261,3 @@
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
-./var/log
diff --git a/distrib/sets/lists/xserv/md.octeon b/distrib/sets/lists/xserv/md.octeon
index 35e6df683..28571fa83 100644
--- a/distrib/sets/lists/xserv/md.octeon
+++ b/distrib/sets/lists/xserv/md.octeon
@@ -5,4 +5,3 @@
 ./usr/X11R6/man/man1/Xvfb.1
 ./var/db/xkb
 ./var/db/xkb/README.compiled
-./var/log
diff --git a/distrib/sets/lists/xserv/md.sgi b/distrib/sets/lists/xserv/md.sgi
index f023f1530..320cfca7f 100644
--- a/distrib/sets/lists/xserv/md.sgi
+++ b/distrib/sets/lists/xserv/md.sgi
@@ -204,4 +204,3 @@
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
-./var/log
diff --git a/distrib/sets/lists/xserv/md.socppc b/distrib/sets/lists/xserv/md.socppc
index f95bd26e8..cf518652c 100644
--- a/distrib/sets/lists/xserv/md.socppc
+++ b/distrib/sets/lists/xserv/md.socppc
@@ -209,4 +209,3 @@
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
-./var/log
diff --git a/distrib/sets/lists/xserv/md.sparc b/distrib/sets/lists/xserv/md.sparc
index 46a18a0f8..f3ba0a1be 100644
--- a/distrib/sets/lists/xserv/md.sparc
+++ b/distrib/sets/lists/xserv/md.sparc
@@ -205,4 +205,3 @@
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
-./var/log
diff --git a/distrib/sets/lists/xserv/md.sparc64 b/distrib/sets/lists/xserv/md.sparc64
index 1c0858284..135ac230d 100644
--- a/distrib/sets/lists/xserv/md.sparc64
+++ b/distrib/sets/lists/xserv/md.sparc64
@@ -264,4 +264,3 @@
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
-./var/log
diff --git a/distrib/sets/lists/xserv/md.vax b/distrib/sets/lists/xserv/md.vax
index 6df43fc3d..b86c681e3 100644
--- a/distrib/sets/lists/xserv/md.vax
+++ b/distrib/sets/lists/xserv/md.vax
@@ -1,2 +1 @@
 ./var/db/xkb
-./var/log
diff --git a/distrib/sets/lists/xserv/md.zaurus b/distrib/sets/lists/xserv/md.zaurus
index f95bd26e8..cf518652c 100644
--- a/distrib/sets/lists/xserv/md.zaurus
+++ b/distrib/sets/lists/xserv/md.zaurus
@@ -209,4 +209,3 @@
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
-./var/log
diff --git a/distrib/sets/lists/xserv/mi b/distrib/sets/lists/xserv/mi
index 88a6ea095..8c3e4a5be 100644
--- a/distrib/sets/lists/xserv/mi
+++ b/distrib/sets/lists/xserv/mi
@@ -8,3 +8,4 @@
 ./usr/X11R6/lib/modules/multimedia
 ./usr/X11R6/share/aclocal/xorg-macros.m4
 ./var/db
+./var/log