sync

23 files changed, 68 insertions, 120 deletions

diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 7a0affd00..49a52600d 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -84,9 +84,6 @@
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
 ./usr/X11R6/include/xorg
-./usr/X11R6/include/xorg/BT.h
-./usr/X11R6/include/xorg/IBM.h
-./usr/X11R6/include/xorg/TI.h
 ./usr/X11R6/include/xorg/XIstubs.h
 ./usr/X11R6/include/xorg/Xprintf.h
 ./usr/X11R6/include/xorg/callback.h
@@ -191,7 +188,6 @@
 ./usr/X11R6/include/xorg/shadow.h
 ./usr/X11R6/include/xorg/shadowfb.h
 ./usr/X11R6/include/xorg/shmint.h
-./usr/X11R6/include/xorg/site.h
 ./usr/X11R6/include/xorg/synaptics-properties.h
 ./usr/X11R6/include/xorg/syncsdk.h
 ./usr/X11R6/include/xorg/validate.h
@@ -206,6 +202,7 @@
 ./usr/X11R6/include/xorg/xaarop.h
 ./usr/X11R6/include/xorg/xace.h
 ./usr/X11R6/include/xorg/xacestr.h
+./usr/X11R6/include/xorg/xf86-input-inputtest-protocol.h
 ./usr/X11R6/include/xorg/xf86-mouse-properties.h
 ./usr/X11R6/include/xorg/xf86.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
@@ -222,7 +219,6 @@
 ./usr/X11R6/include/xorg/xf86PciInfo.h
 ./usr/X11R6/include/xorg/xf86Priv.h
 ./usr/X11R6/include/xorg/xf86Privstr.h
-./usr/X11R6/include/xorg/xf86RamDac.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86VGAarbiter.h
 ./usr/X11R6/include/xorg/xf86Xinput.h
diff --git a/distrib/sets/lists/xbase/md.arm64 b/distrib/sets/lists/xbase/md.arm64
index 17df8b773..9a8eceb84 100644
--- a/distrib/sets/lists/xbase/md.arm64
+++ b/distrib/sets/lists/xbase/md.arm64
@@ -79,9 +79,6 @@
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
 ./usr/X11R6/include/xorg
-./usr/X11R6/include/xorg/BT.h
-./usr/X11R6/include/xorg/IBM.h
-./usr/X11R6/include/xorg/TI.h
 ./usr/X11R6/include/xorg/XIstubs.h
 ./usr/X11R6/include/xorg/Xprintf.h
 ./usr/X11R6/include/xorg/callback.h
@@ -185,7 +182,6 @@
 ./usr/X11R6/include/xorg/shadow.h
 ./usr/X11R6/include/xorg/shadowfb.h
 ./usr/X11R6/include/xorg/shmint.h
-./usr/X11R6/include/xorg/site.h
 ./usr/X11R6/include/xorg/syncsdk.h
 ./usr/X11R6/include/xorg/validate.h
 ./usr/X11R6/include/xorg/vbe.h
@@ -199,6 +195,7 @@
 ./usr/X11R6/include/xorg/xaarop.h
 ./usr/X11R6/include/xorg/xace.h
 ./usr/X11R6/include/xorg/xacestr.h
+./usr/X11R6/include/xorg/xf86-input-inputtest-protocol.h
 ./usr/X11R6/include/xorg/xf86-mouse-properties.h
 ./usr/X11R6/include/xorg/xf86.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
@@ -215,7 +212,6 @@
 ./usr/X11R6/include/xorg/xf86PciInfo.h
 ./usr/X11R6/include/xorg/xf86Priv.h
 ./usr/X11R6/include/xorg/xf86Privstr.h
-./usr/X11R6/include/xorg/xf86RamDac.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86VGAarbiter.h
 ./usr/X11R6/include/xorg/xf86Xinput.h
diff --git a/distrib/sets/lists/xbase/md.armv7 b/distrib/sets/lists/xbase/md.armv7
index 7cc1ca1ae..56bbf57a0 100644
--- a/distrib/sets/lists/xbase/md.armv7
+++ b/distrib/sets/lists/xbase/md.armv7
@@ -79,9 +79,6 @@
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
 ./usr/X11R6/include/xorg
-./usr/X11R6/include/xorg/BT.h
-./usr/X11R6/include/xorg/IBM.h
-./usr/X11R6/include/xorg/TI.h
 ./usr/X11R6/include/xorg/XIstubs.h
 ./usr/X11R6/include/xorg/Xprintf.h
 ./usr/X11R6/include/xorg/callback.h
@@ -185,7 +182,6 @@
 ./usr/X11R6/include/xorg/shadow.h
 ./usr/X11R6/include/xorg/shadowfb.h
 ./usr/X11R6/include/xorg/shmint.h
-./usr/X11R6/include/xorg/site.h
 ./usr/X11R6/include/xorg/syncsdk.h
 ./usr/X11R6/include/xorg/validate.h
 ./usr/X11R6/include/xorg/vbe.h
@@ -199,6 +195,7 @@
 ./usr/X11R6/include/xorg/xaarop.h
 ./usr/X11R6/include/xorg/xace.h
 ./usr/X11R6/include/xorg/xacestr.h
+./usr/X11R6/include/xorg/xf86-input-inputtest-protocol.h
 ./usr/X11R6/include/xorg/xf86-mouse-properties.h
 ./usr/X11R6/include/xorg/xf86.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
@@ -215,7 +212,6 @@
 ./usr/X11R6/include/xorg/xf86PciInfo.h
 ./usr/X11R6/include/xorg/xf86Priv.h
 ./usr/X11R6/include/xorg/xf86Privstr.h
-./usr/X11R6/include/xorg/xf86RamDac.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86VGAarbiter.h
 ./usr/X11R6/include/xorg/xf86Xinput.h
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index 5e1f2ce19..ca26c47bd 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -4,9 +4,6 @@
 ./usr/X11R6/include/libdrm/nouveau
 ./usr/X11R6/include/libdrm/nouveau/nvif
 ./usr/X11R6/include/xorg
-./usr/X11R6/include/xorg/BT.h
-./usr/X11R6/include/xorg/IBM.h
-./usr/X11R6/include/xorg/TI.h
 ./usr/X11R6/include/xorg/XIstubs.h
 ./usr/X11R6/include/xorg/Xprintf.h
 ./usr/X11R6/include/xorg/callback.h
@@ -104,7 +101,6 @@
 ./usr/X11R6/include/xorg/shadow.h
 ./usr/X11R6/include/xorg/shadowfb.h
 ./usr/X11R6/include/xorg/shmint.h
-./usr/X11R6/include/xorg/site.h
 ./usr/X11R6/include/xorg/syncsdk.h
 ./usr/X11R6/include/xorg/validate.h
 ./usr/X11R6/include/xorg/vbe.h
@@ -117,6 +113,7 @@
 ./usr/X11R6/include/xorg/xaarop.h
 ./usr/X11R6/include/xorg/xace.h
 ./usr/X11R6/include/xorg/xacestr.h
+./usr/X11R6/include/xorg/xf86-input-inputtest-protocol.h
 ./usr/X11R6/include/xorg/xf86-mouse-properties.h
 ./usr/X11R6/include/xorg/xf86.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
@@ -133,7 +130,6 @@
 ./usr/X11R6/include/xorg/xf86PciInfo.h
 ./usr/X11R6/include/xorg/xf86Priv.h
 ./usr/X11R6/include/xorg/xf86Privstr.h
-./usr/X11R6/include/xorg/xf86RamDac.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86VGAarbiter.h
 ./usr/X11R6/include/xorg/xf86Xinput.h
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index 356bbc16c..a08ca3da8 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -84,9 +84,6 @@
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
 ./usr/X11R6/include/xorg
-./usr/X11R6/include/xorg/BT.h
-./usr/X11R6/include/xorg/IBM.h
-./usr/X11R6/include/xorg/TI.h
 ./usr/X11R6/include/xorg/XIstubs.h
 ./usr/X11R6/include/xorg/Xprintf.h
 ./usr/X11R6/include/xorg/callback.h
@@ -191,7 +188,6 @@
 ./usr/X11R6/include/xorg/shadow.h
 ./usr/X11R6/include/xorg/shadowfb.h
 ./usr/X11R6/include/xorg/shmint.h
-./usr/X11R6/include/xorg/site.h
 ./usr/X11R6/include/xorg/synaptics-properties.h
 ./usr/X11R6/include/xorg/syncsdk.h
 ./usr/X11R6/include/xorg/validate.h
@@ -206,6 +202,7 @@
 ./usr/X11R6/include/xorg/xaarop.h
 ./usr/X11R6/include/xorg/xace.h
 ./usr/X11R6/include/xorg/xacestr.h
+./usr/X11R6/include/xorg/xf86-input-inputtest-protocol.h
 ./usr/X11R6/include/xorg/xf86-mouse-properties.h
 ./usr/X11R6/include/xorg/xf86.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
@@ -222,7 +219,6 @@
 ./usr/X11R6/include/xorg/xf86PciInfo.h
 ./usr/X11R6/include/xorg/xf86Priv.h
 ./usr/X11R6/include/xorg/xf86Privstr.h
-./usr/X11R6/include/xorg/xf86RamDac.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86VGAarbiter.h
 ./usr/X11R6/include/xorg/xf86Xinput.h
diff --git a/distrib/sets/lists/xbase/md.luna88k b/distrib/sets/lists/xbase/md.luna88k
index c3886bd04..9ea873396 100644
--- a/distrib/sets/lists/xbase/md.luna88k
+++ b/distrib/sets/lists/xbase/md.luna88k
@@ -6,9 +6,6 @@
 ./usr/X11R6/include/X11/dri/xf86driproto.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
 ./usr/X11R6/include/xorg
-./usr/X11R6/include/xorg/BT.h
-./usr/X11R6/include/xorg/IBM.h
-./usr/X11R6/include/xorg/TI.h
 ./usr/X11R6/include/xorg/XIstubs.h
 ./usr/X11R6/include/xorg/Xprintf.h
 ./usr/X11R6/include/xorg/callback.h
@@ -112,7 +109,6 @@
 ./usr/X11R6/include/xorg/shadow.h
 ./usr/X11R6/include/xorg/shadowfb.h
 ./usr/X11R6/include/xorg/shmint.h
-./usr/X11R6/include/xorg/site.h
 ./usr/X11R6/include/xorg/syncsdk.h
 ./usr/X11R6/include/xorg/validate.h
 ./usr/X11R6/include/xorg/vbe.h
@@ -126,6 +122,7 @@
 ./usr/X11R6/include/xorg/xaarop.h
 ./usr/X11R6/include/xorg/xace.h
 ./usr/X11R6/include/xorg/xacestr.h
+./usr/X11R6/include/xorg/xf86-input-inputtest-protocol.h
 ./usr/X11R6/include/xorg/xf86-mouse-properties.h
 ./usr/X11R6/include/xorg/xf86.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
@@ -142,7 +139,6 @@
 ./usr/X11R6/include/xorg/xf86PciInfo.h
 ./usr/X11R6/include/xorg/xf86Priv.h
 ./usr/X11R6/include/xorg/xf86Privstr.h
-./usr/X11R6/include/xorg/xf86RamDac.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86VGAarbiter.h
 ./usr/X11R6/include/xorg/xf86Xinput.h
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index 39d5d78bc..00bd0d393 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -79,9 +79,6 @@
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
 ./usr/X11R6/include/xorg
-./usr/X11R6/include/xorg/BT.h
-./usr/X11R6/include/xorg/IBM.h
-./usr/X11R6/include/xorg/TI.h
 ./usr/X11R6/include/xorg/XIstubs.h
 ./usr/X11R6/include/xorg/Xprintf.h
 ./usr/X11R6/include/xorg/callback.h
@@ -186,7 +183,6 @@
 ./usr/X11R6/include/xorg/shadow.h
 ./usr/X11R6/include/xorg/shadowfb.h
 ./usr/X11R6/include/xorg/shmint.h
-./usr/X11R6/include/xorg/site.h
 ./usr/X11R6/include/xorg/syncsdk.h
 ./usr/X11R6/include/xorg/validate.h
 ./usr/X11R6/include/xorg/vbe.h
@@ -200,6 +196,7 @@
 ./usr/X11R6/include/xorg/xaarop.h
 ./usr/X11R6/include/xorg/xace.h
 ./usr/X11R6/include/xorg/xacestr.h
+./usr/X11R6/include/xorg/xf86-input-inputtest-protocol.h
 ./usr/X11R6/include/xorg/xf86-mouse-properties.h
 ./usr/X11R6/include/xorg/xf86.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
@@ -216,7 +213,6 @@
 ./usr/X11R6/include/xorg/xf86PciInfo.h
 ./usr/X11R6/include/xorg/xf86Priv.h
 ./usr/X11R6/include/xorg/xf86Privstr.h
-./usr/X11R6/include/xorg/xf86RamDac.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86VGAarbiter.h
 ./usr/X11R6/include/xorg/xf86Xinput.h
diff --git a/distrib/sets/lists/xbase/md.powerpc64 b/distrib/sets/lists/xbase/md.powerpc64
index 0020058d5..3561b7330 100644
--- a/distrib/sets/lists/xbase/md.powerpc64
+++ b/distrib/sets/lists/xbase/md.powerpc64
@@ -79,9 +79,6 @@
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
 ./usr/X11R6/include/xorg
-./usr/X11R6/include/xorg/BT.h
-./usr/X11R6/include/xorg/IBM.h
-./usr/X11R6/include/xorg/TI.h
 ./usr/X11R6/include/xorg/XIstubs.h
 ./usr/X11R6/include/xorg/Xprintf.h
 ./usr/X11R6/include/xorg/callback.h
@@ -185,7 +182,6 @@
 ./usr/X11R6/include/xorg/shadow.h
 ./usr/X11R6/include/xorg/shadowfb.h
 ./usr/X11R6/include/xorg/shmint.h
-./usr/X11R6/include/xorg/site.h
 ./usr/X11R6/include/xorg/syncsdk.h
 ./usr/X11R6/include/xorg/validate.h
 ./usr/X11R6/include/xorg/vbe.h
@@ -199,6 +195,7 @@
 ./usr/X11R6/include/xorg/xaarop.h
 ./usr/X11R6/include/xorg/xace.h
 ./usr/X11R6/include/xorg/xacestr.h
+./usr/X11R6/include/xorg/xf86-input-inputtest-protocol.h
 ./usr/X11R6/include/xorg/xf86-mouse-properties.h
 ./usr/X11R6/include/xorg/xf86.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
@@ -215,7 +212,6 @@
 ./usr/X11R6/include/xorg/xf86PciInfo.h
 ./usr/X11R6/include/xorg/xf86Priv.h
 ./usr/X11R6/include/xorg/xf86Privstr.h
-./usr/X11R6/include/xorg/xf86RamDac.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86VGAarbiter.h
 ./usr/X11R6/include/xorg/xf86Xinput.h
diff --git a/distrib/sets/lists/xbase/md.riscv64 b/distrib/sets/lists/xbase/md.riscv64
index c06b1b1bf..db697757f 100644
--- a/distrib/sets/lists/xbase/md.riscv64
+++ b/distrib/sets/lists/xbase/md.riscv64
@@ -79,9 +79,6 @@
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
 ./usr/X11R6/include/xorg
-./usr/X11R6/include/xorg/BT.h
-./usr/X11R6/include/xorg/IBM.h
-./usr/X11R6/include/xorg/TI.h
 ./usr/X11R6/include/xorg/XIstubs.h
 ./usr/X11R6/include/xorg/Xprintf.h
 ./usr/X11R6/include/xorg/callback.h
@@ -185,7 +182,6 @@
 ./usr/X11R6/include/xorg/shadow.h
 ./usr/X11R6/include/xorg/shadowfb.h
 ./usr/X11R6/include/xorg/shmint.h
-./usr/X11R6/include/xorg/site.h
 ./usr/X11R6/include/xorg/syncsdk.h
 ./usr/X11R6/include/xorg/validate.h
 ./usr/X11R6/include/xorg/vbe.h
@@ -198,6 +194,7 @@
 ./usr/X11R6/include/xorg/xaarop.h
 ./usr/X11R6/include/xorg/xace.h
 ./usr/X11R6/include/xorg/xacestr.h
+./usr/X11R6/include/xorg/xf86-input-inputtest-protocol.h
 ./usr/X11R6/include/xorg/xf86.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
 ./usr/X11R6/include/xorg/xf86Cursor.h
@@ -213,7 +210,6 @@
 ./usr/X11R6/include/xorg/xf86PciInfo.h
 ./usr/X11R6/include/xorg/xf86Priv.h
 ./usr/X11R6/include/xorg/xf86Privstr.h
-./usr/X11R6/include/xorg/xf86RamDac.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86VGAarbiter.h
 ./usr/X11R6/include/xorg/xf86Xinput.h
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index 68477c168..78dde00c7 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -79,9 +79,6 @@
 ./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
 ./usr/X11R6/include/xorg
-./usr/X11R6/include/xorg/BT.h
-./usr/X11R6/include/xorg/IBM.h
-./usr/X11R6/include/xorg/TI.h
 ./usr/X11R6/include/xorg/XIstubs.h
 ./usr/X11R6/include/xorg/Xprintf.h
 ./usr/X11R6/include/xorg/callback.h
@@ -186,7 +183,6 @@
 ./usr/X11R6/include/xorg/shadow.h
 ./usr/X11R6/include/xorg/shadowfb.h
 ./usr/X11R6/include/xorg/shmint.h
-./usr/X11R6/include/xorg/site.h
 ./usr/X11R6/include/xorg/syncsdk.h
 ./usr/X11R6/include/xorg/validate.h
 ./usr/X11R6/include/xorg/vbe.h
@@ -200,6 +196,7 @@
 ./usr/X11R6/include/xorg/xaarop.h
 ./usr/X11R6/include/xorg/xace.h
 ./usr/X11R6/include/xorg/xacestr.h
+./usr/X11R6/include/xorg/xf86-input-inputtest-protocol.h
 ./usr/X11R6/include/xorg/xf86-mouse-properties.h
 ./usr/X11R6/include/xorg/xf86.h
 ./usr/X11R6/include/xorg/xf86Crtc.h
@@ -216,7 +213,6 @@
 ./usr/X11R6/include/xorg/xf86PciInfo.h
 ./usr/X11R6/include/xorg/xf86Priv.h
 ./usr/X11R6/include/xorg/xf86Privstr.h
-./usr/X11R6/include/xorg/xf86RamDac.h
 ./usr/X11R6/include/xorg/xf86RandR12.h
 ./usr/X11R6/include/xorg/xf86VGAarbiter.h
 ./usr/X11R6/include/xorg/xf86Xinput.h
diff --git a/distrib/sets/lists/xbase/mi b/distrib/sets/lists/xbase/mi
index af4fba227..0abb00656 100644
--- a/distrib/sets/lists/xbase/mi
+++ b/distrib/sets/lists/xbase/mi
@@ -30,14 +30,15 @@
 ./etc/fonts/conf.avail/25-unhint-nonlatin.conf
 ./etc/fonts/conf.avail/30-lucida-aliases.conf
 ./etc/fonts/conf.avail/30-metric-aliases.conf
-./etc/fonts/conf.avail/30-urw-aliases.conf
 ./etc/fonts/conf.avail/31-nonmst.conf
 ./etc/fonts/conf.avail/40-nonlatin.conf
 ./etc/fonts/conf.avail/42-luxi-mono.conf
+./etc/fonts/conf.avail/45-generic.conf
 ./etc/fonts/conf.avail/45-latin.conf
 ./etc/fonts/conf.avail/49-sansserif.conf
 ./etc/fonts/conf.avail/50-user.conf
 ./etc/fonts/conf.avail/51-local.conf
+./etc/fonts/conf.avail/60-generic.conf
 ./etc/fonts/conf.avail/60-latin.conf
 ./etc/fonts/conf.avail/65-fonts-persian.conf
 ./etc/fonts/conf.avail/65-khmer.conf
@@ -61,15 +62,14 @@
 ./usr/X11R6/bin/beforelight
 ./usr/X11R6/bin/bitmap
 ./usr/X11R6/bin/bmtoa
+./usr/X11R6/bin/cvt
 ./usr/X11R6/bin/cwm
 ./usr/X11R6/bin/cxpm
 ./usr/X11R6/bin/dga
 ./usr/X11R6/bin/editres
 ./usr/X11R6/bin/fc-cache
-./usr/X11R6/bin/fc-case
 ./usr/X11R6/bin/fc-cat
-./usr/X11R6/bin/fc-glyphname
-./usr/X11R6/bin/fc-lang
+./usr/X11R6/bin/fc-conflist
 ./usr/X11R6/bin/fc-list
 ./usr/X11R6/bin/fc-match
 ./usr/X11R6/bin/fc-pattern
@@ -242,7 +242,7 @@
 ./usr/X11R6/lib/libXext.so.13.0
 ./usr/X11R6/lib/libXfixes.a
 ./usr/X11R6/lib/libXfixes.la
-./usr/X11R6/lib/libXfixes.so.6.0
+./usr/X11R6/lib/libXfixes.so.6.1
 ./usr/X11R6/lib/libXfont2.a
 ./usr/X11R6/lib/libXfont2.la
 ./usr/X11R6/lib/libXfont2.so.2.0
@@ -251,7 +251,7 @@
 ./usr/X11R6/lib/libXft.so.12.0
 ./usr/X11R6/lib/libXi.a
 ./usr/X11R6/lib/libXi.la
-./usr/X11R6/lib/libXi.so.12.1
+./usr/X11R6/lib/libXi.so.12.2
 ./usr/X11R6/lib/libXinerama.a
 ./usr/X11R6/lib/libXinerama.la
 ./usr/X11R6/lib/libXinerama.so.6.0
@@ -299,12 +299,12 @@
 ./usr/X11R6/lib/libXxf86vm.so.6.0
 ./usr/X11R6/lib/libfontconfig.a
 ./usr/X11R6/lib/libfontconfig.la
-./usr/X11R6/lib/libfontconfig.so.13.0
+./usr/X11R6/lib/libfontconfig.so.13.1
 ./usr/X11R6/lib/libfontenc.a
 ./usr/X11R6/lib/libfontenc.la
 ./usr/X11R6/lib/libfontenc.so.4.0
 ./usr/X11R6/lib/libfreetype.a
-./usr/X11R6/lib/libfreetype.so.30.0
+./usr/X11R6/lib/libfreetype.so.30.1
 ./usr/X11R6/lib/libpciaccess.a
 ./usr/X11R6/lib/libpciaccess.la
 ./usr/X11R6/lib/libpciaccess.so.2.0
@@ -383,11 +383,14 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.1.0
 ./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.4.1
+./usr/X11R6/lib/libxcvt.a
+./usr/X11R6/lib/libxcvt.so.0.0
 ./usr/X11R6/lib/libxkbfile.a
 ./usr/X11R6/lib/libxkbfile.la
 ./usr/X11R6/lib/libxkbfile.so.6.0
 ./usr/X11R6/lib/locate
 ./usr/X11R6/lib/locate/xorg.db
+./usr/X11R6/lib/pkgconfig/libxcvt.pc
 ./usr/X11R6/lib/pkgconfig/pixman-1.pc
 ./usr/X11R6/lib/pkgconfig/presentproto.pc
 ./usr/X11R6/lib/pkgconfig/x11-xcb.pc
diff --git a/distrib/sets/lists/xetc/mi b/distrib/sets/lists/xetc/mi
index f0f4b1658..7ccfed5ed 100644
--- a/distrib/sets/lists/xetc/mi
+++ b/distrib/sets/lists/xetc/mi
@@ -10,25 +10,29 @@
 ./etc/X11/xenodm/xenodm-config
 ./etc/X11/xinit/xinitrc
 ./etc/X11/xsm/system.xsm
+./etc/fonts/conf.d/10-hinting-slight.conf
 ./etc/fonts/conf.d/10-scale-bitmap-fonts.conf
+./etc/fonts/conf.d/11-lcd-filter-default.conf
 ./etc/fonts/conf.d/20-unhint-small-dejavu-sans-mono.conf
 ./etc/fonts/conf.d/20-unhint-small-dejavu-sans.conf
 ./etc/fonts/conf.d/20-unhint-small-dejavu-serif.conf
 ./etc/fonts/conf.d/20-unhint-small-vera.conf
 ./etc/fonts/conf.d/30-lucida-aliases.conf
 ./etc/fonts/conf.d/30-metric-aliases.conf
-./etc/fonts/conf.d/30-urw-aliases.conf
 ./etc/fonts/conf.d/31-nonmst.conf
 ./etc/fonts/conf.d/40-nonlatin.conf
 ./etc/fonts/conf.d/42-luxi-mono.conf
+./etc/fonts/conf.d/45-generic.conf
 ./etc/fonts/conf.d/45-latin.conf
 ./etc/fonts/conf.d/49-sansserif.conf
 ./etc/fonts/conf.d/50-user.conf
 ./etc/fonts/conf.d/51-local.conf
+./etc/fonts/conf.d/60-generic.conf
 ./etc/fonts/conf.d/60-latin.conf
 ./etc/fonts/conf.d/65-fonts-persian.conf
 ./etc/fonts/conf.d/65-nonlatin.conf
 ./etc/fonts/conf.d/69-unifont.conf
+./etc/fonts/conf.d/70-no-bitmaps.conf
 ./etc/fonts/conf.d/80-delicious.conf
 ./etc/fonts/conf.d/90-synthetic.conf
 ./var/sysmerge/xetcsum
diff --git a/distrib/sets/lists/xserv/md.amd64 b/distrib/sets/lists/xserv/md.amd64
index b796e93a7..370a6a458 100644
--- a/distrib/sets/lists/xserv/md.amd64
+++ b/distrib/sets/lists/xserv/md.amd64
@@ -1,7 +1,6 @@
 ./usr/X11R6/bin/X
 ./usr/X11R6/bin/Xephyr
 ./usr/X11R6/bin/Xorg
-./usr/X11R6/bin/cvt
 ./usr/X11R6/bin/gtf
 ./usr/X11R6/include/libsync.h
 ./usr/X11R6/lib/modules/dri/i915_dri.so
@@ -68,6 +67,8 @@
 ./usr/X11R6/lib/modules/input/fpit_drv.so
 ./usr/X11R6/lib/modules/input/hyperpen_drv.la
 ./usr/X11R6/lib/modules/input/hyperpen_drv.so
+./usr/X11R6/lib/modules/input/inputtest_drv.la
+./usr/X11R6/lib/modules/input/inputtest_drv.so
 ./usr/X11R6/lib/modules/input/joystick_drv.la
 ./usr/X11R6/lib/modules/input/joystick_drv.so
 ./usr/X11R6/lib/modules/input/kbd_drv.la
@@ -90,8 +91,6 @@
 ./usr/X11R6/lib/modules/input/ws_drv.so
 ./usr/X11R6/lib/modules/libexa.la
 ./usr/X11R6/lib/modules/libexa.so
-./usr/X11R6/lib/modules/libfb.la
-./usr/X11R6/lib/modules/libfb.so
 ./usr/X11R6/lib/modules/libfbdevhw.la
 ./usr/X11R6/lib/modules/libfbdevhw.so
 ./usr/X11R6/lib/modules/libglamoregl.la
@@ -102,8 +101,6 @@
 ./usr/X11R6/lib/modules/libshadow.so
 ./usr/X11R6/lib/modules/libshadowfb.la
 ./usr/X11R6/lib/modules/libshadowfb.so
-./usr/X11R6/lib/modules/libvbe.la
-./usr/X11R6/lib/modules/libvbe.so
 ./usr/X11R6/lib/modules/libvgahw.la
 ./usr/X11R6/lib/modules/libvgahw.so
 ./usr/X11R6/lib/modules/libwfb.la
@@ -114,7 +111,6 @@
 ./usr/X11R6/lib/pkgconfig/xorg-synaptics.pc
 ./usr/X11R6/man/man1/Xephyr.1
 ./usr/X11R6/man/man1/Xorg.1
-./usr/X11R6/man/man1/cvt.1
 ./usr/X11R6/man/man1/gtf.1
 ./usr/X11R6/man/man1/synclient.1
 ./usr/X11R6/man/man1/syndaemon.1
@@ -127,6 +123,7 @@
 ./usr/X11R6/man/man4/exa.4
 ./usr/X11R6/man/man4/fbdevhw.4
 ./usr/X11R6/man/man4/fpit.4
+./usr/X11R6/man/man4/inputtestdrv.4
 ./usr/X11R6/man/man4/intel.4
 ./usr/X11R6/man/man4/joystick.4
 ./usr/X11R6/man/man4/kbd.4
diff --git a/distrib/sets/lists/xserv/md.arm64 b/distrib/sets/lists/xserv/md.arm64
index 9efd82389..ac9db644a 100644
--- a/distrib/sets/lists/xserv/md.arm64
+++ b/distrib/sets/lists/xserv/md.arm64
@@ -1,7 +1,6 @@
 ./usr/X11R6/bin/X
 ./usr/X11R6/bin/Xephyr
 ./usr/X11R6/bin/Xorg
-./usr/X11R6/bin/cvt
 ./usr/X11R6/bin/gtf
 ./usr/X11R6/include/libsync.h
 ./usr/X11R6/lib/modules/dri/kms_swrast_dri.so
@@ -25,6 +24,8 @@
 ./usr/X11R6/lib/modules/drivers/wsudl_drv.so
 ./usr/X11R6/lib/modules/extensions/libglx.la
 ./usr/X11R6/lib/modules/extensions/libglx.so
+./usr/X11R6/lib/modules/input/inputtest_drv.la
+./usr/X11R6/lib/modules/input/inputtest_drv.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
@@ -37,8 +38,6 @@
 ./usr/X11R6/lib/modules/input/ws_drv.so
 ./usr/X11R6/lib/modules/libexa.la
 ./usr/X11R6/lib/modules/libexa.so
-./usr/X11R6/lib/modules/libfb.la
-./usr/X11R6/lib/modules/libfb.so
 ./usr/X11R6/lib/modules/libfbdevhw.la
 ./usr/X11R6/lib/modules/libfbdevhw.so
 ./usr/X11R6/lib/modules/libglamoregl.la
@@ -49,8 +48,6 @@
 ./usr/X11R6/lib/modules/libshadow.so
 ./usr/X11R6/lib/modules/libshadowfb.la
 ./usr/X11R6/lib/modules/libshadowfb.so
-./usr/X11R6/lib/modules/libvbe.la
-./usr/X11R6/lib/modules/libvbe.so
 ./usr/X11R6/lib/modules/libvgahw.la
 ./usr/X11R6/lib/modules/libvgahw.so
 ./usr/X11R6/lib/modules/libwfb.la
@@ -59,12 +56,12 @@
 ./usr/X11R6/lib/pkgconfig/xorg-server.pc
 ./usr/X11R6/man/man1/Xephyr.1
 ./usr/X11R6/man/man1/Xorg.1
-./usr/X11R6/man/man1/cvt.1
 ./usr/X11R6/man/man1/gtf.1
 ./usr/X11R6/man/man4/amdgpu.4
 ./usr/X11R6/man/man4/ati.4
 ./usr/X11R6/man/man4/exa.4
 ./usr/X11R6/man/man4/fbdevhw.4
+./usr/X11R6/man/man4/inputtestdrv.4
 ./usr/X11R6/man/man4/kbd.4
 ./usr/X11R6/man/man4/modesetting.4
 ./usr/X11R6/man/man4/mouse.4
diff --git a/distrib/sets/lists/xserv/md.armv7 b/distrib/sets/lists/xserv/md.armv7
index f11dbc2ba..8a28acefa 100644
--- a/distrib/sets/lists/xserv/md.armv7
+++ b/distrib/sets/lists/xserv/md.armv7
@@ -1,7 +1,6 @@
 ./usr/X11R6/bin/X
 ./usr/X11R6/bin/Xephyr
 ./usr/X11R6/bin/Xorg
-./usr/X11R6/bin/cvt
 ./usr/X11R6/bin/gtf
 ./usr/X11R6/include/libsync.h
 ./usr/X11R6/lib/modules/dri/kms_swrast_dri.so
@@ -14,6 +13,8 @@
 ./usr/X11R6/lib/modules/drivers/wsudl_drv.so
 ./usr/X11R6/lib/modules/extensions/libglx.la
 ./usr/X11R6/lib/modules/extensions/libglx.so
+./usr/X11R6/lib/modules/input/inputtest_drv.la
+./usr/X11R6/lib/modules/input/inputtest_drv.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
@@ -26,8 +27,6 @@
 ./usr/X11R6/lib/modules/input/ws_drv.so
 ./usr/X11R6/lib/modules/libexa.la
 ./usr/X11R6/lib/modules/libexa.so
-./usr/X11R6/lib/modules/libfb.la
-./usr/X11R6/lib/modules/libfb.so
 ./usr/X11R6/lib/modules/libfbdevhw.la
 ./usr/X11R6/lib/modules/libfbdevhw.so
 ./usr/X11R6/lib/modules/libglamoregl.la
@@ -38,8 +37,6 @@
 ./usr/X11R6/lib/modules/libshadow.so
 ./usr/X11R6/lib/modules/libshadowfb.la
 ./usr/X11R6/lib/modules/libshadowfb.so
-./usr/X11R6/lib/modules/libvbe.la
-./usr/X11R6/lib/modules/libvbe.so
 ./usr/X11R6/lib/modules/libvgahw.la
 ./usr/X11R6/lib/modules/libvgahw.so
 ./usr/X11R6/lib/modules/libwfb.la
@@ -48,10 +45,10 @@
 ./usr/X11R6/lib/pkgconfig/xorg-server.pc
 ./usr/X11R6/man/man1/Xephyr.1
 ./usr/X11R6/man/man1/Xorg.1
-./usr/X11R6/man/man1/cvt.1
 ./usr/X11R6/man/man1/gtf.1
 ./usr/X11R6/man/man4/exa.4
 ./usr/X11R6/man/man4/fbdevhw.4
+./usr/X11R6/man/man4/inputtestdrv.4
 ./usr/X11R6/man/man4/kbd.4
 ./usr/X11R6/man/man4/modesetting.4
 ./usr/X11R6/man/man4/mouse.4
diff --git a/distrib/sets/lists/xserv/md.hppa b/distrib/sets/lists/xserv/md.hppa
index b38f92235..91f370492 100644
--- a/distrib/sets/lists/xserv/md.hppa
+++ b/distrib/sets/lists/xserv/md.hppa
@@ -1,12 +1,13 @@
 ./usr/X11R6/bin/X
 ./usr/X11R6/bin/Xorg
-./usr/X11R6/bin/cvt
 ./usr/X11R6/bin/gtf
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/lib/modules/drivers/wsfb_drv.la
 ./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/input/inputtest_drv.la
+./usr/X11R6/lib/modules/input/inputtest_drv.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
@@ -19,8 +20,6 @@
 ./usr/X11R6/lib/modules/input/ws_drv.so
 ./usr/X11R6/lib/modules/libexa.la
 ./usr/X11R6/lib/modules/libexa.so
-./usr/X11R6/lib/modules/libfb.la
-./usr/X11R6/lib/modules/libfb.so
 ./usr/X11R6/lib/modules/libfbdevhw.la
 ./usr/X11R6/lib/modules/libfbdevhw.so
 ./usr/X11R6/lib/modules/libint10.la
@@ -29,8 +28,6 @@
 ./usr/X11R6/lib/modules/libshadow.so
 ./usr/X11R6/lib/modules/libshadowfb.la
 ./usr/X11R6/lib/modules/libshadowfb.so
-./usr/X11R6/lib/modules/libvbe.la
-./usr/X11R6/lib/modules/libvbe.so
 ./usr/X11R6/lib/modules/libvgahw.la
 ./usr/X11R6/lib/modules/libvgahw.so
 ./usr/X11R6/lib/modules/libwfb.la
@@ -40,12 +37,12 @@
 ./usr/X11R6/lib/pkgconfig/xorg-server.pc
 ./usr/X11R6/man/man1/Xorg.1
 ./usr/X11R6/man/man1/bdftruncate.1
-./usr/X11R6/man/man1/cvt.1
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/gtf.1
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man4/exa.4
 ./usr/X11R6/man/man4/fbdevhw.4
+./usr/X11R6/man/man4/inputtestdrv.4
 ./usr/X11R6/man/man4/kbd.4
 ./usr/X11R6/man/man4/mouse.4
 ./usr/X11R6/man/man4/mousedrv.4
diff --git a/distrib/sets/lists/xserv/md.i386 b/distrib/sets/lists/xserv/md.i386
index baef8aee6..71253fa3e 100644
--- a/distrib/sets/lists/xserv/md.i386
+++ b/distrib/sets/lists/xserv/md.i386
@@ -1,7 +1,6 @@
 ./usr/X11R6/bin/X
 ./usr/X11R6/bin/Xephyr
 ./usr/X11R6/bin/Xorg
-./usr/X11R6/bin/cvt
 ./usr/X11R6/bin/gtf
 ./usr/X11R6/include/libsync.h
 ./usr/X11R6/lib/modules/dri/i915_dri.so
@@ -70,6 +69,8 @@
 ./usr/X11R6/lib/modules/input/fpit_drv.so
 ./usr/X11R6/lib/modules/input/hyperpen_drv.la
 ./usr/X11R6/lib/modules/input/hyperpen_drv.so
+./usr/X11R6/lib/modules/input/inputtest_drv.la
+./usr/X11R6/lib/modules/input/inputtest_drv.so
 ./usr/X11R6/lib/modules/input/joystick_drv.la
 ./usr/X11R6/lib/modules/input/joystick_drv.so
 ./usr/X11R6/lib/modules/input/kbd_drv.la
@@ -92,8 +93,6 @@
 ./usr/X11R6/lib/modules/input/ws_drv.so
 ./usr/X11R6/lib/modules/libexa.la
 ./usr/X11R6/lib/modules/libexa.so
-./usr/X11R6/lib/modules/libfb.la
-./usr/X11R6/lib/modules/libfb.so
 ./usr/X11R6/lib/modules/libfbdevhw.la
 ./usr/X11R6/lib/modules/libfbdevhw.so
 ./usr/X11R6/lib/modules/libglamoregl.la
@@ -104,8 +103,6 @@
 ./usr/X11R6/lib/modules/libshadow.so
 ./usr/X11R6/lib/modules/libshadowfb.la
 ./usr/X11R6/lib/modules/libshadowfb.so
-./usr/X11R6/lib/modules/libvbe.la
-./usr/X11R6/lib/modules/libvbe.so
 ./usr/X11R6/lib/modules/libvgahw.la
 ./usr/X11R6/lib/modules/libvgahw.so
 ./usr/X11R6/lib/modules/libwfb.la
@@ -116,7 +113,6 @@
 ./usr/X11R6/lib/pkgconfig/xorg-synaptics.pc
 ./usr/X11R6/man/man1/Xephyr.1
 ./usr/X11R6/man/man1/Xorg.1
-./usr/X11R6/man/man1/cvt.1
 ./usr/X11R6/man/man1/gtf.1
 ./usr/X11R6/man/man1/synclient.1
 ./usr/X11R6/man/man1/syndaemon.1
@@ -129,6 +125,7 @@
 ./usr/X11R6/man/man4/exa.4
 ./usr/X11R6/man/man4/fbdevhw.4
 ./usr/X11R6/man/man4/fpit.4
+./usr/X11R6/man/man4/inputtestdrv.4
 ./usr/X11R6/man/man4/intel.4
 ./usr/X11R6/man/man4/joystick.4
 ./usr/X11R6/man/man4/kbd.4
diff --git a/distrib/sets/lists/xserv/md.luna88k b/distrib/sets/lists/xserv/md.luna88k
index c56b248a9..0e4b6556b 100644
--- a/distrib/sets/lists/xserv/md.luna88k
+++ b/distrib/sets/lists/xserv/md.luna88k
@@ -2,6 +2,8 @@
 ./usr/X11R6/bin/Xorg
 ./usr/X11R6/lib/modules/drivers/wsfb_drv.la
 ./usr/X11R6/lib/modules/drivers/wsfb_drv.so
+./usr/X11R6/lib/modules/input/inputtest_drv.la
+./usr/X11R6/lib/modules/input/inputtest_drv.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
@@ -14,8 +16,6 @@
 ./usr/X11R6/lib/modules/input/ws_drv.so
 ./usr/X11R6/lib/modules/libexa.la
 ./usr/X11R6/lib/modules/libexa.so
-./usr/X11R6/lib/modules/libfb.la
-./usr/X11R6/lib/modules/libfb.so
 ./usr/X11R6/lib/modules/libfbdevhw.la
 ./usr/X11R6/lib/modules/libfbdevhw.so
 ./usr/X11R6/lib/modules/libint10.la
@@ -24,8 +24,6 @@
 ./usr/X11R6/lib/modules/libshadow.so
 ./usr/X11R6/lib/modules/libshadowfb.la
 ./usr/X11R6/lib/modules/libshadowfb.so
-./usr/X11R6/lib/modules/libvbe.la
-./usr/X11R6/lib/modules/libvbe.so
 ./usr/X11R6/lib/modules/libvgahw.la
 ./usr/X11R6/lib/modules/libvgahw.so
 ./usr/X11R6/lib/modules/libwfb.la
@@ -35,6 +33,7 @@
 ./usr/X11R6/man/man1/Xorg.1
 ./usr/X11R6/man/man4/exa.4
 ./usr/X11R6/man/man4/fbdevhw.4
+./usr/X11R6/man/man4/inputtestdrv.4
 ./usr/X11R6/man/man4/kbd.4
 ./usr/X11R6/man/man4/mouse.4
 ./usr/X11R6/man/man4/mousedrv.4
diff --git a/distrib/sets/lists/xserv/md.macppc b/distrib/sets/lists/xserv/md.macppc
index e56327bc3..fd22d8bcc 100644
--- a/distrib/sets/lists/xserv/md.macppc
+++ b/distrib/sets/lists/xserv/md.macppc
@@ -1,7 +1,6 @@
 ./usr/X11R6/bin/X
 ./usr/X11R6/bin/Xephyr
 ./usr/X11R6/bin/Xorg
-./usr/X11R6/bin/cvt
 ./usr/X11R6/bin/gtf
 ./usr/X11R6/include/libsync.h
 ./usr/X11R6/lib/modules/dri/kms_swrast_dri.so
@@ -36,6 +35,8 @@
 ./usr/X11R6/lib/modules/input/fpit_drv.so
 ./usr/X11R6/lib/modules/input/hyperpen_drv.la
 ./usr/X11R6/lib/modules/input/hyperpen_drv.so
+./usr/X11R6/lib/modules/input/inputtest_drv.la
+./usr/X11R6/lib/modules/input/inputtest_drv.so
 ./usr/X11R6/lib/modules/input/joystick_drv.la
 ./usr/X11R6/lib/modules/input/joystick_drv.so
 ./usr/X11R6/lib/modules/input/kbd_drv.la
@@ -54,8 +55,6 @@
 ./usr/X11R6/lib/modules/input/ws_drv.so
 ./usr/X11R6/lib/modules/libexa.la
 ./usr/X11R6/lib/modules/libexa.so
-./usr/X11R6/lib/modules/libfb.la
-./usr/X11R6/lib/modules/libfb.so
 ./usr/X11R6/lib/modules/libfbdevhw.la
 ./usr/X11R6/lib/modules/libfbdevhw.so
 ./usr/X11R6/lib/modules/libglamoregl.la
@@ -66,8 +65,6 @@
 ./usr/X11R6/lib/modules/libshadow.so
 ./usr/X11R6/lib/modules/libshadowfb.la
 ./usr/X11R6/lib/modules/libshadowfb.so
-./usr/X11R6/lib/modules/libvbe.la
-./usr/X11R6/lib/modules/libvbe.so
 ./usr/X11R6/lib/modules/libvgahw.la
 ./usr/X11R6/lib/modules/libvgahw.so
 ./usr/X11R6/lib/modules/libwfb.la
@@ -77,7 +74,6 @@
 ./usr/X11R6/lib/pkgconfig/xorg-server.pc
 ./usr/X11R6/man/man1/Xephyr.1
 ./usr/X11R6/man/man1/Xorg.1
-./usr/X11R6/man/man1/cvt.1
 ./usr/X11R6/man/man1/gtf.1
 ./usr/X11R6/man/man4/acecad.4
 ./usr/X11R6/man/man4/ati.4
@@ -85,6 +81,7 @@
 ./usr/X11R6/man/man4/exa.4
 ./usr/X11R6/man/man4/fbdevhw.4
 ./usr/X11R6/man/man4/fpit.4
+./usr/X11R6/man/man4/inputtestdrv.4
 ./usr/X11R6/man/man4/joystick.4
 ./usr/X11R6/man/man4/kbd.4
 ./usr/X11R6/man/man4/modesetting.4
diff --git a/distrib/sets/lists/xserv/md.powerpc64 b/distrib/sets/lists/xserv/md.powerpc64
index c1883a17e..c97b5de3a 100644
--- a/distrib/sets/lists/xserv/md.powerpc64
+++ b/distrib/sets/lists/xserv/md.powerpc64
@@ -1,7 +1,6 @@
 ./usr/X11R6/bin/X
 ./usr/X11R6/bin/Xephyr
 ./usr/X11R6/bin/Xorg
-./usr/X11R6/bin/cvt
 ./usr/X11R6/bin/gtf
 ./usr/X11R6/include/libsync.h
 ./usr/X11R6/lib/libvulkan_radeon.so
@@ -18,6 +17,8 @@
 ./usr/X11R6/lib/modules/drivers/wsfb_drv.so
 ./usr/X11R6/lib/modules/extensions/libglx.la
 ./usr/X11R6/lib/modules/extensions/libglx.so
+./usr/X11R6/lib/modules/input/inputtest_drv.la
+./usr/X11R6/lib/modules/input/inputtest_drv.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
@@ -30,8 +31,6 @@
 ./usr/X11R6/lib/modules/input/ws_drv.so
 ./usr/X11R6/lib/modules/libexa.la
 ./usr/X11R6/lib/modules/libexa.so
-./usr/X11R6/lib/modules/libfb.la
-./usr/X11R6/lib/modules/libfb.so
 ./usr/X11R6/lib/modules/libfbdevhw.la
 ./usr/X11R6/lib/modules/libfbdevhw.so
 ./usr/X11R6/lib/modules/libglamoregl.la
@@ -42,8 +41,6 @@
 ./usr/X11R6/lib/modules/libshadow.so
 ./usr/X11R6/lib/modules/libshadowfb.la
 ./usr/X11R6/lib/modules/libshadowfb.so
-./usr/X11R6/lib/modules/libvbe.la
-./usr/X11R6/lib/modules/libvbe.so
 ./usr/X11R6/lib/modules/libvgahw.la
 ./usr/X11R6/lib/modules/libvgahw.so
 ./usr/X11R6/lib/modules/libwfb.la
@@ -52,11 +49,11 @@
 ./usr/X11R6/lib/pkgconfig/xorg-server.pc
 ./usr/X11R6/man/man1/Xephyr.1
 ./usr/X11R6/man/man1/Xorg.1
-./usr/X11R6/man/man1/cvt.1
 ./usr/X11R6/man/man1/gtf.1
 ./usr/X11R6/man/man4/ati.4
 ./usr/X11R6/man/man4/exa.4
 ./usr/X11R6/man/man4/fbdevhw.4
+./usr/X11R6/man/man4/inputtestdrv.4
 ./usr/X11R6/man/man4/kbd.4
 ./usr/X11R6/man/man4/modesetting.4
 ./usr/X11R6/man/man4/mouse.4
diff --git a/distrib/sets/lists/xserv/md.riscv64 b/distrib/sets/lists/xserv/md.riscv64
index bfad01d28..7885182c6 100644
--- a/distrib/sets/lists/xserv/md.riscv64
+++ b/distrib/sets/lists/xserv/md.riscv64
@@ -1,7 +1,6 @@
 ./usr/X11R6/bin/X
 ./usr/X11R6/bin/Xephyr
 ./usr/X11R6/bin/Xorg
-./usr/X11R6/bin/cvt
 ./usr/X11R6/bin/gtf
 ./usr/X11R6/include/libsync.h
 ./usr/X11R6/include/xorg/ws-properties.h
@@ -27,6 +26,8 @@
 ./usr/X11R6/lib/modules/drivers/wsudl_drv.so
 ./usr/X11R6/lib/modules/extensions/libglx.la
 ./usr/X11R6/lib/modules/extensions/libglx.so
+./usr/X11R6/lib/modules/input/inputtest_drv.la
+./usr/X11R6/lib/modules/input/inputtest_drv.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
@@ -39,8 +40,6 @@
 ./usr/X11R6/lib/modules/input/ws_drv.so
 ./usr/X11R6/lib/modules/libexa.la
 ./usr/X11R6/lib/modules/libexa.so
-./usr/X11R6/lib/modules/libfb.la
-./usr/X11R6/lib/modules/libfb.so
 ./usr/X11R6/lib/modules/libfbdevhw.la
 ./usr/X11R6/lib/modules/libfbdevhw.so
 ./usr/X11R6/lib/modules/libglamoregl.la
@@ -51,8 +50,6 @@
 ./usr/X11R6/lib/modules/libshadow.so
 ./usr/X11R6/lib/modules/libshadowfb.la
 ./usr/X11R6/lib/modules/libshadowfb.so
-./usr/X11R6/lib/modules/libvbe.la
-./usr/X11R6/lib/modules/libvbe.so
 ./usr/X11R6/lib/modules/libvgahw.la
 ./usr/X11R6/lib/modules/libvgahw.so
 ./usr/X11R6/lib/modules/libwfb.la
@@ -61,12 +58,12 @@
 ./usr/X11R6/lib/pkgconfig/xorg-server.pc
 ./usr/X11R6/man/man1/Xephyr.1
 ./usr/X11R6/man/man1/Xorg.1
-./usr/X11R6/man/man1/cvt.1
 ./usr/X11R6/man/man1/gtf.1
 ./usr/X11R6/man/man4/amdgpu.4
 ./usr/X11R6/man/man4/ati.4
 ./usr/X11R6/man/man4/exa.4
 ./usr/X11R6/man/man4/fbdevhw.4
+./usr/X11R6/man/man4/inputtestdrv.4
 ./usr/X11R6/man/man4/kbd.4
 ./usr/X11R6/man/man4/modesetting.4
 ./usr/X11R6/man/man4/mouse.4
diff --git a/distrib/sets/lists/xserv/md.sparc64 b/distrib/sets/lists/xserv/md.sparc64
index 8055e0d00..35ea42733 100644
--- a/distrib/sets/lists/xserv/md.sparc64
+++ b/distrib/sets/lists/xserv/md.sparc64
@@ -1,7 +1,6 @@
 ./usr/X11R6/bin/X
 ./usr/X11R6/bin/Xephyr
 ./usr/X11R6/bin/Xorg
-./usr/X11R6/bin/cvt
 ./usr/X11R6/bin/gtf
 ./usr/X11R6/include/libsync.h
 ./usr/X11R6/lib/modules/dri/kms_swrast_dri.so
@@ -36,6 +35,8 @@
 ./usr/X11R6/lib/modules/input/fpit_drv.so
 ./usr/X11R6/lib/modules/input/hyperpen_drv.la
 ./usr/X11R6/lib/modules/input/hyperpen_drv.so
+./usr/X11R6/lib/modules/input/inputtest_drv.la
+./usr/X11R6/lib/modules/input/inputtest_drv.so
 ./usr/X11R6/lib/modules/input/joystick_drv.la
 ./usr/X11R6/lib/modules/input/joystick_drv.so
 ./usr/X11R6/lib/modules/input/kbd_drv.la
@@ -54,8 +55,6 @@
 ./usr/X11R6/lib/modules/input/ws_drv.so
 ./usr/X11R6/lib/modules/libexa.la
 ./usr/X11R6/lib/modules/libexa.so
-./usr/X11R6/lib/modules/libfb.la
-./usr/X11R6/lib/modules/libfb.so
 ./usr/X11R6/lib/modules/libfbdevhw.la
 ./usr/X11R6/lib/modules/libfbdevhw.so
 ./usr/X11R6/lib/modules/libglamoregl.la
@@ -66,8 +65,6 @@
 ./usr/X11R6/lib/modules/libshadow.so
 ./usr/X11R6/lib/modules/libshadowfb.la
 ./usr/X11R6/lib/modules/libshadowfb.so
-./usr/X11R6/lib/modules/libvbe.la
-./usr/X11R6/lib/modules/libvbe.so
 ./usr/X11R6/lib/modules/libvgahw.la
 ./usr/X11R6/lib/modules/libvgahw.so
 ./usr/X11R6/lib/modules/libwfb.la
@@ -76,7 +73,6 @@
 ./usr/X11R6/lib/pkgconfig/xorg-server.pc
 ./usr/X11R6/man/man1/Xephyr.1
 ./usr/X11R6/man/man1/Xorg.1
-./usr/X11R6/man/man1/cvt.1
 ./usr/X11R6/man/man1/gtf.1
 ./usr/X11R6/man/man4/acecad.4
 ./usr/X11R6/man/man4/ati.4
@@ -84,6 +80,7 @@
 ./usr/X11R6/man/man4/exa.4
 ./usr/X11R6/man/man4/fbdevhw.4
 ./usr/X11R6/man/man4/fpit.4
+./usr/X11R6/man/man4/inputtestdrv.4
 ./usr/X11R6/man/man4/joystick.4
 ./usr/X11R6/man/man4/kbd.4
 ./usr/X11R6/man/man4/modesetting.4
diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi
index b882d0809..d14483630 100644
--- a/distrib/sets/lists/xshare/mi
+++ b/distrib/sets/lists/xshare/mi
@@ -604,6 +604,7 @@
 ./usr/X11R6/include/freetype2/freetype/ftincrem.h
 ./usr/X11R6/include/freetype2/freetype/ftlcdfil.h
 ./usr/X11R6/include/freetype2/freetype/ftlist.h
+./usr/X11R6/include/freetype2/freetype/ftlogging.h
 ./usr/X11R6/include/freetype2/freetype/ftlzw.h
 ./usr/X11R6/include/freetype2/freetype/ftmac.h
 ./usr/X11R6/include/freetype2/freetype/ftmm.h
@@ -627,6 +628,8 @@
 ./usr/X11R6/include/freetype2/freetype/tttables.h
 ./usr/X11R6/include/freetype2/freetype/tttags.h
 ./usr/X11R6/include/freetype2/ft2build.h
+./usr/X11R6/include/libxcvt/libxcvt.h
+./usr/X11R6/include/libxcvt/libxcvt_mode.h
 ./usr/X11R6/include/pciaccess.h
 ./usr/X11R6/include/xcb/bigreq.h
 ./usr/X11R6/include/xcb/composite.h
@@ -786,11 +789,13 @@
 ./usr/X11R6/man/man1/beforelight.1
 ./usr/X11R6/man/man1/bitmap.1
 ./usr/X11R6/man/man1/bmtoa.1
+./usr/X11R6/man/man1/cvt.1
 ./usr/X11R6/man/man1/cwm.1
 ./usr/X11R6/man/man1/cxpm.1
 ./usr/X11R6/man/man1/editres.1
 ./usr/X11R6/man/man1/fc-cache.1
 ./usr/X11R6/man/man1/fc-cat.1
+./usr/X11R6/man/man1/fc-conflist.1
 ./usr/X11R6/man/man1/fc-list.1
 ./usr/X11R6/man/man1/fc-match.1
 ./usr/X11R6/man/man1/fc-pattern.1
@@ -972,6 +977,7 @@
 ./usr/X11R6/man/man3/FcConfigGetConfigDirs.3
 ./usr/X11R6/man/man3/FcConfigGetConfigFiles.3
 ./usr/X11R6/man/man3/FcConfigGetCurrent.3
+./usr/X11R6/man/man3/FcConfigGetFilename.3
 ./usr/X11R6/man/man3/FcConfigGetFontDirs.3
 ./usr/X11R6/man/man3/FcConfigGetFonts.3
 ./usr/X11R6/man/man3/FcConfigGetRescanInterval.3
@@ -1085,6 +1091,7 @@
 ./usr/X11R6/man/man3/FcRangeDestroy.3
 ./usr/X11R6/man/man3/FcRangeGetDouble.3
 ./usr/X11R6/man/man3/FcStrBasename.3
+./usr/X11R6/man/man3/FcStrBuildFilename.3
 ./usr/X11R6/man/man3/FcStrCmp.3
 ./usr/X11R6/man/man3/FcStrCmpIgnoreCase.3
 ./usr/X11R6/man/man3/FcStrCopy.3
@@ -1407,6 +1414,7 @@
 ./usr/X11R6/man/man3/XGraphicsExposeEvent.3
 ./usr/X11R6/man/man3/XGravityEvent.3
 ./usr/X11R6/man/man3/XHostAddress.3
+./usr/X11R6/man/man3/XIAllowEvents.3
 ./usr/X11R6/man/man3/XIBarrierReleasePointer.3
 ./usr/X11R6/man/man3/XIBarrierReleasePointers.3
 ./usr/X11R6/man/man3/XIChangeHierarchy.3
@@ -3541,8 +3549,6 @@
 ./usr/X11R6/share/doc
 ./usr/X11R6/share/doc/fontconfig
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel.pdf
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel.txt
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcatomiccreate.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcatomicdeletenew.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcatomicdestroy.html
@@ -3594,6 +3600,7 @@
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfiggetconfigdirs.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfiggetconfigfiles.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfiggetcurrent.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfiggetfilename.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfiggetfontdirs.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfiggetfonts.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcconfiggetrescaninterval.html
@@ -3702,6 +3709,7 @@
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcpatternreference.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcpatternremove.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcstrbasename.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcstrbuildfilename.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcstrcmp.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcstrcmpignorecase.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcstrcopy.html
@@ -3733,9 +3741,10 @@
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcvalueequal.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcvalueprint.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/fcvaluesave.html
-./usr/X11R6/share/doc/fontconfig/fontconfig-devel/x102.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/x19.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel/x31.html
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel.pdf
+./usr/X11R6/share/doc/fontconfig/fontconfig-devel.txt
 ./usr/X11R6/share/doc/fontconfig/fontconfig-user.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-user.pdf
 ./usr/X11R6/share/doc/fontconfig/fontconfig-user.txt