more

3 files changed, 451 insertions, 467 deletions

diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index bdab388bb..30fa0d4c7 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -1,5 +1,3 @@
-./etc/X11
-./etc/X11/app-defaults
 ./etc/X11/fs
 ./etc/X11/lbxproxy
 ./etc/X11/proxymngr
@@ -12,9 +10,6 @@
 ./etc/X11/xdm/pixmaps
 ./etc/X11/xinit
 ./etc/X11/xkb
-./etc/X11/xkb/README
-./etc/X11/xkb/README.config
-./etc/X11/xkb/README.enhancing
 ./etc/X11/xkb/compat
 ./etc/X11/xkb/compat.dir
 ./etc/X11/xkb/compat/README
@@ -36,6 +31,7 @@
 ./etc/X11/xkb/compat/xfree86
 ./etc/X11/xkb/compat/xtest
 ./etc/X11/xkb/compiled
+./etc/X11/xkb/compiled/README.compiled
 ./etc/X11/xkb/geometry
 ./etc/X11/xkb/geometry.dir
 ./etc/X11/xkb/geometry/README
@@ -144,10 +140,10 @@
 ./etc/X11/xkb/rules/sgi.lst
 ./etc/X11/xkb/rules/sun
 ./etc/X11/xkb/rules/sun.lst
-./etc/X11/xkb/rules/xfree86
-./etc/X11/xkb/rules/xfree86-it.lst
-./etc/X11/xkb/rules/xfree86.lst
-./etc/X11/xkb/rules/xfree86.xml
+./etc/X11/xkb/rules/xfree98
+./etc/X11/xkb/rules/xfree98.lst
+./etc/X11/xkb/rules/xkb.dtd
+./etc/X11/xkb/rules/xml2lst.pl
 ./etc/X11/xkb/rules/xorg
 ./etc/X11/xkb/rules/xorg-it.lst
 ./etc/X11/xkb/rules/xorg.lst
@@ -232,6 +228,8 @@
 ./etc/X11/xkb/symbols/lo
 ./etc/X11/xkb/symbols/lock
 ./etc/X11/xkb/symbols/lt
+./etc/X11/xkb/symbols/lt_a
+./etc/X11/xkb/symbols/lt_p
 ./etc/X11/xkb/symbols/lt_std
 ./etc/X11/xkb/symbols/lv
 ./etc/X11/xkb/symbols/macintosh
@@ -252,6 +250,7 @@
 ./etc/X11/xkb/symbols/mk
 ./etc/X11/xkb/symbols/ml
 ./etc/X11/xkb/symbols/mm
+./etc/X11/xkb/symbols/mn
 ./etc/X11/xkb/symbols/mt
 ./etc/X11/xkb/symbols/mt_us
 ./etc/X11/xkb/symbols/nec
@@ -375,10 +374,27 @@
 ./etc/X11/xkb/symbols/xfree68/ataritt
 ./etc/X11/xkb/symbols/yu
 ./etc/X11/xkb/symbols/zaurus
+./etc/X11/xkb/torture
+./etc/X11/xkb/torture/indicator
+./etc/X11/xkb/torture/indicator1
+./etc/X11/xkb/torture/indicator2
+./etc/X11/xkb/torture/indicator3
+./etc/X11/xkb/torture/mod_compat
+./etc/X11/xkb/torture/mod_compat1
+./etc/X11/xkb/torture/mod_compat2
+./etc/X11/xkb/torture/mod_compat3
+./etc/X11/xkb/torture/mod_compat4
+./etc/X11/xkb/torture/sym_interp
+./etc/X11/xkb/torture/sym_interp1
+./etc/X11/xkb/torture/sym_interp2
+./etc/X11/xkb/torture/sym_interp3
+./etc/X11/xkb/torture/sym_interp4
+./etc/X11/xkb/torture/types
 ./etc/X11/xkb/types
 ./etc/X11/xkb/types.dir
 ./etc/X11/xkb/types/README
 ./etc/X11/xkb/types/basic
+./etc/X11/xkb/types/cancel
 ./etc/X11/xkb/types/caps
 ./etc/X11/xkb/types/complete
 ./etc/X11/xkb/types/default
@@ -387,38 +403,13 @@
 ./etc/X11/xkb/types/mousekeys
 ./etc/X11/xkb/types/numpad
 ./etc/X11/xkb/types/pc
-./etc/X11/xkb/xkbcomp
-./etc/X11/xserver
-./etc/X11/xserver/C
-./etc/X11/xserver/C/print
-./etc/X11/xserver/C/print/attributes
-./etc/X11/xserver/C/print/ddx-config
-./etc/X11/xserver/C/print/ddx-config/raster
-./etc/X11/xserver/C/print/models
-./etc/X11/xserver/C/print/models/CANONC3200-PS
-./etc/X11/xserver/C/print/models/CANONC3200-PS/fonts
-./etc/X11/xserver/C/print/models/HPDJ1600C
-./etc/X11/xserver/C/print/models/HPDJ1600C/fonts
-./etc/X11/xserver/C/print/models/HPLJ4050-PS
-./etc/X11/xserver/C/print/models/HPLJ4050-PS/fonts
-./etc/X11/xserver/C/print/models/HPLJ4family
-./etc/X11/xserver/C/print/models/HPLJ4family/fonts
-./etc/X11/xserver/C/print/models/PSdefault
-./etc/X11/xserver/C/print/models/PSdefault/fonts
-./etc/X11/xserver/C/print/models/PSspooldir
-./etc/X11/xserver/C/print/models/PSspooldir/fonts
-./etc/X11/xserver/C/print/models/SPSPARC2
-./etc/X11/xserver/C/print/models/SPSPARC2/fonts
 ./etc/X11/xsm
-./usr/X11R6/.X.Org_Version
 ./usr/X11R6/bin/bdftruncate
 ./usr/X11R6/bin/dga
 ./usr/X11R6/bin/glxgears
 ./usr/X11R6/bin/glxinfo
-./usr/X11R6/bin/gtf
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/bin/xdriinfo
-./usr/X11R6/bin/xrx
 ./usr/X11R6/include/GL
 ./usr/X11R6/include/GL/GLwDrawA.h
 ./usr/X11R6/include/GL/GLwDrawAP.h
@@ -433,6 +424,8 @@
 ./usr/X11R6/include/GL/glxmd.h
 ./usr/X11R6/include/GL/glxproto.h
 ./usr/X11R6/include/GL/glxtokens.h
+./usr/X11R6/include/GL/internal
+./usr/X11R6/include/GL/internal/glcore.h
 ./usr/X11R6/include/GL/osmesa.h
 ./usr/X11R6/include/X11/bitmaps/card.xbm
 ./usr/X11R6/include/X11/bitmaps/down.xbm
@@ -450,8 +443,6 @@
 ./usr/X11R6/include/X11/extensions/xf86dga1.h
 ./usr/X11R6/include/X11/extensions/xf86dga1str.h
 ./usr/X11R6/include/X11/extensions/xf86dgastr.h
-./usr/X11R6/include/X11/misc.h
-./usr/X11R6/include/X11/os.h
 ./usr/X11R6/include/X11/pixmaps/card.xpm
 ./usr/X11R6/include/X11/pixmaps/computer.xpm
 ./usr/X11R6/include/X11/pixmaps/keyboard.xpm
@@ -462,132 +453,46 @@
 ./usr/X11R6/include/freetype2/freetype/ftpfr.h
 ./usr/X11R6/include/freetype2/freetype/ftwinfnt.h
 ./usr/X11R6/include/ft2build.h
-./usr/X11R6/include/xf86Optrec.h
-./usr/X11R6/include/xf86Parser.h
 ./usr/X11R6/lib/X11/Cards
 ./usr/X11R6/lib/X11/Options
-./usr/X11R6/lib/X11/doc
-./usr/X11R6/lib/X11/doc/BUILD
-./usr/X11R6/lib/X11/doc/BugReport
-./usr/X11R6/lib/X11/doc/DESIGN
-./usr/X11R6/lib/X11/doc/Install
-./usr/X11R6/lib/X11/doc/LICENSE
-./usr/X11R6/lib/X11/doc/OS2.Notes
-./usr/X11R6/lib/X11/doc/README
-./usr/X11R6/lib/X11/doc/README.DECtga
-./usr/X11R6/lib/X11/doc/README.Darwin
-./usr/X11R6/lib/X11/doc/README.I128
-./usr/X11R6/lib/X11/doc/README.LynxOS
-./usr/X11R6/lib/X11/doc/README.NetBSD
-./usr/X11R6/lib/X11/doc/README.OpenBSD
-./usr/X11R6/lib/X11/doc/README.SCO
-./usr/X11R6/lib/X11/doc/README.SiS
-./usr/X11R6/lib/X11/doc/README.Solaris
-./usr/X11R6/lib/X11/doc/README.XKB-Config
-./usr/X11R6/lib/X11/doc/README.XKB-Enhancing
-./usr/X11R6/lib/X11/doc/README.apm
-./usr/X11R6/lib/X11/doc/README.ati
-./usr/X11R6/lib/X11/doc/README.chips
-./usr/X11R6/lib/X11/doc/README.cyrix
-./usr/X11R6/lib/X11/doc/README.dps
-./usr/X11R6/lib/X11/doc/README.fonts
-./usr/X11R6/lib/X11/doc/README.i740
-./usr/X11R6/lib/X11/doc/README.i810
-./usr/X11R6/lib/X11/doc/README.mouse
-./usr/X11R6/lib/X11/doc/README.newport
-./usr/X11R6/lib/X11/doc/README.r128
-./usr/X11R6/lib/X11/doc/README.rapidaccess
-./usr/X11R6/lib/X11/doc/README.rendition
-./usr/X11R6/lib/X11/doc/README.s3virge
-./usr/X11R6/lib/X11/doc/RELNOTES
-./usr/X11R6/lib/X11/doc/Versions
-./usr/X11R6/lib/X11/doc/VideoBoard98
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/AccelCards
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/BUILD
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/COPYRIGHT
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/Devices
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/Monitors
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/QuickStart.doc
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.3DLabs
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.Config
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.DECtga
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.DGA
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.I128
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.LinkKit
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.MGA
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.Mach32
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.Mach64
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.NVIDIA
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.Oak
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.OpenBSD
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.P9000
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.S3
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.S3V
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.SiS
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.Video7
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.W32
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.WstDig
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.agx
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.apm
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.ark
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.ati
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.chips
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.cirrus
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.clkprog
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.cyrix
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.epson
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.i740
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.mouse
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.neo
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.r128
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.rendition
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.trident
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/README.tseng
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/RELNOTES
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/ServersOnly
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/VideoModes.doc
-./usr/X11R6/lib/X11/doc/XFree86-3.3.x/xinput
-./usr/X11R6/lib/X11/etc/Xinstall.sh
-./usr/X11R6/lib/X11/etc/sun.termcap
-./usr/X11R6/lib/X11/etc/sun.terminfo
-./usr/X11R6/lib/X11/etc/xmodmap.std
-./usr/X11R6/lib/X11/old-Cards
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.4.0
+./usr/X11R6/lib/libGL.so.5.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
+./usr/X11R6/lib/libGLU_pic.a
+./usr/X11R6/lib/libGL_pic.a
 ./usr/X11R6/lib/libGLw.a
-./usr/X11R6/lib/libGLw.so.4.0
+./usr/X11R6/lib/libGLw.so.5.0
+./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.8.1
-./usr/X11R6/lib/libOSMesa.a
-./usr/X11R6/lib/libOSMesa.so.7.0
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.9.0
+./usr/X11R6/lib/libX11.so.10.0
 ./usr/X11R6/lib/libXRes.so.3.0
 ./usr/X11R6/lib/libXTrap.so.9.0
 ./usr/X11R6/lib/libXau.so.9.0
+./usr/X11R6/lib/libXaw.so.10.0
 ./usr/X11R6/lib/libXaw.so.11.0
-./usr/X11R6/lib/libXaw6.so.9.0
-./usr/X11R6/lib/libXaw7.so.10.0
+./usr/X11R6/lib/libXaw7.so.7.0
+./usr/X11R6/lib/libXaw8.so.11.0
 ./usr/X11R6/lib/libXcomposite.so.2.0
 ./usr/X11R6/lib/libXcursor.so.3.0
 ./usr/X11R6/lib/libXdamage.so.2.0
 ./usr/X11R6/lib/libXdmcp.so.9.0
 ./usr/X11R6/lib/libXevie.so.1.0
 ./usr/X11R6/lib/libXext.so.9.0
-./usr/X11R6/lib/libXfixes.so.4.0
-./usr/X11R6/lib/libXfont.so.4.0
+./usr/X11R6/lib/libXfixes.so.4.1
+./usr/X11R6/lib/libXfont.so.5.0
+./usr/X11R6/lib/libXfontcache.so.1.0
 ./usr/X11R6/lib/libXft.so.6.0
-./usr/X11R6/lib/libXft1.so.4.0
 ./usr/X11R6/lib/libXi.so.9.0
 ./usr/X11R6/lib/libXinerama.so.4.0
 ./usr/X11R6/lib/libXmu.so.9.0
 ./usr/X11R6/lib/libXmuu.so.4.0
 ./usr/X11R6/lib/libXp.so.9.0
 ./usr/X11R6/lib/libXpm.so.7.0
+./usr/X11R6/lib/libXprintAppUtil.so.1.0
+./usr/X11R6/lib/libXprintUtil.so.1.0
 ./usr/X11R6/lib/libXrandr.so.5.0
 ./usr/X11R6/lib/libXrender.so.4.1
 ./usr/X11R6/lib/libXss.so.4.0
@@ -595,86 +500,31 @@
 ./usr/X11R6/lib/libXtst.so.9.0
 ./usr/X11R6/lib/libXv.so.4.0
 ./usr/X11R6/lib/libXvMC.so.4.1
+./usr/X11R6/lib/libXvMCW.so.1.0
 ./usr/X11R6/lib/libXxf86dga.a
+./usr/X11R6/lib/libXxf86dga.la
 ./usr/X11R6/lib/libXxf86dga.so.4.0
 ./usr/X11R6/lib/libXxf86misc.so.4.0
 ./usr/X11R6/lib/libXxf86vm.so.4.0
-./usr/X11R6/lib/libexpat.so.5.0
-./usr/X11R6/lib/libfontconfig.so.3.0
+./usr/X11R6/lib/libdmx.so.1.0
+./usr/X11R6/lib/libexpat.so.6.0
+./usr/X11R6/lib/libfontconfig.so.5.0
 ./usr/X11R6/lib/libfontenc.so.3.0
-./usr/X11R6/lib/libfreetype.so.13.1
+./usr/X11R6/lib/libfreetype.so.14.0
+./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.9.0
-./usr/X11R6/lib/libxf86config.a
 ./usr/X11R6/lib/libxkbfile.so.3.0
 ./usr/X11R6/lib/libxkbui.so.3.0
-./usr/X11R6/lib/libxrx.so.7.0
-./usr/X11R6/lib/libxrxnest.so.7.0
-./usr/X11R6/man/cat1/bdftruncate.0
-./usr/X11R6/man/cat1/dga.0
+./usr/X11R6/lib/modules
+./usr/X11R6/lib/xserver
+./usr/X11R6/lib/xserver/SecurityPolicy
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
-./usr/X11R6/man/cat1/gtf.0
-./usr/X11R6/man/cat1/libxrx.0
-./usr/X11R6/man/cat1/ucs2any.0
-./usr/X11R6/man/cat1/xdriinfo.0
-./usr/X11R6/man/cat1/xrx.0
 ./usr/X11R6/man/cat3/GLwCreateMDrawingArea.0
 ./usr/X11R6/man/cat3/GLwDrawingArea.0
 ./usr/X11R6/man/cat3/GLwDrawingAreaMakeCurrent.0
 ./usr/X11R6/man/cat3/GLwDrawingAreaSwapBuffers.0
 ./usr/X11R6/man/cat3/GLwMDrawingArea.0
-./usr/X11R6/man/cat3/XDGA.0
-./usr/X11R6/man/cat3/XDGAChangePixmapMode.0
-./usr/X11R6/man/cat3/XDGACloseFramebuffer.0
-./usr/X11R6/man/cat3/XDGACopyArea.0
-./usr/X11R6/man/cat3/XDGACopyTransparentArea.0
-./usr/X11R6/man/cat3/XDGACreateColormap.0
-./usr/X11R6/man/cat3/XDGAFillRectangle.0
-./usr/X11R6/man/cat3/XDGAGetViewportStatus.0
-./usr/X11R6/man/cat3/XDGAInstallColormap.0
-./usr/X11R6/man/cat3/XDGAKeyEventToXKeyEvent.0
-./usr/X11R6/man/cat3/XDGAOpenFramebuffer.0
-./usr/X11R6/man/cat3/XDGAQueryExtension.0
-./usr/X11R6/man/cat3/XDGAQueryModes.0
-./usr/X11R6/man/cat3/XDGAQueryVersion.0
-./usr/X11R6/man/cat3/XDGASelectInput.0
-./usr/X11R6/man/cat3/XDGASetClientVersion.0
-./usr/X11R6/man/cat3/XDGASetMode.0
-./usr/X11R6/man/cat3/XDGASetViewport.0
-./usr/X11R6/man/cat3/XDGASync.0
-./usr/X11R6/man/cat3/XF86DGA.0
-./usr/X11R6/man/cat3/XF86Misc.0
-./usr/X11R6/man/cat3/XF86MiscGetKbdSettings.0
-./usr/X11R6/man/cat3/XF86MiscGetMouseSettings.0
-./usr/X11R6/man/cat3/XF86MiscGetSaver.0
-./usr/X11R6/man/cat3/XF86MiscQueryExtension.0
-./usr/X11R6/man/cat3/XF86MiscQueryVersion.0
-./usr/X11R6/man/cat3/XF86MiscSetKbdSettings.0
-./usr/X11R6/man/cat3/XF86MiscSetMouseSettings.0
-./usr/X11R6/man/cat3/XF86MiscSetSaver.0
-./usr/X11R6/man/cat3/XF86VidMode.0
-./usr/X11R6/man/cat3/XF86VidModeDeleteModeLine.0
-./usr/X11R6/man/cat3/XF86VidModeGetAllModeLines.0
-./usr/X11R6/man/cat3/XF86VidModeGetDotClocks.0
-./usr/X11R6/man/cat3/XF86VidModeGetGamma.0
-./usr/X11R6/man/cat3/XF86VidModeGetGammaRamp.0
-./usr/X11R6/man/cat3/XF86VidModeGetGammaRampSize.0
-./usr/X11R6/man/cat3/XF86VidModeGetModeLine.0
-./usr/X11R6/man/cat3/XF86VidModeGetMonitor.0
-./usr/X11R6/man/cat3/XF86VidModeGetPermissions.0
-./usr/X11R6/man/cat3/XF86VidModeGetViewPort.0
-./usr/X11R6/man/cat3/XF86VidModeLockModeSwitch.0
-./usr/X11R6/man/cat3/XF86VidModeModModeLine.0
-./usr/X11R6/man/cat3/XF86VidModeQueryExtension.0
-./usr/X11R6/man/cat3/XF86VidModeQueryVersion.0
-./usr/X11R6/man/cat3/XF86VidModeSetClientVersion.0
-./usr/X11R6/man/cat3/XF86VidModeSetGamma.0
-./usr/X11R6/man/cat3/XF86VidModeSetGammaRamp.0
-./usr/X11R6/man/cat3/XF86VidModeSetViewPort.0
-./usr/X11R6/man/cat3/XF86VidModeSwitchMode.0
-./usr/X11R6/man/cat3/XF86VidModeSwitchToMode.0
-./usr/X11R6/man/cat3/XF86VidModeValidateModeLine.0
-./usr/X11R6/man/cat3/XFree86-DGA.0
 ./usr/X11R6/man/cat3/glAccum.0
 ./usr/X11R6/man/cat3/glActiveTextureARB.0
 ./usr/X11R6/man/cat3/glAlphaFunc.0
@@ -1194,6 +1044,62 @@
 ./usr/X11R6/man/cat3/gluTessProperty.0
 ./usr/X11R6/man/cat3/gluTessVertex.0
 ./usr/X11R6/man/cat3/gluUnProject.0
-./usr/X11R6/man/cat7/Xprint.0
+./usr/X11R6/man/man1/bdftruncate.1
+./usr/X11R6/man/man1/dga.1
+./usr/X11R6/man/man1/ucs2any.1
+./usr/X11R6/man/man1/xdriinfo.1
+./usr/X11R6/man/man3/XDGA.3
+./usr/X11R6/man/man3/XDGAChangePixmapMode.3
+./usr/X11R6/man/man3/XDGACloseFramebuffer.3
+./usr/X11R6/man/man3/XDGACopyArea.3
+./usr/X11R6/man/man3/XDGACopyTransparentArea.3
+./usr/X11R6/man/man3/XDGACreateColormap.3
+./usr/X11R6/man/man3/XDGAFillRectangle.3
+./usr/X11R6/man/man3/XDGAGetViewportStatus.3
+./usr/X11R6/man/man3/XDGAInstallColormap.3
+./usr/X11R6/man/man3/XDGAKeyEventToXKeyEvent.3
+./usr/X11R6/man/man3/XDGAOpenFramebuffer.3
+./usr/X11R6/man/man3/XDGAQueryExtension.3
+./usr/X11R6/man/man3/XDGAQueryModes.3
+./usr/X11R6/man/man3/XDGAQueryVersion.3
+./usr/X11R6/man/man3/XDGASelectInput.3
+./usr/X11R6/man/man3/XDGASetClientVersion.3
+./usr/X11R6/man/man3/XDGASetMode.3
+./usr/X11R6/man/man3/XDGASetViewport.3
+./usr/X11R6/man/man3/XDGASync.3
+./usr/X11R6/man/man3/XF86DGA.3
+./usr/X11R6/man/man3/XF86Misc.3
+./usr/X11R6/man/man3/XF86MiscGetKbdSettings.3
+./usr/X11R6/man/man3/XF86MiscGetMouseSettings.3
+./usr/X11R6/man/man3/XF86MiscGetSaver.3
+./usr/X11R6/man/man3/XF86MiscQueryExtension.3
+./usr/X11R6/man/man3/XF86MiscQueryVersion.3
+./usr/X11R6/man/man3/XF86MiscSetKbdSettings.3
+./usr/X11R6/man/man3/XF86MiscSetMouseSettings.3
+./usr/X11R6/man/man3/XF86MiscSetSaver.3
+./usr/X11R6/man/man3/XF86VM.3
+./usr/X11R6/man/man3/XF86VidModeDeleteModeLine.3
+./usr/X11R6/man/man3/XF86VidModeGetAllModeLines.3
+./usr/X11R6/man/man3/XF86VidModeGetDotClocks.3
+./usr/X11R6/man/man3/XF86VidModeGetGamma.3
+./usr/X11R6/man/man3/XF86VidModeGetGammaRamp.3
+./usr/X11R6/man/man3/XF86VidModeGetGammaRampSize.3
+./usr/X11R6/man/man3/XF86VidModeGetModeLine.3
+./usr/X11R6/man/man3/XF86VidModeGetMonitor.3
+./usr/X11R6/man/man3/XF86VidModeGetPermissions.3
+./usr/X11R6/man/man3/XF86VidModeGetViewPort.3
+./usr/X11R6/man/man3/XF86VidModeLockModeSwitch.3
+./usr/X11R6/man/man3/XF86VidModeModModeLine.3
+./usr/X11R6/man/man3/XF86VidModeQueryExtension.3
+./usr/X11R6/man/man3/XF86VidModeQueryVersion.3
+./usr/X11R6/man/man3/XF86VidModeSetClientVersion.3
+./usr/X11R6/man/man3/XF86VidModeSetGamma.3
+./usr/X11R6/man/man3/XF86VidModeSetGammaRamp.3
+./usr/X11R6/man/man3/XF86VidModeSetViewPort.3
+./usr/X11R6/man/man3/XF86VidModeSwitchMode.3
+./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
+./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
+./usr/X11R6/man/man3/XFree86-DGA.3
+./usr/X11R6/man/man7/Xprint.7
 ./var/db/xkb
 ./var/db/xkb/README
diff --git a/distrib/sets/lists/xserv/md.i386 b/distrib/sets/lists/xserv/md.i386
index 501500c3f..2dac1364b 100644
--- a/distrib/sets/lists/xserv/md.i386
+++ b/distrib/sets/lists/xserv/md.i386
@@ -1,9 +1,21 @@
+./etc/X11/xserver
+./etc/X11/xserver/C
+./etc/X11/xserver/C/print
 ./etc/X11/xserver/C/print/Xprinters
+./etc/X11/xserver/C/print/Xprinters.ghostscript
+./etc/X11/xserver/C/print/attributes
 ./etc/X11/xserver/C/print/attributes/document
 ./etc/X11/xserver/C/print/attributes/job
 ./etc/X11/xserver/C/print/attributes/printer
+./etc/X11/xserver/C/print/ddx-config
+./etc/X11/xserver/C/print/ddx-config/raster
 ./etc/X11/xserver/C/print/ddx-config/raster/pcl
 ./etc/X11/xserver/C/print/ddx-config/raster/postscript
+./etc/X11/xserver/C/print/models
+./etc/X11/xserver/C/print/models/CANONBJ10E-GS
+./etc/X11/xserver/C/print/models/CANONBJ10E-GS/model-config
+./etc/X11/xserver/C/print/models/CANONC3200-PS
+./etc/X11/xserver/C/print/models/CANONC3200-PS/fonts
 ./etc/X11/xserver/C/print/models/CANONC3200-PS/fonts/AvantGarde-Book.pmf
 ./etc/X11/xserver/C/print/models/CANONC3200-PS/fonts/AvantGarde-BookOblique.pmf
 ./etc/X11/xserver/C/print/models/CANONC3200-PS/fonts/AvantGarde-Demi.pmf
@@ -36,6 +48,10 @@
 ./etc/X11/xserver/C/print/models/CANONC3200-PS/fonts/ZapfDingbats.pmf
 ./etc/X11/xserver/C/print/models/CANONC3200-PS/fonts/fonts.dir
 ./etc/X11/xserver/C/print/models/CANONC3200-PS/model-config
+./etc/X11/xserver/C/print/models/GSdefault
+./etc/X11/xserver/C/print/models/GSdefault/model-config
+./etc/X11/xserver/C/print/models/HPDJ1600C
+./etc/X11/xserver/C/print/models/HPDJ1600C/fonts
 ./etc/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00051.pmf
 ./etc/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00052.pmf
 ./etc/X11/xserver/C/print/models/HPDJ1600C/fonts/9nb00053.pmf
@@ -84,6 +100,8 @@
 ./etc/X11/xserver/C/print/models/HPDJ1600C/fonts/fonts.dir
 ./etc/X11/xserver/C/print/models/HPDJ1600C/fonts/lpr0ye1a.pmf
 ./etc/X11/xserver/C/print/models/HPDJ1600C/model-config
+./etc/X11/xserver/C/print/models/HPLJ4050-PS
+./etc/X11/xserver/C/print/models/HPLJ4050-PS/fonts
 ./etc/X11/xserver/C/print/models/HPLJ4050-PS/fonts/AvantGarde-Book.pmf
 ./etc/X11/xserver/C/print/models/HPLJ4050-PS/fonts/AvantGarde-BookOblique.pmf
 ./etc/X11/xserver/C/print/models/HPLJ4050-PS/fonts/AvantGarde-Demi.pmf
@@ -116,6 +134,8 @@
 ./etc/X11/xserver/C/print/models/HPLJ4050-PS/fonts/ZapfDingbats.pmf
 ./etc/X11/xserver/C/print/models/HPLJ4050-PS/fonts/fonts.dir
 ./etc/X11/xserver/C/print/models/HPLJ4050-PS/model-config
+./etc/X11/xserver/C/print/models/HPLJ4family
+./etc/X11/xserver/C/print/models/HPLJ4family/fonts
 ./etc/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00051.pmf
 ./etc/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00052.pmf
 ./etc/X11/xserver/C/print/models/HPLJ4family/fonts/9nb00053.pmf
@@ -164,6 +184,11 @@
 ./etc/X11/xserver/C/print/models/HPLJ4family/fonts/fonts.dir
 ./etc/X11/xserver/C/print/models/HPLJ4family/fonts/lpr0ye1a.pmf
 ./etc/X11/xserver/C/print/models/HPLJ4family/model-config
+./etc/X11/xserver/C/print/models/PS2PDFspooldir-GS
+./etc/X11/xserver/C/print/models/PS2PDFspooldir-GS/model-config
+./etc/X11/xserver/C/print/models/PS2PDFspooldir-GS/ps2pdf_spooltodir.sh
+./etc/X11/xserver/C/print/models/PSdefault
+./etc/X11/xserver/C/print/models/PSdefault/fonts
 ./etc/X11/xserver/C/print/models/PSdefault/fonts/AvantGarde-Book.pmf
 ./etc/X11/xserver/C/print/models/PSdefault/fonts/AvantGarde-BookOblique.pmf
 ./etc/X11/xserver/C/print/models/PSdefault/fonts/AvantGarde-Demi.pmf
@@ -181,7 +206,6 @@
 ./etc/X11/xserver/C/print/models/PSdefault/fonts/LubalinGraph-Demi.pmf
 ./etc/X11/xserver/C/print/models/PSdefault/fonts/LubalinGraph-DemiOblique.pmf
 ./etc/X11/xserver/C/print/models/PSdefault/fonts/NewCenturySchlbk-Bold.pmf
-./etc/X11/xserver/C/print/models/PSdefault/fonts/NewCenturySchlbk-BoldItalic.pmf
 ./etc/X11/xserver/C/print/models/PSdefault/fonts/NewCenturySchlbk-Italic.pmf
 ./etc/X11/xserver/C/print/models/PSdefault/fonts/NewCenturySchlbk-Roman.pmf
 ./etc/X11/xserver/C/print/models/PSdefault/fonts/Souvenir-Demi.pmf
@@ -196,8 +220,11 @@
 ./etc/X11/xserver/C/print/models/PSdefault/fonts/ZapfDingbats.pmf
 ./etc/X11/xserver/C/print/models/PSdefault/fonts/fonts.dir
 ./etc/X11/xserver/C/print/models/PSdefault/model-config
+./etc/X11/xserver/C/print/models/PSspooldir
 ./etc/X11/xserver/C/print/models/PSspooldir/model-config
 ./etc/X11/xserver/C/print/models/PSspooldir/spooltodir.sh
+./etc/X11/xserver/C/print/models/SPSPARC2
+./etc/X11/xserver/C/print/models/SPSPARC2/fonts
 ./etc/X11/xserver/C/print/models/SPSPARC2/fonts/Courier-Bold.pmf
 ./etc/X11/xserver/C/print/models/SPSPARC2/fonts/Courier-BoldOblique.pmf
 ./etc/X11/xserver/C/print/models/SPSPARC2/fonts/Courier-Oblique.pmf
@@ -215,11 +242,8 @@
 ./etc/X11/xserver/C/print/models/SPSPARC2/model-config
 ./etc/X11/xserver/POSIX
 ./etc/X11/xserver/README
-./etc/X11/xserver/af
 ./etc/X11/xserver/af_ZA
 ./etc/X11/xserver/af_ZA.iso88591
-./etc/X11/xserver/af_ZA.utf8
-./etc/X11/xserver/afrikaans
 ./etc/X11/xserver/ar
 ./etc/X11/xserver/ar_AE
 ./etc/X11/xserver/ar_AE.iso88596
@@ -409,13 +433,8 @@
 ./etc/X11/xserver/en_US.iso885915
 ./etc/X11/xserver/en_US.utf8
 ./etc/X11/xserver/en_US/print
-./etc/X11/xserver/en_US/print/Xprinters
 ./etc/X11/xserver/en_US/print/attributes
 ./etc/X11/xserver/en_US/print/attributes/document
-./etc/X11/xserver/en_US/print/attributes/job
-./etc/X11/xserver/en_US/print/attributes/printer
-./etc/X11/xserver/en_US/print/ddx-config
-./etc/X11/xserver/en_US/print/models
 ./etc/X11/xserver/en_ZA
 ./etc/X11/xserver/en_ZA.iso88591
 ./etc/X11/xserver/en_ZA.utf8
@@ -637,9 +656,6 @@
 ./etc/X11/xserver/korean.euc
 ./etc/X11/xserver/kw_GB
 ./etc/X11/xserver/kw_GB.iso88591
-./etc/X11/xserver/ky_KG
-./etc/X11/xserver/ky_KG.UTF-8
-./etc/X11/xserver/ky_KG.utf8
 ./etc/X11/xserver/lithuanian
 ./etc/X11/xserver/lt
 ./etc/X11/xserver/lt.ISO8859-13
@@ -666,7 +682,6 @@
 ./etc/X11/xserver/mt_MT.iso88593
 ./etc/X11/xserver/nb_NO
 ./etc/X11/xserver/nb_NO.ISO-8859-1
-./etc/X11/xserver/ndebele
 ./etc/X11/xserver/nl
 ./etc/X11/xserver/nl.ISO8859-1
 ./etc/X11/xserver/nl.ISO8859-15
@@ -694,14 +709,6 @@
 ./etc/X11/xserver/no_NO.iso88591
 ./etc/X11/xserver/no_NO.utf8
 ./etc/X11/xserver/norwegian
-./etc/X11/xserver/nr
-./etc/X11/xserver/nr_ZA
-./etc/X11/xserver/nr_ZA.iso88591
-./etc/X11/xserver/nr_ZA.utf8
-./etc/X11/xserver/nso
-./etc/X11/xserver/nso_ZA
-./etc/X11/xserver/nso_ZA.iso885915
-./etc/X11/xserver/nso_ZA.utf8
 ./etc/X11/xserver/oc_FR
 ./etc/X11/xserver/oc_FR.iso88591
 ./etc/X11/xserver/pa_IN.UTF-8
@@ -757,9 +764,6 @@
 ./etc/X11/xserver/russian
 ./etc/X11/xserver/se_NO
 ./etc/X11/xserver/se_NO.utf8
-./etc/X11/xserver/sepedi
-./etc/X11/xserver/sesotho
-./etc/X11/xserver/setswana
 ./etc/X11/xserver/sh
 ./etc/X11/xserver/sh.ISO8859-2
 ./etc/X11/xserver/sh_BA.ISO8859-2@bosnia
@@ -770,7 +774,6 @@
 ./etc/X11/xserver/si_LK
 ./etc/X11/xserver/si_LK.UTF8
 ./etc/X11/xserver/sinhala
-./etc/X11/xserver/siswati
 ./etc/X11/xserver/sk
 ./etc/X11/xserver/sk.ISO8859-2
 ./etc/X11/xserver/sk_SK
@@ -797,14 +800,6 @@
 ./etc/X11/xserver/sr_YU.iso88595@cyrillic
 ./etc/X11/xserver/sr_YU.utf8
 ./etc/X11/xserver/sr_YU@cyrillic
-./etc/X11/xserver/ss
-./etc/X11/xserver/ss_ZA
-./etc/X11/xserver/ss_ZA.iso88591
-./etc/X11/xserver/ss_ZA.utf8
-./etc/X11/xserver/st
-./etc/X11/xserver/st_ZA
-./etc/X11/xserver/st_ZA.iso88591
-./etc/X11/xserver/st_ZA.utf8
 ./etc/X11/xserver/su
 ./etc/X11/xserver/su.ISO8859-1
 ./etc/X11/xserver/sv
@@ -840,10 +835,6 @@
 ./etc/X11/xserver/thai
 ./etc/X11/xserver/tl_PH
 ./etc/X11/xserver/tl_PH.iso88591
-./etc/X11/xserver/tn
-./etc/X11/xserver/tn_ZA
-./etc/X11/xserver/tn_ZA.iso885915
-./etc/X11/xserver/tn_ZA.utf8
 ./etc/X11/xserver/tr
 ./etc/X11/xserver/tr.ISO8859-9
 ./etc/X11/xserver/tr_TR
@@ -851,11 +842,6 @@
 ./etc/X11/xserver/tr_TR.UTF-8
 ./etc/X11/xserver/tr_TR.iso88599
 ./etc/X11/xserver/tr_TR.utf8
-./etc/X11/xserver/ts
-./etc/X11/xserver/ts_ZA
-./etc/X11/xserver/ts_ZA.iso88591
-./etc/X11/xserver/ts_ZA.utf8
-./etc/X11/xserver/tsonga
 ./etc/X11/xserver/turkish
 ./etc/X11/xserver/uk_UA
 ./etc/X11/xserver/uk_UA.koi8u
@@ -864,10 +850,6 @@
 ./etc/X11/xserver/ur_PK.utf8
 ./etc/X11/xserver/uz_UZ
 ./etc/X11/xserver/uz_UZ.iso88591
-./etc/X11/xserver/ve
-./etc/X11/xserver/ve_ZA
-./etc/X11/xserver/ve_ZA.utf8
-./etc/X11/xserver/venda
 ./etc/X11/xserver/vi_VN
 ./etc/X11/xserver/vi_VN.tcvn
 ./etc/X11/xserver/vi_VN.utf8
@@ -875,11 +857,6 @@
 ./etc/X11/xserver/wa_BE.iso88591
 ./etc/X11/xserver/wa_BE.iso885915@euro
 ./etc/X11/xserver/wa_BE@euro
-./etc/X11/xserver/xh
-./etc/X11/xserver/xh_ZA
-./etc/X11/xserver/xh_ZA.iso88591
-./etc/X11/xserver/xh_ZA.utf8
-./etc/X11/xserver/xhosa
 ./etc/X11/xserver/yi_US
 ./etc/X11/xserver/yi_US.cp1255
 ./etc/X11/xserver/zh
@@ -934,331 +911,425 @@
 ./etc/X11/xserver/zh_TW.big5
 ./etc/X11/xserver/zh_TW.euctw
 ./etc/X11/xserver/zh_TW.utf8
-./etc/X11/xserver/zu
-./etc/X11/xserver/zu_ZA
-./etc/X11/xserver/zu_ZA.iso88591
-./etc/X11/xserver/zu_ZA.utf8
-./etc/X11/xserver/zulu
 ./usr/X11R6/bin/X
-./usr/X11R6/bin/XF86Setup
-./usr/X11R6/bin/XF86_8514
-./usr/X11R6/bin/XF86_AGX
-./usr/X11R6/bin/XF86_Mach32
-./usr/X11R6/bin/XF86_Mach8
-./usr/X11R6/bin/XF86_Mono
-./usr/X11R6/bin/XF86_P9000
-./usr/X11R6/bin/XF86_S3
-./usr/X11R6/bin/XF86_SVGA
-./usr/X11R6/bin/XF86_VGA16
 ./usr/X11R6/bin/Xnest
 ./usr/X11R6/bin/Xorg
 ./usr/X11R6/bin/Xprt
 ./usr/X11R6/bin/Xvfb
-./usr/X11R6/bin/Xwrapper
-./usr/X11R6/bin/getconfig
-./usr/X11R6/bin/getconfig.pl
+./usr/X11R6/bin/cvt
+./usr/X11R6/bin/gtf
 ./usr/X11R6/bin/inb
 ./usr/X11R6/bin/inl
 ./usr/X11R6/bin/inw
 ./usr/X11R6/bin/ioport
-./usr/X11R6/bin/kbd_mode
-./usr/X11R6/bin/mmapr
-./usr/X11R6/bin/mmapw
 ./usr/X11R6/bin/outb
 ./usr/X11R6/bin/outl
 ./usr/X11R6/bin/outw
 ./usr/X11R6/bin/pcitweak
 ./usr/X11R6/bin/scanpci
-./usr/X11R6/bin/xf86config3
-./usr/X11R6/bin/xmseconfig
 ./usr/X11R6/bin/xorgcfg
 ./usr/X11R6/bin/xorgconfig
-./usr/X11R6/lib/X11/XF86Config.eg
-./usr/X11R6/lib/X11/XF86Setup
-./usr/X11R6/lib/X11/XF86Setup/LICENSE
-./usr/X11R6/lib/X11/XF86Setup/card.tcl
-./usr/X11R6/lib/X11/XF86Setup/carddata.tcl
-./usr/X11R6/lib/X11/XF86Setup/done.tcl
-./usr/X11R6/lib/X11/XF86Setup/filelist.tcl
-./usr/X11R6/lib/X11/XF86Setup/keyboard.tcl
-./usr/X11R6/lib/X11/XF86Setup/modeselect.tcl
-./usr/X11R6/lib/X11/XF86Setup/mondata.tcl
-./usr/X11R6/lib/X11/XF86Setup/monitor.tcl
-./usr/X11R6/lib/X11/XF86Setup/mouse.tcl
-./usr/X11R6/lib/X11/XF86Setup/mseproto.tcl
-./usr/X11R6/lib/X11/XF86Setup/phase1.tcl
-./usr/X11R6/lib/X11/XF86Setup/phase2.tcl
-./usr/X11R6/lib/X11/XF86Setup/phase3.tcl
-./usr/X11R6/lib/X11/XF86Setup/phase4.tcl
-./usr/X11R6/lib/X11/XF86Setup/phase5.tcl
-./usr/X11R6/lib/X11/XF86Setup/pics
-./usr/X11R6/lib/X11/XF86Setup/pics/XFree86.msk
-./usr/X11R6/lib/X11/XF86Setup/pics/XFree86.xbm
-./usr/X11R6/lib/X11/XF86Setup/pics/vidcard.msk
-./usr/X11R6/lib/X11/XF86Setup/pics/vidcard.xbm
-./usr/X11R6/lib/X11/XF86Setup/scripts
-./usr/X11R6/lib/X11/XF86Setup/scripts/mseconfig.tcl
-./usr/X11R6/lib/X11/XF86Setup/setuplib.tcl
-./usr/X11R6/lib/X11/XF86Setup/srvflags.tcl
-./usr/X11R6/lib/X11/XF86Setup/tcllib
-./usr/X11R6/lib/X11/XF86Setup/tcllib/button.tcl
-./usr/X11R6/lib/X11/XF86Setup/tcllib/combobox.tcl
-./usr/X11R6/lib/X11/XF86Setup/tcllib/dialog.tcl
-./usr/X11R6/lib/X11/XF86Setup/tcllib/downarrow.xbm
-./usr/X11R6/lib/X11/XF86Setup/tcllib/entry.tcl
-./usr/X11R6/lib/X11/XF86Setup/tcllib/focus.tcl
-./usr/X11R6/lib/X11/XF86Setup/tcllib/init.tcl
-./usr/X11R6/lib/X11/XF86Setup/tcllib/license.terms
-./usr/X11R6/lib/X11/XF86Setup/tcllib/listbox.tcl
-./usr/X11R6/lib/X11/XF86Setup/tcllib/menu.tcl
-./usr/X11R6/lib/X11/XF86Setup/tcllib/misc.tcl
-./usr/X11R6/lib/X11/XF86Setup/tcllib/optionMenu.tcl
-./usr/X11R6/lib/X11/XF86Setup/tcllib/palette.tcl
-./usr/X11R6/lib/X11/XF86Setup/tcllib/scale.tcl
-./usr/X11R6/lib/X11/XF86Setup/tcllib/scrollbar.tcl
-./usr/X11R6/lib/X11/XF86Setup/tcllib/tclIndex
-./usr/X11R6/lib/X11/XF86Setup/tcllib/tearoff.tcl
-./usr/X11R6/lib/X11/XF86Setup/tcllib/text.tcl
-./usr/X11R6/lib/X11/XF86Setup/tcllib/tk.tcl
-./usr/X11R6/lib/X11/XF86Setup/tcllib/tkerror.tcl
-./usr/X11R6/lib/X11/XF86Setup/tcllib/uparrow.xbm
-./usr/X11R6/lib/X11/XF86Setup/texts
-./usr/X11R6/lib/X11/XF86Setup/texts/generic
-./usr/X11R6/lib/X11/XF86Setup/texts/generic/help_card.tcl
-./usr/X11R6/lib/X11/XF86Setup/texts/generic/help_done.tcl
-./usr/X11R6/lib/X11/XF86Setup/texts/generic/help_intro.tcl
-./usr/X11R6/lib/X11/XF86Setup/texts/generic/help_keyboard.tcl
-./usr/X11R6/lib/X11/XF86Setup/texts/generic/help_modeselect.tcl
-./usr/X11R6/lib/X11/XF86Setup/texts/generic/help_monitor.tcl
-./usr/X11R6/lib/X11/XF86Setup/texts/generic/help_mouse.tcl
-./usr/X11R6/lib/X11/XF86Setup/texts/generic/help_other.tcl
-./usr/X11R6/lib/X11/XF86Setup/texts/generic/message_proc.tcl
-./usr/X11R6/lib/X11/XF86Setup/texts/generic/messages.tcl
-./usr/X11R6/lib/X11/XF86Setup/texts/ja
-./usr/X11R6/lib/X11/XF86Setup/texts/ja/help_card.tcl
-./usr/X11R6/lib/X11/XF86Setup/texts/ja/help_done.tcl
-./usr/X11R6/lib/X11/XF86Setup/texts/ja/help_intro.tcl
-./usr/X11R6/lib/X11/XF86Setup/texts/ja/help_keyboard.tcl
-./usr/X11R6/lib/X11/XF86Setup/texts/ja/help_modeselect.tcl
-./usr/X11R6/lib/X11/XF86Setup/texts/ja/help_monitor.tcl
-./usr/X11R6/lib/X11/XF86Setup/texts/ja/help_mouse.tcl
-./usr/X11R6/lib/X11/XF86Setup/texts/ja/help_other.tcl
-./usr/X11R6/lib/X11/XF86Setup/texts/ja/message_proc.tcl
-./usr/X11R6/lib/X11/XF86Setup/texts/ja/messages.tcl
-./usr/X11R6/lib/X11/XF86Setup/texts/local_text.tcl
-./usr/X11R6/lib/X11/getconfig
-./usr/X11R6/lib/X11/getconfig/cfg.sample
-./usr/X11R6/lib/X11/getconfig/xorg.cfg
-./usr/X11R6/lib/X11/xorg.conf.eg
+./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/afb.h
+./usr/X11R6/include/xorg/assyntax.h
+./usr/X11R6/include/xorg/atKeynames.h
+./usr/X11R6/include/xorg/bstore.h
+./usr/X11R6/include/xorg/bstorestr.h
+./usr/X11R6/include/xorg/bt829.h
+./usr/X11R6/include/xorg/cfb.h
+./usr/X11R6/include/xorg/cfb16.h
+./usr/X11R6/include/xorg/cfb32.h
+./usr/X11R6/include/xorg/cfb8_16.h
+./usr/X11R6/include/xorg/cfb8_32.h
+./usr/X11R6/include/xorg/cfbmap.h
+./usr/X11R6/include/xorg/cfbmskbits.h
+./usr/X11R6/include/xorg/cfbunmap.h
+./usr/X11R6/include/xorg/closestr.h
+./usr/X11R6/include/xorg/closure.h
+./usr/X11R6/include/xorg/colormap.h
+./usr/X11R6/include/xorg/colormapst.h
+./usr/X11R6/include/xorg/compiler.h
+./usr/X11R6/include/xorg/cursor.h
+./usr/X11R6/include/xorg/cursorstr.h
+./usr/X11R6/include/xorg/damage.h
+./usr/X11R6/include/xorg/damagestr.h
+./usr/X11R6/include/xorg/dbestruct.h
+./usr/X11R6/include/xorg/dgaproc.h
+./usr/X11R6/include/xorg/dix.h
+./usr/X11R6/include/xorg/dixevents.h
+./usr/X11R6/include/xorg/dixfont.h
+./usr/X11R6/include/xorg/dixfontstr.h
+./usr/X11R6/include/xorg/dixgrabs.h
+./usr/X11R6/include/xorg/dixstruct.h
+./usr/X11R6/include/xorg/edid.h
+./usr/X11R6/include/xorg/exa.h
+./usr/X11R6/include/xorg/exevents.h
+./usr/X11R6/include/xorg/extension.h
+./usr/X11R6/include/xorg/extinit.h
+./usr/X11R6/include/xorg/extnsionst.h
+./usr/X11R6/include/xorg/fb.h
+./usr/X11R6/include/xorg/fbdevhw.h
+./usr/X11R6/include/xorg/fboverlay.h
+./usr/X11R6/include/xorg/fbpseudocolor.h
+./usr/X11R6/include/xorg/fbrop.h
+./usr/X11R6/include/xorg/fi1236.h
+./usr/X11R6/include/xorg/fourcc.h
+./usr/X11R6/include/xorg/gc.h
+./usr/X11R6/include/xorg/gcstruct.h
+./usr/X11R6/include/xorg/globals.h
+./usr/X11R6/include/xorg/glyphstr.h
+./usr/X11R6/include/xorg/i2c_def.h
+./usr/X11R6/include/xorg/input.h
+./usr/X11R6/include/xorg/inputstr.h
+./usr/X11R6/include/xorg/mfb.h
+./usr/X11R6/include/xorg/mfbmap.h
+./usr/X11R6/include/xorg/mfbunmap.h
+./usr/X11R6/include/xorg/mi.h
+./usr/X11R6/include/xorg/mibank.h
+./usr/X11R6/include/xorg/mibstore.h
+./usr/X11R6/include/xorg/micmap.h
+./usr/X11R6/include/xorg/micoord.h
+./usr/X11R6/include/xorg/mifillarc.h
+./usr/X11R6/include/xorg/mifpoly.h
+./usr/X11R6/include/xorg/migc.h
+./usr/X11R6/include/xorg/miline.h
+./usr/X11R6/include/xorg/mipict.h
+./usr/X11R6/include/xorg/mipointer.h
+./usr/X11R6/include/xorg/mipointrst.h
+./usr/X11R6/include/xorg/misc.h
+./usr/X11R6/include/xorg/miscstruct.h
+./usr/X11R6/include/xorg/mispans.h
+./usr/X11R6/include/xorg/mistruct.h
+./usr/X11R6/include/xorg/miwideline.h
+./usr/X11R6/include/xorg/mizerarc.h
+./usr/X11R6/include/xorg/msp3430.h
+./usr/X11R6/include/xorg/opaque.h
+./usr/X11R6/include/xorg/os.h
+./usr/X11R6/include/xorg/picture.h
+./usr/X11R6/include/xorg/picturestr.h
+./usr/X11R6/include/xorg/pixmap.h
+./usr/X11R6/include/xorg/pixmapstr.h
+./usr/X11R6/include/xorg/property.h
+./usr/X11R6/include/xorg/propertyst.h
+./usr/X11R6/include/xorg/randrstr.h
+./usr/X11R6/include/xorg/region.h
+./usr/X11R6/include/xorg/regionstr.h
+./usr/X11R6/include/xorg/renderedge.h
+./usr/X11R6/include/xorg/resource.h
+./usr/X11R6/include/xorg/rgb.h
+./usr/X11R6/include/xorg/screenint.h
+./usr/X11R6/include/xorg/scrnintstr.h
+./usr/X11R6/include/xorg/selection.h
+./usr/X11R6/include/xorg/servermd.h
+./usr/X11R6/include/xorg/shadow.h
+./usr/X11R6/include/xorg/shadowfb.h
+./usr/X11R6/include/xorg/site.h
+./usr/X11R6/include/xorg/swaprep.h
+./usr/X11R6/include/xorg/swapreq.h
+./usr/X11R6/include/xorg/tda8425.h
+./usr/X11R6/include/xorg/tda9850.h
+./usr/X11R6/include/xorg/tda9885.h
+./usr/X11R6/include/xorg/uda1380.h
+./usr/X11R6/include/xorg/validate.h
+./usr/X11R6/include/xorg/vbe.h
+./usr/X11R6/include/xorg/vbeModes.h
+./usr/X11R6/include/xorg/vdif.h
+./usr/X11R6/include/xorg/vgaHW.h
+./usr/X11R6/include/xorg/window.h
+./usr/X11R6/include/xorg/windowstr.h
+./usr/X11R6/include/xorg/xaa.h
+./usr/X11R6/include/xorg/xaaWrapper.h
+./usr/X11R6/include/xorg/xaalocal.h
+./usr/X11R6/include/xorg/xaarop.h
+./usr/X11R6/include/xorg/xf1bpp.h
+./usr/X11R6/include/xorg/xf4bpp.h
+./usr/X11R6/include/xorg/xf86.h
+./usr/X11R6/include/xorg/xf86Cursor.h
+./usr/X11R6/include/xorg/xf86DDC.h
+./usr/X11R6/include/xorg/xf86Module.h
+./usr/X11R6/include/xorg/xf86OSKbd.h
+./usr/X11R6/include/xorg/xf86OSmouse.h
+./usr/X11R6/include/xorg/xf86Opt.h
+./usr/X11R6/include/xorg/xf86Pci.h
+./usr/X11R6/include/xorg/xf86PciInfo.h
+./usr/X11R6/include/xorg/xf86Priv.h
+./usr/X11R6/include/xorg/xf86Privstr.h
+./usr/X11R6/include/xorg/xf86RAC.h
+./usr/X11R6/include/xorg/xf86RamDac.h
+./usr/X11R6/include/xorg/xf86Resources.h
+./usr/X11R6/include/xorg/xf86Version.h
+./usr/X11R6/include/xorg/xf86Xinput.h
+./usr/X11R6/include/xorg/xf86_OSlib.h
+./usr/X11R6/include/xorg/xf86_OSproc.h
+./usr/X11R6/include/xorg/xf86_ansic.h
+./usr/X11R6/include/xorg/xf86_libc.h
+./usr/X11R6/include/xorg/xf86cmap.h
+./usr/X11R6/include/xorg/xf86fbman.h
+./usr/X11R6/include/xorg/xf86i2c.h
+./usr/X11R6/include/xorg/xf86int10.h
+./usr/X11R6/include/xorg/xf86sbusBus.h
+./usr/X11R6/include/xorg/xf86str.h
+./usr/X11R6/include/xorg/xf86xv.h
+./usr/X11R6/include/xorg/xf86xvmc.h
+./usr/X11R6/include/xorg/xf86xvpriv.h
+./usr/X11R6/include/xorg/xisb.h
+./usr/X11R6/include/xorg/xorg-server.h
+./usr/X11R6/include/xorg/xorgVersion.h
+./usr/X11R6/include/xorg/xvdix.h
+./usr/X11R6/include/xorg/xvmcext.h
 ./usr/X11R6/lib/X11/xserver
-./usr/X11R6/lib/modules
 ./usr/X11R6/lib/modules/drivers
+./usr/X11R6/lib/modules/drivers/apm_drv.la
 ./usr/X11R6/lib/modules/drivers/apm_drv.so
+./usr/X11R6/lib/modules/drivers/ark_drv.la
 ./usr/X11R6/lib/modules/drivers/ark_drv.so
+./usr/X11R6/lib/modules/drivers/ati_drv.la
 ./usr/X11R6/lib/modules/drivers/ati_drv.so
+./usr/X11R6/lib/modules/drivers/atimisc_drv.la
 ./usr/X11R6/lib/modules/drivers/atimisc_drv.so
+./usr/X11R6/lib/modules/drivers/chips_drv.la
 ./usr/X11R6/lib/modules/drivers/chips_drv.so
+./usr/X11R6/lib/modules/drivers/cirrus_alpine.la
 ./usr/X11R6/lib/modules/drivers/cirrus_alpine.so
+./usr/X11R6/lib/modules/drivers/cirrus_drv.la
 ./usr/X11R6/lib/modules/drivers/cirrus_drv.so
+./usr/X11R6/lib/modules/drivers/cirrus_laguna.la
 ./usr/X11R6/lib/modules/drivers/cirrus_laguna.so
+./usr/X11R6/lib/modules/drivers/cyrix_drv.la
 ./usr/X11R6/lib/modules/drivers/cyrix_drv.so
+./usr/X11R6/lib/modules/drivers/dummy_drv.la
 ./usr/X11R6/lib/modules/drivers/dummy_drv.so
+./usr/X11R6/lib/modules/drivers/glint_drv.la
 ./usr/X11R6/lib/modules/drivers/glint_drv.so
+./usr/X11R6/lib/modules/drivers/i128_drv.la
 ./usr/X11R6/lib/modules/drivers/i128_drv.so
+./usr/X11R6/lib/modules/drivers/i740_drv.la
 ./usr/X11R6/lib/modules/drivers/i740_drv.so
+./usr/X11R6/lib/modules/drivers/i810_drv.la
 ./usr/X11R6/lib/modules/drivers/i810_drv.so
+./usr/X11R6/lib/modules/drivers/mga_drv.la
 ./usr/X11R6/lib/modules/drivers/mga_drv.so
+./usr/X11R6/lib/modules/drivers/neomagic_drv.la
 ./usr/X11R6/lib/modules/drivers/neomagic_drv.so
+./usr/X11R6/lib/modules/drivers/nsc_drv.la
 ./usr/X11R6/lib/modules/drivers/nsc_drv.so
+./usr/X11R6/lib/modules/drivers/nv_drv.la
 ./usr/X11R6/lib/modules/drivers/nv_drv.so
+./usr/X11R6/lib/modules/drivers/r128_drv.la
 ./usr/X11R6/lib/modules/drivers/r128_drv.so
+./usr/X11R6/lib/modules/drivers/radeon_drv.la
 ./usr/X11R6/lib/modules/drivers/radeon_drv.so
+./usr/X11R6/lib/modules/drivers/rendition_drv.la
 ./usr/X11R6/lib/modules/drivers/rendition_drv.so
+./usr/X11R6/lib/modules/drivers/riva128.la
 ./usr/X11R6/lib/modules/drivers/riva128.so
+./usr/X11R6/lib/modules/drivers/s3_drv.la
 ./usr/X11R6/lib/modules/drivers/s3_drv.so
+./usr/X11R6/lib/modules/drivers/s3virge_drv.la
 ./usr/X11R6/lib/modules/drivers/s3virge_drv.so
+./usr/X11R6/lib/modules/drivers/savage_drv.la
 ./usr/X11R6/lib/modules/drivers/savage_drv.so
+./usr/X11R6/lib/modules/drivers/siliconmotion_drv.la
 ./usr/X11R6/lib/modules/drivers/siliconmotion_drv.so
+./usr/X11R6/lib/modules/drivers/sis_drv.la
 ./usr/X11R6/lib/modules/drivers/sis_drv.so
+./usr/X11R6/lib/modules/drivers/tdfx_drv.la
 ./usr/X11R6/lib/modules/drivers/tdfx_drv.so
-./usr/X11R6/lib/modules/drivers/tga_drv.so
+./usr/X11R6/lib/modules/drivers/trident_drv.la
 ./usr/X11R6/lib/modules/drivers/trident_drv.so
+./usr/X11R6/lib/modules/drivers/tseng_drv.la
 ./usr/X11R6/lib/modules/drivers/tseng_drv.so
+./usr/X11R6/lib/modules/drivers/vesa_drv.la
 ./usr/X11R6/lib/modules/drivers/vesa_drv.so
+./usr/X11R6/lib/modules/drivers/vga_drv.la
 ./usr/X11R6/lib/modules/drivers/vga_drv.so
-./usr/X11R6/lib/modules/drivers/via_drv.so
+./usr/X11R6/lib/modules/drivers/vmware_drv.la
 ./usr/X11R6/lib/modules/drivers/vmware_drv.so
+./usr/X11R6/lib/modules/drivers/voodoo_drv.la
+./usr/X11R6/lib/modules/drivers/voodoo_drv.so
+./usr/X11R6/lib/modules/drivers/wsfb_drv.la
 ./usr/X11R6/lib/modules/drivers/wsfb_drv.so
 ./usr/X11R6/lib/modules/extensions
+./usr/X11R6/lib/modules/extensions/libGLcore.la
 ./usr/X11R6/lib/modules/extensions/libGLcore.so
+./usr/X11R6/lib/modules/extensions/libdbe.la
 ./usr/X11R6/lib/modules/extensions/libdbe.so
+./usr/X11R6/lib/modules/extensions/libextmod.la
 ./usr/X11R6/lib/modules/extensions/libextmod.so
+./usr/X11R6/lib/modules/extensions/libglx.la
 ./usr/X11R6/lib/modules/extensions/libglx.so
+./usr/X11R6/lib/modules/extensions/librecord.la
 ./usr/X11R6/lib/modules/extensions/librecord.so
+./usr/X11R6/lib/modules/extensions/libxtrap.la
 ./usr/X11R6/lib/modules/extensions/libxtrap.so
 ./usr/X11R6/lib/modules/fonts
-./usr/X11R6/lib/modules/fonts/libbitmap.so
+./usr/X11R6/lib/modules/fonts/libfreetype.la
 ./usr/X11R6/lib/modules/fonts/libfreetype.so
+./usr/X11R6/lib/modules/fonts/libtype1.la
 ./usr/X11R6/lib/modules/fonts/libtype1.so
 ./usr/X11R6/lib/modules/input
+./usr/X11R6/lib/modules/input/acecad_drv.la
 ./usr/X11R6/lib/modules/input/acecad_drv.so
-./usr/X11R6/lib/modules/input/calcomp_drv.so
-./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.so
-./usr/X11R6/lib/modules/input/dynapro_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
 ./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/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/keyboard_drv.la
 ./usr/X11R6/lib/modules/input/keyboard_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.so
+./usr/X11R6/lib/modules/input/magictouch_drv.la
+./usr/X11R6/lib/modules/input/magictouch_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.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
+./usr/X11R6/lib/modules/input/vmmouse_drv.so
+./usr/X11R6/lib/modules/input/void_drv.la
 ./usr/X11R6/lib/modules/input/void_drv.so
-./usr/X11R6/lib/modules/input/wacom_drv.so
-./usr/X11R6/lib/modules/internal
+./usr/X11R6/lib/modules/libafb.la
 ./usr/X11R6/lib/modules/libafb.so
+./usr/X11R6/lib/modules/libcfb.la
 ./usr/X11R6/lib/modules/libcfb.so
-./usr/X11R6/lib/modules/libcfb16.so
+./usr/X11R6/lib/modules/libcfb32.la
 ./usr/X11R6/lib/modules/libcfb32.so
+./usr/X11R6/lib/modules/libddc.la
 ./usr/X11R6/lib/modules/libddc.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/libi2c.la
 ./usr/X11R6/lib/modules/libi2c.so
+./usr/X11R6/lib/modules/libint10.la
 ./usr/X11R6/lib/modules/libint10.so
-./usr/X11R6/lib/modules/liblayer.so
+./usr/X11R6/lib/modules/libmfb.la
 ./usr/X11R6/lib/modules/libmfb.so
+./usr/X11R6/lib/modules/libpcidata.la
 ./usr/X11R6/lib/modules/libpcidata.so
-./usr/X11R6/lib/modules/librac.so
+./usr/X11R6/lib/modules/libramdac.la
 ./usr/X11R6/lib/modules/libramdac.so
+./usr/X11R6/lib/modules/libscanpci.la
 ./usr/X11R6/lib/modules/libscanpci.so
+./usr/X11R6/lib/modules/libshadow.la
 ./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/libxaa.la
 ./usr/X11R6/lib/modules/libxaa.so
+./usr/X11R6/lib/modules/libxf1bpp.la
 ./usr/X11R6/lib/modules/libxf1bpp.so
+./usr/X11R6/lib/modules/libxf4bpp.la
 ./usr/X11R6/lib/modules/libxf4bpp.so
+./usr/X11R6/lib/modules/libxf8_16bpp.la
 ./usr/X11R6/lib/modules/libxf8_16bpp.so
+./usr/X11R6/lib/modules/libxf8_32bpp.la
 ./usr/X11R6/lib/modules/libxf8_32bpp.so
 ./usr/X11R6/lib/modules/multimedia
+./usr/X11R6/lib/modules/multimedia/bt829_drv.la
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.so
+./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
 ./usr/X11R6/lib/modules/multimedia/fi1236_drv.so
+./usr/X11R6/lib/modules/multimedia/msp3430_drv.la
 ./usr/X11R6/lib/modules/multimedia/msp3430_drv.so
+./usr/X11R6/lib/modules/multimedia/tda8425_drv.la
 ./usr/X11R6/lib/modules/multimedia/tda8425_drv.so
+./usr/X11R6/lib/modules/multimedia/tda9850_drv.la
 ./usr/X11R6/lib/modules/multimedia/tda9850_drv.so
+./usr/X11R6/lib/modules/multimedia/tda9885_drv.la
 ./usr/X11R6/lib/modules/multimedia/tda9885_drv.so
+./usr/X11R6/lib/modules/multimedia/theatre200_drv.la
 ./usr/X11R6/lib/modules/multimedia/theatre200_drv.so
+./usr/X11R6/lib/modules/multimedia/theatre_detect_drv.la
 ./usr/X11R6/lib/modules/multimedia/theatre_detect_drv.so
+./usr/X11R6/lib/modules/multimedia/theatre_drv.la
 ./usr/X11R6/lib/modules/multimedia/theatre_drv.so
+./usr/X11R6/lib/modules/multimedia/uda1380_drv.la
 ./usr/X11R6/lib/modules/multimedia/uda1380_drv.so
-./usr/X11R6/lib/modules/old
-./usr/X11R6/lib/modules/old/xf86AceCad.so
-./usr/X11R6/lib/modules/old/xf86Calcomp.so
-./usr/X11R6/lib/modules/old/xf86Dial.so
-./usr/X11R6/lib/modules/old/xf86Dyna.so
-./usr/X11R6/lib/modules/old/xf86Elo.so
-./usr/X11R6/lib/modules/old/xf86Jstk.so
-./usr/X11R6/lib/modules/old/xf86MuTouch.so
-./usr/X11R6/lib/modules/old/xf86Summa.so
-./usr/X11R6/lib/modules/old/xf86Wacom.so
 ./usr/X11R6/lib/modules/v10002d.uc
 ./usr/X11R6/lib/modules/v20002d.uc
-./usr/X11R6/man/cat1/XDarwin.0
-./usr/X11R6/man/cat1/XF86Setup.0
-./usr/X11R6/man/cat1/XF86_8514.0
-./usr/X11R6/man/cat1/XF86_AGX.0
-./usr/X11R6/man/cat1/XF86_Accel.0
-./usr/X11R6/man/cat1/XF86_I128.0
-./usr/X11R6/man/cat1/XF86_Mach32.0
-./usr/X11R6/man/cat1/XF86_Mach64.0
-./usr/X11R6/man/cat1/XF86_Mach8.0
-./usr/X11R6/man/cat1/XF86_Mono.0
-./usr/X11R6/man/cat1/XF86_P9000.0
-./usr/X11R6/man/cat1/XF86_S3.0
-./usr/X11R6/man/cat1/XF86_SVGA.0
-./usr/X11R6/man/cat1/XF86_VGA16.0
-./usr/X11R6/man/cat1/XF86_W32.0
-./usr/X11R6/man/cat1/Xnest.0
-./usr/X11R6/man/cat1/Xorg.0
-./usr/X11R6/man/cat1/Xprt.0
-./usr/X11R6/man/cat1/Xserver.0
-./usr/X11R6/man/cat1/Xvfb.0
-./usr/X11R6/man/cat1/Xwrapper.0
-./usr/X11R6/man/cat1/getconfig.0
-./usr/X11R6/man/cat1/kbd_mode.0
-./usr/X11R6/man/cat1/pcitweak.0
-./usr/X11R6/man/cat1/scanpci.0
-./usr/X11R6/man/cat1/xf86config3.0
-./usr/X11R6/man/cat1/xmseconfig.0
-./usr/X11R6/man/cat1/xorgcfg.0
-./usr/X11R6/man/cat1/xorgconfig.0
-./usr/X11R6/man/cat4/aiptek.0
-./usr/X11R6/man/cat4/apm.0
-./usr/X11R6/man/cat4/chips.0
-./usr/X11R6/man/cat4/cirrus.0
-./usr/X11R6/man/cat4/citron.0
-./usr/X11R6/man/cat4/cyrix.0
-./usr/X11R6/man/cat4/dmc.0
-./usr/X11R6/man/cat4/dynapro.0
-./usr/X11R6/man/cat4/elographics.0
-./usr/X11R6/man/cat4/fbdevhw.0
-./usr/X11R6/man/cat4/fpit.0
-./usr/X11R6/man/cat4/glide.0
-./usr/X11R6/man/cat4/glint.0
-./usr/X11R6/man/cat4/i128.0
-./usr/X11R6/man/cat4/i740.0
-./usr/X11R6/man/cat4/i810.0
-./usr/X11R6/man/cat4/js_x.0
-./usr/X11R6/man/cat4/kbd.0
-./usr/X11R6/man/cat4/keyboard.0
-./usr/X11R6/man/cat4/mga.0
-./usr/X11R6/man/cat4/microtouch.0
-./usr/X11R6/man/cat4/mouse.0
-./usr/X11R6/man/cat4/mutouch.0
-./usr/X11R6/man/cat4/neomagic.0
-./usr/X11R6/man/cat4/newport.0
-./usr/X11R6/man/cat4/nsc.0
-./usr/X11R6/man/cat4/nv.0
-./usr/X11R6/man/cat4/palmax.0
-./usr/X11R6/man/cat4/penmount.0
-./usr/X11R6/man/cat4/r128.0
-./usr/X11R6/man/cat4/radeon.0
-./usr/X11R6/man/cat4/rendition.0
-./usr/X11R6/man/cat4/s3virge.0
-./usr/X11R6/man/cat4/savage.0
-./usr/X11R6/man/cat4/siliconmotion.0
-./usr/X11R6/man/cat4/sis.0
-./usr/X11R6/man/cat4/sunbw2.0
-./usr/X11R6/man/cat4/suncg14.0
-./usr/X11R6/man/cat4/suncg3.0
-./usr/X11R6/man/cat4/suncg6.0
-./usr/X11R6/man/cat4/sunffb.0
-./usr/X11R6/man/cat4/sunleo.0
-./usr/X11R6/man/cat4/suntcx.0
-./usr/X11R6/man/cat4/tdfx.0
-./usr/X11R6/man/cat4/tek4957.0
-./usr/X11R6/man/cat4/trident.0
-./usr/X11R6/man/cat4/tseng.0
-./usr/X11R6/man/cat4/ur98.0
-./usr/X11R6/man/cat4/usbtablet.0
-./usr/X11R6/man/cat4/v4l.0
-./usr/X11R6/man/cat4/vesa.0
-./usr/X11R6/man/cat4/vga.0
-./usr/X11R6/man/cat4/via.0
-./usr/X11R6/man/cat4/vmware.0
-./usr/X11R6/man/cat4/void.0
-./usr/X11R6/man/cat4/wacom.0
-./usr/X11R6/man/cat4/wsfb.0
-./usr/X11R6/man/cat5/XF86Config-3.0
-./usr/X11R6/man/cat5/getconfig.0
-./usr/X11R6/man/cat5/xorg.conf.0
+./usr/X11R6/man/man1/Xnest.1
+./usr/X11R6/man/man1/Xorg.1
+./usr/X11R6/man/man1/Xprt.1
+./usr/X11R6/man/man1/Xserver.1
+./usr/X11R6/man/man1/Xvfb.1
+./usr/X11R6/man/man1/cvt.1
+./usr/X11R6/man/man1/gtf.1
+./usr/X11R6/man/man1/pcitweak.1
+./usr/X11R6/man/man1/scanpci.1
+./usr/X11R6/man/man1/xorgcfg.1
+./usr/X11R6/man/man1/xorgconfig.1
+./usr/X11R6/man/man4/acecad.4
+./usr/X11R6/man/man4/apm.4
+./usr/X11R6/man/man4/ati.4
+./usr/X11R6/man/man4/chips.4
+./usr/X11R6/man/man4/cirrus.4
+./usr/X11R6/man/man4/cyrix.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/glint.4
+./usr/X11R6/man/man4/i128.4
+./usr/X11R6/man/man4/i740.4
+./usr/X11R6/man/man4/i810.4
+./usr/X11R6/man/man4/js_x.4
+./usr/X11R6/man/man4/kbd.4
+./usr/X11R6/man/man4/keyboard.4
+./usr/X11R6/man/man4/magictouch.4
+./usr/X11R6/man/man4/mga.4
+./usr/X11R6/man/man4/mousedrv.4
+./usr/X11R6/man/man4/mutouch.4
+./usr/X11R6/man/man4/neomagic.4
+./usr/X11R6/man/man4/nsc.4
+./usr/X11R6/man/man4/nv.4
+./usr/X11R6/man/man4/palmax.4
+./usr/X11R6/man/man4/r128.4
+./usr/X11R6/man/man4/radeon.4
+./usr/X11R6/man/man4/rendition.4
+./usr/X11R6/man/man4/s3virge.4
+./usr/X11R6/man/man4/savage.4
+./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
+./usr/X11R6/man/man4/vesa.4
+./usr/X11R6/man/man4/vga.4
+./usr/X11R6/man/man4/vmmouse.4
+./usr/X11R6/man/man4/vmware.4
+./usr/X11R6/man/man4/voodoo.4
+./usr/X11R6/man/man4/void.4
+./usr/X11R6/man/man4/wsfb.4
+./usr/X11R6/man/man5/xorg.conf.5
diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi
index af42d9df3..df8607b6d 100644
--- a/distrib/sets/lists/xshare/mi
+++ b/distrib/sets/lists/xshare/mi
@@ -2129,10 +2129,16 @@
 ./usr/X11R6/man/man3/XwcTextPerCharExtents.3
 ./usr/X11R6/man/man3/XwcTextPropertyToTextList.3
 ./usr/X11R6/man/man3/libXp.3
+./usr/X11R6/man/man7/Consortium.7
+./usr/X11R6/man/man7/Standards.7
 ./usr/X11R6/man/man7/X.7
 ./usr/X11R6/man/man7/XOrgFoundation.7
 ./usr/X11R6/man/man7/XProjectTeam.7
 ./usr/X11R6/man/man7/security.7
+./usr/X11R6/share/X11/XErrorDB
+./usr/X11R6/share/X11/XKeysymDB
+./usr/X11R6/share/X11/doc
+./usr/X11R6/share/X11/doc/MAINTAINERS
 ./usr/X11R6/share/X11/locale
 ./usr/X11R6/share/X11/locale/C
 ./usr/X11R6/share/X11/locale/C/Compose
@@ -2365,6 +2371,7 @@
 ./usr/X11R6/share/X11/locale/zh_TW/Compose
 ./usr/X11R6/share/X11/locale/zh_TW/XI18N_OBJS
 ./usr/X11R6/share/X11/locale/zh_TW/XLC_LOCALE
+./usr/X11R6/share/X11/rgb.txt
 ./usr/X11R6/share/aclocal
 ./usr/X11R6/share/aclocal/fontutil.m4
 ./usr/X11R6/share/aclocal/xaw.m4