sync

25 files changed, 178 insertions, 159 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 11dfd81edd0..85cbe7809d8 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -238,6 +238,7 @@
 ./usr/lib/perl5/alpha-openbsd/5.003/sys/dkstat.ph
 ./usr/lib/perl5/alpha-openbsd/5.003/sys/dmap.ph
 ./usr/lib/perl5/alpha-openbsd/5.003/sys/domain.ph
+./usr/lib/perl5/alpha-openbsd/5.003/sys/endian.ph
 ./usr/lib/perl5/alpha-openbsd/5.003/sys/errno.ph
 ./usr/lib/perl5/alpha-openbsd/5.003/sys/exec.ph
 ./usr/lib/perl5/alpha-openbsd/5.003/sys/exec_aout.ph
@@ -260,6 +261,7 @@
 ./usr/lib/perl5/alpha-openbsd/5.003/sys/ktrace.ph
 ./usr/lib/perl5/alpha-openbsd/5.003/sys/lkm.ph
 ./usr/lib/perl5/alpha-openbsd/5.003/sys/localedef.ph
+./usr/lib/perl5/alpha-openbsd/5.003/sys/lock.ph
 ./usr/lib/perl5/alpha-openbsd/5.003/sys/lockf.ph
 ./usr/lib/perl5/alpha-openbsd/5.003/sys/malloc.ph
 ./usr/lib/perl5/alpha-openbsd/5.003/sys/map.ph
@@ -289,6 +291,7 @@
 ./usr/lib/perl5/alpha-openbsd/5.003/sys/siginfo.ph
 ./usr/lib/perl5/alpha-openbsd/5.003/sys/signal.ph
 ./usr/lib/perl5/alpha-openbsd/5.003/sys/signalvar.ph
+./usr/lib/perl5/alpha-openbsd/5.003/sys/simplelock.ph
 ./usr/lib/perl5/alpha-openbsd/5.003/sys/socket.ph
 ./usr/lib/perl5/alpha-openbsd/5.003/sys/socketvar.ph
 ./usr/lib/perl5/alpha-openbsd/5.003/sys/sockio.ph
@@ -358,6 +361,3 @@
 ./usr/mdec/installboot
 ./usr/mdec/netboot
 ./usr/mdec/setnetbootinfo
-./usr/lib/perl5/alpha-openbsd/5.003/sys/endian.ph
-./usr/lib/perl5/alpha-openbsd/5.003/sys/lock.ph
-./usr/lib/perl5/alpha-openbsd/5.003/sys/simplelock.ph
diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index c91972d2c7b..a38b1e8787c 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -1,4 +1,3 @@
-./usr/lib/perl5/m68k-openbsd/5.003/rmd160.ph
 ./dev/mouse
 ./dev/scan0
 ./sbin/binpatch
@@ -10,7 +9,7 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.2/2.7.2.1/include
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.2/2.7.2.1/include/objc
 ./usr/lib/libacl.so.4.0
-./usr/lib/libc.so.17.4
+./usr/lib/libc.so.17.5
 ./usr/lib/libcurses.so.4.0
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
@@ -18,9 +17,9 @@
 ./usr/lib/libg++.so.27.1
 ./usr/lib/libiberty.so.0.0
 ./usr/lib/libkadm.so.4.0
-./usr/lib/libkafs.so.4.0
+./usr/lib/libkafs.so.5.0
 ./usr/lib/libkdb.so.4.1
-./usr/lib/libkrb.so.4.1
+./usr/lib/libkrb.so.6.0
 ./usr/lib/libkvm.so.5.1
 ./usr/lib/libm.so.0.1
 ./usr/lib/libmenu.so.1.0
@@ -284,9 +283,8 @@
 ./usr/lib/perl5/m68k-openbsd/5.003/cpio.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/ctype.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/curses.ph
-./usr/lib/perl5/m68k-openbsd/5.003/des.ph
-./usr/lib/perl5/m68k-openbsd/5.003/gmp.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/db.ph
+./usr/lib/perl5/m68k-openbsd/5.003/des.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/dirent.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/disktab.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/dlfcn.ph
@@ -302,6 +300,7 @@
 ./usr/lib/perl5/m68k-openbsd/5.003/fstab.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/fts.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/glob.ph
+./usr/lib/perl5/m68k-openbsd/5.003/gmp.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/grp.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/histedit.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/ieeefp.ph
@@ -407,6 +406,7 @@
 ./usr/lib/perl5/m68k-openbsd/5.003/regex.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/regexp.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/resolv.ph
+./usr/lib/perl5/m68k-openbsd/5.003/rmd160.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/scsi.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/search.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/setjmp.ph
@@ -443,6 +443,7 @@
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/dkstat.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/dmap.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/domain.ph
+./usr/lib/perl5/m68k-openbsd/5.003/sys/endian.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/errno.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/exec.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/exec_aout.ph
@@ -465,6 +466,7 @@
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/ktrace.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/lkm.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/localedef.ph
+./usr/lib/perl5/m68k-openbsd/5.003/sys/lock.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/lockf.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/malloc.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/map.ph
@@ -494,6 +496,7 @@
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/siginfo.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/signal.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/signalvar.ph
+./usr/lib/perl5/m68k-openbsd/5.003/sys/simplelock.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/socket.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/socketvar.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/sockio.ph
@@ -563,6 +566,3 @@
 ./usr/share/keymaps/amiga/din.map
 ./usr/share/keymaps/amiga/sw.map
 ./usr/share/keymaps/amiga/us.map
-./usr/lib/perl5/m68k-openbsd/5.003/sys/endian.ph
-./usr/lib/perl5/m68k-openbsd/5.003/sys/lock.ph
-./usr/lib/perl5/m68k-openbsd/5.003/sys/simplelock.ph
diff --git a/distrib/sets/lists/base/md.arc b/distrib/sets/lists/base/md.arc
index ca2a4fd2818..703b6a43d4f 100644
--- a/distrib/sets/lists/base/md.arc
+++ b/distrib/sets/lists/base/md.arc
@@ -11,15 +11,15 @@
 ./usr/lib/gcc-lib/mipsel-unknown-openbsd2.2/2.7.2.1/include
 ./usr/lib/gcc-lib/mipsel-unknown-openbsd2.2/2.7.2.1/include/objc
 ./usr/lib/libacl.so.4.0
-./usr/lib/libc.so.17.4
+./usr/lib/libc.so.17.5
 ./usr/lib/libcurses.so.4.0
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
 ./usr/lib/libform.so.1.0
 ./usr/lib/libkadm.so.4.0
-./usr/lib/libkafs.so.4.0
+./usr/lib/libkafs.so.5.0
 ./usr/lib/libkdb.so.4.1
-./usr/lib/libkrb.so.4.1
+./usr/lib/libkrb.so.6.0
 ./usr/lib/libkvm.so.4.1
 ./usr/lib/libm.so.0.1
 ./usr/lib/libmenu.so.1.0
@@ -116,12 +116,12 @@
 ./usr/lib/perl5/mips-openbsd/5.003/gmp.ph
 ./usr/lib/perl5/mips-openbsd/5.003/grp.ph
 ./usr/lib/perl5/mips-openbsd/5.003/histedit.ph
-./usr/lib/perl5/mips-openbsd/5.003/inttypes.ph
-./usr/lib/perl5/mips-openbsd/5.003/libgen.ph
 ./usr/lib/perl5/mips-openbsd/5.003/ieeefp.ph
+./usr/lib/perl5/mips-openbsd/5.003/inttypes.ph
 ./usr/lib/perl5/mips-openbsd/5.003/iso646.ph
 ./usr/lib/perl5/mips-openbsd/5.003/kvm.ph
 ./usr/lib/perl5/mips-openbsd/5.003/langinfo.ph
+./usr/lib/perl5/mips-openbsd/5.003/libgen.ph
 ./usr/lib/perl5/mips-openbsd/5.003/limits.ph
 ./usr/lib/perl5/mips-openbsd/5.003/link.ph
 ./usr/lib/perl5/mips-openbsd/5.003/locale.ph
@@ -266,6 +266,7 @@
 ./usr/lib/perl5/mips-openbsd/5.003/sys/dkstat.ph
 ./usr/lib/perl5/mips-openbsd/5.003/sys/dmap.ph
 ./usr/lib/perl5/mips-openbsd/5.003/sys/domain.ph
+./usr/lib/perl5/mips-openbsd/5.003/sys/endian.ph
 ./usr/lib/perl5/mips-openbsd/5.003/sys/errno.ph
 ./usr/lib/perl5/mips-openbsd/5.003/sys/exec.ph
 ./usr/lib/perl5/mips-openbsd/5.003/sys/exec_aout.ph
@@ -288,6 +289,7 @@
 ./usr/lib/perl5/mips-openbsd/5.003/sys/ktrace.ph
 ./usr/lib/perl5/mips-openbsd/5.003/sys/lkm.ph
 ./usr/lib/perl5/mips-openbsd/5.003/sys/localedef.ph
+./usr/lib/perl5/mips-openbsd/5.003/sys/lock.ph
 ./usr/lib/perl5/mips-openbsd/5.003/sys/lockf.ph
 ./usr/lib/perl5/mips-openbsd/5.003/sys/malloc.ph
 ./usr/lib/perl5/mips-openbsd/5.003/sys/map.ph
@@ -317,6 +319,7 @@
 ./usr/lib/perl5/mips-openbsd/5.003/sys/siginfo.ph
 ./usr/lib/perl5/mips-openbsd/5.003/sys/signal.ph
 ./usr/lib/perl5/mips-openbsd/5.003/sys/signalvar.ph
+./usr/lib/perl5/mips-openbsd/5.003/sys/simplelock.ph
 ./usr/lib/perl5/mips-openbsd/5.003/sys/socket.ph
 ./usr/lib/perl5/mips-openbsd/5.003/sys/socketvar.ph
 ./usr/lib/perl5/mips-openbsd/5.003/sys/sockio.ph
@@ -383,6 +386,3 @@
 ./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.003/sys/endian.ph
-./usr/lib/perl5/mips-openbsd/5.003/sys/lock.ph
-./usr/lib/perl5/mips-openbsd/5.003/sys/simplelock.ph
diff --git a/distrib/sets/lists/base/md.atari b/distrib/sets/lists/base/md.atari
index fc6db0acfa7..6a858f22527 100644
--- a/distrib/sets/lists/base/md.atari
+++ b/distrib/sets/lists/base/md.atari
@@ -1,10 +1,9 @@
-./usr/lib/perl5/m68k-openbsd/5.003/rmd160.ph
 ./dev/scan0
 ./sbin/ldconfig
 ./usr/bin/ldd
 ./usr/include/m68k
 ./usr/lib/libacl.so.4.0
-./usr/lib/libc.so.17.4
+./usr/lib/libc.so.17.5
 ./usr/lib/libcurses.so.4.0
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
@@ -12,9 +11,9 @@
 ./usr/lib/libg++.so.27.1
 ./usr/lib/libiberty.so.0.0
 ./usr/lib/libkadm.so.4.0
-./usr/lib/libkafs.so.4.0
+./usr/lib/libkafs.so.5.0
 ./usr/lib/libkdb.so.4.1
-./usr/lib/libkrb.so.4.1
+./usr/lib/libkrb.so.6.0
 ./usr/lib/libkvm.so.5.1
 ./usr/lib/libm.so.0.1
 ./usr/lib/libmenu.so.1.0
@@ -31,5 +30,6 @@
 ./usr/lib/libutil.so.4.1
 ./usr/lib/libwrap.so.1.0
 ./usr/lib/libz.so.1.2
+./usr/lib/perl5/m68k-openbsd/5.003/rmd160.ph
 ./usr/libexec/ld.so
 ./usr/sbin/iteconfig
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 933032fd412..43649d3398a 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -1,4 +1,3 @@
-./usr/lib/perl5/m68k-openbsd/5.003/rmd160.ph
 ./sbin/ldconfig
 ./usr/bin/ldd
 ./usr/include/m68k
@@ -7,7 +6,7 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.2/2.7.2.1/include
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.2/2.7.2.1/include/objc
 ./usr/lib/libacl.so.4.0
-./usr/lib/libc.so.17.4
+./usr/lib/libc.so.17.5
 ./usr/lib/libcurses.so.4.0
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
@@ -15,9 +14,9 @@
 ./usr/lib/libg++.so.27.1
 ./usr/lib/libiberty.so.0.0
 ./usr/lib/libkadm.so.4.0
-./usr/lib/libkafs.so.4.0
+./usr/lib/libkafs.so.5.0
 ./usr/lib/libkdb.so.4.1
-./usr/lib/libkrb.so.4.1
+./usr/lib/libkrb.so.6.0
 ./usr/lib/libkvm.so.4.1
 ./usr/lib/libm.so.0.1
 ./usr/lib/libmenu.so.1.0
@@ -281,12 +280,8 @@
 ./usr/lib/perl5/m68k-openbsd/5.003/cpio.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/ctype.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/curses.ph
-./usr/lib/perl5/m68k-openbsd/5.003/inttypes.ph
-./usr/lib/perl5/m68k-openbsd/5.003/libgen.ph
-./usr/lib/perl5/m68k-openbsd/5.003/machine/hp300spu.ph
-./usr/lib/perl5/m68k-openbsd/5.003/des.ph
-./usr/lib/perl5/m68k-openbsd/5.003/gmp.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/db.ph
+./usr/lib/perl5/m68k-openbsd/5.003/des.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/dirent.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/disktab.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/dlfcn.ph
@@ -302,12 +297,15 @@
 ./usr/lib/perl5/m68k-openbsd/5.003/fstab.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/fts.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/glob.ph
+./usr/lib/perl5/m68k-openbsd/5.003/gmp.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/grp.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/histedit.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/ieeefp.ph
+./usr/lib/perl5/m68k-openbsd/5.003/inttypes.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/iso646.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/kvm.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/langinfo.ph
+./usr/lib/perl5/m68k-openbsd/5.003/libgen.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/limits.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/link.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/locale.ph
@@ -323,6 +321,7 @@
 ./usr/lib/perl5/m68k-openbsd/5.003/machine/exec.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/machine/float.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/machine/frame.ph
+./usr/lib/perl5/m68k-openbsd/5.003/machine/hp300spu.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/machine/hpux_machdep.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/machine/ieeefp.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/machine/intr.ph
@@ -400,6 +399,7 @@
 ./usr/lib/perl5/m68k-openbsd/5.003/regex.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/regexp.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/resolv.ph
+./usr/lib/perl5/m68k-openbsd/5.003/rmd160.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/scsi.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/search.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/setjmp.ph
@@ -436,6 +436,7 @@
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/dkstat.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/dmap.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/domain.ph
+./usr/lib/perl5/m68k-openbsd/5.003/sys/endian.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/errno.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/exec.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/exec_aout.ph
@@ -458,6 +459,7 @@
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/ktrace.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/lkm.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/localedef.ph
+./usr/lib/perl5/m68k-openbsd/5.003/sys/lock.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/lockf.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/malloc.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/map.ph
@@ -487,6 +489,7 @@
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/siginfo.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/signal.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/signalvar.ph
+./usr/lib/perl5/m68k-openbsd/5.003/sys/simplelock.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/socket.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/socketvar.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/sockio.ph
@@ -552,14 +555,11 @@
 ./usr/mdec/ctboot
 ./usr/mdec/hdboot
 ./usr/mdec/installboot
+./usr/mdec/isolif
 ./usr/mdec/rbootd
 ./usr/mdec/rbootd/SYS_UBOOT
 ./usr/mdec/sdboot
 ./usr/mdec/uboot.lif
+./usr/mdec/uboot.raw
 ./usr/sbin/grfinfo
 ./usr/sbin/hilinfo
-./usr/mdec/uboot.raw
-./usr/mdec/isolif
-./usr/lib/perl5/m68k-openbsd/5.003/sys/endian.ph
-./usr/lib/perl5/m68k-openbsd/5.003/sys/lock.ph
-./usr/lib/perl5/m68k-openbsd/5.003/sys/simplelock.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index b69df8d604a..9ad8fcd3e25 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -1,4 +1,3 @@
-./usr/lib/perl5/i386-openbsd/5.003/rmd160.ph
 ./dev/pcmcia
 ./dev/scan0
 ./dev/scan1
@@ -14,7 +13,7 @@
 ./usr/lib/gcc-lib/i386-unknown-openbsd2.2/2.7.2.1/include
 ./usr/lib/gcc-lib/i386-unknown-openbsd2.2/2.7.2.1/include/objc
 ./usr/lib/libacl.so.4.0
-./usr/lib/libc.so.17.4
+./usr/lib/libc.so.17.5
 ./usr/lib/libcurses.so.4.0
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
@@ -23,9 +22,9 @@
 ./usr/lib/libi386.so.0.2
 ./usr/lib/libiberty.so.0.0
 ./usr/lib/libkadm.so.4.0
-./usr/lib/libkafs.so.4.0
+./usr/lib/libkafs.so.5.0
 ./usr/lib/libkdb.so.4.1
-./usr/lib/libkrb.so.4.1
+./usr/lib/libkrb.so.6.0
 ./usr/lib/libkvm.so.4.1
 ./usr/lib/libm.so.0.1
 ./usr/lib/libm_i387.so.0.1
@@ -292,7 +291,6 @@
 ./usr/lib/perl5/i386-openbsd/5.003/curses.ph
 ./usr/lib/perl5/i386-openbsd/5.003/db.ph
 ./usr/lib/perl5/i386-openbsd/5.003/des.ph
-./usr/lib/perl5/i386-openbsd/5.003/gmp.ph
 ./usr/lib/perl5/i386-openbsd/5.003/dirent.ph
 ./usr/lib/perl5/i386-openbsd/5.003/disktab.ph
 ./usr/lib/perl5/i386-openbsd/5.003/dlfcn.ph
@@ -308,12 +306,15 @@
 ./usr/lib/perl5/i386-openbsd/5.003/fstab.ph
 ./usr/lib/perl5/i386-openbsd/5.003/fts.ph
 ./usr/lib/perl5/i386-openbsd/5.003/glob.ph
+./usr/lib/perl5/i386-openbsd/5.003/gmp.ph
 ./usr/lib/perl5/i386-openbsd/5.003/grp.ph
 ./usr/lib/perl5/i386-openbsd/5.003/histedit.ph
 ./usr/lib/perl5/i386-openbsd/5.003/ieeefp.ph
+./usr/lib/perl5/i386-openbsd/5.003/inttypes.ph
 ./usr/lib/perl5/i386-openbsd/5.003/iso646.ph
 ./usr/lib/perl5/i386-openbsd/5.003/kvm.ph
 ./usr/lib/perl5/i386-openbsd/5.003/langinfo.ph
+./usr/lib/perl5/i386-openbsd/5.003/libgen.ph
 ./usr/lib/perl5/i386-openbsd/5.003/limits.ph
 ./usr/lib/perl5/i386-openbsd/5.003/link.ph
 ./usr/lib/perl5/i386-openbsd/5.003/locale.ph
@@ -321,6 +322,7 @@
 ./usr/lib/perl5/i386-openbsd/5.003/machine/ansi.ph
 ./usr/lib/perl5/i386-openbsd/5.003/machine/apmvar.ph
 ./usr/lib/perl5/i386-openbsd/5.003/machine/asm.ph
+./usr/lib/perl5/i386-openbsd/5.003/machine/biosvar.ph
 ./usr/lib/perl5/i386-openbsd/5.003/machine/bus.ph
 ./usr/lib/perl5/i386-openbsd/5.003/machine/cdefs.ph
 ./usr/lib/perl5/i386-openbsd/5.003/machine/conf.ph
@@ -380,8 +382,8 @@
 ./usr/lib/perl5/i386-openbsd/5.003/ndbm.ph
 ./usr/lib/perl5/i386-openbsd/5.003/net
 ./usr/lib/perl5/i386-openbsd/5.003/net/bpf.ph
-./usr/lib/perl5/i386-openbsd/5.003/net/encap.ph
 ./usr/lib/perl5/i386-openbsd/5.003/net/bpfdesc.ph
+./usr/lib/perl5/i386-openbsd/5.003/net/encap.ph
 ./usr/lib/perl5/i386-openbsd/5.003/net/if.ph
 ./usr/lib/perl5/i386-openbsd/5.003/net/if_arp.ph
 ./usr/lib/perl5/i386-openbsd/5.003/net/if_atm.ph
@@ -427,6 +429,7 @@
 ./usr/lib/perl5/i386-openbsd/5.003/regex.ph
 ./usr/lib/perl5/i386-openbsd/5.003/regexp.ph
 ./usr/lib/perl5/i386-openbsd/5.003/resolv.ph
+./usr/lib/perl5/i386-openbsd/5.003/rmd160.ph
 ./usr/lib/perl5/i386-openbsd/5.003/scsi.ph
 ./usr/lib/perl5/i386-openbsd/5.003/search.ph
 ./usr/lib/perl5/i386-openbsd/5.003/setjmp.ph
@@ -463,6 +466,7 @@
 ./usr/lib/perl5/i386-openbsd/5.003/sys/dkstat.ph
 ./usr/lib/perl5/i386-openbsd/5.003/sys/dmap.ph
 ./usr/lib/perl5/i386-openbsd/5.003/sys/domain.ph
+./usr/lib/perl5/i386-openbsd/5.003/sys/endian.ph
 ./usr/lib/perl5/i386-openbsd/5.003/sys/errno.ph
 ./usr/lib/perl5/i386-openbsd/5.003/sys/exec.ph
 ./usr/lib/perl5/i386-openbsd/5.003/sys/exec_aout.ph
@@ -485,6 +489,7 @@
 ./usr/lib/perl5/i386-openbsd/5.003/sys/ktrace.ph
 ./usr/lib/perl5/i386-openbsd/5.003/sys/lkm.ph
 ./usr/lib/perl5/i386-openbsd/5.003/sys/localedef.ph
+./usr/lib/perl5/i386-openbsd/5.003/sys/lock.ph
 ./usr/lib/perl5/i386-openbsd/5.003/sys/lockf.ph
 ./usr/lib/perl5/i386-openbsd/5.003/sys/malloc.ph
 ./usr/lib/perl5/i386-openbsd/5.003/sys/map.ph
@@ -514,6 +519,7 @@
 ./usr/lib/perl5/i386-openbsd/5.003/sys/siginfo.ph
 ./usr/lib/perl5/i386-openbsd/5.003/sys/signal.ph
 ./usr/lib/perl5/i386-openbsd/5.003/sys/signalvar.ph
+./usr/lib/perl5/i386-openbsd/5.003/sys/simplelock.ph
 ./usr/lib/perl5/i386-openbsd/5.003/sys/socket.ph
 ./usr/lib/perl5/i386-openbsd/5.003/sys/socketvar.ph
 ./usr/lib/perl5/i386-openbsd/5.003/sys/sockio.ph
@@ -543,8 +549,6 @@
 ./usr/lib/perl5/i386-openbsd/5.003/sys/un.ph
 ./usr/lib/perl5/i386-openbsd/5.003/sys/unistd.ph
 ./usr/lib/perl5/i386-openbsd/5.003/sys/unpcb.ph
-./usr/lib/perl5/i386-openbsd/5.003/inttypes.ph
-./usr/lib/perl5/i386-openbsd/5.003/libgen.ph
 ./usr/lib/perl5/i386-openbsd/5.003/sys/user.ph
 ./usr/lib/perl5/i386-openbsd/5.003/sys/utsname.ph
 ./usr/lib/perl5/i386-openbsd/5.003/sys/vadvise.ph
@@ -573,7 +577,6 @@
 ./usr/lib/perl5/i386-openbsd/5.003/vis.ph
 ./usr/lib/perl5/i386-openbsd/5.003/zconf.ph
 ./usr/lib/perl5/i386-openbsd/5.003/zlib.ph
-./usr/lib/perl5/i386-openbsd/5.003/machine/biosvar.ph
 ./usr/lib/perl5/site_perl/i386-openbsd
 ./usr/libexec/ld.so
 ./usr/lkm/ap.o
@@ -612,6 +615,3 @@
 ./usr/share/misc/pcvtfonts/vt220l.810
 ./usr/share/misc/pcvtfonts/vt220l.814
 ./usr/share/misc/pcvtfonts/vt220l.816
-./usr/lib/perl5/i386-openbsd/5.003/sys/endian.ph
-./usr/lib/perl5/i386-openbsd/5.003/sys/lock.ph
-./usr/lib/perl5/i386-openbsd/5.003/sys/simplelock.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 012c9406e9c..9b135bd0489 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -1,4 +1,3 @@
-./usr/lib/perl5/m68k-openbsd/5.003/rmd160.ph
 ./dev/scan0
 ./sbin/ldconfig
 ./usr/bin/ldd
@@ -8,7 +7,7 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.2/2.7.2.1/include
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.2/2.7.2.1/include/objc
 ./usr/lib/libacl.so.4.0
-./usr/lib/libc.so.17.4
+./usr/lib/libc.so.17.5
 ./usr/lib/libcurses.so.4.0
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
@@ -16,9 +15,9 @@
 ./usr/lib/libg++.so.27.1
 ./usr/lib/libiberty.so.0.0
 ./usr/lib/libkadm.so.4.0
-./usr/lib/libkafs.so.4.0
+./usr/lib/libkafs.so.5.0
 ./usr/lib/libkdb.so.4.1
-./usr/lib/libkrb.so.4.1
+./usr/lib/libkrb.so.6.0
 ./usr/lib/libkvm.so.4.1
 ./usr/lib/libm.so.0.1
 ./usr/lib/libmenu.so.1.0
@@ -282,9 +281,8 @@
 ./usr/lib/perl5/m68k-openbsd/5.003/cpio.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/ctype.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/curses.ph
-./usr/lib/perl5/m68k-openbsd/5.003/des.ph
-./usr/lib/perl5/m68k-openbsd/5.003/gmp.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/db.ph
+./usr/lib/perl5/m68k-openbsd/5.003/des.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/dirent.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/disktab.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/dlfcn.ph
@@ -300,11 +298,12 @@
 ./usr/lib/perl5/m68k-openbsd/5.003/fstab.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/fts.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/glob.ph
+./usr/lib/perl5/m68k-openbsd/5.003/gmp.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/grp.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/histedit.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/ieeefp.ph
-./usr/lib/perl5/m68k-openbsd/5.003/iso646.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/inttypes.ph
+./usr/lib/perl5/m68k-openbsd/5.003/iso646.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/kvm.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/langinfo.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/libgen.ph
@@ -409,6 +408,7 @@
 ./usr/lib/perl5/m68k-openbsd/5.003/regex.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/regexp.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/resolv.ph
+./usr/lib/perl5/m68k-openbsd/5.003/rmd160.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/scsi.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/search.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/setjmp.ph
@@ -445,6 +445,7 @@
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/dkstat.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/dmap.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/domain.ph
+./usr/lib/perl5/m68k-openbsd/5.003/sys/endian.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/errno.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/exec.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/exec_aout.ph
@@ -467,11 +468,12 @@
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/ktrace.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/lkm.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/localedef.ph
+./usr/lib/perl5/m68k-openbsd/5.003/sys/lock.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/lockf.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/malloc.ph
-./usr/lib/perl5/m68k-openbsd/5.003/sys/md5k.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/map.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/mbuf.ph
+./usr/lib/perl5/m68k-openbsd/5.003/sys/md5k.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/mman.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/mount.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/msg.ph
@@ -496,6 +498,7 @@
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/siginfo.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/signal.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/signalvar.ph
+./usr/lib/perl5/m68k-openbsd/5.003/sys/simplelock.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/socket.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/socketvar.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/sockio.ph
@@ -555,6 +558,3 @@
 ./usr/lib/perl5/m68k-openbsd/5.003/zlib.ph
 ./usr/lib/perl5/site_perl/m68k-openbsd
 ./usr/libexec/ld.so
-./usr/lib/perl5/m68k-openbsd/5.003/sys/endian.ph
-./usr/lib/perl5/m68k-openbsd/5.003/sys/lock.ph
-./usr/lib/perl5/m68k-openbsd/5.003/sys/simplelock.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index cf6b564400c..ed2a47bb862 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -7,7 +7,7 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.2/2.7.2.1/include
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.2/2.7.2.1/include/objc
 ./usr/lib/libacl.so.4.0
-./usr/lib/libc.so.17.4
+./usr/lib/libc.so.17.5
 ./usr/lib/libcurses.so.4.0
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
@@ -15,9 +15,9 @@
 ./usr/lib/libg++.so.27.1
 ./usr/lib/libiberty.so.0.0
 ./usr/lib/libkadm.so.4.0
-./usr/lib/libkafs.so.4.0
+./usr/lib/libkafs.so.5.0
 ./usr/lib/libkdb.so.4.1
-./usr/lib/libkrb.so.4.1
+./usr/lib/libkrb.so.6.0
 ./usr/lib/libkvm.so.4.1
 ./usr/lib/libm.so.0.1
 ./usr/lib/libmenu.so.1.0
@@ -438,6 +438,7 @@
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/dkstat.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/dmap.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/domain.ph
+./usr/lib/perl5/m68k-openbsd/5.003/sys/endian.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/errno.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/exec.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/exec_aout.ph
@@ -460,6 +461,7 @@
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/ktrace.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/lkm.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/localedef.ph
+./usr/lib/perl5/m68k-openbsd/5.003/sys/lock.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/lockf.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/malloc.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/map.ph
@@ -489,6 +491,7 @@
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/siginfo.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/signal.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/signalvar.ph
+./usr/lib/perl5/m68k-openbsd/5.003/sys/simplelock.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/socket.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/socketvar.ph
 ./usr/lib/perl5/m68k-openbsd/5.003/sys/sockio.ph
@@ -556,6 +559,3 @@
 ./usr/mdec/rboot
 ./usr/mdec/sboot
 ./usr/mdec/stboot
-./usr/lib/perl5/m68k-openbsd/5.003/sys/endian.ph
-./usr/lib/perl5/m68k-openbsd/5.003/sys/lock.ph
-./usr/lib/perl5/m68k-openbsd/5.003/sys/simplelock.ph
diff --git a/distrib/sets/lists/base/md.pc532 b/distrib/sets/lists/base/md.pc532
index 086c009343e..ab59d8fd54e 100644
--- a/distrib/sets/lists/base/md.pc532
+++ b/distrib/sets/lists/base/md.pc532
@@ -1,10 +1,9 @@
-./usr/lib/perl5/pc532-openbsd/5.003/rmd160.ph
 ./dev/scan0
 ./sbin/bim
 ./usr/bin/ldd
 ./usr/include/ns32k
 ./usr/lib/libacl.so.4.0
-./usr/lib/libc.so.17.4
+./usr/lib/libc.so.17.5
 ./usr/lib/libcurses.so.4.0
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
@@ -31,6 +30,7 @@
 ./usr/lib/libutil.so.4.1
 ./usr/lib/libwrap.so.1.0
 ./usr/lib/libz.so.1.2
+./usr/lib/perl5/pc532-openbsd/5.003/rmd160.ph
 ./usr/libexec/ld.so
 ./usr/mdec/boot
 ./usr/mdec/zboot.o
diff --git a/distrib/sets/lists/base/md.pmax b/distrib/sets/lists/base/md.pmax
index c6ac53b3b82..57400932347 100644
--- a/distrib/sets/lists/base/md.pmax
+++ b/distrib/sets/lists/base/md.pmax
@@ -8,15 +8,15 @@
 ./usr/lib/gcc-lib/mipsel-unknown-openbsd2.2/2.7.2.1/include
 ./usr/lib/gcc-lib/mipsel-unknown-openbsd2.2/2.7.2.1/include/objc
 ./usr/lib/libacl.so.4.0
-./usr/lib/libc.so.17.4
+./usr/lib/libc.so.17.5
 ./usr/lib/libcurses.so.4.0
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
 ./usr/lib/libform.so.1.0
 ./usr/lib/libkadm.so.4.0
-./usr/lib/libkafs.so.4.0
+./usr/lib/libkafs.so.5.0
 ./usr/lib/libkdb.so.4.1
-./usr/lib/libkrb.so.4.1
+./usr/lib/libkrb.so.6.0
 ./usr/lib/libkvm.so.4.1
 ./usr/lib/libm.so.0.1
 ./usr/lib/libmenu.so.1.0
@@ -32,6 +32,12 @@
 ./usr/lib/libutil.so.4.1
 ./usr/lib/libwrap.so.1.0
 ./usr/lib/libz.so.1.2
+./usr/lib/perl5/auto/Text
+./usr/lib/perl5/auto/Text/ParseWords
+./usr/lib/perl5/auto/Text/ParseWords/autosplit.ix
+./usr/lib/perl5/auto/Text/ParseWords/old_shellwords.al
+./usr/lib/perl5/auto/Text/ParseWords/quotewords.al
+./usr/lib/perl5/auto/Text/ParseWords/shellwords.al
 ./usr/lib/perl5/mips-openbsd
 ./usr/lib/perl5/mips-openbsd/5.003
 ./usr/lib/perl5/mips-openbsd/5.003/CORE
@@ -90,9 +96,8 @@
 ./usr/lib/perl5/mips-openbsd/5.003/cpio.ph
 ./usr/lib/perl5/mips-openbsd/5.003/ctype.ph
 ./usr/lib/perl5/mips-openbsd/5.003/curses.ph
-./usr/lib/perl5/mips-openbsd/5.003/des.ph
-./usr/lib/perl5/mips-openbsd/5.003/gmp.ph
 ./usr/lib/perl5/mips-openbsd/5.003/db.ph
+./usr/lib/perl5/mips-openbsd/5.003/des.ph
 ./usr/lib/perl5/mips-openbsd/5.003/dirent.ph
 ./usr/lib/perl5/mips-openbsd/5.003/disktab.ph
 ./usr/lib/perl5/mips-openbsd/5.003/dlfcn.ph
@@ -108,6 +113,7 @@
 ./usr/lib/perl5/mips-openbsd/5.003/fstab.ph
 ./usr/lib/perl5/mips-openbsd/5.003/fts.ph
 ./usr/lib/perl5/mips-openbsd/5.003/glob.ph
+./usr/lib/perl5/mips-openbsd/5.003/gmp.ph
 ./usr/lib/perl5/mips-openbsd/5.003/grp.ph
 ./usr/lib/perl5/mips-openbsd/5.003/histedit.ph
 ./usr/lib/perl5/mips-openbsd/5.003/ieeefp.ph
@@ -169,9 +175,9 @@
 ./usr/lib/perl5/mips-openbsd/5.003/machine/reloc.ph
 ./usr/lib/perl5/mips-openbsd/5.003/machine/setjmp.ph
 ./usr/lib/perl5/mips-openbsd/5.003/machine/signal.ph
-./usr/lib/perl5/mips-openbsd/5.003/machine/trap.ph
 ./usr/lib/perl5/mips-openbsd/5.003/machine/stdarg.ph
 ./usr/lib/perl5/mips-openbsd/5.003/machine/tc_machdep.ph
+./usr/lib/perl5/mips-openbsd/5.003/machine/trap.ph
 ./usr/lib/perl5/mips-openbsd/5.003/machine/types.ph
 ./usr/lib/perl5/mips-openbsd/5.003/machine/varargs.ph
 ./usr/lib/perl5/mips-openbsd/5.003/machine/vmparam.ph
@@ -233,6 +239,7 @@
 ./usr/lib/perl5/mips-openbsd/5.003/regex.ph
 ./usr/lib/perl5/mips-openbsd/5.003/regexp.ph
 ./usr/lib/perl5/mips-openbsd/5.003/resolv.ph
+./usr/lib/perl5/mips-openbsd/5.003/rmd160.ph
 ./usr/lib/perl5/mips-openbsd/5.003/scsi.ph
 ./usr/lib/perl5/mips-openbsd/5.003/search.ph
 ./usr/lib/perl5/mips-openbsd/5.003/setjmp.ph
@@ -269,6 +276,7 @@
 ./usr/lib/perl5/mips-openbsd/5.003/sys/dkstat.ph
 ./usr/lib/perl5/mips-openbsd/5.003/sys/dmap.ph
 ./usr/lib/perl5/mips-openbsd/5.003/sys/domain.ph
+./usr/lib/perl5/mips-openbsd/5.003/sys/endian.ph
 ./usr/lib/perl5/mips-openbsd/5.003/sys/errno.ph
 ./usr/lib/perl5/mips-openbsd/5.003/sys/exec.ph
 ./usr/lib/perl5/mips-openbsd/5.003/sys/exec_aout.ph
@@ -291,6 +299,7 @@
 ./usr/lib/perl5/mips-openbsd/5.003/sys/ktrace.ph
 ./usr/lib/perl5/mips-openbsd/5.003/sys/lkm.ph
 ./usr/lib/perl5/mips-openbsd/5.003/sys/localedef.ph
+./usr/lib/perl5/mips-openbsd/5.003/sys/lock.ph
 ./usr/lib/perl5/mips-openbsd/5.003/sys/lockf.ph
 ./usr/lib/perl5/mips-openbsd/5.003/sys/malloc.ph
 ./usr/lib/perl5/mips-openbsd/5.003/sys/map.ph
@@ -320,6 +329,7 @@
 ./usr/lib/perl5/mips-openbsd/5.003/sys/siginfo.ph
 ./usr/lib/perl5/mips-openbsd/5.003/sys/signal.ph
 ./usr/lib/perl5/mips-openbsd/5.003/sys/signalvar.ph
+./usr/lib/perl5/mips-openbsd/5.003/sys/simplelock.ph
 ./usr/lib/perl5/mips-openbsd/5.003/sys/socket.ph
 ./usr/lib/perl5/mips-openbsd/5.003/sys/socketvar.ph
 ./usr/lib/perl5/mips-openbsd/5.003/sys/sockio.ph
@@ -377,12 +387,6 @@
 ./usr/lib/perl5/mips-openbsd/5.003/vis.ph
 ./usr/lib/perl5/mips-openbsd/5.003/zconf.ph
 ./usr/lib/perl5/mips-openbsd/5.003/zlib.ph
-./usr/lib/perl5/auto/Text
-./usr/lib/perl5/auto/Text/ParseWords
-./usr/lib/perl5/auto/Text/ParseWords/autosplit.ix
-./usr/lib/perl5/auto/Text/ParseWords/old_shellwords.al
-./usr/lib/perl5/auto/Text/ParseWords/quotewords.al
-./usr/lib/perl5/auto/Text/ParseWords/shellwords.al
 ./usr/lib/perl5/site_perl/mips-openbsd
 ./usr/lib/scrt0.o
 ./usr/libexec/ld.so
@@ -392,7 +396,3 @@
 ./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.003/rmd160.ph
-./usr/lib/perl5/mips-openbsd/5.003/sys/endian.ph
-./usr/lib/perl5/mips-openbsd/5.003/sys/lock.ph
-./usr/lib/perl5/mips-openbsd/5.003/sys/simplelock.ph
diff --git a/distrib/sets/lists/base/md.powerpc b/distrib/sets/lists/base/md.powerpc
index 1a18f116df0..fcefa38f617 100644
--- a/distrib/sets/lists/base/md.powerpc
+++ b/distrib/sets/lists/base/md.powerpc
@@ -189,6 +189,7 @@
 ./usr/lib/perl5/powerpc-openbsd/5.003/regex.ph
 ./usr/lib/perl5/powerpc-openbsd/5.003/regexp.ph
 ./usr/lib/perl5/powerpc-openbsd/5.003/resolv.ph
+./usr/lib/perl5/powerpc-openbsd/5.003/rmd160.ph
 ./usr/lib/perl5/powerpc-openbsd/5.003/scsi.ph
 ./usr/lib/perl5/powerpc-openbsd/5.003/search.ph
 ./usr/lib/perl5/powerpc-openbsd/5.003/setjmp.ph
@@ -225,6 +226,7 @@
 ./usr/lib/perl5/powerpc-openbsd/5.003/sys/dkstat.ph
 ./usr/lib/perl5/powerpc-openbsd/5.003/sys/dmap.ph
 ./usr/lib/perl5/powerpc-openbsd/5.003/sys/domain.ph
+./usr/lib/perl5/powerpc-openbsd/5.003/sys/endian.ph
 ./usr/lib/perl5/powerpc-openbsd/5.003/sys/errno.ph
 ./usr/lib/perl5/powerpc-openbsd/5.003/sys/exec.ph
 ./usr/lib/perl5/powerpc-openbsd/5.003/sys/exec_aout.ph
@@ -247,6 +249,7 @@
 ./usr/lib/perl5/powerpc-openbsd/5.003/sys/ktrace.ph
 ./usr/lib/perl5/powerpc-openbsd/5.003/sys/lkm.ph
 ./usr/lib/perl5/powerpc-openbsd/5.003/sys/localedef.ph
+./usr/lib/perl5/powerpc-openbsd/5.003/sys/lock.ph
 ./usr/lib/perl5/powerpc-openbsd/5.003/sys/lockf.ph
 ./usr/lib/perl5/powerpc-openbsd/5.003/sys/malloc.ph
 ./usr/lib/perl5/powerpc-openbsd/5.003/sys/map.ph
@@ -275,6 +278,7 @@
 ./usr/lib/perl5/powerpc-openbsd/5.003/sys/siginfo.ph
 ./usr/lib/perl5/powerpc-openbsd/5.003/sys/signal.ph
 ./usr/lib/perl5/powerpc-openbsd/5.003/sys/signalvar.ph
+./usr/lib/perl5/powerpc-openbsd/5.003/sys/simplelock.ph
 ./usr/lib/perl5/powerpc-openbsd/5.003/sys/socket.ph
 ./usr/lib/perl5/powerpc-openbsd/5.003/sys/socketvar.ph
 ./usr/lib/perl5/powerpc-openbsd/5.003/sys/sockio.ph
@@ -340,7 +344,3 @@
 ./usr/powerpc-unknown-openbsd2.2/bin
 ./usr/powerpc-unknown-openbsd2.2/lib
 ./usr/powerpc-unknown-openbsd2.2/lib/ldscripts
-./usr/lib/perl5/powerpc-openbsd/5.003/rmd160.ph
-./usr/lib/perl5/powerpc-openbsd/5.003/sys/endian.ph
-./usr/lib/perl5/powerpc-openbsd/5.003/sys/lock.ph
-./usr/lib/perl5/powerpc-openbsd/5.003/sys/simplelock.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index d4f1de369c2..91b57f516c3 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -8,7 +8,7 @@
 ./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.0
-./usr/lib/libc.so.17.4
+./usr/lib/libc.so.17.5
 ./usr/lib/libcurses.so.4.0
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
@@ -16,9 +16,9 @@
 ./usr/lib/libg++.so.27.1
 ./usr/lib/libiberty.so.0.0
 ./usr/lib/libkadm.so.4.0
-./usr/lib/libkafs.so.4.0
+./usr/lib/libkafs.so.5.0
 ./usr/lib/libkdb.so.4.1
-./usr/lib/libkrb.so.4.1
+./usr/lib/libkrb.so.6.0
 ./usr/lib/libkvm.so.5.1
 ./usr/lib/libm.so.0.1
 ./usr/lib/libmenu.so.1.0
@@ -459,6 +459,7 @@
 ./usr/lib/perl5/sparc-openbsd/5.003/sys/dkstat.ph
 ./usr/lib/perl5/sparc-openbsd/5.003/sys/dmap.ph
 ./usr/lib/perl5/sparc-openbsd/5.003/sys/domain.ph
+./usr/lib/perl5/sparc-openbsd/5.003/sys/endian.ph
 ./usr/lib/perl5/sparc-openbsd/5.003/sys/errno.ph
 ./usr/lib/perl5/sparc-openbsd/5.003/sys/exec.ph
 ./usr/lib/perl5/sparc-openbsd/5.003/sys/exec_aout.ph
@@ -481,6 +482,7 @@
 ./usr/lib/perl5/sparc-openbsd/5.003/sys/ktrace.ph
 ./usr/lib/perl5/sparc-openbsd/5.003/sys/lkm.ph
 ./usr/lib/perl5/sparc-openbsd/5.003/sys/localedef.ph
+./usr/lib/perl5/sparc-openbsd/5.003/sys/lock.ph
 ./usr/lib/perl5/sparc-openbsd/5.003/sys/lockf.ph
 ./usr/lib/perl5/sparc-openbsd/5.003/sys/malloc.ph
 ./usr/lib/perl5/sparc-openbsd/5.003/sys/map.ph
@@ -510,6 +512,7 @@
 ./usr/lib/perl5/sparc-openbsd/5.003/sys/siginfo.ph
 ./usr/lib/perl5/sparc-openbsd/5.003/sys/signal.ph
 ./usr/lib/perl5/sparc-openbsd/5.003/sys/signalvar.ph
+./usr/lib/perl5/sparc-openbsd/5.003/sys/simplelock.ph
 ./usr/lib/perl5/sparc-openbsd/5.003/sys/socket.ph
 ./usr/lib/perl5/sparc-openbsd/5.003/sys/socketvar.ph
 ./usr/lib/perl5/sparc-openbsd/5.003/sys/sockio.ph
@@ -571,10 +574,7 @@
 ./usr/mdec/binstall
 ./usr/mdec/boot
 ./usr/mdec/bootxx
+./usr/mdec/installboot
 ./usr/sbin/eeprom
 ./usr/sbin/fdformat
 ./usr/sbin/screenblank
-./usr/mdec/installboot
-./usr/lib/perl5/sparc-openbsd/5.003/sys/endian.ph
-./usr/lib/perl5/sparc-openbsd/5.003/sys/lock.ph
-./usr/lib/perl5/sparc-openbsd/5.003/sys/simplelock.ph
diff --git a/distrib/sets/lists/base/md.sun3 b/distrib/sets/lists/base/md.sun3
index d0891c93aad..c2993786b6d 100644
--- a/distrib/sets/lists/base/md.sun3
+++ b/distrib/sets/lists/base/md.sun3
@@ -4,7 +4,7 @@
 ./usr/bin/ldd
 ./usr/include/m68k
 ./usr/lib/libacl.so.4.0
-./usr/lib/libc.so.17.4
+./usr/lib/libc.so.17.5
 ./usr/lib/libcurses.so.4.0
 ./usr/lib/libdes.so.6.0
 ./usr/lib/libedit.so.0.0
@@ -12,9 +12,9 @@
 ./usr/lib/libg++.so.27.1
 ./usr/lib/libiberty.so.0.0
 ./usr/lib/libkadm.so.4.0
-./usr/lib/libkafs.so.4.0
+./usr/lib/libkafs.so.5.0
 ./usr/lib/libkdb.so.4.1
-./usr/lib/libkrb.so.4.1
+./usr/lib/libkrb.so.6.0
 ./usr/lib/libkvm.so.5.1
 ./usr/lib/libm.so.0.1
 ./usr/lib/libmenu.so.1.0
@@ -31,6 +31,7 @@
 ./usr/lib/libutil.so.4.1
 ./usr/lib/libwrap.so.1.0
 ./usr/lib/libz.so.1.2
+./usr/lib/perl5/m68k-openbsd/5.003/rmd160.ph
 ./usr/libexec/ld.so
 ./usr/mdec/bootxx
 ./usr/mdec/installboot
@@ -39,4 +40,3 @@
 ./usr/mdec/ufsboot
 ./usr/sbin/eeprom
 ./usr/sbin/screenblank
-./usr/lib/perl5/m68k-openbsd/5.003/rmd160.ph
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 0f040e4dcbb..1cce25a7edf 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -750,6 +750,7 @@
 ./usr/sbin/map-mbone
 ./usr/sbin/mk-amd-map
 ./usr/sbin/mkalias
+./usr/sbin/mkisofs
 ./usr/sbin/mknetid
 ./usr/sbin/mopa.out
 ./usr/sbin/mopchk
@@ -979,6 +980,11 @@
 ./usr/share/ipf/firewall.2
 ./usr/share/ipf/nat.1
 ./usr/share/ipf/nat.2
+./usr/share/ipsec
+./usr/share/ipsec/attributes.conf
+./usr/share/ipsec/photuris.conf
+./usr/share/ipsec/photuris.startup
+./usr/share/ipsec/secrets.conf
 ./usr/share/lkm
 ./usr/share/lkm/misc
 ./usr/share/lkm/misc/module
@@ -1735,9 +1741,3 @@
 ./var/yp/Makefile.yp
 ./var/yp/Makefile.yp.dist
 ./var/yp/README
-./usr/sbin/mkisofs
-./usr/share/ipsec
-./usr/share/ipsec/attributes.conf
-./usr/share/ipsec/photuris.conf
-./usr/share/ipsec/photuris.startup
-./usr/share/ipsec/secrets.conf
diff --git a/distrib/sets/lists/comp/md.hp300 b/distrib/sets/lists/comp/md.hp300
index abe7ae49cb6..070aaaca069 100644
--- a/distrib/sets/lists/comp/md.hp300
+++ b/distrib/sets/lists/comp/md.hp300
@@ -1,16 +1,15 @@
 ./usr/bin/gdb
 ./usr/include/dlfcn.h
 ./usr/include/link.h
-./usr/include/m68k/param.h
 ./usr/include/m68k/ansi.h
 ./usr/include/m68k/asm.h
 ./usr/include/m68k/asm_single.h
-./usr/include/m68k/cdefs.h
 ./usr/include/m68k/cacheops.h
 ./usr/include/m68k/cacheops_20.h
 ./usr/include/m68k/cacheops_30.h
 ./usr/include/m68k/cacheops_40.h
 ./usr/include/m68k/cacheops_60.h
+./usr/include/m68k/cdefs.h
 ./usr/include/m68k/cpu.h
 ./usr/include/m68k/db_machdep.h
 ./usr/include/m68k/endian.h
@@ -19,6 +18,7 @@
 ./usr/include/m68k/ieeefp.h
 ./usr/include/m68k/kcore.h
 ./usr/include/m68k/limits.h
+./usr/include/m68k/param.h
 ./usr/include/m68k/profile.h
 ./usr/include/m68k/psl.h
 ./usr/include/m68k/ptrace.h
@@ -118,9 +118,9 @@
 ./usr/lib/libz_pic.a
 ./usr/lib/scrt0.o
 ./usr/share/man/cat1/gdb.0
-./usr/share/man/cat3/dlfcn.0
-./usr/share/man/cat3/dlopen.0
 ./usr/share/man/cat3/dlclose.0
-./usr/share/man/cat3/dlsym.0
 ./usr/share/man/cat3/dlctl.0
 ./usr/share/man/cat3/dlerror.0
+./usr/share/man/cat3/dlfcn.0
+./usr/share/man/cat3/dlopen.0
+./usr/share/man/cat3/dlsym.0
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index cf07b100c72..e3c94524d24 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -2,9 +2,9 @@
 ./usr/include/dlfcn.h
 ./usr/include/link.h
 ./usr/include/machine/ansi.h
-./usr/include/machine/biosvar.h
 ./usr/include/machine/apmvar.h
 ./usr/include/machine/asm.h
+./usr/include/machine/biosvar.h
 ./usr/include/machine/bus.h
 ./usr/include/machine/cdefs.h
 ./usr/include/machine/conf.h
diff --git a/distrib/sets/lists/comp/md.mvme68k b/distrib/sets/lists/comp/md.mvme68k
index a0845edaa96..f76079e0ac2 100644
--- a/distrib/sets/lists/comp/md.mvme68k
+++ b/distrib/sets/lists/comp/md.mvme68k
@@ -3,13 +3,12 @@
 ./usr/include/link.h
 ./usr/include/m68k/ansi.h
 ./usr/include/m68k/asm.h
+./usr/include/m68k/asm_single.h
 ./usr/include/m68k/cacheops.h
 ./usr/include/m68k/cacheops_20.h
 ./usr/include/m68k/cacheops_30.h
 ./usr/include/m68k/cacheops_40.h
-./usr/include/m68k/param.h
 ./usr/include/m68k/cacheops_60.h
-./usr/include/m68k/asm_single.h
 ./usr/include/m68k/cdefs.h
 ./usr/include/m68k/cpu.h
 ./usr/include/m68k/db_machdep.h
@@ -19,6 +18,7 @@
 ./usr/include/m68k/ieeefp.h
 ./usr/include/m68k/kcore.h
 ./usr/include/m68k/limits.h
+./usr/include/m68k/param.h
 ./usr/include/m68k/profile.h
 ./usr/include/m68k/psl.h
 ./usr/include/m68k/ptrace.h
diff --git a/distrib/sets/lists/comp/md.powerpc b/distrib/sets/lists/comp/md.powerpc
index 0c573cfc2f7..354ce2d127e 100644
--- a/distrib/sets/lists/comp/md.powerpc
+++ b/distrib/sets/lists/comp/md.powerpc
@@ -3,7 +3,6 @@
 ./usr/bin/gasp
 ./usr/bin/objcopy
 ./usr/bin/objdump
-./usr/lib/libbfd.a
 ./usr/include/ansidecl.h
 ./usr/include/bfd.h
 ./usr/include/bfdlink.h
@@ -100,6 +99,7 @@
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd2.2/2.7.2.1/soft-float
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd2.2/2.7.2.1/soft-float/libgcc.a
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd2.2/2.7.2.1/specs
+./usr/lib/libbfd.a
 ./usr/powerpc-unknown-openbsd2.2/bin/ar
 ./usr/powerpc-unknown-openbsd2.2/bin/as
 ./usr/powerpc-unknown-openbsd2.2/bin/dlltool
diff --git a/distrib/sets/lists/comp/md.sparc b/distrib/sets/lists/comp/md.sparc
index 6752a6ec637..ea3e6c8e4e9 100644
--- a/distrib/sets/lists/comp/md.sparc
+++ b/distrib/sets/lists/comp/md.sparc
@@ -2,8 +2,6 @@
 ./usr/bin/gdb
 ./usr/include/dlfcn.h
 ./usr/include/link.h
-./usr/include/machine/kcore.h
-./usr/include/machine/ioctl_fd.h
 ./usr/include/machine/ansi.h
 ./usr/include/machine/asm.h
 ./usr/include/machine/autoconf.h
@@ -28,8 +26,10 @@
 ./usr/include/machine/ieee.h
 ./usr/include/machine/ieeefp.h
 ./usr/include/machine/instr.h
+./usr/include/machine/ioctl_fd.h
 ./usr/include/machine/kbd.h
 ./usr/include/machine/kbio.h
+./usr/include/machine/kcore.h
 ./usr/include/machine/limits.h
 ./usr/include/machine/oldmon.h
 ./usr/include/machine/openpromio.h
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index e3f85ba3260..c3645568d0c 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -55,9 +55,9 @@
 ./usr/include/ddb/db_watch.h
 ./usr/include/des.h
 ./usr/include/dev/atapi
-./usr/include/dev/auconv.h
 ./usr/include/dev/atapi/atapi.h
 ./usr/include/dev/atapi/atapilink.h
+./usr/include/dev/auconv.h
 ./usr/include/dev/audio_if.h
 ./usr/include/dev/audiovar.h
 ./usr/include/dev/ccdvar.h
@@ -83,6 +83,7 @@
 ./usr/include/dev/ic/dc21040reg.h
 ./usr/include/dev/ic/dp8390reg.h
 ./usr/include/dev/ic/dp857xreg.h
+./usr/include/dev/ic/ds.h
 ./usr/include/dev/ic/elink3reg.h
 ./usr/include/dev/ic/elink3var.h
 ./usr/include/dev/ic/espreg.h
@@ -114,13 +115,12 @@
 ./usr/include/dev/ic/smc93cx6var.h
 ./usr/include/dev/ic/uhareg.h
 ./usr/include/dev/ic/uhavar.h
+./usr/include/dev/ic/vgavar.h
 ./usr/include/dev/ic/z8530reg.h
 ./usr/include/dev/ic/z8530sc.h
 ./usr/include/dev/ic/z8536reg.h
 ./usr/include/dev/isa
 ./usr/include/dev/isa/ad1848var.h
-./usr/include/dev/ic/ds.h
-./usr/include/dev/isa/if_exreg.h
 ./usr/include/dev/isa/ahareg.h
 ./usr/include/dev/isa/ariareg.h
 ./usr/include/dev/isa/btreg.h
@@ -133,6 +133,7 @@
 ./usr/include/dev/isa/if_edreg.h
 ./usr/include/dev/isa/if_egreg.h
 ./usr/include/dev/isa/if_elreg.h
+./usr/include/dev/isa/if_exreg.h
 ./usr/include/dev/isa/if_fereg.h
 ./usr/include/dev/isa/if_ie507.h
 ./usr/include/dev/isa/if_ieatt.h
@@ -152,6 +153,7 @@
 ./usr/include/dev/isa/sbdspvar.h
 ./usr/include/dev/isa/sbreg.h
 ./usr/include/dev/isa/sbvar.h
+./usr/include/dev/isa/vga_isavar.h
 ./usr/include/dev/isa/wdlink.h
 ./usr/include/dev/isa/wdreg.h
 ./usr/include/dev/isa/wdsreg.h
@@ -175,6 +177,7 @@
 ./usr/include/dev/pci/pcireg.h
 ./usr/include/dev/pci/pcivar.h
 ./usr/include/dev/pci/ppbreg.h
+./usr/include/dev/pci/vga_pcivar.h
 ./usr/include/dev/pcmcia
 ./usr/include/dev/pcmcia/pcmcia.h
 ./usr/include/dev/pcmcia/pcmcia_ioctl.h
@@ -200,6 +203,15 @@
 ./usr/include/dev/tc/tcreg.h
 ./usr/include/dev/tc/tcvar.h
 ./usr/include/dev/vndioctl.h
+./usr/include/dev/wscons
+./usr/include/dev/wscons/ascii.h
+./usr/include/dev/wscons/event_var.h
+./usr/include/dev/wscons/kbd.h
+./usr/include/dev/wscons/ms.h
+./usr/include/dev/wscons/wscons_emul.h
+./usr/include/dev/wscons/wscons_raster.h
+./usr/include/dev/wscons/wscons_rfont.h
+./usr/include/dev/wscons/wsconsvar.h
 ./usr/include/dirent.h
 ./usr/include/disktab.h
 ./usr/include/elf_abi.h
@@ -612,7 +624,6 @@
 ./usr/include/netdb.h
 ./usr/include/netgroup.h
 ./usr/include/netinet/icmp_var.h
-./usr/include/netinet/ip_rmd160.h
 ./usr/include/netinet/if_arc.h
 ./usr/include/netinet/if_atm.h
 ./usr/include/netinet/if_ether.h
@@ -624,6 +635,9 @@
 ./usr/include/netinet/in_var.h
 ./usr/include/netinet/ip.h
 ./usr/include/netinet/ip_ah.h
+./usr/include/netinet/ip_blf.h
+./usr/include/netinet/ip_cast.h
+./usr/include/netinet/ip_castsb.h
 ./usr/include/netinet/ip_esp.h
 ./usr/include/netinet/ip_fil.h
 ./usr/include/netinet/ip_fil_compat.h
@@ -633,6 +647,7 @@
 ./usr/include/netinet/ip_ipsp.h
 ./usr/include/netinet/ip_mroute.h
 ./usr/include/netinet/ip_nat.h
+./usr/include/netinet/ip_rmd160.h
 ./usr/include/netinet/ip_sha1.h
 ./usr/include/netinet/ip_state.h
 ./usr/include/netinet/ip_var.h
@@ -833,6 +848,7 @@
 ./usr/include/sys/dkstat.h
 ./usr/include/sys/dmap.h
 ./usr/include/sys/domain.h
+./usr/include/sys/endian.h
 ./usr/include/sys/errno.h
 ./usr/include/sys/exec.h
 ./usr/include/sys/exec_aout.h
@@ -855,6 +871,7 @@
 ./usr/include/sys/ktrace.h
 ./usr/include/sys/lkm.h
 ./usr/include/sys/localedef.h
+./usr/include/sys/lock.h
 ./usr/include/sys/lockf.h
 ./usr/include/sys/malloc.h
 ./usr/include/sys/map.h
@@ -884,6 +901,7 @@
 ./usr/include/sys/siginfo.h
 ./usr/include/sys/signal.h
 ./usr/include/sys/signalvar.h
+./usr/include/sys/simplelock.h
 ./usr/include/sys/socket.h
 ./usr/include/sys/socketvar.h
 ./usr/include/sys/sockio.h
@@ -1099,7 +1117,6 @@
 ./usr/share/man/cat1/yacc.0
 ./usr/share/man/cat2/__syscall.0
 ./usr/share/man/cat2/_exit.0
-./usr/share/man/cat2/getsid.0
 ./usr/share/man/cat2/accept.0
 ./usr/share/man/cat2/access.0
 ./usr/share/man/cat2/acct.0
@@ -1150,6 +1167,7 @@
 ./usr/share/man/cat2/getpriority.0
 ./usr/share/man/cat2/getrlimit.0
 ./usr/share/man/cat2/getrusage.0
+./usr/share/man/cat2/getsid.0
 ./usr/share/man/cat2/getsockname.0
 ./usr/share/man/cat2/getsockopt.0
 ./usr/share/man/cat2/gettimeofday.0
@@ -1257,7 +1275,6 @@
 ./usr/share/man/cat2/write.0
 ./usr/share/man/cat2/writev.0
 ./usr/share/man/cat3/MD4Data.0
-./usr/share/man/cat3/mkdtemp.0
 ./usr/share/man/cat3/MD4End.0
 ./usr/share/man/cat3/MD4File.0
 ./usr/share/man/cat3/MD4Final.0
@@ -1297,6 +1314,7 @@
 ./usr/share/man/cat3/asctime.0
 ./usr/share/man/cat3/asin.0
 ./usr/share/man/cat3/asinh.0
+./usr/share/man/cat3/asprintf.0
 ./usr/share/man/cat3/assert.0
 ./usr/share/man/cat3/atan.0
 ./usr/share/man/cat3/atan2.0
@@ -1418,13 +1436,9 @@
 ./usr/share/man/cat3/curs_outopts.0
 ./usr/share/man/cat3/curs_overlay.0
 ./usr/share/man/cat3/curs_pad.0
+./usr/share/man/cat3/curs_print.0
 ./usr/share/man/cat3/curs_printw.0
 ./usr/share/man/cat3/curs_refresh.0
-./usr/share/man/cat3/curs_print.0
-./usr/share/man/cat3/form_requestname.0
-./usr/share/man/cat3/menu_requestname.0
-./usr/share/man/cat3/menu_spacing.0
-./usr/share/man/cat3/wresize.0
 ./usr/share/man/cat3/curs_scanw.0
 ./usr/share/man/cat3/curs_scr_dmp.0
 ./usr/share/man/cat3/curs_scroll.0
@@ -1438,6 +1452,7 @@
 ./usr/share/man/cat3/daemon.0
 ./usr/share/man/cat3/db.0
 ./usr/share/man/cat3/dbopen.0
+./usr/share/man/cat3/del_curterm.0
 ./usr/share/man/cat3/des_3cbc_encrypt.0
 ./usr/share/man/cat3/des_3ecb_encrypt.0
 ./usr/share/man/cat3/des_cbc_cksum.0
@@ -1558,6 +1573,7 @@
 ./usr/share/man/cat3/form_opts.0
 ./usr/share/man/cat3/form_page.0
 ./usr/share/man/cat3/form_post.0
+./usr/share/man/cat3/form_requestname.0
 ./usr/share/man/cat3/form_userptr.0
 ./usr/share/man/cat3/form_win.0
 ./usr/share/man/cat3/fprintf.0
@@ -1795,15 +1811,19 @@
 ./usr/share/man/cat3/menu_opts.0
 ./usr/share/man/cat3/menu_pattern.0
 ./usr/share/man/cat3/menu_post.0
+./usr/share/man/cat3/menu_requestname.0
+./usr/share/man/cat3/menu_spacing.0
 ./usr/share/man/cat3/menu_userptr.0
 ./usr/share/man/cat3/menu_win.0
 ./usr/share/man/cat3/mergesort.0
+./usr/share/man/cat3/mkdtemp.0
 ./usr/share/man/cat3/mkstemp.0
 ./usr/share/man/cat3/mktemp.0
 ./usr/share/man/cat3/mktime.0
 ./usr/share/man/cat3/modf.0
 ./usr/share/man/cat3/moncontrol.0
 ./usr/share/man/cat3/mrand48.0
+./usr/share/man/cat3/mvcur.0
 ./usr/share/man/cat3/ncurses.0
 ./usr/share/man/cat3/network.0
 ./usr/share/man/cat3/nextafter.0
@@ -1839,6 +1859,7 @@
 ./usr/share/man/cat3/putc.0
 ./usr/share/man/cat3/putchar.0
 ./usr/share/man/cat3/putenv.0
+./usr/share/man/cat3/putp.0
 ./usr/share/man/cat3/puts.0
 ./usr/share/man/cat3/putw.0
 ./usr/share/man/cat3/pw_abort.0
@@ -1890,6 +1911,7 @@
 ./usr/share/man/cat3/res_search.0
 ./usr/share/man/cat3/res_send.0
 ./usr/share/man/cat3/resolver.0
+./usr/share/man/cat3/restartterm.0
 ./usr/share/man/cat3/rewind.0
 ./usr/share/man/cat3/rewinddir.0
 ./usr/share/man/cat3/rexec.0
@@ -1917,6 +1939,7 @@
 ./usr/share/man/cat3/scsireq_reset.0
 ./usr/share/man/cat3/seed48.0
 ./usr/share/man/cat3/seekdir.0
+./usr/share/man/cat3/set_curterm.0
 ./usr/share/man/cat3/setbuf.0
 ./usr/share/man/cat3/setbuffer.0
 ./usr/share/man/cat3/setdomainname.0
@@ -1948,7 +1971,9 @@
 ./usr/share/man/cat3/setruid.0
 ./usr/share/man/cat3/setservent.0
 ./usr/share/man/cat3/setstate.0
+./usr/share/man/cat3/setterm.0
 ./usr/share/man/cat3/setttyent.0
+./usr/share/man/cat3/setupterm.0
 ./usr/share/man/cat3/setusershell.0
 ./usr/share/man/cat3/setvbuf.0
 ./usr/share/man/cat3/sha1.0
@@ -2064,6 +2089,7 @@
 ./usr/share/man/cat3/telldir.0
 ./usr/share/man/cat3/tempnam.0
 ./usr/share/man/cat3/termcap.0
+./usr/share/man/cat3/terminfo.0
 ./usr/share/man/cat3/tf_close.0
 ./usr/share/man/cat3/tf_get_cred.0
 ./usr/share/man/cat3/tf_get_pinst.0
@@ -2076,6 +2102,9 @@
 ./usr/share/man/cat3/tgetnum.0
 ./usr/share/man/cat3/tgetstr.0
 ./usr/share/man/cat3/tgoto.0
+./usr/share/man/cat3/tigetflag.0
+./usr/share/man/cat3/tigetnum.0
+./usr/share/man/cat3/tigetstr.0
 ./usr/share/man/cat3/time.0
 ./usr/share/man/cat3/time2posix.0
 ./usr/share/man/cat3/times.0
@@ -2085,6 +2114,8 @@
 ./usr/share/man/cat3/toascii.0
 ./usr/share/man/cat3/tolower.0
 ./usr/share/man/cat3/toupper.0
+./usr/share/man/cat3/tparam.0
+./usr/share/man/cat3/tparm.0
 ./usr/share/man/cat3/tputs.0
 ./usr/share/man/cat3/tsearch.0
 ./usr/share/man/cat3/ttyname.0
@@ -2105,10 +2136,13 @@
 ./usr/share/man/cat3/va_start.0
 ./usr/share/man/cat3/valloc.0
 ./usr/share/man/cat3/varargs.0
+./usr/share/man/cat3/vasprintf.0
 ./usr/share/man/cat3/verr.0
 ./usr/share/man/cat3/verrx.0
 ./usr/share/man/cat3/vfprintf.0
 ./usr/share/man/cat3/vfscanf.0
+./usr/share/man/cat3/vidattr.0
+./usr/share/man/cat3/vidputs.0
 ./usr/share/man/cat3/vis.0
 ./usr/share/man/cat3/vlimit.0
 ./usr/share/man/cat3/vprintf.0
@@ -2122,6 +2156,7 @@
 ./usr/share/man/cat3/vwarnx.0
 ./usr/share/man/cat3/warn.0
 ./usr/share/man/cat3/warnx.0
+./usr/share/man/cat3/wresize.0
 ./usr/share/man/cat3/xdr.0
 ./usr/share/man/cat3/xdr_accepted_reply.0
 ./usr/share/man/cat3/xdr_array.0
@@ -2252,21 +2287,3 @@
 ./usr/share/mk/bsd.subdir.mk
 ./usr/share/mk/bsd.sys.mk
 ./var/db/libc.tags
-./usr/include/dev/ic/vgavar.h
-./usr/include/dev/isa/vga_isavar.h
-./usr/include/dev/pci/vga_pcivar.h
-./usr/include/dev/wscons
-./usr/include/dev/wscons/ascii.h
-./usr/include/dev/wscons/event_var.h
-./usr/include/dev/wscons/kbd.h
-./usr/include/dev/wscons/ms.h
-./usr/include/dev/wscons/wscons_emul.h
-./usr/include/dev/wscons/wscons_raster.h
-./usr/include/dev/wscons/wscons_rfont.h
-./usr/include/dev/wscons/wsconsvar.h
-./usr/include/netinet/ip_blf.h
-./usr/include/netinet/ip_cast.h
-./usr/include/netinet/ip_castsb.h
-./usr/include/sys/endian.h
-./usr/include/sys/lock.h
-./usr/include/sys/simplelock.h
diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi
index e07d103e0db..188b728a084 100644
--- a/distrib/sets/lists/etc/mi
+++ b/distrib/sets/lists/etc/mi
@@ -55,6 +55,11 @@
 ./etc/passwd
 ./etc/passwd.conf
 ./etc/phones
+./etc/photuris
+./etc/photuris/attributes.conf
+./etc/photuris/photuris.conf
+./etc/photuris/photuris.startup
+./etc/photuris/secrets.conf
 ./etc/portal.conf
 ./etc/ppp/chap-secrets
 ./etc/ppp/chatscript.sample
@@ -90,7 +95,6 @@
 ./etc/uucp/passwd
 ./etc/uucp/port
 ./etc/uucp/sys
-./etc/photuris
 ./etc/weekly
 ./root/.cshrc
 ./root/.klogin
@@ -99,7 +103,3 @@
 ./var/at/at.deny
 ./var/cron/tabs/root
 ./var/msgs/bounds
-./etc/photuris/attributes.conf
-./etc/photuris/photuris.conf
-./etc/photuris/photuris.startup
-./etc/photuris/secrets.conf
diff --git a/distrib/sets/lists/game/mi b/distrib/sets/lists/game/mi
index 01c657f8149..d2d540b5417 100644
--- a/distrib/sets/lists/game/mi
+++ b/distrib/sets/lists/game/mi
@@ -192,6 +192,8 @@
 ./usr/share/man/cat6/worm.0
 ./usr/share/man/cat6/worms.0
 ./usr/share/man/cat6/wump.0
+./var/games/atc_score
+./var/games/battlestar.log
 ./var/games/hackdir/data
 ./var/games/hackdir/help
 ./var/games/hackdir/hh
@@ -206,5 +208,3 @@
 ./var/games/phantasia/scoreboard
 ./var/games/phantasia/void
 ./var/games/robots_roll
-./var/games/atc_score
-./var/games/battlestar.log
diff --git a/distrib/sets/lists/man/md.hp300 b/distrib/sets/lists/man/md.hp300
index 0b72cbf84ac..5734ee07f65 100644
--- a/distrib/sets/lists/man/md.hp300
+++ b/distrib/sets/lists/man/md.hp300
@@ -4,5 +4,5 @@
 ./usr/share/man/cat1/rtld.0
 ./usr/share/man/cat5/ar.0
 ./usr/share/man/cat5/ranlib.0
-./usr/share/man/cat8/ldconfig.0
 ./usr/share/man/cat8/isolif.0
+./usr/share/man/cat8/ldconfig.0
diff --git a/distrib/sets/lists/man/md.sparc b/distrib/sets/lists/man/md.sparc
index 795f814ecee..8fdeee5e263 100644
--- a/distrib/sets/lists/man/md.sparc
+++ b/distrib/sets/lists/man/md.sparc
@@ -1,14 +1,14 @@
+./usr/share/man/cat1/fdformat.0
 ./usr/share/man/cat1/ld.so.0
 ./usr/share/man/cat1/ldd.0
 ./usr/share/man/cat1/rtld.0
 ./usr/share/man/cat1/screenblank.0
+./usr/share/man/cat3/kvm_dump.0
+./usr/share/man/cat3/kvm_dump_inval.0
+./usr/share/man/cat3/kvm_dump_mkheader.0
+./usr/share/man/cat3/kvm_dump_wrtheader.0
 ./usr/share/man/cat5/ar.0
 ./usr/share/man/cat5/ranlib.0
 ./usr/share/man/cat8/eeprom.0
 ./usr/share/man/cat8/installboot.0
 ./usr/share/man/cat8/ldconfig.0
-./usr/share/man/cat3/kvm_dump.0
-./usr/share/man/cat3/kvm_dump_inval.0
-./usr/share/man/cat3/kvm_dump_mkheader.0
-./usr/share/man/cat3/kvm_dump_wrtheader.0
-./usr/share/man/cat1/fdformat.0
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index fd5733d64a8..58026311ff4 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -536,6 +536,7 @@
 ./usr/share/man/cat4/unix.0
 ./usr/share/man/cat4/urandom.0
 ./usr/share/man/cat4/vnd.0
+./usr/share/man/cat5/.rhosts.0
 ./usr/share/man/cat5/a.out.0
 ./usr/share/man/cat5/acct.0
 ./usr/share/man/cat5/aliases.0
@@ -561,6 +562,7 @@
 ./usr/share/man/cat5/hosts.0
 ./usr/share/man/cat5/hosts.allow.0
 ./usr/share/man/cat5/hosts.deny.0
+./usr/share/man/cat5/hosts.equiv.0
 ./usr/share/man/cat5/hosts_access.0
 ./usr/share/man/cat5/hosts_options.0
 ./usr/share/man/cat5/inetd.0