sync

1 files changed, 106 insertions, 159 deletions

diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index 4109d2328..c018d4772 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -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
@@ -144,10 +139,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 +227,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 +249,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 +373,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,37 +402,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/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
@@ -432,6 +423,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
@@ -449,8 +442,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
@@ -461,87 +452,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/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/getconfig
-./usr/X11R6/lib/X11/getconfig/cfg.sample
-./usr/X11R6/lib/X11/getconfig/xorg.cfg
 ./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/libXft.so.6.0
-./usr/X11R6/lib/libXft1.so.4.0
+./usr/X11R6/lib/libXfixes.so.4.1
+./usr/X11R6/lib/libXfont.so.6.0
+./usr/X11R6/lib/libXfontcache.so.1.0
+./usr/X11R6/lib/libXft.so.6.1
 ./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
@@ -549,86 +499,29 @@
 ./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/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
@@ -1148,6 +1041,60 @@
 ./usr/X11R6/man/cat3/gluTessProperty.0
 ./usr/X11R6/man/cat3/gluTessVertex.0
 ./usr/X11R6/man/cat3/gluUnProject.0
-./usr/X11R6/man/cat7/Xprint.0
-./var/db/xkb
-./var/db/xkb/README
+./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