sync

14 files changed, 173 insertions, 135 deletions

diff --git a/distrib/sets/lists/comp/md.alpha b/distrib/sets/lists/comp/md.alpha
index 684eb472472..2742af64eeb 100644
--- a/distrib/sets/lists/comp/md.alpha
+++ b/distrib/sets/lists/comp/md.alpha
@@ -310,6 +310,7 @@
 ./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libssl_pic.a
+./usr/lib/libstdc++_p.a
 ./usr/lib/libstdc++_pic.a
 ./usr/lib/libtermcap_pic.a
 ./usr/lib/libtermlib_pic.a
diff --git a/distrib/sets/lists/comp/md.hp300 b/distrib/sets/lists/comp/md.hp300
index 40398ada35b..78a248e071a 100644
--- a/distrib/sets/lists/comp/md.hp300
+++ b/distrib/sets/lists/comp/md.hp300
@@ -295,6 +295,7 @@
 ./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libssl_pic.a
+./usr/lib/libstdc++_p.a
 ./usr/lib/libstdc++_pic.a
 ./usr/lib/libtermcap_pic.a
 ./usr/lib/libtermlib_pic.a
diff --git a/distrib/sets/lists/comp/md.hppa b/distrib/sets/lists/comp/md.hppa
index bb91859ef8d..cce0f10a690 100644
--- a/distrib/sets/lists/comp/md.hppa
+++ b/distrib/sets/lists/comp/md.hppa
@@ -238,6 +238,7 @@
 ./usr/lib/libfrtbegin_p.a
 ./usr/lib/libg2c.a
 ./usr/lib/libg2c_p.a
+./usr/lib/libstdc++_p.a
 ./usr/libdata/ldscripts
 ./usr/libdata/ldscripts/hppaobsd.x
 ./usr/libdata/ldscripts/hppaobsd.xbn
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index c91c174702a..a562fc7eb45 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -285,6 +285,7 @@
 ./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libssl_pic.a
+./usr/lib/libstdc++_p.a
 ./usr/lib/libstdc++_pic.a
 ./usr/lib/libtermcap_pic.a
 ./usr/lib/libtermlib_pic.a
diff --git a/distrib/sets/lists/comp/md.mac68k b/distrib/sets/lists/comp/md.mac68k
index b68d2800511..76198099e63 100644
--- a/distrib/sets/lists/comp/md.mac68k
+++ b/distrib/sets/lists/comp/md.mac68k
@@ -303,6 +303,7 @@
 ./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libssl_pic.a
+./usr/lib/libstdc++_p.a
 ./usr/lib/libstdc++_pic.a
 ./usr/lib/libtermcap_pic.a
 ./usr/lib/libtermlib_pic.a
diff --git a/distrib/sets/lists/comp/md.macppc b/distrib/sets/lists/comp/md.macppc
index d3a1ead9d46..fa1bce60af6 100644
--- a/distrib/sets/lists/comp/md.macppc
+++ b/distrib/sets/lists/comp/md.macppc
@@ -315,6 +315,7 @@
 ./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libssl_pic.a
+./usr/lib/libstdc++_p.a
 ./usr/lib/libstdc++_pic.a
 ./usr/lib/libtermcap_pic.a
 ./usr/lib/libtermlib_pic.a
diff --git a/distrib/sets/lists/comp/md.mvme68k b/distrib/sets/lists/comp/md.mvme68k
index 58654350e31..49361b1c306 100644
--- a/distrib/sets/lists/comp/md.mvme68k
+++ b/distrib/sets/lists/comp/md.mvme68k
@@ -299,6 +299,7 @@
 ./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libssl_pic.a
+./usr/lib/libstdc++_p.a
 ./usr/lib/libstdc++_pic.a
 ./usr/lib/libtermcap_pic.a
 ./usr/lib/libtermlib_pic.a
diff --git a/distrib/sets/lists/comp/md.mvme88k b/distrib/sets/lists/comp/md.mvme88k
index 9fa62688b12..61bd6b756c8 100644
--- a/distrib/sets/lists/comp/md.mvme88k
+++ b/distrib/sets/lists/comp/md.mvme88k
@@ -238,4 +238,5 @@
 ./usr/lib/libfrtbegin_p.a
 ./usr/lib/libg2c.a
 ./usr/lib/libg2c_p.a
+./usr/lib/libstdc++_p.a
 ./usr/lib/scrt0.o
diff --git a/distrib/sets/lists/comp/md.mvmeppc b/distrib/sets/lists/comp/md.mvmeppc
index 56c9d41d721..fe4991da6b5 100644
--- a/distrib/sets/lists/comp/md.mvmeppc
+++ b/distrib/sets/lists/comp/md.mvmeppc
@@ -264,6 +264,7 @@
 ./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libssl_pic.a
+./usr/lib/libstdc++_p.a
 ./usr/lib/libstdc++_pic.a
 ./usr/lib/libtermcap_pic.a
 ./usr/lib/libtermlib_pic.a
diff --git a/distrib/sets/lists/comp/md.pegasos b/distrib/sets/lists/comp/md.pegasos
index 2afbecc9a6f..d1d0064195f 100644
--- a/distrib/sets/lists/comp/md.pegasos
+++ b/distrib/sets/lists/comp/md.pegasos
@@ -311,6 +311,7 @@
 ./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libssl_pic.a
+./usr/lib/libstdc++_p.a
 ./usr/lib/libstdc++_pic.a
 ./usr/lib/libtermcap_pic.a
 ./usr/lib/libtermlib_pic.a
diff --git a/distrib/sets/lists/comp/md.sparc b/distrib/sets/lists/comp/md.sparc
index b056de1c25e..d5d6d23b779 100644
--- a/distrib/sets/lists/comp/md.sparc
+++ b/distrib/sets/lists/comp/md.sparc
@@ -282,6 +282,7 @@
 ./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libssl_pic.a
+./usr/lib/libstdc++_p.a
 ./usr/lib/libstdc++_pic.a
 ./usr/lib/libtermcap_pic.a
 ./usr/lib/libtermlib_pic.a
diff --git a/distrib/sets/lists/comp/md.sparc64 b/distrib/sets/lists/comp/md.sparc64
index 21953ee2bba..c592c2ccead 100644
--- a/distrib/sets/lists/comp/md.sparc64
+++ b/distrib/sets/lists/comp/md.sparc64
@@ -2,18 +2,113 @@
 ./usr/bin/gasp
 ./usr/bin/objcopy
 ./usr/bin/readelf
-./usr/include/f2c.h
 ./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++/backward
+./usr/include/g++/backward/algo.h
+./usr/include/g++/backward/algobase.h
+./usr/include/g++/backward/alloc.h
+./usr/include/g++/backward/backward_warning.h
+./usr/include/g++/backward/bvector.h
+./usr/include/g++/backward/complex.h
+./usr/include/g++/backward/defalloc.h
+./usr/include/g++/backward/deque.h
+./usr/include/g++/backward/fstream.h
+./usr/include/g++/backward/function.h
+./usr/include/g++/backward/hash_map.h
+./usr/include/g++/backward/hash_set.h
+./usr/include/g++/backward/hashtable.h
+./usr/include/g++/backward/heap.h
+./usr/include/g++/backward/iomanip.h
+./usr/include/g++/backward/iostream.h
+./usr/include/g++/backward/istream.h
+./usr/include/g++/backward/iterator.h
+./usr/include/g++/backward/list.h
+./usr/include/g++/backward/map.h
+./usr/include/g++/backward/multimap.h
+./usr/include/g++/backward/multiset.h
+./usr/include/g++/backward/new.h
+./usr/include/g++/backward/ostream.h
+./usr/include/g++/backward/pair.h
+./usr/include/g++/backward/queue.h
+./usr/include/g++/backward/rope.h
+./usr/include/g++/backward/set.h
+./usr/include/g++/backward/slist.h
+./usr/include/g++/backward/stack.h
+./usr/include/g++/backward/stream.h
+./usr/include/g++/backward/streambuf.h
+./usr/include/g++/backward/strstream
+./usr/include/g++/backward/tempbuf.h
+./usr/include/g++/backward/tree.h
+./usr/include/g++/backward/vector.h
+./usr/include/g++/bits
+./usr/include/g++/bits/basic_ios.h
+./usr/include/g++/bits/basic_ios.tcc
+./usr/include/g++/bits/basic_string.h
+./usr/include/g++/bits/basic_string.tcc
+./usr/include/g++/bits/boost_concept_check.h
+./usr/include/g++/bits/char_traits.h
+./usr/include/g++/bits/cmath.tcc
+./usr/include/g++/bits/codecvt.h
+./usr/include/g++/bits/concept_check.h
+./usr/include/g++/bits/cpp_type_traits.h
+./usr/include/g++/bits/deque.tcc
+./usr/include/g++/bits/fpos.h
+./usr/include/g++/bits/fstream.tcc
+./usr/include/g++/bits/functexcept.h
+./usr/include/g++/bits/gslice.h
+./usr/include/g++/bits/gslice_array.h
+./usr/include/g++/bits/indirect_array.h
+./usr/include/g++/bits/ios_base.h
+./usr/include/g++/bits/istream.tcc
+./usr/include/g++/bits/list.tcc
+./usr/include/g++/bits/locale_classes.h
+./usr/include/g++/bits/locale_facets.h
+./usr/include/g++/bits/locale_facets.tcc
+./usr/include/g++/bits/localefwd.h
+./usr/include/g++/bits/mask_array.h
+./usr/include/g++/bits/ostream.tcc
+./usr/include/g++/bits/pthread_allocimpl.h
+./usr/include/g++/bits/slice_array.h
+./usr/include/g++/bits/sstream.tcc
+./usr/include/g++/bits/stl_algo.h
+./usr/include/g++/bits/stl_algobase.h
+./usr/include/g++/bits/stl_alloc.h
+./usr/include/g++/bits/stl_bvector.h
+./usr/include/g++/bits/stl_construct.h
+./usr/include/g++/bits/stl_deque.h
+./usr/include/g++/bits/stl_function.h
+./usr/include/g++/bits/stl_heap.h
+./usr/include/g++/bits/stl_iterator.h
+./usr/include/g++/bits/stl_iterator_base_funcs.h
+./usr/include/g++/bits/stl_iterator_base_types.h
+./usr/include/g++/bits/stl_list.h
+./usr/include/g++/bits/stl_map.h
+./usr/include/g++/bits/stl_multimap.h
+./usr/include/g++/bits/stl_multiset.h
+./usr/include/g++/bits/stl_numeric.h
+./usr/include/g++/bits/stl_pair.h
+./usr/include/g++/bits/stl_pthread_alloc.h
+./usr/include/g++/bits/stl_queue.h
+./usr/include/g++/bits/stl_raw_storage_iter.h
+./usr/include/g++/bits/stl_relops.h
+./usr/include/g++/bits/stl_set.h
+./usr/include/g++/bits/stl_stack.h
+./usr/include/g++/bits/stl_tempbuf.h
+./usr/include/g++/bits/stl_threads.h
+./usr/include/g++/bits/stl_tree.h
+./usr/include/g++/bits/stl_uninitialized.h
+./usr/include/g++/bits/stl_vector.h
+./usr/include/g++/bits/stream_iterator.h
+./usr/include/g++/bits/streambuf.tcc
+./usr/include/g++/bits/streambuf_iterator.h
+./usr/include/g++/bits/stringfwd.h
+./usr/include/g++/bits/type_traits.h
+./usr/include/g++/bits/valarray_array.h
+./usr/include/g++/bits/valarray_array.tcc
+./usr/include/g++/bits/valarray_meta.h
+./usr/include/g++/bits/vector.tcc
 ./usr/include/g++/bitset
-./usr/include/g++/builtinbuf.h
-./usr/include/g++/bvector.h
 ./usr/include/g++/cassert
 ./usr/include/g++/cctype
 ./usr/include/g++/cerrno
@@ -23,7 +118,6 @@
 ./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
@@ -40,133 +134,74 @@
 ./usr/include/g++/cursslk.h
 ./usr/include/g++/cwchar
 ./usr/include/g++/cwctype
-./usr/include/g++/defalloc.h
+./usr/include/g++/cxxabi.h
 ./usr/include/g++/deque
-./usr/include/g++/deque.h
-./usr/include/g++/editbuf.h
 ./usr/include/g++/etip.h
 ./usr/include/g++/exception
-./usr/include/g++/floatio.h
+./usr/include/g++/exception_defines.h
+./usr/include/g++/ext
+./usr/include/g++/ext/algorithm
+./usr/include/g++/ext/enc_filebuf.h
+./usr/include/g++/ext/functional
+./usr/include/g++/ext/hash_map
+./usr/include/g++/ext/hash_set
+./usr/include/g++/ext/iterator
+./usr/include/g++/ext/memory
+./usr/include/g++/ext/numeric
+./usr/include/g++/ext/rb_tree
+./usr/include/g++/ext/rope
+./usr/include/g++/ext/ropeimpl.h
+./usr/include/g++/ext/slist
+./usr/include/g++/ext/stdio_filebuf.h
+./usr/include/g++/ext/stl_hash_fun.h
+./usr/include/g++/ext/stl_hashtable.h
+./usr/include/g++/ext/stl_rope.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++/ios
 ./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++/istream
 ./usr/include/g++/iterator
-./usr/include/g++/iterator.h
-./usr/include/g++/libio.h
-./usr/include/g++/libioP.h
+./usr/include/g++/limits
 ./usr/include/g++/list
-./usr/include/g++/list.h
+./usr/include/g++/locale
 ./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++/ostream
 ./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++/sparc64-unknown-openbsd3.4
+./usr/include/g++/sparc64-unknown-openbsd3.4/bits
+./usr/include/g++/sparc64-unknown-openbsd3.4/bits/atomicity.h
+./usr/include/g++/sparc64-unknown-openbsd3.4/bits/basic_file.h
+./usr/include/g++/sparc64-unknown-openbsd3.4/bits/c++config.h
+./usr/include/g++/sparc64-unknown-openbsd3.4/bits/c++io.h
+./usr/include/g++/sparc64-unknown-openbsd3.4/bits/c++locale.h
+./usr/include/g++/sparc64-unknown-openbsd3.4/bits/codecvt_specializations.h
+./usr/include/g++/sparc64-unknown-openbsd3.4/bits/ctype_base.h
+./usr/include/g++/sparc64-unknown-openbsd3.4/bits/ctype_inline.h
+./usr/include/g++/sparc64-unknown-openbsd3.4/bits/ctype_noninline.h
+./usr/include/g++/sparc64-unknown-openbsd3.4/bits/gthr-default.h
+./usr/include/g++/sparc64-unknown-openbsd3.4/bits/gthr-posix.h
+./usr/include/g++/sparc64-unknown-openbsd3.4/bits/gthr-single.h
+./usr/include/g++/sparc64-unknown-openbsd3.4/bits/gthr.h
+./usr/include/g++/sparc64-unknown-openbsd3.4/bits/messages_members.h
+./usr/include/g++/sparc64-unknown-openbsd3.4/bits/os_defines.h
+./usr/include/g++/sparc64-unknown-openbsd3.4/bits/time_members.h
 ./usr/include/g++/sstream
 ./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/gslice.h
-./usr/include/g++/std/gslice_array.h
-./usr/include/g++/std/indirect_array.h
-./usr/include/g++/std/ldcomplex.h
-./usr/include/g++/std/mask_array.h
-./usr/include/g++/std/slice.h
-./usr/include/g++/std/slice_array.h
-./usr/include/g++/std/std_valarray.h
-./usr/include/g++/std/straits.h
-./usr/include/g++/std/valarray_array.h
-./usr/include/g++/std/valarray_array.tcc
-./usr/include/g++/std/valarray_meta.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++/streambuf
 ./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++/valarray
 ./usr/include/g++/vector
-./usr/include/g++/vector.h
-./usr/include/g2c.h
 ./usr/include/ieeefp.h
 ./usr/include/sparc64
 ./usr/include/sparc64/ansi.h
@@ -224,24 +259,22 @@
 ./usr/include/sparc64/varargs.h
 ./usr/include/sparc64/vmparam.h
 ./usr/include/sparc64/z8530var.h
+./usr/include/unwind.h
 ./usr/lib/crtbegin.o
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sparc64-unknown-openbsd3.4/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/sparc64-unknown-openbsd3.4/2.95.3/cc1
-./usr/lib/gcc-lib/sparc64-unknown-openbsd3.4/2.95.3/cc1obj
-./usr/lib/gcc-lib/sparc64-unknown-openbsd3.4/2.95.3/cc1plus
-./usr/lib/gcc-lib/sparc64-unknown-openbsd3.4/2.95.3/f771
-./usr/lib/gcc-lib/sparc64-unknown-openbsd3.4/2.95.3/include/README
-./usr/lib/gcc-lib/sparc64-unknown-openbsd3.4/2.95.3/include/exception
-./usr/lib/gcc-lib/sparc64-unknown-openbsd3.4/2.95.3/include/float.h
-./usr/lib/gcc-lib/sparc64-unknown-openbsd3.4/2.95.3/include/limits.h
-./usr/lib/gcc-lib/sparc64-unknown-openbsd3.4/2.95.3/include/new
-./usr/lib/gcc-lib/sparc64-unknown-openbsd3.4/2.95.3/include/new.h
-./usr/lib/gcc-lib/sparc64-unknown-openbsd3.4/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/sparc64-unknown-openbsd3.4/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/sparc64-unknown-openbsd3.4/2.95.3/libgcc.a
+./usr/lib/gcc-lib/sparc64-unknown-openbsd3.4/3.3.2
+./usr/lib/gcc-lib/sparc64-unknown-openbsd3.4/3.3.2/SYSCALLS.c.X
+./usr/lib/gcc-lib/sparc64-unknown-openbsd3.4/3.3.2/cc1
+./usr/lib/gcc-lib/sparc64-unknown-openbsd3.4/3.3.2/cc1obj
+./usr/lib/gcc-lib/sparc64-unknown-openbsd3.4/3.3.2/cc1plus
+./usr/lib/gcc-lib/sparc64-unknown-openbsd3.4/3.3.2/collect2
+./usr/lib/gcc-lib/sparc64-unknown-openbsd3.4/3.3.2/f771
+./usr/lib/gcc-lib/sparc64-unknown-openbsd3.4/3.3.2/include
+./usr/lib/gcc-lib/sparc64-unknown-openbsd3.4/3.3.2/include/unwind.h
+./usr/lib/gcc-lib/sparc64-unknown-openbsd3.4/3.3.2/libgcc.a
+./usr/lib/gcc-lib/sparc64-unknown-openbsd3.4/3.3.2/specs
 ./usr/lib/libasn1_pic.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
@@ -251,12 +284,6 @@
 ./usr/lib/libdes_pic.a
 ./usr/lib/libedit_pic.a
 ./usr/lib/libform_pic.a
-./usr/lib/libfrtbegin.a
-./usr/lib/libfrtbegin_p.a
-./usr/lib/libfrtbegin_pic.a
-./usr/lib/libg2c.a
-./usr/lib/libg2c_p.a
-./usr/lib/libg2c_pic.a
 ./usr/lib/libgssapi_pic.a
 ./usr/lib/libiberty_pic.a
 ./usr/lib/libkadm5clnt_pic.a
@@ -279,7 +306,7 @@
 ./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libssl_pic.a
-./usr/lib/libstdc++_pic.a
+./usr/lib/libsupc++.a
 ./usr/lib/libtermcap_pic.a
 ./usr/lib/libtermlib_pic.a
 ./usr/lib/libusbhid_pic.a
diff --git a/distrib/sets/lists/comp/md.vax b/distrib/sets/lists/comp/md.vax
index 8a5de5f5906..81680779ef9 100644
--- a/distrib/sets/lists/comp/md.vax
+++ b/distrib/sets/lists/comp/md.vax
@@ -237,4 +237,5 @@
 ./usr/lib/libfrtbegin_p.a
 ./usr/lib/libg2c.a
 ./usr/lib/libg2c_p.a
+./usr/lib/libstdc++_p.a
 ./usr/lib/scrt0.o
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index b9949d9305a..bf5bae2610e 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -439,6 +439,7 @@
 ./usr/include/dev/pci/hifn7751reg.h
 ./usr/include/dev/pci/hifn7751var.h
 ./usr/include/dev/pci/i82365_pcivar.h
+./usr/include/dev/pci/ichreg.h
 ./usr/include/dev/pci/if_bcereg.h
 ./usr/include/dev/pci/if_bgereg.h
 ./usr/include/dev/pci/if_devar.h
@@ -1566,7 +1567,6 @@
 ./usr/lib/libssl.a
 ./usr/lib/libssl_p.a
 ./usr/lib/libstdc++.a
-./usr/lib/libstdc++_p.a
 ./usr/lib/libtermcap.a
 ./usr/lib/libtermcap_p.a
 ./usr/lib/libtermlib.a
@@ -1611,7 +1611,6 @@
 ./usr/share/man/cat1/c++.0
 ./usr/share/man/cat1/c++filt.0
 ./usr/share/man/cat1/cc.0
-./usr/share/man/cat1/cccp.0
 ./usr/share/man/cat1/f77.0
 ./usr/share/man/cat1/flex.0
 ./usr/share/man/cat1/fpr.0