sync

37 files changed, 100 insertions, 73 deletions

diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index 28a18c276..e1a0a14b4 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -147,7 +147,7 @@
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.7.0
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.17.1
+./usr/X11R6/lib/libfreetype.so.17.2
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/libpciaccess.so.1.0
 ./usr/X11R6/lib/libpixman-1.so.16.6
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 979c81ae9..9739c3820 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -155,7 +155,7 @@
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.7.0
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.17.1
+./usr/X11R6/lib/libfreetype.so.17.2
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/libpciaccess.so.1.0
 ./usr/X11R6/lib/libpixman-1.so.16.6
diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish
index cadcc3d1e..d294c205f 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -146,7 +146,7 @@
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.7.0
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.17.1
+./usr/X11R6/lib/libfreetype.so.17.2
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/libpciaccess.so.1.0
 ./usr/X11R6/lib/libpixman-1.so.16.6
diff --git a/distrib/sets/lists/xbase/md.hp300 b/distrib/sets/lists/xbase/md.hp300
index d5913fd35..0e2394c0c 100644
--- a/distrib/sets/lists/xbase/md.hp300
+++ b/distrib/sets/lists/xbase/md.hp300
@@ -127,7 +127,7 @@
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.7.0
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.17.1
+./usr/X11R6/lib/libfreetype.so.17.2
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/libpciaccess.so.1.0
 ./usr/X11R6/lib/libpixman-1.so.16.6
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index 91ccfe61a..11bf0e29f 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -110,7 +110,7 @@
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.7.0
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.17.1
+./usr/X11R6/lib/libfreetype.so.17.2
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/libpciaccess.so.1.0
 ./usr/X11R6/lib/libpixman-1.so.16.6
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index 23e02fceb..f2670d505 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -155,7 +155,7 @@
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.7.0
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.17.1
+./usr/X11R6/lib/libfreetype.so.17.2
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/libpciaccess.so.1.0
 ./usr/X11R6/lib/libpixman-1.so.16.6
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index 4f1650151..3d770a368 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -60,16 +60,6 @@
 ./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
@@ -87,7 +77,6 @@
 ./usr/X11R6/lib/libX11-xcb.so.1.0
 ./usr/X11R6/lib/libX11.so.13.0
 ./usr/X11R6/lib/libXRes.so.4.0
-./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
 ./usr/X11R6/lib/libXaw.so.14.0
 ./usr/X11R6/lib/libXaw7.so.14.0
@@ -95,7 +84,6 @@
 ./usr/X11R6/lib/libXcursor.so.4.0
 ./usr/X11R6/lib/libXdamage.so.3.1
 ./usr/X11R6/lib/libXdmcp.so.10.0
-./usr/X11R6/lib/libXevie.so.2.0
 ./usr/X11R6/lib/libXext.so.11.0
 ./usr/X11R6/lib/libXfixes.so.5.0
 ./usr/X11R6/lib/libXfont.so.9.0
@@ -123,9 +111,8 @@
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.7.0
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.17.1
+./usr/X11R6/lib/libfreetype.so.17.2
 ./usr/X11R6/lib/libfreetype_pic.a
-./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.1.0
 ./usr/X11R6/lib/libpixman-1.so.16.6
 ./usr/X11R6/lib/libpthread-stubs.a
diff --git a/distrib/sets/lists/xbase/md.loongson b/distrib/sets/lists/xbase/md.loongson
index f71cdf11d..b725b9c53 100644
--- a/distrib/sets/lists/xbase/md.loongson
+++ b/distrib/sets/lists/xbase/md.loongson
@@ -143,7 +143,7 @@
 ./usr/X11R6/lib/libdrm.so.2.6
 ./usr/X11R6/lib/libfontconfig.so.7.0
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.17.1
+./usr/X11R6/lib/libfreetype.so.17.2
 ./usr/X11R6/lib/libpciaccess.so.1.0
 ./usr/X11R6/lib/libpixman-1.so.16.6
 ./usr/X11R6/lib/libpthread-stubs.a
diff --git a/distrib/sets/lists/xbase/md.mac68k b/distrib/sets/lists/xbase/md.mac68k
index 59da81e57..c87c2d674 100644
--- a/distrib/sets/lists/xbase/md.mac68k
+++ b/distrib/sets/lists/xbase/md.mac68k
@@ -136,7 +136,7 @@
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.7.0
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.17.1
+./usr/X11R6/lib/libfreetype.so.17.2
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/libpciaccess.so.1.0
 ./usr/X11R6/lib/libpixman-1.so.16.6
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index e623d5e4b..d70bea0d1 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -147,7 +147,7 @@
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.7.0
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.17.1
+./usr/X11R6/lib/libfreetype.so.17.2
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/libpciaccess.so.1.0
 ./usr/X11R6/lib/libpixman-1.so.16.6
diff --git a/distrib/sets/lists/xbase/md.mvme68k b/distrib/sets/lists/xbase/md.mvme68k
index 42ebd1774..c94fc816e 100644
--- a/distrib/sets/lists/xbase/md.mvme68k
+++ b/distrib/sets/lists/xbase/md.mvme68k
@@ -59,16 +59,6 @@
 ./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
@@ -120,7 +110,7 @@
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.7.0
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.17.1
+./usr/X11R6/lib/libfreetype.so.17.2
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/libpciaccess.so.1.0
 ./usr/X11R6/lib/libpixman-1.so.16.6
@@ -299,14 +289,14 @@
 ./usr/X11R6/share/xcb/xtest.xml
 ./usr/X11R6/share/xcb/xv.xml
 ./usr/X11R6/share/xcb/xvmc.xml
-./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be32.cache-3
-./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be32.cache-3
-./var/cache/fontconfig/2cee944125173ffd13126fb55c9a0dc1-be32.cache-3
-./var/cache/fontconfig/68418e0da60dfe4003a8c2435e92b1d3-be32.cache-3
-./var/cache/fontconfig/6ac606a6cc613b1dd45fa75d9315a55e-be32.cache-3
-./var/cache/fontconfig/7c10409a5d7a696d98ceb77b9b1e9209-be32.cache-3
-./var/cache/fontconfig/8b934b58f0acb2e86a0bbbb5d24d97c0-be32.cache-3
-./var/cache/fontconfig/90acf7d99f5044d4df0432f2d0f16b42-be32.cache-3
-./var/cache/fontconfig/be2547a64937fd44a1f33dfd1eea53e8-be32.cache-3
-./var/cache/fontconfig/d929d2c542e4f6652ca46d613e4b360e-be32.cache-3
-./var/cache/fontconfig/f8033d5e4c6effb98c84b18a50eef42d-be32.cache-3
+./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be32d4.cache-3
+./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be32d4.cache-3
+./var/cache/fontconfig/2cee944125173ffd13126fb55c9a0dc1-be32d4.cache-3
+./var/cache/fontconfig/68418e0da60dfe4003a8c2435e92b1d3-be32d4.cache-3
+./var/cache/fontconfig/6ac606a6cc613b1dd45fa75d9315a55e-be32d4.cache-3
+./var/cache/fontconfig/7c10409a5d7a696d98ceb77b9b1e9209-be32d4.cache-3
+./var/cache/fontconfig/8b934b58f0acb2e86a0bbbb5d24d97c0-be32d4.cache-3
+./var/cache/fontconfig/90acf7d99f5044d4df0432f2d0f16b42-be32d4.cache-3
+./var/cache/fontconfig/be2547a64937fd44a1f33dfd1eea53e8-be32d4.cache-3
+./var/cache/fontconfig/d929d2c542e4f6652ca46d613e4b360e-be32d4.cache-3
+./var/cache/fontconfig/f8033d5e4c6effb98c84b18a50eef42d-be32d4.cache-3
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index 6d31dbdff..edd75e633 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -143,7 +143,7 @@
 ./usr/X11R6/lib/libdrm.so.2.6
 ./usr/X11R6/lib/libfontconfig.so.7.0
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.17.1
+./usr/X11R6/lib/libfreetype.so.17.2
 ./usr/X11R6/lib/libpciaccess.so.1.0
 ./usr/X11R6/lib/libpixman-1.so.16.6
 ./usr/X11R6/lib/libpthread-stubs.a
diff --git a/distrib/sets/lists/xbase/md.socppc b/distrib/sets/lists/xbase/md.socppc
index 41e14e791..335a0584a 100644
--- a/distrib/sets/lists/xbase/md.socppc
+++ b/distrib/sets/lists/xbase/md.socppc
@@ -146,7 +146,7 @@
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.7.0
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.17.1
+./usr/X11R6/lib/libfreetype.so.17.2
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/libpciaccess.so.1.0
 ./usr/X11R6/lib/libpixman-1.so.16.6
diff --git a/distrib/sets/lists/xbase/md.sparc b/distrib/sets/lists/xbase/md.sparc
index 41e14e791..335a0584a 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -146,7 +146,7 @@
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.7.0
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.17.1
+./usr/X11R6/lib/libfreetype.so.17.2
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/libpciaccess.so.1.0
 ./usr/X11R6/lib/libpixman-1.so.16.6
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index cdfec105d..06ba2d202 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -147,7 +147,7 @@
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.7.0
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.17.1
+./usr/X11R6/lib/libfreetype.so.17.2
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/libpciaccess.so.1.0
 ./usr/X11R6/lib/libpixman-1.so.16.6
diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus
index cadcc3d1e..d294c205f 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -146,7 +146,7 @@
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.7.0
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.17.1
+./usr/X11R6/lib/libfreetype.so.17.2
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/libpciaccess.so.1.0
 ./usr/X11R6/lib/libpixman-1.so.16.6
diff --git a/distrib/sets/lists/xetc/md.loongson b/distrib/sets/lists/xetc/md.loongson
index 7aa8b58b2..e0199028d 100644
--- a/distrib/sets/lists/xetc/md.loongson
+++ b/distrib/sets/lists/xetc/md.loongson
@@ -1,2 +1 @@
 ./etc/X11/fs/config
-./etc/X11/xorg.conf
diff --git a/distrib/sets/lists/xetc/md.vax b/distrib/sets/lists/xetc/md.vax
index 3b85632a0..e69de29bb 100644
--- a/distrib/sets/lists/xetc/md.vax
+++ b/distrib/sets/lists/xetc/md.vax
@@ -1 +0,0 @@
-./etc/X11/xorg.conf
diff --git a/distrib/sets/lists/xserv/md.alpha b/distrib/sets/lists/xserv/md.alpha
index e96df1063..ea095f5f4 100644
--- a/distrib/sets/lists/xserv/md.alpha
+++ b/distrib/sets/lists/xserv/md.alpha
@@ -317,7 +317,6 @@
 ./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 aa7899448..cfa9ef20b 100644
--- a/distrib/sets/lists/xserv/md.amd64
+++ b/distrib/sets/lists/xserv/md.amd64
@@ -350,7 +350,6 @@
 ./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 ace345c96..896a83594 100644
--- a/distrib/sets/lists/xserv/md.armish
+++ b/distrib/sets/lists/xserv/md.armish
@@ -216,7 +216,6 @@
 ./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 a95a20771..b39d95214 100644
--- a/distrib/sets/lists/xserv/md.hp300
+++ b/distrib/sets/lists/xserv/md.hp300
@@ -263,7 +263,6 @@
 ./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 f05d64c3c..e18bb4fce 100644
--- a/distrib/sets/lists/xserv/md.hppa
+++ b/distrib/sets/lists/xserv/md.hppa
@@ -64,6 +64,5 @@
 ./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
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.i386 b/distrib/sets/lists/xserv/md.i386
index d3c64b2af..b562da807 100644
--- a/distrib/sets/lists/xserv/md.i386
+++ b/distrib/sets/lists/xserv/md.i386
@@ -358,7 +358,6 @@
 ./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 44b6fd986..95590756c 100644
--- a/distrib/sets/lists/xserv/md.landisk
+++ b/distrib/sets/lists/xserv/md.landisk
@@ -3,6 +3,5 @@
 ./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 b1e918bdb..ec16e190c 100644
--- a/distrib/sets/lists/xserv/md.loongson
+++ b/distrib/sets/lists/xserv/md.loongson
@@ -212,7 +212,6 @@
 ./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 beed96981..3f8620fa5 100644
--- a/distrib/sets/lists/xserv/md.mac68k
+++ b/distrib/sets/lists/xserv/md.mac68k
@@ -250,7 +250,6 @@
 ./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 c3e572f18..dab75397b 100644
--- a/distrib/sets/lists/xserv/md.macppc
+++ b/distrib/sets/lists/xserv/md.macppc
@@ -259,7 +259,6 @@
 ./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 ab63ad075..9d27c3332 100644
--- a/distrib/sets/lists/xserv/md.mvme68k
+++ b/distrib/sets/lists/xserv/md.mvme68k
@@ -2,7 +2,6 @@
 ./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
@@ -59,8 +58,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-macros.m4
-./usr/X11R6/share/aclocal/xorg-server.m4
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.mvme88k b/distrib/sets/lists/xserv/md.mvme88k
index 08cae479a..f692ddcdb 100644
--- a/distrib/sets/lists/xserv/md.mvme88k
+++ b/distrib/sets/lists/xserv/md.mvme88k
@@ -5,7 +5,6 @@
 ./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 f2f171c7b..e959009e8 100644
--- a/distrib/sets/lists/xserv/md.sgi
+++ b/distrib/sets/lists/xserv/md.sgi
@@ -208,7 +208,6 @@
 ./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 c25dae862..0bad0725b 100644
--- a/distrib/sets/lists/xserv/md.socppc
+++ b/distrib/sets/lists/xserv/md.socppc
@@ -213,7 +213,6 @@
 ./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 e02abd792..d2192569b 100644
--- a/distrib/sets/lists/xserv/md.sparc
+++ b/distrib/sets/lists/xserv/md.sparc
@@ -207,7 +207,6 @@
 ./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 041a6a417..0947b1f27 100644
--- a/distrib/sets/lists/xserv/md.sparc64
+++ b/distrib/sets/lists/xserv/md.sparc64
@@ -262,7 +262,6 @@
 ./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 c25dae862..0bad0725b 100644
--- a/distrib/sets/lists/xserv/md.zaurus
+++ b/distrib/sets/lists/xserv/md.zaurus
@@ -213,7 +213,6 @@
 ./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/mi b/distrib/sets/lists/xserv/mi
index 13f4c9263..88a6ea095 100644
--- a/distrib/sets/lists/xserv/mi
+++ b/distrib/sets/lists/xserv/mi
@@ -6,4 +6,5 @@
 ./usr/X11R6/lib/modules/input
 ./usr/X11R6/lib/modules/linux
 ./usr/X11R6/lib/modules/multimedia
+./usr/X11R6/share/aclocal/xorg-macros.m4
 ./var/db
diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi
index 372f4c0bd..0032239ba 100644
--- a/distrib/sets/lists/xshare/mi
+++ b/distrib/sets/lists/xshare/mi
@@ -1316,6 +1316,7 @@
 ./usr/X11R6/man/man3/XAllocSizeHints.3
 ./usr/X11R6/man/man3/XAllocStandardColormap.3
 ./usr/X11R6/man/man3/XAllocWMHints.3
+./usr/X11R6/man/man3/XAllowDeviceEvents.3
 ./usr/X11R6/man/man3/XAllowEvents.3
 ./usr/X11R6/man/man3/XAnyEvent.3
 ./usr/X11R6/man/man3/XArc.3
@@ -1325,10 +1326,17 @@
 ./usr/X11R6/man/man3/XBell.3
 ./usr/X11R6/man/man3/XButtonEvent.3
 ./usr/X11R6/man/man3/XChangeActivePointerGrab.3
+./usr/X11R6/man/man3/XChangeDeviceControl.3
+./usr/X11R6/man/man3/XChangeDeviceDontPropagateList.3
+./usr/X11R6/man/man3/XChangeDeviceKeyMapping.3
+./usr/X11R6/man/man3/XChangeDeviceProperty.3
+./usr/X11R6/man/man3/XChangeFeedbackControl.3
 ./usr/X11R6/man/man3/XChangeGC.3
 ./usr/X11R6/man/man3/XChangeKeyboardControl.3
+./usr/X11R6/man/man3/XChangeKeyboardDevice.3
 ./usr/X11R6/man/man3/XChangeKeyboardMapping.3
 ./usr/X11R6/man/man3/XChangePointerControl.3
+./usr/X11R6/man/man3/XChangePointerDevice.3
 ./usr/X11R6/man/man3/XChangeProperty.3
 ./usr/X11R6/man/man3/XChangeSaveSet.3
 ./usr/X11R6/man/man3/XChangeWindowAttributes.3
@@ -1349,6 +1357,7 @@
 ./usr/X11R6/man/man3/XClearWindow.3
 ./usr/X11R6/man/man3/XClientMessageEvent.3
 ./usr/X11R6/man/man3/XClipBox.3
+./usr/X11R6/man/man3/XCloseDevice.3
 ./usr/X11R6/man/man3/XCloseDisplay.3
 ./usr/X11R6/man/man3/XCloseIM.3
 ./usr/X11R6/man/man3/XCloseOM.3
@@ -1396,6 +1405,7 @@
 ./usr/X11R6/man/man3/XDefaultString.3
 ./usr/X11R6/man/man3/XDefineCursor.3
 ./usr/X11R6/man/man3/XDeleteContext.3
+./usr/X11R6/man/man3/XDeleteDeviceProperty.3
 ./usr/X11R6/man/man3/XDeleteModifiermapEntry.3
 ./usr/X11R6/man/man3/XDeleteProperty.3
 ./usr/X11R6/man/man3/XDestroyIC.3
@@ -1405,6 +1415,8 @@
 ./usr/X11R6/man/man3/XDestroySubwindows.3
 ./usr/X11R6/man/man3/XDestroyWindow.3
 ./usr/X11R6/man/man3/XDestroyWindowEvent.3
+./usr/X11R6/man/man3/XDeviceBell.3
+./usr/X11R6/man/man3/XDeviceTimeCoord.3
 ./usr/X11R6/man/man3/XDirectionalDependentDrawing.3
 ./usr/X11R6/man/man3/XDisableAccessControl.3
 ./usr/X11R6/man/man3/XDisplayKeycodes.3
@@ -1457,6 +1469,7 @@
 ./usr/X11R6/man/man3/XFreeColormap.3
 ./usr/X11R6/man/man3/XFreeColors.3
 ./usr/X11R6/man/man3/XFreeCursor.3
+./usr/X11R6/man/man3/XFreeDeviceList.3
 ./usr/X11R6/man/man3/XFreeEventData.3
 ./usr/X11R6/man/man3/XFreeExtensionList.3
 ./usr/X11R6/man/man3/XFreeFont.3
@@ -1475,9 +1488,19 @@
 ./usr/X11R6/man/man3/XGetAtomNames.3
 ./usr/X11R6/man/man3/XGetClassHint.3
 ./usr/X11R6/man/man3/XGetCommand.3
+./usr/X11R6/man/man3/XGetDeviceButtonMapping.3
+./usr/X11R6/man/man3/XGetDeviceControl.3
+./usr/X11R6/man/man3/XGetDeviceDontPropagateList.3
+./usr/X11R6/man/man3/XGetDeviceFocus.3
+./usr/X11R6/man/man3/XGetDeviceKeyMapping.3
+./usr/X11R6/man/man3/XGetDeviceModifierMapping.3
+./usr/X11R6/man/man3/XGetDeviceMotionEvents.3
+./usr/X11R6/man/man3/XGetDeviceProperty.3
 ./usr/X11R6/man/man3/XGetErrorDatabaseText.3
 ./usr/X11R6/man/man3/XGetErrorText.3
 ./usr/X11R6/man/man3/XGetEventData.3
+./usr/X11R6/man/man3/XGetExtensionVersion.3
+./usr/X11R6/man/man3/XGetFeedbackControl.3
 ./usr/X11R6/man/man3/XGetFontPath.3
 ./usr/X11R6/man/man3/XGetFontProperty.3
 ./usr/X11R6/man/man3/XGetGCValues.3
@@ -1499,6 +1522,7 @@
 ./usr/X11R6/man/man3/XGetPointerMapping.3
 ./usr/X11R6/man/man3/XGetRGBColormaps.3
 ./usr/X11R6/man/man3/XGetScreenSaver.3
+./usr/X11R6/man/man3/XGetSelectedExtensionEvents.3
 ./usr/X11R6/man/man3/XGetSelectionOwner.3
 ./usr/X11R6/man/man3/XGetSubImage.3
 ./usr/X11R6/man/man3/XGetTextProperty.3
@@ -1516,6 +1540,9 @@
 ./usr/X11R6/man/man3/XGetWindowProperty.3
 ./usr/X11R6/man/man3/XGetXCBConnection.3
 ./usr/X11R6/man/man3/XGrabButton.3
+./usr/X11R6/man/man3/XGrabDevice.3
+./usr/X11R6/man/man3/XGrabDeviceButton.3
+./usr/X11R6/man/man3/XGrabDeviceKey.3
 ./usr/X11R6/man/man3/XGrabKey.3
 ./usr/X11R6/man/man3/XGrabKeyboard.3
 ./usr/X11R6/man/man3/XGrabPointer.3
@@ -1523,7 +1550,35 @@
 ./usr/X11R6/man/man3/XGraphicsExposeEvent.3
 ./usr/X11R6/man/man3/XGravityEvent.3
 ./usr/X11R6/man/man3/XHostAddress.3
+./usr/X11R6/man/man3/XIChangeHierarchy.3
+./usr/X11R6/man/man3/XIChangeProperty.3
+./usr/X11R6/man/man3/XIDefineCursor.3
+./usr/X11R6/man/man3/XIDeleteProperty.3
+./usr/X11R6/man/man3/XIFreeDeviceInfo.3
+./usr/X11R6/man/man3/XIGetClientPointer.3
+./usr/X11R6/man/man3/XIGetFocus.3
+./usr/X11R6/man/man3/XIGetProperty.3
+./usr/X11R6/man/man3/XIGetSelectedEvents.3
+./usr/X11R6/man/man3/XIGrabButton.3
+./usr/X11R6/man/man3/XIGrabDevice.3
+./usr/X11R6/man/man3/XIGrabEnter.3
+./usr/X11R6/man/man3/XIGrabFocusIn.3
+./usr/X11R6/man/man3/XIGrabKeycode.3
+./usr/X11R6/man/man3/XIListProperties.3
 ./usr/X11R6/man/man3/XIMOfIC.3
+./usr/X11R6/man/man3/XIQueryDevice.3
+./usr/X11R6/man/man3/XIQueryPointer.3
+./usr/X11R6/man/man3/XIQueryVersion.3
+./usr/X11R6/man/man3/XISelectEvents.3
+./usr/X11R6/man/man3/XISetClientPointer.3
+./usr/X11R6/man/man3/XISetFocus.3
+./usr/X11R6/man/man3/XIUndefineCursor.3
+./usr/X11R6/man/man3/XIUngrabButton.3
+./usr/X11R6/man/man3/XIUngrabDevice.3
+./usr/X11R6/man/man3/XIUngrabEnter.3
+./usr/X11R6/man/man3/XIUngrabFocusIn.3
+./usr/X11R6/man/man3/XIUngrabKeycode.3
+./usr/X11R6/man/man3/XIWarpPointer.3
 ./usr/X11R6/man/man3/XIconSize.3
 ./usr/X11R6/man/man3/XIconifyWindow.3
 ./usr/X11R6/man/man3/XIfEvent.3
@@ -1543,10 +1598,12 @@
 ./usr/X11R6/man/man3/XKeysymToString.3
 ./usr/X11R6/man/man3/XKillClient.3
 ./usr/X11R6/man/man3/XListDepths.3
+./usr/X11R6/man/man3/XListDeviceProperties.3
 ./usr/X11R6/man/man3/XListExtensions.3
 ./usr/X11R6/man/man3/XListFonts.3
 ./usr/X11R6/man/man3/XListFontsWithInfo.3
 ./usr/X11R6/man/man3/XListHosts.3
+./usr/X11R6/man/man3/XListInputDevices.3
 ./usr/X11R6/man/man3/XListInstalledColormaps.3
 ./usr/X11R6/man/man3/XListPixmapFormats.3
 ./usr/X11R6/man/man3/XListProperties.3
@@ -1579,6 +1636,7 @@
 ./usr/X11R6/man/man3/XNoOp.3
 ./usr/X11R6/man/man3/XOMOfOC.3
 ./usr/X11R6/man/man3/XOffsetRegion.3
+./usr/X11R6/man/man3/XOpenDevice.3
 ./usr/X11R6/man/man3/XOpenDisplay.3
 ./usr/X11R6/man/man3/XOpenIM.3
 ./usr/X11R6/man/man3/XOpenOM.3
@@ -1602,6 +1660,7 @@
 ./usr/X11R6/man/man3/XQueryBestTile.3
 ./usr/X11R6/man/man3/XQueryColor.3
 ./usr/X11R6/man/man3/XQueryColors.3
+./usr/X11R6/man/man3/XQueryDeviceState.3
 ./usr/X11R6/man/man3/XQueryExtension.3
 ./usr/X11R6/man/man3/XQueryFont.3
 ./usr/X11R6/man/man3/XQueryKeymap.3
@@ -1668,11 +1727,13 @@
 ./usr/X11R6/man/man3/XScreenSaverUnregister.3
 ./usr/X11R6/man/man3/XScreenSaverUnsetAttributes.3
 ./usr/X11R6/man/man3/XSegment.3
+./usr/X11R6/man/man3/XSelectExtensionEvent.3
 ./usr/X11R6/man/man3/XSelectInput.3
 ./usr/X11R6/man/man3/XSelectionClearEvent.3
 ./usr/X11R6/man/man3/XSelectionEvent.3
 ./usr/X11R6/man/man3/XSelectionRequestEvent.3
 ./usr/X11R6/man/man3/XSendEvent.3
+./usr/X11R6/man/man3/XSendExtensionEvent.3
 ./usr/X11R6/man/man3/XSetAccessControl.3
 ./usr/X11R6/man/man3/XSetAfterFunction.3
 ./usr/X11R6/man/man3/XSetArcMode.3
@@ -1684,6 +1745,11 @@
 ./usr/X11R6/man/man3/XSetCloseDownMode.3
 ./usr/X11R6/man/man3/XSetCommand.3
 ./usr/X11R6/man/man3/XSetDashes.3
+./usr/X11R6/man/man3/XSetDeviceButtonMapping.3
+./usr/X11R6/man/man3/XSetDeviceFocus.3
+./usr/X11R6/man/man3/XSetDeviceMode.3
+./usr/X11R6/man/man3/XSetDeviceModifierMapping.3
+./usr/X11R6/man/man3/XSetDeviceValuators.3
 ./usr/X11R6/man/man3/XSetErrorHandler.3
 ./usr/X11R6/man/man3/XSetEventQueueOwner.3
 ./usr/X11R6/man/man3/XSetFillRule.3
@@ -1785,6 +1851,9 @@
 ./usr/X11R6/man/man3/XTranslateCoordinates.3
 ./usr/X11R6/man/man3/XUndefineCursor.3
 ./usr/X11R6/man/man3/XUngrabButton.3
+./usr/X11R6/man/man3/XUngrabDevice.3
+./usr/X11R6/man/man3/XUngrabDeviceButton.3
+./usr/X11R6/man/man3/XUngrabDeviceKey.3
 ./usr/X11R6/man/man3/XUngrabKey.3
 ./usr/X11R6/man/man3/XUngrabKeyboard.3
 ./usr/X11R6/man/man3/XUngrabPointer.3
@@ -2013,7 +2082,7 @@
 ./usr/X11R6/man/man3/XkbGetCompatMap.3
 ./usr/X11R6/man/man3/XkbGetControls.3
 ./usr/X11R6/man/man3/XkbGetControlsChanges.3
-./usr/X11R6/man/man3/XkbGetDetectableAutorepeat.3
+./usr/X11R6/man/man3/XkbGetDetectableAutoRepeat.3
 ./usr/X11R6/man/man3/XkbGetDeviceButtonActions.3
 ./usr/X11R6/man/man3/XkbGetDeviceInfo.3
 ./usr/X11R6/man/man3/XkbGetDeviceInfoChanges.3
@@ -2106,7 +2175,7 @@
 ./usr/X11R6/man/man3/XkbSetCompatMap.3
 ./usr/X11R6/man/man3/XkbSetControls.3
 ./usr/X11R6/man/man3/XkbSetDebuggingFlags.3
-./usr/X11R6/man/man3/XkbSetDetectableAutorepeat.3
+./usr/X11R6/man/man3/XkbSetDetectableAutoRepeat.3
 ./usr/X11R6/man/man3/XkbSetDeviceButtonActions.3
 ./usr/X11R6/man/man3/XkbSetDeviceInfo.3
 ./usr/X11R6/man/man3/XkbSetIgnoreLockMods.3
@@ -2493,6 +2562,7 @@
 ./usr/X11R6/man/man3/XwcTextPerCharExtents.3
 ./usr/X11R6/man/man3/XwcTextPropertyToTextList.3
 ./usr/X11R6/man/man5/Compose.5
+./usr/X11R6/man/man5/XCompose.5
 ./usr/X11R6/man/man5/fonts-conf.5
 ./usr/X11R6/man/man7/Consortium.7
 ./usr/X11R6/man/man7/Standards.7