sync

17 files changed, 60 insertions, 44 deletions

diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index 5cf468863..04bf300cc 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -408,6 +408,7 @@
 ./usr/X11R6/bin/glxinfo
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/bin/xdriinfo
+./usr/X11R6/bin/xfs
 ./usr/X11R6/include/GL
 ./usr/X11R6/include/GL/GLwDrawA.h
 ./usr/X11R6/include/GL/GLwDrawAP.h
@@ -523,9 +524,11 @@
 ./usr/X11R6/lib/libdrm.la
 ./usr/X11R6/lib/libdrm.so.2.3
 ./usr/X11R6/lib/libexpat.so.8.0
+./usr/X11R6/lib/libexpat_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.14.0
+./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
@@ -1062,6 +1065,7 @@
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
+./usr/X11R6/man/man1/xfs.1
 ./usr/X11R6/man/man3/XDGA.3
 ./usr/X11R6/man/man3/XDGAChangePixmapMode.3
 ./usr/X11R6/man/man3/XDGACloseFramebuffer.3
diff --git a/distrib/sets/lists/xbase/md.amd64 b/distrib/sets/lists/xbase/md.amd64
index 5cf468863..04bf300cc 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -408,6 +408,7 @@
 ./usr/X11R6/bin/glxinfo
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/bin/xdriinfo
+./usr/X11R6/bin/xfs
 ./usr/X11R6/include/GL
 ./usr/X11R6/include/GL/GLwDrawA.h
 ./usr/X11R6/include/GL/GLwDrawAP.h
@@ -523,9 +524,11 @@
 ./usr/X11R6/lib/libdrm.la
 ./usr/X11R6/lib/libdrm.so.2.3
 ./usr/X11R6/lib/libexpat.so.8.0
+./usr/X11R6/lib/libexpat_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.14.0
+./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
@@ -1062,6 +1065,7 @@
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
+./usr/X11R6/man/man1/xfs.1
 ./usr/X11R6/man/man3/XDGA.3
 ./usr/X11R6/man/man3/XDGAChangePixmapMode.3
 ./usr/X11R6/man/man3/XDGACloseFramebuffer.3
diff --git a/distrib/sets/lists/xbase/md.armish b/distrib/sets/lists/xbase/md.armish
index 8d9c2413a..ae8626366 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -408,6 +408,7 @@
 ./usr/X11R6/bin/glxinfo
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/bin/xdriinfo
+./usr/X11R6/bin/xfs
 ./usr/X11R6/include/GL
 ./usr/X11R6/include/GL/GLwDrawA.h
 ./usr/X11R6/include/GL/GLwDrawAP.h
@@ -506,9 +507,11 @@
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
 ./usr/X11R6/lib/libexpat.so.8.0
+./usr/X11R6/lib/libexpat_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.14.0
+./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
@@ -1043,6 +1046,7 @@
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
+./usr/X11R6/man/man1/xfs.1
 ./usr/X11R6/man/man3/XDGA.3
 ./usr/X11R6/man/man3/XDGAChangePixmapMode.3
 ./usr/X11R6/man/man3/XDGACloseFramebuffer.3
diff --git a/distrib/sets/lists/xbase/md.hp300 b/distrib/sets/lists/xbase/md.hp300
index 122415577..fa61b6228 100644
--- a/distrib/sets/lists/xbase/md.hp300
+++ b/distrib/sets/lists/xbase/md.hp300
@@ -482,6 +482,7 @@
 ./usr/X11R6/bin/gtf
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/bin/xdriinfo
+./usr/X11R6/bin/xfs
 ./usr/X11R6/bin/xrx
 ./usr/X11R6/include/GL
 ./usr/X11R6/include/GL/GLwDrawA.h
@@ -589,9 +590,11 @@
 ./usr/X11R6/lib/libXxf86vm.so.4.0
 ./usr/X11R6/lib/libexpat.so.5.0
 ./usr/X11R6/lib/libexpat.so.8.0
+./usr/X11R6/lib/libexpat_pic.a
 ./usr/X11R6/lib/libfontconfig.so.3.0
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.13.1
+./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liboldX.so.9.0
 ./usr/X11R6/lib/libxf86config.a
 ./usr/X11R6/lib/libxkbfile.so.3.0
@@ -1169,5 +1172,6 @@
 ./usr/X11R6/man/cat3/gluTessVertex.0
 ./usr/X11R6/man/cat3/gluUnProject.0
 ./usr/X11R6/man/cat7/Xprint.0
+./usr/X11R6/man/man1/xfs.1
 ./var/db/xkb
 ./var/db/xkb/README
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index 5e4f668a6..e918e5c21 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -407,6 +407,7 @@
 ./usr/X11R6/bin/glxgears
 ./usr/X11R6/bin/glxinfo
 ./usr/X11R6/bin/xdriinfo
+./usr/X11R6/bin/xfs
 ./usr/X11R6/include/GL
 ./usr/X11R6/include/GL/GLwDrawA.h
 ./usr/X11R6/include/GL/GLwDrawAP.h
@@ -487,9 +488,11 @@
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
 ./usr/X11R6/lib/libexpat.so.8.0
+./usr/X11R6/lib/libexpat_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.14.0
+./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
@@ -1020,4 +1023,5 @@
 ./usr/X11R6/man/cat3/gluTessProperty.0
 ./usr/X11R6/man/cat3/gluTessVertex.0
 ./usr/X11R6/man/cat3/gluUnProject.0
+./usr/X11R6/man/man1/xfs.1
 ./var/db/xkb
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index 5cf468863..04bf300cc 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -408,6 +408,7 @@
 ./usr/X11R6/bin/glxinfo
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/bin/xdriinfo
+./usr/X11R6/bin/xfs
 ./usr/X11R6/include/GL
 ./usr/X11R6/include/GL/GLwDrawA.h
 ./usr/X11R6/include/GL/GLwDrawAP.h
@@ -523,9 +524,11 @@
 ./usr/X11R6/lib/libdrm.la
 ./usr/X11R6/lib/libdrm.so.2.3
 ./usr/X11R6/lib/libexpat.so.8.0
+./usr/X11R6/lib/libexpat_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.14.0
+./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
@@ -1062,6 +1065,7 @@
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
+./usr/X11R6/man/man1/xfs.1
 ./usr/X11R6/man/man3/XDGA.3
 ./usr/X11R6/man/man3/XDGAChangePixmapMode.3
 ./usr/X11R6/man/man3/XDGACloseFramebuffer.3
diff --git a/distrib/sets/lists/xbase/md.landisk b/distrib/sets/lists/xbase/md.landisk
index 684f5263f..0b068f8d6 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -437,52 +437,11 @@
 ./usr/X11R6/include/freetype2/freetype/ftwinfnt.h
 ./usr/X11R6/include/ft2build.h
 ./usr/X11R6/include/xorg
-./usr/X11R6/lib/libFS.so.8.0
 ./usr/X11R6/lib/libGL.a
 ./usr/X11R6/lib/libGLU.a
 ./usr/X11R6/lib/libGLw.a
-./usr/X11R6/lib/libICE.so.8.1
-./usr/X11R6/lib/libSM.so.8.0
-./usr/X11R6/lib/libX11.so.10.0
-./usr/X11R6/lib/libXRes.so.4.0
-./usr/X11R6/lib/libXTrap.so.10.0
-./usr/X11R6/lib/libXau.so.9.0
-./usr/X11R6/lib/libXaw.so.11.0
-./usr/X11R6/lib/libXaw.so.12.0
-./usr/X11R6/lib/libXaw7.so.11.0
-./usr/X11R6/lib/libXaw8.so.12.0
-./usr/X11R6/lib/libXcomposite.so.3.0
-./usr/X11R6/lib/libXcursor.so.4.0
-./usr/X11R6/lib/libXdamage.so.3.0
-./usr/X11R6/lib/libXdmcp.so.9.0
-./usr/X11R6/lib/libXevie.so.2.0
-./usr/X11R6/lib/libXext.so.10.0
-./usr/X11R6/lib/libXfixes.so.5.0
-./usr/X11R6/lib/libXfontcache.so.4.0
-./usr/X11R6/lib/libXi.so.10.0
-./usr/X11R6/lib/libXinerama.so.5.0
-./usr/X11R6/lib/libXmu.so.10.0
-./usr/X11R6/lib/libXmuu.so.5.0
-./usr/X11R6/lib/libXp.so.10.0
-./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/libXrender.so.5.0
-./usr/X11R6/lib/libXss.so.5.0
-./usr/X11R6/lib/libXt.so.10.0
-./usr/X11R6/lib/libXtst.so.10.0
-./usr/X11R6/lib/libXv.so.5.0
-./usr/X11R6/lib/libXvMC.so.5.0
-./usr/X11R6/lib/libXvMCW.so.1.0
 ./usr/X11R6/lib/libXxf86dga.a
 ./usr/X11R6/lib/libXxf86dga.la
-./usr/X11R6/lib/libXxf86dga.so.5.0
-./usr/X11R6/lib/libXxf86misc.so.5.0
-./usr/X11R6/lib/libXxf86vm.so.5.0
-./usr/X11R6/lib/libdmx.so.1.0
-./usr/X11R6/lib/liboldX.so.10.0
-./usr/X11R6/lib/libxkbfile.so.4.0
 ./usr/X11R6/man/cat1/glxgears.0
 ./usr/X11R6/man/cat1/glxinfo.0
 ./usr/X11R6/man/cat3/GLwCreateMDrawingArea.0
diff --git a/distrib/sets/lists/xbase/md.mac68k b/distrib/sets/lists/xbase/md.mac68k
index 783694726..c59663deb 100644
--- a/distrib/sets/lists/xbase/md.mac68k
+++ b/distrib/sets/lists/xbase/md.mac68k
@@ -416,6 +416,7 @@
 ./usr/X11R6/bin/gtf
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/bin/xdriinfo
+./usr/X11R6/bin/xfs
 ./usr/X11R6/bin/xrx
 ./usr/X11R6/include/GL
 ./usr/X11R6/include/GL/GLwDrawA.h
@@ -481,9 +482,11 @@
 ./usr/X11R6/lib/libXxf86vm.so.4.0
 ./usr/X11R6/lib/libexpat.so.5.0
 ./usr/X11R6/lib/libexpat.so.8.0
+./usr/X11R6/lib/libexpat_pic.a
 ./usr/X11R6/lib/libfontconfig.so.3.0
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.13.1
+./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liboldX.so.9.0
 ./usr/X11R6/lib/libxf86config.a
 ./usr/X11R6/lib/libxkbfile.so.3.0
@@ -1020,5 +1023,6 @@
 ./usr/X11R6/man/cat3/gluTessProperty.0
 ./usr/X11R6/man/cat3/gluTessVertex.0
 ./usr/X11R6/man/cat3/gluUnProject.0
+./usr/X11R6/man/man1/xfs.1
 ./var/db/xkb
 ./var/db/xkb/README
diff --git a/distrib/sets/lists/xbase/md.macppc b/distrib/sets/lists/xbase/md.macppc
index 5cf468863..04bf300cc 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -408,6 +408,7 @@
 ./usr/X11R6/bin/glxinfo
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/bin/xdriinfo
+./usr/X11R6/bin/xfs
 ./usr/X11R6/include/GL
 ./usr/X11R6/include/GL/GLwDrawA.h
 ./usr/X11R6/include/GL/GLwDrawAP.h
@@ -523,9 +524,11 @@
 ./usr/X11R6/lib/libdrm.la
 ./usr/X11R6/lib/libdrm.so.2.3
 ./usr/X11R6/lib/libexpat.so.8.0
+./usr/X11R6/lib/libexpat_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.14.0
+./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
@@ -1062,6 +1065,7 @@
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
+./usr/X11R6/man/man1/xfs.1
 ./usr/X11R6/man/man3/XDGA.3
 ./usr/X11R6/man/man3/XDGAChangePixmapMode.3
 ./usr/X11R6/man/man3/XDGACloseFramebuffer.3
diff --git a/distrib/sets/lists/xbase/md.mvme68k b/distrib/sets/lists/xbase/md.mvme68k
index 81a7d1d04..287b5e083 100644
--- a/distrib/sets/lists/xbase/md.mvme68k
+++ b/distrib/sets/lists/xbase/md.mvme68k
@@ -408,6 +408,7 @@
 ./usr/X11R6/bin/glxinfo
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/bin/xdriinfo
+./usr/X11R6/bin/xfs
 ./usr/X11R6/include/GL
 ./usr/X11R6/include/GL/GLwDrawA.h
 ./usr/X11R6/include/GL/GLwDrawAP.h
@@ -487,9 +488,11 @@
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
 ./usr/X11R6/lib/libexpat.so.8.0
+./usr/X11R6/lib/libexpat_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.14.0
+./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
@@ -1023,3 +1026,4 @@
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
+./usr/X11R6/man/man1/xfs.1
diff --git a/distrib/sets/lists/xbase/md.mvme88k b/distrib/sets/lists/xbase/md.mvme88k
index 939d5b660..8da68a41a 100644
--- a/distrib/sets/lists/xbase/md.mvme88k
+++ b/distrib/sets/lists/xbase/md.mvme88k
@@ -15,6 +15,7 @@
 ./usr/X11R6/bin/bdftruncate
 ./usr/X11R6/bin/dga
 ./usr/X11R6/bin/ucs2any
+./usr/X11R6/bin/xfs
 ./usr/X11R6/include/X11/extensions/xf86dga.h
 ./usr/X11R6/include/X11/extensions/xf86dga1.h
 ./usr/X11R6/include/X11/extensions/xf86dga1str.h
@@ -405,6 +406,8 @@
 ./usr/X11R6/lib/libXaw7.so.11.0
 ./usr/X11R6/lib/libXfontcache.so.4.0
 ./usr/X11R6/lib/libXxf86dga.a
+./usr/X11R6/lib/libexpat_pic.a
+./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/man/cat1/XDarwin.0
 ./usr/X11R6/man/cat1/bdftruncate.0
 ./usr/X11R6/man/cat1/dga.0
@@ -474,3 +477,4 @@
 ./usr/X11R6/man/cat4/ur98.0
 ./usr/X11R6/man/cat4/v4l.0
 ./usr/X11R6/man/cat7/Xprint.0
+./usr/X11R6/man/man1/xfs.1
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index 77ab6e754..881289910 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -18,6 +18,7 @@
 ./usr/X11R6/bin/glxinfo
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/bin/xdriinfo
+./usr/X11R6/bin/xfs
 ./usr/X11R6/bin/xrx
 ./usr/X11R6/include/GL
 ./usr/X11R6/include/GL/GLwDrawA.h
@@ -447,9 +448,11 @@
 ./usr/X11R6/lib/libXxf86vm.so.4.0
 ./usr/X11R6/lib/libexpat.so.5.0
 ./usr/X11R6/lib/libexpat.so.8.0
+./usr/X11R6/lib/libexpat_pic.a
 ./usr/X11R6/lib/libfontconfig.so.3.0
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.13.1
+./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liboldX.so.9.0
 ./usr/X11R6/lib/libxkbfile.so.3.0
 ./usr/X11R6/lib/libxkbui.so.3.0
@@ -1053,3 +1056,4 @@
 ./usr/X11R6/man/cat4/ur98.0
 ./usr/X11R6/man/cat4/v4l.0
 ./usr/X11R6/man/cat7/Xprint.0
+./usr/X11R6/man/man1/xfs.1
diff --git a/distrib/sets/lists/xbase/md.sparc b/distrib/sets/lists/xbase/md.sparc
index 8d9c2413a..ae8626366 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -408,6 +408,7 @@
 ./usr/X11R6/bin/glxinfo
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/bin/xdriinfo
+./usr/X11R6/bin/xfs
 ./usr/X11R6/include/GL
 ./usr/X11R6/include/GL/GLwDrawA.h
 ./usr/X11R6/include/GL/GLwDrawAP.h
@@ -506,9 +507,11 @@
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
 ./usr/X11R6/lib/libexpat.so.8.0
+./usr/X11R6/lib/libexpat_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.14.0
+./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
@@ -1043,6 +1046,7 @@
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
+./usr/X11R6/man/man1/xfs.1
 ./usr/X11R6/man/man3/XDGA.3
 ./usr/X11R6/man/man3/XDGAChangePixmapMode.3
 ./usr/X11R6/man/man3/XDGACloseFramebuffer.3
diff --git a/distrib/sets/lists/xbase/md.sparc64 b/distrib/sets/lists/xbase/md.sparc64
index 4b25e8c30..76ebedb32 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -408,6 +408,7 @@
 ./usr/X11R6/bin/glxinfo
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/bin/xdriinfo
+./usr/X11R6/bin/xfs
 ./usr/X11R6/include/GL
 ./usr/X11R6/include/GL/GLwDrawA.h
 ./usr/X11R6/include/GL/GLwDrawAP.h
@@ -523,9 +524,11 @@
 ./usr/X11R6/lib/libdrm.la
 ./usr/X11R6/lib/libdrm.so.2.3
 ./usr/X11R6/lib/libexpat.so.8.0
+./usr/X11R6/lib/libexpat_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.14.0
+./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
@@ -1061,6 +1064,7 @@
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
+./usr/X11R6/man/man1/xfs.1
 ./usr/X11R6/man/man3/XDGA.3
 ./usr/X11R6/man/man3/XDGAChangePixmapMode.3
 ./usr/X11R6/man/man3/XDGACloseFramebuffer.3
diff --git a/distrib/sets/lists/xbase/md.vax b/distrib/sets/lists/xbase/md.vax
index 884385860..51b26460b 100644
--- a/distrib/sets/lists/xbase/md.vax
+++ b/distrib/sets/lists/xbase/md.vax
@@ -412,6 +412,7 @@
 ./etc/X11/xsm
 ./usr/X11R6/bin/bdftruncate
 ./usr/X11R6/bin/ucs2any
+./usr/X11R6/bin/xfs
 ./usr/X11R6/include/X11/bitmaps/card.xbm
 ./usr/X11R6/include/X11/bitmaps/down.xbm
 ./usr/X11R6/include/X11/bitmaps/keyboard.xbm
@@ -480,6 +481,8 @@
 ./usr/X11R6/lib/X11/etc/sun.termcap
 ./usr/X11R6/lib/X11/etc/sun.terminfo
 ./usr/X11R6/lib/X11/etc/xmodmap.std
+./usr/X11R6/lib/libexpat_pic.a
+./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/libxf86config.a
 ./usr/X11R6/man/cat1/bdftruncate.0
 ./usr/X11R6/man/cat1/ucs2any.0
@@ -515,4 +518,5 @@
 ./usr/X11R6/man/cat3/XF86VidModeSwitchToMode.0
 ./usr/X11R6/man/cat3/XF86VidModeValidateModeLine.0
 ./usr/X11R6/man/cat7/Xprint.0
+./usr/X11R6/man/man1/xfs.1
 ./var/db/xkb
diff --git a/distrib/sets/lists/xbase/md.zaurus b/distrib/sets/lists/xbase/md.zaurus
index 8d9c2413a..ae8626366 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -408,6 +408,7 @@
 ./usr/X11R6/bin/glxinfo
 ./usr/X11R6/bin/ucs2any
 ./usr/X11R6/bin/xdriinfo
+./usr/X11R6/bin/xfs
 ./usr/X11R6/include/GL
 ./usr/X11R6/include/GL/GLwDrawA.h
 ./usr/X11R6/include/GL/GLwDrawAP.h
@@ -506,9 +507,11 @@
 ./usr/X11R6/lib/libXxf86vm.so.5.0
 ./usr/X11R6/lib/libdmx.so.1.0
 ./usr/X11R6/lib/libexpat.so.8.0
+./usr/X11R6/lib/libexpat_pic.a
 ./usr/X11R6/lib/libfontconfig.so.5.1
 ./usr/X11R6/lib/libfontenc.so.3.0
 ./usr/X11R6/lib/libfreetype.so.14.0
+./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.so.1.0
 ./usr/X11R6/lib/liboldX.so.10.0
 ./usr/X11R6/lib/libxkbfile.so.4.0
@@ -1043,6 +1046,7 @@
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
+./usr/X11R6/man/man1/xfs.1
 ./usr/X11R6/man/man3/XDGA.3
 ./usr/X11R6/man/man3/XDGAChangePixmapMode.3
 ./usr/X11R6/man/man3/XDGACloseFramebuffer.3
diff --git a/distrib/sets/lists/xbase/mi b/distrib/sets/lists/xbase/mi
index e15037c31..f3939eb37 100644
--- a/distrib/sets/lists/xbase/mi
+++ b/distrib/sets/lists/xbase/mi
@@ -74,7 +74,6 @@
 ./usr/X11R6/bin/xfd
 ./usr/X11R6/bin/xfindproxy
 ./usr/X11R6/bin/xfontsel
-./usr/X11R6/bin/xfs
 ./usr/X11R6/bin/xfsinfo
 ./usr/X11R6/bin/xft-config
 ./usr/X11R6/bin/xfwp
@@ -245,13 +244,11 @@
 ./usr/X11R6/lib/libdmx.a
 ./usr/X11R6/lib/libdmx.la
 ./usr/X11R6/lib/libexpat.a
-./usr/X11R6/lib/libexpat_pic.a
 ./usr/X11R6/lib/libfontconfig.a
 ./usr/X11R6/lib/libfontconfig.la
 ./usr/X11R6/lib/libfontenc.a
 ./usr/X11R6/lib/libfontenc.la
 ./usr/X11R6/lib/libfreetype.a
-./usr/X11R6/lib/libfreetype_pic.a
 ./usr/X11R6/lib/liblbxutil.a
 ./usr/X11R6/lib/liblbxutil.la
 ./usr/X11R6/lib/liboldX.a