sync

17 files changed, 64 insertions, 46 deletions

diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index ce361b729..ba4249919 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -50,7 +50,7 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.1
+./usr/X11R6/lib/libX11.so.11.2
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
@@ -67,7 +67,7 @@
 ./usr/X11R6/lib/libXfont.so.8.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
 ./usr/X11R6/lib/libXft.so.7.0
-./usr/X11R6/lib/libXi.so.10.0
+./usr/X11R6/lib/libXi.so.10.1
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
@@ -75,7 +75,7 @@
 ./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.6.0
+./usr/X11R6/lib/libXrandr.so.6.1
 ./usr/X11R6/lib/libXrender.so.5.0
 ./usr/X11R6/lib/libXss.so.5.0
 ./usr/X11R6/lib/libXt.so.10.0
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 51b464beb..4ab7d8a3b 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -55,7 +55,7 @@
 ./usr/X11R6/lib/libIntelXvMC.la
 ./usr/X11R6/lib/libIntelXvMC.so.1.0
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.1
+./usr/X11R6/lib/libX11.so.11.2
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
@@ -72,7 +72,7 @@
 ./usr/X11R6/lib/libXfont.so.8.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
 ./usr/X11R6/lib/libXft.so.7.0
-./usr/X11R6/lib/libXi.so.10.0
+./usr/X11R6/lib/libXi.so.10.1
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
@@ -80,7 +80,7 @@
 ./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.6.0
+./usr/X11R6/lib/libXrandr.so.6.1
 ./usr/X11R6/lib/libXrender.so.5.0
 ./usr/X11R6/lib/libXss.so.5.0
 ./usr/X11R6/lib/libXt.so.10.0
@@ -95,7 +95,7 @@
 ./usr/X11R6/lib/libdrm.a
 ./usr/X11R6/lib/libdrm.so.2.4
 ./usr/X11R6/lib/libdrm_intel.a
-./usr/X11R6/lib/libdrm_intel.so.1.0
+./usr/X11R6/lib/libdrm_intel.so.1.1
 ./usr/X11R6/lib/libdrm_intel_pic.a
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.6.0
diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish
index 6092fff35..41611e780 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -50,7 +50,7 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.1
+./usr/X11R6/lib/libX11.so.11.2
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
@@ -67,7 +67,7 @@
 ./usr/X11R6/lib/libXfont.so.8.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
 ./usr/X11R6/lib/libXft.so.7.0
-./usr/X11R6/lib/libXi.so.10.0
+./usr/X11R6/lib/libXi.so.10.1
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
@@ -75,7 +75,7 @@
 ./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.6.0
+./usr/X11R6/lib/libXrandr.so.6.1
 ./usr/X11R6/lib/libXrender.so.5.0
 ./usr/X11R6/lib/libXss.so.5.0
 ./usr/X11R6/lib/libXt.so.10.0
diff --git a/distrib/sets/lists/xbase/md.hp300 b/distrib/sets/lists/xbase/md.hp300
index 77975b6c4..3c57b6e43 100644
--- a/distrib/sets/lists/xbase/md.hp300
+++ b/distrib/sets/lists/xbase/md.hp300
@@ -32,7 +32,7 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.1
+./usr/X11R6/lib/libX11.so.11.2
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
@@ -49,7 +49,7 @@
 ./usr/X11R6/lib/libXfont.so.8.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
 ./usr/X11R6/lib/libXft.so.7.0
-./usr/X11R6/lib/libXi.so.10.0
+./usr/X11R6/lib/libXi.so.10.1
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
@@ -57,7 +57,7 @@
 ./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.6.0
+./usr/X11R6/lib/libXrandr.so.6.1
 ./usr/X11R6/lib/libXrender.so.5.0
 ./usr/X11R6/lib/libXss.so.5.0
 ./usr/X11R6/lib/libXt.so.10.0
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index 5fe53dfea..e26d74e4b 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -31,7 +31,7 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.1
+./usr/X11R6/lib/libX11.so.11.2
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
@@ -48,7 +48,7 @@
 ./usr/X11R6/lib/libXfont.so.8.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
 ./usr/X11R6/lib/libXft.so.7.0
-./usr/X11R6/lib/libXi.so.10.0
+./usr/X11R6/lib/libXi.so.10.1
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
@@ -56,7 +56,7 @@
 ./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.6.0
+./usr/X11R6/lib/libXrandr.so.6.1
 ./usr/X11R6/lib/libXrender.so.5.0
 ./usr/X11R6/lib/libXss.so.5.0
 ./usr/X11R6/lib/libXt.so.10.0
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index e77e3549d..6812a6e71 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -55,7 +55,7 @@
 ./usr/X11R6/lib/libIntelXvMC.la
 ./usr/X11R6/lib/libIntelXvMC.so.1.0
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.1
+./usr/X11R6/lib/libX11.so.11.2
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
@@ -72,7 +72,7 @@
 ./usr/X11R6/lib/libXfont.so.8.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
 ./usr/X11R6/lib/libXft.so.7.0
-./usr/X11R6/lib/libXi.so.10.0
+./usr/X11R6/lib/libXi.so.10.1
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
@@ -80,7 +80,7 @@
 ./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.6.0
+./usr/X11R6/lib/libXrandr.so.6.1
 ./usr/X11R6/lib/libXrender.so.5.0
 ./usr/X11R6/lib/libXss.so.5.0
 ./usr/X11R6/lib/libXt.so.10.0
@@ -95,7 +95,7 @@
 ./usr/X11R6/lib/libdrm.a
 ./usr/X11R6/lib/libdrm.so.2.4
 ./usr/X11R6/lib/libdrm_intel.a
-./usr/X11R6/lib/libdrm_intel.so.1.0
+./usr/X11R6/lib/libdrm_intel.so.1.1
 ./usr/X11R6/lib/libdrm_intel_pic.a
 ./usr/X11R6/lib/libdrm_pic.a
 ./usr/X11R6/lib/libfontconfig.so.6.0
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index ed08a2007..77cbb161a 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -32,7 +32,7 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.1
+./usr/X11R6/lib/libX11.so.11.2
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
@@ -49,7 +49,7 @@
 ./usr/X11R6/lib/libXfont.so.8.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
 ./usr/X11R6/lib/libXft.so.7.0
-./usr/X11R6/lib/libXi.so.10.0
+./usr/X11R6/lib/libXi.so.10.1
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
@@ -57,7 +57,7 @@
 ./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.6.0
+./usr/X11R6/lib/libXrandr.so.6.1
 ./usr/X11R6/lib/libXrender.so.5.0
 ./usr/X11R6/lib/libXss.so.5.0
 ./usr/X11R6/lib/libXt.so.10.0
diff --git a/distrib/sets/lists/xbase/md.mac68k b/distrib/sets/lists/xbase/md.mac68k
index 043e59fdd..537aef8c5 100644
--- a/distrib/sets/lists/xbase/md.mac68k
+++ b/distrib/sets/lists/xbase/md.mac68k
@@ -41,7 +41,7 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.1
+./usr/X11R6/lib/libX11.so.11.2
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
@@ -58,7 +58,7 @@
 ./usr/X11R6/lib/libXfont.so.8.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
 ./usr/X11R6/lib/libXft.so.7.0
-./usr/X11R6/lib/libXi.so.10.0
+./usr/X11R6/lib/libXi.so.10.1
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
@@ -66,7 +66,7 @@
 ./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.6.0
+./usr/X11R6/lib/libXrandr.so.6.1
 ./usr/X11R6/lib/libXrender.so.5.0
 ./usr/X11R6/lib/libXss.so.5.0
 ./usr/X11R6/lib/libXt.so.10.0
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index 856dd62ed..c7f394200 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -50,7 +50,7 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.1
+./usr/X11R6/lib/libX11.so.11.2
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
@@ -67,7 +67,7 @@
 ./usr/X11R6/lib/libXfont.so.8.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
 ./usr/X11R6/lib/libXft.so.7.0
-./usr/X11R6/lib/libXi.so.10.0
+./usr/X11R6/lib/libXi.so.10.1
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
@@ -75,7 +75,7 @@
 ./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.6.0
+./usr/X11R6/lib/libXrandr.so.6.1
 ./usr/X11R6/lib/libXrender.so.5.0
 ./usr/X11R6/lib/libXss.so.5.0
 ./usr/X11R6/lib/libXt.so.10.0
diff --git a/distrib/sets/lists/xbase/md.mvme68k b/distrib/sets/lists/xbase/md.mvme68k
index 5e8d192f3..57455a041 100644
--- a/distrib/sets/lists/xbase/md.mvme68k
+++ b/distrib/sets/lists/xbase/md.mvme68k
@@ -31,7 +31,7 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.1
+./usr/X11R6/lib/libX11.so.11.2
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
@@ -48,7 +48,7 @@
 ./usr/X11R6/lib/libXfont.so.8.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
 ./usr/X11R6/lib/libXft.so.7.0
-./usr/X11R6/lib/libXi.so.10.0
+./usr/X11R6/lib/libXi.so.10.1
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
@@ -56,7 +56,7 @@
 ./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.6.0
+./usr/X11R6/lib/libXrandr.so.6.1
 ./usr/X11R6/lib/libXrender.so.5.0
 ./usr/X11R6/lib/libXss.so.5.0
 ./usr/X11R6/lib/libXt.so.10.0
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index 88127c080..af19965a0 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -47,7 +47,7 @@
 ./usr/X11R6/lib/libGLw.so.5.1
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.1
+./usr/X11R6/lib/libX11.so.11.2
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
@@ -64,7 +64,7 @@
 ./usr/X11R6/lib/libXfont.so.8.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
 ./usr/X11R6/lib/libXft.so.7.0
-./usr/X11R6/lib/libXi.so.10.0
+./usr/X11R6/lib/libXi.so.10.1
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
@@ -72,7 +72,7 @@
 ./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.6.0
+./usr/X11R6/lib/libXrandr.so.6.1
 ./usr/X11R6/lib/libXrender.so.5.0
 ./usr/X11R6/lib/libXss.so.5.0
 ./usr/X11R6/lib/libXt.so.10.0
diff --git a/distrib/sets/lists/xbase/md.sparc b/distrib/sets/lists/xbase/md.sparc
index 947641f62..e69f75b69 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -49,7 +49,7 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.1
+./usr/X11R6/lib/libX11.so.11.2
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
@@ -66,7 +66,7 @@
 ./usr/X11R6/lib/libXfont.so.8.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
 ./usr/X11R6/lib/libXft.so.7.0
-./usr/X11R6/lib/libXi.so.10.0
+./usr/X11R6/lib/libXi.so.10.1
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
@@ -74,7 +74,7 @@
 ./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.6.0
+./usr/X11R6/lib/libXrandr.so.6.1
 ./usr/X11R6/lib/libXrender.so.5.0
 ./usr/X11R6/lib/libXss.so.5.0
 ./usr/X11R6/lib/libXt.so.10.0
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index 54beb3242..b9138e343 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -50,7 +50,7 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.1
+./usr/X11R6/lib/libX11.so.11.2
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
@@ -67,7 +67,7 @@
 ./usr/X11R6/lib/libXfont.so.8.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
 ./usr/X11R6/lib/libXft.so.7.0
-./usr/X11R6/lib/libXi.so.10.0
+./usr/X11R6/lib/libXi.so.10.1
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
@@ -75,7 +75,7 @@
 ./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.6.0
+./usr/X11R6/lib/libXrandr.so.6.1
 ./usr/X11R6/lib/libXrender.so.5.0
 ./usr/X11R6/lib/libXss.so.5.0
 ./usr/X11R6/lib/libXt.so.10.0
diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus
index 6092fff35..41611e780 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -50,7 +50,7 @@
 ./usr/X11R6/lib/libGLw_pic.a
 ./usr/X11R6/lib/libICE.so.9.0
 ./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.11.1
+./usr/X11R6/lib/libX11.so.11.2
 ./usr/X11R6/lib/libXRes.so.4.0
 ./usr/X11R6/lib/libXTrap.so.10.0
 ./usr/X11R6/lib/libXau.so.9.0
@@ -67,7 +67,7 @@
 ./usr/X11R6/lib/libXfont.so.8.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
 ./usr/X11R6/lib/libXft.so.7.0
-./usr/X11R6/lib/libXi.so.10.0
+./usr/X11R6/lib/libXi.so.10.1
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
@@ -75,7 +75,7 @@
 ./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.6.0
+./usr/X11R6/lib/libXrandr.so.6.1
 ./usr/X11R6/lib/libXrender.so.5.0
 ./usr/X11R6/lib/libXss.so.5.0
 ./usr/X11R6/lib/libXt.so.10.0
diff --git a/distrib/sets/lists/xbase/mi b/distrib/sets/lists/xbase/mi
index 6b74bdc78..7f70107d7 100644
--- a/distrib/sets/lists/xbase/mi
+++ b/distrib/sets/lists/xbase/mi
@@ -490,6 +490,7 @@
 ./usr/X11R6/bin/xkbprint
 ./usr/X11R6/bin/xkbvleds
 ./usr/X11R6/bin/xkbwatch
+./usr/X11R6/bin/xkeystone
 ./usr/X11R6/bin/xkill
 ./usr/X11R6/bin/xload
 ./usr/X11R6/bin/xlock
diff --git a/distrib/sets/lists/xetc/mi b/distrib/sets/lists/xetc/mi
index 7408dd3f8..011c5b4b0 100644
--- a/distrib/sets/lists/xetc/mi
+++ b/distrib/sets/lists/xetc/mi
@@ -62,6 +62,7 @@
 ./etc/fonts/conf.avail/25-unhint-nonlatin.conf
 ./etc/fonts/conf.avail/30-metric-aliases.conf
 ./etc/fonts/conf.avail/30-urw-aliases.conf
+./etc/fonts/conf.avail/31-nonmst.conf
 ./etc/fonts/conf.avail/40-nonlatin.conf
 ./etc/fonts/conf.avail/45-latin.conf
 ./etc/fonts/conf.avail/49-sansserif.conf
@@ -81,6 +82,7 @@
 ./etc/fonts/conf.d/20-unhint-small-vera.conf
 ./etc/fonts/conf.d/30-metric-aliases.conf
 ./etc/fonts/conf.d/30-urw-aliases.conf
+./etc/fonts/conf.d/31-nonmst.conf
 ./etc/fonts/conf.d/40-nonlatin.conf
 ./etc/fonts/conf.d/45-latin.conf
 ./etc/fonts/conf.d/49-sansserif.conf
diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi
index de01e6219..4a51ae2f4 100644
--- a/distrib/sets/lists/xshare/mi
+++ b/distrib/sets/lists/xshare/mi
@@ -357,6 +357,8 @@
 ./usr/X11R6/include/X11/extensions/dmxproto.h
 ./usr/X11R6/include/X11/extensions/dpms.h
 ./usr/X11R6/include/X11/extensions/dpmsstr.h
+./usr/X11R6/include/X11/extensions/dri2proto.h
+./usr/X11R6/include/X11/extensions/dri2tokens.h
 ./usr/X11R6/include/X11/extensions/extutil.h
 ./usr/X11R6/include/X11/extensions/fontcache.h
 ./usr/X11R6/include/X11/extensions/fontcacheP.h
@@ -664,6 +666,7 @@
 ./usr/X11R6/include/freetype2/freetype/tttags.h
 ./usr/X11R6/include/freetype2/freetype/ttunpat.h
 ./usr/X11R6/include/pciaccess.h
+./usr/X11R6/include/xorg/joystick-properties.h
 ./usr/X11R6/lib/X11/config
 ./usr/X11R6/lib/X11/config/Amoeba.cf
 ./usr/X11R6/lib/X11/config/DGUX.cf
@@ -820,6 +823,7 @@
 ./usr/X11R6/lib/pkgconfig/damageproto.pc
 ./usr/X11R6/lib/pkgconfig/dmx.pc
 ./usr/X11R6/lib/pkgconfig/dmxproto.pc
+./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/evieproto.pc
 ./usr/X11R6/lib/pkgconfig/fixesproto.pc
 ./usr/X11R6/lib/pkgconfig/fontcacheproto.pc
@@ -872,6 +876,7 @@
 ./usr/X11R6/lib/pkgconfig/xkbui.pc
 ./usr/X11R6/lib/pkgconfig/xmu.pc
 ./usr/X11R6/lib/pkgconfig/xmuu.pc
+./usr/X11R6/lib/pkgconfig/xorg-joystick.pc
 ./usr/X11R6/lib/pkgconfig/xp.pc
 ./usr/X11R6/lib/pkgconfig/xpm.pc
 ./usr/X11R6/lib/pkgconfig/xprintapputil.pc
@@ -1329,6 +1334,7 @@
 ./usr/X11R6/man/man3/XChangeDeviceControl.3
 ./usr/X11R6/man/man3/XChangeDeviceDontPropagateList.3
 ./usr/X11R6/man/man3/XChangeDeviceKeyMapping.3
+./usr/X11R6/man/man3/XChangeDeviceProperty.3
 ./usr/X11R6/man/man3/XChangeFeedbackControl.3
 ./usr/X11R6/man/man3/XChangeGC.3
 ./usr/X11R6/man/man3/XChangeKeyboardControl.3
@@ -1404,6 +1410,7 @@
 ./usr/X11R6/man/man3/XDefaultString.3
 ./usr/X11R6/man/man3/XDefineCursor.3
 ./usr/X11R6/man/man3/XDeleteContext.3
+./usr/X11R6/man/man3/XDeleteDeviceProperty.3
 ./usr/X11R6/man/man3/XDeleteModifiermapEntry.3
 ./usr/X11R6/man/man3/XDeleteProperty.3
 ./usr/X11R6/man/man3/XDestroyIC.3
@@ -1491,6 +1498,7 @@
 ./usr/X11R6/man/man3/XGetDeviceKeyMapping.3
 ./usr/X11R6/man/man3/XGetDeviceModifierMapping.3
 ./usr/X11R6/man/man3/XGetDeviceMotionEvents.3
+./usr/X11R6/man/man3/XGetDeviceProperty.3
 ./usr/X11R6/man/man3/XGetErrorDatabaseText.3
 ./usr/X11R6/man/man3/XGetErrorText.3
 ./usr/X11R6/man/man3/XGetExtensionVersion.3
@@ -1564,6 +1572,7 @@
 ./usr/X11R6/man/man3/XKeysymToString.3
 ./usr/X11R6/man/man3/XKillClient.3
 ./usr/X11R6/man/man3/XListDepths.3
+./usr/X11R6/man/man3/XListDeviceProperties.3
 ./usr/X11R6/man/man3/XListExtensions.3
 ./usr/X11R6/man/man3/XListFonts.3
 ./usr/X11R6/man/man3/XListFontsWithInfo.3
@@ -1633,7 +1642,6 @@
 ./usr/X11R6/man/man3/XQueryTextExtents.3
 ./usr/X11R6/man/man3/XQueryTextExtents16.3
 ./usr/X11R6/man/man3/XQueryTree.3
-./usr/X11R6/man/man3/XRRConfig.3
 ./usr/X11R6/man/man3/XRRConfigCurrentConfiguration.3
 ./usr/X11R6/man/man3/XRRConfigCurrentRate.3
 ./usr/X11R6/man/man3/XRRConfigRates.3
@@ -1645,7 +1653,6 @@
 ./usr/X11R6/man/man3/XRRQueryExtension.3
 ./usr/X11R6/man/man3/XRRQueryVersion.3
 ./usr/X11R6/man/man3/XRRRootToScreen.3
-./usr/X11R6/man/man3/XRRScreenConfig.3
 ./usr/X11R6/man/man3/XRRSelectInput.3
 ./usr/X11R6/man/man3/XRRSetScreenConfig.3
 ./usr/X11R6/man/man3/XRRSetScreenConfigAndRate.3
@@ -2606,6 +2613,10 @@
 ./usr/X11R6/share/X11/locale/en_US.UTF-8/Compose
 ./usr/X11R6/share/X11/locale/en_US.UTF-8/XI18N_OBJS
 ./usr/X11R6/share/X11/locale/en_US.UTF-8/XLC_LOCALE
+./usr/X11R6/share/X11/locale/fi_FI.UTF-8
+./usr/X11R6/share/X11/locale/fi_FI.UTF-8/Compose
+./usr/X11R6/share/X11/locale/fi_FI.UTF-8/XI18N_OBJS
+./usr/X11R6/share/X11/locale/fi_FI.UTF-8/XLC_LOCALE
 ./usr/X11R6/share/X11/locale/georgian-academy
 ./usr/X11R6/share/X11/locale/georgian-academy/Compose
 ./usr/X11R6/share/X11/locale/georgian-academy/XI18N_OBJS
@@ -2756,6 +2767,10 @@
 ./usr/X11R6/share/X11/locale/pt_BR.UTF-8/Compose
 ./usr/X11R6/share/X11/locale/pt_BR.UTF-8/XI18N_OBJS
 ./usr/X11R6/share/X11/locale/pt_BR.UTF-8/XLC_LOCALE
+./usr/X11R6/share/X11/locale/ru_RU.UTF-8
+./usr/X11R6/share/X11/locale/ru_RU.UTF-8/Compose
+./usr/X11R6/share/X11/locale/ru_RU.UTF-8/XI18N_OBJS
+./usr/X11R6/share/X11/locale/ru_RU.UTF-8/XLC_LOCALE
 ./usr/X11R6/share/X11/locale/tatar-cyr
 ./usr/X11R6/share/X11/locale/tatar-cyr/Compose
 ./usr/X11R6/share/X11/locale/tatar-cyr/XI18N_OBJS