sync

36 files changed, 201 insertions, 46 deletions

diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index 9b22fca1d..28a18c276 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -59,20 +59,28 @@
 ./usr/X11R6/include/xcb/xvmc.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
+./usr/X11R6/include/xorg/compositeext.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/events.h
+./usr/X11R6/include/xorg/fbpict.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/list.h
+./usr/X11R6/include/xorg/mioverlay.h
+./usr/X11R6/include/xorg/panoramiX.h
+./usr/X11R6/include/xorg/panoramiXsrv.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/vidmodeproc.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/ws-properties.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
@@ -81,12 +89,13 @@
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86Rename.h
+./usr/X11R6/include/xorg/xf86VGAarbiter.h
+./usr/X11R6/include/xorg/xfixes.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
 ./usr/X11R6/lib/libGL.so.10.0
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 6317784d7..979c81ae9 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -60,20 +60,28 @@
 ./usr/X11R6/include/xcb/xvmc.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
+./usr/X11R6/include/xorg/compositeext.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/events.h
+./usr/X11R6/include/xorg/fbpict.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/list.h
+./usr/X11R6/include/xorg/mioverlay.h
+./usr/X11R6/include/xorg/panoramiX.h
+./usr/X11R6/include/xorg/panoramiXsrv.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/vidmodeproc.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/ws-properties.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
@@ -82,12 +90,13 @@
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86Rename.h
+./usr/X11R6/include/xorg/xf86VGAarbiter.h
+./usr/X11R6/include/xorg/xfixes.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
 ./usr/X11R6/lib/libGL.so.10.0
diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish
index f3b770878..cadcc3d1e 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -59,19 +59,27 @@
 ./usr/X11R6/include/xcb/xvmc.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
+./usr/X11R6/include/xorg/compositeext.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/events.h
+./usr/X11R6/include/xorg/fbpict.h
 ./usr/X11R6/include/xorg/geext.h
 ./usr/X11R6/include/xorg/geint.h
 ./usr/X11R6/include/xorg/hotplug.h
+./usr/X11R6/include/xorg/list.h
+./usr/X11R6/include/xorg/mioverlay.h
+./usr/X11R6/include/xorg/panoramiX.h
+./usr/X11R6/include/xorg/panoramiXsrv.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/vidmodeproc.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/ws-properties.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
@@ -80,12 +88,13 @@
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86Rename.h
+./usr/X11R6/include/xorg/xf86VGAarbiter.h
+./usr/X11R6/include/xorg/xfixes.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
 ./usr/X11R6/lib/libGL.so.10.0
diff --git a/distrib/sets/lists/xbase/md.hp300 b/distrib/sets/lists/xbase/md.hp300
index 4039690a9..d5913fd35 100644
--- a/distrib/sets/lists/xbase/md.hp300
+++ b/distrib/sets/lists/xbase/md.hp300
@@ -53,22 +53,31 @@
 ./usr/X11R6/include/xcb/xv.h
 ./usr/X11R6/include/xcb/xvmc.h
 ./usr/X11R6/include/xf86drmMode.h
+./usr/X11R6/include/xorg/compositeext.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/dri2.h
+./usr/X11R6/include/xorg/events.h
+./usr/X11R6/include/xorg/fbpict.h
 ./usr/X11R6/include/xorg/geext.h
 ./usr/X11R6/include/xorg/geint.h
 ./usr/X11R6/include/xorg/joystick-properties.h
+./usr/X11R6/include/xorg/list.h
+./usr/X11R6/include/xorg/mioverlay.h
+./usr/X11R6/include/xorg/panoramiX.h
+./usr/X11R6/include/xorg/panoramiXsrv.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/vidmodeproc.h
 ./usr/X11R6/include/xorg/ws-properties.h
+./usr/X11R6/include/xorg/xf86VGAarbiter.h
+./usr/X11R6/include/xorg/xfixes.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
 ./usr/X11R6/lib/libGL.so.10.0
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index f716ba6fc..23e02fceb 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -60,20 +60,28 @@
 ./usr/X11R6/include/xcb/xvmc.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
+./usr/X11R6/include/xorg/compositeext.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/events.h
+./usr/X11R6/include/xorg/fbpict.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/list.h
+./usr/X11R6/include/xorg/mioverlay.h
+./usr/X11R6/include/xorg/panoramiX.h
+./usr/X11R6/include/xorg/panoramiXsrv.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/vidmodeproc.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/ws-properties.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
@@ -82,12 +90,13 @@
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86Rename.h
+./usr/X11R6/include/xorg/xf86VGAarbiter.h
+./usr/X11R6/include/xorg/xfixes.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
 ./usr/X11R6/lib/libGL.so.10.0
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index 1d1ec6ad9..4f1650151 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -60,6 +60,16 @@
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
 ./usr/X11R6/include/xorg
+./usr/X11R6/include/xorg/compositeext.h
+./usr/X11R6/include/xorg/events.h
+./usr/X11R6/include/xorg/fbpict.h
+./usr/X11R6/include/xorg/list.h
+./usr/X11R6/include/xorg/mioverlay.h
+./usr/X11R6/include/xorg/panoramiX.h
+./usr/X11R6/include/xorg/panoramiXsrv.h
+./usr/X11R6/include/xorg/vidmodeproc.h
+./usr/X11R6/include/xorg/xf86VGAarbiter.h
+./usr/X11R6/include/xorg/xfixes.h
 ./usr/X11R6/lib/libFS.so.9.0
 ./usr/X11R6/lib/libGL.a
 ./usr/X11R6/lib/libGL.so.10.0
diff --git a/distrib/sets/lists/xbase/md.loongson b/distrib/sets/lists/xbase/md.loongson
index fc9a65f90..f71cdf11d 100644
--- a/distrib/sets/lists/xbase/md.loongson
+++ b/distrib/sets/lists/xbase/md.loongson
@@ -60,19 +60,27 @@
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
 ./usr/X11R6/include/xorg
+./usr/X11R6/include/xorg/compositeext.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/events.h
+./usr/X11R6/include/xorg/fbpict.h
 ./usr/X11R6/include/xorg/geext.h
 ./usr/X11R6/include/xorg/geint.h
 ./usr/X11R6/include/xorg/hotplug.h
+./usr/X11R6/include/xorg/list.h
+./usr/X11R6/include/xorg/mioverlay.h
+./usr/X11R6/include/xorg/panoramiX.h
+./usr/X11R6/include/xorg/panoramiXsrv.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/vidmodeproc.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/ws-properties.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
@@ -81,12 +89,13 @@
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86Rename.h
+./usr/X11R6/include/xorg/xf86VGAarbiter.h
+./usr/X11R6/include/xorg/xfixes.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
 ./usr/X11R6/lib/libGL.so.10.0
diff --git a/distrib/sets/lists/xbase/md.mac68k b/distrib/sets/lists/xbase/md.mac68k
index 68354dba5..59da81e57 100644
--- a/distrib/sets/lists/xbase/md.mac68k
+++ b/distrib/sets/lists/xbase/md.mac68k
@@ -54,16 +54,24 @@
 ./usr/X11R6/include/xcb/xv.h
 ./usr/X11R6/include/xcb/xvmc.h
 ./usr/X11R6/include/xf86drmMode.h
+./usr/X11R6/include/xorg/compositeext.h
 ./usr/X11R6/include/xorg/dixaccess.h
 ./usr/X11R6/include/xorg/dri2.h
+./usr/X11R6/include/xorg/events.h
+./usr/X11R6/include/xorg/fbpict.h
 ./usr/X11R6/include/xorg/geext.h
 ./usr/X11R6/include/xorg/geint.h
 ./usr/X11R6/include/xorg/hotplug.h
+./usr/X11R6/include/xorg/list.h
+./usr/X11R6/include/xorg/mioverlay.h
+./usr/X11R6/include/xorg/panoramiX.h
+./usr/X11R6/include/xorg/panoramiXsrv.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/vidmodeproc.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/ws-properties.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
@@ -72,6 +80,8 @@
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86Rename.h
+./usr/X11R6/include/xorg/xf86VGAarbiter.h
+./usr/X11R6/include/xorg/xfixes.h
 ./usr/X11R6/include/xorg/xkbfile.h
 ./usr/X11R6/include/xorg/xkbrules.h
 ./usr/X11R6/include/xorg/xkbsrv.h
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index afa0741b5..e623d5e4b 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -59,20 +59,28 @@
 ./usr/X11R6/include/xcb/xvmc.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
+./usr/X11R6/include/xorg/compositeext.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/events.h
+./usr/X11R6/include/xorg/fbpict.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/list.h
+./usr/X11R6/include/xorg/mioverlay.h
+./usr/X11R6/include/xorg/panoramiX.h
+./usr/X11R6/include/xorg/panoramiXsrv.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/vidmodeproc.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/ws-properties.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
@@ -81,12 +89,13 @@
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86Rename.h
+./usr/X11R6/include/xorg/xf86VGAarbiter.h
+./usr/X11R6/include/xorg/xfixes.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
 ./usr/X11R6/lib/libGL.so.10.0
diff --git a/distrib/sets/lists/xbase/md.mvme68k b/distrib/sets/lists/xbase/md.mvme68k
index 27fb3ea2b..42ebd1774 100644
--- a/distrib/sets/lists/xbase/md.mvme68k
+++ b/distrib/sets/lists/xbase/md.mvme68k
@@ -59,6 +59,16 @@
 ./usr/X11R6/include/xcb/xvmc.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
+./usr/X11R6/include/xorg/compositeext.h
+./usr/X11R6/include/xorg/events.h
+./usr/X11R6/include/xorg/fbpict.h
+./usr/X11R6/include/xorg/list.h
+./usr/X11R6/include/xorg/mioverlay.h
+./usr/X11R6/include/xorg/panoramiX.h
+./usr/X11R6/include/xorg/panoramiXsrv.h
+./usr/X11R6/include/xorg/vidmodeproc.h
+./usr/X11R6/include/xorg/xf86VGAarbiter.h
+./usr/X11R6/include/xorg/xfixes.h
 ./usr/X11R6/lib/libFS.so.9.0
 ./usr/X11R6/lib/libGL.a
 ./usr/X11R6/lib/libGL.so.10.0
diff --git a/distrib/sets/lists/xbase/md.mvme88k b/distrib/sets/lists/xbase/md.mvme88k
index a79f567ac..1dac47c06 100644
--- a/distrib/sets/lists/xbase/md.mvme88k
+++ b/distrib/sets/lists/xbase/md.mvme88k
@@ -1,10 +1,20 @@
 ./usr/X11R6/bin/ucs2any
+./usr/X11R6/include/xorg/compositeext.h
+./usr/X11R6/include/xorg/events.h
+./usr/X11R6/include/xorg/fbpict.h
 ./usr/X11R6/include/xorg/geext.h
 ./usr/X11R6/include/xorg/geint.h
+./usr/X11R6/include/xorg/list.h
+./usr/X11R6/include/xorg/mioverlay.h
+./usr/X11R6/include/xorg/panoramiX.h
+./usr/X11R6/include/xorg/panoramiXsrv.h
 ./usr/X11R6/include/xorg/ptrveloc.h
 ./usr/X11R6/include/xorg/rrtransform.h
 ./usr/X11R6/include/xorg/shmint.h
+./usr/X11R6/include/xorg/vidmodeproc.h
 ./usr/X11R6/include/xorg/ws-properties.h
+./usr/X11R6/include/xorg/xf86VGAarbiter.h
+./usr/X11R6/include/xorg/xfixes.h
 ./usr/X11R6/include/xorg/xkbrules.h
 ./usr/X11R6/include/xorg/xserver-properties.h
 ./usr/X11R6/lib/xorg/protocol.txt
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index 33519fdc7..6d31dbdff 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -60,19 +60,27 @@
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
 ./usr/X11R6/include/xorg
+./usr/X11R6/include/xorg/compositeext.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/events.h
+./usr/X11R6/include/xorg/fbpict.h
 ./usr/X11R6/include/xorg/geext.h
 ./usr/X11R6/include/xorg/geint.h
 ./usr/X11R6/include/xorg/hotplug.h
+./usr/X11R6/include/xorg/list.h
+./usr/X11R6/include/xorg/mioverlay.h
+./usr/X11R6/include/xorg/panoramiX.h
+./usr/X11R6/include/xorg/panoramiXsrv.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/vidmodeproc.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/ws-properties.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
@@ -81,12 +89,13 @@
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86Rename.h
+./usr/X11R6/include/xorg/xf86VGAarbiter.h
+./usr/X11R6/include/xorg/xfixes.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
 ./usr/X11R6/lib/libGL.so.10.0
diff --git a/distrib/sets/lists/xbase/md.socppc b/distrib/sets/lists/xbase/md.socppc
index 733db94b0..41e14e791 100644
--- a/distrib/sets/lists/xbase/md.socppc
+++ b/distrib/sets/lists/xbase/md.socppc
@@ -59,19 +59,27 @@
 ./usr/X11R6/include/xcb/xvmc.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
+./usr/X11R6/include/xorg/compositeext.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/events.h
+./usr/X11R6/include/xorg/fbpict.h
 ./usr/X11R6/include/xorg/geext.h
 ./usr/X11R6/include/xorg/geint.h
 ./usr/X11R6/include/xorg/hotplug.h
+./usr/X11R6/include/xorg/list.h
+./usr/X11R6/include/xorg/mioverlay.h
+./usr/X11R6/include/xorg/panoramiX.h
+./usr/X11R6/include/xorg/panoramiXsrv.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/vidmodeproc.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/ws-properties.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
@@ -80,12 +88,13 @@
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86Rename.h
+./usr/X11R6/include/xorg/xf86VGAarbiter.h
+./usr/X11R6/include/xorg/xfixes.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
 ./usr/X11R6/lib/libGL.so.10.0
diff --git a/distrib/sets/lists/xbase/md.sparc b/distrib/sets/lists/xbase/md.sparc
index 733db94b0..41e14e791 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -59,19 +59,27 @@
 ./usr/X11R6/include/xcb/xvmc.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
+./usr/X11R6/include/xorg/compositeext.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/events.h
+./usr/X11R6/include/xorg/fbpict.h
 ./usr/X11R6/include/xorg/geext.h
 ./usr/X11R6/include/xorg/geint.h
 ./usr/X11R6/include/xorg/hotplug.h
+./usr/X11R6/include/xorg/list.h
+./usr/X11R6/include/xorg/mioverlay.h
+./usr/X11R6/include/xorg/panoramiX.h
+./usr/X11R6/include/xorg/panoramiXsrv.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/vidmodeproc.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/ws-properties.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
@@ -80,12 +88,13 @@
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86Rename.h
+./usr/X11R6/include/xorg/xf86VGAarbiter.h
+./usr/X11R6/include/xorg/xfixes.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
 ./usr/X11R6/lib/libGL.so.10.0
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index 183dbb71f..cdfec105d 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -59,20 +59,28 @@
 ./usr/X11R6/include/xcb/xvmc.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
+./usr/X11R6/include/xorg/compositeext.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/events.h
+./usr/X11R6/include/xorg/fbpict.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/list.h
+./usr/X11R6/include/xorg/mioverlay.h
+./usr/X11R6/include/xorg/panoramiX.h
+./usr/X11R6/include/xorg/panoramiXsrv.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/vidmodeproc.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/ws-properties.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
@@ -81,12 +89,13 @@
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86Rename.h
+./usr/X11R6/include/xorg/xf86VGAarbiter.h
+./usr/X11R6/include/xorg/xfixes.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
 ./usr/X11R6/lib/libGL.so.10.0
diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus
index f3b770878..cadcc3d1e 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -59,19 +59,27 @@
 ./usr/X11R6/include/xcb/xvmc.h
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
+./usr/X11R6/include/xorg/compositeext.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/events.h
+./usr/X11R6/include/xorg/fbpict.h
 ./usr/X11R6/include/xorg/geext.h
 ./usr/X11R6/include/xorg/geint.h
 ./usr/X11R6/include/xorg/hotplug.h
+./usr/X11R6/include/xorg/list.h
+./usr/X11R6/include/xorg/mioverlay.h
+./usr/X11R6/include/xorg/panoramiX.h
+./usr/X11R6/include/xorg/panoramiXsrv.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/vidmodeproc.h
 ./usr/X11R6/include/xorg/wfbrename.h
 ./usr/X11R6/include/xorg/ws-properties.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
@@ -80,12 +88,13 @@
 ./usr/X11R6/include/xorg/xf86Parser.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86Rename.h
+./usr/X11R6/include/xorg/xf86VGAarbiter.h
+./usr/X11R6/include/xorg/xfixes.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
 ./usr/X11R6/lib/libGL.so.10.0
diff --git a/distrib/sets/lists/xbase/mi b/distrib/sets/lists/xbase/mi
index 458d2163a..4563c475d 100644
--- a/distrib/sets/lists/xbase/mi
+++ b/distrib/sets/lists/xbase/mi
@@ -454,6 +454,7 @@
 ./usr/X11R6/bin/sxpm
 ./usr/X11R6/bin/twm
 ./usr/X11R6/bin/uxterm
+./usr/X11R6/bin/video
 ./usr/X11R6/bin/viewres
 ./usr/X11R6/bin/x11perf
 ./usr/X11R6/bin/xauth
diff --git a/distrib/sets/lists/xfont/md.x11r7 b/distrib/sets/lists/xfont/md.x11r7
index c821ea556..44ab65c53 100644
--- a/distrib/sets/lists/xfont/md.x11r7
+++ b/distrib/sets/lists/xfont/md.x11r7
@@ -465,7 +465,6 @@
 ./usr/X11R6/lib/X11/fonts/100dpi/courR24.pcf.gz
 ./usr/X11R6/lib/X11/fonts/100dpi/fonts.alias
 ./usr/X11R6/lib/X11/fonts/100dpi/fonts.dir
-./usr/X11R6/lib/X11/fonts/100dpi/fonts.scale
 ./usr/X11R6/lib/X11/fonts/100dpi/helvB08-ISO8859-1.pcf.gz
 ./usr/X11R6/lib/X11/fonts/100dpi/helvB08-ISO8859-10.pcf.gz
 ./usr/X11R6/lib/X11/fonts/100dpi/helvB08-ISO8859-13.pcf.gz
@@ -2363,7 +2362,6 @@
 ./usr/X11R6/lib/X11/fonts/75dpi/courR24.pcf.gz
 ./usr/X11R6/lib/X11/fonts/75dpi/fonts.alias
 ./usr/X11R6/lib/X11/fonts/75dpi/fonts.dir
-./usr/X11R6/lib/X11/fonts/75dpi/fonts.scale
 ./usr/X11R6/lib/X11/fonts/75dpi/helvB08-ISO8859-1.pcf.gz
 ./usr/X11R6/lib/X11/fonts/75dpi/helvB08-ISO8859-10.pcf.gz
 ./usr/X11R6/lib/X11/fonts/75dpi/helvB08-ISO8859-13.pcf.gz
@@ -3980,7 +3978,6 @@
 ./usr/X11R6/lib/X11/fonts/cyrillic/crox6to.pcf.gz
 ./usr/X11R6/lib/X11/fonts/cyrillic/fonts.alias
 ./usr/X11R6/lib/X11/fonts/cyrillic/fonts.dir
-./usr/X11R6/lib/X11/fonts/cyrillic/fonts.scale
 ./usr/X11R6/lib/X11/fonts/cyrillic/koi10x16b.pcf.gz
 ./usr/X11R6/lib/X11/fonts/cyrillic/koi10x20.pcf.gz
 ./usr/X11R6/lib/X11/fonts/cyrillic/koi12x24.pcf.gz
@@ -4452,7 +4449,6 @@
 ./usr/X11R6/lib/X11/fonts/misc/decsess.pcf.gz
 ./usr/X11R6/lib/X11/fonts/misc/fonts.alias
 ./usr/X11R6/lib/X11/fonts/misc/fonts.dir
-./usr/X11R6/lib/X11/fonts/misc/fonts.scale
 ./usr/X11R6/lib/X11/fonts/misc/gb16fs.pcf.gz
 ./usr/X11R6/lib/X11/fonts/misc/gb16st.pcf.gz
 ./usr/X11R6/lib/X11/fonts/misc/gb24st.pcf.gz
diff --git a/distrib/sets/lists/xserv/md.alpha b/distrib/sets/lists/xserv/md.alpha
index ec9df9784..e96df1063 100644
--- a/distrib/sets/lists/xserv/md.alpha
+++ b/distrib/sets/lists/xserv/md.alpha
@@ -115,9 +115,7 @@
 ./usr/X11R6/include/xorg/xf86PciInfo.h
 ./usr/X11R6/include/xorg/xf86Priv.h
 ./usr/X11R6/include/xorg/xf86Privstr.h
-./usr/X11R6/include/xorg/xf86RAC.h
 ./usr/X11R6/include/xorg/xf86RamDac.h
-./usr/X11R6/include/xorg/xf86Resources.h
 ./usr/X11R6/include/xorg/xf86Xinput.h
 ./usr/X11R6/include/xorg/xf86_OSlib.h
 ./usr/X11R6/include/xorg/xf86_OSproc.h
@@ -200,6 +198,8 @@
 ./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/extensions/librecord.la
+./usr/X11R6/lib/modules/extensions/librecord.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
@@ -317,6 +317,7 @@
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
+./usr/X11R6/share/aclocal/xorg-macros.m4
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xserv/md.amd64 b/distrib/sets/lists/xserv/md.amd64
index 50b942e3c..aa7899448 100644
--- a/distrib/sets/lists/xserv/md.amd64
+++ b/distrib/sets/lists/xserv/md.amd64
@@ -115,9 +115,7 @@
 ./usr/X11R6/include/xorg/xf86PciInfo.h
 ./usr/X11R6/include/xorg/xf86Priv.h
 ./usr/X11R6/include/xorg/xf86Privstr.h
-./usr/X11R6/include/xorg/xf86RAC.h
 ./usr/X11R6/include/xorg/xf86RamDac.h
-./usr/X11R6/include/xorg/xf86Resources.h
 ./usr/X11R6/include/xorg/xf86Xinput.h
 ./usr/X11R6/include/xorg/xf86_OSlib.h
 ./usr/X11R6/include/xorg/xf86_OSproc.h
@@ -226,6 +224,8 @@
 ./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/extensions/librecord.la
+./usr/X11R6/lib/modules/extensions/librecord.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
@@ -350,6 +350,7 @@
 ./usr/X11R6/man/man4/wsudl.4
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
+./usr/X11R6/share/aclocal/xorg-macros.m4
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xserv/md.armish b/distrib/sets/lists/xserv/md.armish
index 0a95914d0..ace345c96 100644
--- a/distrib/sets/lists/xserv/md.armish
+++ b/distrib/sets/lists/xserv/md.armish
@@ -115,9 +115,7 @@
 ./usr/X11R6/include/xorg/xf86PciInfo.h
 ./usr/X11R6/include/xorg/xf86Priv.h
 ./usr/X11R6/include/xorg/xf86Privstr.h
-./usr/X11R6/include/xorg/xf86RAC.h
 ./usr/X11R6/include/xorg/xf86RamDac.h
-./usr/X11R6/include/xorg/xf86Resources.h
 ./usr/X11R6/include/xorg/xf86Xinput.h
 ./usr/X11R6/include/xorg/xf86_OSlib.h
 ./usr/X11R6/include/xorg/xf86_OSproc.h
@@ -150,6 +148,8 @@
 ./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/extensions/librecord.la
+./usr/X11R6/lib/modules/extensions/librecord.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
@@ -216,6 +216,7 @@
 ./usr/X11R6/man/man4/wsudl.4
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
+./usr/X11R6/share/aclocal/xorg-macros.m4
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xserv/md.hp300 b/distrib/sets/lists/xserv/md.hp300
index 372bc8dd8..a95a20771 100644
--- a/distrib/sets/lists/xserv/md.hp300
+++ b/distrib/sets/lists/xserv/md.hp300
@@ -119,11 +119,9 @@
 ./usr/X11R6/include/xorg/xf86PciInfo.h
 ./usr/X11R6/include/xorg/xf86Priv.h
 ./usr/X11R6/include/xorg/xf86Privstr.h
-./usr/X11R6/include/xorg/xf86RAC.h
 ./usr/X11R6/include/xorg/xf86RamDac.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86Rename.h
-./usr/X11R6/include/xorg/xf86Resources.h
 ./usr/X11R6/include/xorg/xf86Xinput.h
 ./usr/X11R6/include/xorg/xf86_OSlib.h
 ./usr/X11R6/include/xorg/xf86_OSproc.h
@@ -265,6 +263,7 @@
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
+./usr/X11R6/share/aclocal/xorg-macros.m4
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xserv/md.hppa b/distrib/sets/lists/xserv/md.hppa
index 133d02a9c..f05d64c3c 100644
--- a/distrib/sets/lists/xserv/md.hppa
+++ b/distrib/sets/lists/xserv/md.hppa
@@ -3,7 +3,6 @@
 ./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
@@ -65,6 +64,6 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/man/man7/Xprint.7
-./usr/X11R6/share/aclocal/xorg-server.m4
+./usr/X11R6/share/aclocal/xorg-macros.m4
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.i386 b/distrib/sets/lists/xserv/md.i386
index 5ba16cb88..d3c64b2af 100644
--- a/distrib/sets/lists/xserv/md.i386
+++ b/distrib/sets/lists/xserv/md.i386
@@ -115,9 +115,7 @@
 ./usr/X11R6/include/xorg/xf86PciInfo.h
 ./usr/X11R6/include/xorg/xf86Priv.h
 ./usr/X11R6/include/xorg/xf86Privstr.h
-./usr/X11R6/include/xorg/xf86RAC.h
 ./usr/X11R6/include/xorg/xf86RamDac.h
-./usr/X11R6/include/xorg/xf86Resources.h
 ./usr/X11R6/include/xorg/xf86Xinput.h
 ./usr/X11R6/include/xorg/xf86_OSlib.h
 ./usr/X11R6/include/xorg/xf86_OSproc.h
@@ -232,6 +230,8 @@
 ./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/extensions/librecord.la
+./usr/X11R6/lib/modules/extensions/librecord.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
@@ -358,6 +358,7 @@
 ./usr/X11R6/man/man4/wsudl.4
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
+./usr/X11R6/share/aclocal/xorg-macros.m4
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xserv/md.landisk b/distrib/sets/lists/xserv/md.landisk
index 95590756c..44b6fd986 100644
--- a/distrib/sets/lists/xserv/md.landisk
+++ b/distrib/sets/lists/xserv/md.landisk
@@ -3,5 +3,6 @@
 ./usr/X11R6/man/man1/Xephyr.1
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/man/man7/Xprint.7
+./usr/X11R6/share/aclocal/xorg-macros.m4
 ./var/db/xkb
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.loongson b/distrib/sets/lists/xserv/md.loongson
index 6fea89d79..b1e918bdb 100644
--- a/distrib/sets/lists/xserv/md.loongson
+++ b/distrib/sets/lists/xserv/md.loongson
@@ -114,9 +114,7 @@
 ./usr/X11R6/include/xorg/xf86PciInfo.h
 ./usr/X11R6/include/xorg/xf86Priv.h
 ./usr/X11R6/include/xorg/xf86Privstr.h
-./usr/X11R6/include/xorg/xf86RAC.h
 ./usr/X11R6/include/xorg/xf86RamDac.h
-./usr/X11R6/include/xorg/xf86Resources.h
 ./usr/X11R6/include/xorg/xf86Xinput.h
 ./usr/X11R6/include/xorg/xf86_OSlib.h
 ./usr/X11R6/include/xorg/xf86_OSproc.h
@@ -147,6 +145,8 @@
 ./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/extensions/librecord.la
+./usr/X11R6/lib/modules/extensions/librecord.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
@@ -212,6 +212,7 @@
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
+./usr/X11R6/share/aclocal/xorg-macros.m4
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xserv/md.mac68k b/distrib/sets/lists/xserv/md.mac68k
index 2426e3940..beed96981 100644
--- a/distrib/sets/lists/xserv/md.mac68k
+++ b/distrib/sets/lists/xserv/md.mac68k
@@ -112,9 +112,7 @@
 ./usr/X11R6/include/xorg/xf86PciInfo.h
 ./usr/X11R6/include/xorg/xf86Priv.h
 ./usr/X11R6/include/xorg/xf86Privstr.h
-./usr/X11R6/include/xorg/xf86RAC.h
 ./usr/X11R6/include/xorg/xf86RamDac.h
-./usr/X11R6/include/xorg/xf86Resources.h
 ./usr/X11R6/include/xorg/xf86Xinput.h
 ./usr/X11R6/include/xorg/xf86_OSlib.h
 ./usr/X11R6/include/xorg/xf86_OSproc.h
@@ -132,7 +130,6 @@
 ./usr/X11R6/include/xorg/xorgVersion.h
 ./usr/X11R6/include/xorg/xvdix.h
 ./usr/X11R6/include/xorg/xvmcext.h
-./usr/X11R6/lib/X11/Options
 ./usr/X11R6/lib/modules/drivers/wsfb_drv.la
 ./usr/X11R6/lib/modules/drivers/wsfb_drv.so
 ./usr/X11R6/lib/modules/extensions/libdbe.la
@@ -253,6 +250,7 @@
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
+./usr/X11R6/share/aclocal/xorg-macros.m4
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xserv/md.macppc b/distrib/sets/lists/xserv/md.macppc
index c2ee27ade..c3e572f18 100644
--- a/distrib/sets/lists/xserv/md.macppc
+++ b/distrib/sets/lists/xserv/md.macppc
@@ -115,9 +115,7 @@
 ./usr/X11R6/include/xorg/xf86PciInfo.h
 ./usr/X11R6/include/xorg/xf86Priv.h
 ./usr/X11R6/include/xorg/xf86Privstr.h
-./usr/X11R6/include/xorg/xf86RAC.h
 ./usr/X11R6/include/xorg/xf86RamDac.h
-./usr/X11R6/include/xorg/xf86Resources.h
 ./usr/X11R6/include/xorg/xf86Xinput.h
 ./usr/X11R6/include/xorg/xf86_OSlib.h
 ./usr/X11R6/include/xorg/xf86_OSproc.h
@@ -160,6 +158,8 @@
 ./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/extensions/librecord.la
+./usr/X11R6/lib/modules/extensions/librecord.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
@@ -259,6 +259,7 @@
 ./usr/X11R6/man/man4/wsudl.4
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
+./usr/X11R6/share/aclocal/xorg-macros.m4
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xserv/md.mvme68k b/distrib/sets/lists/xserv/md.mvme68k
index 0deb3ee65..ab63ad075 100644
--- a/distrib/sets/lists/xserv/md.mvme68k
+++ b/distrib/sets/lists/xserv/md.mvme68k
@@ -59,6 +59,7 @@
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
 ./usr/X11R6/man/man7/Xprint.7
+./usr/X11R6/share/aclocal/xorg-macros.m4
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xserv/md.mvme88k b/distrib/sets/lists/xserv/md.mvme88k
index f692ddcdb..08cae479a 100644
--- a/distrib/sets/lists/xserv/md.mvme88k
+++ b/distrib/sets/lists/xserv/md.mvme88k
@@ -5,6 +5,7 @@
 ./usr/X11R6/man/man1/Xnest.1
 ./usr/X11R6/man/man1/Xserver.1
 ./usr/X11R6/man/man1/Xvfb.1
+./usr/X11R6/share/aclocal/xorg-macros.m4
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xserv/md.sgi b/distrib/sets/lists/xserv/md.sgi
index b6bf66a41..f2f171c7b 100644
--- a/distrib/sets/lists/xserv/md.sgi
+++ b/distrib/sets/lists/xserv/md.sgi
@@ -112,9 +112,7 @@
 ./usr/X11R6/include/xorg/xf86PciInfo.h
 ./usr/X11R6/include/xorg/xf86Priv.h
 ./usr/X11R6/include/xorg/xf86Privstr.h
-./usr/X11R6/include/xorg/xf86RAC.h
 ./usr/X11R6/include/xorg/xf86RamDac.h
-./usr/X11R6/include/xorg/xf86Resources.h
 ./usr/X11R6/include/xorg/xf86Xinput.h
 ./usr/X11R6/include/xorg/xf86_OSlib.h
 ./usr/X11R6/include/xorg/xf86_OSproc.h
@@ -145,6 +143,8 @@
 ./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/extensions/librecord.la
+./usr/X11R6/lib/modules/extensions/librecord.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
@@ -208,6 +208,7 @@
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
+./usr/X11R6/share/aclocal/xorg-macros.m4
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xserv/md.socppc b/distrib/sets/lists/xserv/md.socppc
index 6e5546c1d..c25dae862 100644
--- a/distrib/sets/lists/xserv/md.socppc
+++ b/distrib/sets/lists/xserv/md.socppc
@@ -115,9 +115,7 @@
 ./usr/X11R6/include/xorg/xf86PciInfo.h
 ./usr/X11R6/include/xorg/xf86Priv.h
 ./usr/X11R6/include/xorg/xf86Privstr.h
-./usr/X11R6/include/xorg/xf86RAC.h
 ./usr/X11R6/include/xorg/xf86RamDac.h
-./usr/X11R6/include/xorg/xf86Resources.h
 ./usr/X11R6/include/xorg/xf86Xinput.h
 ./usr/X11R6/include/xorg/xf86_OSlib.h
 ./usr/X11R6/include/xorg/xf86_OSproc.h
@@ -148,6 +146,8 @@
 ./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/extensions/librecord.la
+./usr/X11R6/lib/modules/extensions/librecord.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
@@ -213,6 +213,7 @@
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
+./usr/X11R6/share/aclocal/xorg-macros.m4
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xserv/md.sparc b/distrib/sets/lists/xserv/md.sparc
index 3a7cdcdd6..e02abd792 100644
--- a/distrib/sets/lists/xserv/md.sparc
+++ b/distrib/sets/lists/xserv/md.sparc
@@ -112,9 +112,7 @@
 ./usr/X11R6/include/xorg/xf86PciInfo.h
 ./usr/X11R6/include/xorg/xf86Priv.h
 ./usr/X11R6/include/xorg/xf86Privstr.h
-./usr/X11R6/include/xorg/xf86RAC.h
 ./usr/X11R6/include/xorg/xf86RamDac.h
-./usr/X11R6/include/xorg/xf86Resources.h
 ./usr/X11R6/include/xorg/xf86Xinput.h
 ./usr/X11R6/include/xorg/xf86_OSlib.h
 ./usr/X11R6/include/xorg/xf86_OSproc.h
@@ -145,6 +143,8 @@
 ./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/extensions/librecord.la
+./usr/X11R6/lib/modules/extensions/librecord.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
@@ -207,6 +207,7 @@
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
+./usr/X11R6/share/aclocal/xorg-macros.m4
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xserv/md.sparc64 b/distrib/sets/lists/xserv/md.sparc64
index 4cd6977d4..041a6a417 100644
--- a/distrib/sets/lists/xserv/md.sparc64
+++ b/distrib/sets/lists/xserv/md.sparc64
@@ -115,9 +115,7 @@
 ./usr/X11R6/include/xorg/xf86PciInfo.h
 ./usr/X11R6/include/xorg/xf86Priv.h
 ./usr/X11R6/include/xorg/xf86Privstr.h
-./usr/X11R6/include/xorg/xf86RAC.h
 ./usr/X11R6/include/xorg/xf86RamDac.h
-./usr/X11R6/include/xorg/xf86Resources.h
 ./usr/X11R6/include/xorg/xf86Xinput.h
 ./usr/X11R6/include/xorg/xf86_OSlib.h
 ./usr/X11R6/include/xorg/xf86_OSproc.h
@@ -162,6 +160,8 @@
 ./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/extensions/librecord.la
+./usr/X11R6/lib/modules/extensions/librecord.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
@@ -262,6 +262,7 @@
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
+./usr/X11R6/share/aclocal/xorg-macros.m4
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xserv/md.zaurus b/distrib/sets/lists/xserv/md.zaurus
index 6e5546c1d..c25dae862 100644
--- a/distrib/sets/lists/xserv/md.zaurus
+++ b/distrib/sets/lists/xserv/md.zaurus
@@ -115,9 +115,7 @@
 ./usr/X11R6/include/xorg/xf86PciInfo.h
 ./usr/X11R6/include/xorg/xf86Priv.h
 ./usr/X11R6/include/xorg/xf86Privstr.h
-./usr/X11R6/include/xorg/xf86RAC.h
 ./usr/X11R6/include/xorg/xf86RamDac.h
-./usr/X11R6/include/xorg/xf86Resources.h
 ./usr/X11R6/include/xorg/xf86Xinput.h
 ./usr/X11R6/include/xorg/xf86_OSlib.h
 ./usr/X11R6/include/xorg/xf86_OSproc.h
@@ -148,6 +146,8 @@
 ./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/extensions/librecord.la
+./usr/X11R6/lib/modules/extensions/librecord.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
@@ -213,6 +213,7 @@
 ./usr/X11R6/man/man4/wsfb.4
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
+./usr/X11R6/share/aclocal/xorg-macros.m4
 ./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi
index d9977ba3b..3cb7ad9b3 100644
--- a/distrib/sets/lists/xshare/mi
+++ b/distrib/sets/lists/xshare/mi
@@ -913,6 +913,7 @@
 ./usr/X11R6/man/cat1/resize.0
 ./usr/X11R6/man/cat1/ssh-askpass.0
 ./usr/X11R6/man/cat1/uxterm.0
+./usr/X11R6/man/cat1/video.0
 ./usr/X11R6/man/cat1/xidle.0
 ./usr/X11R6/man/cat1/xpmroot.0
 ./usr/X11R6/man/cat1/xsystrace.0
@@ -2751,7 +2752,6 @@
 ./usr/X11R6/share/X11/rgb.txt
 ./usr/X11R6/share/aclocal
 ./usr/X11R6/share/aclocal/fontutil.m4
-./usr/X11R6/share/aclocal/xorg-macros.m4
 ./usr/X11R6/share/aclocal/xtrans.m4
 ./usr/X11R6/share/doc
 ./usr/X11R6/share/doc/compositeproto