sync

18 files changed, 5 insertions, 16 deletions

diff --git a/distrib/sets/lists/xbase/md.alpha b/distrib/sets/lists/xbase/md.alpha
index eca948097..fcd52f49f 100644
--- a/distrib/sets/lists/xbase/md.alpha
+++ b/distrib/sets/lists/xbase/md.alpha
@@ -1027,7 +1027,6 @@
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
 ./usr/X11R6/man/man1/xfs.1
-./usr/X11R6/man/man1/xfsinfo.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 e593d3e19..f88427226 100644
--- a/distrib/sets/lists/xbase/md.amd64
+++ b/distrib/sets/lists/xbase/md.amd64
@@ -1055,7 +1055,6 @@
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
 ./usr/X11R6/man/man1/xfs.1
-./usr/X11R6/man/man1/xfsinfo.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 4f2c19396..e642c57a9 100644
--- a/distrib/sets/lists/xbase/md.armish
+++ b/distrib/sets/lists/xbase/md.armish
@@ -1027,7 +1027,6 @@
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
 ./usr/X11R6/man/man1/xfs.1
-./usr/X11R6/man/man1/xfsinfo.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 2ba0aafb6..1e6556411 100644
--- a/distrib/sets/lists/xbase/md.hp300
+++ b/distrib/sets/lists/xbase/md.hp300
@@ -1013,7 +1013,6 @@
 ./usr/X11R6/man/cat3/gluUnProject.0
 ./usr/X11R6/man/man1/bdftruncate.1
 ./usr/X11R6/man/man1/xfs.1
-./usr/X11R6/man/man1/xfsinfo.1
 ./var/cache/fontconfig/06967e83801ccef301685ecdd941333e-m68k.cache-2
 ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-m68k.cache-2
 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-m68k.cache-2
diff --git a/distrib/sets/lists/xbase/md.hppa b/distrib/sets/lists/xbase/md.hppa
index ace9a50d5..9bdd98b39 100644
--- a/distrib/sets/lists/xbase/md.hppa
+++ b/distrib/sets/lists/xbase/md.hppa
@@ -1012,7 +1012,6 @@
 ./usr/X11R6/man/cat3/gluTessVertex.0
 ./usr/X11R6/man/cat3/gluUnProject.0
 ./usr/X11R6/man/man1/xfs.1
-./usr/X11R6/man/man1/xfsinfo.1
 ./var/cache/fontconfig/06967e83801ccef301685ecdd941333e-ppc.cache-2
 ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-ppc.cache-2
 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-ppc.cache-2
diff --git a/distrib/sets/lists/xbase/md.i386 b/distrib/sets/lists/xbase/md.i386
index ab4deca7a..7902d4ee7 100644
--- a/distrib/sets/lists/xbase/md.i386
+++ b/distrib/sets/lists/xbase/md.i386
@@ -1059,7 +1059,6 @@
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
 ./usr/X11R6/man/man1/xfs.1
-./usr/X11R6/man/man1/xfsinfo.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 82211183d..639f4005d 100644
--- a/distrib/sets/lists/xbase/md.landisk
+++ b/distrib/sets/lists/xbase/md.landisk
@@ -1011,7 +1011,6 @@
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
 ./usr/X11R6/man/man1/xfs.1
-./usr/X11R6/man/man1/xfsinfo.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.mac68k b/distrib/sets/lists/xbase/md.mac68k
index cc91c72df..e11130245 100644
--- a/distrib/sets/lists/xbase/md.mac68k
+++ b/distrib/sets/lists/xbase/md.mac68k
@@ -598,6 +598,5 @@
 ./usr/X11R6/man/cat3/gluTessVertex.0
 ./usr/X11R6/man/cat3/gluUnProject.0
 ./usr/X11R6/man/man1/xfs.1
-./usr/X11R6/man/man1/xfsinfo.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 384eb2f3d..f79bc2427 100644
--- a/distrib/sets/lists/xbase/md.macppc
+++ b/distrib/sets/lists/xbase/md.macppc
@@ -1027,7 +1027,6 @@
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
 ./usr/X11R6/man/man1/xfs.1
-./usr/X11R6/man/man1/xfsinfo.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 839ca8888..a08e9191e 100644
--- a/distrib/sets/lists/xbase/md.mvme68k
+++ b/distrib/sets/lists/xbase/md.mvme68k
@@ -1024,7 +1024,6 @@
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
 ./usr/X11R6/man/man1/xfs.1
-./usr/X11R6/man/man1/xfsinfo.1
 ./var/cache/fontconfig/06967e83801ccef301685ecdd941333e-m68k.cache-2
 ./var/cache/fontconfig/0fe0af1d5898cfe43064332244d1dc15-m68k.cache-2
 ./var/cache/fontconfig/1bd20f0f0c9d7d1d5fd55b69fcc2b3a3-m68k.cache-2
diff --git a/distrib/sets/lists/xbase/md.mvme88k b/distrib/sets/lists/xbase/md.mvme88k
index 0d4135a51..2111b56b5 100644
--- a/distrib/sets/lists/xbase/md.mvme88k
+++ b/distrib/sets/lists/xbase/md.mvme88k
@@ -424,4 +424,3 @@
 ./usr/X11R6/man/cat3/XDGASetViewport.0
 ./usr/X11R6/man/cat3/XDGASync.0
 ./usr/X11R6/man/man1/xfs.1
-./usr/X11R6/man/man1/xfsinfo.1
diff --git a/distrib/sets/lists/xbase/md.sgi b/distrib/sets/lists/xbase/md.sgi
index f44a03604..64aa43ee6 100644
--- a/distrib/sets/lists/xbase/md.sgi
+++ b/distrib/sets/lists/xbase/md.sgi
@@ -998,7 +998,6 @@
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xfs.1
-./usr/X11R6/man/man1/xfsinfo.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.sparc b/distrib/sets/lists/xbase/md.sparc
index 9c553ee71..794b9eae5 100644
--- a/distrib/sets/lists/xbase/md.sparc
+++ b/distrib/sets/lists/xbase/md.sparc
@@ -1026,7 +1026,6 @@
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
 ./usr/X11R6/man/man1/xfs.1
-./usr/X11R6/man/man1/xfsinfo.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 6aac1d07f..bc4f1c3b8 100644
--- a/distrib/sets/lists/xbase/md.sparc64
+++ b/distrib/sets/lists/xbase/md.sparc64
@@ -1027,7 +1027,6 @@
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
 ./usr/X11R6/man/man1/xfs.1
-./usr/X11R6/man/man1/xfsinfo.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 7e90e8b9b..a7f7a003a 100644
--- a/distrib/sets/lists/xbase/md.vax
+++ b/distrib/sets/lists/xbase/md.vax
@@ -938,7 +938,6 @@
 ./usr/X11R6/man/man1/bdftruncate.1
 ./usr/X11R6/man/man1/dga.1
 ./usr/X11R6/man/man1/ucs2any.1
-./usr/X11R6/man/man1/xfsinfo.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.zaurus b/distrib/sets/lists/xbase/md.zaurus
index 4f2c19396..e642c57a9 100644
--- a/distrib/sets/lists/xbase/md.zaurus
+++ b/distrib/sets/lists/xbase/md.zaurus
@@ -1027,7 +1027,6 @@
 ./usr/X11R6/man/man1/ucs2any.1
 ./usr/X11R6/man/man1/xdriinfo.1
 ./usr/X11R6/man/man1/xfs.1
-./usr/X11R6/man/man1/xfsinfo.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 3229fb1ef..3a1b08d58 100644
--- a/distrib/sets/lists/xbase/mi
+++ b/distrib/sets/lists/xbase/mi
@@ -284,6 +284,7 @@
 ./usr/X11R6/man/cat5
 ./usr/X11R6/man/cat7
 ./usr/X11R6/man/man1
+./usr/X11R6/man/man1/xfsinfo.1
 ./usr/X11R6/man/man3
 ./usr/X11R6/man/man4
 ./usr/X11R6/man/man5
diff --git a/distrib/sets/lists/xshare/mi b/distrib/sets/lists/xshare/mi
index aaabab00c..cd1633a40 100644
--- a/distrib/sets/lists/xshare/mi
+++ b/distrib/sets/lists/xshare/mi
@@ -2553,6 +2553,10 @@
 ./usr/X11R6/share/X11/locale/C/Compose
 ./usr/X11R6/share/X11/locale/C/XI18N_OBJS
 ./usr/X11R6/share/X11/locale/C/XLC_LOCALE
+./usr/X11R6/share/X11/locale/am_ET.UTF-8
+./usr/X11R6/share/X11/locale/am_ET.UTF-8/Compose
+./usr/X11R6/share/X11/locale/am_ET.UTF-8/XI18N_OBJS
+./usr/X11R6/share/X11/locale/am_ET.UTF-8/XLC_LOCALE
 ./usr/X11R6/share/X11/locale/armscii-8
 ./usr/X11R6/share/X11/locale/armscii-8/Compose
 ./usr/X11R6/share/X11/locale/armscii-8/XI18N_OBJS