sync

12 files changed, 40 insertions, 33 deletions

diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index 6c5970547..23e6b78e8 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -463,7 +463,7 @@
 ./usr/X11R6/lib/X11/Options
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.6.0
+./usr/X11R6/lib/libGL.so.7.1
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -477,10 +477,9 @@
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
-./usr/X11R6/lib/libXaw.so.11.0
-./usr/X11R6/lib/libXaw.so.12.0
-./usr/X11R6/lib/libXaw7.so.11.0
-./usr/X11R6/lib/libXaw8.so.12.0
+./usr/X11R6/lib/libXaw.so.13.0
+./usr/X11R6/lib/libXaw7.so.12.0
+./usr/X11R6/lib/libXaw8.so.13.0
 ./usr/X11R6/lib/libXcomposite.so.3.0
 ./usr/X11R6/lib/libXcursor.so.4.0
 ./usr/X11R6/lib/libXdamage.so.3.1
@@ -527,6 +526,7 @@
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/modules
+./usr/X11R6/lib/modules/dri
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 6c5970547..23e6b78e8 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -463,7 +463,7 @@
 ./usr/X11R6/lib/X11/Options
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.6.0
+./usr/X11R6/lib/libGL.so.7.1
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -477,10 +477,9 @@
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
-./usr/X11R6/lib/libXaw.so.11.0
-./usr/X11R6/lib/libXaw.so.12.0
-./usr/X11R6/lib/libXaw7.so.11.0
-./usr/X11R6/lib/libXaw8.so.12.0
+./usr/X11R6/lib/libXaw.so.13.0
+./usr/X11R6/lib/libXaw7.so.12.0
+./usr/X11R6/lib/libXaw8.so.13.0
 ./usr/X11R6/lib/libXcomposite.so.3.0
 ./usr/X11R6/lib/libXcursor.so.4.0
 ./usr/X11R6/lib/libXdamage.so.3.1
@@ -527,6 +526,7 @@
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/modules
+./usr/X11R6/lib/modules/dri
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
diff --git a/distrib/sets/lists/xbase/md.hp300 b/distrib/sets/lists/xbase/md.hp300
index fc49fc195..b461e4f1a 100644
--- a/distrib/sets/lists/xbase/md.hp300
+++ b/distrib/sets/lists/xbase/md.hp300
@@ -408,7 +408,6 @@
 ./usr/X11R6/bin/glxinfo
 ./usr/X11R6/bin/xdriinfo
 ./usr/X11R6/bin/xfs
-./usr/X11R6/include/drm
 ./usr/X11R6/include/GL
 ./usr/X11R6/include/GL/GLwDrawA.h
 ./usr/X11R6/include/GL/GLwDrawAP.h
@@ -430,6 +429,7 @@
 ./usr/X11R6/include/X11/extensions/xf86dga1.h
 ./usr/X11R6/include/X11/extensions/xf86dga1str.h
 ./usr/X11R6/include/X11/extensions/xf86dgastr.h
+./usr/X11R6/include/drm
 ./usr/X11R6/include/freetype2/freetype/ftgzip.h
 ./usr/X11R6/include/freetype2/freetype/ftincrem.h
 ./usr/X11R6/include/freetype2/freetype/ftpfr.h
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index 26cb0de77..0663a9f94 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -429,6 +429,7 @@
 ./usr/X11R6/include/X11/extensions/xf86dga1.h
 ./usr/X11R6/include/X11/extensions/xf86dga1str.h
 ./usr/X11R6/include/X11/extensions/xf86dgastr.h
+./usr/X11R6/include/drm
 ./usr/X11R6/include/freetype2/freetype/ftgzip.h
 ./usr/X11R6/include/freetype2/freetype/ftincrem.h
 ./usr/X11R6/include/freetype2/freetype/ftpfr.h
@@ -437,7 +438,7 @@
 ./usr/X11R6/include/xorg
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.6.0
+./usr/X11R6/lib/libGL.so.7.1
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -451,10 +452,9 @@
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
-./usr/X11R6/lib/libXaw.so.11.0
-./usr/X11R6/lib/libXaw.so.12.0
-./usr/X11R6/lib/libXaw7.so.11.0
-./usr/X11R6/lib/libXaw8.so.12.0
+./usr/X11R6/lib/libXaw.so.13.0
+./usr/X11R6/lib/libXaw7.so.12.0
+./usr/X11R6/lib/libXaw8.so.13.0
 ./usr/X11R6/lib/libXcomposite.so.3.0
 ./usr/X11R6/lib/libXcursor.so.4.0
 ./usr/X11R6/lib/libXdamage.so.3.1
@@ -498,6 +498,7 @@
 ./usr/X11R6/lib/libpixman-1.so.10.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
+./usr/X11R6/lib/modules/dri
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/cat3/GLwCreateMDrawingArea.0
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index 16a54a06c..9d8d7f4a0 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -463,7 +463,7 @@
 ./usr/X11R6/lib/X11/Options
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.6.0
+./usr/X11R6/lib/libGL.so.7.1
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -477,10 +477,9 @@
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
-./usr/X11R6/lib/libXaw.so.11.0
-./usr/X11R6/lib/libXaw.so.12.0
-./usr/X11R6/lib/libXaw7.so.11.0
-./usr/X11R6/lib/libXaw8.so.12.0
+./usr/X11R6/lib/libXaw.so.13.0
+./usr/X11R6/lib/libXaw7.so.12.0
+./usr/X11R6/lib/libXaw8.so.13.0
 ./usr/X11R6/lib/libXcomposite.so.3.0
 ./usr/X11R6/lib/libXcursor.so.4.0
 ./usr/X11R6/lib/libXdamage.so.3.1
@@ -527,6 +526,7 @@
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/modules
+./usr/X11R6/lib/modules/dri
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index 8cfcb3331..9b9a1cb54 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -463,7 +463,7 @@
 ./usr/X11R6/lib/X11/Options
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.6.0
+./usr/X11R6/lib/libGL.so.7.1
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -477,10 +477,9 @@
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
-./usr/X11R6/lib/libXaw.so.11.0
-./usr/X11R6/lib/libXaw.so.12.0
-./usr/X11R6/lib/libXaw7.so.11.0
-./usr/X11R6/lib/libXaw8.so.12.0
+./usr/X11R6/lib/libXaw.so.13.0
+./usr/X11R6/lib/libXaw7.so.12.0
+./usr/X11R6/lib/libXaw8.so.13.0
 ./usr/X11R6/lib/libXcomposite.so.3.0
 ./usr/X11R6/lib/libXcursor.so.4.0
 ./usr/X11R6/lib/libXdamage.so.3.1
@@ -527,6 +526,7 @@
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/modules
+./usr/X11R6/lib/modules/dri
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index 9484fcc7b..bf19e98d0 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -463,7 +463,7 @@
 ./usr/X11R6/lib/X11/Options
 ./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
-./usr/X11R6/lib/libGL.so.6.0
+./usr/X11R6/lib/libGL.so.7.1
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLU.so.7.0
 ./usr/X11R6/lib/libGLU_pic.a
@@ -477,10 +477,9 @@
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
-./usr/X11R6/lib/libXaw.so.11.0
-./usr/X11R6/lib/libXaw.so.12.0
-./usr/X11R6/lib/libXaw7.so.11.0
-./usr/X11R6/lib/libXaw8.so.12.0
+./usr/X11R6/lib/libXaw.so.13.0
+./usr/X11R6/lib/libXaw7.so.12.0
+./usr/X11R6/lib/libXaw8.so.13.0
 ./usr/X11R6/lib/libXcomposite.so.3.0
 ./usr/X11R6/lib/libXcursor.so.4.0
 ./usr/X11R6/lib/libXdamage.so.3.1
@@ -526,6 +525,7 @@
 ./usr/X11R6/lib/libpixman-1.so.10.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/lib/libxkbui.so.4.0
+./usr/X11R6/lib/modules/dri
 ./usr/X11R6/lib/pkgconfig/libdrm.pc
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
diff --git a/distrib/sets/lists/xbase/mi b/distrib/sets/lists/xbase/mi
index f97d3fe90..db420a6d3 100644
--- a/distrib/sets/lists/xbase/mi
+++ b/distrib/sets/lists/xbase/mi
@@ -32,6 +32,7 @@
 ./usr/X11R6/bin/iceauth
 ./usr/X11R6/bin/ico
 ./usr/X11R6/bin/imake
+./usr/X11R6/bin/koi8rxterm
 ./usr/X11R6/bin/lbxproxy
 ./usr/X11R6/bin/listres
 ./usr/X11R6/bin/luit
diff --git a/distrib/sets/lists/xetc/mi b/distrib/sets/lists/xetc/mi
index 7f74ed834..527e2b60c 100644
--- a/distrib/sets/lists/xetc/mi
+++ b/distrib/sets/lists/xetc/mi
@@ -6,6 +6,7 @@
 ./etc/X11/app-defaults/Clock-color
 ./etc/X11/app-defaults/Editres
 ./etc/X11/app-defaults/Editres-color
+./etc/X11/app-defaults/KOI8RXTerm
 ./etc/X11/app-defaults/SshAskpass
 ./etc/X11/app-defaults/UXTerm
 ./etc/X11/app-defaults/Viewres
diff --git a/distrib/sets/lists/xserv/md.amd64 b/distrib/sets/lists/xserv/md.amd64
index 018a7841b..44a0e152b 100644
--- a/distrib/sets/lists/xserv/md.amd64
+++ b/distrib/sets/lists/xserv/md.amd64
@@ -193,7 +193,6 @@
 ./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/i810_drv.so
 ./usr/X11R6/lib/modules/drivers/intel_drv.la
 ./usr/X11R6/lib/modules/drivers/intel_drv.so
 ./usr/X11R6/lib/modules/drivers/ivch.la
@@ -384,7 +383,6 @@
 ./usr/X11R6/man/man4/fpit.4
 ./usr/X11R6/man/man4/glint.4
 ./usr/X11R6/man/man4/i128.4
-./usr/X11R6/man/man4/i810.4
 ./usr/X11R6/man/man4/intel.4
 ./usr/X11R6/man/man4/js_x.4
 ./usr/X11R6/man/man4/kbd.4
diff --git a/distrib/sets/lists/xserv/md.hppa b/distrib/sets/lists/xserv/md.hppa
index 3ec3640df..d8a95cc69 100644
--- a/distrib/sets/lists/xserv/md.hppa
+++ b/distrib/sets/lists/xserv/md.hppa
@@ -98,3 +98,4 @@
 ./usr/X11R6/share/X11/xserver/en_US/print/attributes
 ./var/db
 ./var/db/xkb/README.compiled
+./var/log
diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi
index 55fcea695..0e2bfb510 100644
--- a/distrib/sets/lists/xshare/mi
+++ b/distrib/sets/lists/xshare/mi
@@ -828,7 +828,10 @@
 ./usr/X11R6/lib/pkgconfig/fontsproto.pc
 ./usr/X11R6/lib/pkgconfig/fontutil.pc
 ./usr/X11R6/lib/pkgconfig/freetype2.pc
+./usr/X11R6/lib/pkgconfig/gl.pc
 ./usr/X11R6/lib/pkgconfig/glproto.pc
+./usr/X11R6/lib/pkgconfig/glu.pc
+./usr/X11R6/lib/pkgconfig/glw.pc
 ./usr/X11R6/lib/pkgconfig/ice.pc
 ./usr/X11R6/lib/pkgconfig/inputproto.pc
 ./usr/X11R6/lib/pkgconfig/kbproto.pc
@@ -913,8 +916,10 @@
 ./usr/X11R6/man/cat1/FvwmWinList.0
 ./usr/X11R6/man/cat1/cwm.0
 ./usr/X11R6/man/cat1/fvwm.0
+./usr/X11R6/man/cat1/koi8rxterm.0
 ./usr/X11R6/man/cat1/resize.0
 ./usr/X11R6/man/cat1/ssh-askpass.0
+./usr/X11R6/man/cat1/uxterm.0
 ./usr/X11R6/man/cat1/xidle.0
 ./usr/X11R6/man/cat1/xpmroot.0
 ./usr/X11R6/man/cat1/xsystrace.0