16 files changed, 89 insertions, 82 deletions
diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index e1df28879d3..b533fb541a3 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -8,9 +8,8 @@
 ./usr/include/alpha
 ./usr/include/readline
 ./usr/lib/gcc-lib/alpha-unknown-openbsd2.5
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.8.1
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.8.1/include
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.8.1/include/objc
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/gcc-2.95
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/gcc-2.95/include
 ./usr/libdata/perl5/alpha-openbsd
 ./usr/libdata/perl5/alpha-openbsd/5.00503
 ./usr/libdata/perl5/alpha-openbsd/5.00503/.packlist
@@ -653,3 +652,4 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/termcap.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/sys/swap.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/keynote.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/f2c.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index de1d9ea5ed9..aed815707ae 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -704,3 +704,5 @@
 ./usr/share/misc/pcvtfonts/vt220l.814
 ./usr/share/misc/pcvtfonts/vt220l.816
 ./usr/libdata/perl5/site_perl/i386-openbsd/keynote.ph
+./usr/bin/objdump
+./usr/bin/c++filt
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 2efd0bd1b2c..dde068c4927 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -677,3 +677,5 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sys/swap.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/f2c.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/keynote.ph
+./usr/bin/objdump
+./usr/bin/c++filt
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index c7382f13a8b..2af69e42ba9 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -2616,5 +2616,3 @@
 ./var/yp/README
 ./sbin/swapctl
 ./usr/bin/keynote
-./usr/bin/c++filt
-./usr/bin/objdump
diff --git a/distrib/sets/lists/comp/md.alpha b/distrib/sets/lists/comp/md.alpha
index e07c15ff25a..46fa511fae7 100644
--- a/distrib/sets/lists/comp/md.alpha
+++ b/distrib/sets/lists/comp/md.alpha
@@ -19,90 +19,83 @@
 ./usr/bin/gdb
 ./usr/bin/objcopy
 ./usr/bin/objdump
+./usr/include/alpha/alpha_cpu.h
+./usr/include/alpha/ansi.h
+./usr/include/alpha/aout_machdep.h
+./usr/include/alpha/asm.h
+./usr/include/alpha/autoconf.h
+./usr/include/alpha/bus.h
+./usr/include/alpha/cdefs.h
+./usr/include/alpha/cfbreg.h
+./usr/include/alpha/cpu.h
+./usr/include/alpha/cpuconf.h
+./usr/include/alpha/db_machdep.h
+./usr/include/alpha/disklabel.h
+./usr/include/alpha/ecoff.h
+./usr/include/alpha/ecoff_machdep.h
+./usr/include/alpha/elf_machdep.h
+./usr/include/alpha/endian.h
+./usr/include/alpha/exec.h
+./usr/include/alpha/fbio.h
+./usr/include/alpha/float.h
+./usr/include/alpha/frame.h
+./usr/include/alpha/ieee.h
+./usr/include/alpha/ieeefp.h
+./usr/include/alpha/intr.h
+./usr/include/alpha/intrcnt.h
+./usr/include/alpha/kbio.h
+./usr/include/alpha/kcore.h
+./usr/include/alpha/limits.h
+./usr/include/alpha/param.h
+./usr/include/alpha/pcb.h
+./usr/include/alpha/pmap.h
+./usr/include/alpha/pmap.new.h
+./usr/include/alpha/pmap.old.h
+./usr/include/alpha/proc.h
+./usr/include/alpha/profile.h
+./usr/include/alpha/prom.h
+./usr/include/alpha/psl.h
+./usr/include/alpha/pte.h
+./usr/include/alpha/ptrace.h
+./usr/include/alpha/reg.h
+./usr/include/alpha/rpb.h
+./usr/include/alpha/setjmp.h
+./usr/include/alpha/sfbreg.h
+./usr/include/alpha/signal.h
+./usr/include/alpha/spinlock.h
+./usr/include/alpha/stdarg.h
+./usr/include/alpha/tgareg.h
+./usr/include/alpha/types.h
+./usr/include/alpha/varargs.h
+./usr/include/alpha/vmparam.h
+./usr/include/alpha/vuid_event.h
+./usr/include/alpha/wsconsio.h
 ./usr/include/ansidecl.h
 ./usr/include/bfd.h
 ./usr/include/bfdlink.h
-./usr/include/machine/alpha_cpu.h
-./usr/include/machine/ansi.h
-./usr/include/machine/aout_machdep.h
-./usr/include/machine/asm.h
-./usr/include/machine/autoconf.h
-./usr/include/machine/bus.h
-./usr/include/machine/cdefs.h
-./usr/include/machine/cfbreg.h
-./usr/include/machine/cpu.h
-./usr/include/machine/cpuconf.h
-./usr/include/machine/db_machdep.h
-./usr/include/machine/disklabel.h
-./usr/include/machine/ecoff.h
-./usr/include/machine/ecoff_machdep.h
-./usr/include/machine/elf_machdep.h
-./usr/include/machine/endian.h
-./usr/include/machine/exec.h
-./usr/include/machine/fbio.h
-./usr/include/machine/float.h
-./usr/include/machine/frame.h
-./usr/include/machine/ieee.h
-./usr/include/machine/ieeefp.h
-./usr/include/machine/intr.h
-./usr/include/machine/intrcnt.h
-./usr/include/machine/kbio.h
-./usr/include/machine/kcore.h
-./usr/include/machine/limits.h
-./usr/include/machine/param.h
-./usr/include/machine/pcb.h
-./usr/include/machine/pmap.h
-./usr/include/machine/pmap.new.h
-./usr/include/machine/pmap.old.h
-./usr/include/machine/proc.h
-./usr/include/machine/profile.h
-./usr/include/machine/prom.h
-./usr/include/machine/psl.h
-./usr/include/machine/pte.h
-./usr/include/machine/ptrace.h
-./usr/include/machine/reg.h
-./usr/include/machine/rpb.h
-./usr/include/machine/setjmp.h
-./usr/include/machine/sfbreg.h
-./usr/include/machine/signal.h
-./usr/include/machine/stdarg.h
-./usr/include/machine/tgareg.h
-./usr/include/machine/types.h
-./usr/include/machine/varargs.h
-./usr/include/machine/vmparam.h
-./usr/include/machine/vuid_event.h
-./usr/include/machine/wsconsio.h
 ./usr/include/obstack.h
 ./usr/include/readline/chardefs.h
 ./usr/include/readline/keymaps.h
 ./usr/include/readline/readline.h
 ./usr/lib/crtbegin.o
 ./usr/lib/crtend.o
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.8.1/SYSCALLS.c.X
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.8.1/cc1
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.8.1/cc1obj
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.8.1/cc1plus
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.8.1/cpp
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.8.1/f771
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.8.1/include/README
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.8.1/include/f2c.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.8.1/include/limits.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.8.1/include/objc/NXConstStr.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.8.1/include/objc/Object.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.8.1/include/objc/Protocol.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.8.1/include/objc/encoding.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.8.1/include/objc/hash.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.8.1/include/objc/objc-api.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.8.1/include/objc/objc-list.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.8.1/include/objc/objc.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.8.1/include/objc/sarray.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.8.1/include/objc/thr.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.8.1/include/objc/typedstream.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.8.1/include/syslimits.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.8.1/libf2c.a
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.8.1/libgcc.a
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.8.1/libobjc.a
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.8.1/specs
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/gcc-2.95/SYSCALLS.c.X
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/gcc-2.95/cc1
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/gcc-2.95/cc1obj
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/gcc-2.95/cc1plus
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/gcc-2.95/collect2
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/gcc-2.95/cpp
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/gcc-2.95/f771
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/gcc-2.95/include/README
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/gcc-2.95/include/exception
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/gcc-2.95/include/float.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/gcc-2.95/include/limits.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/gcc-2.95/include/new
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/gcc-2.95/include/new.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/gcc-2.95/include/syslimits.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/gcc-2.95/include/typeinfo
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/gcc-2.95/libgcc.a
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/gcc-2.95/specs
 ./usr/lib/libbfd.a
 ./usr/lib/libmmalloc.a
 ./usr/lib/libopcodes.a
diff --git a/distrib/sets/lists/comp/md.amiga b/distrib/sets/lists/comp/md.amiga
index b35ed8036bd..3ab2b4ce1bc 100644
--- a/distrib/sets/lists/comp/md.amiga
+++ b/distrib/sets/lists/comp/md.amiga
@@ -150,3 +150,4 @@
 ./usr/share/man/cat3/kvm_dump_wrtheader.0
 ./usr/lib/libc_r_pic.a
 ./usr/lib/libcurses++_pic.a
+./usr/lib/libkeynote_pic.a
diff --git a/distrib/sets/lists/comp/md.hp300 b/distrib/sets/lists/comp/md.hp300
index 9eba1e7aab9..8e99fec377f 100644
--- a/distrib/sets/lists/comp/md.hp300
+++ b/distrib/sets/lists/comp/md.hp300
@@ -147,3 +147,4 @@
 ./usr/share/man/cat3/dlsym.0
 ./usr/lib/libc_r_pic.a
 ./usr/lib/libcurses++_pic.a
+./usr/lib/libkeynote_pic.a
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index 447d6a192e5..a1e1b2adfcf 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -147,3 +147,4 @@
 ./usr/lib/libcurses++_pic.a
 ./usr/lib/libg2c_pic.a
 ./usr/lib/libobjc_pic.a
+./usr/lib/libkeynote_pic.a
diff --git a/distrib/sets/lists/comp/md.mac68k b/distrib/sets/lists/comp/md.mac68k
index 4c3a305ecbd..b5b7fa70954 100644
--- a/distrib/sets/lists/comp/md.mac68k
+++ b/distrib/sets/lists/comp/md.mac68k
@@ -152,3 +152,4 @@
 ./usr/lib/libc_r_pic.a
 ./usr/include/m68k/spinlock.h
 ./usr/lib/libcurses++_pic.a
+./usr/lib/libkeynote_pic.a
diff --git a/distrib/sets/lists/comp/md.sparc b/distrib/sets/lists/comp/md.sparc
index af190afc3c0..955204f6d99 100644
--- a/distrib/sets/lists/comp/md.sparc
+++ b/distrib/sets/lists/comp/md.sparc
@@ -127,3 +127,4 @@
 ./usr/share/man/cat3/dlsym.0
 ./usr/lib/libc_r_pic.a
 ./usr/lib/libcurses++_pic.a
+./usr/lib/libkeynote_pic.a
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index a76cdd71912..c486632aae4 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -2526,7 +2526,6 @@
 ./usr/lib/libcurses++_p.a
 ./usr/lib/libkeynote.a
 ./usr/lib/libkeynote_p.a
-./usr/lib/libkeynote_pic.a
 ./usr/include/f2c.h
 ./usr/include/objc
 ./usr/include/objc/NXConstStr.h
@@ -2699,3 +2698,7 @@
 ./usr/include/g++/vector
 ./usr/include/g++/vector.h
 ./usr/include/keynote.h
+./usr/include/dev/ic/rl2.h
+./usr/include/dev/ic/rl2cmd.h
+./usr/include/dev/ic/rl2reg.h
+./usr/include/dev/ic/rl2var.h
diff --git a/distrib/sets/lists/man/md.amiga b/distrib/sets/lists/man/md.amiga
index caf8c7b9124..4104f921415 100644
--- a/distrib/sets/lists/man/md.amiga
+++ b/distrib/sets/lists/man/md.amiga
@@ -10,3 +10,4 @@
 ./usr/share/man/cat8/iteconfig_amiga.0
 ./usr/share/man/cat8/ldconfig.0
 ./usr/share/man/cat8/loadkmap.0
+./usr/share/man/cat1/objdump.0
diff --git a/distrib/sets/lists/man/md.hp300 b/distrib/sets/lists/man/md.hp300
index 7b84b4b2064..74c1cfbfcc2 100644
--- a/distrib/sets/lists/man/md.hp300
+++ b/distrib/sets/lists/man/md.hp300
@@ -10,3 +10,4 @@
 ./usr/share/man/cat5/ranlib.0
 ./usr/share/man/cat8/isolif.0
 ./usr/share/man/cat8/ldconfig.0
+./usr/share/man/cat1/objdump.0
diff --git a/distrib/sets/lists/man/md.i386 b/distrib/sets/lists/man/md.i386
index 3eaeb9e945d..4c118225740 100644
--- a/distrib/sets/lists/man/md.i386
+++ b/distrib/sets/lists/man/md.i386
@@ -28,3 +28,4 @@
 ./usr/share/man/cat8/ldconfig.0
 ./usr/share/man/cat8/mbr.0
 ./usr/share/man/cat8/zzz.0
+./usr/share/man/cat1/objdump.0
diff --git a/distrib/sets/lists/man/md.sparc b/distrib/sets/lists/man/md.sparc
index 8fdeee5e263..45a8675a4d7 100644
--- a/distrib/sets/lists/man/md.sparc
+++ b/distrib/sets/lists/man/md.sparc
@@ -12,3 +12,4 @@
 ./usr/share/man/cat8/eeprom.0
 ./usr/share/man/cat8/installboot.0
 ./usr/share/man/cat8/ldconfig.0
+./usr/share/man/cat1/objdump.0
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index de039e91c14..56e3b10c97b 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1590,5 +1590,5 @@
 ./usr/share/man/cat1/view.0
 ./usr/share/man/cat4/sparc/audiocs.0
 ./usr/share/info/g77.info-22
-./usr/share/man/cat1/objdump.0
 ./usr/share/man/cat9/malloc.0
+./usr/share/man/cat4/rln.0