summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
Diffstat (limited to 'distrib')
-rw-r--r--distrib/sets/lists/xbase/md.alpha4
-rw-r--r--distrib/sets/lists/xbase/md.amd644
-rw-r--r--distrib/sets/lists/xbase/md.armish4
-rw-r--r--distrib/sets/lists/xbase/md.hp3004
-rw-r--r--distrib/sets/lists/xbase/md.hppa4
-rw-r--r--distrib/sets/lists/xbase/md.i3864
-rw-r--r--distrib/sets/lists/xbase/md.landisk4
-rw-r--r--distrib/sets/lists/xbase/md.loongson4
-rw-r--r--distrib/sets/lists/xbase/md.luna88k4
-rw-r--r--distrib/sets/lists/xbase/md.macppc4
-rw-r--r--distrib/sets/lists/xbase/md.mvme68k4
-rw-r--r--distrib/sets/lists/xbase/md.mvme88k4
-rw-r--r--distrib/sets/lists/xbase/md.sgi4
-rw-r--r--distrib/sets/lists/xbase/md.socppc4
-rw-r--r--distrib/sets/lists/xbase/md.sparc4
-rw-r--r--distrib/sets/lists/xbase/md.sparc644
-rw-r--r--distrib/sets/lists/xbase/md.zaurus4
-rw-r--r--distrib/sets/lists/xserv/md.amd6418
-rw-r--r--distrib/sets/lists/xserv/md.armish17
-rw-r--r--distrib/sets/lists/xserv/md.hp30017
-rw-r--r--distrib/sets/lists/xserv/md.hppa17
-rw-r--r--distrib/sets/lists/xserv/md.i38618
-rw-r--r--distrib/sets/lists/xserv/md.loongson17
-rw-r--r--distrib/sets/lists/xserv/md.macppc17
-rw-r--r--distrib/sets/lists/xserv/md.sgi17
-rw-r--r--distrib/sets/lists/xserv/md.socppc17
-rw-r--r--distrib/sets/lists/xserv/md.sparc17
-rw-r--r--distrib/sets/lists/xserv/md.sparc6417
-rw-r--r--distrib/sets/lists/xserv/md.zaurus17
-rw-r--r--distrib/sets/lists/xshare/mi5
30 files changed, 63 insertions, 216 deletions
diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index 33f38ca78..cce9447e9 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -68,11 +68,11 @@
./usr/X11R6/lib/libdrm.so.3.2
./usr/X11R6/lib/libfontconfig.so.8.0
./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.19.0
+./usr/X11R6/lib/libfreetype.so.20.0
./usr/X11R6/lib/libpciaccess.so.1.1
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.28.0
+./usr/X11R6/lib/libpixman-1.so.30.0
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libxcb-atom.so.1.0
./usr/X11R6/lib/libxcb-aux.so.0.0
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index c92361468..ba2cac2ad 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -116,11 +116,11 @@
./usr/X11R6/lib/libdrm_intel.so.2.2
./usr/X11R6/lib/libfontconfig.so.8.0
./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.19.0
+./usr/X11R6/lib/libfreetype.so.20.0
./usr/X11R6/lib/libpciaccess.so.1.1
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.28.0
+./usr/X11R6/lib/libpixman-1.so.30.0
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libxcb-atom.so.1.0
./usr/X11R6/lib/libxcb-aux.so.0.0
diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish
index 1f4c451e6..a6dddeaee 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -106,11 +106,11 @@
./usr/X11R6/lib/libdrm.so.3.2
./usr/X11R6/lib/libfontconfig.so.8.0
./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.19.0
+./usr/X11R6/lib/libfreetype.so.20.0
./usr/X11R6/lib/libpciaccess.so.1.1
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.28.0
+./usr/X11R6/lib/libpixman-1.so.30.0
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libxcb-atom.so.1.0
./usr/X11R6/lib/libxcb-aux.so.0.0
diff --git a/distrib/sets/lists/xbase/md.hp300 b/distrib/sets/lists/xbase/md.hp300
index 27b8ac1ee..6cdab3709 100644
--- a/distrib/sets/lists/xbase/md.hp300
+++ b/distrib/sets/lists/xbase/md.hp300
@@ -96,11 +96,11 @@
./usr/X11R6/lib/libdrm.so.3.2
./usr/X11R6/lib/libfontconfig.so.8.0
./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.19.0
+./usr/X11R6/lib/libfreetype.so.20.0
./usr/X11R6/lib/libpciaccess.so.1.1
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.28.0
+./usr/X11R6/lib/libpixman-1.so.30.0
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libxcb-atom.so.1.0
./usr/X11R6/lib/libxcb-aux.so.0.0
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index f27b0bf46..22fd6f195 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -69,11 +69,11 @@
./usr/X11R6/lib/libdrm.so.3.2
./usr/X11R6/lib/libfontconfig.so.8.0
./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.19.0
+./usr/X11R6/lib/libfreetype.so.20.0
./usr/X11R6/lib/libpciaccess.so.1.1
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.28.0
+./usr/X11R6/lib/libpixman-1.so.30.0
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libxcb-atom.so.1.0
./usr/X11R6/lib/libxcb-aux.so.0.0
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index 77526c19b..1782a94b6 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -116,11 +116,11 @@
./usr/X11R6/lib/libdrm_intel.so.2.2
./usr/X11R6/lib/libfontconfig.so.8.0
./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.19.0
+./usr/X11R6/lib/libfreetype.so.20.0
./usr/X11R6/lib/libpciaccess.so.1.1
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.28.0
+./usr/X11R6/lib/libpixman-1.so.30.0
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libxcb-atom.so.1.0
./usr/X11R6/lib/libxcb-aux.so.0.0
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index 740b958ff..35e225d62 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -69,11 +69,11 @@
./usr/X11R6/lib/libdrm.so.3.2
./usr/X11R6/lib/libfontconfig.so.8.0
./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.19.0
+./usr/X11R6/lib/libfreetype.so.20.0
./usr/X11R6/lib/libpciaccess.so.1.1
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.28.0
+./usr/X11R6/lib/libpixman-1.so.30.0
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libxcb-atom.so.1.0
./usr/X11R6/lib/libxcb-aux.so.0.0
diff --git a/distrib/sets/lists/xbase/md.loongson b/distrib/sets/lists/xbase/md.loongson
index 545c339c8..3b37247b2 100644
--- a/distrib/sets/lists/xbase/md.loongson
+++ b/distrib/sets/lists/xbase/md.loongson
@@ -107,11 +107,11 @@
./usr/X11R6/lib/libdrm.so.3.2
./usr/X11R6/lib/libfontconfig.so.8.0
./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.19.0
+./usr/X11R6/lib/libfreetype.so.20.0
./usr/X11R6/lib/libpciaccess.so.1.1
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.28.0
+./usr/X11R6/lib/libpixman-1.so.30.0
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libxcb-atom.so.1.0
./usr/X11R6/lib/libxcb-aux.so.0.0
diff --git a/distrib/sets/lists/xbase/md.luna88k b/distrib/sets/lists/xbase/md.luna88k
index 0648bc214..9e649f515 100644
--- a/distrib/sets/lists/xbase/md.luna88k
+++ b/distrib/sets/lists/xbase/md.luna88k
@@ -68,11 +68,11 @@
./usr/X11R6/lib/libdrm.so.3.2
./usr/X11R6/lib/libfontconfig.so.8.0
./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.19.0
+./usr/X11R6/lib/libfreetype.so.20.0
./usr/X11R6/lib/libpciaccess.so.1.1
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.28.0
+./usr/X11R6/lib/libpixman-1.so.30.0
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libxcb-atom.so.1.0
./usr/X11R6/lib/libxcb-aux.so.0.0
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index ca48db266..c7d7b1604 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -107,11 +107,11 @@
./usr/X11R6/lib/libdrm.so.3.2
./usr/X11R6/lib/libfontconfig.so.8.0
./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.19.0
+./usr/X11R6/lib/libfreetype.so.20.0
./usr/X11R6/lib/libpciaccess.so.1.1
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.28.0
+./usr/X11R6/lib/libpixman-1.so.30.0
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libxcb-atom.so.1.0
./usr/X11R6/lib/libxcb-aux.so.0.0
diff --git a/distrib/sets/lists/xbase/md.mvme68k b/distrib/sets/lists/xbase/md.mvme68k
index 06fe1cfd0..b05196f77 100644
--- a/distrib/sets/lists/xbase/md.mvme68k
+++ b/distrib/sets/lists/xbase/md.mvme68k
@@ -68,11 +68,11 @@
./usr/X11R6/lib/libdrm.so.3.2
./usr/X11R6/lib/libfontconfig.so.8.0
./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.19.0
+./usr/X11R6/lib/libfreetype.so.20.0
./usr/X11R6/lib/libpciaccess.so.1.1
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.28.0
+./usr/X11R6/lib/libpixman-1.so.30.0
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libxcb-atom.so.1.0
./usr/X11R6/lib/libxcb-aux.so.0.0
diff --git a/distrib/sets/lists/xbase/md.mvme88k b/distrib/sets/lists/xbase/md.mvme88k
index 0648bc214..9e649f515 100644
--- a/distrib/sets/lists/xbase/md.mvme88k
+++ b/distrib/sets/lists/xbase/md.mvme88k
@@ -68,11 +68,11 @@
./usr/X11R6/lib/libdrm.so.3.2
./usr/X11R6/lib/libfontconfig.so.8.0
./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.19.0
+./usr/X11R6/lib/libfreetype.so.20.0
./usr/X11R6/lib/libpciaccess.so.1.1
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.28.0
+./usr/X11R6/lib/libpixman-1.so.30.0
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libxcb-atom.so.1.0
./usr/X11R6/lib/libxcb-aux.so.0.0
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index 50904cdb9..6b382a370 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -107,11 +107,11 @@
./usr/X11R6/lib/libdrm.so.3.2
./usr/X11R6/lib/libfontconfig.so.8.0
./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.19.0
+./usr/X11R6/lib/libfreetype.so.20.0
./usr/X11R6/lib/libpciaccess.so.1.1
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.28.0
+./usr/X11R6/lib/libpixman-1.so.30.0
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libxcb-atom.so.1.0
./usr/X11R6/lib/libxcb-aux.so.0.0
diff --git a/distrib/sets/lists/xbase/md.socppc b/distrib/sets/lists/xbase/md.socppc
index 5cbc47e0f..6fcf72695 100644
--- a/distrib/sets/lists/xbase/md.socppc
+++ b/distrib/sets/lists/xbase/md.socppc
@@ -106,11 +106,11 @@
./usr/X11R6/lib/libdrm.so.3.2
./usr/X11R6/lib/libfontconfig.so.8.0
./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.19.0
+./usr/X11R6/lib/libfreetype.so.20.0
./usr/X11R6/lib/libpciaccess.so.1.1
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.28.0
+./usr/X11R6/lib/libpixman-1.so.30.0
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libxcb-atom.so.1.0
./usr/X11R6/lib/libxcb-aux.so.0.0
diff --git a/distrib/sets/lists/xbase/md.sparc b/distrib/sets/lists/xbase/md.sparc
index 5cbc47e0f..6fcf72695 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -106,11 +106,11 @@
./usr/X11R6/lib/libdrm.so.3.2
./usr/X11R6/lib/libfontconfig.so.8.0
./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.19.0
+./usr/X11R6/lib/libfreetype.so.20.0
./usr/X11R6/lib/libpciaccess.so.1.1
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.28.0
+./usr/X11R6/lib/libpixman-1.so.30.0
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libxcb-atom.so.1.0
./usr/X11R6/lib/libxcb-aux.so.0.0
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index bb8d67632..4daef1d7e 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -107,11 +107,11 @@
./usr/X11R6/lib/libdrm.so.3.2
./usr/X11R6/lib/libfontconfig.so.8.0
./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.19.0
+./usr/X11R6/lib/libfreetype.so.20.0
./usr/X11R6/lib/libpciaccess.so.1.1
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.28.0
+./usr/X11R6/lib/libpixman-1.so.30.0
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libxcb-atom.so.1.0
./usr/X11R6/lib/libxcb-aux.so.0.0
diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus
index 1f4c451e6..a6dddeaee 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -106,11 +106,11 @@
./usr/X11R6/lib/libdrm.so.3.2
./usr/X11R6/lib/libfontconfig.so.8.0
./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.19.0
+./usr/X11R6/lib/libfreetype.so.20.0
./usr/X11R6/lib/libpciaccess.so.1.1
./usr/X11R6/lib/libpixman-1.a
./usr/X11R6/lib/libpixman-1.la
-./usr/X11R6/lib/libpixman-1.so.28.0
+./usr/X11R6/lib/libpixman-1.so.30.0
./usr/X11R6/lib/libpthread-stubs.so.1.0
./usr/X11R6/lib/libxcb-atom.so.1.0
./usr/X11R6/lib/libxcb-aux.so.0.0
diff --git a/distrib/sets/lists/xserv/md.amd64 b/distrib/sets/lists/xserv/md.amd64
index c6b6401ef..0d9c4eadb 100644
--- a/distrib/sets/lists/xserv/md.amd64
+++ b/distrib/sets/lists/xserv/md.amd64
@@ -54,12 +54,12 @@
./usr/X11R6/include/xorg/gc.h
./usr/X11R6/include/xorg/gcstruct.h
./usr/X11R6/include/xorg/globals.h
+./usr/X11R6/include/xorg/glx_extinit.h
./usr/X11R6/include/xorg/glyphstr.h
./usr/X11R6/include/xorg/i2c_def.h
./usr/X11R6/include/xorg/input.h
./usr/X11R6/include/xorg/inputstr.h
./usr/X11R6/include/xorg/mi.h
-./usr/X11R6/include/xorg/mibstore.h
./usr/X11R6/include/xorg/micmap.h
./usr/X11R6/include/xorg/micoord.h
./usr/X11R6/include/xorg/mifillarc.h
@@ -101,7 +101,6 @@
./usr/X11R6/include/xorg/swaprep.h
./usr/X11R6/include/xorg/swapreq.h
./usr/X11R6/include/xorg/synaptics-properties.h
-./usr/X11R6/include/xorg/synaptics.h
./usr/X11R6/include/xorg/syncsdk.h
./usr/X11R6/include/xorg/tda8425.h
./usr/X11R6/include/xorg/tda9850.h
@@ -113,8 +112,6 @@
./usr/X11R6/include/xorg/vgaHW.h
./usr/X11R6/include/xorg/window.h
./usr/X11R6/include/xorg/windowstr.h
-./usr/X11R6/include/xorg/xaa.h
-./usr/X11R6/include/xorg/xaalocal.h
./usr/X11R6/include/xorg/xaarop.h
./usr/X11R6/include/xorg/xace.h
./usr/X11R6/include/xorg/xacestr.h
@@ -136,6 +133,7 @@
./usr/X11R6/include/xorg/xf86fbman.h
./usr/X11R6/include/xorg/xf86i2c.h
./usr/X11R6/include/xorg/xf86int10.h
+./usr/X11R6/include/xorg/xf86platformBus.h
./usr/X11R6/include/xorg/xf86sbusBus.h
./usr/X11R6/include/xorg/xf86str.h
./usr/X11R6/include/xorg/xf86xv.h
@@ -218,18 +216,8 @@
./usr/X11R6/lib/modules/drivers/vmware_drv.so
./usr/X11R6/lib/modules/drivers/wsudl_drv.la
./usr/X11R6/lib/modules/drivers/wsudl_drv.so
-./usr/X11R6/lib/modules/extensions/libdbe.la
-./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/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/elographics_drv.la
@@ -276,8 +264,6 @@
./usr/X11R6/lib/modules/libvgahw.so
./usr/X11R6/lib/modules/libwfb.la
./usr/X11R6/lib/modules/libwfb.so
-./usr/X11R6/lib/modules/libxaa.la
-./usr/X11R6/lib/modules/libxaa.so
./usr/X11R6/lib/modules/multimedia/bt829_drv.la
./usr/X11R6/lib/modules/multimedia/bt829_drv.so
./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
diff --git a/distrib/sets/lists/xserv/md.armish b/distrib/sets/lists/xserv/md.armish
index 54bd7a821..7f0d83d58 100644
--- a/distrib/sets/lists/xserv/md.armish
+++ b/distrib/sets/lists/xserv/md.armish
@@ -46,12 +46,12 @@
./usr/X11R6/include/xorg/gc.h
./usr/X11R6/include/xorg/gcstruct.h
./usr/X11R6/include/xorg/globals.h
+./usr/X11R6/include/xorg/glx_extinit.h
./usr/X11R6/include/xorg/glyphstr.h
./usr/X11R6/include/xorg/i2c_def.h
./usr/X11R6/include/xorg/input.h
./usr/X11R6/include/xorg/inputstr.h
./usr/X11R6/include/xorg/mi.h
-./usr/X11R6/include/xorg/mibstore.h
./usr/X11R6/include/xorg/micmap.h
./usr/X11R6/include/xorg/micoord.h
./usr/X11R6/include/xorg/mifillarc.h
@@ -103,8 +103,6 @@
./usr/X11R6/include/xorg/vgaHW.h
./usr/X11R6/include/xorg/window.h
./usr/X11R6/include/xorg/windowstr.h
-./usr/X11R6/include/xorg/xaa.h
-./usr/X11R6/include/xorg/xaalocal.h
./usr/X11R6/include/xorg/xaarop.h
./usr/X11R6/include/xorg/xace.h
./usr/X11R6/include/xorg/xacestr.h
@@ -126,6 +124,7 @@
./usr/X11R6/include/xorg/xf86fbman.h
./usr/X11R6/include/xorg/xf86i2c.h
./usr/X11R6/include/xorg/xf86int10.h
+./usr/X11R6/include/xorg/xf86platformBus.h
./usr/X11R6/include/xorg/xf86sbusBus.h
./usr/X11R6/include/xorg/xf86str.h
./usr/X11R6/include/xorg/xf86xv.h
@@ -141,18 +140,8 @@
./usr/X11R6/lib/modules/drivers/wsfb_drv.so
./usr/X11R6/lib/modules/drivers/wsudl_drv.la
./usr/X11R6/lib/modules/drivers/wsudl_drv.so
-./usr/X11R6/lib/modules/extensions/libdbe.la
-./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/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
@@ -181,8 +170,6 @@
./usr/X11R6/lib/modules/libvgahw.so
./usr/X11R6/lib/modules/libwfb.la
./usr/X11R6/lib/modules/libwfb.so
-./usr/X11R6/lib/modules/libxaa.la
-./usr/X11R6/lib/modules/libxaa.so
./usr/X11R6/lib/modules/multimedia/bt829_drv.la
./usr/X11R6/lib/modules/multimedia/bt829_drv.so
./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
diff --git a/distrib/sets/lists/xserv/md.hp300 b/distrib/sets/lists/xserv/md.hp300
index 670fd3f0b..6d02563b2 100644
--- a/distrib/sets/lists/xserv/md.hp300
+++ b/distrib/sets/lists/xserv/md.hp300
@@ -45,13 +45,13 @@
./usr/X11R6/include/xorg/gc.h
./usr/X11R6/include/xorg/gcstruct.h
./usr/X11R6/include/xorg/globals.h
+./usr/X11R6/include/xorg/glx_extinit.h
./usr/X11R6/include/xorg/glyphstr.h
./usr/X11R6/include/xorg/hotplug.h
./usr/X11R6/include/xorg/i2c_def.h
./usr/X11R6/include/xorg/input.h
./usr/X11R6/include/xorg/inputstr.h
./usr/X11R6/include/xorg/mi.h
-./usr/X11R6/include/xorg/mibstore.h
./usr/X11R6/include/xorg/micmap.h
./usr/X11R6/include/xorg/micoord.h
./usr/X11R6/include/xorg/mifillarc.h
@@ -104,8 +104,6 @@
./usr/X11R6/include/xorg/wfbrename.h
./usr/X11R6/include/xorg/window.h
./usr/X11R6/include/xorg/windowstr.h
-./usr/X11R6/include/xorg/xaa.h
-./usr/X11R6/include/xorg/xaalocal.h
./usr/X11R6/include/xorg/xaarop.h
./usr/X11R6/include/xorg/xace.h
./usr/X11R6/include/xorg/xacestr.h
@@ -133,6 +131,7 @@
./usr/X11R6/include/xorg/xf86fbman.h
./usr/X11R6/include/xorg/xf86i2c.h
./usr/X11R6/include/xorg/xf86int10.h
+./usr/X11R6/include/xorg/xf86platformBus.h
./usr/X11R6/include/xorg/xf86sbusBus.h
./usr/X11R6/include/xorg/xf86str.h
./usr/X11R6/include/xorg/xf86xv.h
@@ -147,18 +146,8 @@
./usr/X11R6/lib/modules/dri/swrast_dri.so
./usr/X11R6/lib/modules/drivers/wsfb_drv.la
./usr/X11R6/lib/modules/drivers/wsfb_drv.so
-./usr/X11R6/lib/modules/extensions/libdbe.la
-./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/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
@@ -187,8 +176,6 @@
./usr/X11R6/lib/modules/libvgahw.so
./usr/X11R6/lib/modules/libwfb.la
./usr/X11R6/lib/modules/libwfb.so
-./usr/X11R6/lib/modules/libxaa.la
-./usr/X11R6/lib/modules/libxaa.so
./usr/X11R6/lib/modules/multimedia/bt829_drv.la
./usr/X11R6/lib/modules/multimedia/bt829_drv.so
./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
diff --git a/distrib/sets/lists/xserv/md.hppa b/distrib/sets/lists/xserv/md.hppa
index d610c9e80..0b677fe90 100644
--- a/distrib/sets/lists/xserv/md.hppa
+++ b/distrib/sets/lists/xserv/md.hppa
@@ -56,6 +56,7 @@
./usr/X11R6/include/xorg/geext.h
./usr/X11R6/include/xorg/geint.h
./usr/X11R6/include/xorg/globals.h
+./usr/X11R6/include/xorg/glx_extinit.h
./usr/X11R6/include/xorg/glyphstr.h
./usr/X11R6/include/xorg/hotplug.h
./usr/X11R6/include/xorg/i2c_def.h
@@ -63,7 +64,6 @@
./usr/X11R6/include/xorg/inputstr.h
./usr/X11R6/include/xorg/list.h
./usr/X11R6/include/xorg/mi.h
-./usr/X11R6/include/xorg/mibstore.h
./usr/X11R6/include/xorg/micmap.h
./usr/X11R6/include/xorg/micoord.h
./usr/X11R6/include/xorg/mifillarc.h
@@ -127,8 +127,6 @@
./usr/X11R6/include/xorg/window.h
./usr/X11R6/include/xorg/windowstr.h
./usr/X11R6/include/xorg/ws-properties.h
-./usr/X11R6/include/xorg/xaa.h
-./usr/X11R6/include/xorg/xaalocal.h
./usr/X11R6/include/xorg/xaarop.h
./usr/X11R6/include/xorg/xace.h
./usr/X11R6/include/xorg/xacestr.h
@@ -157,6 +155,7 @@
./usr/X11R6/include/xorg/xf86fbman.h
./usr/X11R6/include/xorg/xf86i2c.h
./usr/X11R6/include/xorg/xf86int10.h
+./usr/X11R6/include/xorg/xf86platformBus.h
./usr/X11R6/include/xorg/xf86sbusBus.h
./usr/X11R6/include/xorg/xf86str.h
./usr/X11R6/include/xorg/xf86xv.h
@@ -178,18 +177,8 @@
./usr/X11R6/lib/modules/drivers/wsfb_drv.so
./usr/X11R6/lib/modules/drivers/wsudl_drv.la
./usr/X11R6/lib/modules/drivers/wsudl_drv.so
-./usr/X11R6/lib/modules/extensions/libdbe.la
-./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/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
@@ -218,8 +207,6 @@
./usr/X11R6/lib/modules/libvgahw.so
./usr/X11R6/lib/modules/libwfb.la
./usr/X11R6/lib/modules/libwfb.so
-./usr/X11R6/lib/modules/libxaa.la
-./usr/X11R6/lib/modules/libxaa.so
./usr/X11R6/lib/modules/multimedia/bt829_drv.la
./usr/X11R6/lib/modules/multimedia/bt829_drv.so
./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
diff --git a/distrib/sets/lists/xserv/md.i386 b/distrib/sets/lists/xserv/md.i386
index d78a26136..5a594b691 100644
--- a/distrib/sets/lists/xserv/md.i386
+++ b/distrib/sets/lists/xserv/md.i386
@@ -54,12 +54,12 @@
./usr/X11R6/include/xorg/gc.h
./usr/X11R6/include/xorg/gcstruct.h
./usr/X11R6/include/xorg/globals.h
+./usr/X11R6/include/xorg/glx_extinit.h
./usr/X11R6/include/xorg/glyphstr.h
./usr/X11R6/include/xorg/i2c_def.h
./usr/X11R6/include/xorg/input.h
./usr/X11R6/include/xorg/inputstr.h
./usr/X11R6/include/xorg/mi.h
-./usr/X11R6/include/xorg/mibstore.h
./usr/X11R6/include/xorg/micmap.h
./usr/X11R6/include/xorg/micoord.h
./usr/X11R6/include/xorg/mifillarc.h
@@ -101,7 +101,6 @@
./usr/X11R6/include/xorg/swaprep.h
./usr/X11R6/include/xorg/swapreq.h
./usr/X11R6/include/xorg/synaptics-properties.h
-./usr/X11R6/include/xorg/synaptics.h
./usr/X11R6/include/xorg/syncsdk.h
./usr/X11R6/include/xorg/tda8425.h
./usr/X11R6/include/xorg/tda9850.h
@@ -113,8 +112,6 @@
./usr/X11R6/include/xorg/vgaHW.h
./usr/X11R6/include/xorg/window.h
./usr/X11R6/include/xorg/windowstr.h
-./usr/X11R6/include/xorg/xaa.h
-./usr/X11R6/include/xorg/xaalocal.h
./usr/X11R6/include/xorg/xaarop.h
./usr/X11R6/include/xorg/xace.h
./usr/X11R6/include/xorg/xacestr.h
@@ -136,6 +133,7 @@
./usr/X11R6/include/xorg/xf86fbman.h
./usr/X11R6/include/xorg/xf86i2c.h
./usr/X11R6/include/xorg/xf86int10.h
+./usr/X11R6/include/xorg/xf86platformBus.h
./usr/X11R6/include/xorg/xf86sbusBus.h
./usr/X11R6/include/xorg/xf86str.h
./usr/X11R6/include/xorg/xf86xv.h
@@ -224,18 +222,8 @@
./usr/X11R6/lib/modules/drivers/voodoo_drv.so
./usr/X11R6/lib/modules/drivers/wsudl_drv.la
./usr/X11R6/lib/modules/drivers/wsudl_drv.so
-./usr/X11R6/lib/modules/extensions/libdbe.la
-./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/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/elographics_drv.la
@@ -282,8 +270,6 @@
./usr/X11R6/lib/modules/libvgahw.so
./usr/X11R6/lib/modules/libwfb.la
./usr/X11R6/lib/modules/libwfb.so
-./usr/X11R6/lib/modules/libxaa.la
-./usr/X11R6/lib/modules/libxaa.so
./usr/X11R6/lib/modules/multimedia/bt829_drv.la
./usr/X11R6/lib/modules/multimedia/bt829_drv.so
./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
diff --git a/distrib/sets/lists/xserv/md.loongson b/distrib/sets/lists/xserv/md.loongson
index a5c6e8391..346c05bdd 100644
--- a/distrib/sets/lists/xserv/md.loongson
+++ b/distrib/sets/lists/xserv/md.loongson
@@ -45,12 +45,12 @@
./usr/X11R6/include/xorg/gc.h
./usr/X11R6/include/xorg/gcstruct.h
./usr/X11R6/include/xorg/globals.h
+./usr/X11R6/include/xorg/glx_extinit.h
./usr/X11R6/include/xorg/glyphstr.h
./usr/X11R6/include/xorg/i2c_def.h
./usr/X11R6/include/xorg/input.h
./usr/X11R6/include/xorg/inputstr.h
./usr/X11R6/include/xorg/mi.h
-./usr/X11R6/include/xorg/mibstore.h
./usr/X11R6/include/xorg/micmap.h
./usr/X11R6/include/xorg/micoord.h
./usr/X11R6/include/xorg/mifillarc.h
@@ -102,8 +102,6 @@
./usr/X11R6/include/xorg/vgaHW.h
./usr/X11R6/include/xorg/window.h
./usr/X11R6/include/xorg/windowstr.h
-./usr/X11R6/include/xorg/xaa.h
-./usr/X11R6/include/xorg/xaalocal.h
./usr/X11R6/include/xorg/xaarop.h
./usr/X11R6/include/xorg/xace.h
./usr/X11R6/include/xorg/xacestr.h
@@ -125,6 +123,7 @@
./usr/X11R6/include/xorg/xf86fbman.h
./usr/X11R6/include/xorg/xf86i2c.h
./usr/X11R6/include/xorg/xf86int10.h
+./usr/X11R6/include/xorg/xf86platformBus.h
./usr/X11R6/include/xorg/xf86sbusBus.h
./usr/X11R6/include/xorg/xf86str.h
./usr/X11R6/include/xorg/xf86xv.h
@@ -138,18 +137,8 @@
./usr/X11R6/lib/modules/dri/swrast_dri.so
./usr/X11R6/lib/modules/drivers/wsfb_drv.la
./usr/X11R6/lib/modules/drivers/wsfb_drv.so
-./usr/X11R6/lib/modules/extensions/libdbe.la
-./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/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
@@ -178,8 +167,6 @@
./usr/X11R6/lib/modules/libvgahw.so
./usr/X11R6/lib/modules/libwfb.la
./usr/X11R6/lib/modules/libwfb.so
-./usr/X11R6/lib/modules/libxaa.la
-./usr/X11R6/lib/modules/libxaa.so
./usr/X11R6/lib/modules/multimedia/bt829_drv.la
./usr/X11R6/lib/modules/multimedia/bt829_drv.so
./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
diff --git a/distrib/sets/lists/xserv/md.macppc b/distrib/sets/lists/xserv/md.macppc
index c12a5219c..ba210ba80 100644
--- a/distrib/sets/lists/xserv/md.macppc
+++ b/distrib/sets/lists/xserv/md.macppc
@@ -54,12 +54,12 @@
./usr/X11R6/include/xorg/gc.h
./usr/X11R6/include/xorg/gcstruct.h
./usr/X11R6/include/xorg/globals.h
+./usr/X11R6/include/xorg/glx_extinit.h
./usr/X11R6/include/xorg/glyphstr.h
./usr/X11R6/include/xorg/i2c_def.h
./usr/X11R6/include/xorg/input.h
./usr/X11R6/include/xorg/inputstr.h
./usr/X11R6/include/xorg/mi.h
-./usr/X11R6/include/xorg/mibstore.h
./usr/X11R6/include/xorg/micmap.h
./usr/X11R6/include/xorg/micoord.h
./usr/X11R6/include/xorg/mifillarc.h
@@ -111,8 +111,6 @@
./usr/X11R6/include/xorg/vgaHW.h
./usr/X11R6/include/xorg/window.h
./usr/X11R6/include/xorg/windowstr.h
-./usr/X11R6/include/xorg/xaa.h
-./usr/X11R6/include/xorg/xaalocal.h
./usr/X11R6/include/xorg/xaarop.h
./usr/X11R6/include/xorg/xace.h
./usr/X11R6/include/xorg/xacestr.h
@@ -134,6 +132,7 @@
./usr/X11R6/include/xorg/xf86fbman.h
./usr/X11R6/include/xorg/xf86i2c.h
./usr/X11R6/include/xorg/xf86int10.h
+./usr/X11R6/include/xorg/xf86platformBus.h
./usr/X11R6/include/xorg/xf86sbusBus.h
./usr/X11R6/include/xorg/xf86str.h
./usr/X11R6/include/xorg/xf86xv.h
@@ -166,18 +165,8 @@
./usr/X11R6/lib/modules/drivers/wsfb_drv.so
./usr/X11R6/lib/modules/drivers/wsudl_drv.la
./usr/X11R6/lib/modules/drivers/wsudl_drv.so
-./usr/X11R6/lib/modules/extensions/libdbe.la
-./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/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/elographics_drv.la
@@ -220,8 +209,6 @@
./usr/X11R6/lib/modules/libvgahw.so
./usr/X11R6/lib/modules/libwfb.la
./usr/X11R6/lib/modules/libwfb.so
-./usr/X11R6/lib/modules/libxaa.la
-./usr/X11R6/lib/modules/libxaa.so
./usr/X11R6/lib/modules/multimedia/bt829_drv.la
./usr/X11R6/lib/modules/multimedia/bt829_drv.so
./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
diff --git a/distrib/sets/lists/xserv/md.sgi b/distrib/sets/lists/xserv/md.sgi
index c0792abbb..0d19d066b 100644
--- a/distrib/sets/lists/xserv/md.sgi
+++ b/distrib/sets/lists/xserv/md.sgi
@@ -43,12 +43,12 @@
./usr/X11R6/include/xorg/gc.h
./usr/X11R6/include/xorg/gcstruct.h
./usr/X11R6/include/xorg/globals.h
+./usr/X11R6/include/xorg/glx_extinit.h
./usr/X11R6/include/xorg/glyphstr.h
./usr/X11R6/include/xorg/i2c_def.h
./usr/X11R6/include/xorg/input.h
./usr/X11R6/include/xorg/inputstr.h
./usr/X11R6/include/xorg/mi.h
-./usr/X11R6/include/xorg/mibstore.h
./usr/X11R6/include/xorg/micmap.h
./usr/X11R6/include/xorg/micoord.h
./usr/X11R6/include/xorg/mifillarc.h
@@ -100,8 +100,6 @@
./usr/X11R6/include/xorg/vgaHW.h
./usr/X11R6/include/xorg/window.h
./usr/X11R6/include/xorg/windowstr.h
-./usr/X11R6/include/xorg/xaa.h
-./usr/X11R6/include/xorg/xaalocal.h
./usr/X11R6/include/xorg/xaarop.h
./usr/X11R6/include/xorg/xace.h
./usr/X11R6/include/xorg/xacestr.h
@@ -123,6 +121,7 @@
./usr/X11R6/include/xorg/xf86fbman.h
./usr/X11R6/include/xorg/xf86i2c.h
./usr/X11R6/include/xorg/xf86int10.h
+./usr/X11R6/include/xorg/xf86platformBus.h
./usr/X11R6/include/xorg/xf86sbusBus.h
./usr/X11R6/include/xorg/xf86str.h
./usr/X11R6/include/xorg/xf86xv.h
@@ -136,18 +135,8 @@
./usr/X11R6/lib/modules/dri/swrast_dri.so
./usr/X11R6/lib/modules/drivers/wsfb_drv.la
./usr/X11R6/lib/modules/drivers/wsfb_drv.so
-./usr/X11R6/lib/modules/extensions/libdbe.la
-./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/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
@@ -176,8 +165,6 @@
./usr/X11R6/lib/modules/libvgahw.so
./usr/X11R6/lib/modules/libwfb.la
./usr/X11R6/lib/modules/libwfb.so
-./usr/X11R6/lib/modules/libxaa.la
-./usr/X11R6/lib/modules/libxaa.so
./usr/X11R6/lib/modules/multimedia/bt829_drv.la
./usr/X11R6/lib/modules/multimedia/bt829_drv.so
./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
diff --git a/distrib/sets/lists/xserv/md.socppc b/distrib/sets/lists/xserv/md.socppc
index 9160a7d8f..83038b2ae 100644
--- a/distrib/sets/lists/xserv/md.socppc
+++ b/distrib/sets/lists/xserv/md.socppc
@@ -46,12 +46,12 @@
./usr/X11R6/include/xorg/gc.h
./usr/X11R6/include/xorg/gcstruct.h
./usr/X11R6/include/xorg/globals.h
+./usr/X11R6/include/xorg/glx_extinit.h
./usr/X11R6/include/xorg/glyphstr.h
./usr/X11R6/include/xorg/i2c_def.h
./usr/X11R6/include/xorg/input.h
./usr/X11R6/include/xorg/inputstr.h
./usr/X11R6/include/xorg/mi.h
-./usr/X11R6/include/xorg/mibstore.h
./usr/X11R6/include/xorg/micmap.h
./usr/X11R6/include/xorg/micoord.h
./usr/X11R6/include/xorg/mifillarc.h
@@ -103,8 +103,6 @@
./usr/X11R6/include/xorg/vgaHW.h
./usr/X11R6/include/xorg/window.h
./usr/X11R6/include/xorg/windowstr.h
-./usr/X11R6/include/xorg/xaa.h
-./usr/X11R6/include/xorg/xaalocal.h
./usr/X11R6/include/xorg/xaarop.h
./usr/X11R6/include/xorg/xace.h
./usr/X11R6/include/xorg/xacestr.h
@@ -126,6 +124,7 @@
./usr/X11R6/include/xorg/xf86fbman.h
./usr/X11R6/include/xorg/xf86i2c.h
./usr/X11R6/include/xorg/xf86int10.h
+./usr/X11R6/include/xorg/xf86platformBus.h
./usr/X11R6/include/xorg/xf86sbusBus.h
./usr/X11R6/include/xorg/xf86str.h
./usr/X11R6/include/xorg/xf86xv.h
@@ -139,18 +138,8 @@
./usr/X11R6/lib/modules/dri/swrast_dri.so
./usr/X11R6/lib/modules/drivers/wsfb_drv.la
./usr/X11R6/lib/modules/drivers/wsfb_drv.so
-./usr/X11R6/lib/modules/extensions/libdbe.la
-./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/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
@@ -179,8 +168,6 @@
./usr/X11R6/lib/modules/libvgahw.so
./usr/X11R6/lib/modules/libwfb.la
./usr/X11R6/lib/modules/libwfb.so
-./usr/X11R6/lib/modules/libxaa.la
-./usr/X11R6/lib/modules/libxaa.so
./usr/X11R6/lib/modules/multimedia/bt829_drv.la
./usr/X11R6/lib/modules/multimedia/bt829_drv.so
./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
diff --git a/distrib/sets/lists/xserv/md.sparc b/distrib/sets/lists/xserv/md.sparc
index efb8a5958..7972aac02 100644
--- a/distrib/sets/lists/xserv/md.sparc
+++ b/distrib/sets/lists/xserv/md.sparc
@@ -44,12 +44,12 @@
./usr/X11R6/include/xorg/gc.h
./usr/X11R6/include/xorg/gcstruct.h
./usr/X11R6/include/xorg/globals.h
+./usr/X11R6/include/xorg/glx_extinit.h
./usr/X11R6/include/xorg/glyphstr.h
./usr/X11R6/include/xorg/i2c_def.h
./usr/X11R6/include/xorg/input.h
./usr/X11R6/include/xorg/inputstr.h
./usr/X11R6/include/xorg/mi.h
-./usr/X11R6/include/xorg/mibstore.h
./usr/X11R6/include/xorg/micmap.h
./usr/X11R6/include/xorg/micoord.h
./usr/X11R6/include/xorg/mifillarc.h
@@ -101,8 +101,6 @@
./usr/X11R6/include/xorg/vgaHW.h
./usr/X11R6/include/xorg/window.h
./usr/X11R6/include/xorg/windowstr.h
-./usr/X11R6/include/xorg/xaa.h
-./usr/X11R6/include/xorg/xaalocal.h
./usr/X11R6/include/xorg/xaarop.h
./usr/X11R6/include/xorg/xace.h
./usr/X11R6/include/xorg/xacestr.h
@@ -124,6 +122,7 @@
./usr/X11R6/include/xorg/xf86fbman.h
./usr/X11R6/include/xorg/xf86i2c.h
./usr/X11R6/include/xorg/xf86int10.h
+./usr/X11R6/include/xorg/xf86platformBus.h
./usr/X11R6/include/xorg/xf86sbusBus.h
./usr/X11R6/include/xorg/xf86str.h
./usr/X11R6/include/xorg/xf86xv.h
@@ -137,18 +136,8 @@
./usr/X11R6/lib/modules/dri/swrast_dri.so
./usr/X11R6/lib/modules/drivers/wsfb_drv.la
./usr/X11R6/lib/modules/drivers/wsfb_drv.so
-./usr/X11R6/lib/modules/extensions/libdbe.la
-./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/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
@@ -177,8 +166,6 @@
./usr/X11R6/lib/modules/libvgahw.so
./usr/X11R6/lib/modules/libwfb.la
./usr/X11R6/lib/modules/libwfb.so
-./usr/X11R6/lib/modules/libxaa.la
-./usr/X11R6/lib/modules/libxaa.so
./usr/X11R6/lib/modules/multimedia/bt829_drv.la
./usr/X11R6/lib/modules/multimedia/bt829_drv.so
./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
diff --git a/distrib/sets/lists/xserv/md.sparc64 b/distrib/sets/lists/xserv/md.sparc64
index c9b569d30..1d5b17801 100644
--- a/distrib/sets/lists/xserv/md.sparc64
+++ b/distrib/sets/lists/xserv/md.sparc64
@@ -46,12 +46,12 @@
./usr/X11R6/include/xorg/gc.h
./usr/X11R6/include/xorg/gcstruct.h
./usr/X11R6/include/xorg/globals.h
+./usr/X11R6/include/xorg/glx_extinit.h
./usr/X11R6/include/xorg/glyphstr.h
./usr/X11R6/include/xorg/i2c_def.h
./usr/X11R6/include/xorg/input.h
./usr/X11R6/include/xorg/inputstr.h
./usr/X11R6/include/xorg/mi.h
-./usr/X11R6/include/xorg/mibstore.h
./usr/X11R6/include/xorg/micmap.h
./usr/X11R6/include/xorg/micoord.h
./usr/X11R6/include/xorg/mifillarc.h
@@ -103,8 +103,6 @@
./usr/X11R6/include/xorg/vgaHW.h
./usr/X11R6/include/xorg/window.h
./usr/X11R6/include/xorg/windowstr.h
-./usr/X11R6/include/xorg/xaa.h
-./usr/X11R6/include/xorg/xaalocal.h
./usr/X11R6/include/xorg/xaarop.h
./usr/X11R6/include/xorg/xace.h
./usr/X11R6/include/xorg/xacestr.h
@@ -126,6 +124,7 @@
./usr/X11R6/include/xorg/xf86fbman.h
./usr/X11R6/include/xorg/xf86i2c.h
./usr/X11R6/include/xorg/xf86int10.h
+./usr/X11R6/include/xorg/xf86platformBus.h
./usr/X11R6/include/xorg/xf86sbusBus.h
./usr/X11R6/include/xorg/xf86str.h
./usr/X11R6/include/xorg/xf86xv.h
@@ -155,18 +154,8 @@
./usr/X11R6/lib/modules/drivers/wildcatfb_drv.so
./usr/X11R6/lib/modules/drivers/wsfb_drv.la
./usr/X11R6/lib/modules/drivers/wsfb_drv.so
-./usr/X11R6/lib/modules/extensions/libdbe.la
-./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/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/elographics_drv.la
@@ -209,8 +198,6 @@
./usr/X11R6/lib/modules/libvgahw.so
./usr/X11R6/lib/modules/libwfb.la
./usr/X11R6/lib/modules/libwfb.so
-./usr/X11R6/lib/modules/libxaa.la
-./usr/X11R6/lib/modules/libxaa.so
./usr/X11R6/lib/modules/multimedia/bt829_drv.la
./usr/X11R6/lib/modules/multimedia/bt829_drv.so
./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
diff --git a/distrib/sets/lists/xserv/md.zaurus b/distrib/sets/lists/xserv/md.zaurus
index 9160a7d8f..83038b2ae 100644
--- a/distrib/sets/lists/xserv/md.zaurus
+++ b/distrib/sets/lists/xserv/md.zaurus
@@ -46,12 +46,12 @@
./usr/X11R6/include/xorg/gc.h
./usr/X11R6/include/xorg/gcstruct.h
./usr/X11R6/include/xorg/globals.h
+./usr/X11R6/include/xorg/glx_extinit.h
./usr/X11R6/include/xorg/glyphstr.h
./usr/X11R6/include/xorg/i2c_def.h
./usr/X11R6/include/xorg/input.h
./usr/X11R6/include/xorg/inputstr.h
./usr/X11R6/include/xorg/mi.h
-./usr/X11R6/include/xorg/mibstore.h
./usr/X11R6/include/xorg/micmap.h
./usr/X11R6/include/xorg/micoord.h
./usr/X11R6/include/xorg/mifillarc.h
@@ -103,8 +103,6 @@
./usr/X11R6/include/xorg/vgaHW.h
./usr/X11R6/include/xorg/window.h
./usr/X11R6/include/xorg/windowstr.h
-./usr/X11R6/include/xorg/xaa.h
-./usr/X11R6/include/xorg/xaalocal.h
./usr/X11R6/include/xorg/xaarop.h
./usr/X11R6/include/xorg/xace.h
./usr/X11R6/include/xorg/xacestr.h
@@ -126,6 +124,7 @@
./usr/X11R6/include/xorg/xf86fbman.h
./usr/X11R6/include/xorg/xf86i2c.h
./usr/X11R6/include/xorg/xf86int10.h
+./usr/X11R6/include/xorg/xf86platformBus.h
./usr/X11R6/include/xorg/xf86sbusBus.h
./usr/X11R6/include/xorg/xf86str.h
./usr/X11R6/include/xorg/xf86xv.h
@@ -139,18 +138,8 @@
./usr/X11R6/lib/modules/dri/swrast_dri.so
./usr/X11R6/lib/modules/drivers/wsfb_drv.la
./usr/X11R6/lib/modules/drivers/wsfb_drv.so
-./usr/X11R6/lib/modules/extensions/libdbe.la
-./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/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
@@ -179,8 +168,6 @@
./usr/X11R6/lib/modules/libvgahw.so
./usr/X11R6/lib/modules/libwfb.la
./usr/X11R6/lib/modules/libwfb.so
-./usr/X11R6/lib/modules/libxaa.la
-./usr/X11R6/lib/modules/libxaa.so
./usr/X11R6/lib/modules/multimedia/bt829_drv.la
./usr/X11R6/lib/modules/multimedia/bt829_drv.so
./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi
index d42b4cc8c..80c09c4ad 100644
--- a/distrib/sets/lists/xshare/mi
+++ b/distrib/sets/lists/xshare/mi
@@ -615,12 +615,14 @@
./usr/X11R6/include/freetype2/freetype/ftbitmap.h
./usr/X11R6/include/freetype2/freetype/ftbzip2.h
./usr/X11R6/include/freetype2/freetype/ftcache.h
+./usr/X11R6/include/freetype2/freetype/ftcffdrv.h
./usr/X11R6/include/freetype2/freetype/ftchapters.h
./usr/X11R6/include/freetype2/freetype/ftcid.h
./usr/X11R6/include/freetype2/freetype/fterrdef.h
./usr/X11R6/include/freetype2/freetype/fterrors.h
./usr/X11R6/include/freetype2/freetype/ftgasp.h
./usr/X11R6/include/freetype2/freetype/ftglyph.h
+./usr/X11R6/include/freetype2/freetype/ftgxval.h
./usr/X11R6/include/freetype2/freetype/ftgzip.h
./usr/X11R6/include/freetype2/freetype/ftimage.h
./usr/X11R6/include/freetype2/freetype/ftincrem.h
@@ -631,6 +633,7 @@
./usr/X11R6/include/freetype2/freetype/ftmm.h
./usr/X11R6/include/freetype2/freetype/ftmodapi.h
./usr/X11R6/include/freetype2/freetype/ftmoderr.h
+./usr/X11R6/include/freetype2/freetype/ftotval.h
./usr/X11R6/include/freetype2/freetype/ftoutln.h
./usr/X11R6/include/freetype2/freetype/ftpfr.h
./usr/X11R6/include/freetype2/freetype/ftrender.h
@@ -1500,6 +1503,7 @@
./usr/X11R6/man/man3/XIGrabEnter.3
./usr/X11R6/man/man3/XIGrabFocusIn.3
./usr/X11R6/man/man3/XIGrabKeycode.3
+./usr/X11R6/man/man3/XIGrabTouchBegin.3
./usr/X11R6/man/man3/XIListProperties.3
./usr/X11R6/man/man3/XIMOfIC.3
./usr/X11R6/man/man3/XIQueryDevice.3
@@ -1514,6 +1518,7 @@
./usr/X11R6/man/man3/XIUngrabEnter.3
./usr/X11R6/man/man3/XIUngrabFocusIn.3
./usr/X11R6/man/man3/XIUngrabKeycode.3
+./usr/X11R6/man/man3/XIUngrabTouchBegin.3
./usr/X11R6/man/man3/XIWarpPointer.3
./usr/X11R6/man/man3/XIconSize.3
./usr/X11R6/man/man3/XIconifyWindow.3