sync

5 files changed, 204 insertions, 372 deletions

diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index cf3edb4b344..fc5160b1f47 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -10,14 +10,14 @@
 ./usr/lib/libc.so.21.2
 ./usr/lib/libc_r.so.0.0
 ./usr/lib/libcrypto.so.1.0
-./usr/lib/libcurses.so.5.1
 ./usr/lib/libcurses++.so.1.0
+./usr/lib/libcurses.so.5.1
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
 ./usr/lib/libform.so.1.1
-./usr/lib/libg++.so.28.0
+./usr/lib/libg2c.so.5.24
 ./usr/lib/libi386.so.0.2
-./usr/lib/libiberty.so.0.1
+./usr/lib/libiberty.so.0.2
 ./usr/lib/libkadm.so.5.0
 ./usr/lib/libkafs.so.5.1
 ./usr/lib/libkdb.so.5.0
@@ -26,16 +26,16 @@
 ./usr/lib/libm.so.0.1
 ./usr/lib/libm_i387.so.0.1
 ./usr/lib/libmenu.so.1.1
+./usr/lib/libobjc.so.0.0
 ./usr/lib/libocurses.so.3.0
 ./usr/lib/libossaudio.so.0.0
 ./usr/lib/libotermcap.so.3.0
 ./usr/lib/libpanel.so.1.1
 ./usr/lib/libpcap.so.0.2
 ./usr/lib/libresolv.so.2.0
-./usr/lib/librx.so.0.1
 ./usr/lib/libskey.so.1.0
 ./usr/lib/libssl.so.1.0
-./usr/lib/libstdc++.so.28.0
+./usr/lib/libstdc++.so.29.0
 ./usr/lib/libtermcap.so.5.1
 ./usr/lib/libtermlib.so.5.1
 ./usr/lib/libutil.so.4.2
@@ -370,6 +370,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/err.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/errno.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/eti.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/f2c.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/fcntl.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/float.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/fnmatch.ph
@@ -612,6 +613,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/sys/socketvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/sys/sockio.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/sys/stat.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/sys/swap.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/sys/syscall.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/sys/syscallargs.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/sys/sysctl.ph
@@ -652,6 +654,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/tar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/tcpd.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/term.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/termcap.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/termios.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/time.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/ttyent.ph
@@ -700,5 +703,3 @@
 ./usr/share/misc/pcvtfonts/vt220l.810
 ./usr/share/misc/pcvtfonts/vt220l.814
 ./usr/share/misc/pcvtfonts/vt220l.816
-./usr/libdata/perl5/site_perl/i386-openbsd/termcap.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/sys/swap.ph
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 5b0732f9f94..71a71d4fd65 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -214,7 +214,6 @@
 ./usr/bin/getconf
 ./usr/bin/getopt
 ./usr/bin/gnubc
-./usr/bin/gperf
 ./usr/bin/grep
 ./usr/bin/grodvi
 ./usr/bin/groff
@@ -2616,3 +2615,4 @@
 ./var/yp/README
 ./sbin/swapctl
 ./usr/bin/keynote
+./usr/bin/c++filt
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index e8dc04266c9..101162aac73 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -66,35 +66,25 @@
 ./usr/include/readline/chardefs.h
 ./usr/include/readline/keymaps.h
 ./usr/include/readline/readline.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.8.1
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.8.1/SYSCALLS.c.X
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.8.1/cc1
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.8.1/cc1obj
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.8.1/cc1plus
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.8.1/cpp
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.8.1/f771
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.8.1/include
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.8.1/include/README
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.8.1/include/f2c.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.8.1/include/float.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.8.1/include/limits.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.8.1/include/objc
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.8.1/include/objc/NXConstStr.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.8.1/include/objc/Object.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.8.1/include/objc/Protocol.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.8.1/include/objc/encoding.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.8.1/include/objc/hash.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.8.1/include/objc/objc-api.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.8.1/include/objc/objc-list.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.8.1/include/objc/objc.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.8.1/include/objc/sarray.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.8.1/include/objc/thr.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.8.1/include/objc/typedstream.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.8.1/include/syslimits.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.8.1/libf2c.a
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.8.1/libgcc.a
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.8.1/libobjc.a
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.8.1/specs
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/egcs-2.93.22
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/egcs-2.93.22/SYSCALLS.c.X
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/egcs-2.93.22/cc1
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/egcs-2.93.22/cc1obj
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/egcs-2.93.22/cc1plus
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/egcs-2.93.22/collect2
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/egcs-2.93.22/cpp
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/egcs-2.93.22/f771
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/egcs-2.93.22/include
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/egcs-2.93.22/include/README
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/egcs-2.93.22/include/exception
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/egcs-2.93.22/include/float.h
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/egcs-2.93.22/include/limits.h
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/egcs-2.93.22/include/new
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/egcs-2.93.22/include/new.h
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/egcs-2.93.22/include/syslimits.h
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/egcs-2.93.22/include/typeinfo
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/egcs-2.93.22/libgcc.a
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/egcs-2.93.22/specs
 ./usr/lib/libacl_pic.a
 ./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
@@ -104,7 +94,6 @@
 ./usr/lib/libdes_pic.a
 ./usr/lib/libedit_pic.a
 ./usr/lib/libform_pic.a
-./usr/lib/libg++_pic.a
 ./usr/lib/libi386.a
 ./usr/lib/libi386_p.a
 ./usr/lib/libi386_pic.a
@@ -131,7 +120,6 @@
 ./usr/lib/libpcap_pic.a
 ./usr/lib/libreadline.a
 ./usr/lib/libresolv_pic.a
-./usr/lib/librx_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libssl_pic.a
 ./usr/lib/libstdc++_pic.a
@@ -157,3 +145,5 @@
 ./usr/share/man/cat3/dlsym.0
 ./usr/share/man/cat3/keycap.0
 ./usr/lib/libcurses++_pic.a
+./usr/lib/libg2c_pic.a
+./usr/lib/libobjc_pic.a
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 6eddf55c05b..e3589467d17 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -6,7 +6,6 @@
 ./usr/bin/asa
 ./usr/bin/c++
 ./usr/bin/cc
-./usr/bin/f77
 ./usr/bin/flex
 ./usr/bin/flex++
 ./usr/bin/fpr
@@ -14,7 +13,6 @@
 ./usr/bin/g77
 ./usr/bin/gcc
 ./usr/bin/gcov
-./usr/bin/genclass
 ./usr/bin/gprof
 ./usr/bin/ld
 ./usr/bin/lex
@@ -373,322 +371,6 @@
 ./usr/include/frame.h
 ./usr/include/fstab.h
 ./usr/include/fts.h
-./usr/include/g++/ACG.h
-./usr/include/g++/AllocRing.h
-./usr/include/g++/Binomial.h
-./usr/include/g++/BitSet.h
-./usr/include/g++/BitString.h
-./usr/include/g++/Complex.h
-./usr/include/g++/CursesW.h
-./usr/include/g++/DLList.h
-./usr/include/g++/DiscUnif.h
-./usr/include/g++/Erlang.h
-./usr/include/g++/Fix.h
-./usr/include/g++/Fix16.h
-./usr/include/g++/Fix24.h
-./usr/include/g++/FlexLexer.h
-./usr/include/g++/Geom.h
-./usr/include/g++/GetOpt.h
-./usr/include/g++/HypGeom.h
-./usr/include/g++/Incremental.h
-./usr/include/g++/Integer.h
-./usr/include/g++/LogNorm.h
-./usr/include/g++/MLCG.h
-./usr/include/g++/NegExp.h
-./usr/include/g++/Normal.h
-./usr/include/g++/Obstack.h
-./usr/include/g++/Pix.h
-./usr/include/g++/PlotFile.h
-./usr/include/g++/Poisson.h
-./usr/include/g++/RNG.h
-./usr/include/g++/Random.h
-./usr/include/g++/Rational.h
-./usr/include/g++/Regex.h
-./usr/include/g++/RndInt.h
-./usr/include/g++/SFile.h
-./usr/include/g++/SLList.h
-./usr/include/g++/SmplHist.h
-./usr/include/g++/SmplStat.h
-./usr/include/g++/String.h
-./usr/include/g++/Uniform.h
-./usr/include/g++/Weibull.h
-./usr/include/g++/_G_config.h
-./usr/include/g++/algo.h
-./usr/include/g++/algobase.h
-./usr/include/g++/algorithm
-./usr/include/g++/alloc.h
-./usr/include/g++/bitdo1.h
-./usr/include/g++/bitdo2.h
-./usr/include/g++/bitprims.h
-./usr/include/g++/bool.h
-./usr/include/g++/builtin.h
-./usr/include/g++/builtinbuf.h
-./usr/include/g++/bvector.h
-./usr/include/g++/cassert
-./usr/include/g++/cctype
-./usr/include/g++/cerrno
-./usr/include/g++/cfloat
-./usr/include/g++/ciso646
-./usr/include/g++/climits
-./usr/include/g++/clocale
-./usr/include/g++/cmath
-./usr/include/g++/compare.h
-./usr/include/g++/complex
-./usr/include/g++/complex.h
-./usr/include/g++/csetjmp
-./usr/include/g++/csignal
-./usr/include/g++/cstdarg
-./usr/include/g++/cstddef
-./usr/include/g++/cstdio
-./usr/include/g++/cstdlib
-./usr/include/g++/cstring
-./usr/include/g++/ctime
-./usr/include/g++/cwchar
-./usr/include/g++/cwctype
-./usr/include/g++/defalloc.h
-./usr/include/g++/deque
-./usr/include/g++/deque.h
-./usr/include/g++/dummy.h
-./usr/include/g++/editbuf.h
-./usr/include/g++/exception
-./usr/include/g++/floatio.h
-./usr/include/g++/fstream
-./usr/include/g++/fstream.h
-./usr/include/g++/function.h
-./usr/include/g++/functional
-./usr/include/g++/gen/AVLMap.ccP
-./usr/include/g++/gen/AVLMap.hP
-./usr/include/g++/gen/AVLSet.ccP
-./usr/include/g++/gen/AVLSet.hP
-./usr/include/g++/gen/AVec.ccP
-./usr/include/g++/gen/AVec.hP
-./usr/include/g++/gen/BSTSet.ccP
-./usr/include/g++/gen/BSTSet.hP
-./usr/include/g++/gen/Bag.ccP
-./usr/include/g++/gen/Bag.hP
-./usr/include/g++/gen/CHBag.ccP
-./usr/include/g++/gen/CHBag.hP
-./usr/include/g++/gen/CHMap.ccP
-./usr/include/g++/gen/CHMap.hP
-./usr/include/g++/gen/CHNode.ccP
-./usr/include/g++/gen/CHNode.hP
-./usr/include/g++/gen/CHSet.ccP
-./usr/include/g++/gen/CHSet.hP
-./usr/include/g++/gen/DLDeque.ccP
-./usr/include/g++/gen/DLDeque.hP
-./usr/include/g++/gen/DLList.ccP
-./usr/include/g++/gen/DLList.hP
-./usr/include/g++/gen/Deque.ccP
-./usr/include/g++/gen/Deque.hP
-./usr/include/g++/gen/FPQueue.ccP
-./usr/include/g++/gen/FPQueue.hP
-./usr/include/g++/gen/FPStack.ccP
-./usr/include/g++/gen/FPStack.hP
-./usr/include/g++/gen/FPlex.ccP
-./usr/include/g++/gen/FPlex.hP
-./usr/include/g++/gen/List.ccP
-./usr/include/g++/gen/List.hP
-./usr/include/g++/gen/MPlex.ccP
-./usr/include/g++/gen/MPlex.hP
-./usr/include/g++/gen/Map.ccP
-./usr/include/g++/gen/Map.hP
-./usr/include/g++/gen/OSLBag.ccP
-./usr/include/g++/gen/OSLBag.hP
-./usr/include/g++/gen/OSLSet.ccP
-./usr/include/g++/gen/OSLSet.hP
-./usr/include/g++/gen/OXPBag.ccP
-./usr/include/g++/gen/OXPBag.hP
-./usr/include/g++/gen/OXPSet.ccP
-./usr/include/g++/gen/OXPSet.hP
-./usr/include/g++/gen/PHPQ.ccP
-./usr/include/g++/gen/PHPQ.hP
-./usr/include/g++/gen/PQ.ccP
-./usr/include/g++/gen/PQ.hP
-./usr/include/g++/gen/PSList.hP
-./usr/include/g++/gen/PVec.hP
-./usr/include/g++/gen/Plex.ccP
-./usr/include/g++/gen/Plex.hP
-./usr/include/g++/gen/Queue.ccP
-./usr/include/g++/gen/Queue.hP
-./usr/include/g++/gen/RAVLMap.ccP
-./usr/include/g++/gen/RAVLMap.hP
-./usr/include/g++/gen/RPlex.ccP
-./usr/include/g++/gen/RPlex.hP
-./usr/include/g++/gen/SLBag.ccP
-./usr/include/g++/gen/SLBag.hP
-./usr/include/g++/gen/SLList.ccP
-./usr/include/g++/gen/SLList.hP
-./usr/include/g++/gen/SLQueue.ccP
-./usr/include/g++/gen/SLQueue.hP
-./usr/include/g++/gen/SLSet.ccP
-./usr/include/g++/gen/SLSet.hP
-./usr/include/g++/gen/SLStack.ccP
-./usr/include/g++/gen/SLStack.hP
-./usr/include/g++/gen/Set.ccP
-./usr/include/g++/gen/Set.hP
-./usr/include/g++/gen/SkipBag.ccP
-./usr/include/g++/gen/SkipBag.hP
-./usr/include/g++/gen/SkipMap.ccP
-./usr/include/g++/gen/SkipMap.hP
-./usr/include/g++/gen/SkipSet.ccP
-./usr/include/g++/gen/SkipSet.hP
-./usr/include/g++/gen/SplayBag.ccP
-./usr/include/g++/gen/SplayBag.hP
-./usr/include/g++/gen/SplayMap.ccP
-./usr/include/g++/gen/SplayMap.hP
-./usr/include/g++/gen/SplayNode.ccP
-./usr/include/g++/gen/SplayNode.hP
-./usr/include/g++/gen/SplayPQ.ccP
-./usr/include/g++/gen/SplayPQ.hP
-./usr/include/g++/gen/SplaySet.ccP
-./usr/include/g++/gen/SplaySet.hP
-./usr/include/g++/gen/Stack.ccP
-./usr/include/g++/gen/Stack.hP
-./usr/include/g++/gen/VHBag.ccP
-./usr/include/g++/gen/VHBag.hP
-./usr/include/g++/gen/VHMap.ccP
-./usr/include/g++/gen/VHMap.hP
-./usr/include/g++/gen/VHSet.ccP
-./usr/include/g++/gen/VHSet.hP
-./usr/include/g++/gen/VOHSet.ccP
-./usr/include/g++/gen/VOHSet.hP
-./usr/include/g++/gen/VQueue.ccP
-./usr/include/g++/gen/VQueue.hP
-./usr/include/g++/gen/VStack.ccP
-./usr/include/g++/gen/VStack.hP
-./usr/include/g++/gen/Vec.ccP
-./usr/include/g++/gen/Vec.hP
-./usr/include/g++/gen/XPBag.ccP
-./usr/include/g++/gen/XPBag.hP
-./usr/include/g++/gen/XPDeque.ccP
-./usr/include/g++/gen/XPDeque.hP
-./usr/include/g++/gen/XPPQ.ccP
-./usr/include/g++/gen/XPPQ.hP
-./usr/include/g++/gen/XPQueue.ccP
-./usr/include/g++/gen/XPQueue.hP
-./usr/include/g++/gen/XPSet.ccP
-./usr/include/g++/gen/XPSet.hP
-./usr/include/g++/gen/XPStack.ccP
-./usr/include/g++/gen/XPStack.hP
-./usr/include/g++/gen/XPlex.ccP
-./usr/include/g++/gen/XPlex.hP
-./usr/include/g++/gen/defs.hP
-./usr/include/g++/gen/intSList.hP
-./usr/include/g++/gen/intVec.hP
-./usr/include/g++/generic.h
-./usr/include/g++/getpagesize.h
-./usr/include/g++/hash_map
-./usr/include/g++/hash_map.h
-./usr/include/g++/hash_set
-./usr/include/g++/hash_set.h
-./usr/include/g++/hashtable.h
-./usr/include/g++/heap.h
-./usr/include/g++/indstream.h
-./usr/include/g++/iolibio.h
-./usr/include/g++/iomanip
-./usr/include/g++/iomanip.h
-./usr/include/g++/iosfwd
-./usr/include/g++/iostdio.h
-./usr/include/g++/iostream
-./usr/include/g++/iostream.h
-./usr/include/g++/iostreamP.h
-./usr/include/g++/istream.h
-./usr/include/g++/iterator
-./usr/include/g++/iterator.h
-./usr/include/g++/libc.h
-./usr/include/g++/libio.h
-./usr/include/g++/libioP.h
-./usr/include/g++/list
-./usr/include/g++/list.h
-./usr/include/g++/map
-./usr/include/g++/map.h
-./usr/include/g++/memory
-./usr/include/g++/minmax.h
-./usr/include/g++/multimap.h
-./usr/include/g++/multiset.h
-./usr/include/g++/new
-./usr/include/g++/new.h
-./usr/include/g++/numeric
-./usr/include/g++/osfcn.h
-./usr/include/g++/ostream.h
-./usr/include/g++/pair.h
-./usr/include/g++/parsestream.h
-./usr/include/g++/pfstream.h
-./usr/include/g++/procbuf.h
-./usr/include/g++/pthread_alloc
-./usr/include/g++/pthread_alloc.h
-./usr/include/g++/queue
-./usr/include/g++/rope
-./usr/include/g++/rope.h
-./usr/include/g++/ropeimpl.h
-./usr/include/g++/rx.h
-./usr/include/g++/set
-./usr/include/g++/set.h
-./usr/include/g++/slist
-./usr/include/g++/slist.h
-./usr/include/g++/stack
-./usr/include/g++/stack.h
-./usr/include/g++/std
-./usr/include/g++/std.h
-./usr/include/g++/std/bastring.cc
-./usr/include/g++/std/bastring.h
-./usr/include/g++/std/complext.cc
-./usr/include/g++/std/complext.h
-./usr/include/g++/std/dcomplex.h
-./usr/include/g++/std/fcomplex.h
-./usr/include/g++/std/ldcomplex.h
-./usr/include/g++/std/straits.h
-./usr/include/g++/stdexcept
-./usr/include/g++/stdiostream.h
-./usr/include/g++/stl.h
-./usr/include/g++/stl_algo.h
-./usr/include/g++/stl_algobase.h
-./usr/include/g++/stl_alloc.h
-./usr/include/g++/stl_bvector.h
-./usr/include/g++/stl_config.h
-./usr/include/g++/stl_construct.h
-./usr/include/g++/stl_deque.h
-./usr/include/g++/stl_function.h
-./usr/include/g++/stl_hash_fun.h
-./usr/include/g++/stl_hash_map.h
-./usr/include/g++/stl_hash_set.h
-./usr/include/g++/stl_hashtable.h
-./usr/include/g++/stl_heap.h
-./usr/include/g++/stl_iterator.h
-./usr/include/g++/stl_list.h
-./usr/include/g++/stl_map.h
-./usr/include/g++/stl_multimap.h
-./usr/include/g++/stl_multiset.h
-./usr/include/g++/stl_numeric.h
-./usr/include/g++/stl_pair.h
-./usr/include/g++/stl_queue.h
-./usr/include/g++/stl_raw_storage_iter.h
-./usr/include/g++/stl_relops.h
-./usr/include/g++/stl_rope.h
-./usr/include/g++/stl_set.h
-./usr/include/g++/stl_slist.h
-./usr/include/g++/stl_stack.h
-./usr/include/g++/stl_tempbuf.h
-./usr/include/g++/stl_tree.h
-./usr/include/g++/stl_uninitialized.h
-./usr/include/g++/stl_vector.h
-./usr/include/g++/strclass.h
-./usr/include/g++/stream.h
-./usr/include/g++/streambuf.h
-./usr/include/g++/strfile.h
-./usr/include/g++/string
-./usr/include/g++/strstream
-./usr/include/g++/strstream.h
-./usr/include/g++/swap.h
-./usr/include/g++/sysent.h
-./usr/include/g++/tempbuf.h
-./usr/include/g++/tree.h
-./usr/include/g++/type_traits.h
-./usr/include/g++/typeinfo
-./usr/include/g++/typemacros.h
-./usr/include/g++/utility
-./usr/include/g++/vector
-./usr/include/g++/vector.h
 ./usr/include/glob.h
 ./usr/include/gmp.h
 ./usr/include/grp.h
@@ -1241,13 +923,10 @@
 ./usr/lib/libdes_p.a
 ./usr/lib/libedit.a
 ./usr/lib/libedit_p.a
-./usr/lib/libf2c.a
 ./usr/lib/libfl.a
 ./usr/lib/libfl_p.a
 ./usr/lib/libform.a
 ./usr/lib/libform_p.a
-./usr/lib/libg++.a
-./usr/lib/libg++_p.a
 ./usr/lib/libgmp.a
 ./usr/lib/libiberty.a
 ./usr/lib/libiberty_p.a
@@ -1281,8 +960,6 @@
 ./usr/lib/libresolv_p.a
 ./usr/lib/librpcsvc.a
 ./usr/lib/librpcsvc_p.a
-./usr/lib/librx.a
-./usr/lib/librx_p.a
 ./usr/lib/libskey.a
 ./usr/lib/libskey_p.a
 ./usr/lib/libssl.a
@@ -2848,3 +2525,164 @@
 ./usr/lib/libkeynote.a
 ./usr/lib/libkeynote_p.a
 ./usr/lib/libkeynote_pic.a
+./usr/include/f2c.h
+./usr/include/objc
+./usr/include/objc/NXConstStr.h
+./usr/include/objc/Object.h
+./usr/include/objc/Protocol.h
+./usr/include/objc/encoding.h
+./usr/include/objc/hash.h
+./usr/include/objc/objc-api.h
+./usr/include/objc/objc-list.h
+./usr/include/objc/objc.h
+./usr/include/objc/sarray.h
+./usr/include/objc/thr.h
+./usr/include/objc/typedstream.h
+./usr/lib/libg2c.a
+./usr/lib/libg2c_p.a
+./usr/lib/libobjc.a
+./usr/lib/libobjc_p.a
+./usr/include/g++/FlexLexer.h
+./usr/include/g++/PlotFile.h
+./usr/include/g++/SFile.h
+./usr/include/g++/_G_config.h
+./usr/include/g++/algo.h
+./usr/include/g++/algobase.h
+./usr/include/g++/algorithm
+./usr/include/g++/alloc.h
+./usr/include/g++/builtinbuf.h
+./usr/include/g++/bvector.h
+./usr/include/g++/cassert
+./usr/include/g++/cctype
+./usr/include/g++/cerrno
+./usr/include/g++/cfloat
+./usr/include/g++/ciso646
+./usr/include/g++/climits
+./usr/include/g++/clocale
+./usr/include/g++/cmath
+./usr/include/g++/complex
+./usr/include/g++/complex.h
+./usr/include/g++/csetjmp
+./usr/include/g++/csignal
+./usr/include/g++/cstdarg
+./usr/include/g++/cstddef
+./usr/include/g++/cstdio
+./usr/include/g++/cstdlib
+./usr/include/g++/cstring
+./usr/include/g++/ctime
+./usr/include/g++/cwchar
+./usr/include/g++/cwctype
+./usr/include/g++/defalloc.h
+./usr/include/g++/deque
+./usr/include/g++/deque.h
+./usr/include/g++/dummy.h
+./usr/include/g++/editbuf.h
+./usr/include/g++/exception
+./usr/include/g++/floatio.h
+./usr/include/g++/fstream
+./usr/include/g++/fstream.h
+./usr/include/g++/function.h
+./usr/include/g++/functional
+./usr/include/g++/hash_map
+./usr/include/g++/hash_map.h
+./usr/include/g++/hash_set
+./usr/include/g++/hash_set.h
+./usr/include/g++/hashtable.h
+./usr/include/g++/heap.h
+./usr/include/g++/indstream.h
+./usr/include/g++/iolibio.h
+./usr/include/g++/iomanip
+./usr/include/g++/iomanip.h
+./usr/include/g++/iosfwd
+./usr/include/g++/iostdio.h
+./usr/include/g++/iostream
+./usr/include/g++/iostream.h
+./usr/include/g++/iostreamP.h
+./usr/include/g++/istream.h
+./usr/include/g++/iterator
+./usr/include/g++/iterator.h
+./usr/include/g++/libio.h
+./usr/include/g++/libioP.h
+./usr/include/g++/list
+./usr/include/g++/list.h
+./usr/include/g++/map
+./usr/include/g++/map.h
+./usr/include/g++/memory
+./usr/include/g++/multimap.h
+./usr/include/g++/multiset.h
+./usr/include/g++/new
+./usr/include/g++/new.h
+./usr/include/g++/numeric
+./usr/include/g++/ostream.h
+./usr/include/g++/pair.h
+./usr/include/g++/parsestream.h
+./usr/include/g++/pfstream.h
+./usr/include/g++/procbuf.h
+./usr/include/g++/pthread_alloc
+./usr/include/g++/pthread_alloc.h
+./usr/include/g++/queue
+./usr/include/g++/rope
+./usr/include/g++/rope.h
+./usr/include/g++/ropeimpl.h
+./usr/include/g++/set
+./usr/include/g++/set.h
+./usr/include/g++/slist
+./usr/include/g++/slist.h
+./usr/include/g++/stack
+./usr/include/g++/stack.h
+./usr/include/g++/std
+./usr/include/g++/std/bastring.cc
+./usr/include/g++/std/bastring.h
+./usr/include/g++/std/complext.cc
+./usr/include/g++/std/complext.h
+./usr/include/g++/std/dcomplex.h
+./usr/include/g++/std/fcomplex.h
+./usr/include/g++/std/ldcomplex.h
+./usr/include/g++/std/straits.h
+./usr/include/g++/stdexcept
+./usr/include/g++/stdiostream.h
+./usr/include/g++/stl.h
+./usr/include/g++/stl_algo.h
+./usr/include/g++/stl_algobase.h
+./usr/include/g++/stl_alloc.h
+./usr/include/g++/stl_bvector.h
+./usr/include/g++/stl_config.h
+./usr/include/g++/stl_construct.h
+./usr/include/g++/stl_deque.h
+./usr/include/g++/stl_function.h
+./usr/include/g++/stl_hash_fun.h
+./usr/include/g++/stl_hash_map.h
+./usr/include/g++/stl_hash_set.h
+./usr/include/g++/stl_hashtable.h
+./usr/include/g++/stl_heap.h
+./usr/include/g++/stl_iterator.h
+./usr/include/g++/stl_list.h
+./usr/include/g++/stl_map.h
+./usr/include/g++/stl_multimap.h
+./usr/include/g++/stl_multiset.h
+./usr/include/g++/stl_numeric.h
+./usr/include/g++/stl_pair.h
+./usr/include/g++/stl_queue.h
+./usr/include/g++/stl_raw_storage_iter.h
+./usr/include/g++/stl_relops.h
+./usr/include/g++/stl_rope.h
+./usr/include/g++/stl_set.h
+./usr/include/g++/stl_slist.h
+./usr/include/g++/stl_stack.h
+./usr/include/g++/stl_tempbuf.h
+./usr/include/g++/stl_tree.h
+./usr/include/g++/stl_uninitialized.h
+./usr/include/g++/stl_vector.h
+./usr/include/g++/stream.h
+./usr/include/g++/streambuf.h
+./usr/include/g++/strfile.h
+./usr/include/g++/string
+./usr/include/g++/strstream
+./usr/include/g++/strstream.h
+./usr/include/g++/tempbuf.h
+./usr/include/g++/tree.h
+./usr/include/g++/type_traits.h
+./usr/include/g++/typeinfo
+./usr/include/g++/utility
+./usr/include/g++/vector
+./usr/include/g++/vector.h
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index fad392bbe05..a2b4bc436fc 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -94,21 +94,12 @@
 ./usr/share/info/gmp.info-1
 ./usr/share/info/gmp.info-2
 ./usr/share/info/gmp.info-3
-./usr/share/info/gperf.info
 ./usr/share/info/gzip.info
 ./usr/share/info/history.info
 ./usr/share/info/info-stnd.info
 ./usr/share/info/info.info
-./usr/share/info/iostream.info
 ./usr/share/info/kth-krb.info
-./usr/share/info/libg++.info
-./usr/share/info/libg++.info-1
-./usr/share/info/libg++.info-2
-./usr/share/info/libg++.info-3
-./usr/share/info/libg++.info-4
-./usr/share/info/libg++.info-5
 ./usr/share/info/readline.info
-./usr/share/info/standards.info
 ./usr/share/info/texinfo
 ./usr/share/info/texinfo-1
 ./usr/share/info/texinfo-10
@@ -227,7 +218,6 @@
 ./usr/share/man/cat1/gencat.0
 ./usr/share/man/cat1/getconf.0
 ./usr/share/man/cat1/getopt.0
-./usr/share/man/cat1/gperf.0
 ./usr/share/man/cat1/grep.0
 ./usr/share/man/cat1/grodvi.0
 ./usr/share/man/cat1/groff.0
@@ -1584,3 +1574,16 @@
 ./usr/share/man/cat4/keynote.0
 ./usr/share/man/cat8/swapctl.0
 ./usr/share/man/cat1/keynote.0
+./usr/share/info/g77.info-11
+./usr/share/info/g77.info-12
+./usr/share/info/g77.info-13
+./usr/share/info/g77.info-14
+./usr/share/info/g77.info-15
+./usr/share/info/g77.info-16
+./usr/share/info/g77.info-17
+./usr/share/info/g77.info-18
+./usr/share/info/g77.info-19
+./usr/share/info/g77.info-20
+./usr/share/info/g77.info-21
+./usr/share/info/gcc.info-29
+./usr/share/info/gcc.info-30