sync

20 files changed, 25 insertions, 174 deletions

diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index 4805f909b..5904ad7f6 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -92,7 +92,7 @@
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.16.1
+./usr/X11R6/lib/libfreetype.so.16.2
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 86e1e2af9..bca75eb9c 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -100,7 +100,7 @@
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.16.1
+./usr/X11R6/lib/libfreetype.so.16.2
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish
index fec2ded36..42b5c88f2 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -92,7 +92,7 @@
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.16.1
+./usr/X11R6/lib/libfreetype.so.16.2
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
diff --git a/distrib/sets/lists/xbase/md.hp300 b/distrib/sets/lists/xbase/md.hp300
index 0506356fb..9a5e69e75 100644
--- a/distrib/sets/lists/xbase/md.hp300
+++ b/distrib/sets/lists/xbase/md.hp300
@@ -72,7 +72,7 @@
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.16.1
+./usr/X11R6/lib/libfreetype.so.16.2
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index 6552b6a1a..26e0a5982 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -73,7 +73,7 @@
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.16.1
+./usr/X11R6/lib/libfreetype.so.16.2
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index cf9ebe29f..1b6719c05 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -100,7 +100,7 @@
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.16.1
+./usr/X11R6/lib/libfreetype.so.16.2
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index c8be20e0a..04efa8dc8 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -74,7 +74,7 @@
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.16.1
+./usr/X11R6/lib/libfreetype.so.16.2
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
diff --git a/distrib/sets/lists/xbase/md.mac68k b/distrib/sets/lists/xbase/md.mac68k
index ea6d08adf..eae734ca5 100644
--- a/distrib/sets/lists/xbase/md.mac68k
+++ b/distrib/sets/lists/xbase/md.mac68k
@@ -81,7 +81,7 @@
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.16.1
+./usr/X11R6/lib/libfreetype.so.16.2
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index 46dfc99b4..bfd90d230 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -92,7 +92,7 @@
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.16.1
+./usr/X11R6/lib/libfreetype.so.16.2
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
diff --git a/distrib/sets/lists/xbase/md.mvme68k b/distrib/sets/lists/xbase/md.mvme68k
index 31823fe5a..ec6e59f87 100644
--- a/distrib/sets/lists/xbase/md.mvme68k
+++ b/distrib/sets/lists/xbase/md.mvme68k
@@ -12,14 +12,13 @@
 ./usr/X11R6/include/GL/glu.h
 ./usr/X11R6/include/GL/glx.h
 ./usr/X11R6/include/GL/glxext.h
+./usr/X11R6/include/GL/internal/dri_interface.h
 ./usr/X11R6/include/GL/internal/dri_sarea.h
 ./usr/X11R6/include/GL/osmesa.h
+./usr/X11R6/include/X11/dri/xf86dri.h
+./usr/X11R6/include/X11/dri/xf86dristr.h
+./usr/X11R6/include/xf86drm.h
 ./usr/X11R6/include/xf86drmMode.h
-./usr/X11R6/include/xorg/dixaccess.h
-./usr/X11R6/include/xorg/privates.h
-./usr/X11R6/include/xorg/registry.h
-./usr/X11R6/include/xorg/xkbfile.h
-./usr/X11R6/include/xorg/xkbstr.h
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
 ./usr/X11R6/lib/libGL.so.8.0
@@ -69,19 +68,24 @@
 ./usr/X11R6/lib/libXxf86misc.so.5.0
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
+./usr/X11R6/lib/libdrm.a
+./usr/X11R6/lib/libdrm.so.2.4
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.16.1
+./usr/X11R6/lib/libfreetype.so.16.2
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.12.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
+./usr/X11R6/lib/modules/dri/swrast_dri.so
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/gl.pc
 ./usr/X11R6/lib/pkgconfig/glu.pc
 ./usr/X11R6/lib/pkgconfig/glw.pc
+./usr/X11R6/lib/pkgconfig/libdrm.pc
+./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/lib/xorg
 ./usr/X11R6/lib/xorg/protocol.txt
 ./usr/X11R6/man/cat1/glxgears.0
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index 2bab280af..111d982ad 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -88,7 +88,7 @@
 ./usr/X11R6/lib/libdrm.so.2.4
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.16.1
+./usr/X11R6/lib/libfreetype.so.16.2
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
 ./usr/X11R6/lib/libpixman-1.so.12.0
diff --git a/distrib/sets/lists/xbase/md.sparc b/distrib/sets/lists/xbase/md.sparc
index e7a67969a..a29524d30 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -91,7 +91,7 @@
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.16.1
+./usr/X11R6/lib/libfreetype.so.16.2
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index 2b3640b61..c98f25e19 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -92,7 +92,7 @@
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.16.1
+./usr/X11R6/lib/libfreetype.so.16.2
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus
index fec2ded36..42b5c88f2 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -92,7 +92,7 @@
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.16.1
+./usr/X11R6/lib/libfreetype.so.16.2
 ./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/libpciaccess.so.0.10
diff --git a/distrib/sets/lists/xserv/md.alpha b/distrib/sets/lists/xserv/md.alpha
index a4c38885e..364cfc49f 100644
--- a/distrib/sets/lists/xserv/md.alpha
+++ b/distrib/sets/lists/xserv/md.alpha
@@ -221,18 +221,8 @@
 ./usr/X11R6/lib/modules/fonts/libfreetype.so
 ./usr/X11R6/lib/modules/input/acecad_drv.la
 ./usr/X11R6/lib/modules/input/acecad_drv.so
-./usr/X11R6/lib/modules/input/calcomp_drv.la
-./usr/X11R6/lib/modules/input/calcomp_drv.so
 ./usr/X11R6/lib/modules/input/citron_drv.la
 ./usr/X11R6/lib/modules/input/citron_drv.so
-./usr/X11R6/lib/modules/input/digitaledge_drv.la
-./usr/X11R6/lib/modules/input/digitaledge_drv.so
-./usr/X11R6/lib/modules/input/dmc_drv.la
-./usr/X11R6/lib/modules/input/dmc_drv.so
-./usr/X11R6/lib/modules/input/dynapro_drv.la
-./usr/X11R6/lib/modules/input/dynapro_drv.so
-./usr/X11R6/lib/modules/input/elo2300_drv.la
-./usr/X11R6/lib/modules/input/elo2300_drv.so
 ./usr/X11R6/lib/modules/input/elographics_drv.la
 ./usr/X11R6/lib/modules/input/elographics_drv.so
 ./usr/X11R6/lib/modules/input/fpit_drv.la
@@ -241,28 +231,14 @@
 ./usr/X11R6/lib/modules/input/hyperpen_drv.so
 ./usr/X11R6/lib/modules/input/joystick_drv.la
 ./usr/X11R6/lib/modules/input/joystick_drv.so
-./usr/X11R6/lib/modules/input/js_x_drv.la
-./usr/X11R6/lib/modules/input/js_x_drv.so
 ./usr/X11R6/lib/modules/input/kbd_drv.la
 ./usr/X11R6/lib/modules/input/kbd_drv.so
-./usr/X11R6/lib/modules/input/magellan_drv.la
-./usr/X11R6/lib/modules/input/magellan_drv.so
-./usr/X11R6/lib/modules/input/microtouch_drv.la
-./usr/X11R6/lib/modules/input/microtouch_drv.so
 ./usr/X11R6/lib/modules/input/mouse_drv.la
 ./usr/X11R6/lib/modules/input/mouse_drv.so
 ./usr/X11R6/lib/modules/input/mutouch_drv.la
 ./usr/X11R6/lib/modules/input/mutouch_drv.so
-./usr/X11R6/lib/modules/input/palmax_drv.la
-./usr/X11R6/lib/modules/input/palmax_drv.so
 ./usr/X11R6/lib/modules/input/penmount_drv.la
 ./usr/X11R6/lib/modules/input/penmount_drv.so
-./usr/X11R6/lib/modules/input/spaceorb_drv.la
-./usr/X11R6/lib/modules/input/spaceorb_drv.so
-./usr/X11R6/lib/modules/input/summa_drv.la
-./usr/X11R6/lib/modules/input/summa_drv.so
-./usr/X11R6/lib/modules/input/tek4957_drv.la
-./usr/X11R6/lib/modules/input/tek4957_drv.so
 ./usr/X11R6/lib/modules/input/usbtablet_drv.la
 ./usr/X11R6/lib/modules/input/usbtablet_drv.so
 ./usr/X11R6/lib/modules/input/void_drv.la
@@ -339,12 +315,9 @@
 ./usr/X11R6/man/man4/acecad.4
 ./usr/X11R6/man/man4/apm.4
 ./usr/X11R6/man/man4/ati.4
-./usr/X11R6/man/man4/calcomp.4
 ./usr/X11R6/man/man4/chips.4
 ./usr/X11R6/man/man4/cirrus.4
 ./usr/X11R6/man/man4/citron.4
-./usr/X11R6/man/man4/dmc.4
-./usr/X11R6/man/man4/dynapro.4
 ./usr/X11R6/man/man4/elographics.4
 ./usr/X11R6/man/man4/exa.4
 ./usr/X11R6/man/man4/fbdevhw.4
@@ -352,16 +325,13 @@
 ./usr/X11R6/man/man4/glint.4
 ./usr/X11R6/man/man4/i128.4
 ./usr/X11R6/man/man4/joystick.4
-./usr/X11R6/man/man4/js_x.4
 ./usr/X11R6/man/man4/kbd.4
 ./usr/X11R6/man/man4/mga.4
-./usr/X11R6/man/man4/microtouch.4
 ./usr/X11R6/man/man4/mouse.4
 ./usr/X11R6/man/man4/mousedrv.4
 ./usr/X11R6/man/man4/mutouch.4
 ./usr/X11R6/man/man4/neomagic.4
 ./usr/X11R6/man/man4/nv.4
-./usr/X11R6/man/man4/palmax.4
 ./usr/X11R6/man/man4/penmount.4
 ./usr/X11R6/man/man4/r128.4
 ./usr/X11R6/man/man4/radeon.4
@@ -371,7 +341,6 @@
 ./usr/X11R6/man/man4/siliconmotion.4
 ./usr/X11R6/man/man4/sis.4
 ./usr/X11R6/man/man4/tdfx.4
-./usr/X11R6/man/man4/tek4957.4
 ./usr/X11R6/man/man4/trident.4
 ./usr/X11R6/man/man4/tseng.4
 ./usr/X11R6/man/man4/usbtablet.4
diff --git a/distrib/sets/lists/xserv/md.amd64 b/distrib/sets/lists/xserv/md.amd64
index d505a1431..079c6b1c5 100644
--- a/distrib/sets/lists/xserv/md.amd64
+++ b/distrib/sets/lists/xserv/md.amd64
@@ -251,18 +251,8 @@
 ./usr/X11R6/lib/modules/fonts/libfreetype.so
 ./usr/X11R6/lib/modules/input/acecad_drv.la
 ./usr/X11R6/lib/modules/input/acecad_drv.so
-./usr/X11R6/lib/modules/input/calcomp_drv.la
-./usr/X11R6/lib/modules/input/calcomp_drv.so
 ./usr/X11R6/lib/modules/input/citron_drv.la
 ./usr/X11R6/lib/modules/input/citron_drv.so
-./usr/X11R6/lib/modules/input/digitaledge_drv.la
-./usr/X11R6/lib/modules/input/digitaledge_drv.so
-./usr/X11R6/lib/modules/input/dmc_drv.la
-./usr/X11R6/lib/modules/input/dmc_drv.so
-./usr/X11R6/lib/modules/input/dynapro_drv.la
-./usr/X11R6/lib/modules/input/dynapro_drv.so
-./usr/X11R6/lib/modules/input/elo2300_drv.la
-./usr/X11R6/lib/modules/input/elo2300_drv.so
 ./usr/X11R6/lib/modules/input/elographics_drv.la
 ./usr/X11R6/lib/modules/input/elographics_drv.so
 ./usr/X11R6/lib/modules/input/fpit_drv.la
@@ -271,28 +261,14 @@
 ./usr/X11R6/lib/modules/input/hyperpen_drv.so
 ./usr/X11R6/lib/modules/input/joystick_drv.la
 ./usr/X11R6/lib/modules/input/joystick_drv.so
-./usr/X11R6/lib/modules/input/js_x_drv.la
-./usr/X11R6/lib/modules/input/js_x_drv.so
 ./usr/X11R6/lib/modules/input/kbd_drv.la
 ./usr/X11R6/lib/modules/input/kbd_drv.so
-./usr/X11R6/lib/modules/input/magellan_drv.la
-./usr/X11R6/lib/modules/input/magellan_drv.so
-./usr/X11R6/lib/modules/input/microtouch_drv.la
-./usr/X11R6/lib/modules/input/microtouch_drv.so
 ./usr/X11R6/lib/modules/input/mouse_drv.la
 ./usr/X11R6/lib/modules/input/mouse_drv.so
 ./usr/X11R6/lib/modules/input/mutouch_drv.la
 ./usr/X11R6/lib/modules/input/mutouch_drv.so
-./usr/X11R6/lib/modules/input/palmax_drv.la
-./usr/X11R6/lib/modules/input/palmax_drv.so
 ./usr/X11R6/lib/modules/input/penmount_drv.la
 ./usr/X11R6/lib/modules/input/penmount_drv.so
-./usr/X11R6/lib/modules/input/spaceorb_drv.la
-./usr/X11R6/lib/modules/input/spaceorb_drv.so
-./usr/X11R6/lib/modules/input/summa_drv.la
-./usr/X11R6/lib/modules/input/summa_drv.so
-./usr/X11R6/lib/modules/input/tek4957_drv.la
-./usr/X11R6/lib/modules/input/tek4957_drv.so
 ./usr/X11R6/lib/modules/input/usbtablet_drv.la
 ./usr/X11R6/lib/modules/input/usbtablet_drv.so
 ./usr/X11R6/lib/modules/input/vmmouse_drv.la
@@ -371,12 +347,9 @@
 ./usr/X11R6/man/man4/acecad.4
 ./usr/X11R6/man/man4/apm.4
 ./usr/X11R6/man/man4/ati.4
-./usr/X11R6/man/man4/calcomp.4
 ./usr/X11R6/man/man4/chips.4
 ./usr/X11R6/man/man4/cirrus.4
 ./usr/X11R6/man/man4/citron.4
-./usr/X11R6/man/man4/dmc.4
-./usr/X11R6/man/man4/dynapro.4
 ./usr/X11R6/man/man4/elographics.4
 ./usr/X11R6/man/man4/exa.4
 ./usr/X11R6/man/man4/fbdevhw.4
@@ -385,17 +358,14 @@
 ./usr/X11R6/man/man4/i128.4
 ./usr/X11R6/man/man4/intel.4
 ./usr/X11R6/man/man4/joystick.4
-./usr/X11R6/man/man4/js_x.4
 ./usr/X11R6/man/man4/kbd.4
 ./usr/X11R6/man/man4/mga.4
-./usr/X11R6/man/man4/microtouch.4
 ./usr/X11R6/man/man4/mouse.4
 ./usr/X11R6/man/man4/mousedrv.4
 ./usr/X11R6/man/man4/mutouch.4
 ./usr/X11R6/man/man4/neomagic.4
 ./usr/X11R6/man/man4/nv.4
 ./usr/X11R6/man/man4/openchrome.4
-./usr/X11R6/man/man4/palmax.4
 ./usr/X11R6/man/man4/penmount.4
 ./usr/X11R6/man/man4/r128.4
 ./usr/X11R6/man/man4/radeon.4
@@ -406,7 +376,6 @@
 ./usr/X11R6/man/man4/siliconmotion.4
 ./usr/X11R6/man/man4/sis.4
 ./usr/X11R6/man/man4/tdfx.4
-./usr/X11R6/man/man4/tek4957.4
 ./usr/X11R6/man/man4/trident.4
 ./usr/X11R6/man/man4/tseng.4
 ./usr/X11R6/man/man4/usbtablet.4
diff --git a/distrib/sets/lists/xserv/md.i386 b/distrib/sets/lists/xserv/md.i386
index bb4f122f3..40a990cab 100644
--- a/distrib/sets/lists/xserv/md.i386
+++ b/distrib/sets/lists/xserv/md.i386
@@ -257,18 +257,8 @@
 ./usr/X11R6/lib/modules/fonts/libfreetype.so
 ./usr/X11R6/lib/modules/input/acecad_drv.la
 ./usr/X11R6/lib/modules/input/acecad_drv.so
-./usr/X11R6/lib/modules/input/calcomp_drv.la
-./usr/X11R6/lib/modules/input/calcomp_drv.so
 ./usr/X11R6/lib/modules/input/citron_drv.la
 ./usr/X11R6/lib/modules/input/citron_drv.so
-./usr/X11R6/lib/modules/input/digitaledge_drv.la
-./usr/X11R6/lib/modules/input/digitaledge_drv.so
-./usr/X11R6/lib/modules/input/dmc_drv.la
-./usr/X11R6/lib/modules/input/dmc_drv.so
-./usr/X11R6/lib/modules/input/dynapro_drv.la
-./usr/X11R6/lib/modules/input/dynapro_drv.so
-./usr/X11R6/lib/modules/input/elo2300_drv.la
-./usr/X11R6/lib/modules/input/elo2300_drv.so
 ./usr/X11R6/lib/modules/input/elographics_drv.la
 ./usr/X11R6/lib/modules/input/elographics_drv.so
 ./usr/X11R6/lib/modules/input/fpit_drv.la
@@ -277,28 +267,14 @@
 ./usr/X11R6/lib/modules/input/hyperpen_drv.so
 ./usr/X11R6/lib/modules/input/joystick_drv.la
 ./usr/X11R6/lib/modules/input/joystick_drv.so
-./usr/X11R6/lib/modules/input/js_x_drv.la
-./usr/X11R6/lib/modules/input/js_x_drv.so
 ./usr/X11R6/lib/modules/input/kbd_drv.la
 ./usr/X11R6/lib/modules/input/kbd_drv.so
-./usr/X11R6/lib/modules/input/magellan_drv.la
-./usr/X11R6/lib/modules/input/magellan_drv.so
-./usr/X11R6/lib/modules/input/microtouch_drv.la
-./usr/X11R6/lib/modules/input/microtouch_drv.so
 ./usr/X11R6/lib/modules/input/mouse_drv.la
 ./usr/X11R6/lib/modules/input/mouse_drv.so
 ./usr/X11R6/lib/modules/input/mutouch_drv.la
 ./usr/X11R6/lib/modules/input/mutouch_drv.so
-./usr/X11R6/lib/modules/input/palmax_drv.la
-./usr/X11R6/lib/modules/input/palmax_drv.so
 ./usr/X11R6/lib/modules/input/penmount_drv.la
 ./usr/X11R6/lib/modules/input/penmount_drv.so
-./usr/X11R6/lib/modules/input/spaceorb_drv.la
-./usr/X11R6/lib/modules/input/spaceorb_drv.so
-./usr/X11R6/lib/modules/input/summa_drv.la
-./usr/X11R6/lib/modules/input/summa_drv.so
-./usr/X11R6/lib/modules/input/tek4957_drv.la
-./usr/X11R6/lib/modules/input/tek4957_drv.so
 ./usr/X11R6/lib/modules/input/usbtablet_drv.la
 ./usr/X11R6/lib/modules/input/usbtablet_drv.so
 ./usr/X11R6/lib/modules/input/vmmouse_drv.la
@@ -377,12 +353,9 @@
 ./usr/X11R6/man/man4/acecad.4
 ./usr/X11R6/man/man4/apm.4
 ./usr/X11R6/man/man4/ati.4
-./usr/X11R6/man/man4/calcomp.4
 ./usr/X11R6/man/man4/chips.4
 ./usr/X11R6/man/man4/cirrus.4
 ./usr/X11R6/man/man4/citron.4
-./usr/X11R6/man/man4/dmc.4
-./usr/X11R6/man/man4/dynapro.4
 ./usr/X11R6/man/man4/elographics.4
 ./usr/X11R6/man/man4/exa.4
 ./usr/X11R6/man/man4/fbdevhw.4
@@ -392,17 +365,14 @@
 ./usr/X11R6/man/man4/i740.4
 ./usr/X11R6/man/man4/intel.4
 ./usr/X11R6/man/man4/joystick.4
-./usr/X11R6/man/man4/js_x.4
 ./usr/X11R6/man/man4/kbd.4
 ./usr/X11R6/man/man4/mga.4
-./usr/X11R6/man/man4/microtouch.4
 ./usr/X11R6/man/man4/mouse.4
 ./usr/X11R6/man/man4/mousedrv.4
 ./usr/X11R6/man/man4/mutouch.4
 ./usr/X11R6/man/man4/neomagic.4
 ./usr/X11R6/man/man4/nv.4
 ./usr/X11R6/man/man4/openchrome.4
-./usr/X11R6/man/man4/palmax.4
 ./usr/X11R6/man/man4/penmount.4
 ./usr/X11R6/man/man4/r128.4
 ./usr/X11R6/man/man4/radeon.4
@@ -413,7 +383,6 @@
 ./usr/X11R6/man/man4/siliconmotion.4
 ./usr/X11R6/man/man4/sis.4
 ./usr/X11R6/man/man4/tdfx.4
-./usr/X11R6/man/man4/tek4957.4
 ./usr/X11R6/man/man4/trident.4
 ./usr/X11R6/man/man4/tseng.4
 ./usr/X11R6/man/man4/usbtablet.4
diff --git a/distrib/sets/lists/xserv/md.macppc b/distrib/sets/lists/xserv/md.macppc
index bf0956489..23ca283af 100644
--- a/distrib/sets/lists/xserv/md.macppc
+++ b/distrib/sets/lists/xserv/md.macppc
@@ -179,18 +179,8 @@
 ./usr/X11R6/lib/modules/fonts/libfreetype.so
 ./usr/X11R6/lib/modules/input/acecad_drv.la
 ./usr/X11R6/lib/modules/input/acecad_drv.so
-./usr/X11R6/lib/modules/input/calcomp_drv.la
-./usr/X11R6/lib/modules/input/calcomp_drv.so
 ./usr/X11R6/lib/modules/input/citron_drv.la
 ./usr/X11R6/lib/modules/input/citron_drv.so
-./usr/X11R6/lib/modules/input/digitaledge_drv.la
-./usr/X11R6/lib/modules/input/digitaledge_drv.so
-./usr/X11R6/lib/modules/input/dmc_drv.la
-./usr/X11R6/lib/modules/input/dmc_drv.so
-./usr/X11R6/lib/modules/input/dynapro_drv.la
-./usr/X11R6/lib/modules/input/dynapro_drv.so
-./usr/X11R6/lib/modules/input/elo2300_drv.la
-./usr/X11R6/lib/modules/input/elo2300_drv.so
 ./usr/X11R6/lib/modules/input/elographics_drv.la
 ./usr/X11R6/lib/modules/input/elographics_drv.so
 ./usr/X11R6/lib/modules/input/fpit_drv.la
@@ -199,28 +189,14 @@
 ./usr/X11R6/lib/modules/input/hyperpen_drv.so
 ./usr/X11R6/lib/modules/input/joystick_drv.la
 ./usr/X11R6/lib/modules/input/joystick_drv.so
-./usr/X11R6/lib/modules/input/js_x_drv.la
-./usr/X11R6/lib/modules/input/js_x_drv.so
 ./usr/X11R6/lib/modules/input/kbd_drv.la
 ./usr/X11R6/lib/modules/input/kbd_drv.so
-./usr/X11R6/lib/modules/input/magellan_drv.la
-./usr/X11R6/lib/modules/input/magellan_drv.so
-./usr/X11R6/lib/modules/input/microtouch_drv.la
-./usr/X11R6/lib/modules/input/microtouch_drv.so
 ./usr/X11R6/lib/modules/input/mouse_drv.la
 ./usr/X11R6/lib/modules/input/mouse_drv.so
 ./usr/X11R6/lib/modules/input/mutouch_drv.la
 ./usr/X11R6/lib/modules/input/mutouch_drv.so
-./usr/X11R6/lib/modules/input/palmax_drv.la
-./usr/X11R6/lib/modules/input/palmax_drv.so
 ./usr/X11R6/lib/modules/input/penmount_drv.la
 ./usr/X11R6/lib/modules/input/penmount_drv.so
-./usr/X11R6/lib/modules/input/spaceorb_drv.la
-./usr/X11R6/lib/modules/input/spaceorb_drv.so
-./usr/X11R6/lib/modules/input/summa_drv.la
-./usr/X11R6/lib/modules/input/summa_drv.so
-./usr/X11R6/lib/modules/input/tek4957_drv.la
-./usr/X11R6/lib/modules/input/tek4957_drv.so
 ./usr/X11R6/lib/modules/input/usbtablet_drv.la
 ./usr/X11R6/lib/modules/input/usbtablet_drv.so
 ./usr/X11R6/lib/modules/input/void_drv.la
@@ -294,27 +270,20 @@
 ./usr/X11R6/man/man1/xorgconfig.1
 ./usr/X11R6/man/man4/acecad.4
 ./usr/X11R6/man/man4/ati.4
-./usr/X11R6/man/man4/calcomp.4
 ./usr/X11R6/man/man4/citron.4
-./usr/X11R6/man/man4/dmc.4
-./usr/X11R6/man/man4/dynapro.4
 ./usr/X11R6/man/man4/elographics.4
 ./usr/X11R6/man/man4/exa.4
 ./usr/X11R6/man/man4/fbdevhw.4
 ./usr/X11R6/man/man4/fpit.4
 ./usr/X11R6/man/man4/joystick.4
-./usr/X11R6/man/man4/js_x.4
 ./usr/X11R6/man/man4/kbd.4
-./usr/X11R6/man/man4/microtouch.4
 ./usr/X11R6/man/man4/mouse.4
 ./usr/X11R6/man/man4/mousedrv.4
 ./usr/X11R6/man/man4/mutouch.4
 ./usr/X11R6/man/man4/nv.4
-./usr/X11R6/man/man4/palmax.4
 ./usr/X11R6/man/man4/penmount.4
 ./usr/X11R6/man/man4/r128.4
 ./usr/X11R6/man/man4/radeon.4
-./usr/X11R6/man/man4/tek4957.4
 ./usr/X11R6/man/man4/usbtablet.4
 ./usr/X11R6/man/man4/void.4
 ./usr/X11R6/man/man4/ws.4
diff --git a/distrib/sets/lists/xserv/md.sparc64 b/distrib/sets/lists/xserv/md.sparc64
index 050819799..0116c3228 100644
--- a/distrib/sets/lists/xserv/md.sparc64
+++ b/distrib/sets/lists/xserv/md.sparc64
@@ -186,18 +186,8 @@
 ./usr/X11R6/lib/modules/fonts/libfreetype.so
 ./usr/X11R6/lib/modules/input/acecad_drv.la
 ./usr/X11R6/lib/modules/input/acecad_drv.so
-./usr/X11R6/lib/modules/input/calcomp_drv.la
-./usr/X11R6/lib/modules/input/calcomp_drv.so
 ./usr/X11R6/lib/modules/input/citron_drv.la
 ./usr/X11R6/lib/modules/input/citron_drv.so
-./usr/X11R6/lib/modules/input/digitaledge_drv.la
-./usr/X11R6/lib/modules/input/digitaledge_drv.so
-./usr/X11R6/lib/modules/input/dmc_drv.la
-./usr/X11R6/lib/modules/input/dmc_drv.so
-./usr/X11R6/lib/modules/input/dynapro_drv.la
-./usr/X11R6/lib/modules/input/dynapro_drv.so
-./usr/X11R6/lib/modules/input/elo2300_drv.la
-./usr/X11R6/lib/modules/input/elo2300_drv.so
 ./usr/X11R6/lib/modules/input/elographics_drv.la
 ./usr/X11R6/lib/modules/input/elographics_drv.so
 ./usr/X11R6/lib/modules/input/fpit_drv.la
@@ -206,28 +196,14 @@
 ./usr/X11R6/lib/modules/input/hyperpen_drv.so
 ./usr/X11R6/lib/modules/input/joystick_drv.la
 ./usr/X11R6/lib/modules/input/joystick_drv.so
-./usr/X11R6/lib/modules/input/js_x_drv.la
-./usr/X11R6/lib/modules/input/js_x_drv.so
 ./usr/X11R6/lib/modules/input/kbd_drv.la
 ./usr/X11R6/lib/modules/input/kbd_drv.so
-./usr/X11R6/lib/modules/input/magellan_drv.la
-./usr/X11R6/lib/modules/input/magellan_drv.so
-./usr/X11R6/lib/modules/input/microtouch_drv.la
-./usr/X11R6/lib/modules/input/microtouch_drv.so
 ./usr/X11R6/lib/modules/input/mouse_drv.la
 ./usr/X11R6/lib/modules/input/mouse_drv.so
 ./usr/X11R6/lib/modules/input/mutouch_drv.la
 ./usr/X11R6/lib/modules/input/mutouch_drv.so
-./usr/X11R6/lib/modules/input/palmax_drv.la
-./usr/X11R6/lib/modules/input/palmax_drv.so
 ./usr/X11R6/lib/modules/input/penmount_drv.la
 ./usr/X11R6/lib/modules/input/penmount_drv.so
-./usr/X11R6/lib/modules/input/spaceorb_drv.la
-./usr/X11R6/lib/modules/input/spaceorb_drv.so
-./usr/X11R6/lib/modules/input/summa_drv.la
-./usr/X11R6/lib/modules/input/summa_drv.so
-./usr/X11R6/lib/modules/input/tek4957_drv.la
-./usr/X11R6/lib/modules/input/tek4957_drv.so
 ./usr/X11R6/lib/modules/input/usbtablet_drv.la
 ./usr/X11R6/lib/modules/input/usbtablet_drv.so
 ./usr/X11R6/lib/modules/input/void_drv.la
@@ -301,27 +277,20 @@
 ./usr/X11R6/man/man1/xorgconfig.1
 ./usr/X11R6/man/man4/acecad.4
 ./usr/X11R6/man/man4/ati.4
-./usr/X11R6/man/man4/calcomp.4
 ./usr/X11R6/man/man4/citron.4
-./usr/X11R6/man/man4/dmc.4
-./usr/X11R6/man/man4/dynapro.4
 ./usr/X11R6/man/man4/elographics.4
 ./usr/X11R6/man/man4/exa.4
 ./usr/X11R6/man/man4/fbdevhw.4
 ./usr/X11R6/man/man4/fpit.4
 ./usr/X11R6/man/man4/joystick.4
-./usr/X11R6/man/man4/js_x.4
 ./usr/X11R6/man/man4/kbd.4
-./usr/X11R6/man/man4/microtouch.4
 ./usr/X11R6/man/man4/mouse.4
 ./usr/X11R6/man/man4/mousedrv.4
 ./usr/X11R6/man/man4/mutouch.4
-./usr/X11R6/man/man4/palmax.4
 ./usr/X11R6/man/man4/penmount.4
 ./usr/X11R6/man/man4/r128.4
 ./usr/X11R6/man/man4/radeon.4
 ./usr/X11R6/man/man4/sunffb.4
-./usr/X11R6/man/man4/tek4957.4
 ./usr/X11R6/man/man4/usbtablet.4
 ./usr/X11R6/man/man4/void.4
 ./usr/X11R6/man/man4/wildcatfb.4
diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi
index 7dff3d1b0..9a11f6ffa 100644
--- a/distrib/sets/lists/xshare/mi
+++ b/distrib/sets/lists/xshare/mi
@@ -595,6 +595,7 @@
 ./usr/X11R6/include/freetype2/freetype/config/ftoption.h
 ./usr/X11R6/include/freetype2/freetype/config/ftstdlib.h
 ./usr/X11R6/include/freetype2/freetype/freetype.h
+./usr/X11R6/include/freetype2/freetype/ftadvanc.h
 ./usr/X11R6/include/freetype2/freetype/ftbbox.h
 ./usr/X11R6/include/freetype2/freetype/ftbdf.h
 ./usr/X11R6/include/freetype2/freetype/ftbitmap.h
@@ -1640,6 +1641,7 @@
 ./usr/X11R6/man/man3/XSaveContext.3
 ./usr/X11R6/man/man3/XScreenNumberOfScreen.3
 ./usr/X11R6/man/man3/XScreenResourceString.3
+./usr/X11R6/man/man3/XScreenSaver.3
 ./usr/X11R6/man/man3/XScreenSaverAllocInfo.3
 ./usr/X11R6/man/man3/XScreenSaverGetRegistered.3
 ./usr/X11R6/man/man3/XScreenSaverQueryExtension.3