15 files changed, 13 insertions, 158 deletions
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 831f0590b31..e8d767dfcf9 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -59,7 +59,7 @@
 ./usr/lib/libpthread.so.2.1
 ./usr/lib/libreadline.so.1.0
 ./usr/lib/libsectok.so.5.0
-./usr/lib/libskey.so.1.0
+./usr/lib/libskey.so.4.0
 ./usr/lib/libssl.so.8.0
 ./usr/lib/libstdc++.so.31.0
 ./usr/lib/libtermcap.so.9.0
diff --git a/distrib/sets/lists/comp/md.alpha b/distrib/sets/lists/comp/md.alpha
index 97d10df92d4..1ca0687e3df 100644
--- a/distrib/sets/lists/comp/md.alpha
+++ b/distrib/sets/lists/comp/md.alpha
@@ -1,8 +1,6 @@
 ./usr/bin/addr2line
 ./usr/bin/gasp
-./usr/bin/gdb
 ./usr/bin/objcopy
-./usr/bin/objdump
 ./usr/bin/readelf
 ./usr/include/alpha
 ./usr/include/alpha/alpha_cpu.h
@@ -61,11 +59,7 @@
 ./usr/include/alpha/varargs.h
 ./usr/include/alpha/vmparam.h
 ./usr/include/alpha/wsconsio.h
-./usr/include/bfd.h
-./usr/include/bfdlink.h
-./usr/include/dlfcn.h
 ./usr/include/ieeefp.h
-./usr/include/link.h
 ./usr/lib/crtbegin.o
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
@@ -115,7 +109,6 @@
 ./usr/lib/libalpha.a
 ./usr/lib/libalpha_p.a
 ./usr/lib/libasn1_pic.a
-./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
 ./usr/lib/libcrypto_pic.a
@@ -135,18 +128,15 @@
 ./usr/lib/libkvm_pic.a
 ./usr/lib/libm_pic.a
 ./usr/lib/libmenu_pic.a
-./usr/lib/libmmalloc.a
 ./usr/lib/libncurses_pic.a
 ./usr/lib/libobjc_pic.a
 ./usr/lib/libocurses_pic.a
-./usr/lib/libopcodes.a
 ./usr/lib/libossaudio_pic.a
 ./usr/lib/libotermcap_pic.a
 ./usr/lib/libpanel_pic.a
 ./usr/lib/libpcap_pic.a
 ./usr/lib/libperl_pic.a
 ./usr/lib/libpthread_pic.a
-./usr/lib/libreadline.a
 ./usr/lib/libreadline_pic.a
 ./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
@@ -166,6 +156,4 @@
 ./usr/libdata/ldscripts/elf64alpha.xs
 ./usr/libdata/ldscripts/elf64alpha.xu
 ./usr/libdata/ldscripts/elf64alpha.xz
-./usr/share/man/cat1/gdb.0
 ./usr/share/man/cat1/objcopy.0
-./usr/share/man/cat1/objdump.0
diff --git a/distrib/sets/lists/comp/md.hp300 b/distrib/sets/lists/comp/md.hp300
index f8e93db2259..02050486489 100644
--- a/distrib/sets/lists/comp/md.hp300
+++ b/distrib/sets/lists/comp/md.hp300
@@ -1,8 +1,3 @@
-./usr/bin/gdb
-./usr/bin/objdump
-./usr/include/bfd.h
-./usr/include/bfdlink.h
-./usr/include/dlfcn.h
 ./usr/include/hp300
 ./usr/include/hp300/ansi.h
 ./usr/include/hp300/asm.h
@@ -41,7 +36,6 @@
 ./usr/include/hp300/varargs.h
 ./usr/include/hp300/vmparam.h
 ./usr/include/ieeefp.h
-./usr/include/link.h
 ./usr/include/m68k
 ./usr/include/m68k/ansi.h
 ./usr/include/m68k/asm.h
@@ -100,7 +94,6 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.4/2.95.3/include/typeinfo
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.4/2.95.3/libgcc.a
 ./usr/lib/libasn1_pic.a
-./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
 ./usr/lib/libcrypto_pic.a
@@ -120,18 +113,15 @@
 ./usr/lib/libkvm_pic.a
 ./usr/lib/libm_pic.a
 ./usr/lib/libmenu_pic.a
-./usr/lib/libmmalloc.a
 ./usr/lib/libncurses_pic.a
 ./usr/lib/libobjc_pic.a
 ./usr/lib/libocurses_pic.a
-./usr/lib/libopcodes.a
 ./usr/lib/libossaudio_pic.a
 ./usr/lib/libotermcap_pic.a
 ./usr/lib/libpanel_pic.a
 ./usr/lib/libpcap_pic.a
 ./usr/lib/libperl_pic.a
 ./usr/lib/libpthread_pic.a
-./usr/lib/libreadline.a
 ./usr/lib/libreadline_pic.a
 ./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
@@ -144,5 +134,3 @@
 ./usr/lib/libwrap_pic.a
 ./usr/lib/libz_pic.a
 ./usr/lib/scrt0.o
-./usr/share/man/cat1/gdb.0
-./usr/share/man/cat1/objdump.0
diff --git a/distrib/sets/lists/comp/md.hppa b/distrib/sets/lists/comp/md.hppa
index da15fa0c40c..7c62dea434d 100644
--- a/distrib/sets/lists/comp/md.hppa
+++ b/distrib/sets/lists/comp/md.hppa
@@ -1,12 +1,7 @@
 ./usr/bin/addr2line
 ./usr/bin/gasp
-./usr/bin/gdb
 ./usr/bin/objcopy
-./usr/bin/objdump
 ./usr/bin/readelf
-./usr/include/bfd.h
-./usr/include/bfdlink.h
-./usr/include/dlfcn.h
 ./usr/include/hppa
 ./usr/include/hppa/ansi.h
 ./usr/include/hppa/asm.h
@@ -56,7 +51,6 @@
 ./usr/include/hppa/varargs.h
 ./usr/include/hppa/vmparam.h
 ./usr/include/ieeefp.h
-./usr/include/link.h
 ./usr/lib/crtbegin.o
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
@@ -75,10 +69,6 @@
 ./usr/lib/gcc-lib/hppa-unknown-openbsd3.4/2.95.3/include/syslimits.h
 ./usr/lib/gcc-lib/hppa-unknown-openbsd3.4/2.95.3/include/typeinfo
 ./usr/lib/gcc-lib/hppa-unknown-openbsd3.4/2.95.3/libgcc.a
-./usr/lib/libbfd.a
-./usr/lib/libmmalloc.a
-./usr/lib/libopcodes.a
-./usr/lib/libreadline.a
 ./usr/libdata/ldscripts
 ./usr/libdata/ldscripts/hppaobsd.x
 ./usr/libdata/ldscripts/hppaobsd.xbn
@@ -87,6 +77,4 @@
 ./usr/libdata/ldscripts/hppaobsd.xs
 ./usr/libdata/ldscripts/hppaobsd.xu
 ./usr/libdata/ldscripts/hppaobsd.xz
-./usr/share/man/cat1/gdb.0
 ./usr/share/man/cat1/objcopy.0
-./usr/share/man/cat1/objdump.0
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index 184fcb9ae0b..d774c07eac2 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -1,12 +1,7 @@
 ./usr/bin/addr2line
 ./usr/bin/gasp
-./usr/bin/gdb
 ./usr/bin/objcopy
-./usr/bin/objdump
 ./usr/bin/readelf
-./usr/include/bfd.h
-./usr/include/bfdlink.h
-./usr/include/dlfcn.h
 ./usr/include/i386
 ./usr/include/i386/ansi.h
 ./usr/include/i386/apmvar.h
@@ -67,7 +62,6 @@
 ./usr/include/i386/vm86.h
 ./usr/include/i386/vmparam.h
 ./usr/include/ieeefp.h
-./usr/include/link.h
 ./usr/lib/crtbegin.o
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
@@ -89,7 +83,6 @@
 ./usr/lib/gcc-lib/i386-unknown-openbsd3.4/2.95.3/include/typeinfo
 ./usr/lib/gcc-lib/i386-unknown-openbsd3.4/2.95.3/libgcc.a
 ./usr/lib/libasn1_pic.a
-./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
 ./usr/lib/libcrypto_pic.a
@@ -111,18 +104,15 @@
 ./usr/lib/libkvm_pic.a
 ./usr/lib/libm_pic.a
 ./usr/lib/libmenu_pic.a
-./usr/lib/libmmalloc.a
 ./usr/lib/libncurses_pic.a
 ./usr/lib/libobjc_pic.a
 ./usr/lib/libocurses_pic.a
-./usr/lib/libopcodes.a
 ./usr/lib/libossaudio_pic.a
 ./usr/lib/libotermcap_pic.a
 ./usr/lib/libpanel_pic.a
 ./usr/lib/libpcap_pic.a
 ./usr/lib/libperl_pic.a
 ./usr/lib/libpthread_pic.a
-./usr/lib/libreadline.a
 ./usr/lib/libreadline_pic.a
 ./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
@@ -142,5 +132,3 @@
 ./usr/libdata/ldscripts/elf_i386.xs
 ./usr/libdata/ldscripts/elf_i386.xu
 ./usr/libdata/ldscripts/elf_i386.xz
-./usr/share/man/cat1/gdb.0
-./usr/share/man/cat1/objdump.0
diff --git a/distrib/sets/lists/comp/md.mac68k b/distrib/sets/lists/comp/md.mac68k
index 99f51472f64..1f8987d0e2a 100644
--- a/distrib/sets/lists/comp/md.mac68k
+++ b/distrib/sets/lists/comp/md.mac68k
@@ -1,10 +1,4 @@
-./usr/bin/gdb
-./usr/bin/objdump
-./usr/include/bfd.h
-./usr/include/bfdlink.h
-./usr/include/dlfcn.h
 ./usr/include/ieeefp.h
-./usr/include/link.h
 ./usr/include/m68k
 ./usr/include/m68k/ansi.h
 ./usr/include/m68k/asm.h
@@ -108,7 +102,6 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.4/2.95.3/include/typeinfo
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.4/2.95.3/libgcc.a
 ./usr/lib/libasn1_pic.a
-./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
 ./usr/lib/libcrypto_pic.a
@@ -128,18 +121,15 @@
 ./usr/lib/libkvm_pic.a
 ./usr/lib/libm_pic.a
 ./usr/lib/libmenu_pic.a
-./usr/lib/libmmalloc.a
 ./usr/lib/libncurses_pic.a
 ./usr/lib/libobjc_pic.a
 ./usr/lib/libocurses_pic.a
-./usr/lib/libopcodes.a
 ./usr/lib/libossaudio_pic.a
 ./usr/lib/libotermcap_pic.a
 ./usr/lib/libpanel_pic.a
 ./usr/lib/libpcap_pic.a
 ./usr/lib/libperl_pic.a
 ./usr/lib/libpthread_pic.a
-./usr/lib/libreadline.a
 ./usr/lib/libreadline_pic.a
 ./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
@@ -152,5 +142,3 @@
 ./usr/lib/libwrap_pic.a
 ./usr/lib/libz_pic.a
 ./usr/lib/scrt0.o
-./usr/share/man/cat1/gdb.0
-./usr/share/man/cat1/objdump.0
diff --git a/distrib/sets/lists/comp/md.macppc b/distrib/sets/lists/comp/md.macppc
index 8682f27e9a3..98204acab34 100644
--- a/distrib/sets/lists/comp/md.macppc
+++ b/distrib/sets/lists/comp/md.macppc
@@ -1,12 +1,6 @@
 ./usr/bin/gasp
-./usr/bin/gdb
 ./usr/bin/objcopy
-./usr/bin/objdump
-./usr/include/bfd.h
-./usr/include/bfdlink.h
-./usr/include/dlfcn.h
 ./usr/include/ieeefp.h
-./usr/include/link.h
 ./usr/include/macppc
 ./usr/include/macppc/adbsys.h
 ./usr/include/macppc/ansi.h
@@ -121,7 +115,6 @@
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd3.4/2.95.3/soft-float
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd3.4/2.95.3/soft-float/libgcc.a
 ./usr/lib/libasn1_pic.a
-./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
 ./usr/lib/libcrypto_pic.a
@@ -141,18 +134,15 @@
 ./usr/lib/libkvm_pic.a
 ./usr/lib/libm_pic.a
 ./usr/lib/libmenu_pic.a
-./usr/lib/libmmalloc.a
 ./usr/lib/libncurses_pic.a
 ./usr/lib/libobjc_pic.a
 ./usr/lib/libocurses_pic.a
-./usr/lib/libopcodes.a
 ./usr/lib/libossaudio_pic.a
 ./usr/lib/libotermcap_pic.a
 ./usr/lib/libpanel_pic.a
 ./usr/lib/libpcap_pic.a
 ./usr/lib/libperl_pic.a
 ./usr/lib/libpthread_pic.a
-./usr/lib/libreadline.a
 ./usr/lib/libreadline_pic.a
 ./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
@@ -186,6 +176,4 @@
 ./usr/libdata/ldscripts/elf32ppcsim.xs
 ./usr/libdata/ldscripts/elf32ppcsim.xu
 ./usr/libdata/ldscripts/elf32ppcsim.xz
-./usr/share/man/cat1/gdb.0
 ./usr/share/man/cat1/objcopy.0
-./usr/share/man/cat1/objdump.0
diff --git a/distrib/sets/lists/comp/md.mvme68k b/distrib/sets/lists/comp/md.mvme68k
index 95a9f234688..a7816c86b43 100644
--- a/distrib/sets/lists/comp/md.mvme68k
+++ b/distrib/sets/lists/comp/md.mvme68k
@@ -1,10 +1,4 @@
-./usr/bin/gdb
-./usr/bin/objdump
-./usr/include/bfd.h
-./usr/include/bfdlink.h
-./usr/include/dlfcn.h
 ./usr/include/ieeefp.h
-./usr/include/link.h
 ./usr/include/m68k
 ./usr/include/m68k/ansi.h
 ./usr/include/m68k/asm.h
@@ -104,7 +98,6 @@
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.4/2.95.3/include/typeinfo
 ./usr/lib/gcc-lib/m68k-unknown-openbsd3.4/2.95.3/libgcc.a
 ./usr/lib/libasn1_pic.a
-./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
 ./usr/lib/libcrypto_pic.a
@@ -124,18 +117,15 @@
 ./usr/lib/libkvm_pic.a
 ./usr/lib/libm_pic.a
 ./usr/lib/libmenu_pic.a
-./usr/lib/libmmalloc.a
 ./usr/lib/libncurses_pic.a
 ./usr/lib/libobjc_pic.a
 ./usr/lib/libocurses_pic.a
-./usr/lib/libopcodes.a
 ./usr/lib/libossaudio_pic.a
 ./usr/lib/libotermcap_pic.a
 ./usr/lib/libpanel_pic.a
 ./usr/lib/libpcap_pic.a
 ./usr/lib/libperl_pic.a
 ./usr/lib/libpthread_pic.a
-./usr/lib/libreadline.a
 ./usr/lib/libreadline_pic.a
 ./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
@@ -148,5 +138,3 @@
 ./usr/lib/libwrap_pic.a
 ./usr/lib/libz_pic.a
 ./usr/lib/scrt0.o
-./usr/share/man/cat1/gdb.0
-./usr/share/man/cat1/objdump.0
diff --git a/distrib/sets/lists/comp/md.mvme88k b/distrib/sets/lists/comp/md.mvme88k
index 941c23526a8..2788afc70f8 100644
--- a/distrib/sets/lists/comp/md.mvme88k
+++ b/distrib/sets/lists/comp/md.mvme88k
@@ -1,10 +1,4 @@
-./usr/bin/gdb
-./usr/bin/objdump
-./usr/include/bfd.h
-./usr/include/bfdlink.h
-./usr/include/dlfcn.h
 ./usr/include/ieeefp.h
-./usr/include/link.h
 ./usr/include/mvme88k
 ./usr/include/mvme88k/ansi.h
 ./usr/include/mvme88k/asm.h
@@ -76,10 +70,4 @@
 ./usr/lib/gcc-lib/m88k-unknown-openbsd3.4/2.95.3/include/syslimits.h
 ./usr/lib/gcc-lib/m88k-unknown-openbsd3.4/2.95.3/include/typeinfo
 ./usr/lib/gcc-lib/m88k-unknown-openbsd3.4/2.95.3/libgcc.a
-./usr/lib/libbfd.a
-./usr/lib/libmmalloc.a
-./usr/lib/libopcodes.a
-./usr/lib/libreadline.a
 ./usr/lib/scrt0.o
-./usr/share/man/cat1/gdb.0
-./usr/share/man/cat1/objdump.0
diff --git a/distrib/sets/lists/comp/md.mvmeppc b/distrib/sets/lists/comp/md.mvmeppc
index 4d94bb6ba41..47f6538c1a2 100644
--- a/distrib/sets/lists/comp/md.mvmeppc
+++ b/distrib/sets/lists/comp/md.mvmeppc
@@ -1,12 +1,6 @@
 ./usr/bin/gasp
-./usr/bin/gdb
 ./usr/bin/objcopy
-./usr/bin/objdump
-./usr/include/bfd.h
-./usr/include/bfdlink.h
-./usr/include/dlfcn.h
 ./usr/include/ieeefp.h
-./usr/include/link.h
 ./usr/include/mvmeppc
 ./usr/include/mvmeppc/ansi.h
 ./usr/include/mvmeppc/asm.h
@@ -77,7 +71,6 @@
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd3.4/2.95.3/libgcc.a
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd3.4/2.95.3/soft-float
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd3.4/2.95.3/soft-float/libgcc.a
-./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
 ./usr/lib/libcrypto_pic.a
@@ -92,18 +85,15 @@
 ./usr/lib/libkvm_pic.a
 ./usr/lib/libm_pic.a
 ./usr/lib/libmenu_pic.a
-./usr/lib/libmmalloc.a
 ./usr/lib/libncurses_pic.a
 ./usr/lib/libobjc_pic.a
 ./usr/lib/libocurses_pic.a
-./usr/lib/libopcodes.a
 ./usr/lib/libossaudio_pic.a
 ./usr/lib/libotermcap_pic.a
 ./usr/lib/libpanel_pic.a
 ./usr/lib/libpcap_pic.a
 ./usr/lib/libperl_pic.a
 ./usr/lib/libpthread_pic.a
-./usr/lib/libreadline.a
 ./usr/lib/libreadline_pic.a
 ./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
@@ -138,6 +128,4 @@
 ./usr/libdata/ldscripts/elf32ppcsim.xs
 ./usr/libdata/ldscripts/elf32ppcsim.xu
 ./usr/libdata/ldscripts/elf32ppcsim.xz
-./usr/share/man/cat1/gdb.0
 ./usr/share/man/cat1/objcopy.0
-./usr/share/man/cat1/objdump.0
diff --git a/distrib/sets/lists/comp/md.pegasos b/distrib/sets/lists/comp/md.pegasos
index 05fe5ef86f2..66a676ba1dc 100644
--- a/distrib/sets/lists/comp/md.pegasos
+++ b/distrib/sets/lists/comp/md.pegasos
@@ -1,13 +1,6 @@
-
 ./usr/bin/gasp
-./usr/bin/gdb
 ./usr/bin/objcopy
-./usr/bin/objdump
-./usr/include/bfd.h
-./usr/include/bfdlink.h
-./usr/include/dlfcn.h
 ./usr/include/ieeefp.h
-./usr/include/link.h
 ./usr/include/pegasos
 ./usr/include/pegasos/ansi.h
 ./usr/include/pegasos/asm.h
@@ -117,7 +110,6 @@
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd3.4/2.95.3/soft-float
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd3.4/2.95.3/soft-float/libgcc.a
 ./usr/lib/libasn1_pic.a
-./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
 ./usr/lib/libcrypto_pic.a
@@ -137,18 +129,15 @@
 ./usr/lib/libkvm_pic.a
 ./usr/lib/libm_pic.a
 ./usr/lib/libmenu_pic.a
-./usr/lib/libmmalloc.a
 ./usr/lib/libncurses_pic.a
 ./usr/lib/libobjc_pic.a
 ./usr/lib/libocurses_pic.a
-./usr/lib/libopcodes.a
 ./usr/lib/libossaudio_pic.a
 ./usr/lib/libotermcap_pic.a
 ./usr/lib/libpanel_pic.a
 ./usr/lib/libpcap_pic.a
 ./usr/lib/libperl_pic.a
 ./usr/lib/libpthread_pic.a
-./usr/lib/libreadline.a
 ./usr/lib/libreadline_pic.a
 ./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
@@ -182,6 +171,4 @@
 ./usr/libdata/ldscripts/elf32ppcsim.xs
 ./usr/libdata/ldscripts/elf32ppcsim.xu
 ./usr/libdata/ldscripts/elf32ppcsim.xz
-./usr/share/man/cat1/gdb.0
 ./usr/share/man/cat1/objcopy.0
-./usr/share/man/cat1/objdump.0
diff --git a/distrib/sets/lists/comp/md.sparc b/distrib/sets/lists/comp/md.sparc
index 480326a0496..e94dc880efd 100644
--- a/distrib/sets/lists/comp/md.sparc
+++ b/distrib/sets/lists/comp/md.sparc
@@ -1,14 +1,8 @@
 ./usr/bin/addr2line
 ./usr/bin/gasp
-./usr/bin/gdb
 ./usr/bin/objcopy
-./usr/bin/objdump
 ./usr/bin/readelf
-./usr/include/bfd.h
-./usr/include/bfdlink.h
-./usr/include/dlfcn.h
 ./usr/include/ieeefp.h
-./usr/include/link.h
 ./usr/include/sparc
 ./usr/include/sparc/ansi.h
 ./usr/include/sparc/asm.h
@@ -87,7 +81,6 @@
 ./usr/lib/gcc-lib/sparc-unknown-openbsd3.4/2.95.3/include/typeinfo
 ./usr/lib/gcc-lib/sparc-unknown-openbsd3.4/2.95.3/libgcc.a
 ./usr/lib/libasn1_pic.a
-./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
 ./usr/lib/libcrypto_pic.a
@@ -107,18 +100,15 @@
 ./usr/lib/libkvm_pic.a
 ./usr/lib/libm_pic.a
 ./usr/lib/libmenu_pic.a
-./usr/lib/libmmalloc.a
 ./usr/lib/libncurses_pic.a
 ./usr/lib/libobjc_pic.a
 ./usr/lib/libocurses_pic.a
-./usr/lib/libopcodes.a
 ./usr/lib/libossaudio_pic.a
 ./usr/lib/libotermcap_pic.a
 ./usr/lib/libpanel_pic.a
 ./usr/lib/libpcap_pic.a
 ./usr/lib/libperl_pic.a
 ./usr/lib/libpthread_pic.a
-./usr/lib/libreadline.a
 ./usr/lib/libreadline_pic.a
 ./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
@@ -138,6 +128,4 @@
 ./usr/libdata/ldscripts/elf32_sparc.xs
 ./usr/libdata/ldscripts/elf32_sparc.xu
 ./usr/libdata/ldscripts/elf32_sparc.xz
-./usr/share/man/cat1/gdb.0
 ./usr/share/man/cat1/objcopy.0
-./usr/share/man/cat1/objdump.0
diff --git a/distrib/sets/lists/comp/md.sparc64 b/distrib/sets/lists/comp/md.sparc64
index e142be4fe91..4b24da48a53 100644
--- a/distrib/sets/lists/comp/md.sparc64
+++ b/distrib/sets/lists/comp/md.sparc64
@@ -1,14 +1,8 @@
 ./usr/bin/addr2line
 ./usr/bin/gasp
-./usr/bin/gdb
 ./usr/bin/objcopy
-./usr/bin/objdump
 ./usr/bin/readelf
-./usr/include/bfd.h
-./usr/include/bfdlink.h
-./usr/include/dlfcn.h
 ./usr/include/ieeefp.h
-./usr/include/link.h
 ./usr/include/sparc64
 ./usr/include/sparc64/ansi.h
 ./usr/include/sparc64/asm.h
@@ -84,7 +78,6 @@
 ./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/libasn1_pic.a
-./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
 ./usr/lib/libcrypto_pic.a
@@ -104,18 +97,15 @@
 ./usr/lib/libkvm_pic.a
 ./usr/lib/libm_pic.a
 ./usr/lib/libmenu_pic.a
-./usr/lib/libmmalloc.a
 ./usr/lib/libncurses_pic.a
 ./usr/lib/libobjc_pic.a
 ./usr/lib/libocurses_pic.a
-./usr/lib/libopcodes.a
 ./usr/lib/libossaudio_pic.a
 ./usr/lib/libotermcap_pic.a
 ./usr/lib/libpanel_pic.a
 ./usr/lib/libpcap_pic.a
 ./usr/lib/libperl_pic.a
 ./usr/lib/libpthread_pic.a
-./usr/lib/libreadline.a
 ./usr/lib/libreadline_pic.a
 ./usr/lib/libsectok_pic.a
 ./usr/lib/libskey_pic.a
@@ -135,6 +125,4 @@
 ./usr/libdata/ldscripts/elf64_sparc.xs
 ./usr/libdata/ldscripts/elf64_sparc.xu
 ./usr/libdata/ldscripts/elf64_sparc.xz
-./usr/share/man/cat1/gdb.0
 ./usr/share/man/cat1/objcopy.0
-./usr/share/man/cat1/objdump.0
diff --git a/distrib/sets/lists/comp/md.vax b/distrib/sets/lists/comp/md.vax
index ca3f7a82f8c..f19a352b9a5 100644
--- a/distrib/sets/lists/comp/md.vax
+++ b/distrib/sets/lists/comp/md.vax
@@ -1,9 +1,3 @@
-./usr/bin/gdb
-./usr/bin/objdump
-./usr/include/bfd.h
-./usr/include/bfdlink.h
-./usr/include/dlfcn.h
-./usr/include/link.h
 ./usr/include/vax
 ./usr/include/vax/ansi.h
 ./usr/include/vax/aout_machdep.h
@@ -74,10 +68,4 @@
 ./usr/lib/gcc-lib/vax-unknown-openbsd3.4/2.95.3/include/syslimits.h
 ./usr/lib/gcc-lib/vax-unknown-openbsd3.4/2.95.3/include/typeinfo
 ./usr/lib/gcc-lib/vax-unknown-openbsd3.4/2.95.3/libgcc.a
-./usr/lib/libbfd.a
-./usr/lib/libmmalloc.a
-./usr/lib/libopcodes.a
-./usr/lib/libreadline.a
 ./usr/lib/scrt0.o
-./usr/share/man/cat1/gdb.0
-./usr/share/man/cat1/objdump.0
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 460b22c983a..0fc11899464 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -13,12 +13,14 @@
 ./usr/bin/g77
 ./usr/bin/gcc
 ./usr/bin/gcov
+./usr/bin/gdb
 ./usr/bin/gprof
 ./usr/bin/ld
 ./usr/bin/lex
 ./usr/bin/lint
 ./usr/bin/lorder
 ./usr/bin/mkstr
+./usr/bin/objdump
 ./usr/bin/pmdb
 ./usr/bin/protoize
 ./usr/bin/ranlib
@@ -49,6 +51,8 @@
 ./usr/include/arpa/telnet.h
 ./usr/include/arpa/tftp.h
 ./usr/include/assert.h
+./usr/include/bfd.h
+./usr/include/bfdlink.h
 ./usr/include/bitstring.h
 ./usr/include/blf.h
 ./usr/include/bm.h
@@ -717,6 +721,7 @@
 ./usr/include/dev/wsfont/wsfont.h
 ./usr/include/dirent.h
 ./usr/include/disktab.h
+./usr/include/dlfcn.h
 ./usr/include/elf_abi.h
 ./usr/include/err.h
 ./usr/include/errno.h
@@ -942,6 +947,7 @@
 ./usr/include/langinfo.h
 ./usr/include/libgen.h
 ./usr/include/limits.h
+./usr/include/link.h
 ./usr/include/link_aout.h
 ./usr/include/link_elf.h
 ./usr/include/locale.h
@@ -1639,6 +1645,7 @@
 ./usr/lib/gcrt0.o
 ./usr/lib/libasn1.a
 ./usr/lib/libasn1_p.a
+./usr/lib/libbfd.a
 ./usr/lib/libbfd.la
 ./usr/lib/libc.a
 ./usr/lib/libc_p.a
@@ -1690,12 +1697,14 @@
 ./usr/lib/libm_p.a
 ./usr/lib/libmenu.a
 ./usr/lib/libmenu_p.a
+./usr/lib/libmmalloc.a
 ./usr/lib/libncurses.a
 ./usr/lib/libncurses_p.a
 ./usr/lib/libobjc.a
 ./usr/lib/libobjc_p.a
 ./usr/lib/libocurses.a
 ./usr/lib/libocurses_p.a
+./usr/lib/libopcodes.a
 ./usr/lib/libopcodes.la
 ./usr/lib/libossaudio.a
 ./usr/lib/libossaudio_p.a
@@ -1709,6 +1718,7 @@
 ./usr/lib/libperl_p.a
 ./usr/lib/libpthread.a
 ./usr/lib/libpthread_p.a
+./usr/lib/libreadline.a
 ./usr/lib/libreadline_p.a
 ./usr/lib/libresolv.a
 ./usr/lib/libresolv_p.a
@@ -1774,12 +1784,14 @@
 ./usr/share/man/cat1/gcc-local.0
 ./usr/share/man/cat1/gcc.0
 ./usr/share/man/cat1/gcov.0
+./usr/share/man/cat1/gdb.0
 ./usr/share/man/cat1/gprof.0
 ./usr/share/man/cat1/ld.0
 ./usr/share/man/cat1/lex.0
 ./usr/share/man/cat1/lint.0
 ./usr/share/man/cat1/lorder.0
 ./usr/share/man/cat1/mkstr.0
+./usr/share/man/cat1/objdump.0
 ./usr/share/man/cat1/pmdb.0
 ./usr/share/man/cat1/protoize.0
 ./usr/share/man/cat1/ranlib.0