correct some locations

17 files changed, 3 insertions, 15 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index a79ae087ccd..b83919464fb 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -5,7 +5,6 @@
 ./sbin/ldconfig
 ./sbin/wicontrol
 ./sbin/wsconsctl
-./usr/bin/c++filt
 ./usr/bin/ldd
 ./usr/lib/apache/modules/libproxy.so
 ./usr/lib/apache/modules/mod_auth_anon.so
diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index a322cd5f54e..1b1c56dfcfb 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -1,6 +1,5 @@
 ./sbin/binpatch
 ./sbin/ldconfig
-./usr/bin/c++filt
 ./usr/bin/ldd
 ./usr/lib/apache/modules/libproxy.so
 ./usr/lib/apache/modules/mod_auth_anon.so
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 7128bbb641e..efd9f8006d7 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -1,5 +1,4 @@
 ./sbin/ldconfig
-./usr/bin/c++filt
 ./usr/bin/ldd
 ./usr/lib/apache/modules/libproxy.so
 ./usr/lib/apache/modules/mod_auth_anon.so
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 91bb0d6a455..9d80c985f13 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -1,7 +1,6 @@
 ./sbin/iopctl
 ./sbin/kbd
 ./sbin/wsconsctl
-./usr/bin/c++filt
 ./usr/lib/gcc-lib/hppa-unknown-openbsd3.1
 ./usr/lib/gcc-lib/hppa-unknown-openbsd3.1/2.95.3
 ./usr/lib/gcc-lib/hppa-unknown-openbsd3.1/2.95.3/collect2
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 182e07ddfde..c2bfaf5f90d 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -5,7 +5,6 @@
 ./sbin/ldconfig
 ./sbin/wicontrol
 ./sbin/wsconsctl
-./usr/bin/c++filt
 ./usr/bin/ldd
 ./usr/bin/pctr
 ./usr/lib/apache/modules/libproxy.so
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 311d1c245c6..a2c484f005c 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -1,6 +1,5 @@
 ./sbin/ldconfig
 ./sbin/pdisk
-./usr/bin/c++filt
 ./usr/bin/ldd
 ./usr/lib/apache/modules/libproxy.so
 ./usr/lib/apache/modules/mod_auth_anon.so
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index d85a732bf7f..2585fa5dd76 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -7,7 +7,6 @@
 ./sbin/wicontrol
 ./sbin/wsconsctl
 ./usr/bin/addr2line
-./usr/bin/c++filt
 ./usr/bin/ldd
 ./usr/bin/readelf
 ./usr/lib/apache/modules/libproxy.so
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 491a2791d56..2f8fc2398c7 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -1,5 +1,4 @@
 ./sbin/ldconfig
-./usr/bin/c++filt
 ./usr/bin/ldd
 ./usr/lib/apache/modules/libproxy.so
 ./usr/lib/apache/modules/mod_auth_anon.so
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index f0328e3f647..f93baad4af7 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -1,5 +1,4 @@
 ./sbin/ldconfig
-./usr/bin/c++filt
 ./usr/bin/ldd
 ./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/cpp
 ./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/specs
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 5ae17712bd3..0a0eae40c27 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -3,7 +3,6 @@
 ./sbin/pdisk
 ./sbin/wsconsctl
 ./usr/bin/addr2line
-./usr/bin/c++filt
 ./usr/bin/ldd
 ./usr/bin/readelf
 ./usr/lib/apache/modules/libproxy.so
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index f70898aaa55..be95e10916e 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -1,6 +1,5 @@
 ./sbin/kbd
 ./sbin/ldconfig
-./usr/bin/c++filt
 ./usr/bin/ldd
 ./usr/lib/apache/modules/libproxy.so
 ./usr/lib/apache/modules/mod_auth_anon.so
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 9f2f55c1ecc..ab88e2c0d6a 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -2,7 +2,6 @@
 ./sbin/ldconfig
 ./sbin/wicontrol
 ./sbin/wsconsctl
-./usr/bin/c++filt
 ./usr/bin/ldd
 ./usr/lib/apache/modules/libproxy.so
 ./usr/lib/apache/modules/mod_auth_anon.so
diff --git a/distrib/sets/lists/base/md.sun3 b/distrib/sets/lists/base/md.sun3
index 77b3eb901a9..c547cd17b1d 100644
--- a/distrib/sets/lists/base/md.sun3
+++ b/distrib/sets/lists/base/md.sun3
@@ -1,5 +1,4 @@
 ./sbin/ldconfig
-./usr/bin/c++filt
 ./usr/bin/ldd
 ./usr/lib/apache/modules/libproxy.so
 ./usr/lib/apache/modules/mod_auth_anon.so
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index ef041979bc1..7a742a1f17d 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -1,7 +1,6 @@
 ./pcs750.bin
 ./sbin/kbd
 ./sbin/ldconfig
-./usr/bin/c++filt
 ./usr/bin/ldd
 ./usr/lib/gcc-lib/vax-unknown-openbsd3.1
 ./usr/lib/gcc-lib/vax-unknown-openbsd3.1/2.95.3
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 8ca38cf9fea..d41eeba0443 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -1737,7 +1737,6 @@
 ./usr/share/man/cat1/help.0
 ./usr/share/man/cat1/man.0
 ./usr/share/man/cat1/pkg_add.0
-./usr/share/man/cat4/nofn.0
 ./usr/share/man/cat7
 ./usr/share/man/cat7/packages.0
 ./usr/share/man/cat8
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 854785acd56..3dab3181a52 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -3,6 +3,7 @@
 ./usr/bin/as
 ./usr/bin/asa
 ./usr/bin/c++
+./usr/bin/c++filt
 ./usr/bin/cc
 ./usr/bin/f77
 ./usr/bin/flex
@@ -1579,6 +1580,7 @@
 ./usr/lib/apache/include/compat.h
 ./usr/lib/apache/include/conf.h
 ./usr/lib/apache/include/explain.h
+./usr/lib/apache/include/fdcache.h
 ./usr/lib/apache/include/fnmatch.h
 ./usr/lib/apache/include/hsregex.h
 ./usr/lib/apache/include/http_conf_globals.h
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 17af452d548..8949daf9ee9 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1130,6 +1130,7 @@
 ./usr/share/man/cat4/networking.0
 ./usr/share/man/cat4/nge.0
 ./usr/share/man/cat4/noct.0
+./usr/share/man/cat4/nofn.0
 ./usr/share/man/cat4/ns.0
 ./usr/share/man/cat4/nsgphy.0
 ./usr/share/man/cat4/nsip.0