sync

11 files changed, 117 insertions, 115 deletions

diff --git a/distrib/sets/lists/base/md.arc b/distrib/sets/lists/base/md.arc
index 2cf2f3cee05..670f4068a21 100644
--- a/distrib/sets/lists/base/md.arc
+++ b/distrib/sets/lists/base/md.arc
@@ -74,15 +74,6 @@
 ./usr/lib/perl5/mips-openbsd/5.00404/Config.pm
 ./usr/lib/perl5/mips-openbsd/5.00404/DynaLoader.pm
 ./usr/lib/perl5/mips-openbsd/5.00404/FileHandle.pm
-./usr/lib/perl5/site_perl/mips-openbsd
-./usr/lib/scrt0.o
-./usr/libexec/ld.so
-./usr/mdec/mbr
-./usr/mdec/msdos5mb.gz
-./usr/mipsel-unknown-openbsd2.2
-./usr/mipsel-unknown-openbsd2.2/bin
-./usr/mipsel-unknown-openbsd2.2/lib
-./usr/mipsel-unknown-openbsd2.2/lib/ldscripts
 ./usr/lib/perl5/mips-openbsd/5.00404/auto
 ./usr/lib/perl5/mips-openbsd/5.00404/auto/DynaLoader
 ./usr/lib/perl5/mips-openbsd/5.00404/auto/DynaLoader/DynaLoader.a
@@ -96,3 +87,12 @@
 ./usr/lib/perl5/mips-openbsd/5.00404/overload.pm
 ./usr/lib/perl5/mips-openbsd/5.00404/pod
 ./usr/lib/perl5/mips-openbsd/5.00404/pod/perldiag.pod
+./usr/lib/perl5/site_perl/mips-openbsd
+./usr/lib/scrt0.o
+./usr/libexec/ld.so
+./usr/mdec/mbr
+./usr/mdec/msdos5mb.gz
+./usr/mipsel-unknown-openbsd2.2
+./usr/mipsel-unknown-openbsd2.2/bin
+./usr/mipsel-unknown-openbsd2.2/lib
+./usr/mipsel-unknown-openbsd2.2/lib/ldscripts
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index bdc3b03145c..6aee1d0ec79 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -18,7 +18,6 @@
 ./usr/lib/libg++.so.28.0
 ./usr/lib/libi386.so.0.2
 ./usr/lib/libiberty.so.0.1
-./usr/lib/librx.so.0.1
 ./usr/lib/libkadm.so.5.0
 ./usr/lib/libkafs.so.5.0
 ./usr/lib/libkdb.so.5.0
@@ -31,6 +30,7 @@
 ./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/libss.so.4.0
 ./usr/lib/libstdc++.so.28.0
@@ -40,6 +40,7 @@
 ./usr/lib/libutil.so.4.1
 ./usr/lib/libwrap.so.1.0
 ./usr/lib/libz.so.1.2
+./usr/lib/perl5/IO
 ./usr/lib/perl5/i386-openbsd
 ./usr/lib/perl5/i386-openbsd/5.00404
 ./usr/lib/perl5/i386-openbsd/5.00404/CORE
@@ -320,4 +321,3 @@
 ./usr/share/misc/pcvtfonts/vt220l.810
 ./usr/share/misc/pcvtfonts/vt220l.814
 ./usr/share/misc/pcvtfonts/vt220l.816
-./usr/lib/perl5/IO
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index a28bb08bb34..f3f3aaad60b 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -4,17 +4,14 @@
 ./usr/bin/ldd
 ./usr/include/sparc
 ./usr/lib/gcc-lib/sparc-unknown-openbsd2.2
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.7.2.1
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.7.2.1/include
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.7.2.1/include/objc
 ./usr/lib/libacl.so.4.1
 ./usr/lib/libc.so.17.8
 ./usr/lib/libcurses.so.4.2
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
 ./usr/lib/libform.so.1.1
-./usr/lib/libg++.so.27.1
-./usr/lib/libiberty.so.0.0
+./usr/lib/libg++.so.28.0
+./usr/lib/libiberty.so.0.1
 ./usr/lib/libkadm.so.5.0
 ./usr/lib/libkafs.so.5.0
 ./usr/lib/libkdb.so.5.0
@@ -26,9 +23,10 @@
 ./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/libss.so.4.0
-./usr/lib/libstdc++.so.27.1
+./usr/lib/libstdc++.so.28.0
 ./usr/lib/libtelnet.so.1.0
 ./usr/lib/libtermcap.so.0.0
 ./usr/lib/libtermlib.so.3.0
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index e8e27b7dd0c..f72814c5d0a 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -687,6 +687,7 @@
 ./usr/libexec/getty
 ./usr/libexec/identd
 ./usr/libexec/kadmind
+./usr/libexec/kauthd
 ./usr/libexec/kerberos
 ./usr/libexec/kpropd
 ./usr/libexec/locate.bigram
@@ -1084,6 +1085,7 @@
 ./usr/share/man/cat7
 ./usr/share/man/cat8
 ./usr/share/man/cat8/adduser.0
+./usr/share/man/cat8/afterboot.0
 ./usr/share/man/cat8/alpha
 ./usr/share/man/cat8/amiga
 ./usr/share/man/cat8/arc
@@ -1091,6 +1093,7 @@
 ./usr/share/man/cat8/atari
 ./usr/share/man/cat8/hp300
 ./usr/share/man/cat8/i386
+./usr/share/man/cat8/kauthd.0
 ./usr/share/man/cat8/mac68k
 ./usr/share/man/cat8/mvme68k
 ./usr/share/man/cat8/mvme88k
@@ -1192,6 +1195,10 @@
 ./usr/share/skel/dot.mailrc
 ./usr/share/skel/dot.profile
 ./usr/share/skel/dot.rhosts
+./usr/share/smtpd
+./usr/share/smtpd/example.antispam
+./usr/share/smtpd/example.features
+./usr/share/smtpd/example.norelay
 ./usr/share/tabset
 ./usr/share/tabset/3101
 ./usr/share/tabset/9837
@@ -1802,9 +1809,3 @@
 ./var/yp/Makefile.yp
 ./var/yp/Makefile.yp.dist
 ./var/yp/README
-./usr/share/smtpd
-./usr/share/smtpd/example.antispam
-./usr/share/smtpd/example.features
-./usr/share/smtpd/example.norelay
-./usr/libexec/kauthd
-./usr/share/man/cat8/kauthd.0
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index 0889f5ebb2c..665f43532fd 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -84,7 +84,6 @@
 ./usr/lib/gcc-lib/i386-unknown-openbsd2.2/2.8.0/libobjc.a
 ./usr/lib/gcc-lib/i386-unknown-openbsd2.2/2.8.0/specs
 ./usr/lib/libacl_pic.a
-./usr/lib/librx_pic.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
 ./usr/lib/libcurses_pic.a
@@ -113,6 +112,7 @@
 ./usr/lib/libpanel_pic.a
 ./usr/lib/libpcap_pic.a
 ./usr/lib/libresolv_pic.a
+./usr/lib/librx_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libss_pic.a
 ./usr/lib/libstdc++_pic.a
diff --git a/distrib/sets/lists/comp/md.mac68k b/distrib/sets/lists/comp/md.mac68k
index 72e0defee7f..117993cd1d9 100644
--- a/distrib/sets/lists/comp/md.mac68k
+++ b/distrib/sets/lists/comp/md.mac68k
@@ -31,7 +31,6 @@
 ./usr/include/m68k/types.h
 ./usr/include/m68k/varargs.h
 ./usr/include/machine/adbsys.h
-./usr/include/machine/psc.h
 ./usr/include/machine/ansi.h
 ./usr/include/machine/asm.h
 ./usr/include/machine/autoconf.h
@@ -56,6 +55,7 @@
 ./usr/include/machine/pmap.h
 ./usr/include/machine/proc.h
 ./usr/include/machine/profile.h
+./usr/include/machine/psc.h
 ./usr/include/machine/psl.h
 ./usr/include/machine/pte.h
 ./usr/include/machine/ptrace.h
diff --git a/distrib/sets/lists/comp/md.sparc b/distrib/sets/lists/comp/md.sparc
index ea3e6c8e4e9..0ac5543ed0d 100644
--- a/distrib/sets/lists/comp/md.sparc
+++ b/distrib/sets/lists/comp/md.sparc
@@ -54,31 +54,34 @@
 ./usr/include/machine/varargs.h
 ./usr/include/machine/vmparam.h
 ./usr/include/machine/vuid_event.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.7.2.1/SYSCALLS.c.X
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.7.2.1/cc1
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.7.2.1/cc1obj
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.7.2.1/cc1plus
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.7.2.1/cpp
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.7.2.1/f771
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.7.2.1/include/README
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.7.2.1/include/f2c.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.7.2.1/include/float.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.7.2.1/include/limits.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.7.2.1/include/objc/NXConstStr.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.7.2.1/include/objc/Object.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.7.2.1/include/objc/Protocol.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.7.2.1/include/objc/encoding.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.7.2.1/include/objc/hash.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.7.2.1/include/objc/list.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.7.2.1/include/objc/objc-api.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.7.2.1/include/objc/objc.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.7.2.1/include/objc/sarray.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.7.2.1/include/objc/typedstream.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.7.2.1/include/syslimits.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.7.2.1/libf2c.a
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.7.2.1/libgcc.a
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.7.2.1/libobjc.a
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.7.2.1/specs
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.8.0
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.8.0/SYSCALLS.c.X
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.8.0/cc1
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.8.0/cc1obj
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.8.0/cc1plus
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.8.0/cpp
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.8.0/f771
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.8.0/include
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.8.0/include/README
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.8.0/include/f2c.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.8.0/include/limits.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.8.0/include/objc
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.8.0/include/objc/NXConstStr.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.8.0/include/objc/Object.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.8.0/include/objc/Protocol.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.8.0/include/objc/encoding.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.8.0/include/objc/hash.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.8.0/include/objc/objc-api.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.8.0/include/objc/objc-list.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.8.0/include/objc/objc.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.8.0/include/objc/sarray.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.8.0/include/objc/thr.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.8.0/include/objc/typedstream.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.8.0/include/syslimits.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.8.0/libf2c.a
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.8.0/libgcc.a
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.8.0/libobjc.a
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.2/2.8.0/specs
 ./usr/lib/libacl_pic.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
@@ -99,6 +102,7 @@
 ./usr/lib/libpanel_pic.a
 ./usr/lib/libpcap_pic.a
 ./usr/lib/libresolv_pic.a
+./usr/lib/librx_pic.a
 ./usr/lib/libskey_pic.a
 ./usr/lib/libss_pic.a
 ./usr/lib/libstdc++_pic.a
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 4839b035e1f..5a682a920d9 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -3,7 +3,6 @@
 ./usr/bin/as
 ./usr/bin/asa
 ./usr/bin/c++
-./usr/bin/gcov
 ./usr/bin/cc
 ./usr/bin/f77
 ./usr/bin/flex
@@ -12,6 +11,7 @@
 ./usr/bin/g++
 ./usr/bin/g77
 ./usr/bin/gcc
+./usr/bin/gcov
 ./usr/bin/genclass
 ./usr/bin/gprof
 ./usr/bin/ld
@@ -225,56 +225,6 @@
 ./usr/include/frame.h
 ./usr/include/fstab.h
 ./usr/include/fts.h
-./usr/include/g++/alloc.h
-./usr/include/g++/dummy.h
-./usr/include/g++/fstream
-./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++/iomanip
-./usr/include/g++/iosfwd
-./usr/include/g++/iostream
-./usr/include/g++/pthread_alloc
-./usr/include/g++/pthread_alloc.h
-./usr/include/g++/rope
-./usr/include/g++/rope.h
-./usr/include/g++/ropeimpl.h
-./usr/include/g++/slist
-./usr/include/g++/slist.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/ufs/ffs/softdep.h
 ./usr/include/g++/ACG.h
 ./usr/include/g++/AllocRing.h
 ./usr/include/g++/Binomial.h
@@ -318,6 +268,7 @@
 ./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
@@ -349,9 +300,11 @@
 ./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
@@ -476,11 +429,19 @@
 ./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
@@ -506,10 +467,17 @@
 ./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
@@ -525,18 +493,49 @@
 ./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++/type_traits.h
 ./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
@@ -955,6 +954,7 @@
 ./usr/include/ufs/ext2fs/ext2fs_extern.h
 ./usr/include/ufs/ffs/ffs_extern.h
 ./usr/include/ufs/ffs/fs.h
+./usr/include/ufs/ffs/softdep.h
 ./usr/include/ufs/lfs/lfs.h
 ./usr/include/ufs/lfs/lfs_extern.h
 ./usr/include/ufs/mfs/mfs_extern.h
@@ -997,8 +997,6 @@
 ./usr/lib/gcc-lib
 ./usr/lib/gcrt0.o
 ./usr/lib/libacl.a
-./usr/lib/librx.a
-./usr/lib/librx_p.a
 ./usr/lib/libacl_p.a
 ./usr/lib/libc.a
 ./usr/lib/libc_p.a
@@ -1048,6 +1046,8 @@
 ./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/libss.a
diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi
index b772fe5216f..32251c3cad8 100644
--- a/distrib/sets/lists/etc/mi
+++ b/distrib/sets/lists/etc/mi
@@ -27,6 +27,7 @@
 ./etc/ifaliases
 ./etc/inetd.conf
 ./etc/ipf.rules
+./etc/ipnat.rules
 ./etc/kerberosIV/README
 ./etc/kerberosIV/krb.conf
 ./etc/kerberosIV/krb.realms
@@ -48,7 +49,6 @@
 ./etc/namedb/localhost.rev
 ./etc/namedb/named.boot
 ./etc/namedb/root.cache
-./etc/ipnat.rules
 ./etc/netstart
 ./etc/networks
 ./etc/newsyslog.conf
diff --git a/distrib/sets/lists/man/md.i386 b/distrib/sets/lists/man/md.i386
index 663f6a0b6f7..a0476532d92 100644
--- a/distrib/sets/lists/man/md.i386
+++ b/distrib/sets/lists/man/md.i386
@@ -16,10 +16,10 @@
 ./usr/share/man/cat5/keycap.0
 ./usr/share/man/cat5/ranlib.0
 ./usr/share/man/cat8/apm.0
-./usr/share/man/cat8/boot.conf.0
 ./usr/share/man/cat8/apmd.0
 ./usr/share/man/cat8/biosboot.0
 ./usr/share/man/cat8/boot.0
+./usr/share/man/cat8/boot.conf.0
 ./usr/share/man/cat8/fdisk.0
 ./usr/share/man/cat8/i386/bad144.0
 ./usr/share/man/cat8/installboot.0
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index a232d4a903d..2ae550cddba 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1,6 +1,3 @@
-./usr/share/info/gcc.info-26
-./usr/share/info/gcc.info-27
-./usr/share/info/gcc.info-28
 ./usr/share/info/cpp.info
 ./usr/share/info/cpp.info-1
 ./usr/share/info/cpp.info-2
@@ -49,6 +46,9 @@
 ./usr/share/info/gcc.info-23
 ./usr/share/info/gcc.info-24
 ./usr/share/info/gcc.info-25
+./usr/share/info/gcc.info-26
+./usr/share/info/gcc.info-27
+./usr/share/info/gcc.info-28
 ./usr/share/info/gcc.info-3
 ./usr/share/info/gcc.info-4
 ./usr/share/info/gcc.info-5
@@ -341,7 +341,6 @@
 ./usr/share/man/cat1/perlvar.0
 ./usr/share/man/cat1/perlxs.0
 ./usr/share/man/cat1/perlxstut.0
-./usr/share/man/cat1/photurisd.0
 ./usr/share/man/cat1/pkg_add.0
 ./usr/share/man/cat1/pkg_create.0
 ./usr/share/man/cat1/pkg_delete.0
@@ -381,8 +380,6 @@
 ./usr/share/man/cat1/rmdir.0
 ./usr/share/man/cat1/rs.0
 ./usr/share/man/cat1/rsh.0
-./usr/share/man/cat1/rt.0
-./usr/share/man/cat1/rtdelete.0
 ./usr/share/man/cat1/rup.0
 ./usr/share/man/cat1/ruptime.0
 ./usr/share/man/cat1/rusers.0
@@ -406,7 +403,6 @@
 ./usr/share/man/cat1/source.0
 ./usr/share/man/cat1/splain.0
 ./usr/share/man/cat1/split.0
-./usr/share/man/cat1/startkey.0
 ./usr/share/man/cat1/stop.0
 ./usr/share/man/cat1/strings.0
 ./usr/share/man/cat1/stty.0
@@ -641,7 +637,6 @@
 ./usr/share/man/cat8/ac.0
 ./usr/share/man/cat8/accton.0
 ./usr/share/man/cat8/adduser_proc.0
-./usr/share/man/cat8/afterboot.0
 ./usr/share/man/cat8/amd.0
 ./usr/share/man/cat8/amq.0
 ./usr/share/man/cat8/arm32/MAKEDEV.0
@@ -664,6 +659,7 @@
 ./usr/share/man/cat8/clri.0
 ./usr/share/man/cat8/compat_bsdos.0
 ./usr/share/man/cat8/compat_freebsd.0
+./usr/share/man/cat8/compat_ibcs2.0
 ./usr/share/man/cat8/compat_linux.0
 ./usr/share/man/cat8/compat_sunos.0
 ./usr/share/man/cat8/compat_svr4.0
@@ -772,6 +768,7 @@
 ./usr/share/man/cat8/nslookup.0
 ./usr/share/man/cat8/pac.0
 ./usr/share/man/cat8/pcnfsd.0
+./usr/share/man/cat8/photurisd.0
 ./usr/share/man/cat8/ping.0
 ./usr/share/man/cat8/portmap.0
 ./usr/share/man/cat8/ppp.0
@@ -818,6 +815,8 @@
 ./usr/share/man/cat8/rrestore.0
 ./usr/share/man/cat8/rshd.0
 ./usr/share/man/cat8/rstatd.0
+./usr/share/man/cat8/rt.0
+./usr/share/man/cat8/rtdelete.0
 ./usr/share/man/cat8/rtquery.0
 ./usr/share/man/cat8/rusersd.0
 ./usr/share/man/cat8/rwalld.0
@@ -840,6 +839,7 @@
 ./usr/share/man/cat8/smtpfwdd.0
 ./usr/share/man/cat8/spray.0
 ./usr/share/man/cat8/sprayd.0
+./usr/share/man/cat8/startkey.0
 ./usr/share/man/cat8/stdethers.0
 ./usr/share/man/cat8/stdhosts.0
 ./usr/share/man/cat8/sticky.0
@@ -905,4 +905,3 @@
 ./usr/share/man/cat9/splstatclock.0
 ./usr/share/man/cat9/spltty.0
 ./usr/share/man/cat9/splx.0
-./usr/share/man/cat8/compat_ibcs2.0