Move manpages related to binaries in comp from man to comp.

Sort some files.  Remove the nlmconv manpage as we don't have the binary.
Moved some stuff in the powerpc sets that had gotten wrong, please check, Dale.

23 files changed, 29 insertions, 43 deletions

diff --git a/distrib/sets/lists/base/md.powerpc b/distrib/sets/lists/base/md.powerpc
index 9fe5d975175..62fff75721e 100644
--- a/distrib/sets/lists/base/md.powerpc
+++ b/distrib/sets/lists/base/md.powerpc
@@ -1,14 +1,5 @@
-./usr/lib/libbfd.a
-./usr/lib/libmmalloc.a
-./usr/lib/libreadline.a
-./usr/mdec/boot.mac
-./usr/mdec/boot.ppc
 ./sbin/fdisk
 ./usr/bin/dlltool
-./usr/bin/gasp
-./usr/bin/gprof
-./usr/bin/objcopy
-./usr/bin/objdump
 ./usr/lib/perl5/auto/Text
 ./usr/lib/perl5/auto/Text/ParseWords
 ./usr/lib/perl5/auto/Text/ParseWords/autosplit.ix
@@ -338,3 +329,5 @@
 ./usr/lib/perl5/powerpc-openbsd/5.003/zconf.ph
 ./usr/lib/perl5/powerpc-openbsd/5.003/zlib.ph
 ./usr/lib/perl5/site_perl/powerpc-openbsd
+./usr/mdec/boot.mac
+./usr/mdec/boot.ppc
diff --git a/distrib/sets/lists/comp/md.alpha b/distrib/sets/lists/comp/md.alpha
index e0ad702c726..52b605c0306 100644
--- a/distrib/sets/lists/comp/md.alpha
+++ b/distrib/sets/lists/comp/md.alpha
@@ -107,6 +107,9 @@
 ./usr/lib/libmmalloc.a
 ./usr/lib/libopcodes.a
 ./usr/lib/libreadline.a
+./usr/share/man/cat1/gdb.0
+./usr/share/man/cat1/objcopy.0
+./usr/share/man/cat1/objdump.0
 ./usr/share/man/cat3/dlclose.0
 ./usr/share/man/cat3/dlctl.0
 ./usr/share/man/cat3/dlerror.0
diff --git a/distrib/sets/lists/comp/md.amiga b/distrib/sets/lists/comp/md.amiga
index 553966b62e4..949e714e00a 100644
--- a/distrib/sets/lists/comp/md.amiga
+++ b/distrib/sets/lists/comp/md.amiga
@@ -114,6 +114,7 @@
 ./usr/lib/libwrap_pic.a
 ./usr/lib/libz_pic.a
 ./usr/lib/scrt0.o
+./usr/share/man/cat1/gdb.0
 ./usr/share/man/cat3/dlclose.0
 ./usr/share/man/cat3/dlctl.0
 ./usr/share/man/cat3/dlerror.0
diff --git a/distrib/sets/lists/comp/md.arc b/distrib/sets/lists/comp/md.arc
index c36f9739784..8123b87575d 100644
--- a/distrib/sets/lists/comp/md.arc
+++ b/distrib/sets/lists/comp/md.arc
@@ -101,6 +101,9 @@
 ./usr/mipsel-unknown-openbsd2.1/lib/ldscripts/mipsel_obsd.xr
 ./usr/mipsel-unknown-openbsd2.1/lib/ldscripts/mipsel_obsd.xs
 ./usr/mipsel-unknown-openbsd2.1/lib/ldscripts/mipsel_obsd.xu
+./usr/share/man/cat1/gdb.0
+./usr/share/man/cat1/objcopy.0
+./usr/share/man/cat1/objdump.0
 ./usr/share/man/cat3/dlclose.0
 ./usr/share/man/cat3/dlctl.0
 ./usr/share/man/cat3/dlerror.0
diff --git a/distrib/sets/lists/comp/md.hp300 b/distrib/sets/lists/comp/md.hp300
index 6cf1b3bdb79..3f36d10671e 100644
--- a/distrib/sets/lists/comp/md.hp300
+++ b/distrib/sets/lists/comp/md.hp300
@@ -111,6 +111,7 @@
 ./usr/lib/libwrap_pic.a
 ./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
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index e01cbcd99a0..f2c3dabd51e 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -117,6 +117,7 @@
 ./usr/lib/libwrap_pic.a
 ./usr/lib/libz_pic.a
 ./usr/lib/scrt0.o
+./usr/share/man/cat1/gdb.0
 ./usr/share/man/cat2/i386_get_ioperm.0
 ./usr/share/man/cat2/i386_get_ldt.0
 ./usr/share/man/cat2/i386_iopl.0
diff --git a/distrib/sets/lists/comp/md.mac68k b/distrib/sets/lists/comp/md.mac68k
index f21c08c26e2..f5fce13c9f9 100644
--- a/distrib/sets/lists/comp/md.mac68k
+++ b/distrib/sets/lists/comp/md.mac68k
@@ -119,6 +119,7 @@
 ./usr/lib/libwrap_pic.a
 ./usr/lib/libz_pic.a
 ./usr/lib/scrt0.o
+./usr/share/man/cat1/gdb.0
 ./usr/share/man/cat3/dlclose.0
 ./usr/share/man/cat3/dlctl.0
 ./usr/share/man/cat3/dlerror.0
diff --git a/distrib/sets/lists/comp/md.mvme68k b/distrib/sets/lists/comp/md.mvme68k
index 1330ceb3fc5..f10987caaef 100644
--- a/distrib/sets/lists/comp/md.mvme68k
+++ b/distrib/sets/lists/comp/md.mvme68k
@@ -108,6 +108,7 @@
 ./usr/lib/libutil_pic.a
 ./usr/lib/libz_pic.a
 ./usr/lib/scrt0.o
+./usr/share/man/cat1/gdb.0
 ./usr/share/man/cat3/dlclose.0
 ./usr/share/man/cat3/dlctl.0
 ./usr/share/man/cat3/dlerror.0
diff --git a/distrib/sets/lists/comp/md.pmax b/distrib/sets/lists/comp/md.pmax
index a4bb3d577f0..8ee4c87327f 100644
--- a/distrib/sets/lists/comp/md.pmax
+++ b/distrib/sets/lists/comp/md.pmax
@@ -110,6 +110,9 @@
 ./usr/mipsel-unknown-openbsd2.1/lib/ldscripts/mipsel_obsd.xr
 ./usr/mipsel-unknown-openbsd2.1/lib/ldscripts/mipsel_obsd.xs
 ./usr/mipsel-unknown-openbsd2.1/lib/ldscripts/mipsel_obsd.xu
+./usr/share/man/cat1/gdb.0
+./usr/share/man/cat1/objcopy.0
+./usr/share/man/cat1/objdump.0
 ./usr/share/man/cat3/dlclose.0
 ./usr/share/man/cat3/dlctl.0
 ./usr/share/man/cat3/dlerror.0
diff --git a/distrib/sets/lists/comp/md.powerpc b/distrib/sets/lists/comp/md.powerpc
index 160a6426a82..712b1166e81 100644
--- a/distrib/sets/lists/comp/md.powerpc
+++ b/distrib/sets/lists/comp/md.powerpc
@@ -1,3 +1,10 @@
+./usr/bin/c++filt
+./usr/bin/gasp
+./usr/bin/objcopy
+./usr/bin/objdump
+./usr/lib/libbfd.a
+./usr/lib/libmmalloc.a
+./usr/lib/libreadline.a
 ./usr/include/ansidecl.h
 ./usr/include/bfd.h
 ./usr/include/bfdlink.h
@@ -103,7 +110,6 @@
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd2.0/2.7.2.1/soft-float
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd2.0/2.7.2.1/soft-float/libgcc.a
 ./usr/lib/gcc-lib/powerpc-unknown-openbsd2.0/2.7.2.1/specs
-./usr/bin/c++filt
 ./usr/powerpc-unknown-openbsd2.0
 ./usr/powerpc-unknown-openbsd2.0/bin
 ./usr/powerpc-unknown-openbsd2.0/bin/ar
@@ -121,3 +127,5 @@
 ./usr/powerpc-unknown-openbsd2.0/lib/ldscripts/elf32ppc.xr
 ./usr/powerpc-unknown-openbsd2.0/lib/ldscripts/elf32ppc.xs
 ./usr/powerpc-unknown-openbsd2.0/lib/ldscripts/elf32ppc.xu
+./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 c2fcdcd7812..269569a2aef 100644
--- a/distrib/sets/lists/comp/md.sparc
+++ b/distrib/sets/lists/comp/md.sparc
@@ -107,6 +107,7 @@
 ./usr/lib/libwrap_pic.a
 ./usr/lib/libz_pic.a
 ./usr/lib/scrt0.o
+./usr/share/man/cat1/gdb.0
 ./usr/share/man/cat3/dlclose.0
 ./usr/share/man/cat3/dlctl.0
 ./usr/share/man/cat3/dlerror.0
diff --git a/distrib/sets/lists/comp/md.sun3 b/distrib/sets/lists/comp/md.sun3
index a797f075604..fedbf97663b 100644
--- a/distrib/sets/lists/comp/md.sun3
+++ b/distrib/sets/lists/comp/md.sun3
@@ -83,6 +83,7 @@
 ./usr/lib/libutil_pic.a
 ./usr/lib/scrt0.o
 ./usr/sbin/dbsym
+./usr/share/man/cat1/gdb.0
 ./usr/share/man/cat3/dlclose.0
 ./usr/share/man/cat3/dlctl.0
 ./usr/share/man/cat3/dlerror.0
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 770873f5799..0662542e2e9 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1063,6 +1063,7 @@
 ./usr/share/man/cat1/fpr.0
 ./usr/share/man/cat1/g++.0
 ./usr/share/man/cat1/gcc.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
diff --git a/distrib/sets/lists/man/md.alpha b/distrib/sets/lists/man/md.alpha
index e202726575e..f287842df32 100644
--- a/distrib/sets/lists/man/md.alpha
+++ b/distrib/sets/lists/man/md.alpha
@@ -1,6 +1 @@
-./usr/share/man/cat1/gdb.0
-./usr/share/man/cat1/gprof.0
-./usr/share/man/cat1/nlmconv.0
-./usr/share/man/cat1/objcopy.0
-./usr/share/man/cat1/objdump.0
 ./usr/share/man/cat8/alpha/installboot.0
diff --git a/distrib/sets/lists/man/md.amiga b/distrib/sets/lists/man/md.amiga
index 8fa124e9fc4..1fca08a1d1d 100644
--- a/distrib/sets/lists/man/md.amiga
+++ b/distrib/sets/lists/man/md.amiga
@@ -1,5 +1,3 @@
-./usr/share/man/cat1/gdb.0
-./usr/share/man/cat1/gprof.0
 ./usr/share/man/cat1/ld.so.0
 ./usr/share/man/cat1/ldd.0
 ./usr/share/man/cat1/rtld.0
diff --git a/distrib/sets/lists/man/md.arc b/distrib/sets/lists/man/md.arc
index 5f8f7ce5390..0578a74831c 100644
--- a/distrib/sets/lists/man/md.arc
+++ b/distrib/sets/lists/man/md.arc
@@ -1,11 +1,6 @@
 ./usr/share/man/cat1/elf2aout.0
 ./usr/share/man/cat1/elf2ecoff.0
-./usr/share/man/cat1/gdb.0
-./usr/share/man/cat1/gprof.0
 ./usr/share/man/cat1/ldd.0
-./usr/share/man/cat1/nlmconv.0
-./usr/share/man/cat1/objcopy.0
-./usr/share/man/cat1/objdump.0
 ./usr/share/man/cat8/fdisk.0
 ./usr/share/man/cat8/ld.so.0
 ./usr/share/man/cat8/ldconfig.0
diff --git a/distrib/sets/lists/man/md.hp300 b/distrib/sets/lists/man/md.hp300
index d5735512608..eef14bce001 100644
--- a/distrib/sets/lists/man/md.hp300
+++ b/distrib/sets/lists/man/md.hp300
@@ -1,5 +1,3 @@
-./usr/share/man/cat1/gdb.0
-./usr/share/man/cat1/gprof.0
 ./usr/share/man/cat1/grfinfo.0
 ./usr/share/man/cat1/ld.so.0
 ./usr/share/man/cat1/ldd.0
diff --git a/distrib/sets/lists/man/md.i386 b/distrib/sets/lists/man/md.i386
index 278a8c985b8..d4e2a9dc68e 100644
--- a/distrib/sets/lists/man/md.i386
+++ b/distrib/sets/lists/man/md.i386
@@ -2,8 +2,6 @@
 ./usr/share/man/cat1/fdformat.0
 ./usr/share/man/cat1/fed.0
 ./usr/share/man/cat1/fontedit.0
-./usr/share/man/cat1/gdb.0
-./usr/share/man/cat1/gprof.0
 ./usr/share/man/cat1/kcon.0
 ./usr/share/man/cat1/ld.so.0
 ./usr/share/man/cat1/ldd.0
diff --git a/distrib/sets/lists/man/md.mac68k b/distrib/sets/lists/man/md.mac68k
index 6f772f845bf..aaeb8bd2e92 100644
--- a/distrib/sets/lists/man/md.mac68k
+++ b/distrib/sets/lists/man/md.mac68k
@@ -1,5 +1,3 @@
-./usr/share/man/cat1/gdb.0
-./usr/share/man/cat1/gprof.0
 ./usr/share/man/cat1/ld.so.0
 ./usr/share/man/cat1/ldd.0
 ./usr/share/man/cat1/rtld.0
diff --git a/distrib/sets/lists/man/md.mvme68k b/distrib/sets/lists/man/md.mvme68k
index 300ed2a88d6..4df87d6d3b8 100644
--- a/distrib/sets/lists/man/md.mvme68k
+++ b/distrib/sets/lists/man/md.mvme68k
@@ -1,5 +1,3 @@
-./usr/share/man/cat1/gdb.0
-./usr/share/man/cat1/gprof.0
 ./usr/share/man/cat1/ld.so.0
 ./usr/share/man/cat1/ldd.0
 ./usr/share/man/cat1/rtld.0
diff --git a/distrib/sets/lists/man/md.pmax b/distrib/sets/lists/man/md.pmax
index b4aa3a3689a..8a27fb168b7 100644
--- a/distrib/sets/lists/man/md.pmax
+++ b/distrib/sets/lists/man/md.pmax
@@ -1,10 +1,5 @@
 ./usr/share/man/cat1/elf2aout.0
 ./usr/share/man/cat1/elf2ecoff.0
-./usr/share/man/cat1/gdb.0
-./usr/share/man/cat1/gprof.0
 ./usr/share/man/cat1/ldd.0
-./usr/share/man/cat1/nlmconv.0
-./usr/share/man/cat1/objcopy.0
-./usr/share/man/cat1/objdump.0
 ./usr/share/man/cat8/ld.so.0
 ./usr/share/man/cat8/ldconfig.0
diff --git a/distrib/sets/lists/man/md.powerpc b/distrib/sets/lists/man/md.powerpc
index dfddf34f108..77a7c8f8bbc 100644
--- a/distrib/sets/lists/man/md.powerpc
+++ b/distrib/sets/lists/man/md.powerpc
@@ -1,8 +1,4 @@
-./usr/share/man/cat1/gprof.0
-./usr/share/man/cat1/nlmconv.0
-./usr/share/man/cat1/objcopy.0
-./usr/share/man/cat1/objdump.0
-./usr/share/man/cat2/seek.0
+./usr/share/info/cpio.info
 ./usr/share/man/cat3/dlclose.0
 ./usr/share/man/cat3/dlctl.0
 ./usr/share/man/cat3/dlerror.0
@@ -15,4 +11,3 @@
 ./usr/share/man/cat3/kvm_dump_wrtheader.0
 ./usr/share/man/cat4/i386/ncr.0
 ./usr/share/man/cat8/fdisk.0
-./usr/share/info/cpio.info
diff --git a/distrib/sets/lists/man/md.sparc b/distrib/sets/lists/man/md.sparc
index d383a436579..4604d4dbd9e 100644
--- a/distrib/sets/lists/man/md.sparc
+++ b/distrib/sets/lists/man/md.sparc
@@ -1,5 +1,3 @@
-./usr/share/man/cat1/gdb.0
-./usr/share/man/cat1/gprof.0
 ./usr/share/man/cat1/ld.so.0
 ./usr/share/man/cat1/ldd.0
 ./usr/share/man/cat1/rtld.0