sync

17 files changed, 32 insertions, 27 deletions

diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index a3cf5088b..089107a18 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -238,7 +238,7 @@
 ./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.2.1
 ./usr/X11R6/lib/libxcb_pic.a
-./usr/X11R6/lib/libxkbfile.so.4.0
+./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 58caa706a..15a7f8962 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -246,7 +246,7 @@
 ./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.2.1
 ./usr/X11R6/lib/libxcb_pic.a
-./usr/X11R6/lib/libxkbfile.so.4.0
+./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish
index d928de53e..5aa21361b 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -237,7 +237,7 @@
 ./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.2.1
 ./usr/X11R6/lib/libxcb_pic.a
-./usr/X11R6/lib/libxkbfile.so.4.0
+./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
diff --git a/distrib/sets/lists/xbase/md.hp300 b/distrib/sets/lists/xbase/md.hp300
index 8610aa541..bc2d65829 100644
--- a/distrib/sets/lists/xbase/md.hp300
+++ b/distrib/sets/lists/xbase/md.hp300
@@ -218,7 +218,7 @@
 ./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.2.1
 ./usr/X11R6/lib/libxcb_pic.a
-./usr/X11R6/lib/libxkbfile.so.4.0
+./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index 3d18695a3..bc966307f 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -210,7 +210,7 @@
 ./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.2.1
 ./usr/X11R6/lib/libxcb_pic.a
-./usr/X11R6/lib/libxkbfile.so.4.0
+./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index 4285a9220..b98a6fe1a 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -246,7 +246,7 @@
 ./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.2.1
 ./usr/X11R6/lib/libxcb_pic.a
-./usr/X11R6/lib/libxkbfile.so.4.0
+./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index 6f6adcd99..cd848ae49 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -214,7 +214,7 @@
 ./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.2.1
 ./usr/X11R6/lib/libxcb_pic.a
-./usr/X11R6/lib/libxkbfile.so.4.0
+./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
diff --git a/distrib/sets/lists/xbase/md.loongson b/distrib/sets/lists/xbase/md.loongson
index f055ad3f6..c2abd6160 100644
--- a/distrib/sets/lists/xbase/md.loongson
+++ b/distrib/sets/lists/xbase/md.loongson
@@ -201,7 +201,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.2.1
-./usr/X11R6/lib/libxkbfile.so.4.0
+./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
diff --git a/distrib/sets/lists/xbase/md.mac68k b/distrib/sets/lists/xbase/md.mac68k
index 977ff1300..da8ec3f65 100644
--- a/distrib/sets/lists/xbase/md.mac68k
+++ b/distrib/sets/lists/xbase/md.mac68k
@@ -226,7 +226,7 @@
 ./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.2.1
 ./usr/X11R6/lib/libxcb_pic.a
-./usr/X11R6/lib/libxkbfile.so.4.0
+./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index cc5f4f195..5759e0152 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -238,7 +238,7 @@
 ./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.2.1
 ./usr/X11R6/lib/libxcb_pic.a
-./usr/X11R6/lib/libxkbfile.so.4.0
+./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
diff --git a/distrib/sets/lists/xbase/md.mvme68k b/distrib/sets/lists/xbase/md.mvme68k
index 4fb0b831a..633d38306 100644
--- a/distrib/sets/lists/xbase/md.mvme68k
+++ b/distrib/sets/lists/xbase/md.mvme68k
@@ -210,7 +210,7 @@
 ./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.2.1
 ./usr/X11R6/lib/libxcb_pic.a
-./usr/X11R6/lib/libxkbfile.so.4.0
+./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/modules/dri/swrast_dri.so
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index a2721251c..127782113 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -201,7 +201,7 @@
 ./usr/X11R6/lib/libxcb-xvmc.so.0.0
 ./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.2.1
-./usr/X11R6/lib/libxkbfile.so.4.0
+./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
diff --git a/distrib/sets/lists/xbase/md.socppc b/distrib/sets/lists/xbase/md.socppc
index 95a200c47..50167501c 100644
--- a/distrib/sets/lists/xbase/md.socppc
+++ b/distrib/sets/lists/xbase/md.socppc
@@ -237,7 +237,7 @@
 ./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.2.1
 ./usr/X11R6/lib/libxcb_pic.a
-./usr/X11R6/lib/libxkbfile.so.4.0
+./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
diff --git a/distrib/sets/lists/xbase/md.sparc b/distrib/sets/lists/xbase/md.sparc
index bfa17e3ae..50167501c 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -237,7 +237,7 @@
 ./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.2.1
 ./usr/X11R6/lib/libxcb_pic.a
-./usr/X11R6/lib/libxkbfile.so.4.0
+./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
@@ -368,14 +368,14 @@
 ./usr/X11R6/share/xcb/xtest.xml
 ./usr/X11R6/share/xcb/xv.xml
 ./usr/X11R6/share/xcb/xvmc.xml
-./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be32.cache-3
-./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be32.cache-3
-./var/cache/fontconfig/2cee944125173ffd13126fb55c9a0dc1-be32.cache-3
-./var/cache/fontconfig/68418e0da60dfe4003a8c2435e92b1d3-be32.cache-3
-./var/cache/fontconfig/6ac606a6cc613b1dd45fa75d9315a55e-be32.cache-3
-./var/cache/fontconfig/7c10409a5d7a696d98ceb77b9b1e9209-be32.cache-3
-./var/cache/fontconfig/8b934b58f0acb2e86a0bbbb5d24d97c0-be32.cache-3
-./var/cache/fontconfig/90acf7d99f5044d4df0432f2d0f16b42-be32.cache-3
-./var/cache/fontconfig/be2547a64937fd44a1f33dfd1eea53e8-be32.cache-3
-./var/cache/fontconfig/d929d2c542e4f6652ca46d613e4b360e-be32.cache-3
-./var/cache/fontconfig/f8033d5e4c6effb98c84b18a50eef42d-be32.cache-3
+./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be32d8.cache-3
+./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be32d8.cache-3
+./var/cache/fontconfig/2cee944125173ffd13126fb55c9a0dc1-be32d8.cache-3
+./var/cache/fontconfig/68418e0da60dfe4003a8c2435e92b1d3-be32d8.cache-3
+./var/cache/fontconfig/6ac606a6cc613b1dd45fa75d9315a55e-be32d8.cache-3
+./var/cache/fontconfig/7c10409a5d7a696d98ceb77b9b1e9209-be32d8.cache-3
+./var/cache/fontconfig/8b934b58f0acb2e86a0bbbb5d24d97c0-be32d8.cache-3
+./var/cache/fontconfig/90acf7d99f5044d4df0432f2d0f16b42-be32d8.cache-3
+./var/cache/fontconfig/be2547a64937fd44a1f33dfd1eea53e8-be32d8.cache-3
+./var/cache/fontconfig/d929d2c542e4f6652ca46d613e4b360e-be32d8.cache-3
+./var/cache/fontconfig/f8033d5e4c6effb98c84b18a50eef42d-be32d8.cache-3
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index 18a6774b7..ed7cccdf1 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -238,7 +238,7 @@
 ./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.2.1
 ./usr/X11R6/lib/libxcb_pic.a
-./usr/X11R6/lib/libxkbfile.so.4.0
+./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus
index d928de53e..5aa21361b 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -237,7 +237,7 @@
 ./usr/X11R6/lib/libxcb.a
 ./usr/X11R6/lib/libxcb.so.2.1
 ./usr/X11R6/lib/libxcb_pic.a
-./usr/X11R6/lib/libxkbfile.so.4.0
+./usr/X11R6/lib/libxkbfile.so.5.0
 ./usr/X11R6/lib/libxkbui.so.4.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
 ./usr/X11R6/lib/pkgconfig/dri2proto.pc
diff --git a/distrib/sets/lists/xbase/mi b/distrib/sets/lists/xbase/mi
index 54d8642aa..e72f172fb 100644
--- a/distrib/sets/lists/xbase/mi
+++ b/distrib/sets/lists/xbase/mi
@@ -534,9 +534,14 @@
 ./usr/X11R6/include/GL/internal/glcore.h
 ./usr/X11R6/include/X11
 ./usr/X11R6/include/X11/dri
+./usr/X11R6/include/X11/extensions/Xxf86dga.h
 ./usr/X11R6/include/X11/extensions/xf86dga.h
 ./usr/X11R6/include/X11/extensions/xf86dga1.h
+./usr/X11R6/include/X11/extensions/xf86dga1const.h
+./usr/X11R6/include/X11/extensions/xf86dga1proto.h
 ./usr/X11R6/include/X11/extensions/xf86dga1str.h
+./usr/X11R6/include/X11/extensions/xf86dgaconst.h
+./usr/X11R6/include/X11/extensions/xf86dgaproto.h
 ./usr/X11R6/include/X11/extensions/xf86dgastr.h
 ./usr/X11R6/include/freetype2/freetype/ftgzip.h
 ./usr/X11R6/include/freetype2/freetype/ftincrem.h