sync

17 files changed, 18 insertions, 67 deletions

diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index b7eb22368..4a86401f2 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -50,7 +50,7 @@
 ./usr/X11R6/lib/libXfont.so.9.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
 ./usr/X11R6/lib/libXft.so.8.0
-./usr/X11R6/lib/libXi.so.11.0
+./usr/X11R6/lib/libXi.so.11.1
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 2ca265647..d205c6790 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -94,7 +94,7 @@
 ./usr/X11R6/lib/libXfont.so.9.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
 ./usr/X11R6/lib/libXft.so.8.0
-./usr/X11R6/lib/libXi.so.11.0
+./usr/X11R6/lib/libXi.so.11.1
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish
index cd6cc1ddd..d634caf99 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -86,7 +86,7 @@
 ./usr/X11R6/lib/libXfont.so.9.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
 ./usr/X11R6/lib/libXft.so.8.0
-./usr/X11R6/lib/libXi.so.11.0
+./usr/X11R6/lib/libXi.so.11.1
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
diff --git a/distrib/sets/lists/xbase/md.hp300 b/distrib/sets/lists/xbase/md.hp300
index 73d49e2e3..173251ac2 100644
--- a/distrib/sets/lists/xbase/md.hp300
+++ b/distrib/sets/lists/xbase/md.hp300
@@ -69,7 +69,7 @@
 ./usr/X11R6/lib/libXfont.so.9.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
 ./usr/X11R6/lib/libXft.so.8.0
-./usr/X11R6/lib/libXi.so.11.0
+./usr/X11R6/lib/libXi.so.11.1
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index 5eb10de87..c8e0ea0f9 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -49,7 +49,7 @@
 ./usr/X11R6/lib/libXfont.so.9.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
 ./usr/X11R6/lib/libXft.so.8.0
-./usr/X11R6/lib/libXi.so.11.0
+./usr/X11R6/lib/libXi.so.11.1
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index deb07dce6..37a9a50fe 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -94,7 +94,7 @@
 ./usr/X11R6/lib/libXfont.so.9.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
 ./usr/X11R6/lib/libXft.so.8.0
-./usr/X11R6/lib/libXi.so.11.0
+./usr/X11R6/lib/libXi.so.11.1
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index a0031236c..483f78291 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -49,7 +49,7 @@
 ./usr/X11R6/lib/libXfont.so.9.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
 ./usr/X11R6/lib/libXft.so.8.0
-./usr/X11R6/lib/libXi.so.11.0
+./usr/X11R6/lib/libXi.so.11.1
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
diff --git a/distrib/sets/lists/xbase/md.loongson b/distrib/sets/lists/xbase/md.loongson
index 7a3cd953c..e60d3f683 100644
--- a/distrib/sets/lists/xbase/md.loongson
+++ b/distrib/sets/lists/xbase/md.loongson
@@ -84,7 +84,7 @@
 ./usr/X11R6/lib/libXfont.so.9.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
 ./usr/X11R6/lib/libXft.so.8.0
-./usr/X11R6/lib/libXi.so.11.0
+./usr/X11R6/lib/libXi.so.11.1
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
diff --git a/distrib/sets/lists/xbase/md.mac68k b/distrib/sets/lists/xbase/md.mac68k
index b6c7dfc90..1d3d4edef 100644
--- a/distrib/sets/lists/xbase/md.mac68k
+++ b/distrib/sets/lists/xbase/md.mac68k
@@ -78,7 +78,7 @@
 ./usr/X11R6/lib/libXfont.so.9.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
 ./usr/X11R6/lib/libXft.so.8.0
-./usr/X11R6/lib/libXi.so.11.0
+./usr/X11R6/lib/libXi.so.11.1
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index f9833cbe4..af59516bf 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -87,7 +87,7 @@
 ./usr/X11R6/lib/libXfont.so.9.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
 ./usr/X11R6/lib/libXft.so.8.0
-./usr/X11R6/lib/libXi.so.11.0
+./usr/X11R6/lib/libXi.so.11.1
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
diff --git a/distrib/sets/lists/xbase/md.mvme68k b/distrib/sets/lists/xbase/md.mvme68k
index f78227bf2..6aab48128 100644
--- a/distrib/sets/lists/xbase/md.mvme68k
+++ b/distrib/sets/lists/xbase/md.mvme68k
@@ -50,7 +50,7 @@
 ./usr/X11R6/lib/libXfont.so.9.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
 ./usr/X11R6/lib/libXft.so.8.0
-./usr/X11R6/lib/libXi.so.11.0
+./usr/X11R6/lib/libXi.so.11.1
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index cc2bcb574..e59479142 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -84,7 +84,7 @@
 ./usr/X11R6/lib/libXfont.so.9.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
 ./usr/X11R6/lib/libXft.so.8.0
-./usr/X11R6/lib/libXi.so.11.0
+./usr/X11R6/lib/libXi.so.11.1
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
diff --git a/distrib/sets/lists/xbase/md.socppc b/distrib/sets/lists/xbase/md.socppc
index 78ab89db8..18e502360 100644
--- a/distrib/sets/lists/xbase/md.socppc
+++ b/distrib/sets/lists/xbase/md.socppc
@@ -86,7 +86,7 @@
 ./usr/X11R6/lib/libXfont.so.9.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
 ./usr/X11R6/lib/libXft.so.8.0
-./usr/X11R6/lib/libXi.so.11.0
+./usr/X11R6/lib/libXi.so.11.1
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
diff --git a/distrib/sets/lists/xbase/md.sparc b/distrib/sets/lists/xbase/md.sparc
index 78ab89db8..18e502360 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -86,7 +86,7 @@
 ./usr/X11R6/lib/libXfont.so.9.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
 ./usr/X11R6/lib/libXft.so.8.0
-./usr/X11R6/lib/libXi.so.11.0
+./usr/X11R6/lib/libXi.so.11.1
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index 5c1cc8917..55daa4f36 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -87,7 +87,7 @@
 ./usr/X11R6/lib/libXfont.so.9.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
 ./usr/X11R6/lib/libXft.so.8.0
-./usr/X11R6/lib/libXi.so.11.0
+./usr/X11R6/lib/libXi.so.11.1
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus
index cd6cc1ddd..d634caf99 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -86,7 +86,7 @@
 ./usr/X11R6/lib/libXfont.so.9.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
 ./usr/X11R6/lib/libXft.so.8.0
-./usr/X11R6/lib/libXi.so.11.0
+./usr/X11R6/lib/libXi.so.11.1
 ./usr/X11R6/lib/libXinerama.so.5.0
 ./usr/X11R6/lib/libXmu.so.10.0
 ./usr/X11R6/lib/libXmuu.so.5.0
diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi
index 4c7379da6..1dffd976a 100644
--- a/distrib/sets/lists/xshare/mi
+++ b/distrib/sets/lists/xshare/mi
@@ -727,6 +727,8 @@
 ./usr/X11R6/include/xcb/xtest.h
 ./usr/X11R6/include/xcb/xv.h
 ./usr/X11R6/include/xcb/xvmc.h
+./usr/X11R6/include/xorg/optionstr.h
+./usr/X11R6/include/xorg/xf86Optionstr.h
 ./usr/X11R6/lib/X11/config
 ./usr/X11R6/lib/X11/config/Amoeba.cf
 ./usr/X11R6/lib/X11/config/DGUX.cf
@@ -3417,17 +3419,14 @@
 ./usr/X11R6/share/X11/xkb/compat/basic
 ./usr/X11R6/share/X11/xkb/compat/caps
 ./usr/X11R6/share/X11/xkb/compat/complete
-./usr/X11R6/share/X11/xkb/compat/default
 ./usr/X11R6/share/X11/xkb/compat/iso9995
 ./usr/X11R6/share/X11/xkb/compat/japan
-./usr/X11R6/share/X11/xkb/compat/keypad
 ./usr/X11R6/share/X11/xkb/compat/ledcaps
 ./usr/X11R6/share/X11/xkb/compat/lednum
 ./usr/X11R6/share/X11/xkb/compat/ledscroll
 ./usr/X11R6/share/X11/xkb/compat/level5
 ./usr/X11R6/share/X11/xkb/compat/misc
 ./usr/X11R6/share/X11/xkb/compat/mousekeys
-./usr/X11R6/share/X11/xkb/compat/norepeat
 ./usr/X11R6/share/X11/xkb/compat/olpc
 ./usr/X11R6/share/X11/xkb/compat/pc
 ./usr/X11R6/share/X11/xkb/compat/pc98
@@ -3490,52 +3489,9 @@
 ./usr/X11R6/share/X11/xkb/keycodes/xfree86
 ./usr/X11R6/share/X11/xkb/keycodes/xfree98
 ./usr/X11R6/share/X11/xkb/keymap
-./usr/X11R6/share/X11/xkb/keymap.dir
-./usr/X11R6/share/X11/xkb/keymap/README
-./usr/X11R6/share/X11/xkb/keymap/amiga
-./usr/X11R6/share/X11/xkb/keymap/ataritt
 ./usr/X11R6/share/X11/xkb/keymap/digital_vndr
-./usr/X11R6/share/X11/xkb/keymap/digital_vndr/us
-./usr/X11R6/share/X11/xkb/keymap/macintosh
 ./usr/X11R6/share/X11/xkb/keymap/sgi_vndr
-./usr/X11R6/share/X11/xkb/keymap/sgi_vndr/be
-./usr/X11R6/share/X11/xkb/keymap/sgi_vndr/bg
-./usr/X11R6/share/X11/xkb/keymap/sgi_vndr/ca
-./usr/X11R6/share/X11/xkb/keymap/sgi_vndr/ch
-./usr/X11R6/share/X11/xkb/keymap/sgi_vndr/cz
-./usr/X11R6/share/X11/xkb/keymap/sgi_vndr/de
-./usr/X11R6/share/X11/xkb/keymap/sgi_vndr/dk
-./usr/X11R6/share/X11/xkb/keymap/sgi_vndr/dvorak
-./usr/X11R6/share/X11/xkb/keymap/sgi_vndr/es
-./usr/X11R6/share/X11/xkb/keymap/sgi_vndr/fi
-./usr/X11R6/share/X11/xkb/keymap/sgi_vndr/fr
-./usr/X11R6/share/X11/xkb/keymap/sgi_vndr/gb
-./usr/X11R6/share/X11/xkb/keymap/sgi_vndr/hu
-./usr/X11R6/share/X11/xkb/keymap/sgi_vndr/it
-./usr/X11R6/share/X11/xkb/keymap/sgi_vndr/jp
-./usr/X11R6/share/X11/xkb/keymap/sgi_vndr/no
-./usr/X11R6/share/X11/xkb/keymap/sgi_vndr/pl
-./usr/X11R6/share/X11/xkb/keymap/sgi_vndr/pt
-./usr/X11R6/share/X11/xkb/keymap/sgi_vndr/ru
-./usr/X11R6/share/X11/xkb/keymap/sgi_vndr/se
-./usr/X11R6/share/X11/xkb/keymap/sgi_vndr/sk
-./usr/X11R6/share/X11/xkb/keymap/sgi_vndr/th
-./usr/X11R6/share/X11/xkb/keymap/sgi_vndr/us
-./usr/X11R6/share/X11/xkb/keymap/sony
 ./usr/X11R6/share/X11/xkb/keymap/sun_vndr
-./usr/X11R6/share/X11/xkb/keymap/sun_vndr/all
-./usr/X11R6/share/X11/xkb/keymap/sun_vndr/de
-./usr/X11R6/share/X11/xkb/keymap/sun_vndr/es
-./usr/X11R6/share/X11/xkb/keymap/sun_vndr/fi
-./usr/X11R6/share/X11/xkb/keymap/sun_vndr/fr
-./usr/X11R6/share/X11/xkb/keymap/sun_vndr/no
-./usr/X11R6/share/X11/xkb/keymap/sun_vndr/pl
-./usr/X11R6/share/X11/xkb/keymap/sun_vndr/ru
-./usr/X11R6/share/X11/xkb/keymap/sun_vndr/se
-./usr/X11R6/share/X11/xkb/keymap/sun_vndr/uk
-./usr/X11R6/share/X11/xkb/keymap/sun_vndr/us
-./usr/X11R6/share/X11/xkb/keymap/xfree86
-./usr/X11R6/share/X11/xkb/keymap/xfree98
 ./usr/X11R6/share/X11/xkb/rules
 ./usr/X11R6/share/X11/xkb/rules/README
 ./usr/X11R6/share/X11/xkb/rules/base
@@ -3544,11 +3500,6 @@
 ./usr/X11R6/share/X11/xkb/rules/base.xml
 ./usr/X11R6/share/X11/xkb/rules/xkb.dtd
 ./usr/X11R6/share/X11/xkb/semantics
-./usr/X11R6/share/X11/xkb/semantics.dir
-./usr/X11R6/share/X11/xkb/semantics/basic
-./usr/X11R6/share/X11/xkb/semantics/complete
-./usr/X11R6/share/X11/xkb/semantics/default
-./usr/X11R6/share/X11/xkb/semantics/xtest
 ./usr/X11R6/share/X11/xkb/symbols
 ./usr/X11R6/share/X11/xkb/symbols.dir
 ./usr/X11R6/share/X11/xkb/symbols/ad