sync

36 files changed, 62 insertions, 77 deletions

diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index 164edfd56..f3fcd5d27 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -395,7 +395,6 @@
 ./usr/X11R6/bin/glxinfo
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/bin/xdriinfo
-./usr/X11R6/bin/xfs
 ./usr/X11R6/include/GL
 ./usr/X11R6/include/GL/GLwDrawA.h
 ./usr/X11R6/include/GL/GLwDrawAP.h
@@ -493,6 +492,7 @@
 ./usr/X11R6/lib/pkgconfig/gl.pc
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
+./usr/X11R6/lib/pkgconfig/pixman-1.pc
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/cat3/GLwCreateMDrawingArea.0
@@ -1023,7 +1023,6 @@
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
-./usr/X11R6/man/man1/xfs.1
 ./usr/X11R6/man/man3/XDGA.3
 ./usr/X11R6/man/man3/XDGAChangePixmapMode.3
 ./usr/X11R6/man/man3/XDGACloseFramebuffer.3
@@ -1076,7 +1075,6 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
-./usr/X11R6/man/man7/Xprint.7
 ./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-x86-64.cache-2
 ./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-x86-64.cache-2
 ./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-x86-64.cache-2
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 164edfd56..f3fcd5d27 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -395,7 +395,6 @@
 ./usr/X11R6/bin/glxinfo
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/bin/xdriinfo
-./usr/X11R6/bin/xfs
 ./usr/X11R6/include/GL
 ./usr/X11R6/include/GL/GLwDrawA.h
 ./usr/X11R6/include/GL/GLwDrawAP.h
@@ -493,6 +492,7 @@
 ./usr/X11R6/lib/pkgconfig/gl.pc
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
+./usr/X11R6/lib/pkgconfig/pixman-1.pc
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/cat3/GLwCreateMDrawingArea.0
@@ -1023,7 +1023,6 @@
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
-./usr/X11R6/man/man1/xfs.1
 ./usr/X11R6/man/man3/XDGA.3
 ./usr/X11R6/man/man3/XDGAChangePixmapMode.3
 ./usr/X11R6/man/man3/XDGACloseFramebuffer.3
@@ -1076,7 +1075,6 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
-./usr/X11R6/man/man7/Xprint.7
 ./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-x86-64.cache-2
 ./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-x86-64.cache-2
 ./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-x86-64.cache-2
diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish
index 4146bfc60..64ad412ff 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -395,7 +395,6 @@
 ./usr/X11R6/bin/glxinfo
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/bin/xdriinfo
-./usr/X11R6/bin/xfs
 ./usr/X11R6/include/GL
 ./usr/X11R6/include/GL/GLwDrawA.h
 ./usr/X11R6/include/GL/GLwDrawAP.h
@@ -493,6 +492,7 @@
 ./usr/X11R6/lib/pkgconfig/gl.pc
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
+./usr/X11R6/lib/pkgconfig/pixman-1.pc
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/cat3/GLwCreateMDrawingArea.0
@@ -1023,7 +1023,6 @@
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
-./usr/X11R6/man/man1/xfs.1
 ./usr/X11R6/man/man3/XDGA.3
 ./usr/X11R6/man/man3/XDGAChangePixmapMode.3
 ./usr/X11R6/man/man3/XDGACloseFramebuffer.3
@@ -1076,7 +1075,6 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
-./usr/X11R6/man/man7/Xprint.7
 ./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-x86.cache-2
 ./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-x86.cache-2
 ./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-x86.cache-2
diff --git a/distrib/sets/lists/xbase/md.hp300 b/distrib/sets/lists/xbase/md.hp300
index 4f3201f17..942018157 100644
--- a/distrib/sets/lists/xbase/md.hp300
+++ b/distrib/sets/lists/xbase/md.hp300
@@ -394,7 +394,6 @@
 ./usr/X11R6/bin/glxgears
 ./usr/X11R6/bin/glxinfo
 ./usr/X11R6/bin/xdriinfo
-./usr/X11R6/bin/xfs
 ./usr/X11R6/include/GL
 ./usr/X11R6/include/GL/GLwDrawA.h
 ./usr/X11R6/include/GL/GLwDrawAP.h
@@ -482,6 +481,7 @@
 ./usr/X11R6/lib/pkgconfig/gl.pc
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
+./usr/X11R6/lib/pkgconfig/pixman-1.pc
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/cat3/GLwCreateMDrawingArea.0
@@ -1009,7 +1009,6 @@
 ./usr/X11R6/man/cat3/gluTessVertex.0
 ./usr/X11R6/man/cat3/gluUnProject.0
 ./usr/X11R6/man/man1/bdftruncate.1
-./usr/X11R6/man/man1/xfs.1
 ./var/cache/fontconfig/06967e83801ccef301685ecdd941333e-m68k.cache-2
 ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-m68k.cache-2
 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-m68k.cache-2
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index 76266f274..f0d495417 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -394,7 +394,6 @@
 ./usr/X11R6/bin/glxgears
 ./usr/X11R6/bin/glxinfo
 ./usr/X11R6/bin/xdriinfo
-./usr/X11R6/bin/xfs
 ./usr/X11R6/include/GL
 ./usr/X11R6/include/GL/GLwDrawA.h
 ./usr/X11R6/include/GL/GLwDrawAP.h
@@ -482,6 +481,7 @@
 ./usr/X11R6/lib/pkgconfig/gl.pc
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
+./usr/X11R6/lib/pkgconfig/pixman-1.pc
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/cat3/GLwCreateMDrawingArea.0
@@ -1008,7 +1008,6 @@
 ./usr/X11R6/man/cat3/gluTessProperty.0
 ./usr/X11R6/man/cat3/gluTessVertex.0
 ./usr/X11R6/man/cat3/gluUnProject.0
-./usr/X11R6/man/man1/xfs.1
 ./var/cache/fontconfig/06967e83801ccef301685ecdd941333e-ppc.cache-2
 ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-ppc.cache-2
 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-ppc.cache-2
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index 0dc062bca..a81cc395f 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -395,7 +395,6 @@
 ./usr/X11R6/bin/glxinfo
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/bin/xdriinfo
-./usr/X11R6/bin/xfs
 ./usr/X11R6/include/GL
 ./usr/X11R6/include/GL/GLwDrawA.h
 ./usr/X11R6/include/GL/GLwDrawAP.h
@@ -429,6 +428,7 @@
 ./usr/X11R6/include/drm/sis_drm.h
 ./usr/X11R6/include/drm/via_3d_reg.h
 ./usr/X11R6/include/drm/via_drm.h
+./usr/X11R6/include/pixman-1/pixman.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86mm.h
 ./usr/X11R6/include/xorg/hotplug.h
@@ -510,6 +510,7 @@
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
+./usr/X11R6/lib/pkgconfig/pixman-1.pc
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/cat3/GLwCreateMDrawingArea.0
@@ -1040,7 +1041,6 @@
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
-./usr/X11R6/man/man1/xfs.1
 ./usr/X11R6/man/man3/XDGA.3
 ./usr/X11R6/man/man3/XDGAChangePixmapMode.3
 ./usr/X11R6/man/man3/XDGACloseFramebuffer.3
@@ -1093,7 +1093,6 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
-./usr/X11R6/man/man7/Xprint.7
 ./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-x86.cache-2
 ./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-x86.cache-2
 ./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-x86.cache-2
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index 2595c825c..237fdb4de 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -417,15 +417,6 @@
 ./usr/X11R6/include/X11/extensions/xf86dga1str.h
 ./usr/X11R6/include/X11/extensions/xf86dgastr.h
 ./usr/X11R6/include/xorg
-./usr/X11R6/include/xorg/hotplug.h
-./usr/X11R6/include/xorg/wfbrename.h
-./usr/X11R6/include/xorg/xf86Crtc.h
-./usr/X11R6/include/xorg/xf86Modes.h
-./usr/X11R6/include/xorg/xf86Optrec.h
-./usr/X11R6/include/xorg/xf86Parser.h
-./usr/X11R6/include/xorg/xf86RandR12.h
-./usr/X11R6/include/xorg/xf86Rename.h
-./usr/X11R6/include/xorg/xkbsrv.h
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
 ./usr/X11R6/lib/libGL.so.7.1
@@ -477,14 +468,12 @@
 ./usr/X11R6/lib/libXxf86misc.so.5.0
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
-./usr/X11R6/lib/libdrm.so.2.3
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.16.0
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
-./usr/X11R6/lib/libpixman-1.so.10.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/gl.pc
diff --git a/distrib/sets/lists/xbase/md.mac68k b/distrib/sets/lists/xbase/md.mac68k
index c459336ab..244197fcf 100644
--- a/distrib/sets/lists/xbase/md.mac68k
+++ b/distrib/sets/lists/xbase/md.mac68k
@@ -2,7 +2,6 @@
 ./usr/X11R6/bin/glxinfo
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/bin/xdriinfo
-./usr/X11R6/bin/xfs
 ./usr/X11R6/include/GL
 ./usr/X11R6/include/GL/GLwDrawA.h
 ./usr/X11R6/include/GL/GLwDrawAP.h
@@ -66,6 +65,7 @@
 ./usr/X11R6/lib/pkgconfig/gl.pc
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
+./usr/X11R6/lib/pkgconfig/pixman-1.pc
 ./usr/X11R6/man/cat1/bdftruncate.0
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
@@ -596,6 +596,5 @@
 ./usr/X11R6/man/cat3/gluTessProperty.0
 ./usr/X11R6/man/cat3/gluTessVertex.0
 ./usr/X11R6/man/cat3/gluUnProject.0
-./usr/X11R6/man/man1/xfs.1
 ./var/db/xkb
 ./var/db/xkb/README
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index 89ee3bcd5..e9d2eb63c 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -395,7 +395,6 @@
 ./usr/X11R6/bin/glxinfo
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/bin/xdriinfo
-./usr/X11R6/bin/xfs
 ./usr/X11R6/include/GL
 ./usr/X11R6/include/GL/GLwDrawA.h
 ./usr/X11R6/include/GL/GLwDrawAP.h
@@ -493,6 +492,7 @@
 ./usr/X11R6/lib/pkgconfig/gl.pc
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
+./usr/X11R6/lib/pkgconfig/pixman-1.pc
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/cat3/GLwCreateMDrawingArea.0
@@ -1023,7 +1023,6 @@
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
-./usr/X11R6/man/man1/xfs.1
 ./usr/X11R6/man/man3/XDGA.3
 ./usr/X11R6/man/man3/XDGAChangePixmapMode.3
 ./usr/X11R6/man/man3/XDGACloseFramebuffer.3
@@ -1076,7 +1075,6 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
-./usr/X11R6/man/man7/Xprint.7
 ./var/cache/fontconfig/06967e83801ccef301685ecdd941333e-ppc.cache-2
 ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-ppc.cache-2
 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-ppc.cache-2
diff --git a/distrib/sets/lists/xbase/md.mvme68k b/distrib/sets/lists/xbase/md.mvme68k
index 0fca7f0a6..a67f382d3 100644
--- a/distrib/sets/lists/xbase/md.mvme68k
+++ b/distrib/sets/lists/xbase/md.mvme68k
@@ -395,7 +395,6 @@
 ./usr/X11R6/bin/glxinfo
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/bin/xdriinfo
-./usr/X11R6/bin/xfs
 ./usr/X11R6/include/GL
 ./usr/X11R6/include/GL/GLwDrawA.h
 ./usr/X11R6/include/GL/GLwDrawAP.h
@@ -490,6 +489,7 @@
 ./usr/X11R6/lib/pkgconfig/gl.pc
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
+./usr/X11R6/lib/pkgconfig/pixman-1.pc
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/cat3/GLwCreateMDrawingArea.0
@@ -1020,7 +1020,6 @@
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
-./usr/X11R6/man/man1/xfs.1
 ./var/cache/fontconfig/06967e83801ccef301685ecdd941333e-m68k.cache-2
 ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-m68k.cache-2
 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-m68k.cache-2
diff --git a/distrib/sets/lists/xbase/md.mvme88k b/distrib/sets/lists/xbase/md.mvme88k
index 443f01a44..85f0c7497 100644
--- a/distrib/sets/lists/xbase/md.mvme88k
+++ b/distrib/sets/lists/xbase/md.mvme88k
@@ -1,6 +1,5 @@
 ./usr/X11R6/bin/dga
 ./usr/X11R6/bin/ucs2any
-./usr/X11R6/bin/xfs
 ./usr/X11R6/include/X11/extensions/xf86dga.h
 ./usr/X11R6/include/X11/extensions/xf86dga1.h
 ./usr/X11R6/include/X11/extensions/xf86dga1str.h
@@ -400,6 +399,7 @@
 ./usr/X11R6/lib/pkgconfig/gl.pc
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
+./usr/X11R6/lib/pkgconfig/pixman-1.pc
 ./usr/X11R6/man/cat1/bdftruncate.0
 ./usr/X11R6/man/cat1/dga.0
 ./usr/X11R6/man/cat1/ucs2any.0
@@ -422,4 +422,3 @@
 ./usr/X11R6/man/cat3/XDGASetMode.0
 ./usr/X11R6/man/cat3/XDGASetViewport.0
 ./usr/X11R6/man/cat3/XDGASync.0
-./usr/X11R6/man/man1/xfs.1
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index e6fec5379..87af11c39 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -392,7 +392,6 @@
 ./etc/X11/xkb/types/pc
 ./usr/X11R6/bin/dga
 ./usr/X11R6/bin/ucs2any
-./usr/X11R6/bin/xfs
 ./usr/X11R6/include/GL
 ./usr/X11R6/include/GL/glxint.h
 ./usr/X11R6/include/GL/glxmd.h
@@ -467,6 +466,7 @@
 ./usr/X11R6/lib/libpixman-1.so.10.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
+./usr/X11R6/lib/pkgconfig/pixman-1.pc
 ./usr/X11R6/man/cat3/GLwCreateMDrawingArea.0
 ./usr/X11R6/man/cat3/GLwDrawingArea.0
 ./usr/X11R6/man/cat3/GLwDrawingAreaMakeCurrent.0
@@ -994,7 +994,6 @@
 ./usr/X11R6/man/man1/bdftruncate.1
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/ucs2any.1
-./usr/X11R6/man/man1/xfs.1
 ./usr/X11R6/man/man3/XDGA.3
 ./usr/X11R6/man/man3/XDGAChangePixmapMode.3
 ./usr/X11R6/man/man3/XDGACloseFramebuffer.3
diff --git a/distrib/sets/lists/xbase/md.sparc b/distrib/sets/lists/xbase/md.sparc
index 35543405c..1ef364eee 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -395,7 +395,6 @@
 ./usr/X11R6/bin/glxinfo
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/bin/xdriinfo
-./usr/X11R6/bin/xfs
 ./usr/X11R6/include/GL
 ./usr/X11R6/include/GL/GLwDrawA.h
 ./usr/X11R6/include/GL/GLwDrawAP.h
@@ -492,6 +491,7 @@
 ./usr/X11R6/lib/pkgconfig/gl.pc
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
+./usr/X11R6/lib/pkgconfig/pixman-1.pc
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/cat3/GLwCreateMDrawingArea.0
@@ -1022,7 +1022,6 @@
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
-./usr/X11R6/man/man1/xfs.1
 ./usr/X11R6/man/man3/XDGA.3
 ./usr/X11R6/man/man3/XDGAChangePixmapMode.3
 ./usr/X11R6/man/man3/XDGACloseFramebuffer.3
@@ -1075,7 +1074,6 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
-./usr/X11R6/man/man7/Xprint.7
 ./var/cache/fontconfig/06967e83801ccef301685ecdd941333e-ppc.cache-2
 ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-ppc.cache-2
 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-ppc.cache-2
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index f9294f676..561d34759 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -395,7 +395,6 @@
 ./usr/X11R6/bin/glxinfo
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/bin/xdriinfo
-./usr/X11R6/bin/xfs
 ./usr/X11R6/include/GL
 ./usr/X11R6/include/GL/GLwDrawA.h
 ./usr/X11R6/include/GL/GLwDrawAP.h
@@ -493,6 +492,7 @@
 ./usr/X11R6/lib/pkgconfig/gl.pc
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
+./usr/X11R6/lib/pkgconfig/pixman-1.pc
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/cat3/GLwCreateMDrawingArea.0
@@ -1023,7 +1023,6 @@
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
-./usr/X11R6/man/man1/xfs.1
 ./usr/X11R6/man/man3/XDGA.3
 ./usr/X11R6/man/man3/XDGAChangePixmapMode.3
 ./usr/X11R6/man/man3/XDGACloseFramebuffer.3
@@ -1076,7 +1075,6 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
-./usr/X11R6/man/man7/Xprint.7
 ./var/cache/fontconfig/06967e83801ccef301685ecdd941333e-ppc64.cache-2
 ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-ppc64.cache-2
 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-ppc64.cache-2
diff --git a/distrib/sets/lists/xbase/md.vax b/distrib/sets/lists/xbase/md.vax
index 092642891..7442db794 100644
--- a/distrib/sets/lists/xbase/md.vax
+++ b/distrib/sets/lists/xbase/md.vax
@@ -411,6 +411,7 @@
 ./usr/X11R6/lib/pkgconfig/gl.pc
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
+./usr/X11R6/lib/pkgconfig/pixman-1.pc
 ./usr/X11R6/man/cat3/GLwCreateMDrawingArea.0
 ./usr/X11R6/man/cat3/GLwDrawingArea.0
 ./usr/X11R6/man/cat3/GLwDrawingAreaMakeCurrent.0
@@ -990,7 +991,6 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
-./usr/X11R6/man/man7/Xprint.7
 ./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-x86.cache-2
 ./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-x86.cache-2
 ./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-x86.cache-2
diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus
index 4146bfc60..64ad412ff 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -395,7 +395,6 @@
 ./usr/X11R6/bin/glxinfo
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/bin/xdriinfo
-./usr/X11R6/bin/xfs
 ./usr/X11R6/include/GL
 ./usr/X11R6/include/GL/GLwDrawA.h
 ./usr/X11R6/include/GL/GLwDrawAP.h
@@ -493,6 +492,7 @@
 ./usr/X11R6/lib/pkgconfig/gl.pc
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
+./usr/X11R6/lib/pkgconfig/pixman-1.pc
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/cat3/GLwCreateMDrawingArea.0
@@ -1023,7 +1023,6 @@
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
-./usr/X11R6/man/man1/xfs.1
 ./usr/X11R6/man/man3/XDGA.3
 ./usr/X11R6/man/man3/XDGAChangePixmapMode.3
 ./usr/X11R6/man/man3/XDGACloseFramebuffer.3
@@ -1076,7 +1075,6 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
-./usr/X11R6/man/man7/Xprint.7
 ./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-x86.cache-2
 ./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-x86.cache-2
 ./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-x86.cache-2
diff --git a/distrib/sets/lists/xbase/mi b/distrib/sets/lists/xbase/mi
index de8dda644..79a1d4fa5 100644
--- a/distrib/sets/lists/xbase/mi
+++ b/distrib/sets/lists/xbase/mi
@@ -89,6 +89,7 @@
 ./usr/X11R6/bin/xfd
 ./usr/X11R6/bin/xfindproxy
 ./usr/X11R6/bin/xfontsel
+./usr/X11R6/bin/xfs
 ./usr/X11R6/bin/xfsinfo
 ./usr/X11R6/bin/xft-config
 ./usr/X11R6/bin/xfwp
@@ -156,6 +157,7 @@
 ./usr/X11R6/include/freetype2/freetype/ftpfr.h
 ./usr/X11R6/include/freetype2/freetype/ftwinfnt.h
 ./usr/X11R6/include/ft2build.h
+./usr/X11R6/include/pixman-1
 ./usr/X11R6/lib
 ./usr/X11R6/lib/X11
 ./usr/X11R6/lib/X11/Xcms.txt
@@ -278,7 +280,6 @@
 ./usr/X11R6/lib/libxkbui.la
 ./usr/X11R6/man
 ./usr/X11R6/man/cat1
-./usr/X11R6/man/cat1/xtsscale.0
 ./usr/X11R6/man/cat4
 ./usr/X11R6/man/cat5
 ./usr/X11R6/man/cat7
diff --git a/distrib/sets/lists/xetc/md.landisk b/distrib/sets/lists/xetc/md.landisk
index e69de29bb..e0199028d 100644
--- a/distrib/sets/lists/xetc/md.landisk
+++ b/distrib/sets/lists/xetc/md.landisk
@@ -0,0 +1 @@
+./etc/X11/fs/config
diff --git a/distrib/sets/lists/xserv/md.alpha b/distrib/sets/lists/xserv/md.alpha
index 264bb76ca..41a6750eb 100644
--- a/distrib/sets/lists/xserv/md.alpha
+++ b/distrib/sets/lists/xserv/md.alpha
@@ -165,7 +165,6 @@
 ./usr/X11R6/include/xorg/xvdix.h
 ./usr/X11R6/include/xorg/xvmcext.h
 ./usr/X11R6/lib/modules
-./usr/X11R6/lib/modules/dri
 ./usr/X11R6/lib/modules/drivers
 ./usr/X11R6/lib/modules/drivers/apm_drv.la
 ./usr/X11R6/lib/modules/drivers/apm_drv.so
@@ -346,6 +345,7 @@
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.so
 ./usr/X11R6/lib/modules/v10002d.uc
 ./usr/X11R6/lib/modules/v20002d.uc
+./usr/X11R6/lib/pkgconfig/xorg-server.pc
 ./usr/X11R6/lib/xserver
 ./usr/X11R6/lib/xserver/SecurityPolicy
 ./usr/X11R6/man/man1/Xnest.1
@@ -396,7 +396,9 @@
 ./usr/X11R6/man/man4/void.4
 ./usr/X11R6/man/man4/ws.4
 ./usr/X11R6/man/man4/wsfb.4
+./usr/X11R6/man/man5/SecurityPolicy.5
 ./usr/X11R6/man/man5/xorg.conf.5
+./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/X11/xserver
 ./usr/X11R6/share/X11/xserver/C
 ./usr/X11R6/share/X11/xserver/C/print
diff --git a/distrib/sets/lists/xserv/md.amd64 b/distrib/sets/lists/xserv/md.amd64
index 9566f3f98..1297a8584 100644
--- a/distrib/sets/lists/xserv/md.amd64
+++ b/distrib/sets/lists/xserv/md.amd64
@@ -165,7 +165,6 @@
 ./usr/X11R6/include/xorg/xvdix.h
 ./usr/X11R6/include/xorg/xvmcext.h
 ./usr/X11R6/lib/modules
-./usr/X11R6/lib/modules/dri
 ./usr/X11R6/lib/modules/drivers
 ./usr/X11R6/lib/modules/drivers/apm_drv.la
 ./usr/X11R6/lib/modules/drivers/apm_drv.so
@@ -362,6 +361,7 @@
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.so
 ./usr/X11R6/lib/modules/v10002d.uc
 ./usr/X11R6/lib/modules/v20002d.uc
+./usr/X11R6/lib/pkgconfig/xorg-server.pc
 ./usr/X11R6/lib/xserver
 ./usr/X11R6/lib/xserver/SecurityPolicy
 ./usr/X11R6/man/man1/Xnest.1
@@ -415,7 +415,9 @@
 ./usr/X11R6/man/man4/vmware.4
 ./usr/X11R6/man/man4/void.4
 ./usr/X11R6/man/man4/ws.4
+./usr/X11R6/man/man5/SecurityPolicy.5
 ./usr/X11R6/man/man5/xorg.conf.5
+./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/X11/xserver
 ./usr/X11R6/share/X11/xserver/C
 ./usr/X11R6/share/X11/xserver/C/print
diff --git a/distrib/sets/lists/xserv/md.armish b/distrib/sets/lists/xserv/md.armish
index 4b9ffa0be..03a3ed4e6 100644
--- a/distrib/sets/lists/xserv/md.armish
+++ b/distrib/sets/lists/xserv/md.armish
@@ -165,7 +165,6 @@
 ./usr/X11R6/include/xorg/xvdix.h
 ./usr/X11R6/include/xorg/xvmcext.h
 ./usr/X11R6/lib/modules
-./usr/X11R6/lib/modules/dri
 ./usr/X11R6/lib/modules/drivers
 ./usr/X11R6/lib/modules/drivers/wsfb_drv.la
 ./usr/X11R6/lib/modules/drivers/wsfb_drv.so
@@ -254,6 +253,7 @@
 ./usr/X11R6/lib/modules/multimedia/tda9885_drv.so
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.la
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.so
+./usr/X11R6/lib/pkgconfig/xorg-server.pc
 ./usr/X11R6/lib/xserver
 ./usr/X11R6/lib/xserver/SecurityPolicy
 ./usr/X11R6/man/man1/Xnest.1
@@ -274,7 +274,9 @@
 ./usr/X11R6/man/man4/void.4
 ./usr/X11R6/man/man4/ws.4
 ./usr/X11R6/man/man4/wsfb.4
+./usr/X11R6/man/man5/SecurityPolicy.5
 ./usr/X11R6/man/man5/xorg.conf.5
+./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/X11/xserver
 ./usr/X11R6/share/X11/xserver/C
 ./usr/X11R6/share/X11/xserver/C/print
diff --git a/distrib/sets/lists/xserv/md.hp300 b/distrib/sets/lists/xserv/md.hp300
index 2d8c6ae54..b8c16770c 100644
--- a/distrib/sets/lists/xserv/md.hp300
+++ b/distrib/sets/lists/xserv/md.hp300
@@ -163,7 +163,6 @@
 ./usr/X11R6/include/xorg/xvdix.h
 ./usr/X11R6/include/xorg/xvmcext.h
 ./usr/X11R6/lib/modules
-./usr/X11R6/lib/modules/dri
 ./usr/X11R6/lib/modules/drivers
 ./usr/X11R6/lib/modules/drivers/wsfb_drv.la
 ./usr/X11R6/lib/modules/drivers/wsfb_drv.so
@@ -248,6 +247,7 @@
 ./usr/X11R6/lib/modules/multimedia/tda9885_drv.so
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.la
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.so
+./usr/X11R6/lib/pkgconfig/xorg-server.pc
 ./usr/X11R6/lib/xserver
 ./usr/X11R6/lib/xserver/SecurityPolicy
 ./usr/X11R6/man/man1/Xnest.1
@@ -318,6 +318,7 @@
 ./usr/X11R6/man/man4/void.4
 ./usr/X11R6/man/man4/ws.4
 ./usr/X11R6/man/man4/wsfb.4
+./usr/X11R6/man/man5/SecurityPolicy.5
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/X11/xserver
diff --git a/distrib/sets/lists/xserv/md.hppa b/distrib/sets/lists/xserv/md.hppa
index 695e70622..74464738a 100644
--- a/distrib/sets/lists/xserv/md.hppa
+++ b/distrib/sets/lists/xserv/md.hppa
@@ -2,13 +2,13 @@
 ./usr/X11R6/bin/Xvfb
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/lib/modules
-./usr/X11R6/lib/modules/dri
 ./usr/X11R6/lib/modules/drivers
 ./usr/X11R6/lib/modules/extensions
 ./usr/X11R6/lib/modules/fonts
 ./usr/X11R6/lib/modules/input
 ./usr/X11R6/lib/modules/linux
 ./usr/X11R6/lib/modules/multimedia
+./usr/X11R6/lib/pkgconfig/xorg-server.pc
 ./usr/X11R6/lib/xserver
 ./usr/X11R6/lib/xserver/SecurityPolicy
 ./usr/X11R6/man/man1/Xnest.1
@@ -70,6 +70,7 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
+./usr/X11R6/man/man5/SecurityPolicy.5
 ./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/X11/xserver
 ./usr/X11R6/share/X11/xserver/C
diff --git a/distrib/sets/lists/xserv/md.i386 b/distrib/sets/lists/xserv/md.i386
index f642cefd9..dd3de1d06 100644
--- a/distrib/sets/lists/xserv/md.i386
+++ b/distrib/sets/lists/xserv/md.i386
@@ -165,7 +165,6 @@
 ./usr/X11R6/include/xorg/xvdix.h
 ./usr/X11R6/include/xorg/xvmcext.h
 ./usr/X11R6/lib/modules
-./usr/X11R6/lib/modules/dri
 ./usr/X11R6/lib/modules/drivers
 ./usr/X11R6/lib/modules/drivers/apm_drv.la
 ./usr/X11R6/lib/modules/drivers/apm_drv.so
@@ -372,6 +371,7 @@
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.so
 ./usr/X11R6/lib/modules/v10002d.uc
 ./usr/X11R6/lib/modules/v20002d.uc
+./usr/X11R6/lib/pkgconfig/xorg-server.pc
 ./usr/X11R6/lib/xserver
 ./usr/X11R6/lib/xserver/SecurityPolicy
 ./usr/X11R6/man/man1/Xnest.1
@@ -430,7 +430,9 @@
 ./usr/X11R6/man/man4/void.4
 ./usr/X11R6/man/man4/voodoo.4
 ./usr/X11R6/man/man4/ws.4
+./usr/X11R6/man/man5/SecurityPolicy.5
 ./usr/X11R6/man/man5/xorg.conf.5
+./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/X11/xserver
 ./usr/X11R6/share/X11/xserver/C
 ./usr/X11R6/share/X11/xserver/C/print
diff --git a/distrib/sets/lists/xserv/md.landisk b/distrib/sets/lists/xserv/md.landisk
index 4c8191250..f74274907 100644
--- a/distrib/sets/lists/xserv/md.landisk
+++ b/distrib/sets/lists/xserv/md.landisk
@@ -1,7 +1,4 @@
-./usr/X11R6/bin/Xnest
-./usr/X11R6/bin/Xvfb
 ./usr/X11R6/lib/modules
-./usr/X11R6/lib/modules/dri
 ./usr/X11R6/lib/modules/drivers
 ./usr/X11R6/lib/modules/extensions
 ./usr/X11R6/lib/modules/fonts
@@ -9,10 +6,6 @@
 ./usr/X11R6/lib/modules/linux
 ./usr/X11R6/lib/modules/multimedia
 ./usr/X11R6/lib/xserver
-./usr/X11R6/lib/xserver/SecurityPolicy
-./usr/X11R6/man/man1/Xnest.1
-./usr/X11R6/man/man1/Xserver.1
-./usr/X11R6/man/man1/Xvfb.1
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/X11/xserver
@@ -41,7 +34,7 @@
 ./usr/X11R6/share/X11/xserver/en_US
 ./usr/X11R6/share/X11/xserver/en_US/print
 ./usr/X11R6/share/X11/xserver/en_US/print/attributes
-./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db
 ./var/db/xkb
 ./var/db/xkb/README.compiled
+./var/log
diff --git a/distrib/sets/lists/xserv/md.mac68k b/distrib/sets/lists/xserv/md.mac68k
index 51958eef0..c85369534 100644
--- a/distrib/sets/lists/xserv/md.mac68k
+++ b/distrib/sets/lists/xserv/md.mac68k
@@ -51,11 +51,12 @@
 ./usr/X11R6/lib/X11/etc/xmodmap.std
 ./usr/X11R6/lib/X11/xorg.conf.eg
 ./usr/X11R6/lib/modules
-./usr/X11R6/lib/modules/dri
 ./usr/X11R6/lib/modules/drivers
 ./usr/X11R6/lib/modules/extensions
 ./usr/X11R6/lib/modules/fonts
 ./usr/X11R6/lib/modules/input
 ./usr/X11R6/lib/modules/internal
 ./usr/X11R6/lib/modules/multimedia
+./usr/X11R6/lib/pkgconfig/xorg-server.pc
+./usr/X11R6/man/man5/SecurityPolicy.5
 ./usr/X11R6/share/aclocal/xorg-server.m4
diff --git a/distrib/sets/lists/xserv/md.macppc b/distrib/sets/lists/xserv/md.macppc
index e7d704330..986b32bd0 100644
--- a/distrib/sets/lists/xserv/md.macppc
+++ b/distrib/sets/lists/xserv/md.macppc
@@ -165,7 +165,6 @@
 ./usr/X11R6/include/xorg/xvdix.h
 ./usr/X11R6/include/xorg/xvmcext.h
 ./usr/X11R6/lib/modules
-./usr/X11R6/lib/modules/dri
 ./usr/X11R6/lib/modules/drivers
 ./usr/X11R6/lib/modules/drivers/ati_drv.la
 ./usr/X11R6/lib/modules/drivers/ati_drv.so
@@ -298,6 +297,7 @@
 ./usr/X11R6/lib/modules/multimedia/theatre_drv.so
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.la
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.so
+./usr/X11R6/lib/pkgconfig/xorg-server.pc
 ./usr/X11R6/lib/xserver
 ./usr/X11R6/lib/xserver/SecurityPolicy
 ./usr/X11R6/man/man1/Xnest.1
@@ -330,7 +330,9 @@
 ./usr/X11R6/man/man4/void.4
 ./usr/X11R6/man/man4/ws.4
 ./usr/X11R6/man/man4/wsfb.4
+./usr/X11R6/man/man5/SecurityPolicy.5
 ./usr/X11R6/man/man5/xorg.conf.5
+./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/X11/xserver
 ./usr/X11R6/share/X11/xserver/C
 ./usr/X11R6/share/X11/xserver/C/print
diff --git a/distrib/sets/lists/xserv/md.mvme68k b/distrib/sets/lists/xserv/md.mvme68k
index 8807f1134..6c0a3e0e2 100644
--- a/distrib/sets/lists/xserv/md.mvme68k
+++ b/distrib/sets/lists/xserv/md.mvme68k
@@ -3,13 +3,13 @@
 ./usr/X11R6/include/xorg
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/modules
-./usr/X11R6/lib/modules/dri
 ./usr/X11R6/lib/modules/drivers
 ./usr/X11R6/lib/modules/extensions
 ./usr/X11R6/lib/modules/fonts
 ./usr/X11R6/lib/modules/input
 ./usr/X11R6/lib/modules/linux
 ./usr/X11R6/lib/modules/multimedia
+./usr/X11R6/lib/pkgconfig/xorg-server.pc
 ./usr/X11R6/lib/xserver
 ./usr/X11R6/lib/xserver/SecurityPolicy
 ./usr/X11R6/man/man1/Xnest.1
@@ -67,6 +67,7 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
+./usr/X11R6/man/man5/SecurityPolicy.5
 ./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/X11/xserver
 ./usr/X11R6/share/X11/xserver/C
diff --git a/distrib/sets/lists/xserv/md.mvme88k b/distrib/sets/lists/xserv/md.mvme88k
index 5fd531460..5fca4bac7 100644
--- a/distrib/sets/lists/xserv/md.mvme88k
+++ b/distrib/sets/lists/xserv/md.mvme88k
@@ -1,4 +1,4 @@
-./usr/X11R6/lib/modules/dri
+./usr/X11R6/lib/pkgconfig/xorg-server.pc
 ./usr/X11R6/man/cat1/XDarwin.0
 ./usr/X11R6/man/cat4/aiptek.0
 ./usr/X11R6/man/cat4/glide.0
@@ -13,4 +13,5 @@
 ./usr/X11R6/man/cat4/ur98.0
 ./usr/X11R6/man/cat4/v4l.0
 ./usr/X11R6/man/cat7/Xprint.0
+./usr/X11R6/man/man5/SecurityPolicy.5
 ./usr/X11R6/share/aclocal/xorg-server.m4
diff --git a/distrib/sets/lists/xserv/md.sgi b/distrib/sets/lists/xserv/md.sgi
index eb503365a..ef83c7435 100644
--- a/distrib/sets/lists/xserv/md.sgi
+++ b/distrib/sets/lists/xserv/md.sgi
@@ -152,7 +152,6 @@
 ./usr/X11R6/include/xorg/xvdix.h
 ./usr/X11R6/include/xorg/xvmcext.h
 ./usr/X11R6/lib/modules
-./usr/X11R6/lib/modules/dri
 ./usr/X11R6/lib/modules/drivers
 ./usr/X11R6/lib/modules/drivers/wsfb_drv.la
 ./usr/X11R6/lib/modules/drivers/wsfb_drv.so
@@ -237,6 +236,7 @@
 ./usr/X11R6/lib/modules/multimedia/tda9885_drv.so
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.la
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.so
+./usr/X11R6/lib/pkgconfig/xorg-server.pc
 ./usr/X11R6/lib/xserver
 ./usr/X11R6/lib/xserver/SecurityPolicy
 ./usr/X11R6/man/man1/Xnest.1
@@ -252,6 +252,7 @@
 ./usr/X11R6/man/man4/void.4
 ./usr/X11R6/man/man4/ws.4
 ./usr/X11R6/man/man4/wsfb.4
+./usr/X11R6/man/man5/SecurityPolicy.5
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/X11/xserver
diff --git a/distrib/sets/lists/xserv/md.sparc b/distrib/sets/lists/xserv/md.sparc
index 1090a74d2..6dccf2265 100644
--- a/distrib/sets/lists/xserv/md.sparc
+++ b/distrib/sets/lists/xserv/md.sparc
@@ -153,7 +153,6 @@
 ./usr/X11R6/include/xorg/xvdix.h
 ./usr/X11R6/include/xorg/xvmcext.h
 ./usr/X11R6/lib/modules
-./usr/X11R6/lib/modules/dri
 ./usr/X11R6/lib/modules/drivers
 ./usr/X11R6/lib/modules/drivers/wsfb_drv.la
 ./usr/X11R6/lib/modules/drivers/wsfb_drv.so
@@ -242,6 +241,7 @@
 ./usr/X11R6/lib/modules/multimedia/tda9885_drv.so
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.la
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.so
+./usr/X11R6/lib/pkgconfig/xorg-server.pc
 ./usr/X11R6/lib/xserver
 ./usr/X11R6/lib/xserver/SecurityPolicy
 ./usr/X11R6/man/man1/Xnest.1
@@ -257,7 +257,9 @@
 ./usr/X11R6/man/man4/void.4
 ./usr/X11R6/man/man4/ws.4
 ./usr/X11R6/man/man4/wsfb.4
+./usr/X11R6/man/man5/SecurityPolicy.5
 ./usr/X11R6/man/man5/xorg.conf.5
+./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/X11/xserver
 ./usr/X11R6/share/X11/xserver/C
 ./usr/X11R6/share/X11/xserver/C/print
diff --git a/distrib/sets/lists/xserv/md.sparc64 b/distrib/sets/lists/xserv/md.sparc64
index b01cf48e4..4326c8a5e 100644
--- a/distrib/sets/lists/xserv/md.sparc64
+++ b/distrib/sets/lists/xserv/md.sparc64
@@ -165,7 +165,6 @@
 ./usr/X11R6/include/xorg/xvdix.h
 ./usr/X11R6/include/xorg/xvmcext.h
 ./usr/X11R6/lib/modules
-./usr/X11R6/lib/modules/dri
 ./usr/X11R6/lib/modules/drivers
 ./usr/X11R6/lib/modules/drivers/ati_drv.la
 ./usr/X11R6/lib/modules/drivers/ati_drv.so
@@ -296,6 +295,7 @@
 ./usr/X11R6/lib/modules/multimedia/theatre_drv.so
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.la
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.so
+./usr/X11R6/lib/pkgconfig/xorg-server.pc
 ./usr/X11R6/lib/xserver
 ./usr/X11R6/lib/xserver/SecurityPolicy
 ./usr/X11R6/man/man1/Xnest.1
@@ -327,7 +327,9 @@
 ./usr/X11R6/man/man4/void.4
 ./usr/X11R6/man/man4/ws.4
 ./usr/X11R6/man/man4/wsfb.4
+./usr/X11R6/man/man5/SecurityPolicy.5
 ./usr/X11R6/man/man5/xorg.conf.5
+./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/X11/xserver
 ./usr/X11R6/share/X11/xserver/C
 ./usr/X11R6/share/X11/xserver/C/print
diff --git a/distrib/sets/lists/xserv/md.vax b/distrib/sets/lists/xserv/md.vax
index 748f99bcd..4307d5c42 100644
--- a/distrib/sets/lists/xserv/md.vax
+++ b/distrib/sets/lists/xserv/md.vax
@@ -1,18 +1,20 @@
 ./usr/X11R6/bin/Xnest
 ./usr/X11R6/bin/Xvfb
 ./usr/X11R6/lib/modules
-./usr/X11R6/lib/modules/dri
 ./usr/X11R6/lib/modules/drivers
 ./usr/X11R6/lib/modules/extensions
 ./usr/X11R6/lib/modules/fonts
 ./usr/X11R6/lib/modules/input
 ./usr/X11R6/lib/modules/linux
 ./usr/X11R6/lib/modules/multimedia
+./usr/X11R6/lib/pkgconfig/xorg-server.pc
 ./usr/X11R6/lib/xserver
 ./usr/X11R6/lib/xserver/SecurityPolicy
 ./usr/X11R6/man/man1/Xnest.1
 ./usr/X11R6/man/man1/Xserver.1
 ./usr/X11R6/man/man1/Xvfb.1
+./usr/X11R6/man/man5/SecurityPolicy.5
+./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/X11/xserver
 ./usr/X11R6/share/X11/xserver/C
 ./usr/X11R6/share/X11/xserver/C/print
diff --git a/distrib/sets/lists/xserv/md.zaurus b/distrib/sets/lists/xserv/md.zaurus
index 4b9ffa0be..03a3ed4e6 100644
--- a/distrib/sets/lists/xserv/md.zaurus
+++ b/distrib/sets/lists/xserv/md.zaurus
@@ -165,7 +165,6 @@
 ./usr/X11R6/include/xorg/xvdix.h
 ./usr/X11R6/include/xorg/xvmcext.h
 ./usr/X11R6/lib/modules
-./usr/X11R6/lib/modules/dri
 ./usr/X11R6/lib/modules/drivers
 ./usr/X11R6/lib/modules/drivers/wsfb_drv.la
 ./usr/X11R6/lib/modules/drivers/wsfb_drv.so
@@ -254,6 +253,7 @@
 ./usr/X11R6/lib/modules/multimedia/tda9885_drv.so
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.la
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.so
+./usr/X11R6/lib/pkgconfig/xorg-server.pc
 ./usr/X11R6/lib/xserver
 ./usr/X11R6/lib/xserver/SecurityPolicy
 ./usr/X11R6/man/man1/Xnest.1
@@ -274,7 +274,9 @@
 ./usr/X11R6/man/man4/void.4
 ./usr/X11R6/man/man4/ws.4
 ./usr/X11R6/man/man4/wsfb.4
+./usr/X11R6/man/man5/SecurityPolicy.5
 ./usr/X11R6/man/man5/xorg.conf.5
+./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/X11/xserver
 ./usr/X11R6/share/X11/xserver/C
 ./usr/X11R6/share/X11/xserver/C/print
diff --git a/distrib/sets/lists/xserv/mi b/distrib/sets/lists/xserv/mi
index e69de29bb..fb8935216 100644
--- a/distrib/sets/lists/xserv/mi
+++ b/distrib/sets/lists/xserv/mi
@@ -0,0 +1 @@
+./usr/X11R6/lib/modules/dri
diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi
index ac9e41ed3..9e7e32591 100644
--- a/distrib/sets/lists/xshare/mi
+++ b/distrib/sets/lists/xshare/mi
@@ -665,8 +665,6 @@
 ./usr/X11R6/include/freetype2/freetype/tttables.h
 ./usr/X11R6/include/freetype2/freetype/tttags.h
 ./usr/X11R6/include/freetype2/freetype/ttunpat.h
-./usr/X11R6/include/pixman-1
-./usr/X11R6/include/pixman-1/pixman.h
 ./usr/X11R6/lib/X11/config
 ./usr/X11R6/lib/X11/config/Amoeba.cf
 ./usr/X11R6/lib/X11/config/DGUX.cf
@@ -835,7 +833,6 @@
 ./usr/X11R6/lib/pkgconfig/lbxutil.pc
 ./usr/X11R6/lib/pkgconfig/libfs.pc
 ./usr/X11R6/lib/pkgconfig/oldx.pc
-./usr/X11R6/lib/pkgconfig/pixman-1.pc
 ./usr/X11R6/lib/pkgconfig/printproto.pc
 ./usr/X11R6/lib/pkgconfig/randrproto.pc
 ./usr/X11R6/lib/pkgconfig/recordproto.pc
@@ -874,7 +871,6 @@
 ./usr/X11R6/lib/pkgconfig/xkbui.pc
 ./usr/X11R6/lib/pkgconfig/xmu.pc
 ./usr/X11R6/lib/pkgconfig/xmuu.pc
-./usr/X11R6/lib/pkgconfig/xorg-server.pc
 ./usr/X11R6/lib/pkgconfig/xp.pc
 ./usr/X11R6/lib/pkgconfig/xpm.pc
 ./usr/X11R6/lib/pkgconfig/xprintapputil.pc
@@ -921,6 +917,7 @@
 ./usr/X11R6/man/cat1/xpmroot.0
 ./usr/X11R6/man/cat1/xsystrace.0
 ./usr/X11R6/man/cat1/xterm.0
+./usr/X11R6/man/cat1/xtsscale.0
 ./usr/X11R6/man/cat1/xvctl.0
 ./usr/X11R6/man/cat3
 ./usr/X11R6/man/cat5/cwmrc.0
@@ -991,6 +988,7 @@
 ./usr/X11R6/man/man1/xfd.1
 ./usr/X11R6/man/man1/xfindproxy.1
 ./usr/X11R6/man/man1/xfontsel.1
+./usr/X11R6/man/man1/xfs.1
 ./usr/X11R6/man/man1/xfsinfo.1
 ./usr/X11R6/man/man1/xft-config.1
 ./usr/X11R6/man/man1/xfwp.1
@@ -2541,7 +2539,6 @@
 ./usr/X11R6/man/man3/XwcTextPerCharExtents.3
 ./usr/X11R6/man/man3/XwcTextPropertyToTextList.3
 ./usr/X11R6/man/man3/libXp.3
-./usr/X11R6/man/man5/SecurityPolicy.5
 ./usr/X11R6/man/man5/fonts-conf.5
 ./usr/X11R6/man/man7/Consortium.7
 ./usr/X11R6/man/man7/Standards.7