sync

17 files changed, 46 insertions, 175 deletions

diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index c9ce15333..99bad2526 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -426,27 +426,10 @@
 ./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
-./usr/X11R6/include/X11/bitmaps/keyboard.xbm
-./usr/X11R6/include/X11/bitmaps/left.xbm
-./usr/X11R6/include/X11/bitmaps/monitor.xbm
-./usr/X11R6/include/X11/bitmaps/mouse.xbm
-./usr/X11R6/include/X11/bitmaps/narrower.xbm
-./usr/X11R6/include/X11/bitmaps/right.xbm
-./usr/X11R6/include/X11/bitmaps/shorter.xbm
-./usr/X11R6/include/X11/bitmaps/taller.xbm
-./usr/X11R6/include/X11/bitmaps/up.xbm
-./usr/X11R6/include/X11/bitmaps/wider.xbm
 ./usr/X11R6/include/X11/extensions/xf86dga.h
 ./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/pixmaps/card.xpm
-./usr/X11R6/include/X11/pixmaps/computer.xpm
-./usr/X11R6/include/X11/pixmaps/keyboard.xpm
-./usr/X11R6/include/X11/pixmaps/monitor.xpm
-./usr/X11R6/include/X11/pixmaps/mouse.xpm
 ./usr/X11R6/include/drm
 ./usr/X11R6/include/drm/drm.h
 ./usr/X11R6/include/drm/drm_sarea.h
@@ -471,7 +454,7 @@
 ./usr/X11R6/lib/X11/Options
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.5.1
+./usr/X11R6/lib/libGL.so.6.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -481,7 +464,7 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.8.1
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.0
+./usr/X11R6/lib/libX11.so.11.1
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index c9ce15333..99bad2526 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -426,27 +426,10 @@
 ./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
-./usr/X11R6/include/X11/bitmaps/keyboard.xbm
-./usr/X11R6/include/X11/bitmaps/left.xbm
-./usr/X11R6/include/X11/bitmaps/monitor.xbm
-./usr/X11R6/include/X11/bitmaps/mouse.xbm
-./usr/X11R6/include/X11/bitmaps/narrower.xbm
-./usr/X11R6/include/X11/bitmaps/right.xbm
-./usr/X11R6/include/X11/bitmaps/shorter.xbm
-./usr/X11R6/include/X11/bitmaps/taller.xbm
-./usr/X11R6/include/X11/bitmaps/up.xbm
-./usr/X11R6/include/X11/bitmaps/wider.xbm
 ./usr/X11R6/include/X11/extensions/xf86dga.h
 ./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/pixmaps/card.xpm
-./usr/X11R6/include/X11/pixmaps/computer.xpm
-./usr/X11R6/include/X11/pixmaps/keyboard.xpm
-./usr/X11R6/include/X11/pixmaps/monitor.xpm
-./usr/X11R6/include/X11/pixmaps/mouse.xpm
 ./usr/X11R6/include/drm
 ./usr/X11R6/include/drm/drm.h
 ./usr/X11R6/include/drm/drm_sarea.h
@@ -471,7 +454,7 @@
 ./usr/X11R6/lib/X11/Options
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.5.1
+./usr/X11R6/lib/libGL.so.6.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -481,7 +464,7 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.8.1
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.0
+./usr/X11R6/lib/libX11.so.11.1
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish
index 18580a687..e424dcd67 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -426,27 +426,10 @@
 ./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
-./usr/X11R6/include/X11/bitmaps/keyboard.xbm
-./usr/X11R6/include/X11/bitmaps/left.xbm
-./usr/X11R6/include/X11/bitmaps/monitor.xbm
-./usr/X11R6/include/X11/bitmaps/mouse.xbm
-./usr/X11R6/include/X11/bitmaps/narrower.xbm
-./usr/X11R6/include/X11/bitmaps/right.xbm
-./usr/X11R6/include/X11/bitmaps/shorter.xbm
-./usr/X11R6/include/X11/bitmaps/taller.xbm
-./usr/X11R6/include/X11/bitmaps/up.xbm
-./usr/X11R6/include/X11/bitmaps/wider.xbm
 ./usr/X11R6/include/X11/extensions/xf86dga.h
 ./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/pixmaps/card.xpm
-./usr/X11R6/include/X11/pixmaps/computer.xpm
-./usr/X11R6/include/X11/pixmaps/keyboard.xpm
-./usr/X11R6/include/X11/pixmaps/monitor.xpm
-./usr/X11R6/include/X11/pixmaps/mouse.xpm
 ./usr/X11R6/include/freetype2/freetype/ftgzip.h
 ./usr/X11R6/include/freetype2/freetype/ftincrem.h
 ./usr/X11R6/include/freetype2/freetype/ftpfr.h
@@ -456,7 +439,7 @@
 ./usr/X11R6/lib/X11/Options
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.5.1
+./usr/X11R6/lib/libGL.so.6.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -466,7 +449,7 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.8.1
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.0
+./usr/X11R6/lib/libX11.so.11.1
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
diff --git a/distrib/sets/lists/xbase/md.hp300 b/distrib/sets/lists/xbase/md.hp300
index c029467a7..d0e5abc76 100644
--- a/distrib/sets/lists/xbase/md.hp300
+++ b/distrib/sets/lists/xbase/md.hp300
@@ -499,25 +499,8 @@
 ./usr/X11R6/include/GL/glxproto.h
 ./usr/X11R6/include/GL/glxtokens.h
 ./usr/X11R6/include/GL/osmesa.h
-./usr/X11R6/include/X11/bitmaps/card.xbm
-./usr/X11R6/include/X11/bitmaps/down.xbm
-./usr/X11R6/include/X11/bitmaps/keyboard.xbm
-./usr/X11R6/include/X11/bitmaps/left.xbm
-./usr/X11R6/include/X11/bitmaps/monitor.xbm
-./usr/X11R6/include/X11/bitmaps/mouse.xbm
-./usr/X11R6/include/X11/bitmaps/narrower.xbm
-./usr/X11R6/include/X11/bitmaps/right.xbm
-./usr/X11R6/include/X11/bitmaps/shorter.xbm
-./usr/X11R6/include/X11/bitmaps/taller.xbm
-./usr/X11R6/include/X11/bitmaps/up.xbm
-./usr/X11R6/include/X11/bitmaps/wider.xbm
 ./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
-./usr/X11R6/include/X11/pixmaps/monitor.xpm
-./usr/X11R6/include/X11/pixmaps/mouse.xpm
 ./usr/X11R6/include/freetype2/freetype/ftgzip.h
 ./usr/X11R6/include/freetype2/freetype/ftincrem.h
 ./usr/X11R6/include/freetype2/freetype/ftpfr.h
@@ -570,10 +553,12 @@
 ./usr/X11R6/lib/X11/xorg.conf.eg
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
+./usr/X11R6/lib/libGL.so.6.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLw.a
 ./usr/X11R6/lib/libICE.so.8.1
 ./usr/X11R6/lib/libSM.so.8.0
+./usr/X11R6/lib/libX11.so.11.1
 ./usr/X11R6/lib/libXau.so.9.0
 ./usr/X11R6/lib/libXaw.so.11.0
 ./usr/X11R6/lib/libXaw7.so.11.0
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index b8a4e20c8..862395310 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -437,7 +437,7 @@
 ./usr/X11R6/include/xorg
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.5.1
+./usr/X11R6/lib/libGL.so.6.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -447,7 +447,7 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.8.1
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.0
+./usr/X11R6/lib/libX11.so.11.1
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index 23cec33fc..e8392b1ff 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -426,27 +426,10 @@
 ./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
-./usr/X11R6/include/X11/bitmaps/keyboard.xbm
-./usr/X11R6/include/X11/bitmaps/left.xbm
-./usr/X11R6/include/X11/bitmaps/monitor.xbm
-./usr/X11R6/include/X11/bitmaps/mouse.xbm
-./usr/X11R6/include/X11/bitmaps/narrower.xbm
-./usr/X11R6/include/X11/bitmaps/right.xbm
-./usr/X11R6/include/X11/bitmaps/shorter.xbm
-./usr/X11R6/include/X11/bitmaps/taller.xbm
-./usr/X11R6/include/X11/bitmaps/up.xbm
-./usr/X11R6/include/X11/bitmaps/wider.xbm
 ./usr/X11R6/include/X11/extensions/xf86dga.h
 ./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/pixmaps/card.xpm
-./usr/X11R6/include/X11/pixmaps/computer.xpm
-./usr/X11R6/include/X11/pixmaps/keyboard.xpm
-./usr/X11R6/include/X11/pixmaps/monitor.xpm
-./usr/X11R6/include/X11/pixmaps/mouse.xpm
 ./usr/X11R6/include/drm
 ./usr/X11R6/include/drm/drm.h
 ./usr/X11R6/include/drm/drm_sarea.h
@@ -471,7 +454,7 @@
 ./usr/X11R6/lib/X11/Options
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.5.1
+./usr/X11R6/lib/libGL.so.6.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -481,7 +464,7 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.8.1
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.0
+./usr/X11R6/lib/libX11.so.11.1
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index 513cf3196..05e431434 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -436,8 +436,10 @@
 ./usr/X11R6/include/ft2build.h
 ./usr/X11R6/include/xorg
 ./usr/X11R6/lib/libGL.a
+./usr/X11R6/lib/libGL.so.6.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLw.a
+./usr/X11R6/lib/libX11.so.11.1
 ./usr/X11R6/lib/libXxf86dga.a
 ./usr/X11R6/lib/libXxf86dga.la
 ./usr/X11R6/man/cat1/glxgears.0
diff --git a/distrib/sets/lists/xbase/md.mac68k b/distrib/sets/lists/xbase/md.mac68k
index 160900638..e85cdf783 100644
--- a/distrib/sets/lists/xbase/md.mac68k
+++ b/distrib/sets/lists/xbase/md.mac68k
@@ -433,25 +433,8 @@
 ./usr/X11R6/include/GL/glxproto.h
 ./usr/X11R6/include/GL/glxtokens.h
 ./usr/X11R6/include/GL/osmesa.h
-./usr/X11R6/include/X11/bitmaps/card.xbm
-./usr/X11R6/include/X11/bitmaps/down.xbm
-./usr/X11R6/include/X11/bitmaps/keyboard.xbm
-./usr/X11R6/include/X11/bitmaps/left.xbm
-./usr/X11R6/include/X11/bitmaps/monitor.xbm
-./usr/X11R6/include/X11/bitmaps/mouse.xbm
-./usr/X11R6/include/X11/bitmaps/narrower.xbm
-./usr/X11R6/include/X11/bitmaps/right.xbm
-./usr/X11R6/include/X11/bitmaps/shorter.xbm
-./usr/X11R6/include/X11/bitmaps/taller.xbm
-./usr/X11R6/include/X11/bitmaps/up.xbm
-./usr/X11R6/include/X11/bitmaps/wider.xbm
 ./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
-./usr/X11R6/include/X11/pixmaps/monitor.xpm
-./usr/X11R6/include/X11/pixmaps/mouse.xpm
 ./usr/X11R6/include/freetype2/freetype/ftgzip.h
 ./usr/X11R6/include/freetype2/freetype/ftincrem.h
 ./usr/X11R6/include/freetype2/freetype/ftpfr.h
@@ -462,10 +445,12 @@
 ./usr/X11R6/lib/X11/xserver
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
+./usr/X11R6/lib/libGL.so.6.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLw.a
 ./usr/X11R6/lib/libICE.so.8.1
 ./usr/X11R6/lib/libSM.so.8.0
+./usr/X11R6/lib/libX11.so.11.1
 ./usr/X11R6/lib/libXau.so.9.0
 ./usr/X11R6/lib/libXaw.so.11.0
 ./usr/X11R6/lib/libXaw7.so.11.0
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index a386cdc6a..e62bc5667 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -426,27 +426,10 @@
 ./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
-./usr/X11R6/include/X11/bitmaps/keyboard.xbm
-./usr/X11R6/include/X11/bitmaps/left.xbm
-./usr/X11R6/include/X11/bitmaps/monitor.xbm
-./usr/X11R6/include/X11/bitmaps/mouse.xbm
-./usr/X11R6/include/X11/bitmaps/narrower.xbm
-./usr/X11R6/include/X11/bitmaps/right.xbm
-./usr/X11R6/include/X11/bitmaps/shorter.xbm
-./usr/X11R6/include/X11/bitmaps/taller.xbm
-./usr/X11R6/include/X11/bitmaps/up.xbm
-./usr/X11R6/include/X11/bitmaps/wider.xbm
 ./usr/X11R6/include/X11/extensions/xf86dga.h
 ./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/pixmaps/card.xpm
-./usr/X11R6/include/X11/pixmaps/computer.xpm
-./usr/X11R6/include/X11/pixmaps/keyboard.xpm
-./usr/X11R6/include/X11/pixmaps/monitor.xpm
-./usr/X11R6/include/X11/pixmaps/mouse.xpm
 ./usr/X11R6/include/drm
 ./usr/X11R6/include/drm/drm.h
 ./usr/X11R6/include/drm/drm_sarea.h
@@ -471,7 +454,7 @@
 ./usr/X11R6/lib/X11/Options
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.5.1
+./usr/X11R6/lib/libGL.so.6.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -481,7 +464,7 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.8.1
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.0
+./usr/X11R6/lib/libX11.so.11.1
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
diff --git a/distrib/sets/lists/xbase/md.mvme68k b/distrib/sets/lists/xbase/md.mvme68k
index beaa58459..aa56f631a 100644
--- a/distrib/sets/lists/xbase/md.mvme68k
+++ b/distrib/sets/lists/xbase/md.mvme68k
@@ -437,7 +437,7 @@
 ./usr/X11R6/include/ft2build.h
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.5.1
+./usr/X11R6/lib/libGL.so.6.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -447,7 +447,7 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.8.1
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.10.0
+./usr/X11R6/lib/libX11.so.11.1
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
@@ -457,7 +457,7 @@
 ./usr/X11R6/lib/libXaw8.so.12.0
 ./usr/X11R6/lib/libXcomposite.so.3.0
 ./usr/X11R6/lib/libXcursor.so.4.0
-./usr/X11R6/lib/libXdamage.so.3.0
+./usr/X11R6/lib/libXdamage.so.3.1
 ./usr/X11R6/lib/libXdmcp.so.9.0
 ./usr/X11R6/lib/libXevie.so.2.0
 ./usr/X11R6/lib/libXext.so.10.0
@@ -1025,3 +1025,15 @@
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
 ./usr/X11R6/man/man1/xfs.1
+./var/cache/fontconfig/06967e83801ccef301685ecdd941333e-m68k.cache-2
+./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-m68k.cache-2
+./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-m68k.cache-2
+./var/cache/fontconfig/2cee944125173ffd13126fb55c9a0dc1-m68k.cache-2
+./var/cache/fontconfig/68418e0da60dfe4003a8c2435e92b1d3-m68k.cache-2
+./var/cache/fontconfig/6ac606a6cc613b1dd45fa75d9315a55e-m68k.cache-2
+./var/cache/fontconfig/7c10409a5d7a696d98ceb77b9b1e9209-m68k.cache-2
+./var/cache/fontconfig/8b934b58f0acb2e86a0bbbb5d24d97c0-m68k.cache-2
+./var/cache/fontconfig/90acf7d99f5044d4df0432f2d0f16b42-m68k.cache-2
+./var/cache/fontconfig/be2547a64937fd44a1f33dfd1eea53e8-m68k.cache-2
+./var/cache/fontconfig/d929d2c542e4f6652ca46d613e4b360e-m68k.cache-2
+./var/cache/fontconfig/f8033d5e4c6effb98c84b18a50eef42d-m68k.cache-2
diff --git a/distrib/sets/lists/xbase/md.mvme88k b/distrib/sets/lists/xbase/md.mvme88k
index c12ace14d..404ab0f4b 100644
--- a/distrib/sets/lists/xbase/md.mvme88k
+++ b/distrib/sets/lists/xbase/md.mvme88k
@@ -402,6 +402,8 @@
 ./usr/X11R6/lib/X11/xkb/types/numpad
 ./usr/X11R6/lib/X11/xkb/types/pc
 ./usr/X11R6/lib/X11/xkb/xkbcomp
+./usr/X11R6/lib/libGL.so.6.0
+./usr/X11R6/lib/libX11.so.11.1
 ./usr/X11R6/lib/libXaw.so.11.0
 ./usr/X11R6/lib/libXaw7.so.11.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index dcd115a20..63fe846e0 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -424,9 +424,10 @@
 ./usr/X11R6/include/ft2build.h
 ./usr/X11R6/include/xorg
 ./usr/X11R6/lib/libFS.so.8.0
+./usr/X11R6/lib/libGL.so.6.0
 ./usr/X11R6/lib/libICE.so.8.1
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.0
+./usr/X11R6/lib/libX11.so.11.1
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
diff --git a/distrib/sets/lists/xbase/md.sparc b/distrib/sets/lists/xbase/md.sparc
index f3fe24e88..5f40d2eb4 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -438,7 +438,7 @@
 ./usr/X11R6/lib/X11/Options
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.5.1
+./usr/X11R6/lib/libGL.so.6.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -448,7 +448,7 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.8.1
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.0
+./usr/X11R6/lib/libX11.so.11.1
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index 2b29f88ed..2cfdc20fb 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -426,27 +426,10 @@
 ./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
-./usr/X11R6/include/X11/bitmaps/keyboard.xbm
-./usr/X11R6/include/X11/bitmaps/left.xbm
-./usr/X11R6/include/X11/bitmaps/monitor.xbm
-./usr/X11R6/include/X11/bitmaps/mouse.xbm
-./usr/X11R6/include/X11/bitmaps/narrower.xbm
-./usr/X11R6/include/X11/bitmaps/right.xbm
-./usr/X11R6/include/X11/bitmaps/shorter.xbm
-./usr/X11R6/include/X11/bitmaps/taller.xbm
-./usr/X11R6/include/X11/bitmaps/up.xbm
-./usr/X11R6/include/X11/bitmaps/wider.xbm
 ./usr/X11R6/include/X11/extensions/xf86dga.h
 ./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/pixmaps/card.xpm
-./usr/X11R6/include/X11/pixmaps/computer.xpm
-./usr/X11R6/include/X11/pixmaps/keyboard.xpm
-./usr/X11R6/include/X11/pixmaps/monitor.xpm
-./usr/X11R6/include/X11/pixmaps/mouse.xpm
 ./usr/X11R6/include/drm
 ./usr/X11R6/include/drm/drm.h
 ./usr/X11R6/include/drm/drm_sarea.h
@@ -471,7 +454,7 @@
 ./usr/X11R6/lib/X11/Options
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.5.1
+./usr/X11R6/lib/libGL.so.6.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -481,7 +464,7 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.8.1
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.0
+./usr/X11R6/lib/libX11.so.11.1
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
diff --git a/distrib/sets/lists/xbase/md.vax b/distrib/sets/lists/xbase/md.vax
index 8d1032b02..9b42318a6 100644
--- a/distrib/sets/lists/xbase/md.vax
+++ b/distrib/sets/lists/xbase/md.vax
@@ -422,6 +422,8 @@
 ./usr/X11R6/include/freetype2/freetype/ftwinfnt.h
 ./usr/X11R6/include/ft2build.h
 ./usr/X11R6/include/xorg
+./usr/X11R6/lib/libGL.so.6.0
+./usr/X11R6/lib/libX11.so.11.1
 ./usr/X11R6/lib/libXxf86dga.a
 ./usr/X11R6/lib/libXxf86dga.la
 ./usr/X11R6/lib/libpixman-1.a
diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus
index 18580a687..e424dcd67 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -426,27 +426,10 @@
 ./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
-./usr/X11R6/include/X11/bitmaps/keyboard.xbm
-./usr/X11R6/include/X11/bitmaps/left.xbm
-./usr/X11R6/include/X11/bitmaps/monitor.xbm
-./usr/X11R6/include/X11/bitmaps/mouse.xbm
-./usr/X11R6/include/X11/bitmaps/narrower.xbm
-./usr/X11R6/include/X11/bitmaps/right.xbm
-./usr/X11R6/include/X11/bitmaps/shorter.xbm
-./usr/X11R6/include/X11/bitmaps/taller.xbm
-./usr/X11R6/include/X11/bitmaps/up.xbm
-./usr/X11R6/include/X11/bitmaps/wider.xbm
 ./usr/X11R6/include/X11/extensions/xf86dga.h
 ./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/pixmaps/card.xpm
-./usr/X11R6/include/X11/pixmaps/computer.xpm
-./usr/X11R6/include/X11/pixmaps/keyboard.xpm
-./usr/X11R6/include/X11/pixmaps/monitor.xpm
-./usr/X11R6/include/X11/pixmaps/mouse.xpm
 ./usr/X11R6/include/freetype2/freetype/ftgzip.h
 ./usr/X11R6/include/freetype2/freetype/ftincrem.h
 ./usr/X11R6/include/freetype2/freetype/ftpfr.h
@@ -456,7 +439,7 @@
 ./usr/X11R6/lib/X11/Options
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.5.1
+./usr/X11R6/lib/libGL.so.6.0
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -466,7 +449,7 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.8.1
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.0
+./usr/X11R6/lib/libX11.so.11.1
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
diff --git a/distrib/sets/lists/xbase/mi b/distrib/sets/lists/xbase/mi
index 265c0fdbf..f97d3fe90 100644
--- a/distrib/sets/lists/xbase/mi
+++ b/distrib/sets/lists/xbase/mi
@@ -57,6 +57,7 @@
 ./usr/X11R6/bin/x11perf
 ./usr/X11R6/bin/xauth
 ./usr/X11R6/bin/xauth_switch_to_sun-des-1
+./usr/X11R6/bin/xbacklight
 ./usr/X11R6/bin/xbiff
 ./usr/X11R6/bin/xcalc
 ./usr/X11R6/bin/xclipboard