summaryrefslogtreecommitdiff
path: root/distrib/sets
diff options
context:
space:
mode:
authorTodd T. Fries <todd@cvs.openbsd.org>2009-09-07 03:41:11 +0000
committerTodd T. Fries <todd@cvs.openbsd.org>2009-09-07 03:41:11 +0000
commit5a16a37d58ecfcf6f1f2d1a490cf9f20d26b1be9 (patch)
treed64e2072ceb041aea59941f4d137f0cd73751e51 /distrib/sets
parent9401e5643e90e23287b785e5fc238bb7c7f2d896 (diff)
sync
Diffstat (limited to 'distrib/sets')
-rw-r--r--distrib/sets/lists/xbase/md.alpha9
-rw-r--r--distrib/sets/lists/xbase/md.amd649
-rw-r--r--distrib/sets/lists/xbase/md.armish9
-rw-r--r--distrib/sets/lists/xbase/md.hp3008
-rw-r--r--distrib/sets/lists/xbase/md.i3869
-rw-r--r--distrib/sets/lists/xbase/md.landisk8
-rw-r--r--distrib/sets/lists/xbase/md.mac68k8
-rw-r--r--distrib/sets/lists/xbase/md.macppc9
-rw-r--r--distrib/sets/lists/xbase/md.mvme68k8
-rw-r--r--distrib/sets/lists/xbase/md.mvme88k8
-rw-r--r--distrib/sets/lists/xbase/md.sgi8
-rw-r--r--distrib/sets/lists/xbase/md.sparc8
-rw-r--r--distrib/sets/lists/xbase/md.sparc649
-rw-r--r--distrib/sets/lists/xbase/md.zaurus9
-rw-r--r--distrib/sets/lists/xserv/md.alpha40
-rw-r--r--distrib/sets/lists/xserv/md.amd6440
-rw-r--r--distrib/sets/lists/xserv/md.armish40
-rw-r--r--distrib/sets/lists/xserv/md.hp30036
-rw-r--r--distrib/sets/lists/xserv/md.hppa2
-rw-r--r--distrib/sets/lists/xserv/md.i38640
-rw-r--r--distrib/sets/lists/xserv/md.mac68k36
-rw-r--r--distrib/sets/lists/xserv/md.macppc40
-rw-r--r--distrib/sets/lists/xserv/md.mvme68k2
-rw-r--r--distrib/sets/lists/xserv/md.mvme88k2
-rw-r--r--distrib/sets/lists/xserv/md.sgi38
-rw-r--r--distrib/sets/lists/xserv/md.sparc38
-rw-r--r--distrib/sets/lists/xserv/md.sparc6440
-rw-r--r--distrib/sets/lists/xserv/md.vax2
-rw-r--r--distrib/sets/lists/xserv/md.zaurus40
29 files changed, 130 insertions, 425 deletions
diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index 0d99e0b65..c8c54e251 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -57,12 +57,18 @@
./usr/X11R6/include/xf86drmMode.h
./usr/X11R6/include/xorg/dixaccess.h
./usr/X11R6/include/xorg/dri.h
+./usr/X11R6/include/xorg/dri2.h
./usr/X11R6/include/xorg/dristruct.h
+./usr/X11R6/include/xorg/geext.h
+./usr/X11R6/include/xorg/geint.h
./usr/X11R6/include/xorg/hotplug.h
./usr/X11R6/include/xorg/joystick-properties.h
./usr/X11R6/include/xorg/privates.h
+./usr/X11R6/include/xorg/ptrveloc.h
./usr/X11R6/include/xorg/registry.h
+./usr/X11R6/include/xorg/rrtransform.h
./usr/X11R6/include/xorg/sarea.h
+./usr/X11R6/include/xorg/shmint.h
./usr/X11R6/include/xorg/wfbrename.h
./usr/X11R6/include/xorg/xf86Crtc.h
./usr/X11R6/include/xorg/xf86Modes.h
@@ -71,9 +77,10 @@
./usr/X11R6/include/xorg/xf86RandR12.h
./usr/X11R6/include/xorg/xf86Rename.h
./usr/X11R6/include/xorg/xkbfile.h
+./usr/X11R6/include/xorg/xkbrules.h
./usr/X11R6/include/xorg/xkbsrv.h
./usr/X11R6/include/xorg/xkbstr.h
-./usr/X11R6/lib/X11/Cards
+./usr/X11R6/include/xorg/xserver-properties.h
./usr/X11R6/lib/X11/Options
./usr/X11R6/lib/libFS.so.9.0
./usr/X11R6/lib/libGL.a
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index d4e2feabc..f57152392 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -58,12 +58,18 @@
./usr/X11R6/include/xf86drmMode.h
./usr/X11R6/include/xorg/dixaccess.h
./usr/X11R6/include/xorg/dri.h
+./usr/X11R6/include/xorg/dri2.h
./usr/X11R6/include/xorg/dristruct.h
+./usr/X11R6/include/xorg/geext.h
+./usr/X11R6/include/xorg/geint.h
./usr/X11R6/include/xorg/hotplug.h
./usr/X11R6/include/xorg/joystick-properties.h
./usr/X11R6/include/xorg/privates.h
+./usr/X11R6/include/xorg/ptrveloc.h
./usr/X11R6/include/xorg/registry.h
+./usr/X11R6/include/xorg/rrtransform.h
./usr/X11R6/include/xorg/sarea.h
+./usr/X11R6/include/xorg/shmint.h
./usr/X11R6/include/xorg/wfbrename.h
./usr/X11R6/include/xorg/xf86Crtc.h
./usr/X11R6/include/xorg/xf86Modes.h
@@ -72,9 +78,10 @@
./usr/X11R6/include/xorg/xf86RandR12.h
./usr/X11R6/include/xorg/xf86Rename.h
./usr/X11R6/include/xorg/xkbfile.h
+./usr/X11R6/include/xorg/xkbrules.h
./usr/X11R6/include/xorg/xkbsrv.h
./usr/X11R6/include/xorg/xkbstr.h
-./usr/X11R6/lib/X11/Cards
+./usr/X11R6/include/xorg/xserver-properties.h
./usr/X11R6/lib/X11/Options
./usr/X11R6/lib/libFS.so.9.0
./usr/X11R6/lib/libGL.a
diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish
index 993266d48..0f61292df 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -57,11 +57,17 @@
./usr/X11R6/include/xf86drmMode.h
./usr/X11R6/include/xorg/dixaccess.h
./usr/X11R6/include/xorg/dri.h
+./usr/X11R6/include/xorg/dri2.h
./usr/X11R6/include/xorg/dristruct.h
+./usr/X11R6/include/xorg/geext.h
+./usr/X11R6/include/xorg/geint.h
./usr/X11R6/include/xorg/hotplug.h
./usr/X11R6/include/xorg/privates.h
+./usr/X11R6/include/xorg/ptrveloc.h
./usr/X11R6/include/xorg/registry.h
+./usr/X11R6/include/xorg/rrtransform.h
./usr/X11R6/include/xorg/sarea.h
+./usr/X11R6/include/xorg/shmint.h
./usr/X11R6/include/xorg/wfbrename.h
./usr/X11R6/include/xorg/xf86Crtc.h
./usr/X11R6/include/xorg/xf86Modes.h
@@ -70,9 +76,10 @@
./usr/X11R6/include/xorg/xf86RandR12.h
./usr/X11R6/include/xorg/xf86Rename.h
./usr/X11R6/include/xorg/xkbfile.h
+./usr/X11R6/include/xorg/xkbrules.h
./usr/X11R6/include/xorg/xkbsrv.h
./usr/X11R6/include/xorg/xkbstr.h
-./usr/X11R6/lib/X11/Cards
+./usr/X11R6/include/xorg/xserver-properties.h
./usr/X11R6/lib/X11/Options
./usr/X11R6/lib/libFS.so.9.0
./usr/X11R6/lib/libGL.a
diff --git a/distrib/sets/lists/xbase/md.hp300 b/distrib/sets/lists/xbase/md.hp300
index 6ad1a30cd..b147ee58a 100644
--- a/distrib/sets/lists/xbase/md.hp300
+++ b/distrib/sets/lists/xbase/md.hp300
@@ -51,11 +51,19 @@
./usr/X11R6/include/xcb/xvmc.h
./usr/X11R6/include/xf86drmMode.h
./usr/X11R6/include/xorg/dixaccess.h
+./usr/X11R6/include/xorg/dri2.h
+./usr/X11R6/include/xorg/geext.h
+./usr/X11R6/include/xorg/geint.h
./usr/X11R6/include/xorg/joystick-properties.h
./usr/X11R6/include/xorg/privates.h
+./usr/X11R6/include/xorg/ptrveloc.h
./usr/X11R6/include/xorg/registry.h
+./usr/X11R6/include/xorg/rrtransform.h
+./usr/X11R6/include/xorg/shmint.h
./usr/X11R6/include/xorg/xkbfile.h
+./usr/X11R6/include/xorg/xkbrules.h
./usr/X11R6/include/xorg/xkbstr.h
+./usr/X11R6/include/xorg/xserver-properties.h
./usr/X11R6/lib/X11/Options
./usr/X11R6/lib/libFS.so.9.0
./usr/X11R6/lib/libGL.a
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index 8a5b29c4d..5c51c14a5 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -58,12 +58,18 @@
./usr/X11R6/include/xf86drmMode.h
./usr/X11R6/include/xorg/dixaccess.h
./usr/X11R6/include/xorg/dri.h
+./usr/X11R6/include/xorg/dri2.h
./usr/X11R6/include/xorg/dristruct.h
+./usr/X11R6/include/xorg/geext.h
+./usr/X11R6/include/xorg/geint.h
./usr/X11R6/include/xorg/hotplug.h
./usr/X11R6/include/xorg/joystick-properties.h
./usr/X11R6/include/xorg/privates.h
+./usr/X11R6/include/xorg/ptrveloc.h
./usr/X11R6/include/xorg/registry.h
+./usr/X11R6/include/xorg/rrtransform.h
./usr/X11R6/include/xorg/sarea.h
+./usr/X11R6/include/xorg/shmint.h
./usr/X11R6/include/xorg/wfbrename.h
./usr/X11R6/include/xorg/xf86Crtc.h
./usr/X11R6/include/xorg/xf86Modes.h
@@ -72,9 +78,10 @@
./usr/X11R6/include/xorg/xf86RandR12.h
./usr/X11R6/include/xorg/xf86Rename.h
./usr/X11R6/include/xorg/xkbfile.h
+./usr/X11R6/include/xorg/xkbrules.h
./usr/X11R6/include/xorg/xkbsrv.h
./usr/X11R6/include/xorg/xkbstr.h
-./usr/X11R6/lib/X11/Cards
+./usr/X11R6/include/xorg/xserver-properties.h
./usr/X11R6/lib/X11/Options
./usr/X11R6/lib/libFS.so.9.0
./usr/X11R6/lib/libGL.a
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index f03f761c6..86b95f3de 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -56,6 +56,14 @@
./usr/X11R6/include/xf86drm.h
./usr/X11R6/include/xf86drmMode.h
./usr/X11R6/include/xorg
+./usr/X11R6/include/xorg/dri2.h
+./usr/X11R6/include/xorg/geext.h
+./usr/X11R6/include/xorg/geint.h
+./usr/X11R6/include/xorg/ptrveloc.h
+./usr/X11R6/include/xorg/rrtransform.h
+./usr/X11R6/include/xorg/shmint.h
+./usr/X11R6/include/xorg/xkbrules.h
+./usr/X11R6/include/xorg/xserver-properties.h
./usr/X11R6/lib/libFS.so.9.0
./usr/X11R6/lib/libGL.a
./usr/X11R6/lib/libGL.so.9.1
diff --git a/distrib/sets/lists/xbase/md.mac68k b/distrib/sets/lists/xbase/md.mac68k
index da7371009..3732fe053 100644
--- a/distrib/sets/lists/xbase/md.mac68k
+++ b/distrib/sets/lists/xbase/md.mac68k
@@ -52,9 +52,15 @@
./usr/X11R6/include/xcb/xvmc.h
./usr/X11R6/include/xf86drmMode.h
./usr/X11R6/include/xorg/dixaccess.h
+./usr/X11R6/include/xorg/dri2.h
+./usr/X11R6/include/xorg/geext.h
+./usr/X11R6/include/xorg/geint.h
./usr/X11R6/include/xorg/hotplug.h
./usr/X11R6/include/xorg/privates.h
+./usr/X11R6/include/xorg/ptrveloc.h
./usr/X11R6/include/xorg/registry.h
+./usr/X11R6/include/xorg/rrtransform.h
+./usr/X11R6/include/xorg/shmint.h
./usr/X11R6/include/xorg/wfbrename.h
./usr/X11R6/include/xorg/xf86Crtc.h
./usr/X11R6/include/xorg/xf86Modes.h
@@ -63,8 +69,10 @@
./usr/X11R6/include/xorg/xf86RandR12.h
./usr/X11R6/include/xorg/xf86Rename.h
./usr/X11R6/include/xorg/xkbfile.h
+./usr/X11R6/include/xorg/xkbrules.h
./usr/X11R6/include/xorg/xkbsrv.h
./usr/X11R6/include/xorg/xkbstr.h
+./usr/X11R6/include/xorg/xserver-properties.h
./usr/X11R6/lib/libFS.so.9.0
./usr/X11R6/lib/libGL.a
./usr/X11R6/lib/libGL.so.9.1
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index 32c3d53c0..d7e19b76f 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -57,12 +57,18 @@
./usr/X11R6/include/xf86drmMode.h
./usr/X11R6/include/xorg/dixaccess.h
./usr/X11R6/include/xorg/dri.h
+./usr/X11R6/include/xorg/dri2.h
./usr/X11R6/include/xorg/dristruct.h
+./usr/X11R6/include/xorg/geext.h
+./usr/X11R6/include/xorg/geint.h
./usr/X11R6/include/xorg/hotplug.h
./usr/X11R6/include/xorg/joystick-properties.h
./usr/X11R6/include/xorg/privates.h
+./usr/X11R6/include/xorg/ptrveloc.h
./usr/X11R6/include/xorg/registry.h
+./usr/X11R6/include/xorg/rrtransform.h
./usr/X11R6/include/xorg/sarea.h
+./usr/X11R6/include/xorg/shmint.h
./usr/X11R6/include/xorg/wfbrename.h
./usr/X11R6/include/xorg/xf86Crtc.h
./usr/X11R6/include/xorg/xf86Modes.h
@@ -71,9 +77,10 @@
./usr/X11R6/include/xorg/xf86RandR12.h
./usr/X11R6/include/xorg/xf86Rename.h
./usr/X11R6/include/xorg/xkbfile.h
+./usr/X11R6/include/xorg/xkbrules.h
./usr/X11R6/include/xorg/xkbsrv.h
./usr/X11R6/include/xorg/xkbstr.h
-./usr/X11R6/lib/X11/Cards
+./usr/X11R6/include/xorg/xserver-properties.h
./usr/X11R6/lib/X11/Options
./usr/X11R6/lib/libFS.so.9.0
./usr/X11R6/lib/libGL.a
diff --git a/distrib/sets/lists/xbase/md.mvme68k b/distrib/sets/lists/xbase/md.mvme68k
index 6543767ec..d70225dcd 100644
--- a/distrib/sets/lists/xbase/md.mvme68k
+++ b/distrib/sets/lists/xbase/md.mvme68k
@@ -55,6 +55,14 @@
./usr/X11R6/include/xcb/xvmc.h
./usr/X11R6/include/xf86drm.h
./usr/X11R6/include/xf86drmMode.h
+./usr/X11R6/include/xorg/dri2.h
+./usr/X11R6/include/xorg/geext.h
+./usr/X11R6/include/xorg/geint.h
+./usr/X11R6/include/xorg/ptrveloc.h
+./usr/X11R6/include/xorg/rrtransform.h
+./usr/X11R6/include/xorg/shmint.h
+./usr/X11R6/include/xorg/xkbrules.h
+./usr/X11R6/include/xorg/xserver-properties.h
./usr/X11R6/lib/libFS.so.9.0
./usr/X11R6/lib/libGL.a
./usr/X11R6/lib/libGL.so.9.1
diff --git a/distrib/sets/lists/xbase/md.mvme88k b/distrib/sets/lists/xbase/md.mvme88k
index c1c12ac81..e30d269d7 100644
--- a/distrib/sets/lists/xbase/md.mvme88k
+++ b/distrib/sets/lists/xbase/md.mvme88k
@@ -36,6 +36,14 @@
./usr/X11R6/include/xcb/xtest.h
./usr/X11R6/include/xcb/xv.h
./usr/X11R6/include/xcb/xvmc.h
+./usr/X11R6/include/xorg/dri2.h
+./usr/X11R6/include/xorg/geext.h
+./usr/X11R6/include/xorg/geint.h
+./usr/X11R6/include/xorg/ptrveloc.h
+./usr/X11R6/include/xorg/rrtransform.h
+./usr/X11R6/include/xorg/shmint.h
+./usr/X11R6/include/xorg/xkbrules.h
+./usr/X11R6/include/xorg/xserver-properties.h
./usr/X11R6/lib/libX11-xcb.so.1.0
./usr/X11R6/lib/libpthread-stubs.so.0.0
./usr/X11R6/lib/libpthread-stubs_pic.a
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index 3541c3f85..ed0ae2414 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -58,11 +58,17 @@
./usr/X11R6/include/xorg
./usr/X11R6/include/xorg/dixaccess.h
./usr/X11R6/include/xorg/dri.h
+./usr/X11R6/include/xorg/dri2.h
./usr/X11R6/include/xorg/dristruct.h
+./usr/X11R6/include/xorg/geext.h
+./usr/X11R6/include/xorg/geint.h
./usr/X11R6/include/xorg/hotplug.h
./usr/X11R6/include/xorg/privates.h
+./usr/X11R6/include/xorg/ptrveloc.h
./usr/X11R6/include/xorg/registry.h
+./usr/X11R6/include/xorg/rrtransform.h
./usr/X11R6/include/xorg/sarea.h
+./usr/X11R6/include/xorg/shmint.h
./usr/X11R6/include/xorg/wfbrename.h
./usr/X11R6/include/xorg/xf86Crtc.h
./usr/X11R6/include/xorg/xf86Modes.h
@@ -71,8 +77,10 @@
./usr/X11R6/include/xorg/xf86RandR12.h
./usr/X11R6/include/xorg/xf86Rename.h
./usr/X11R6/include/xorg/xkbfile.h
+./usr/X11R6/include/xorg/xkbrules.h
./usr/X11R6/include/xorg/xkbsrv.h
./usr/X11R6/include/xorg/xkbstr.h
+./usr/X11R6/include/xorg/xserver-properties.h
./usr/X11R6/lib/X11/Options
./usr/X11R6/lib/libFS.so.9.0
./usr/X11R6/lib/libGL.a
diff --git a/distrib/sets/lists/xbase/md.sparc b/distrib/sets/lists/xbase/md.sparc
index 9e2e8de86..6825534d4 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -57,11 +57,17 @@
./usr/X11R6/include/xf86drmMode.h
./usr/X11R6/include/xorg/dixaccess.h
./usr/X11R6/include/xorg/dri.h
+./usr/X11R6/include/xorg/dri2.h
./usr/X11R6/include/xorg/dristruct.h
+./usr/X11R6/include/xorg/geext.h
+./usr/X11R6/include/xorg/geint.h
./usr/X11R6/include/xorg/hotplug.h
./usr/X11R6/include/xorg/privates.h
+./usr/X11R6/include/xorg/ptrveloc.h
./usr/X11R6/include/xorg/registry.h
+./usr/X11R6/include/xorg/rrtransform.h
./usr/X11R6/include/xorg/sarea.h
+./usr/X11R6/include/xorg/shmint.h
./usr/X11R6/include/xorg/wfbrename.h
./usr/X11R6/include/xorg/xf86Crtc.h
./usr/X11R6/include/xorg/xf86Modes.h
@@ -70,8 +76,10 @@
./usr/X11R6/include/xorg/xf86RandR12.h
./usr/X11R6/include/xorg/xf86Rename.h
./usr/X11R6/include/xorg/xkbfile.h
+./usr/X11R6/include/xorg/xkbrules.h
./usr/X11R6/include/xorg/xkbsrv.h
./usr/X11R6/include/xorg/xkbstr.h
+./usr/X11R6/include/xorg/xserver-properties.h
./usr/X11R6/lib/X11/Options
./usr/X11R6/lib/libFS.so.9.0
./usr/X11R6/lib/libGL.a
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index 5f0eedebc..f6942a680 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -57,12 +57,18 @@
./usr/X11R6/include/xf86drmMode.h
./usr/X11R6/include/xorg/dixaccess.h
./usr/X11R6/include/xorg/dri.h
+./usr/X11R6/include/xorg/dri2.h
./usr/X11R6/include/xorg/dristruct.h
+./usr/X11R6/include/xorg/geext.h
+./usr/X11R6/include/xorg/geint.h
./usr/X11R6/include/xorg/hotplug.h
./usr/X11R6/include/xorg/joystick-properties.h
./usr/X11R6/include/xorg/privates.h
+./usr/X11R6/include/xorg/ptrveloc.h
./usr/X11R6/include/xorg/registry.h
+./usr/X11R6/include/xorg/rrtransform.h
./usr/X11R6/include/xorg/sarea.h
+./usr/X11R6/include/xorg/shmint.h
./usr/X11R6/include/xorg/wfbrename.h
./usr/X11R6/include/xorg/xf86Crtc.h
./usr/X11R6/include/xorg/xf86Modes.h
@@ -71,9 +77,10 @@
./usr/X11R6/include/xorg/xf86RandR12.h
./usr/X11R6/include/xorg/xf86Rename.h
./usr/X11R6/include/xorg/xkbfile.h
+./usr/X11R6/include/xorg/xkbrules.h
./usr/X11R6/include/xorg/xkbsrv.h
./usr/X11R6/include/xorg/xkbstr.h
-./usr/X11R6/lib/X11/Cards
+./usr/X11R6/include/xorg/xserver-properties.h
./usr/X11R6/lib/X11/Options
./usr/X11R6/lib/libFS.so.9.0
./usr/X11R6/lib/libGL.a
diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus
index 993266d48..0f61292df 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -57,11 +57,17 @@
./usr/X11R6/include/xf86drmMode.h
./usr/X11R6/include/xorg/dixaccess.h
./usr/X11R6/include/xorg/dri.h
+./usr/X11R6/include/xorg/dri2.h
./usr/X11R6/include/xorg/dristruct.h
+./usr/X11R6/include/xorg/geext.h
+./usr/X11R6/include/xorg/geint.h
./usr/X11R6/include/xorg/hotplug.h
./usr/X11R6/include/xorg/privates.h
+./usr/X11R6/include/xorg/ptrveloc.h
./usr/X11R6/include/xorg/registry.h
+./usr/X11R6/include/xorg/rrtransform.h
./usr/X11R6/include/xorg/sarea.h
+./usr/X11R6/include/xorg/shmint.h
./usr/X11R6/include/xorg/wfbrename.h
./usr/X11R6/include/xorg/xf86Crtc.h
./usr/X11R6/include/xorg/xf86Modes.h
@@ -70,9 +76,10 @@
./usr/X11R6/include/xorg/xf86RandR12.h
./usr/X11R6/include/xorg/xf86Rename.h
./usr/X11R6/include/xorg/xkbfile.h
+./usr/X11R6/include/xorg/xkbrules.h
./usr/X11R6/include/xorg/xkbsrv.h
./usr/X11R6/include/xorg/xkbstr.h
-./usr/X11R6/lib/X11/Cards
+./usr/X11R6/include/xorg/xserver-properties.h
./usr/X11R6/lib/X11/Options
./usr/X11R6/lib/libFS.so.9.0
./usr/X11R6/lib/libGL.a
diff --git a/distrib/sets/lists/xserv/md.alpha b/distrib/sets/lists/xserv/md.alpha
index 364cfc49f..c8df64eb6 100644
--- a/distrib/sets/lists/xserv/md.alpha
+++ b/distrib/sets/lists/xserv/md.alpha
@@ -1,30 +1,18 @@
./usr/X11R6/bin/X
./usr/X11R6/bin/Xephyr
-./usr/X11R6/bin/Xnest
./usr/X11R6/bin/Xorg
./usr/X11R6/bin/Xvfb
./usr/X11R6/bin/cvt
./usr/X11R6/bin/gtf
-./usr/X11R6/bin/xorgconfig
./usr/X11R6/include/xorg
./usr/X11R6/include/xorg/BT.h
./usr/X11R6/include/xorg/IBM.h
./usr/X11R6/include/xorg/TI.h
./usr/X11R6/include/xorg/XIstubs.h
-./usr/X11R6/include/xorg/afb.h
-./usr/X11R6/include/xorg/assyntax.h
-./usr/X11R6/include/xorg/atKeynames.h
./usr/X11R6/include/xorg/bstore.h
./usr/X11R6/include/xorg/bstorestr.h
./usr/X11R6/include/xorg/bt829.h
-./usr/X11R6/include/xorg/cfb.h
-./usr/X11R6/include/xorg/cfb16.h
-./usr/X11R6/include/xorg/cfb32.h
./usr/X11R6/include/xorg/cfb8_16.h
-./usr/X11R6/include/xorg/cfb8_32.h
-./usr/X11R6/include/xorg/cfbmap.h
-./usr/X11R6/include/xorg/cfbmskbits.h
-./usr/X11R6/include/xorg/cfbunmap.h
./usr/X11R6/include/xorg/closestr.h
./usr/X11R6/include/xorg/closure.h
./usr/X11R6/include/xorg/colormap.h
@@ -51,7 +39,6 @@
./usr/X11R6/include/xorg/fb.h
./usr/X11R6/include/xorg/fbdevhw.h
./usr/X11R6/include/xorg/fboverlay.h
-./usr/X11R6/include/xorg/fbpseudocolor.h
./usr/X11R6/include/xorg/fbrop.h
./usr/X11R6/include/xorg/fi1236.h
./usr/X11R6/include/xorg/fourcc.h
@@ -62,9 +49,6 @@
./usr/X11R6/include/xorg/i2c_def.h
./usr/X11R6/include/xorg/input.h
./usr/X11R6/include/xorg/inputstr.h
-./usr/X11R6/include/xorg/mfb.h
-./usr/X11R6/include/xorg/mfbmap.h
-./usr/X11R6/include/xorg/mfbunmap.h
./usr/X11R6/include/xorg/mi.h
./usr/X11R6/include/xorg/mibank.h
./usr/X11R6/include/xorg/mibstore.h
@@ -121,13 +105,10 @@
./usr/X11R6/include/xorg/xaaWrapper.h
./usr/X11R6/include/xorg/xaalocal.h
./usr/X11R6/include/xorg/xaarop.h
-./usr/X11R6/include/xorg/xf1bpp.h
-./usr/X11R6/include/xorg/xf4bpp.h
./usr/X11R6/include/xorg/xf86.h
./usr/X11R6/include/xorg/xf86Cursor.h
./usr/X11R6/include/xorg/xf86DDC.h
./usr/X11R6/include/xorg/xf86Module.h
-./usr/X11R6/include/xorg/xf86OSmouse.h
./usr/X11R6/include/xorg/xf86Opt.h
./usr/X11R6/include/xorg/xf86Pci.h
./usr/X11R6/include/xorg/xf86PciInfo.h
@@ -136,7 +117,6 @@
./usr/X11R6/include/xorg/xf86RAC.h
./usr/X11R6/include/xorg/xf86RamDac.h
./usr/X11R6/include/xorg/xf86Resources.h
-./usr/X11R6/include/xorg/xf86Version.h
./usr/X11R6/include/xorg/xf86Xinput.h
./usr/X11R6/include/xorg/xf86_OSlib.h
./usr/X11R6/include/xorg/xf86_OSproc.h
@@ -213,12 +193,12 @@
./usr/X11R6/lib/modules/extensions/libdbe.so
./usr/X11R6/lib/modules/extensions/libdri.la
./usr/X11R6/lib/modules/extensions/libdri.so
+./usr/X11R6/lib/modules/extensions/libdri2.la
+./usr/X11R6/lib/modules/extensions/libdri2.so
./usr/X11R6/lib/modules/extensions/libextmod.la
./usr/X11R6/lib/modules/extensions/libextmod.so
./usr/X11R6/lib/modules/extensions/libglx.la
./usr/X11R6/lib/modules/extensions/libglx.so
-./usr/X11R6/lib/modules/fonts/libfreetype.la
-./usr/X11R6/lib/modules/fonts/libfreetype.so
./usr/X11R6/lib/modules/input/acecad_drv.la
./usr/X11R6/lib/modules/input/acecad_drv.so
./usr/X11R6/lib/modules/input/citron_drv.la
@@ -245,20 +225,12 @@
./usr/X11R6/lib/modules/input/void_drv.so
./usr/X11R6/lib/modules/input/ws_drv.la
./usr/X11R6/lib/modules/input/ws_drv.so
-./usr/X11R6/lib/modules/libafb.la
-./usr/X11R6/lib/modules/libafb.so
-./usr/X11R6/lib/modules/libcfb.la
-./usr/X11R6/lib/modules/libcfb.so
-./usr/X11R6/lib/modules/libcfb32.la
-./usr/X11R6/lib/modules/libcfb32.so
./usr/X11R6/lib/modules/libexa.la
./usr/X11R6/lib/modules/libexa.so
./usr/X11R6/lib/modules/libfb.la
./usr/X11R6/lib/modules/libfb.so
./usr/X11R6/lib/modules/libint10.la
./usr/X11R6/lib/modules/libint10.so
-./usr/X11R6/lib/modules/libmfb.la
-./usr/X11R6/lib/modules/libmfb.so
./usr/X11R6/lib/modules/libshadow.la
./usr/X11R6/lib/modules/libshadow.so
./usr/X11R6/lib/modules/libshadowfb.la
@@ -271,14 +243,8 @@
./usr/X11R6/lib/modules/libwfb.so
./usr/X11R6/lib/modules/libxaa.la
./usr/X11R6/lib/modules/libxaa.so
-./usr/X11R6/lib/modules/libxf1bpp.la
-./usr/X11R6/lib/modules/libxf1bpp.so
-./usr/X11R6/lib/modules/libxf4bpp.la
-./usr/X11R6/lib/modules/libxf4bpp.so
./usr/X11R6/lib/modules/libxf8_16bpp.la
./usr/X11R6/lib/modules/libxf8_16bpp.so
-./usr/X11R6/lib/modules/libxf8_32bpp.la
-./usr/X11R6/lib/modules/libxf8_32bpp.so
./usr/X11R6/lib/modules/linux/libfbdevhw.la
./usr/X11R6/lib/modules/linux/libfbdevhw.so
./usr/X11R6/lib/modules/multimedia/bt829_drv.la
@@ -305,13 +271,11 @@
./usr/X11R6/lib/modules/v20002d.uc
./usr/X11R6/lib/pkgconfig/xorg-server.pc
./usr/X11R6/man/man1/Xephyr.1
-./usr/X11R6/man/man1/Xnest.1
./usr/X11R6/man/man1/Xorg.1
./usr/X11R6/man/man1/Xserver.1
./usr/X11R6/man/man1/Xvfb.1
./usr/X11R6/man/man1/cvt.1
./usr/X11R6/man/man1/gtf.1
-./usr/X11R6/man/man1/xorgconfig.1
./usr/X11R6/man/man4/acecad.4
./usr/X11R6/man/man4/apm.4
./usr/X11R6/man/man4/ati.4
diff --git a/distrib/sets/lists/xserv/md.amd64 b/distrib/sets/lists/xserv/md.amd64
index 079c6b1c5..23c01ee8a 100644
--- a/distrib/sets/lists/xserv/md.amd64
+++ b/distrib/sets/lists/xserv/md.amd64
@@ -1,30 +1,18 @@
./usr/X11R6/bin/X
./usr/X11R6/bin/Xephyr
-./usr/X11R6/bin/Xnest
./usr/X11R6/bin/Xorg
./usr/X11R6/bin/Xvfb
./usr/X11R6/bin/cvt
./usr/X11R6/bin/gtf
-./usr/X11R6/bin/xorgconfig
./usr/X11R6/include/xorg
./usr/X11R6/include/xorg/BT.h
./usr/X11R6/include/xorg/IBM.h
./usr/X11R6/include/xorg/TI.h
./usr/X11R6/include/xorg/XIstubs.h
-./usr/X11R6/include/xorg/afb.h
-./usr/X11R6/include/xorg/assyntax.h
-./usr/X11R6/include/xorg/atKeynames.h
./usr/X11R6/include/xorg/bstore.h
./usr/X11R6/include/xorg/bstorestr.h
./usr/X11R6/include/xorg/bt829.h
-./usr/X11R6/include/xorg/cfb.h
-./usr/X11R6/include/xorg/cfb16.h
-./usr/X11R6/include/xorg/cfb32.h
./usr/X11R6/include/xorg/cfb8_16.h
-./usr/X11R6/include/xorg/cfb8_32.h
-./usr/X11R6/include/xorg/cfbmap.h
-./usr/X11R6/include/xorg/cfbmskbits.h
-./usr/X11R6/include/xorg/cfbunmap.h
./usr/X11R6/include/xorg/closestr.h
./usr/X11R6/include/xorg/closure.h
./usr/X11R6/include/xorg/colormap.h
@@ -51,7 +39,6 @@
./usr/X11R6/include/xorg/fb.h
./usr/X11R6/include/xorg/fbdevhw.h
./usr/X11R6/include/xorg/fboverlay.h
-./usr/X11R6/include/xorg/fbpseudocolor.h
./usr/X11R6/include/xorg/fbrop.h
./usr/X11R6/include/xorg/fi1236.h
./usr/X11R6/include/xorg/fourcc.h
@@ -62,9 +49,6 @@
./usr/X11R6/include/xorg/i2c_def.h
./usr/X11R6/include/xorg/input.h
./usr/X11R6/include/xorg/inputstr.h
-./usr/X11R6/include/xorg/mfb.h
-./usr/X11R6/include/xorg/mfbmap.h
-./usr/X11R6/include/xorg/mfbunmap.h
./usr/X11R6/include/xorg/mi.h
./usr/X11R6/include/xorg/mibank.h
./usr/X11R6/include/xorg/mibstore.h
@@ -121,13 +105,10 @@
./usr/X11R6/include/xorg/xaaWrapper.h
./usr/X11R6/include/xorg/xaalocal.h
./usr/X11R6/include/xorg/xaarop.h
-./usr/X11R6/include/xorg/xf1bpp.h
-./usr/X11R6/include/xorg/xf4bpp.h
./usr/X11R6/include/xorg/xf86.h
./usr/X11R6/include/xorg/xf86Cursor.h
./usr/X11R6/include/xorg/xf86DDC.h
./usr/X11R6/include/xorg/xf86Module.h
-./usr/X11R6/include/xorg/xf86OSmouse.h
./usr/X11R6/include/xorg/xf86Opt.h
./usr/X11R6/include/xorg/xf86Pci.h
./usr/X11R6/include/xorg/xf86PciInfo.h
@@ -136,7 +117,6 @@
./usr/X11R6/include/xorg/xf86RAC.h
./usr/X11R6/include/xorg/xf86RamDac.h
./usr/X11R6/include/xorg/xf86Resources.h
-./usr/X11R6/include/xorg/xf86Version.h
./usr/X11R6/include/xorg/xf86Xinput.h
./usr/X11R6/include/xorg/xf86_OSlib.h
./usr/X11R6/include/xorg/xf86_OSproc.h
@@ -243,12 +223,12 @@
./usr/X11R6/lib/modules/extensions/libdbe.so
./usr/X11R6/lib/modules/extensions/libdri.la
./usr/X11R6/lib/modules/extensions/libdri.so
+./usr/X11R6/lib/modules/extensions/libdri2.la
+./usr/X11R6/lib/modules/extensions/libdri2.so
./usr/X11R6/lib/modules/extensions/libextmod.la
./usr/X11R6/lib/modules/extensions/libextmod.so
./usr/X11R6/lib/modules/extensions/libglx.la
./usr/X11R6/lib/modules/extensions/libglx.so
-./usr/X11R6/lib/modules/fonts/libfreetype.la
-./usr/X11R6/lib/modules/fonts/libfreetype.so
./usr/X11R6/lib/modules/input/acecad_drv.la
./usr/X11R6/lib/modules/input/acecad_drv.so
./usr/X11R6/lib/modules/input/citron_drv.la
@@ -277,20 +257,12 @@
./usr/X11R6/lib/modules/input/void_drv.so
./usr/X11R6/lib/modules/input/ws_drv.la
./usr/X11R6/lib/modules/input/ws_drv.so
-./usr/X11R6/lib/modules/libafb.la
-./usr/X11R6/lib/modules/libafb.so
-./usr/X11R6/lib/modules/libcfb.la
-./usr/X11R6/lib/modules/libcfb.so
-./usr/X11R6/lib/modules/libcfb32.la
-./usr/X11R6/lib/modules/libcfb32.so
./usr/X11R6/lib/modules/libexa.la
./usr/X11R6/lib/modules/libexa.so
./usr/X11R6/lib/modules/libfb.la
./usr/X11R6/lib/modules/libfb.so
./usr/X11R6/lib/modules/libint10.la
./usr/X11R6/lib/modules/libint10.so
-./usr/X11R6/lib/modules/libmfb.la
-./usr/X11R6/lib/modules/libmfb.so
./usr/X11R6/lib/modules/libshadow.la
./usr/X11R6/lib/modules/libshadow.so
./usr/X11R6/lib/modules/libshadowfb.la
@@ -303,14 +275,8 @@
./usr/X11R6/lib/modules/libwfb.so
./usr/X11R6/lib/modules/libxaa.la
./usr/X11R6/lib/modules/libxaa.so
-./usr/X11R6/lib/modules/libxf1bpp.la
-./usr/X11R6/lib/modules/libxf1bpp.so
-./usr/X11R6/lib/modules/libxf4bpp.la
-./usr/X11R6/lib/modules/libxf4bpp.so
./usr/X11R6/lib/modules/libxf8_16bpp.la
./usr/X11R6/lib/modules/libxf8_16bpp.so
-./usr/X11R6/lib/modules/libxf8_32bpp.la
-./usr/X11R6/lib/modules/libxf8_32bpp.so
./usr/X11R6/lib/modules/linux/libfbdevhw.la
./usr/X11R6/lib/modules/linux/libfbdevhw.so
./usr/X11R6/lib/modules/multimedia/bt829_drv.la
@@ -337,13 +303,11 @@
./usr/X11R6/lib/modules/v20002d.uc
./usr/X11R6/lib/pkgconfig/xorg-server.pc
./usr/X11R6/man/man1/Xephyr.1
-./usr/X11R6/man/man1/Xnest.1
./usr/X11R6/man/man1/Xorg.1
./usr/X11R6/man/man1/Xserver.1
./usr/X11R6/man/man1/Xvfb.1
./usr/X11R6/man/man1/cvt.1
./usr/X11R6/man/man1/gtf.1
-./usr/X11R6/man/man1/xorgconfig.1
./usr/X11R6/man/man4/acecad.4
./usr/X11R6/man/man4/apm.4
./usr/X11R6/man/man4/ati.4
diff --git a/distrib/sets/lists/xserv/md.armish b/distrib/sets/lists/xserv/md.armish
index 03d3e598e..4f0de2142 100644
--- a/distrib/sets/lists/xserv/md.armish
+++ b/distrib/sets/lists/xserv/md.armish
@@ -1,30 +1,18 @@
./usr/X11R6/bin/X
./usr/X11R6/bin/Xephyr
-./usr/X11R6/bin/Xnest
./usr/X11R6/bin/Xorg
./usr/X11R6/bin/Xvfb
./usr/X11R6/bin/cvt
./usr/X11R6/bin/gtf
-./usr/X11R6/bin/xorgconfig
./usr/X11R6/include/xorg
./usr/X11R6/include/xorg/BT.h
./usr/X11R6/include/xorg/IBM.h
./usr/X11R6/include/xorg/TI.h
./usr/X11R6/include/xorg/XIstubs.h
-./usr/X11R6/include/xorg/afb.h
-./usr/X11R6/include/xorg/assyntax.h
-./usr/X11R6/include/xorg/atKeynames.h
./usr/X11R6/include/xorg/bstore.h
./usr/X11R6/include/xorg/bstorestr.h
./usr/X11R6/include/xorg/bt829.h
-./usr/X11R6/include/xorg/cfb.h
-./usr/X11R6/include/xorg/cfb16.h
-./usr/X11R6/include/xorg/cfb32.h
./usr/X11R6/include/xorg/cfb8_16.h
-./usr/X11R6/include/xorg/cfb8_32.h
-./usr/X11R6/include/xorg/cfbmap.h
-./usr/X11R6/include/xorg/cfbmskbits.h
-./usr/X11R6/include/xorg/cfbunmap.h
./usr/X11R6/include/xorg/closestr.h
./usr/X11R6/include/xorg/closure.h
./usr/X11R6/include/xorg/colormap.h
@@ -51,7 +39,6 @@
./usr/X11R6/include/xorg/fb.h
./usr/X11R6/include/xorg/fbdevhw.h
./usr/X11R6/include/xorg/fboverlay.h
-./usr/X11R6/include/xorg/fbpseudocolor.h
./usr/X11R6/include/xorg/fbrop.h
./usr/X11R6/include/xorg/fi1236.h
./usr/X11R6/include/xorg/fourcc.h
@@ -62,9 +49,6 @@
./usr/X11R6/include/xorg/i2c_def.h
./usr/X11R6/include/xorg/input.h
./usr/X11R6/include/xorg/inputstr.h
-./usr/X11R6/include/xorg/mfb.h
-./usr/X11R6/include/xorg/mfbmap.h
-./usr/X11R6/include/xorg/mfbunmap.h
./usr/X11R6/include/xorg/mi.h
./usr/X11R6/include/xorg/mibank.h
./usr/X11R6/include/xorg/mibstore.h
@@ -121,13 +105,10 @@
./usr/X11R6/include/xorg/xaaWrapper.h
./usr/X11R6/include/xorg/xaalocal.h
./usr/X11R6/include/xorg/xaarop.h
-./usr/X11R6/include/xorg/xf1bpp.h
-./usr/X11R6/include/xorg/xf4bpp.h
./usr/X11R6/include/xorg/xf86.h
./usr/X11R6/include/xorg/xf86Cursor.h
./usr/X11R6/include/xorg/xf86DDC.h
./usr/X11R6/include/xorg/xf86Module.h
-./usr/X11R6/include/xorg/xf86OSmouse.h
./usr/X11R6/include/xorg/xf86Opt.h
./usr/X11R6/include/xorg/xf86Pci.h
./usr/X11R6/include/xorg/xf86PciInfo.h
@@ -136,7 +117,6 @@
./usr/X11R6/include/xorg/xf86RAC.h
./usr/X11R6/include/xorg/xf86RamDac.h
./usr/X11R6/include/xorg/xf86Resources.h
-./usr/X11R6/include/xorg/xf86Version.h
./usr/X11R6/include/xorg/xf86Xinput.h
./usr/X11R6/include/xorg/xf86_OSlib.h
./usr/X11R6/include/xorg/xf86_OSproc.h
@@ -161,12 +141,12 @@
./usr/X11R6/lib/modules/extensions/libdbe.so
./usr/X11R6/lib/modules/extensions/libdri.la
./usr/X11R6/lib/modules/extensions/libdri.so
+./usr/X11R6/lib/modules/extensions/libdri2.la
+./usr/X11R6/lib/modules/extensions/libdri2.so
./usr/X11R6/lib/modules/extensions/libextmod.la
./usr/X11R6/lib/modules/extensions/libextmod.so
./usr/X11R6/lib/modules/extensions/libglx.la
./usr/X11R6/lib/modules/extensions/libglx.so
-./usr/X11R6/lib/modules/fonts/libfreetype.la
-./usr/X11R6/lib/modules/fonts/libfreetype.so
./usr/X11R6/lib/modules/input/kbd_drv.la
./usr/X11R6/lib/modules/input/kbd_drv.so
./usr/X11R6/lib/modules/input/mouse_drv.la
@@ -177,20 +157,12 @@
./usr/X11R6/lib/modules/input/void_drv.so
./usr/X11R6/lib/modules/input/ws_drv.la
./usr/X11R6/lib/modules/input/ws_drv.so
-./usr/X11R6/lib/modules/libafb.la
-./usr/X11R6/lib/modules/libafb.so
-./usr/X11R6/lib/modules/libcfb.la
-./usr/X11R6/lib/modules/libcfb.so
-./usr/X11R6/lib/modules/libcfb32.la
-./usr/X11R6/lib/modules/libcfb32.so
./usr/X11R6/lib/modules/libexa.la
./usr/X11R6/lib/modules/libexa.so
./usr/X11R6/lib/modules/libfb.la
./usr/X11R6/lib/modules/libfb.so
./usr/X11R6/lib/modules/libint10.la
./usr/X11R6/lib/modules/libint10.so
-./usr/X11R6/lib/modules/libmfb.la
-./usr/X11R6/lib/modules/libmfb.so
./usr/X11R6/lib/modules/libshadow.la
./usr/X11R6/lib/modules/libshadow.so
./usr/X11R6/lib/modules/libshadowfb.la
@@ -203,14 +175,8 @@
./usr/X11R6/lib/modules/libwfb.so
./usr/X11R6/lib/modules/libxaa.la
./usr/X11R6/lib/modules/libxaa.so
-./usr/X11R6/lib/modules/libxf1bpp.la
-./usr/X11R6/lib/modules/libxf1bpp.so
-./usr/X11R6/lib/modules/libxf4bpp.la
-./usr/X11R6/lib/modules/libxf4bpp.so
./usr/X11R6/lib/modules/libxf8_16bpp.la
./usr/X11R6/lib/modules/libxf8_16bpp.so
-./usr/X11R6/lib/modules/libxf8_32bpp.la
-./usr/X11R6/lib/modules/libxf8_32bpp.so
./usr/X11R6/lib/modules/linux/libfbdevhw.la
./usr/X11R6/lib/modules/linux/libfbdevhw.so
./usr/X11R6/lib/modules/multimedia/bt829_drv.la
@@ -229,13 +195,11 @@
./usr/X11R6/lib/modules/multimedia/uda1380_drv.so
./usr/X11R6/lib/pkgconfig/xorg-server.pc
./usr/X11R6/man/man1/Xephyr.1
-./usr/X11R6/man/man1/Xnest.1
./usr/X11R6/man/man1/Xorg.1
./usr/X11R6/man/man1/Xserver.1
./usr/X11R6/man/man1/Xvfb.1
./usr/X11R6/man/man1/cvt.1
./usr/X11R6/man/man1/gtf.1
-./usr/X11R6/man/man1/xorgconfig.1
./usr/X11R6/man/man4/exa.4
./usr/X11R6/man/man4/fbdevhw.4
./usr/X11R6/man/man4/kbd.4
diff --git a/distrib/sets/lists/xserv/md.hp300 b/distrib/sets/lists/xserv/md.hp300
index 64ae28846..667bbdcac 100644
--- a/distrib/sets/lists/xserv/md.hp300
+++ b/distrib/sets/lists/xserv/md.hp300
@@ -1,5 +1,4 @@
./usr/X11R6/bin/X
-./usr/X11R6/bin/Xnest
./usr/X11R6/bin/Xorg
./usr/X11R6/bin/Xvfb
./usr/X11R6/bin/ucs2any
@@ -8,20 +7,10 @@
./usr/X11R6/include/xorg/IBM.h
./usr/X11R6/include/xorg/TI.h
./usr/X11R6/include/xorg/XIstubs.h
-./usr/X11R6/include/xorg/afb.h
-./usr/X11R6/include/xorg/assyntax.h
-./usr/X11R6/include/xorg/atKeynames.h
./usr/X11R6/include/xorg/bstore.h
./usr/X11R6/include/xorg/bstorestr.h
./usr/X11R6/include/xorg/bt829.h
-./usr/X11R6/include/xorg/cfb.h
-./usr/X11R6/include/xorg/cfb16.h
-./usr/X11R6/include/xorg/cfb32.h
./usr/X11R6/include/xorg/cfb8_16.h
-./usr/X11R6/include/xorg/cfb8_32.h
-./usr/X11R6/include/xorg/cfbmap.h
-./usr/X11R6/include/xorg/cfbmskbits.h
-./usr/X11R6/include/xorg/cfbunmap.h
./usr/X11R6/include/xorg/closestr.h
./usr/X11R6/include/xorg/closure.h
./usr/X11R6/include/xorg/colormap.h
@@ -48,7 +37,6 @@
./usr/X11R6/include/xorg/fb.h
./usr/X11R6/include/xorg/fbdevhw.h
./usr/X11R6/include/xorg/fboverlay.h
-./usr/X11R6/include/xorg/fbpseudocolor.h
./usr/X11R6/include/xorg/fbrop.h
./usr/X11R6/include/xorg/fi1236.h
./usr/X11R6/include/xorg/fourcc.h
@@ -60,9 +48,6 @@
./usr/X11R6/include/xorg/i2c_def.h
./usr/X11R6/include/xorg/input.h
./usr/X11R6/include/xorg/inputstr.h
-./usr/X11R6/include/xorg/mfb.h
-./usr/X11R6/include/xorg/mfbmap.h
-./usr/X11R6/include/xorg/mfbunmap.h
./usr/X11R6/include/xorg/mi.h
./usr/X11R6/include/xorg/mibank.h
./usr/X11R6/include/xorg/mibstore.h
@@ -120,15 +105,12 @@
./usr/X11R6/include/xorg/xaaWrapper.h
./usr/X11R6/include/xorg/xaalocal.h
./usr/X11R6/include/xorg/xaarop.h
-./usr/X11R6/include/xorg/xf1bpp.h
-./usr/X11R6/include/xorg/xf4bpp.h
./usr/X11R6/include/xorg/xf86.h
./usr/X11R6/include/xorg/xf86Crtc.h
./usr/X11R6/include/xorg/xf86Cursor.h
./usr/X11R6/include/xorg/xf86DDC.h
./usr/X11R6/include/xorg/xf86Modes.h
./usr/X11R6/include/xorg/xf86Module.h
-./usr/X11R6/include/xorg/xf86OSmouse.h
./usr/X11R6/include/xorg/xf86Opt.h
./usr/X11R6/include/xorg/xf86Optrec.h
./usr/X11R6/include/xorg/xf86Parser.h
@@ -141,7 +123,6 @@
./usr/X11R6/include/xorg/xf86RandR12.h
./usr/X11R6/include/xorg/xf86Rename.h
./usr/X11R6/include/xorg/xf86Resources.h
-./usr/X11R6/include/xorg/xf86Version.h
./usr/X11R6/include/xorg/xf86Xinput.h
./usr/X11R6/include/xorg/xf86_OSlib.h
./usr/X11R6/include/xorg/xf86_OSproc.h
@@ -166,8 +147,6 @@
./usr/X11R6/lib/modules/extensions/libdbe.so
./usr/X11R6/lib/modules/extensions/libextmod.la
./usr/X11R6/lib/modules/extensions/libextmod.so
-./usr/X11R6/lib/modules/fonts/libfreetype.la
-./usr/X11R6/lib/modules/fonts/libfreetype.so
./usr/X11R6/lib/modules/input/kbd_drv.la
./usr/X11R6/lib/modules/input/kbd_drv.so
./usr/X11R6/lib/modules/input/mouse_drv.la
@@ -178,20 +157,12 @@
./usr/X11R6/lib/modules/input/void_drv.so
./usr/X11R6/lib/modules/input/ws_drv.la
./usr/X11R6/lib/modules/input/ws_drv.so
-./usr/X11R6/lib/modules/libafb.la
-./usr/X11R6/lib/modules/libafb.so
-./usr/X11R6/lib/modules/libcfb.la
-./usr/X11R6/lib/modules/libcfb.so
-./usr/X11R6/lib/modules/libcfb32.la
-./usr/X11R6/lib/modules/libcfb32.so
./usr/X11R6/lib/modules/libexa.la
./usr/X11R6/lib/modules/libexa.so
./usr/X11R6/lib/modules/libfb.la
./usr/X11R6/lib/modules/libfb.so
./usr/X11R6/lib/modules/libint10.la
./usr/X11R6/lib/modules/libint10.so
-./usr/X11R6/lib/modules/libmfb.la
-./usr/X11R6/lib/modules/libmfb.so
./usr/X11R6/lib/modules/libshadow.la
./usr/X11R6/lib/modules/libshadow.so
./usr/X11R6/lib/modules/libshadowfb.la
@@ -204,14 +175,8 @@
./usr/X11R6/lib/modules/libwfb.so
./usr/X11R6/lib/modules/libxaa.la
./usr/X11R6/lib/modules/libxaa.so
-./usr/X11R6/lib/modules/libxf1bpp.la
-./usr/X11R6/lib/modules/libxf1bpp.so
-./usr/X11R6/lib/modules/libxf4bpp.la
-./usr/X11R6/lib/modules/libxf4bpp.so
./usr/X11R6/lib/modules/libxf8_16bpp.la
./usr/X11R6/lib/modules/libxf8_16bpp.so
-./usr/X11R6/lib/modules/libxf8_32bpp.la
-./usr/X11R6/lib/modules/libxf8_32bpp.so
./usr/X11R6/lib/modules/linux/libfbdevhw.la
./usr/X11R6/lib/modules/linux/libfbdevhw.so
./usr/X11R6/lib/modules/multimedia/bt829_drv.la
@@ -229,7 +194,6 @@
./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/man/man1/Xnest.1
./usr/X11R6/man/man1/Xorg.1
./usr/X11R6/man/man1/Xserver.1
./usr/X11R6/man/man1/Xvfb.1
diff --git a/distrib/sets/lists/xserv/md.hppa b/distrib/sets/lists/xserv/md.hppa
index 0dffa83e3..231ce22e0 100644
--- a/distrib/sets/lists/xserv/md.hppa
+++ b/distrib/sets/lists/xserv/md.hppa
@@ -1,11 +1,9 @@
./usr/X11R6/bin/Xephyr
-./usr/X11R6/bin/Xnest
./usr/X11R6/bin/Xvfb
./usr/X11R6/bin/ucs2any
./usr/X11R6/lib/modules/dri/swrast_dri.so
./usr/X11R6/lib/pkgconfig/xorg-server.pc
./usr/X11R6/man/man1/Xephyr.1
-./usr/X11R6/man/man1/Xnest.1
./usr/X11R6/man/man1/Xserver.1
./usr/X11R6/man/man1/Xvfb.1
./usr/X11R6/man/man1/bdftruncate.1
diff --git a/distrib/sets/lists/xserv/md.i386 b/distrib/sets/lists/xserv/md.i386
index 40a990cab..cc930f842 100644
--- a/distrib/sets/lists/xserv/md.i386
+++ b/distrib/sets/lists/xserv/md.i386
@@ -1,30 +1,18 @@
./usr/X11R6/bin/X
./usr/X11R6/bin/Xephyr
-./usr/X11R6/bin/Xnest
./usr/X11R6/bin/Xorg
./usr/X11R6/bin/Xvfb
./usr/X11R6/bin/cvt
./usr/X11R6/bin/gtf
-./usr/X11R6/bin/xorgconfig
./usr/X11R6/include/xorg
./usr/X11R6/include/xorg/BT.h
./usr/X11R6/include/xorg/IBM.h
./usr/X11R6/include/xorg/TI.h
./usr/X11R6/include/xorg/XIstubs.h
-./usr/X11R6/include/xorg/afb.h
-./usr/X11R6/include/xorg/assyntax.h
-./usr/X11R6/include/xorg/atKeynames.h
./usr/X11R6/include/xorg/bstore.h
./usr/X11R6/include/xorg/bstorestr.h
./usr/X11R6/include/xorg/bt829.h
-./usr/X11R6/include/xorg/cfb.h
-./usr/X11R6/include/xorg/cfb16.h
-./usr/X11R6/include/xorg/cfb32.h
./usr/X11R6/include/xorg/cfb8_16.h
-./usr/X11R6/include/xorg/cfb8_32.h
-./usr/X11R6/include/xorg/cfbmap.h
-./usr/X11R6/include/xorg/cfbmskbits.h
-./usr/X11R6/include/xorg/cfbunmap.h
./usr/X11R6/include/xorg/closestr.h
./usr/X11R6/include/xorg/closure.h
./usr/X11R6/include/xorg/colormap.h
@@ -51,7 +39,6 @@
./usr/X11R6/include/xorg/fb.h
./usr/X11R6/include/xorg/fbdevhw.h
./usr/X11R6/include/xorg/fboverlay.h
-./usr/X11R6/include/xorg/fbpseudocolor.h
./usr/X11R6/include/xorg/fbrop.h
./usr/X11R6/include/xorg/fi1236.h
./usr/X11R6/include/xorg/fourcc.h
@@ -62,9 +49,6 @@
./usr/X11R6/include/xorg/i2c_def.h
./usr/X11R6/include/xorg/input.h
./usr/X11R6/include/xorg/inputstr.h
-./usr/X11R6/include/xorg/mfb.h
-./usr/X11R6/include/xorg/mfbmap.h
-./usr/X11R6/include/xorg/mfbunmap.h
./usr/X11R6/include/xorg/mi.h
./usr/X11R6/include/xorg/mibank.h
./usr/X11R6/include/xorg/mibstore.h
@@ -121,13 +105,10 @@
./usr/X11R6/include/xorg/xaaWrapper.h
./usr/X11R6/include/xorg/xaalocal.h
./usr/X11R6/include/xorg/xaarop.h
-./usr/X11R6/include/xorg/xf1bpp.h
-./usr/X11R6/include/xorg/xf4bpp.h
./usr/X11R6/include/xorg/xf86.h
./usr/X11R6/include/xorg/xf86Cursor.h
./usr/X11R6/include/xorg/xf86DDC.h
./usr/X11R6/include/xorg/xf86Module.h
-./usr/X11R6/include/xorg/xf86OSmouse.h
./usr/X11R6/include/xorg/xf86Opt.h
./usr/X11R6/include/xorg/xf86Pci.h
./usr/X11R6/include/xorg/xf86PciInfo.h
@@ -136,7 +117,6 @@
./usr/X11R6/include/xorg/xf86RAC.h
./usr/X11R6/include/xorg/xf86RamDac.h
./usr/X11R6/include/xorg/xf86Resources.h
-./usr/X11R6/include/xorg/xf86Version.h
./usr/X11R6/include/xorg/xf86Xinput.h
./usr/X11R6/include/xorg/xf86_OSlib.h
./usr/X11R6/include/xorg/xf86_OSproc.h
@@ -249,12 +229,12 @@
./usr/X11R6/lib/modules/extensions/libdbe.so
./usr/X11R6/lib/modules/extensions/libdri.la
./usr/X11R6/lib/modules/extensions/libdri.so
+./usr/X11R6/lib/modules/extensions/libdri2.la
+./usr/X11R6/lib/modules/extensions/libdri2.so
./usr/X11R6/lib/modules/extensions/libextmod.la
./usr/X11R6/lib/modules/extensions/libextmod.so
./usr/X11R6/lib/modules/extensions/libglx.la
./usr/X11R6/lib/modules/extensions/libglx.so
-./usr/X11R6/lib/modules/fonts/libfreetype.la
-./usr/X11R6/lib/modules/fonts/libfreetype.so
./usr/X11R6/lib/modules/input/acecad_drv.la
./usr/X11R6/lib/modules/input/acecad_drv.so
./usr/X11R6/lib/modules/input/citron_drv.la
@@ -283,20 +263,12 @@
./usr/X11R6/lib/modules/input/void_drv.so
./usr/X11R6/lib/modules/input/ws_drv.la
./usr/X11R6/lib/modules/input/ws_drv.so
-./usr/X11R6/lib/modules/libafb.la
-./usr/X11R6/lib/modules/libafb.so
-./usr/X11R6/lib/modules/libcfb.la
-./usr/X11R6/lib/modules/libcfb.so
-./usr/X11R6/lib/modules/libcfb32.la
-./usr/X11R6/lib/modules/libcfb32.so
./usr/X11R6/lib/modules/libexa.la
./usr/X11R6/lib/modules/libexa.so
./usr/X11R6/lib/modules/libfb.la
./usr/X11R6/lib/modules/libfb.so
./usr/X11R6/lib/modules/libint10.la
./usr/X11R6/lib/modules/libint10.so
-./usr/X11R6/lib/modules/libmfb.la
-./usr/X11R6/lib/modules/libmfb.so
./usr/X11R6/lib/modules/libshadow.la
./usr/X11R6/lib/modules/libshadow.so
./usr/X11R6/lib/modules/libshadowfb.la
@@ -309,14 +281,8 @@
./usr/X11R6/lib/modules/libwfb.so
./usr/X11R6/lib/modules/libxaa.la
./usr/X11R6/lib/modules/libxaa.so
-./usr/X11R6/lib/modules/libxf1bpp.la
-./usr/X11R6/lib/modules/libxf1bpp.so
-./usr/X11R6/lib/modules/libxf4bpp.la
-./usr/X11R6/lib/modules/libxf4bpp.so
./usr/X11R6/lib/modules/libxf8_16bpp.la
./usr/X11R6/lib/modules/libxf8_16bpp.so
-./usr/X11R6/lib/modules/libxf8_32bpp.la
-./usr/X11R6/lib/modules/libxf8_32bpp.so
./usr/X11R6/lib/modules/linux/libfbdevhw.la
./usr/X11R6/lib/modules/linux/libfbdevhw.so
./usr/X11R6/lib/modules/multimedia/bt829_drv.la
@@ -343,13 +309,11 @@
./usr/X11R6/lib/modules/v20002d.uc
./usr/X11R6/lib/pkgconfig/xorg-server.pc
./usr/X11R6/man/man1/Xephyr.1
-./usr/X11R6/man/man1/Xnest.1
./usr/X11R6/man/man1/Xorg.1
./usr/X11R6/man/man1/Xserver.1
./usr/X11R6/man/man1/Xvfb.1
./usr/X11R6/man/man1/cvt.1
./usr/X11R6/man/man1/gtf.1
-./usr/X11R6/man/man1/xorgconfig.1
./usr/X11R6/man/man4/acecad.4
./usr/X11R6/man/man4/apm.4
./usr/X11R6/man/man4/ati.4
diff --git a/distrib/sets/lists/xserv/md.mac68k b/distrib/sets/lists/xserv/md.mac68k
index ccf6bce79..b9ef375fd 100644
--- a/distrib/sets/lists/xserv/md.mac68k
+++ b/distrib/sets/lists/xserv/md.mac68k
@@ -1,5 +1,4 @@
./usr/X11R6/bin/X
-./usr/X11R6/bin/Xnest
./usr/X11R6/bin/Xorg
./usr/X11R6/bin/Xvfb
./usr/X11R6/include/xorg
@@ -7,20 +6,10 @@
./usr/X11R6/include/xorg/IBM.h
./usr/X11R6/include/xorg/TI.h
./usr/X11R6/include/xorg/XIstubs.h
-./usr/X11R6/include/xorg/afb.h
-./usr/X11R6/include/xorg/assyntax.h
-./usr/X11R6/include/xorg/atKeynames.h
./usr/X11R6/include/xorg/bstore.h
./usr/X11R6/include/xorg/bstorestr.h
./usr/X11R6/include/xorg/bt829.h
-./usr/X11R6/include/xorg/cfb.h
-./usr/X11R6/include/xorg/cfb16.h
-./usr/X11R6/include/xorg/cfb32.h
./usr/X11R6/include/xorg/cfb8_16.h
-./usr/X11R6/include/xorg/cfb8_32.h
-./usr/X11R6/include/xorg/cfbmap.h
-./usr/X11R6/include/xorg/cfbmskbits.h
-./usr/X11R6/include/xorg/cfbunmap.h
./usr/X11R6/include/xorg/closestr.h
./usr/X11R6/include/xorg/closure.h
./usr/X11R6/include/xorg/colormap.h
@@ -47,7 +36,6 @@
./usr/X11R6/include/xorg/fb.h
./usr/X11R6/include/xorg/fbdevhw.h
./usr/X11R6/include/xorg/fboverlay.h
-./usr/X11R6/include/xorg/fbpseudocolor.h
./usr/X11R6/include/xorg/fbrop.h
./usr/X11R6/include/xorg/fi1236.h
./usr/X11R6/include/xorg/fourcc.h
@@ -58,9 +46,6 @@
./usr/X11R6/include/xorg/i2c_def.h
./usr/X11R6/include/xorg/input.h
./usr/X11R6/include/xorg/inputstr.h
-./usr/X11R6/include/xorg/mfb.h
-./usr/X11R6/include/xorg/mfbmap.h
-./usr/X11R6/include/xorg/mfbunmap.h
./usr/X11R6/include/xorg/mi.h
./usr/X11R6/include/xorg/mibank.h
./usr/X11R6/include/xorg/mibstore.h
@@ -117,13 +102,10 @@
./usr/X11R6/include/xorg/xaaWrapper.h
./usr/X11R6/include/xorg/xaalocal.h
./usr/X11R6/include/xorg/xaarop.h
-./usr/X11R6/include/xorg/xf1bpp.h
-./usr/X11R6/include/xorg/xf4bpp.h
./usr/X11R6/include/xorg/xf86.h
./usr/X11R6/include/xorg/xf86Cursor.h
./usr/X11R6/include/xorg/xf86DDC.h
./usr/X11R6/include/xorg/xf86Module.h
-./usr/X11R6/include/xorg/xf86OSmouse.h
./usr/X11R6/include/xorg/xf86Opt.h
./usr/X11R6/include/xorg/xf86Pci.h
./usr/X11R6/include/xorg/xf86PciInfo.h
@@ -132,7 +114,6 @@
./usr/X11R6/include/xorg/xf86RAC.h
./usr/X11R6/include/xorg/xf86RamDac.h
./usr/X11R6/include/xorg/xf86Resources.h
-./usr/X11R6/include/xorg/xf86Version.h
./usr/X11R6/include/xorg/xf86Xinput.h
./usr/X11R6/include/xorg/xf86_OSlib.h
./usr/X11R6/include/xorg/xf86_OSproc.h
@@ -157,8 +138,6 @@
./usr/X11R6/lib/modules/extensions/libdbe.so
./usr/X11R6/lib/modules/extensions/libextmod.la
./usr/X11R6/lib/modules/extensions/libextmod.so
-./usr/X11R6/lib/modules/fonts/libfreetype.la
-./usr/X11R6/lib/modules/fonts/libfreetype.so
./usr/X11R6/lib/modules/input/kbd_drv.la
./usr/X11R6/lib/modules/input/kbd_drv.so
./usr/X11R6/lib/modules/input/mouse_drv.la
@@ -169,20 +148,12 @@
./usr/X11R6/lib/modules/input/void_drv.so
./usr/X11R6/lib/modules/input/ws_drv.la
./usr/X11R6/lib/modules/input/ws_drv.so
-./usr/X11R6/lib/modules/libafb.la
-./usr/X11R6/lib/modules/libafb.so
-./usr/X11R6/lib/modules/libcfb.la
-./usr/X11R6/lib/modules/libcfb.so
-./usr/X11R6/lib/modules/libcfb32.la
-./usr/X11R6/lib/modules/libcfb32.so
./usr/X11R6/lib/modules/libexa.la
./usr/X11R6/lib/modules/libexa.so
./usr/X11R6/lib/modules/libfb.la
./usr/X11R6/lib/modules/libfb.so
./usr/X11R6/lib/modules/libint10.la
./usr/X11R6/lib/modules/libint10.so
-./usr/X11R6/lib/modules/libmfb.la
-./usr/X11R6/lib/modules/libmfb.so
./usr/X11R6/lib/modules/libshadow.la
./usr/X11R6/lib/modules/libshadow.so
./usr/X11R6/lib/modules/libshadowfb.la
@@ -195,14 +166,8 @@
./usr/X11R6/lib/modules/libwfb.so
./usr/X11R6/lib/modules/libxaa.la
./usr/X11R6/lib/modules/libxaa.so
-./usr/X11R6/lib/modules/libxf1bpp.la
-./usr/X11R6/lib/modules/libxf1bpp.so
-./usr/X11R6/lib/modules/libxf4bpp.la
-./usr/X11R6/lib/modules/libxf4bpp.so
./usr/X11R6/lib/modules/libxf8_16bpp.la
./usr/X11R6/lib/modules/libxf8_16bpp.so
-./usr/X11R6/lib/modules/libxf8_32bpp.la
-./usr/X11R6/lib/modules/libxf8_32bpp.so
./usr/X11R6/lib/modules/linux/libfbdevhw.la
./usr/X11R6/lib/modules/linux/libfbdevhw.so
./usr/X11R6/lib/modules/multimedia/bt829_drv.la
@@ -220,7 +185,6 @@
./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/man/man1/Xnest.1
./usr/X11R6/man/man1/Xorg.1
./usr/X11R6/man/man1/Xserver.1
./usr/X11R6/man/man1/Xvfb.1
diff --git a/distrib/sets/lists/xserv/md.macppc b/distrib/sets/lists/xserv/md.macppc
index 23ca283af..fd2dd00b3 100644
--- a/distrib/sets/lists/xserv/md.macppc
+++ b/distrib/sets/lists/xserv/md.macppc
@@ -1,30 +1,18 @@
./usr/X11R6/bin/X
./usr/X11R6/bin/Xephyr
-./usr/X11R6/bin/Xnest
./usr/X11R6/bin/Xorg
./usr/X11R6/bin/Xvfb
./usr/X11R6/bin/cvt
./usr/X11R6/bin/gtf
-./usr/X11R6/bin/xorgconfig
./usr/X11R6/include/xorg
./usr/X11R6/include/xorg/BT.h
./usr/X11R6/include/xorg/IBM.h
./usr/X11R6/include/xorg/TI.h
./usr/X11R6/include/xorg/XIstubs.h
-./usr/X11R6/include/xorg/afb.h
-./usr/X11R6/include/xorg/assyntax.h
-./usr/X11R6/include/xorg/atKeynames.h
./usr/X11R6/include/xorg/bstore.h
./usr/X11R6/include/xorg/bstorestr.h
./usr/X11R6/include/xorg/bt829.h
-./usr/X11R6/include/xorg/cfb.h
-./usr/X11R6/include/xorg/cfb16.h
-./usr/X11R6/include/xorg/cfb32.h
./usr/X11R6/include/xorg/cfb8_16.h
-./usr/X11R6/include/xorg/cfb8_32.h
-./usr/X11R6/include/xorg/cfbmap.h
-./usr/X11R6/include/xorg/cfbmskbits.h
-./usr/X11R6/include/xorg/cfbunmap.h
./usr/X11R6/include/xorg/closestr.h
./usr/X11R6/include/xorg/closure.h
./usr/X11R6/include/xorg/colormap.h
@@ -51,7 +39,6 @@
./usr/X11R6/include/xorg/fb.h
./usr/X11R6/include/xorg/fbdevhw.h
./usr/X11R6/include/xorg/fboverlay.h
-./usr/X11R6/include/xorg/fbpseudocolor.h
./usr/X11R6/include/xorg/fbrop.h
./usr/X11R6/include/xorg/fi1236.h
./usr/X11R6/include/xorg/fourcc.h
@@ -62,9 +49,6 @@
./usr/X11R6/include/xorg/i2c_def.h
./usr/X11R6/include/xorg/input.h
./usr/X11R6/include/xorg/inputstr.h
-./usr/X11R6/include/xorg/mfb.h
-./usr/X11R6/include/xorg/mfbmap.h
-./usr/X11R6/include/xorg/mfbunmap.h
./usr/X11R6/include/xorg/mi.h
./usr/X11R6/include/xorg/mibank.h
./usr/X11R6/include/xorg/mibstore.h
@@ -121,13 +105,10 @@
./usr/X11R6/include/xorg/xaaWrapper.h
./usr/X11R6/include/xorg/xaalocal.h
./usr/X11R6/include/xorg/xaarop.h
-./usr/X11R6/include/xorg/xf1bpp.h
-./usr/X11R6/include/xorg/xf4bpp.h
./usr/X11R6/include/xorg/xf86.h
./usr/X11R6/include/xorg/xf86Cursor.h
./usr/X11R6/include/xorg/xf86DDC.h
./usr/X11R6/include/xorg/xf86Module.h
-./usr/X11R6/include/xorg/xf86OSmouse.h
./usr/X11R6/include/xorg/xf86Opt.h
./usr/X11R6/include/xorg/xf86Pci.h
./usr/X11R6/include/xorg/xf86PciInfo.h
@@ -136,7 +117,6 @@
./usr/X11R6/include/xorg/xf86RAC.h
./usr/X11R6/include/xorg/xf86RamDac.h
./usr/X11R6/include/xorg/xf86Resources.h
-./usr/X11R6/include/xorg/xf86Version.h
./usr/X11R6/include/xorg/xf86Xinput.h
./usr/X11R6/include/xorg/xf86_OSlib.h
./usr/X11R6/include/xorg/xf86_OSproc.h
@@ -171,12 +151,12 @@
./usr/X11R6/lib/modules/extensions/libdbe.so
./usr/X11R6/lib/modules/extensions/libdri.la
./usr/X11R6/lib/modules/extensions/libdri.so
+./usr/X11R6/lib/modules/extensions/libdri2.la
+./usr/X11R6/lib/modules/extensions/libdri2.so
./usr/X11R6/lib/modules/extensions/libextmod.la
./usr/X11R6/lib/modules/extensions/libextmod.so
./usr/X11R6/lib/modules/extensions/libglx.la
./usr/X11R6/lib/modules/extensions/libglx.so
-./usr/X11R6/lib/modules/fonts/libfreetype.la
-./usr/X11R6/lib/modules/fonts/libfreetype.so
./usr/X11R6/lib/modules/input/acecad_drv.la
./usr/X11R6/lib/modules/input/acecad_drv.so
./usr/X11R6/lib/modules/input/citron_drv.la
@@ -203,20 +183,12 @@
./usr/X11R6/lib/modules/input/void_drv.so
./usr/X11R6/lib/modules/input/ws_drv.la
./usr/X11R6/lib/modules/input/ws_drv.so
-./usr/X11R6/lib/modules/libafb.la
-./usr/X11R6/lib/modules/libafb.so
-./usr/X11R6/lib/modules/libcfb.la
-./usr/X11R6/lib/modules/libcfb.so
-./usr/X11R6/lib/modules/libcfb32.la
-./usr/X11R6/lib/modules/libcfb32.so
./usr/X11R6/lib/modules/libexa.la
./usr/X11R6/lib/modules/libexa.so
./usr/X11R6/lib/modules/libfb.la
./usr/X11R6/lib/modules/libfb.so
./usr/X11R6/lib/modules/libint10.la
./usr/X11R6/lib/modules/libint10.so
-./usr/X11R6/lib/modules/libmfb.la
-./usr/X11R6/lib/modules/libmfb.so
./usr/X11R6/lib/modules/libshadow.la
./usr/X11R6/lib/modules/libshadow.so
./usr/X11R6/lib/modules/libshadowfb.la
@@ -229,14 +201,8 @@
./usr/X11R6/lib/modules/libwfb.so
./usr/X11R6/lib/modules/libxaa.la
./usr/X11R6/lib/modules/libxaa.so
-./usr/X11R6/lib/modules/libxf1bpp.la
-./usr/X11R6/lib/modules/libxf1bpp.so
-./usr/X11R6/lib/modules/libxf4bpp.la
-./usr/X11R6/lib/modules/libxf4bpp.so
./usr/X11R6/lib/modules/libxf8_16bpp.la
./usr/X11R6/lib/modules/libxf8_16bpp.so
-./usr/X11R6/lib/modules/libxf8_32bpp.la
-./usr/X11R6/lib/modules/libxf8_32bpp.so
./usr/X11R6/lib/modules/linux/libfbdevhw.la
./usr/X11R6/lib/modules/linux/libfbdevhw.so
./usr/X11R6/lib/modules/multimedia/bt829_drv.la
@@ -261,13 +227,11 @@
./usr/X11R6/lib/modules/multimedia/uda1380_drv.so
./usr/X11R6/lib/pkgconfig/xorg-server.pc
./usr/X11R6/man/man1/Xephyr.1
-./usr/X11R6/man/man1/Xnest.1
./usr/X11R6/man/man1/Xorg.1
./usr/X11R6/man/man1/Xserver.1
./usr/X11R6/man/man1/Xvfb.1
./usr/X11R6/man/man1/cvt.1
./usr/X11R6/man/man1/gtf.1
-./usr/X11R6/man/man1/xorgconfig.1
./usr/X11R6/man/man4/acecad.4
./usr/X11R6/man/man4/ati.4
./usr/X11R6/man/man4/citron.4
diff --git a/distrib/sets/lists/xserv/md.mvme68k b/distrib/sets/lists/xserv/md.mvme68k
index b7e73e37e..7320d8207 100644
--- a/distrib/sets/lists/xserv/md.mvme68k
+++ b/distrib/sets/lists/xserv/md.mvme68k
@@ -1,9 +1,7 @@
-./usr/X11R6/bin/Xnest
./usr/X11R6/bin/Xvfb
./usr/X11R6/include/xorg
./usr/X11R6/lib/libxkbui.so.4.0
./usr/X11R6/lib/pkgconfig/xorg-server.pc
-./usr/X11R6/man/man1/Xnest.1
./usr/X11R6/man/man1/Xserver.1
./usr/X11R6/man/man1/Xvfb.1
./usr/X11R6/man/man3/XDGA.3
diff --git a/distrib/sets/lists/xserv/md.mvme88k b/distrib/sets/lists/xserv/md.mvme88k
index ea60834aa..351328e3c 100644
--- a/distrib/sets/lists/xserv/md.mvme88k
+++ b/distrib/sets/lists/xserv/md.mvme88k
@@ -1,8 +1,6 @@
-./usr/X11R6/bin/Xnest
./usr/X11R6/bin/Xvfb
./usr/X11R6/include/xorg
./usr/X11R6/lib/pkgconfig/xorg-server.pc
-./usr/X11R6/man/man1/Xnest.1
./usr/X11R6/man/man1/Xserver.1
./usr/X11R6/man/man1/Xvfb.1
./usr/X11R6/share/aclocal/xorg-server.m4
diff --git a/distrib/sets/lists/xserv/md.sgi b/distrib/sets/lists/xserv/md.sgi
index cf75cc890..889f1aab2 100644
--- a/distrib/sets/lists/xserv/md.sgi
+++ b/distrib/sets/lists/xserv/md.sgi
@@ -1,26 +1,15 @@
./usr/X11R6/bin/X
./usr/X11R6/bin/Xephyr
-./usr/X11R6/bin/Xnest
./usr/X11R6/bin/Xorg
./usr/X11R6/bin/Xvfb
./usr/X11R6/include/xorg/BT.h
./usr/X11R6/include/xorg/IBM.h
./usr/X11R6/include/xorg/TI.h
./usr/X11R6/include/xorg/XIstubs.h
-./usr/X11R6/include/xorg/afb.h
-./usr/X11R6/include/xorg/assyntax.h
-./usr/X11R6/include/xorg/atKeynames.h
./usr/X11R6/include/xorg/bstore.h
./usr/X11R6/include/xorg/bstorestr.h
./usr/X11R6/include/xorg/bt829.h
-./usr/X11R6/include/xorg/cfb.h
-./usr/X11R6/include/xorg/cfb16.h
-./usr/X11R6/include/xorg/cfb32.h
./usr/X11R6/include/xorg/cfb8_16.h
-./usr/X11R6/include/xorg/cfb8_32.h
-./usr/X11R6/include/xorg/cfbmap.h
-./usr/X11R6/include/xorg/cfbmskbits.h
-./usr/X11R6/include/xorg/cfbunmap.h
./usr/X11R6/include/xorg/closestr.h
./usr/X11R6/include/xorg/closure.h
./usr/X11R6/include/xorg/colormap.h
@@ -47,7 +36,6 @@
./usr/X11R6/include/xorg/fb.h
./usr/X11R6/include/xorg/fbdevhw.h
./usr/X11R6/include/xorg/fboverlay.h
-./usr/X11R6/include/xorg/fbpseudocolor.h
./usr/X11R6/include/xorg/fbrop.h
./usr/X11R6/include/xorg/fi1236.h
./usr/X11R6/include/xorg/fourcc.h
@@ -58,9 +46,6 @@
./usr/X11R6/include/xorg/i2c_def.h
./usr/X11R6/include/xorg/input.h
./usr/X11R6/include/xorg/inputstr.h
-./usr/X11R6/include/xorg/mfb.h
-./usr/X11R6/include/xorg/mfbmap.h
-./usr/X11R6/include/xorg/mfbunmap.h
./usr/X11R6/include/xorg/mi.h
./usr/X11R6/include/xorg/mibank.h
./usr/X11R6/include/xorg/mibstore.h
@@ -117,13 +102,10 @@
./usr/X11R6/include/xorg/xaaWrapper.h
./usr/X11R6/include/xorg/xaalocal.h
./usr/X11R6/include/xorg/xaarop.h
-./usr/X11R6/include/xorg/xf1bpp.h
-./usr/X11R6/include/xorg/xf4bpp.h
./usr/X11R6/include/xorg/xf86.h
./usr/X11R6/include/xorg/xf86Cursor.h
./usr/X11R6/include/xorg/xf86DDC.h
./usr/X11R6/include/xorg/xf86Module.h
-./usr/X11R6/include/xorg/xf86OSmouse.h
./usr/X11R6/include/xorg/xf86Opt.h
./usr/X11R6/include/xorg/xf86Pci.h
./usr/X11R6/include/xorg/xf86PciInfo.h
@@ -132,7 +114,6 @@
./usr/X11R6/include/xorg/xf86RAC.h
./usr/X11R6/include/xorg/xf86RamDac.h
./usr/X11R6/include/xorg/xf86Resources.h
-./usr/X11R6/include/xorg/xf86Version.h
./usr/X11R6/include/xorg/xf86Xinput.h
./usr/X11R6/include/xorg/xf86_OSlib.h
./usr/X11R6/include/xorg/xf86_OSproc.h
@@ -157,12 +138,12 @@
./usr/X11R6/lib/modules/extensions/libdbe.so
./usr/X11R6/lib/modules/extensions/libdri.la
./usr/X11R6/lib/modules/extensions/libdri.so
+./usr/X11R6/lib/modules/extensions/libdri2.la
+./usr/X11R6/lib/modules/extensions/libdri2.so
./usr/X11R6/lib/modules/extensions/libextmod.la
./usr/X11R6/lib/modules/extensions/libextmod.so
./usr/X11R6/lib/modules/extensions/libglx.la
./usr/X11R6/lib/modules/extensions/libglx.so
-./usr/X11R6/lib/modules/fonts/libfreetype.la
-./usr/X11R6/lib/modules/fonts/libfreetype.so
./usr/X11R6/lib/modules/input/kbd_drv.la
./usr/X11R6/lib/modules/input/kbd_drv.so
./usr/X11R6/lib/modules/input/mouse_drv.la
@@ -173,20 +154,12 @@
./usr/X11R6/lib/modules/input/void_drv.so
./usr/X11R6/lib/modules/input/ws_drv.la
./usr/X11R6/lib/modules/input/ws_drv.so
-./usr/X11R6/lib/modules/libafb.la
-./usr/X11R6/lib/modules/libafb.so
-./usr/X11R6/lib/modules/libcfb.la
-./usr/X11R6/lib/modules/libcfb.so
-./usr/X11R6/lib/modules/libcfb32.la
-./usr/X11R6/lib/modules/libcfb32.so
./usr/X11R6/lib/modules/libexa.la
./usr/X11R6/lib/modules/libexa.so
./usr/X11R6/lib/modules/libfb.la
./usr/X11R6/lib/modules/libfb.so
./usr/X11R6/lib/modules/libint10.la
./usr/X11R6/lib/modules/libint10.so
-./usr/X11R6/lib/modules/libmfb.la
-./usr/X11R6/lib/modules/libmfb.so
./usr/X11R6/lib/modules/libshadow.la
./usr/X11R6/lib/modules/libshadow.so
./usr/X11R6/lib/modules/libshadowfb.la
@@ -199,14 +172,8 @@
./usr/X11R6/lib/modules/libwfb.so
./usr/X11R6/lib/modules/libxaa.la
./usr/X11R6/lib/modules/libxaa.so
-./usr/X11R6/lib/modules/libxf1bpp.la
-./usr/X11R6/lib/modules/libxf1bpp.so
-./usr/X11R6/lib/modules/libxf4bpp.la
-./usr/X11R6/lib/modules/libxf4bpp.so
./usr/X11R6/lib/modules/libxf8_16bpp.la
./usr/X11R6/lib/modules/libxf8_16bpp.so
-./usr/X11R6/lib/modules/libxf8_32bpp.la
-./usr/X11R6/lib/modules/libxf8_32bpp.so
./usr/X11R6/lib/modules/linux/libfbdevhw.la
./usr/X11R6/lib/modules/linux/libfbdevhw.so
./usr/X11R6/lib/modules/multimedia/bt829_drv.la
@@ -225,7 +192,6 @@
./usr/X11R6/lib/modules/multimedia/uda1380_drv.so
./usr/X11R6/lib/pkgconfig/xorg-server.pc
./usr/X11R6/man/man1/Xephyr.1
-./usr/X11R6/man/man1/Xnest.1
./usr/X11R6/man/man1/Xorg.1
./usr/X11R6/man/man1/Xserver.1
./usr/X11R6/man/man1/Xvfb.1
diff --git a/distrib/sets/lists/xserv/md.sparc b/distrib/sets/lists/xserv/md.sparc
index 477ecfb58..2947242e1 100644
--- a/distrib/sets/lists/xserv/md.sparc
+++ b/distrib/sets/lists/xserv/md.sparc
@@ -1,5 +1,4 @@
./usr/X11R6/bin/X
-./usr/X11R6/bin/Xnest
./usr/X11R6/bin/Xorg
./usr/X11R6/bin/Xvfb
./usr/X11R6/include/xorg
@@ -7,20 +6,10 @@
./usr/X11R6/include/xorg/IBM.h
./usr/X11R6/include/xorg/TI.h
./usr/X11R6/include/xorg/XIstubs.h
-./usr/X11R6/include/xorg/afb.h
-./usr/X11R6/include/xorg/assyntax.h
-./usr/X11R6/include/xorg/atKeynames.h
./usr/X11R6/include/xorg/bstore.h
./usr/X11R6/include/xorg/bstorestr.h
./usr/X11R6/include/xorg/bt829.h
-./usr/X11R6/include/xorg/cfb.h
-./usr/X11R6/include/xorg/cfb16.h
-./usr/X11R6/include/xorg/cfb32.h
./usr/X11R6/include/xorg/cfb8_16.h
-./usr/X11R6/include/xorg/cfb8_32.h
-./usr/X11R6/include/xorg/cfbmap.h
-./usr/X11R6/include/xorg/cfbmskbits.h
-./usr/X11R6/include/xorg/cfbunmap.h
./usr/X11R6/include/xorg/closestr.h
./usr/X11R6/include/xorg/closure.h
./usr/X11R6/include/xorg/colormap.h
@@ -47,7 +36,6 @@
./usr/X11R6/include/xorg/fb.h
./usr/X11R6/include/xorg/fbdevhw.h
./usr/X11R6/include/xorg/fboverlay.h
-./usr/X11R6/include/xorg/fbpseudocolor.h
./usr/X11R6/include/xorg/fbrop.h
./usr/X11R6/include/xorg/fi1236.h
./usr/X11R6/include/xorg/fourcc.h
@@ -58,9 +46,6 @@
./usr/X11R6/include/xorg/i2c_def.h
./usr/X11R6/include/xorg/input.h
./usr/X11R6/include/xorg/inputstr.h
-./usr/X11R6/include/xorg/mfb.h
-./usr/X11R6/include/xorg/mfbmap.h
-./usr/X11R6/include/xorg/mfbunmap.h
./usr/X11R6/include/xorg/mi.h
./usr/X11R6/include/xorg/mibank.h
./usr/X11R6/include/xorg/mibstore.h
@@ -117,13 +102,10 @@
./usr/X11R6/include/xorg/xaaWrapper.h
./usr/X11R6/include/xorg/xaalocal.h
./usr/X11R6/include/xorg/xaarop.h
-./usr/X11R6/include/xorg/xf1bpp.h
-./usr/X11R6/include/xorg/xf4bpp.h
./usr/X11R6/include/xorg/xf86.h
./usr/X11R6/include/xorg/xf86Cursor.h
./usr/X11R6/include/xorg/xf86DDC.h
./usr/X11R6/include/xorg/xf86Module.h
-./usr/X11R6/include/xorg/xf86OSmouse.h
./usr/X11R6/include/xorg/xf86Opt.h
./usr/X11R6/include/xorg/xf86Pci.h
./usr/X11R6/include/xorg/xf86PciInfo.h
@@ -132,7 +114,6 @@
./usr/X11R6/include/xorg/xf86RAC.h
./usr/X11R6/include/xorg/xf86RamDac.h
./usr/X11R6/include/xorg/xf86Resources.h
-./usr/X11R6/include/xorg/xf86Version.h
./usr/X11R6/include/xorg/xf86Xinput.h
./usr/X11R6/include/xorg/xf86_OSlib.h
./usr/X11R6/include/xorg/xf86_OSproc.h
@@ -157,12 +138,12 @@
./usr/X11R6/lib/modules/extensions/libdbe.so
./usr/X11R6/lib/modules/extensions/libdri.la
./usr/X11R6/lib/modules/extensions/libdri.so
+./usr/X11R6/lib/modules/extensions/libdri2.la
+./usr/X11R6/lib/modules/extensions/libdri2.so
./usr/X11R6/lib/modules/extensions/libextmod.la
./usr/X11R6/lib/modules/extensions/libextmod.so
./usr/X11R6/lib/modules/extensions/libglx.la
./usr/X11R6/lib/modules/extensions/libglx.so
-./usr/X11R6/lib/modules/fonts/libfreetype.la
-./usr/X11R6/lib/modules/fonts/libfreetype.so
./usr/X11R6/lib/modules/input/kbd_drv.la
./usr/X11R6/lib/modules/input/kbd_drv.so
./usr/X11R6/lib/modules/input/mouse_drv.la
@@ -173,20 +154,12 @@
./usr/X11R6/lib/modules/input/void_drv.so
./usr/X11R6/lib/modules/input/ws_drv.la
./usr/X11R6/lib/modules/input/ws_drv.so
-./usr/X11R6/lib/modules/libafb.la
-./usr/X11R6/lib/modules/libafb.so
-./usr/X11R6/lib/modules/libcfb.la
-./usr/X11R6/lib/modules/libcfb.so
-./usr/X11R6/lib/modules/libcfb32.la
-./usr/X11R6/lib/modules/libcfb32.so
./usr/X11R6/lib/modules/libexa.la
./usr/X11R6/lib/modules/libexa.so
./usr/X11R6/lib/modules/libfb.la
./usr/X11R6/lib/modules/libfb.so
./usr/X11R6/lib/modules/libint10.la
./usr/X11R6/lib/modules/libint10.so
-./usr/X11R6/lib/modules/libmfb.la
-./usr/X11R6/lib/modules/libmfb.so
./usr/X11R6/lib/modules/libshadow.la
./usr/X11R6/lib/modules/libshadow.so
./usr/X11R6/lib/modules/libshadowfb.la
@@ -199,14 +172,8 @@
./usr/X11R6/lib/modules/libwfb.so
./usr/X11R6/lib/modules/libxaa.la
./usr/X11R6/lib/modules/libxaa.so
-./usr/X11R6/lib/modules/libxf1bpp.la
-./usr/X11R6/lib/modules/libxf1bpp.so
-./usr/X11R6/lib/modules/libxf4bpp.la
-./usr/X11R6/lib/modules/libxf4bpp.so
./usr/X11R6/lib/modules/libxf8_16bpp.la
./usr/X11R6/lib/modules/libxf8_16bpp.so
-./usr/X11R6/lib/modules/libxf8_32bpp.la
-./usr/X11R6/lib/modules/libxf8_32bpp.so
./usr/X11R6/lib/modules/linux/libfbdevhw.la
./usr/X11R6/lib/modules/linux/libfbdevhw.so
./usr/X11R6/lib/modules/multimedia/bt829_drv.la
@@ -224,7 +191,6 @@
./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/man/man1/Xnest.1
./usr/X11R6/man/man1/Xorg.1
./usr/X11R6/man/man1/Xserver.1
./usr/X11R6/man/man1/Xvfb.1
diff --git a/distrib/sets/lists/xserv/md.sparc64 b/distrib/sets/lists/xserv/md.sparc64
index f3214abca..3289e5221 100644
--- a/distrib/sets/lists/xserv/md.sparc64
+++ b/distrib/sets/lists/xserv/md.sparc64
@@ -1,30 +1,18 @@
./usr/X11R6/bin/X
./usr/X11R6/bin/Xephyr
-./usr/X11R6/bin/Xnest
./usr/X11R6/bin/Xorg
./usr/X11R6/bin/Xvfb
./usr/X11R6/bin/cvt
./usr/X11R6/bin/gtf
-./usr/X11R6/bin/xorgconfig
./usr/X11R6/include/xorg
./usr/X11R6/include/xorg/BT.h
./usr/X11R6/include/xorg/IBM.h
./usr/X11R6/include/xorg/TI.h
./usr/X11R6/include/xorg/XIstubs.h
-./usr/X11R6/include/xorg/afb.h
-./usr/X11R6/include/xorg/assyntax.h
-./usr/X11R6/include/xorg/atKeynames.h
./usr/X11R6/include/xorg/bstore.h
./usr/X11R6/include/xorg/bstorestr.h
./usr/X11R6/include/xorg/bt829.h
-./usr/X11R6/include/xorg/cfb.h
-./usr/X11R6/include/xorg/cfb16.h
-./usr/X11R6/include/xorg/cfb32.h
./usr/X11R6/include/xorg/cfb8_16.h
-./usr/X11R6/include/xorg/cfb8_32.h
-./usr/X11R6/include/xorg/cfbmap.h
-./usr/X11R6/include/xorg/cfbmskbits.h
-./usr/X11R6/include/xorg/cfbunmap.h
./usr/X11R6/include/xorg/closestr.h
./usr/X11R6/include/xorg/closure.h
./usr/X11R6/include/xorg/colormap.h
@@ -51,7 +39,6 @@
./usr/X11R6/include/xorg/fb.h
./usr/X11R6/include/xorg/fbdevhw.h
./usr/X11R6/include/xorg/fboverlay.h
-./usr/X11R6/include/xorg/fbpseudocolor.h
./usr/X11R6/include/xorg/fbrop.h
./usr/X11R6/include/xorg/fi1236.h
./usr/X11R6/include/xorg/fourcc.h
@@ -62,9 +49,6 @@
./usr/X11R6/include/xorg/i2c_def.h
./usr/X11R6/include/xorg/input.h
./usr/X11R6/include/xorg/inputstr.h
-./usr/X11R6/include/xorg/mfb.h
-./usr/X11R6/include/xorg/mfbmap.h
-./usr/X11R6/include/xorg/mfbunmap.h
./usr/X11R6/include/xorg/mi.h
./usr/X11R6/include/xorg/mibank.h
./usr/X11R6/include/xorg/mibstore.h
@@ -121,13 +105,10 @@
./usr/X11R6/include/xorg/xaaWrapper.h
./usr/X11R6/include/xorg/xaalocal.h
./usr/X11R6/include/xorg/xaarop.h
-./usr/X11R6/include/xorg/xf1bpp.h
-./usr/X11R6/include/xorg/xf4bpp.h
./usr/X11R6/include/xorg/xf86.h
./usr/X11R6/include/xorg/xf86Cursor.h
./usr/X11R6/include/xorg/xf86DDC.h
./usr/X11R6/include/xorg/xf86Module.h
-./usr/X11R6/include/xorg/xf86OSmouse.h
./usr/X11R6/include/xorg/xf86Opt.h
./usr/X11R6/include/xorg/xf86Pci.h
./usr/X11R6/include/xorg/xf86PciInfo.h
@@ -136,7 +117,6 @@
./usr/X11R6/include/xorg/xf86RAC.h
./usr/X11R6/include/xorg/xf86RamDac.h
./usr/X11R6/include/xorg/xf86Resources.h
-./usr/X11R6/include/xorg/xf86Version.h
./usr/X11R6/include/xorg/xf86Xinput.h
./usr/X11R6/include/xorg/xf86_OSlib.h
./usr/X11R6/include/xorg/xf86_OSproc.h
@@ -180,12 +160,12 @@
./usr/X11R6/lib/modules/extensions/libdbe.so
./usr/X11R6/lib/modules/extensions/libdri.la
./usr/X11R6/lib/modules/extensions/libdri.so
+./usr/X11R6/lib/modules/extensions/libdri2.la
+./usr/X11R6/lib/modules/extensions/libdri2.so
./usr/X11R6/lib/modules/extensions/libextmod.la
./usr/X11R6/lib/modules/extensions/libextmod.so
./usr/X11R6/lib/modules/extensions/libglx.la
./usr/X11R6/lib/modules/extensions/libglx.so
-./usr/X11R6/lib/modules/fonts/libfreetype.la
-./usr/X11R6/lib/modules/fonts/libfreetype.so
./usr/X11R6/lib/modules/input/acecad_drv.la
./usr/X11R6/lib/modules/input/acecad_drv.so
./usr/X11R6/lib/modules/input/citron_drv.la
@@ -212,20 +192,12 @@
./usr/X11R6/lib/modules/input/void_drv.so
./usr/X11R6/lib/modules/input/ws_drv.la
./usr/X11R6/lib/modules/input/ws_drv.so
-./usr/X11R6/lib/modules/libafb.la
-./usr/X11R6/lib/modules/libafb.so
-./usr/X11R6/lib/modules/libcfb.la
-./usr/X11R6/lib/modules/libcfb.so
-./usr/X11R6/lib/modules/libcfb32.la
-./usr/X11R6/lib/modules/libcfb32.so
./usr/X11R6/lib/modules/libexa.la
./usr/X11R6/lib/modules/libexa.so
./usr/X11R6/lib/modules/libfb.la
./usr/X11R6/lib/modules/libfb.so
./usr/X11R6/lib/modules/libint10.la
./usr/X11R6/lib/modules/libint10.so
-./usr/X11R6/lib/modules/libmfb.la
-./usr/X11R6/lib/modules/libmfb.so
./usr/X11R6/lib/modules/libshadow.la
./usr/X11R6/lib/modules/libshadow.so
./usr/X11R6/lib/modules/libshadowfb.la
@@ -238,14 +210,8 @@
./usr/X11R6/lib/modules/libwfb.so
./usr/X11R6/lib/modules/libxaa.la
./usr/X11R6/lib/modules/libxaa.so
-./usr/X11R6/lib/modules/libxf1bpp.la
-./usr/X11R6/lib/modules/libxf1bpp.so
-./usr/X11R6/lib/modules/libxf4bpp.la
-./usr/X11R6/lib/modules/libxf4bpp.so
./usr/X11R6/lib/modules/libxf8_16bpp.la
./usr/X11R6/lib/modules/libxf8_16bpp.so
-./usr/X11R6/lib/modules/libxf8_32bpp.la
-./usr/X11R6/lib/modules/libxf8_32bpp.so
./usr/X11R6/lib/modules/linux/libfbdevhw.la
./usr/X11R6/lib/modules/linux/libfbdevhw.so
./usr/X11R6/lib/modules/multimedia/bt829_drv.la
@@ -270,13 +236,11 @@
./usr/X11R6/lib/modules/multimedia/uda1380_drv.so
./usr/X11R6/lib/pkgconfig/xorg-server.pc
./usr/X11R6/man/man1/Xephyr.1
-./usr/X11R6/man/man1/Xnest.1
./usr/X11R6/man/man1/Xorg.1
./usr/X11R6/man/man1/Xserver.1
./usr/X11R6/man/man1/Xvfb.1
./usr/X11R6/man/man1/cvt.1
./usr/X11R6/man/man1/gtf.1
-./usr/X11R6/man/man1/xorgconfig.1
./usr/X11R6/man/man4/acecad.4
./usr/X11R6/man/man4/ati.4
./usr/X11R6/man/man4/citron.4
diff --git a/distrib/sets/lists/xserv/md.vax b/distrib/sets/lists/xserv/md.vax
index 6255936d2..cb30b04dd 100644
--- a/distrib/sets/lists/xserv/md.vax
+++ b/distrib/sets/lists/xserv/md.vax
@@ -1,7 +1,5 @@
-./usr/X11R6/bin/Xnest
./usr/X11R6/bin/Xvfb
./usr/X11R6/lib/pkgconfig/xorg-server.pc
-./usr/X11R6/man/man1/Xnest.1
./usr/X11R6/man/man1/Xserver.1
./usr/X11R6/man/man1/Xvfb.1
./usr/X11R6/man/man7/Xprint.7
diff --git a/distrib/sets/lists/xserv/md.zaurus b/distrib/sets/lists/xserv/md.zaurus
index 03d3e598e..4f0de2142 100644
--- a/distrib/sets/lists/xserv/md.zaurus
+++ b/distrib/sets/lists/xserv/md.zaurus
@@ -1,30 +1,18 @@
./usr/X11R6/bin/X
./usr/X11R6/bin/Xephyr
-./usr/X11R6/bin/Xnest
./usr/X11R6/bin/Xorg
./usr/X11R6/bin/Xvfb
./usr/X11R6/bin/cvt
./usr/X11R6/bin/gtf
-./usr/X11R6/bin/xorgconfig
./usr/X11R6/include/xorg
./usr/X11R6/include/xorg/BT.h
./usr/X11R6/include/xorg/IBM.h
./usr/X11R6/include/xorg/TI.h
./usr/X11R6/include/xorg/XIstubs.h
-./usr/X11R6/include/xorg/afb.h
-./usr/X11R6/include/xorg/assyntax.h
-./usr/X11R6/include/xorg/atKeynames.h
./usr/X11R6/include/xorg/bstore.h
./usr/X11R6/include/xorg/bstorestr.h
./usr/X11R6/include/xorg/bt829.h
-./usr/X11R6/include/xorg/cfb.h
-./usr/X11R6/include/xorg/cfb16.h
-./usr/X11R6/include/xorg/cfb32.h
./usr/X11R6/include/xorg/cfb8_16.h
-./usr/X11R6/include/xorg/cfb8_32.h
-./usr/X11R6/include/xorg/cfbmap.h
-./usr/X11R6/include/xorg/cfbmskbits.h
-./usr/X11R6/include/xorg/cfbunmap.h
./usr/X11R6/include/xorg/closestr.h
./usr/X11R6/include/xorg/closure.h
./usr/X11R6/include/xorg/colormap.h
@@ -51,7 +39,6 @@
./usr/X11R6/include/xorg/fb.h
./usr/X11R6/include/xorg/fbdevhw.h
./usr/X11R6/include/xorg/fboverlay.h
-./usr/X11R6/include/xorg/fbpseudocolor.h
./usr/X11R6/include/xorg/fbrop.h
./usr/X11R6/include/xorg/fi1236.h
./usr/X11R6/include/xorg/fourcc.h
@@ -62,9 +49,6 @@
./usr/X11R6/include/xorg/i2c_def.h
./usr/X11R6/include/xorg/input.h
./usr/X11R6/include/xorg/inputstr.h
-./usr/X11R6/include/xorg/mfb.h
-./usr/X11R6/include/xorg/mfbmap.h
-./usr/X11R6/include/xorg/mfbunmap.h
./usr/X11R6/include/xorg/mi.h
./usr/X11R6/include/xorg/mibank.h
./usr/X11R6/include/xorg/mibstore.h
@@ -121,13 +105,10 @@
./usr/X11R6/include/xorg/xaaWrapper.h
./usr/X11R6/include/xorg/xaalocal.h
./usr/X11R6/include/xorg/xaarop.h
-./usr/X11R6/include/xorg/xf1bpp.h
-./usr/X11R6/include/xorg/xf4bpp.h
./usr/X11R6/include/xorg/xf86.h
./usr/X11R6/include/xorg/xf86Cursor.h
./usr/X11R6/include/xorg/xf86DDC.h
./usr/X11R6/include/xorg/xf86Module.h
-./usr/X11R6/include/xorg/xf86OSmouse.h
./usr/X11R6/include/xorg/xf86Opt.h
./usr/X11R6/include/xorg/xf86Pci.h
./usr/X11R6/include/xorg/xf86PciInfo.h
@@ -136,7 +117,6 @@
./usr/X11R6/include/xorg/xf86RAC.h
./usr/X11R6/include/xorg/xf86RamDac.h
./usr/X11R6/include/xorg/xf86Resources.h
-./usr/X11R6/include/xorg/xf86Version.h
./usr/X11R6/include/xorg/xf86Xinput.h
./usr/X11R6/include/xorg/xf86_OSlib.h
./usr/X11R6/include/xorg/xf86_OSproc.h
@@ -161,12 +141,12 @@
./usr/X11R6/lib/modules/extensions/libdbe.so
./usr/X11R6/lib/modules/extensions/libdri.la
./usr/X11R6/lib/modules/extensions/libdri.so
+./usr/X11R6/lib/modules/extensions/libdri2.la
+./usr/X11R6/lib/modules/extensions/libdri2.so
./usr/X11R6/lib/modules/extensions/libextmod.la
./usr/X11R6/lib/modules/extensions/libextmod.so
./usr/X11R6/lib/modules/extensions/libglx.la
./usr/X11R6/lib/modules/extensions/libglx.so
-./usr/X11R6/lib/modules/fonts/libfreetype.la
-./usr/X11R6/lib/modules/fonts/libfreetype.so
./usr/X11R6/lib/modules/input/kbd_drv.la
./usr/X11R6/lib/modules/input/kbd_drv.so
./usr/X11R6/lib/modules/input/mouse_drv.la
@@ -177,20 +157,12 @@
./usr/X11R6/lib/modules/input/void_drv.so
./usr/X11R6/lib/modules/input/ws_drv.la
./usr/X11R6/lib/modules/input/ws_drv.so
-./usr/X11R6/lib/modules/libafb.la
-./usr/X11R6/lib/modules/libafb.so
-./usr/X11R6/lib/modules/libcfb.la
-./usr/X11R6/lib/modules/libcfb.so
-./usr/X11R6/lib/modules/libcfb32.la
-./usr/X11R6/lib/modules/libcfb32.so
./usr/X11R6/lib/modules/libexa.la
./usr/X11R6/lib/modules/libexa.so
./usr/X11R6/lib/modules/libfb.la
./usr/X11R6/lib/modules/libfb.so
./usr/X11R6/lib/modules/libint10.la
./usr/X11R6/lib/modules/libint10.so
-./usr/X11R6/lib/modules/libmfb.la
-./usr/X11R6/lib/modules/libmfb.so
./usr/X11R6/lib/modules/libshadow.la
./usr/X11R6/lib/modules/libshadow.so
./usr/X11R6/lib/modules/libshadowfb.la
@@ -203,14 +175,8 @@
./usr/X11R6/lib/modules/libwfb.so
./usr/X11R6/lib/modules/libxaa.la
./usr/X11R6/lib/modules/libxaa.so
-./usr/X11R6/lib/modules/libxf1bpp.la
-./usr/X11R6/lib/modules/libxf1bpp.so
-./usr/X11R6/lib/modules/libxf4bpp.la
-./usr/X11R6/lib/modules/libxf4bpp.so
./usr/X11R6/lib/modules/libxf8_16bpp.la
./usr/X11R6/lib/modules/libxf8_16bpp.so
-./usr/X11R6/lib/modules/libxf8_32bpp.la
-./usr/X11R6/lib/modules/libxf8_32bpp.so
./usr/X11R6/lib/modules/linux/libfbdevhw.la
./usr/X11R6/lib/modules/linux/libfbdevhw.so
./usr/X11R6/lib/modules/multimedia/bt829_drv.la
@@ -229,13 +195,11 @@
./usr/X11R6/lib/modules/multimedia/uda1380_drv.so
./usr/X11R6/lib/pkgconfig/xorg-server.pc
./usr/X11R6/man/man1/Xephyr.1
-./usr/X11R6/man/man1/Xnest.1
./usr/X11R6/man/man1/Xorg.1
./usr/X11R6/man/man1/Xserver.1
./usr/X11R6/man/man1/Xvfb.1
./usr/X11R6/man/man1/cvt.1
./usr/X11R6/man/man1/gtf.1
-./usr/X11R6/man/man1/xorgconfig.1
./usr/X11R6/man/man4/exa.4
./usr/X11R6/man/man4/fbdevhw.4
./usr/X11R6/man/man4/kbd.4