sync

15 files changed, 76 insertions, 156 deletions

diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index 0312c885b..0bbade154 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -38,9 +38,6 @@
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86driproto.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
-./usr/X11R6/include/X11/extensions/dri2proto.h
-./usr/X11R6/include/X11/extensions/dri2tokens.h
-./usr/X11R6/include/X11/extensions/dri3proto.h
 ./usr/X11R6/include/X11/xshmfence.h
 ./usr/X11R6/include/epoxy/common.h
 ./usr/X11R6/include/epoxy/egl.h
@@ -126,7 +123,6 @@
 ./usr/X11R6/lib/libxshmfence.la
 ./usr/X11R6/lib/libxshmfence.so.0.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
-./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/egl.pc
 ./usr/X11R6/lib/pkgconfig/epoxy.pc
 ./usr/X11R6/lib/pkgconfig/gbm.pc
@@ -191,7 +187,6 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
-./usr/X11R6/share/doc/dri2proto/dri2proto.txt
 ./usr/X11R6/share/libdrm/amdgpu.ids
 ./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-le64.cache-7
 ./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le64.cache-7
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 9c21dab04..3a317f03e 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -40,9 +40,6 @@
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86driproto.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
-./usr/X11R6/include/X11/extensions/dri2proto.h
-./usr/X11R6/include/X11/extensions/dri2tokens.h
-./usr/X11R6/include/X11/extensions/dri3proto.h
 ./usr/X11R6/include/X11/xshmfence.h
 ./usr/X11R6/include/epoxy/common.h
 ./usr/X11R6/include/epoxy/egl.h
@@ -298,7 +295,6 @@
 ./usr/X11R6/lib/libxshmfence.la
 ./usr/X11R6/lib/libxshmfence.so.0.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
-./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/egl.pc
 ./usr/X11R6/lib/pkgconfig/epoxy.pc
 ./usr/X11R6/lib/pkgconfig/gbm.pc
@@ -364,7 +360,6 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
-./usr/X11R6/share/doc/dri2proto/dri2proto.txt
 ./usr/X11R6/share/libdrm/amdgpu.ids
 ./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-le64.cache-7
 ./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le64.cache-7
diff --git a/distrib/sets/lists/xbase/md.arm64 b/distrib/sets/lists/xbase/md.arm64
index c63961c70..75fab6e86 100644
--- a/distrib/sets/lists/xbase/md.arm64
+++ b/distrib/sets/lists/xbase/md.arm64
@@ -38,9 +38,6 @@
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86driproto.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
-./usr/X11R6/include/X11/extensions/dri2proto.h
-./usr/X11R6/include/X11/extensions/dri2tokens.h
-./usr/X11R6/include/X11/extensions/dri3proto.h
 ./usr/X11R6/include/X11/xshmfence.h
 ./usr/X11R6/include/epoxy/common.h
 ./usr/X11R6/include/epoxy/egl.h
@@ -294,7 +291,6 @@
 ./usr/X11R6/lib/libxshmfence.la
 ./usr/X11R6/lib/libxshmfence.so.0.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
-./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/egl.pc
 ./usr/X11R6/lib/pkgconfig/epoxy.pc
 ./usr/X11R6/lib/pkgconfig/gbm.pc
@@ -361,7 +357,6 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
-./usr/X11R6/share/doc/dri2proto/dri2proto.txt
 ./usr/X11R6/share/libdrm/amdgpu.ids
 ./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-le64.cache-7
 ./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le64.cache-7
diff --git a/distrib/sets/lists/xbase/md.armv7 b/distrib/sets/lists/xbase/md.armv7
index 4605e48b1..88edd7b40 100644
--- a/distrib/sets/lists/xbase/md.armv7
+++ b/distrib/sets/lists/xbase/md.armv7
@@ -38,9 +38,6 @@
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86driproto.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
-./usr/X11R6/include/X11/extensions/dri2proto.h
-./usr/X11R6/include/X11/extensions/dri2tokens.h
-./usr/X11R6/include/X11/extensions/dri3proto.h
 ./usr/X11R6/include/X11/xshmfence.h
 ./usr/X11R6/include/epoxy/common.h
 ./usr/X11R6/include/epoxy/egl.h
@@ -293,7 +290,6 @@
 ./usr/X11R6/lib/libxshmfence.la
 ./usr/X11R6/lib/libxshmfence.so.0.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
-./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/egl.pc
 ./usr/X11R6/lib/pkgconfig/epoxy.pc
 ./usr/X11R6/lib/pkgconfig/gbm.pc
@@ -360,7 +356,6 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
-./usr/X11R6/share/doc/dri2proto/dri2proto.txt
 ./usr/X11R6/share/libdrm/amdgpu.ids
 ./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-le32d8.cache-7
 ./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le32d8.cache-7
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index 5c54fd482..ae8fb88be 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -37,9 +37,6 @@
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86driproto.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
-./usr/X11R6/include/X11/extensions/dri2proto.h
-./usr/X11R6/include/X11/extensions/dri2tokens.h
-./usr/X11R6/include/X11/extensions/dri3proto.h
 ./usr/X11R6/include/epoxy/common.h
 ./usr/X11R6/include/epoxy/egl.h
 ./usr/X11R6/include/epoxy/egl_generated.h
@@ -257,7 +254,6 @@
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
-./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/egl.pc
 ./usr/X11R6/lib/pkgconfig/epoxy.pc
 ./usr/X11R6/lib/pkgconfig/gbm.pc
@@ -271,7 +267,6 @@
 ./usr/X11R6/lib/pkgconfig/xf86driproto.pc
 ./usr/X11R6/man/man1/glxgears.1
 ./usr/X11R6/man/man1/glxinfo.1
-./usr/X11R6/share/doc/dri2proto/dri2proto.txt
 ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be32d8.cache-7
 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be32d8.cache-7
 ./var/cache/fontconfig/2cee944125173ffd13126fb55c9a0dc1-be32d8.cache-7
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index 4d70f3332..11a064e90 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -40,9 +40,6 @@
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86driproto.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
-./usr/X11R6/include/X11/extensions/dri2proto.h
-./usr/X11R6/include/X11/extensions/dri2tokens.h
-./usr/X11R6/include/X11/extensions/dri3proto.h
 ./usr/X11R6/include/X11/xshmfence.h
 ./usr/X11R6/include/epoxy/common.h
 ./usr/X11R6/include/epoxy/egl.h
@@ -298,7 +295,6 @@
 ./usr/X11R6/lib/libxshmfence.la
 ./usr/X11R6/lib/libxshmfence.so.0.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
-./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/egl.pc
 ./usr/X11R6/lib/pkgconfig/epoxy.pc
 ./usr/X11R6/lib/pkgconfig/gbm.pc
@@ -364,7 +360,6 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
-./usr/X11R6/share/doc/dri2proto/dri2proto.txt
 ./usr/X11R6/share/libdrm/amdgpu.ids
 ./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-le32d8.cache-7
 ./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le32d8.cache-7
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index 433f488df..a325c3faf 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -38,9 +38,6 @@
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86driproto.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
-./usr/X11R6/include/X11/extensions/dri2proto.h
-./usr/X11R6/include/X11/extensions/dri2tokens.h
-./usr/X11R6/include/X11/extensions/dri3proto.h
 ./usr/X11R6/include/epoxy/common.h
 ./usr/X11R6/include/epoxy/egl.h
 ./usr/X11R6/include/epoxy/egl_generated.h
@@ -99,7 +96,6 @@
 ./usr/X11R6/lib/libtxc_dxtn.a
 ./usr/X11R6/lib/libtxc_dxtn.so.0.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
-./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/egl.pc
 ./usr/X11R6/lib/pkgconfig/epoxy.pc
 ./usr/X11R6/lib/pkgconfig/gbm.pc
@@ -159,7 +155,6 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchMode.3
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
-./usr/X11R6/share/doc/dri2proto/dri2proto.txt
 ./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-le32d8.cache-7
 ./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le32d8.cache-7
 ./var/cache/fontconfig/49aa604a5ac92994756d3008e408245c-le32d8.cache-7
diff --git a/distrib/sets/lists/xbase/md.loongson b/distrib/sets/lists/xbase/md.loongson
index d4eef803f..3de7b2627 100644
--- a/distrib/sets/lists/xbase/md.loongson
+++ b/distrib/sets/lists/xbase/md.loongson
@@ -38,9 +38,6 @@
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86driproto.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
-./usr/X11R6/include/X11/extensions/dri2proto.h
-./usr/X11R6/include/X11/extensions/dri2tokens.h
-./usr/X11R6/include/X11/extensions/dri3proto.h
 ./usr/X11R6/include/X11/xshmfence.h
 ./usr/X11R6/include/epoxy/common.h
 ./usr/X11R6/include/epoxy/egl.h
@@ -287,7 +284,6 @@
 ./usr/X11R6/lib/libxshmfence.la
 ./usr/X11R6/lib/libxshmfence.so.0.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
-./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/egl.pc
 ./usr/X11R6/lib/pkgconfig/epoxy.pc
 ./usr/X11R6/lib/pkgconfig/gbm.pc
@@ -349,7 +345,6 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
-./usr/X11R6/share/doc/dri2proto/dri2proto.txt
 ./usr/X11R6/share/libdrm/amdgpu.ids
 ./var/cache/fontconfig/0f0db7876307790c19e1f91eb9095080-le64.cache-7
 ./var/cache/fontconfig/1487dd4aecf3164c4a11193169052443-le64.cache-7
diff --git a/distrib/sets/lists/xbase/md.luna88k b/distrib/sets/lists/xbase/md.luna88k
index 72c4739fa..4ccb3b3d7 100644
--- a/distrib/sets/lists/xbase/md.luna88k
+++ b/distrib/sets/lists/xbase/md.luna88k
@@ -2,7 +2,6 @@
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86driproto.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
-./usr/X11R6/include/X11/extensions/dri3proto.h
 ./usr/X11R6/include/xorg
 ./usr/X11R6/include/xorg/BT.h
 ./usr/X11R6/include/xorg/IBM.h
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index a85a86511..e97d0c789 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -38,9 +38,6 @@
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86driproto.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
-./usr/X11R6/include/X11/extensions/dri2proto.h
-./usr/X11R6/include/X11/extensions/dri2tokens.h
-./usr/X11R6/include/X11/extensions/dri3proto.h
 ./usr/X11R6/include/X11/xshmfence.h
 ./usr/X11R6/include/epoxy/common.h
 ./usr/X11R6/include/epoxy/egl.h
@@ -288,7 +285,6 @@
 ./usr/X11R6/lib/libxshmfence.la
 ./usr/X11R6/lib/libxshmfence.so.0.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
-./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/egl.pc
 ./usr/X11R6/lib/pkgconfig/epoxy.pc
 ./usr/X11R6/lib/pkgconfig/gbm.pc
@@ -353,7 +349,6 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
-./usr/X11R6/share/doc/dri2proto/dri2proto.txt
 ./usr/X11R6/share/libdrm/amdgpu.ids
 ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be32d8.cache-7
 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be32d8.cache-7
diff --git a/distrib/sets/lists/xbase/md.octeon b/distrib/sets/lists/xbase/md.octeon
index d92f66032..90b791e8b 100644
--- a/distrib/sets/lists/xbase/md.octeon
+++ b/distrib/sets/lists/xbase/md.octeon
@@ -38,9 +38,6 @@
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86driproto.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
-./usr/X11R6/include/X11/extensions/dri2proto.h
-./usr/X11R6/include/X11/extensions/dri2tokens.h
-./usr/X11R6/include/X11/extensions/dri3proto.h
 ./usr/X11R6/include/X11/xshmfence.h
 ./usr/X11R6/include/epoxy/common.h
 ./usr/X11R6/include/epoxy/egl.h
@@ -126,7 +123,6 @@
 ./usr/X11R6/lib/libxshmfence.la
 ./usr/X11R6/lib/libxshmfence.so.0.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
-./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/egl.pc
 ./usr/X11R6/lib/pkgconfig/epoxy.pc
 ./usr/X11R6/lib/pkgconfig/gbm.pc
@@ -191,7 +187,6 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
-./usr/X11R6/share/doc/dri2proto/dri2proto.txt
 ./usr/X11R6/share/libdrm/amdgpu.ids
 ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be64.cache-7
 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be64.cache-7
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index 236766c76..1fe878cb6 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -38,9 +38,6 @@
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86driproto.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
-./usr/X11R6/include/X11/extensions/dri2proto.h
-./usr/X11R6/include/X11/extensions/dri2tokens.h
-./usr/X11R6/include/X11/extensions/dri3proto.h
 ./usr/X11R6/include/X11/xshmfence.h
 ./usr/X11R6/include/epoxy/common.h
 ./usr/X11R6/include/epoxy/egl.h
@@ -286,7 +283,6 @@
 ./usr/X11R6/lib/libxshmfence.la
 ./usr/X11R6/lib/libxshmfence.so.0.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
-./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/egl.pc
 ./usr/X11R6/lib/pkgconfig/epoxy.pc
 ./usr/X11R6/lib/pkgconfig/gbm.pc
@@ -348,7 +344,6 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
-./usr/X11R6/share/doc/dri2proto/dri2proto.txt
 ./usr/X11R6/share/libdrm/amdgpu.ids
 ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be64.cache-7
 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be64.cache-7
diff --git a/distrib/sets/lists/xbase/md.socppc b/distrib/sets/lists/xbase/md.socppc
index b1a40011c..1e3ff0ec3 100644
--- a/distrib/sets/lists/xbase/md.socppc
+++ b/distrib/sets/lists/xbase/md.socppc
@@ -38,9 +38,6 @@
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86driproto.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
-./usr/X11R6/include/X11/extensions/dri2proto.h
-./usr/X11R6/include/X11/extensions/dri2tokens.h
-./usr/X11R6/include/X11/extensions/dri3proto.h
 ./usr/X11R6/include/X11/xshmfence.h
 ./usr/X11R6/include/epoxy/common.h
 ./usr/X11R6/include/epoxy/egl.h
@@ -286,7 +283,6 @@
 ./usr/X11R6/lib/libxshmfence.la
 ./usr/X11R6/lib/libxshmfence.so.0.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
-./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/egl.pc
 ./usr/X11R6/lib/pkgconfig/epoxy.pc
 ./usr/X11R6/lib/pkgconfig/gbm.pc
@@ -348,7 +344,6 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
-./usr/X11R6/share/doc/dri2proto/dri2proto.txt
 ./usr/X11R6/share/libdrm/amdgpu.ids
 ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be32d8.cache-7
 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be32d8.cache-7
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index 2d63eab52..12e4fb865 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -38,9 +38,6 @@
 ./usr/X11R6/include/X11/dri/xf86dri.h
 ./usr/X11R6/include/X11/dri/xf86driproto.h
 ./usr/X11R6/include/X11/dri/xf86dristr.h
-./usr/X11R6/include/X11/extensions/dri2proto.h
-./usr/X11R6/include/X11/extensions/dri2tokens.h
-./usr/X11R6/include/X11/extensions/dri3proto.h
 ./usr/X11R6/include/X11/xshmfence.h
 ./usr/X11R6/include/epoxy/common.h
 ./usr/X11R6/include/epoxy/egl.h
@@ -288,7 +285,6 @@
 ./usr/X11R6/lib/libxshmfence.la
 ./usr/X11R6/lib/libxshmfence.so.0.0
 ./usr/X11R6/lib/pkgconfig/dri.pc
-./usr/X11R6/lib/pkgconfig/dri2proto.pc
 ./usr/X11R6/lib/pkgconfig/egl.pc
 ./usr/X11R6/lib/pkgconfig/epoxy.pc
 ./usr/X11R6/lib/pkgconfig/gbm.pc
@@ -354,7 +350,6 @@
 ./usr/X11R6/man/man3/XF86VidModeSwitchToMode.3
 ./usr/X11R6/man/man3/XF86VidModeValidateModeLine.3
 ./usr/X11R6/man/man3/XFree86-DGA.3
-./usr/X11R6/share/doc/dri2proto/dri2proto.txt
 ./usr/X11R6/share/libdrm/amdgpu.ids
 ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-be64.cache-7
 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-be64.cache-7
diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi
index 59191fe43..1b02f7dc9 100644
--- a/distrib/sets/lists/xshare/mi
+++ b/distrib/sets/lists/xshare/mi
@@ -37,9 +37,6 @@
 ./usr/X11R6/include/X11/IntrinsicP.h
 ./usr/X11R6/include/X11/Object.h
 ./usr/X11R6/include/X11/ObjectP.h
-./usr/X11R6/include/X11/PM
-./usr/X11R6/include/X11/PM/PM.h
-./usr/X11R6/include/X11/PM/PMproto.h
 ./usr/X11R6/include/X11/PassivGraI.h
 ./usr/X11R6/include/X11/RectObj.h
 ./usr/X11R6/include/X11/RectObjP.h
@@ -360,6 +357,9 @@
 ./usr/X11R6/include/X11/extensions/dpms.h
 ./usr/X11R6/include/X11/extensions/dpmsconst.h
 ./usr/X11R6/include/X11/extensions/dpmsproto.h
+./usr/X11R6/include/X11/extensions/dri2proto.h
+./usr/X11R6/include/X11/extensions/dri2tokens.h
+./usr/X11R6/include/X11/extensions/dri3proto.h
 ./usr/X11R6/include/X11/extensions/extutil.h
 ./usr/X11R6/include/X11/extensions/ge.h
 ./usr/X11R6/include/X11/extensions/geproto.h
@@ -702,6 +702,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/dri3proto.pc
 ./usr/X11R6/lib/pkgconfig/fixesproto.pc
 ./usr/X11R6/lib/pkgconfig/fontconfig.pc
@@ -752,7 +753,6 @@
 ./usr/X11R6/lib/pkgconfig/xpm.pc
 ./usr/X11R6/lib/pkgconfig/xpresent.pc
 ./usr/X11R6/lib/pkgconfig/xproto.pc
-./usr/X11R6/lib/pkgconfig/xproxymngproto.pc
 ./usr/X11R6/lib/pkgconfig/xrandr.pc
 ./usr/X11R6/lib/pkgconfig/xrender.pc
 ./usr/X11R6/lib/pkgconfig/xres.pc
@@ -3550,17 +3550,6 @@
 ./usr/X11R6/share/aclocal/fontutil.m4
 ./usr/X11R6/share/aclocal/xtrans.m4
 ./usr/X11R6/share/doc
-./usr/X11R6/share/doc/bigreqsproto
-./usr/X11R6/share/doc/bigreqsproto/bigreq.xml
-./usr/X11R6/share/doc/compositeproto
-./usr/X11R6/share/doc/compositeproto/compositeproto.txt
-./usr/X11R6/share/doc/damageproto
-./usr/X11R6/share/doc/damageproto/damageproto.txt
-./usr/X11R6/share/doc/dri2proto
-./usr/X11R6/share/doc/dri3proto
-./usr/X11R6/share/doc/dri3proto/dri3proto.txt
-./usr/X11R6/share/doc/fixesproto
-./usr/X11R6/share/doc/fixesproto/fixesproto.txt
 ./usr/X11R6/share/doc/fontconfig
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel
 ./usr/X11R6/share/doc/fontconfig/fontconfig-devel.pdf
@@ -3761,43 +3750,6 @@
 ./usr/X11R6/share/doc/fontconfig/fontconfig-user.html
 ./usr/X11R6/share/doc/fontconfig/fontconfig-user.pdf
 ./usr/X11R6/share/doc/fontconfig/fontconfig-user.txt
-./usr/X11R6/share/doc/fontsproto
-./usr/X11R6/share/doc/fontsproto/fsproto.xml
-./usr/X11R6/share/doc/inputproto
-./usr/X11R6/share/doc/inputproto/XI2proto.txt
-./usr/X11R6/share/doc/inputproto/XIproto.txt
-./usr/X11R6/share/doc/kbproto
-./usr/X11R6/share/doc/kbproto/XKBproto-1.svg
-./usr/X11R6/share/doc/kbproto/XKBproto-10.svg
-./usr/X11R6/share/doc/kbproto/XKBproto-11.svg
-./usr/X11R6/share/doc/kbproto/XKBproto-2.svg
-./usr/X11R6/share/doc/kbproto/XKBproto-3.svg
-./usr/X11R6/share/doc/kbproto/XKBproto-4.svg
-./usr/X11R6/share/doc/kbproto/XKBproto-5.svg
-./usr/X11R6/share/doc/kbproto/XKBproto-6.svg
-./usr/X11R6/share/doc/kbproto/XKBproto-7.svg
-./usr/X11R6/share/doc/kbproto/XKBproto-8.svg
-./usr/X11R6/share/doc/kbproto/XKBproto-9.svg
-./usr/X11R6/share/doc/kbproto/appA.xml
-./usr/X11R6/share/doc/kbproto/appB.xml
-./usr/X11R6/share/doc/kbproto/appC.xml
-./usr/X11R6/share/doc/kbproto/appD.xml
-./usr/X11R6/share/doc/kbproto/ch01.xml
-./usr/X11R6/share/doc/kbproto/ch02.xml
-./usr/X11R6/share/doc/kbproto/ch03.xml
-./usr/X11R6/share/doc/kbproto/ch04.xml
-./usr/X11R6/share/doc/kbproto/ch05.xml
-./usr/X11R6/share/doc/kbproto/ch06.xml
-./usr/X11R6/share/doc/kbproto/ch07.xml
-./usr/X11R6/share/doc/kbproto/ch08.xml
-./usr/X11R6/share/doc/kbproto/ch09.xml
-./usr/X11R6/share/doc/kbproto/ch10.xml
-./usr/X11R6/share/doc/kbproto/ch11.xml
-./usr/X11R6/share/doc/kbproto/ch12.xml
-./usr/X11R6/share/doc/kbproto/ch13.xml
-./usr/X11R6/share/doc/kbproto/ch15.xml
-./usr/X11R6/share/doc/kbproto/ch16.xml
-./usr/X11R6/share/doc/kbproto/xkbproto.xml
 ./usr/X11R6/share/doc/libFS
 ./usr/X11R6/share/doc/libFS/FSlib.txt
 ./usr/X11R6/share/doc/libICE
@@ -3896,50 +3848,84 @@
 ./usr/X11R6/share/doc/libXtst/xtestlib.xml
 ./usr/X11R6/share/doc/libXvMC
 ./usr/X11R6/share/doc/libXvMC/XvMC_API.txt
-./usr/X11R6/share/doc/randrproto
-./usr/X11R6/share/doc/randrproto/randrproto.txt
-./usr/X11R6/share/doc/recordproto
-./usr/X11R6/share/doc/recordproto/record.xml
-./usr/X11R6/share/doc/renderproto
-./usr/X11R6/share/doc/renderproto/renderproto.txt
-./usr/X11R6/share/doc/resproto
-./usr/X11R6/share/doc/resproto/resproto.txt
-./usr/X11R6/share/doc/scrnsaverproto
-./usr/X11R6/share/doc/scrnsaverproto/saver.xml
-./usr/X11R6/share/doc/x11proto
-./usr/X11R6/share/doc/x11proto/SIAddresses
-./usr/X11R6/share/doc/x11proto/SIAddresses/IPv6.txt
-./usr/X11R6/share/doc/x11proto/SIAddresses/README
-./usr/X11R6/share/doc/x11proto/SIAddresses/hostname.txt
-./usr/X11R6/share/doc/x11proto/SIAddresses/localuser.txt
-./usr/X11R6/share/doc/x11proto/encoding.xml
-./usr/X11R6/share/doc/x11proto/glossary.xml
-./usr/X11R6/share/doc/x11proto/keysyms.xml
-./usr/X11R6/share/doc/x11proto/sect1-9.xml
-./usr/X11R6/share/doc/x11proto/x11protocol.xml
-./usr/X11R6/share/doc/xcmiscproto
-./usr/X11R6/share/doc/xcmiscproto/xc-misc.xml
-./usr/X11R6/share/doc/xextproto
-./usr/X11R6/share/doc/xextproto/appendix.xml
-./usr/X11R6/share/doc/xextproto/appgrp.xml
-./usr/X11R6/share/doc/xextproto/dbe.xml
-./usr/X11R6/share/doc/xextproto/dpms.xml
-./usr/X11R6/share/doc/xextproto/evi.xml
-./usr/X11R6/share/doc/xextproto/geproto.xml
-./usr/X11R6/share/doc/xextproto/lbx.xml
-./usr/X11R6/share/doc/xextproto/multibuf.xml
-./usr/X11R6/share/doc/xextproto/security.xml
-./usr/X11R6/share/doc/xextproto/shape.xml
-./usr/X11R6/share/doc/xextproto/shm.xml
-./usr/X11R6/share/doc/xextproto/sync.xml
-./usr/X11R6/share/doc/xextproto/tog-cup.xml
-./usr/X11R6/share/doc/xextproto/xtest.xml
 ./usr/X11R6/share/doc/xorgproto
+./usr/X11R6/share/doc/xorgproto/PM_spec
 ./usr/X11R6/share/doc/xorgproto/SIAddresses
+./usr/X11R6/share/doc/xorgproto/SIAddresses/IPv6.txt
+./usr/X11R6/share/doc/xorgproto/SIAddresses/README
+./usr/X11R6/share/doc/xorgproto/SIAddresses/hostname.txt
+./usr/X11R6/share/doc/xorgproto/SIAddresses/localuser.txt
+./usr/X11R6/share/doc/xorgproto/bigreq.xml
+./usr/X11R6/share/doc/xorgproto/compositeproto.txt
+./usr/X11R6/share/doc/xorgproto/damageproto.txt
+./usr/X11R6/share/doc/xorgproto/dri3proto.txt
+./usr/X11R6/share/doc/xorgproto/dri2proto.txt
+./usr/X11R6/share/doc/xorgproto/fixesproto.txt
+./usr/X11R6/share/doc/xorgproto/fsproto.xml
 ./usr/X11R6/share/doc/xorgproto/inputproto
+./usr/X11R6/share/doc/xorgproto/inputproto/XI2proto.txt
+./usr/X11R6/share/doc/xorgproto/inputproto/XIproto.txt
 ./usr/X11R6/share/doc/xorgproto/kbproto
+./usr/X11R6/share/doc/xorgproto/kbproto/XKBproto-1.svg
+./usr/X11R6/share/doc/xorgproto/kbproto/XKBproto-10.svg
+./usr/X11R6/share/doc/xorgproto/kbproto/XKBproto-11.svg
+./usr/X11R6/share/doc/xorgproto/kbproto/XKBproto-2.svg
+./usr/X11R6/share/doc/xorgproto/kbproto/XKBproto-3.svg
+./usr/X11R6/share/doc/xorgproto/kbproto/XKBproto-4.svg
+./usr/X11R6/share/doc/xorgproto/kbproto/XKBproto-5.svg
+./usr/X11R6/share/doc/xorgproto/kbproto/XKBproto-6.svg
+./usr/X11R6/share/doc/xorgproto/kbproto/XKBproto-7.svg
+./usr/X11R6/share/doc/xorgproto/kbproto/XKBproto-8.svg
+./usr/X11R6/share/doc/xorgproto/kbproto/XKBproto-9.svg
+./usr/X11R6/share/doc/xorgproto/kbproto/appA.xml
+./usr/X11R6/share/doc/xorgproto/kbproto/appB.xml
+./usr/X11R6/share/doc/xorgproto/kbproto/appC.xml
+./usr/X11R6/share/doc/xorgproto/kbproto/appD.xml
+./usr/X11R6/share/doc/xorgproto/kbproto/ch01.xml
+./usr/X11R6/share/doc/xorgproto/kbproto/ch02.xml
+./usr/X11R6/share/doc/xorgproto/kbproto/ch03.xml
+./usr/X11R6/share/doc/xorgproto/kbproto/ch04.xml
+./usr/X11R6/share/doc/xorgproto/kbproto/ch05.xml
+./usr/X11R6/share/doc/xorgproto/kbproto/ch06.xml
+./usr/X11R6/share/doc/xorgproto/kbproto/ch07.xml
+./usr/X11R6/share/doc/xorgproto/kbproto/ch08.xml
+./usr/X11R6/share/doc/xorgproto/kbproto/ch09.xml
+./usr/X11R6/share/doc/xorgproto/kbproto/ch10.xml
+./usr/X11R6/share/doc/xorgproto/kbproto/ch11.xml
+./usr/X11R6/share/doc/xorgproto/kbproto/ch12.xml
+./usr/X11R6/share/doc/xorgproto/kbproto/ch13.xml
+./usr/X11R6/share/doc/xorgproto/kbproto/ch15.xml
+./usr/X11R6/share/doc/xorgproto/kbproto/ch16.xml
+./usr/X11R6/share/doc/xorgproto/kbproto/xkbproto.xml
+./usr/X11R6/share/doc/xorgproto/presentproto.txt
+./usr/X11R6/share/doc/xorgproto/randrproto.txt
+./usr/X11R6/share/doc/xorgproto/record.xml
+./usr/X11R6/share/doc/xorgproto/renderproto.txt
+./usr/X11R6/share/doc/xorgproto/resproto.txt
+./usr/X11R6/share/doc/xorgproto/saver.xml
 ./usr/X11R6/share/doc/xorgproto/x11proto
+./usr/X11R6/share/doc/xorgproto/x11proto/encoding.xml
+./usr/X11R6/share/doc/xorgproto/x11proto/glossary.xml
+./usr/X11R6/share/doc/xorgproto/x11proto/keysyms.xml
+./usr/X11R6/share/doc/xorgproto/x11proto/sect1-9.xml
+./usr/X11R6/share/doc/xorgproto/x11proto/x11protocol.xml
+./usr/X11R6/share/doc/xorgproto/xc-misc.xml
 ./usr/X11R6/share/doc/xorgproto/xextproto
+./usr/X11R6/share/doc/xorgproto/xextproto/appendix.xml
+./usr/X11R6/share/doc/xorgproto/xextproto/appgrp.xml
+./usr/X11R6/share/doc/xorgproto/xextproto/dbe.xml
+./usr/X11R6/share/doc/xorgproto/xextproto/dpms.xml
+./usr/X11R6/share/doc/xorgproto/xextproto/evi.xml
+./usr/X11R6/share/doc/xorgproto/xextproto/geproto.xml
+./usr/X11R6/share/doc/xorgproto/xextproto/lbx.xml
+./usr/X11R6/share/doc/xorgproto/xextproto/multibuf.xml
+./usr/X11R6/share/doc/xorgproto/xextproto/security.xml
+./usr/X11R6/share/doc/xorgproto/xextproto/shape.xml
+./usr/X11R6/share/doc/xorgproto/xextproto/shm.xml
+./usr/X11R6/share/doc/xorgproto/xextproto/sync.xml
+./usr/X11R6/share/doc/xorgproto/xextproto/tog-cup.xml
+./usr/X11R6/share/doc/xorgproto/xextproto/xtest.xml
+./usr/X11R6/share/doc/xorgproto/xv-protocol-v2.txt
 ./usr/X11R6/share/doc/xorg-docs
 ./usr/X11R6/share/doc/xorg-docs/MAINTAINERS
 ./usr/X11R6/share/doc/xtrans