sync

3 files changed, 3 insertions, 105 deletions

diff --git a/distrib/sets/lists/xbase/md.mvme68k b/distrib/sets/lists/xbase/md.mvme68k
index f5f0e46e5..423bbb7de 100644
--- a/distrib/sets/lists/xbase/md.mvme68k
+++ b/distrib/sets/lists/xbase/md.mvme68k
@@ -1,4 +1,3 @@
-./etc/X11/app-defaults
 ./etc/X11/fs
 ./etc/X11/lbxproxy
 ./etc/X11/proxymngr
@@ -11,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
@@ -34,8 +30,6 @@
 ./etc/X11/xkb/compat/pc98
 ./etc/X11/xkb/compat/xfree86
 ./etc/X11/xkb/compat/xtest
-./etc/X11/xkb/compiled
-./etc/X11/xkb/compiled/README
 ./etc/X11/xkb/geometry
 ./etc/X11/xkb/geometry.dir
 ./etc/X11/xkb/geometry/README
@@ -144,10 +138,6 @@
 ./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
@@ -411,7 +401,6 @@
 ./etc/X11/xkb/types/mousekeys
 ./etc/X11/xkb/types/numpad
 ./etc/X11/xkb/types/pc
-./etc/X11/xkb/xkbcomp
 ./etc/X11/xsm
 ./usr/X11R6/bin/bdftruncate
 ./usr/X11R6/bin/dga
@@ -419,7 +408,6 @@
 ./usr/X11R6/bin/glxinfo
 ./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
@@ -481,114 +469,37 @@
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
 ./usr/X11R6/lib/libXp.so.10.0
-./usr/X11R6/lib/libXpm.so.7.0
 ./usr/X11R6/lib/libXpm.so.8.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/libXrandr.so.6.0
 ./usr/X11R6/lib/libXrender.so.5.0
-./usr/X11R6/lib/libXss.so.4.0
 ./usr/X11R6/lib/libXss.so.5.0
 ./usr/X11R6/lib/libXt.so.10.0
-./usr/X11R6/lib/libXt.so.9.0
 ./usr/X11R6/lib/libXtst.so.10.0
-./usr/X11R6/lib/libXtst.so.9.0
-./usr/X11R6/lib/libXv.so.4.0
 ./usr/X11R6/lib/libXv.so.5.0
-./usr/X11R6/lib/libXvMC.so.4.1
 ./usr/X11R6/lib/libXvMC.so.5.0
 ./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/libXxf86dga.so.5.0
-./usr/X11R6/lib/libXxf86misc.so.4.0
 ./usr/X11R6/lib/libXxf86misc.so.5.0
-./usr/X11R6/lib/libXxf86vm.so.4.0
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
-./usr/X11R6/lib/libexpat.so.5.0
 ./usr/X11R6/lib/libexpat.so.6.0
-./usr/X11R6/lib/libfontconfig.so.3.0
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./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.10.0
-./usr/X11R6/lib/liboldX.so.9.0
-./usr/X11R6/lib/libxkbfile.so.3.0
 ./usr/X11R6/lib/libxkbfile.so.4.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/XDarwin.0
-./usr/X11R6/man/cat1/bdftruncate.0
-./usr/X11R6/man/cat1/dga.0
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.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
@@ -1108,19 +1019,6 @@
 ./usr/X11R6/man/cat3/gluTessProperty.0
 ./usr/X11R6/man/cat3/gluTessVertex.0
 ./usr/X11R6/man/cat3/gluUnProject.0
-./usr/X11R6/man/cat4/aiptek.0
-./usr/X11R6/man/cat4/glide.0
-./usr/X11R6/man/cat4/newport.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/ur98.0
-./usr/X11R6/man/cat4/v4l.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
diff --git a/distrib/sets/lists/xserv/md.mvme68k b/distrib/sets/lists/xserv/md.mvme68k
index 57485724d..2e84c7495 100644
--- a/distrib/sets/lists/xserv/md.mvme68k
+++ b/distrib/sets/lists/xserv/md.mvme68k
@@ -1,6 +1,7 @@
 ./usr/X11R6/bin/Xnest
 ./usr/X11R6/bin/Xprt
 ./usr/X11R6/bin/Xvfb
+./usr/X11R6/include/xorg
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/modules
 ./usr/X11R6/lib/modules/drivers
@@ -11,7 +12,6 @@
 ./usr/X11R6/lib/modules/multimedia
 ./usr/X11R6/lib/xserver
 ./usr/X11R6/lib/xserver/SecurityPolicy
-./usr/X11R6/man/cat1/XDarwin.0
 ./usr/X11R6/man/man1/Xnest.1
 ./usr/X11R6/man/man1/Xprt.1
 ./usr/X11R6/man/man1/Xserver.1
diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi
index 4a78db6a5..d2e7a21fd 100644
--- a/distrib/sets/lists/xshare/mi
+++ b/distrib/sets/lists/xshare/mi
@@ -904,11 +904,13 @@
 ./usr/X11R6/man/cat1/FvwmTalk.0
 ./usr/X11R6/man/cat1/FvwmWinList.0
 ./usr/X11R6/man/cat1/fvwm.0
+./usr/X11R6/man/cat1/resize.0
 ./usr/X11R6/man/cat1/ssh-askpass.0
 ./usr/X11R6/man/cat1/wm2.0
 ./usr/X11R6/man/cat1/xidle.0
 ./usr/X11R6/man/cat1/xpmroot.0
 ./usr/X11R6/man/cat1/xsystrace.0
+./usr/X11R6/man/cat1/xterm.0
 ./usr/X11R6/man/cat1/xvctl.0
 ./usr/X11R6/man/cat3
 ./usr/X11R6/man/man1/Xmark.1
@@ -942,7 +944,6 @@
 ./usr/X11R6/man/man1/mkhtmlindex.1
 ./usr/X11R6/man/man1/oclock.1
 ./usr/X11R6/man/man1/proxymngr.1
-./usr/X11R6/man/man1/resize.1
 ./usr/X11R6/man/man1/revpath.1
 ./usr/X11R6/man/man1/rstart.1
 ./usr/X11R6/man/man1/rstartd.1
@@ -1015,7 +1016,6 @@
 ./usr/X11R6/man/man1/xsetroot.1
 ./usr/X11R6/man/man1/xsm.1
 ./usr/X11R6/man/man1/xstdcmap.1
-./usr/X11R6/man/man1/xterm.1
 ./usr/X11R6/man/man1/xtrap.1
 ./usr/X11R6/man/man1/xtrapchar.1
 ./usr/X11R6/man/man1/xtrapin.1