sync

13 files changed, 52 insertions, 39 deletions

diff --git a/distrib/sets/lists/xserv/md.alpha b/distrib/sets/lists/xserv/md.alpha
index ea095f5f4..6c5e4589c 100644
--- a/distrib/sets/lists/xserv/md.alpha
+++ b/distrib/sets/lists/xserv/md.alpha
@@ -13,6 +13,7 @@
 ./usr/X11R6/include/xorg/bstore.h
 ./usr/X11R6/include/xorg/bstorestr.h
 ./usr/X11R6/include/xorg/bt829.h
+./usr/X11R6/include/xorg/callback.h
 ./usr/X11R6/include/xorg/cfb8_16.h
 ./usr/X11R6/include/xorg/closestr.h
 ./usr/X11R6/include/xorg/closure.h
@@ -51,7 +52,6 @@
 ./usr/X11R6/include/xorg/input.h
 ./usr/X11R6/include/xorg/inputstr.h
 ./usr/X11R6/include/xorg/mi.h
-./usr/X11R6/include/xorg/mibank.h
 ./usr/X11R6/include/xorg/mibstore.h
 ./usr/X11R6/include/xorg/micmap.h
 ./usr/X11R6/include/xorg/micoord.h
@@ -230,6 +230,8 @@
 ./usr/X11R6/lib/modules/libexa.so
 ./usr/X11R6/lib/modules/libfb.la
 ./usr/X11R6/lib/modules/libfb.so
+./usr/X11R6/lib/modules/libfbdevhw.la
+./usr/X11R6/lib/modules/libfbdevhw.so
 ./usr/X11R6/lib/modules/libint10.la
 ./usr/X11R6/lib/modules/libint10.so
 ./usr/X11R6/lib/modules/libshadow.la
@@ -246,8 +248,6 @@
 ./usr/X11R6/lib/modules/libxaa.so
 ./usr/X11R6/lib/modules/libxf8_16bpp.la
 ./usr/X11R6/lib/modules/libxf8_16bpp.so
-./usr/X11R6/lib/modules/linux/libfbdevhw.la
-./usr/X11R6/lib/modules/linux/libfbdevhw.so
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.la
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.so
 ./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
@@ -318,6 +318,7 @@
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/aclocal/xorg-server.m4
+./usr/X11R6/share/doc/xorg-server
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.amd64 b/distrib/sets/lists/xserv/md.amd64
index cfa9ef20b..f04830927 100644
--- a/distrib/sets/lists/xserv/md.amd64
+++ b/distrib/sets/lists/xserv/md.amd64
@@ -13,6 +13,7 @@
 ./usr/X11R6/include/xorg/bstore.h
 ./usr/X11R6/include/xorg/bstorestr.h
 ./usr/X11R6/include/xorg/bt829.h
+./usr/X11R6/include/xorg/callback.h
 ./usr/X11R6/include/xorg/cfb8_16.h
 ./usr/X11R6/include/xorg/closestr.h
 ./usr/X11R6/include/xorg/closure.h
@@ -51,7 +52,6 @@
 ./usr/X11R6/include/xorg/input.h
 ./usr/X11R6/include/xorg/inputstr.h
 ./usr/X11R6/include/xorg/mi.h
-./usr/X11R6/include/xorg/mibank.h
 ./usr/X11R6/include/xorg/mibstore.h
 ./usr/X11R6/include/xorg/micmap.h
 ./usr/X11R6/include/xorg/micoord.h
@@ -258,6 +258,8 @@
 ./usr/X11R6/lib/modules/libexa.so
 ./usr/X11R6/lib/modules/libfb.la
 ./usr/X11R6/lib/modules/libfb.so
+./usr/X11R6/lib/modules/libfbdevhw.la
+./usr/X11R6/lib/modules/libfbdevhw.so
 ./usr/X11R6/lib/modules/libint10.la
 ./usr/X11R6/lib/modules/libint10.so
 ./usr/X11R6/lib/modules/libshadow.la
@@ -274,8 +276,6 @@
 ./usr/X11R6/lib/modules/libxaa.so
 ./usr/X11R6/lib/modules/libxf8_16bpp.la
 ./usr/X11R6/lib/modules/libxf8_16bpp.so
-./usr/X11R6/lib/modules/linux/libfbdevhw.la
-./usr/X11R6/lib/modules/linux/libfbdevhw.so
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.la
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.so
 ./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
@@ -351,6 +351,7 @@
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/aclocal/xorg-server.m4
+./usr/X11R6/share/doc/xorg-server
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.armish b/distrib/sets/lists/xserv/md.armish
index 896a83594..8d97dff93 100644
--- a/distrib/sets/lists/xserv/md.armish
+++ b/distrib/sets/lists/xserv/md.armish
@@ -13,6 +13,7 @@
 ./usr/X11R6/include/xorg/bstore.h
 ./usr/X11R6/include/xorg/bstorestr.h
 ./usr/X11R6/include/xorg/bt829.h
+./usr/X11R6/include/xorg/callback.h
 ./usr/X11R6/include/xorg/cfb8_16.h
 ./usr/X11R6/include/xorg/closestr.h
 ./usr/X11R6/include/xorg/closure.h
@@ -51,7 +52,6 @@
 ./usr/X11R6/include/xorg/input.h
 ./usr/X11R6/include/xorg/inputstr.h
 ./usr/X11R6/include/xorg/mi.h
-./usr/X11R6/include/xorg/mibank.h
 ./usr/X11R6/include/xorg/mibstore.h
 ./usr/X11R6/include/xorg/micmap.h
 ./usr/X11R6/include/xorg/micoord.h
@@ -164,6 +164,8 @@
 ./usr/X11R6/lib/modules/libexa.so
 ./usr/X11R6/lib/modules/libfb.la
 ./usr/X11R6/lib/modules/libfb.so
+./usr/X11R6/lib/modules/libfbdevhw.la
+./usr/X11R6/lib/modules/libfbdevhw.so
 ./usr/X11R6/lib/modules/libint10.la
 ./usr/X11R6/lib/modules/libint10.so
 ./usr/X11R6/lib/modules/libshadow.la
@@ -180,8 +182,6 @@
 ./usr/X11R6/lib/modules/libxaa.so
 ./usr/X11R6/lib/modules/libxf8_16bpp.la
 ./usr/X11R6/lib/modules/libxf8_16bpp.so
-./usr/X11R6/lib/modules/linux/libfbdevhw.la
-./usr/X11R6/lib/modules/linux/libfbdevhw.so
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.la
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.so
 ./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
@@ -217,6 +217,7 @@
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/aclocal/xorg-server.m4
+./usr/X11R6/share/doc/xorg-server
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.hp300 b/distrib/sets/lists/xserv/md.hp300
index b39d95214..7a052805b 100644
--- a/distrib/sets/lists/xserv/md.hp300
+++ b/distrib/sets/lists/xserv/md.hp300
@@ -11,6 +11,7 @@
 ./usr/X11R6/include/xorg/bstore.h
 ./usr/X11R6/include/xorg/bstorestr.h
 ./usr/X11R6/include/xorg/bt829.h
+./usr/X11R6/include/xorg/callback.h
 ./usr/X11R6/include/xorg/cfb8_16.h
 ./usr/X11R6/include/xorg/closestr.h
 ./usr/X11R6/include/xorg/closure.h
@@ -50,7 +51,6 @@
 ./usr/X11R6/include/xorg/input.h
 ./usr/X11R6/include/xorg/inputstr.h
 ./usr/X11R6/include/xorg/mi.h
-./usr/X11R6/include/xorg/mibank.h
 ./usr/X11R6/include/xorg/mibstore.h
 ./usr/X11R6/include/xorg/micmap.h
 ./usr/X11R6/include/xorg/micoord.h
@@ -160,6 +160,8 @@
 ./usr/X11R6/lib/modules/libexa.so
 ./usr/X11R6/lib/modules/libfb.la
 ./usr/X11R6/lib/modules/libfb.so
+./usr/X11R6/lib/modules/libfbdevhw.la
+./usr/X11R6/lib/modules/libfbdevhw.so
 ./usr/X11R6/lib/modules/libint10.la
 ./usr/X11R6/lib/modules/libint10.so
 ./usr/X11R6/lib/modules/libshadow.la
@@ -176,8 +178,6 @@
 ./usr/X11R6/lib/modules/libxaa.so
 ./usr/X11R6/lib/modules/libxf8_16bpp.la
 ./usr/X11R6/lib/modules/libxf8_16bpp.so
-./usr/X11R6/lib/modules/linux/libfbdevhw.la
-./usr/X11R6/lib/modules/linux/libfbdevhw.so
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.la
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.so
 ./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
@@ -264,6 +264,7 @@
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/aclocal/xorg-server.m4
+./usr/X11R6/share/doc/xorg-server
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.i386 b/distrib/sets/lists/xserv/md.i386
index b562da807..239874f33 100644
--- a/distrib/sets/lists/xserv/md.i386
+++ b/distrib/sets/lists/xserv/md.i386
@@ -13,6 +13,7 @@
 ./usr/X11R6/include/xorg/bstore.h
 ./usr/X11R6/include/xorg/bstorestr.h
 ./usr/X11R6/include/xorg/bt829.h
+./usr/X11R6/include/xorg/callback.h
 ./usr/X11R6/include/xorg/cfb8_16.h
 ./usr/X11R6/include/xorg/closestr.h
 ./usr/X11R6/include/xorg/closure.h
@@ -51,7 +52,6 @@
 ./usr/X11R6/include/xorg/input.h
 ./usr/X11R6/include/xorg/inputstr.h
 ./usr/X11R6/include/xorg/mi.h
-./usr/X11R6/include/xorg/mibank.h
 ./usr/X11R6/include/xorg/mibstore.h
 ./usr/X11R6/include/xorg/micmap.h
 ./usr/X11R6/include/xorg/micoord.h
@@ -264,6 +264,8 @@
 ./usr/X11R6/lib/modules/libexa.so
 ./usr/X11R6/lib/modules/libfb.la
 ./usr/X11R6/lib/modules/libfb.so
+./usr/X11R6/lib/modules/libfbdevhw.la
+./usr/X11R6/lib/modules/libfbdevhw.so
 ./usr/X11R6/lib/modules/libint10.la
 ./usr/X11R6/lib/modules/libint10.so
 ./usr/X11R6/lib/modules/libshadow.la
@@ -280,8 +282,6 @@
 ./usr/X11R6/lib/modules/libxaa.so
 ./usr/X11R6/lib/modules/libxf8_16bpp.la
 ./usr/X11R6/lib/modules/libxf8_16bpp.so
-./usr/X11R6/lib/modules/linux/libfbdevhw.la
-./usr/X11R6/lib/modules/linux/libfbdevhw.so
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.la
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.so
 ./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
@@ -359,6 +359,7 @@
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/aclocal/xorg-server.m4
+./usr/X11R6/share/doc/xorg-server
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.loongson b/distrib/sets/lists/xserv/md.loongson
index ec16e190c..cefe02270 100644
--- a/distrib/sets/lists/xserv/md.loongson
+++ b/distrib/sets/lists/xserv/md.loongson
@@ -12,6 +12,7 @@
 ./usr/X11R6/include/xorg/bstore.h
 ./usr/X11R6/include/xorg/bstorestr.h
 ./usr/X11R6/include/xorg/bt829.h
+./usr/X11R6/include/xorg/callback.h
 ./usr/X11R6/include/xorg/cfb8_16.h
 ./usr/X11R6/include/xorg/closestr.h
 ./usr/X11R6/include/xorg/closure.h
@@ -50,7 +51,6 @@
 ./usr/X11R6/include/xorg/input.h
 ./usr/X11R6/include/xorg/inputstr.h
 ./usr/X11R6/include/xorg/mi.h
-./usr/X11R6/include/xorg/mibank.h
 ./usr/X11R6/include/xorg/mibstore.h
 ./usr/X11R6/include/xorg/micmap.h
 ./usr/X11R6/include/xorg/micoord.h
@@ -161,6 +161,8 @@
 ./usr/X11R6/lib/modules/libexa.so
 ./usr/X11R6/lib/modules/libfb.la
 ./usr/X11R6/lib/modules/libfb.so
+./usr/X11R6/lib/modules/libfbdevhw.la
+./usr/X11R6/lib/modules/libfbdevhw.so
 ./usr/X11R6/lib/modules/libint10.la
 ./usr/X11R6/lib/modules/libint10.so
 ./usr/X11R6/lib/modules/libshadow.la
@@ -177,8 +179,6 @@
 ./usr/X11R6/lib/modules/libxaa.so
 ./usr/X11R6/lib/modules/libxf8_16bpp.la
 ./usr/X11R6/lib/modules/libxf8_16bpp.so
-./usr/X11R6/lib/modules/linux/libfbdevhw.la
-./usr/X11R6/lib/modules/linux/libfbdevhw.so
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.la
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.so
 ./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
@@ -213,6 +213,7 @@
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/aclocal/xorg-server.m4
+./usr/X11R6/share/doc/xorg-server
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.mac68k b/distrib/sets/lists/xserv/md.mac68k
index 3f8620fa5..f821a9d26 100644
--- a/distrib/sets/lists/xserv/md.mac68k
+++ b/distrib/sets/lists/xserv/md.mac68k
@@ -10,6 +10,7 @@
 ./usr/X11R6/include/xorg/bstore.h
 ./usr/X11R6/include/xorg/bstorestr.h
 ./usr/X11R6/include/xorg/bt829.h
+./usr/X11R6/include/xorg/callback.h
 ./usr/X11R6/include/xorg/cfb8_16.h
 ./usr/X11R6/include/xorg/closestr.h
 ./usr/X11R6/include/xorg/closure.h
@@ -48,7 +49,6 @@
 ./usr/X11R6/include/xorg/input.h
 ./usr/X11R6/include/xorg/inputstr.h
 ./usr/X11R6/include/xorg/mi.h
-./usr/X11R6/include/xorg/mibank.h
 ./usr/X11R6/include/xorg/mibstore.h
 ./usr/X11R6/include/xorg/micmap.h
 ./usr/X11R6/include/xorg/micoord.h
@@ -150,6 +150,8 @@
 ./usr/X11R6/lib/modules/libexa.so
 ./usr/X11R6/lib/modules/libfb.la
 ./usr/X11R6/lib/modules/libfb.so
+./usr/X11R6/lib/modules/libfbdevhw.la
+./usr/X11R6/lib/modules/libfbdevhw.so
 ./usr/X11R6/lib/modules/libint10.la
 ./usr/X11R6/lib/modules/libint10.so
 ./usr/X11R6/lib/modules/libshadow.la
@@ -166,8 +168,6 @@
 ./usr/X11R6/lib/modules/libxaa.so
 ./usr/X11R6/lib/modules/libxf8_16bpp.la
 ./usr/X11R6/lib/modules/libxf8_16bpp.so
-./usr/X11R6/lib/modules/linux/libfbdevhw.la
-./usr/X11R6/lib/modules/linux/libfbdevhw.so
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.la
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.so
 ./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
@@ -251,6 +251,7 @@
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/aclocal/xorg-server.m4
+./usr/X11R6/share/doc/xorg-server
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.macppc b/distrib/sets/lists/xserv/md.macppc
index dab75397b..a28895e0e 100644
--- a/distrib/sets/lists/xserv/md.macppc
+++ b/distrib/sets/lists/xserv/md.macppc
@@ -13,6 +13,7 @@
 ./usr/X11R6/include/xorg/bstore.h
 ./usr/X11R6/include/xorg/bstorestr.h
 ./usr/X11R6/include/xorg/bt829.h
+./usr/X11R6/include/xorg/callback.h
 ./usr/X11R6/include/xorg/cfb8_16.h
 ./usr/X11R6/include/xorg/closestr.h
 ./usr/X11R6/include/xorg/closure.h
@@ -51,7 +52,6 @@
 ./usr/X11R6/include/xorg/input.h
 ./usr/X11R6/include/xorg/inputstr.h
 ./usr/X11R6/include/xorg/mi.h
-./usr/X11R6/include/xorg/mibank.h
 ./usr/X11R6/include/xorg/mibstore.h
 ./usr/X11R6/include/xorg/micmap.h
 ./usr/X11R6/include/xorg/micoord.h
@@ -190,6 +190,8 @@
 ./usr/X11R6/lib/modules/libexa.so
 ./usr/X11R6/lib/modules/libfb.la
 ./usr/X11R6/lib/modules/libfb.so
+./usr/X11R6/lib/modules/libfbdevhw.la
+./usr/X11R6/lib/modules/libfbdevhw.so
 ./usr/X11R6/lib/modules/libint10.la
 ./usr/X11R6/lib/modules/libint10.so
 ./usr/X11R6/lib/modules/libshadow.la
@@ -206,8 +208,6 @@
 ./usr/X11R6/lib/modules/libxaa.so
 ./usr/X11R6/lib/modules/libxf8_16bpp.la
 ./usr/X11R6/lib/modules/libxf8_16bpp.so
-./usr/X11R6/lib/modules/linux/libfbdevhw.la
-./usr/X11R6/lib/modules/linux/libfbdevhw.so
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.la
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.so
 ./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
@@ -260,6 +260,7 @@
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/aclocal/xorg-server.m4
+./usr/X11R6/share/doc/xorg-server
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.sgi b/distrib/sets/lists/xserv/md.sgi
index e959009e8..f2752cf81 100644
--- a/distrib/sets/lists/xserv/md.sgi
+++ b/distrib/sets/lists/xserv/md.sgi
@@ -10,6 +10,7 @@
 ./usr/X11R6/include/xorg/bstore.h
 ./usr/X11R6/include/xorg/bstorestr.h
 ./usr/X11R6/include/xorg/bt829.h
+./usr/X11R6/include/xorg/callback.h
 ./usr/X11R6/include/xorg/cfb8_16.h
 ./usr/X11R6/include/xorg/closestr.h
 ./usr/X11R6/include/xorg/closure.h
@@ -48,7 +49,6 @@
 ./usr/X11R6/include/xorg/input.h
 ./usr/X11R6/include/xorg/inputstr.h
 ./usr/X11R6/include/xorg/mi.h
-./usr/X11R6/include/xorg/mibank.h
 ./usr/X11R6/include/xorg/mibstore.h
 ./usr/X11R6/include/xorg/micmap.h
 ./usr/X11R6/include/xorg/micoord.h
@@ -159,6 +159,8 @@
 ./usr/X11R6/lib/modules/libexa.so
 ./usr/X11R6/lib/modules/libfb.la
 ./usr/X11R6/lib/modules/libfb.so
+./usr/X11R6/lib/modules/libfbdevhw.la
+./usr/X11R6/lib/modules/libfbdevhw.so
 ./usr/X11R6/lib/modules/libint10.la
 ./usr/X11R6/lib/modules/libint10.so
 ./usr/X11R6/lib/modules/libshadow.la
@@ -175,8 +177,6 @@
 ./usr/X11R6/lib/modules/libxaa.so
 ./usr/X11R6/lib/modules/libxf8_16bpp.la
 ./usr/X11R6/lib/modules/libxf8_16bpp.so
-./usr/X11R6/lib/modules/linux/libfbdevhw.la
-./usr/X11R6/lib/modules/linux/libfbdevhw.so
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.la
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.so
 ./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
@@ -209,6 +209,7 @@
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/aclocal/xorg-server.m4
+./usr/X11R6/share/doc/xorg-server
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.socppc b/distrib/sets/lists/xserv/md.socppc
index 0bad0725b..9026b7e85 100644
--- a/distrib/sets/lists/xserv/md.socppc
+++ b/distrib/sets/lists/xserv/md.socppc
@@ -13,6 +13,7 @@
 ./usr/X11R6/include/xorg/bstore.h
 ./usr/X11R6/include/xorg/bstorestr.h
 ./usr/X11R6/include/xorg/bt829.h
+./usr/X11R6/include/xorg/callback.h
 ./usr/X11R6/include/xorg/cfb8_16.h
 ./usr/X11R6/include/xorg/closestr.h
 ./usr/X11R6/include/xorg/closure.h
@@ -51,7 +52,6 @@
 ./usr/X11R6/include/xorg/input.h
 ./usr/X11R6/include/xorg/inputstr.h
 ./usr/X11R6/include/xorg/mi.h
-./usr/X11R6/include/xorg/mibank.h
 ./usr/X11R6/include/xorg/mibstore.h
 ./usr/X11R6/include/xorg/micmap.h
 ./usr/X11R6/include/xorg/micoord.h
@@ -162,6 +162,8 @@
 ./usr/X11R6/lib/modules/libexa.so
 ./usr/X11R6/lib/modules/libfb.la
 ./usr/X11R6/lib/modules/libfb.so
+./usr/X11R6/lib/modules/libfbdevhw.la
+./usr/X11R6/lib/modules/libfbdevhw.so
 ./usr/X11R6/lib/modules/libint10.la
 ./usr/X11R6/lib/modules/libint10.so
 ./usr/X11R6/lib/modules/libshadow.la
@@ -178,8 +180,6 @@
 ./usr/X11R6/lib/modules/libxaa.so
 ./usr/X11R6/lib/modules/libxf8_16bpp.la
 ./usr/X11R6/lib/modules/libxf8_16bpp.so
-./usr/X11R6/lib/modules/linux/libfbdevhw.la
-./usr/X11R6/lib/modules/linux/libfbdevhw.so
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.la
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.so
 ./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
@@ -214,6 +214,7 @@
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/aclocal/xorg-server.m4
+./usr/X11R6/share/doc/xorg-server
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.sparc b/distrib/sets/lists/xserv/md.sparc
index d2192569b..91561e0f7 100644
--- a/distrib/sets/lists/xserv/md.sparc
+++ b/distrib/sets/lists/xserv/md.sparc
@@ -10,6 +10,7 @@
 ./usr/X11R6/include/xorg/bstore.h
 ./usr/X11R6/include/xorg/bstorestr.h
 ./usr/X11R6/include/xorg/bt829.h
+./usr/X11R6/include/xorg/callback.h
 ./usr/X11R6/include/xorg/cfb8_16.h
 ./usr/X11R6/include/xorg/closestr.h
 ./usr/X11R6/include/xorg/closure.h
@@ -48,7 +49,6 @@
 ./usr/X11R6/include/xorg/input.h
 ./usr/X11R6/include/xorg/inputstr.h
 ./usr/X11R6/include/xorg/mi.h
-./usr/X11R6/include/xorg/mibank.h
 ./usr/X11R6/include/xorg/mibstore.h
 ./usr/X11R6/include/xorg/micmap.h
 ./usr/X11R6/include/xorg/micoord.h
@@ -159,6 +159,8 @@
 ./usr/X11R6/lib/modules/libexa.so
 ./usr/X11R6/lib/modules/libfb.la
 ./usr/X11R6/lib/modules/libfb.so
+./usr/X11R6/lib/modules/libfbdevhw.la
+./usr/X11R6/lib/modules/libfbdevhw.so
 ./usr/X11R6/lib/modules/libint10.la
 ./usr/X11R6/lib/modules/libint10.so
 ./usr/X11R6/lib/modules/libshadow.la
@@ -175,8 +177,6 @@
 ./usr/X11R6/lib/modules/libxaa.so
 ./usr/X11R6/lib/modules/libxf8_16bpp.la
 ./usr/X11R6/lib/modules/libxf8_16bpp.so
-./usr/X11R6/lib/modules/linux/libfbdevhw.la
-./usr/X11R6/lib/modules/linux/libfbdevhw.so
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.la
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.so
 ./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
@@ -208,6 +208,7 @@
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/aclocal/xorg-server.m4
+./usr/X11R6/share/doc/xorg-server
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.sparc64 b/distrib/sets/lists/xserv/md.sparc64
index 0947b1f27..bc39a2292 100644
--- a/distrib/sets/lists/xserv/md.sparc64
+++ b/distrib/sets/lists/xserv/md.sparc64
@@ -13,6 +13,7 @@
 ./usr/X11R6/include/xorg/bstore.h
 ./usr/X11R6/include/xorg/bstorestr.h
 ./usr/X11R6/include/xorg/bt829.h
+./usr/X11R6/include/xorg/callback.h
 ./usr/X11R6/include/xorg/cfb8_16.h
 ./usr/X11R6/include/xorg/closestr.h
 ./usr/X11R6/include/xorg/closure.h
@@ -51,7 +52,6 @@
 ./usr/X11R6/include/xorg/input.h
 ./usr/X11R6/include/xorg/inputstr.h
 ./usr/X11R6/include/xorg/mi.h
-./usr/X11R6/include/xorg/mibank.h
 ./usr/X11R6/include/xorg/mibstore.h
 ./usr/X11R6/include/xorg/micmap.h
 ./usr/X11R6/include/xorg/micoord.h
@@ -192,6 +192,8 @@
 ./usr/X11R6/lib/modules/libexa.so
 ./usr/X11R6/lib/modules/libfb.la
 ./usr/X11R6/lib/modules/libfb.so
+./usr/X11R6/lib/modules/libfbdevhw.la
+./usr/X11R6/lib/modules/libfbdevhw.so
 ./usr/X11R6/lib/modules/libint10.la
 ./usr/X11R6/lib/modules/libint10.so
 ./usr/X11R6/lib/modules/libshadow.la
@@ -208,8 +210,6 @@
 ./usr/X11R6/lib/modules/libxaa.so
 ./usr/X11R6/lib/modules/libxf8_16bpp.la
 ./usr/X11R6/lib/modules/libxf8_16bpp.so
-./usr/X11R6/lib/modules/linux/libfbdevhw.la
-./usr/X11R6/lib/modules/linux/libfbdevhw.so
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.la
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.so
 ./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
@@ -263,6 +263,7 @@
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/aclocal/xorg-server.m4
+./usr/X11R6/share/doc/xorg-server
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log
diff --git a/distrib/sets/lists/xserv/md.zaurus b/distrib/sets/lists/xserv/md.zaurus
index 0bad0725b..9026b7e85 100644
--- a/distrib/sets/lists/xserv/md.zaurus
+++ b/distrib/sets/lists/xserv/md.zaurus
@@ -13,6 +13,7 @@
 ./usr/X11R6/include/xorg/bstore.h
 ./usr/X11R6/include/xorg/bstorestr.h
 ./usr/X11R6/include/xorg/bt829.h
+./usr/X11R6/include/xorg/callback.h
 ./usr/X11R6/include/xorg/cfb8_16.h
 ./usr/X11R6/include/xorg/closestr.h
 ./usr/X11R6/include/xorg/closure.h
@@ -51,7 +52,6 @@
 ./usr/X11R6/include/xorg/input.h
 ./usr/X11R6/include/xorg/inputstr.h
 ./usr/X11R6/include/xorg/mi.h
-./usr/X11R6/include/xorg/mibank.h
 ./usr/X11R6/include/xorg/mibstore.h
 ./usr/X11R6/include/xorg/micmap.h
 ./usr/X11R6/include/xorg/micoord.h
@@ -162,6 +162,8 @@
 ./usr/X11R6/lib/modules/libexa.so
 ./usr/X11R6/lib/modules/libfb.la
 ./usr/X11R6/lib/modules/libfb.so
+./usr/X11R6/lib/modules/libfbdevhw.la
+./usr/X11R6/lib/modules/libfbdevhw.so
 ./usr/X11R6/lib/modules/libint10.la
 ./usr/X11R6/lib/modules/libint10.so
 ./usr/X11R6/lib/modules/libshadow.la
@@ -178,8 +180,6 @@
 ./usr/X11R6/lib/modules/libxaa.so
 ./usr/X11R6/lib/modules/libxf8_16bpp.la
 ./usr/X11R6/lib/modules/libxf8_16bpp.so
-./usr/X11R6/lib/modules/linux/libfbdevhw.la
-./usr/X11R6/lib/modules/linux/libfbdevhw.so
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.la
 ./usr/X11R6/lib/modules/multimedia/bt829_drv.so
 ./usr/X11R6/lib/modules/multimedia/fi1236_drv.la
@@ -214,6 +214,7 @@
 ./usr/X11R6/man/man5/xorg.conf.5
 ./usr/X11R6/man/man7/Xprint.7
 ./usr/X11R6/share/aclocal/xorg-server.m4
+./usr/X11R6/share/doc/xorg-server
 ./var/db/xkb
 ./var/db/xkb/README.compiled
 ./var/log