2.1

15 files changed, 184 insertions, 183 deletions

diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index 8e1f890fd93..8ecfa7675bf 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -3,6 +3,10 @@
 ./sbin/ldconfig
 ./usr/bin/ldd
 ./usr/include/m68k
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/include
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/include/objc
 ./usr/lib/libacl.so.4.0
 ./usr/lib/libc.so.16.0
 ./usr/lib/libcurses.so.3.1
diff --git a/distrib/sets/lists/base/md.arc b/distrib/sets/lists/base/md.arc
index 117b3258845..a996a88d797 100644
--- a/distrib/sets/lists/base/md.arc
+++ b/distrib/sets/lists/base/md.arc
@@ -2,6 +2,10 @@
 ./sbin/ldconfig
 ./usr/bin/ldd
 ./usr/include/mips
+./usr/lib/gcc-lib/mips-arc-openbsd2.1
+./usr/lib/gcc-lib/mips-arc-openbsd2.1/2.7.2.1
+./usr/lib/gcc-lib/mips-arc-openbsd2.1/2.7.2.1/include
+./usr/lib/gcc-lib/mips-arc-openbsd2.1/2.7.2.1/include/objc
 ./usr/lib/libacl.so.4.0
 ./usr/lib/libc.so.16.0
 ./usr/lib/libcurses.so.3.1
@@ -357,19 +361,19 @@
 ./usr/lib/perl5/site_perl/arc-openbsd
 ./usr/lib/scrt0.o
 ./usr/libexec/ld.so
-./usr/mips-arc-openbsd2.0
-./usr/mips-arc-openbsd2.0/bin
-./usr/mips-arc-openbsd2.0/bin/ar
-./usr/mips-arc-openbsd2.0/bin/as
-./usr/mips-arc-openbsd2.0/bin/ld
-./usr/mips-arc-openbsd2.0/bin/nm
-./usr/mips-arc-openbsd2.0/bin/ranlib
-./usr/mips-arc-openbsd2.0/bin/strip
-./usr/mips-arc-openbsd2.0/lib
-./usr/mips-arc-openbsd2.0/lib/ldscripts
-./usr/mips-arc-openbsd2.0/lib/ldscripts/elf32arc.x
-./usr/mips-arc-openbsd2.0/lib/ldscripts/elf32arc.xbn
-./usr/mips-arc-openbsd2.0/lib/ldscripts/elf32arc.xn
-./usr/mips-arc-openbsd2.0/lib/ldscripts/elf32arc.xr
-./usr/mips-arc-openbsd2.0/lib/ldscripts/elf32arc.xs
-./usr/mips-arc-openbsd2.0/lib/ldscripts/elf32arc.xu
+./usr/mips-arc-openbsd2.1
+./usr/mips-arc-openbsd2.1/bin
+./usr/mips-arc-openbsd2.1/bin/ar
+./usr/mips-arc-openbsd2.1/bin/as
+./usr/mips-arc-openbsd2.1/bin/ld
+./usr/mips-arc-openbsd2.1/bin/nm
+./usr/mips-arc-openbsd2.1/bin/ranlib
+./usr/mips-arc-openbsd2.1/bin/strip
+./usr/mips-arc-openbsd2.1/lib
+./usr/mips-arc-openbsd2.1/lib/ldscripts
+./usr/mips-arc-openbsd2.1/lib/ldscripts/elf32arc.x
+./usr/mips-arc-openbsd2.1/lib/ldscripts/elf32arc.xbn
+./usr/mips-arc-openbsd2.1/lib/ldscripts/elf32arc.xn
+./usr/mips-arc-openbsd2.1/lib/ldscripts/elf32arc.xr
+./usr/mips-arc-openbsd2.1/lib/ldscripts/elf32arc.xs
+./usr/mips-arc-openbsd2.1/lib/ldscripts/elf32arc.xu
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index d49acbf4b1d..cb35319f09e 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -7,6 +7,10 @@
 ./usr/bin/ldd
 ./usr/bin/pctr
 ./usr/include/i386
+./usr/lib/gcc-lib/i386-unknown-openbsd2.1
+./usr/lib/gcc-lib/i386-unknown-openbsd2.1/2.7.2.1
+./usr/lib/gcc-lib/i386-unknown-openbsd2.1/2.7.2.1/include
+./usr/lib/gcc-lib/i386-unknown-openbsd2.1/2.7.2.1/include/objc
 ./usr/lib/libacl.so.4.0
 ./usr/lib/libc.so.16.1
 ./usr/lib/libcurses.so.3.1
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 03ae594eef5..9277845af5c 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -1,3 +1,8 @@
+./usr/include/m68k
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/include
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/include/objc
 ./usr/lib/libacl.so.4.0
 ./usr/lib/libc.so.16.0
 ./usr/lib/libcurses.so.3.1
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 47934fe6309..3d0895be74a 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -1,6 +1,10 @@
 ./sbin/ldconfig
 ./usr/bin/ldd
 ./usr/include/m68k
+./usr/lib/gcc-lib/m68k-motorola-openbsd2.1
+./usr/lib/gcc-lib/m68k-motorola-openbsd2.1/2.7.2.1
+./usr/lib/gcc-lib/m68k-motorola-openbsd2.1/2.7.2.1/include
+./usr/lib/gcc-lib/m68k-motorola-openbsd2.1/2.7.2.1/include/objc
 ./usr/lib/libacl.so.4.0
 ./usr/lib/libc.so.16.0
 ./usr/lib/libcurses.so.3.1
diff --git a/distrib/sets/lists/base/md.pc532 b/distrib/sets/lists/base/md.pc532
index 1b0c8a567a9..4cf9f4d3cf1 100644
--- a/distrib/sets/lists/base/md.pc532
+++ b/distrib/sets/lists/base/md.pc532
@@ -1,5 +1,6 @@
 ./sbin/bim
 ./usr/bin/ldd
+./usr/include/ns32k
 ./usr/lib/libacl.so.4.0
 ./usr/lib/libc.so.16.0
 ./usr/lib/libcurses.so.3.1
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 8d81e0248e7..99e64d35f61 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -1,5 +1,10 @@
 ./sbin/ldconfig
 ./usr/bin/ldd
+./usr/include/sparc
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.1
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.1/2.7.2.1
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.1/2.7.2.1/include
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.1/2.7.2.1/include/objc
 ./usr/lib/libacl.so.4.0
 ./usr/lib/libc.so.16.0
 ./usr/lib/libcurses.so.3.1
diff --git a/distrib/sets/lists/comp/md.alpha b/distrib/sets/lists/comp/md.alpha
index 53a1f98a3e4..1115310a1de 100644
--- a/distrib/sets/lists/comp/md.alpha
+++ b/distrib/sets/lists/comp/md.alpha
@@ -1,19 +1,19 @@
-./usr/alpha-unknown-openbsd2.0/bin/ar
-./usr/alpha-unknown-openbsd2.0/bin/as
-./usr/alpha-unknown-openbsd2.0/bin/ld
-./usr/alpha-unknown-openbsd2.0/bin/nm
-./usr/alpha-unknown-openbsd2.0/bin/ranlib
-./usr/alpha-unknown-openbsd2.0/bin/strip
-./usr/alpha-unknown-openbsd2.0/lib/ldscripts/alpha.x
-./usr/alpha-unknown-openbsd2.0/lib/ldscripts/alpha.xbn
-./usr/alpha-unknown-openbsd2.0/lib/ldscripts/alpha.xn
-./usr/alpha-unknown-openbsd2.0/lib/ldscripts/alpha.xr
-./usr/alpha-unknown-openbsd2.0/lib/ldscripts/alpha.xu
-./usr/alpha-unknown-openbsd2.0/lib/ldscripts/alphabsd.x
-./usr/alpha-unknown-openbsd2.0/lib/ldscripts/alphabsd.xbn
-./usr/alpha-unknown-openbsd2.0/lib/ldscripts/alphabsd.xn
-./usr/alpha-unknown-openbsd2.0/lib/ldscripts/alphabsd.xr
-./usr/alpha-unknown-openbsd2.0/lib/ldscripts/alphabsd.xu
+./usr/alpha-unknown-openbsd2.1/bin/ar
+./usr/alpha-unknown-openbsd2.1/bin/as
+./usr/alpha-unknown-openbsd2.1/bin/ld
+./usr/alpha-unknown-openbsd2.1/bin/nm
+./usr/alpha-unknown-openbsd2.1/bin/ranlib
+./usr/alpha-unknown-openbsd2.1/bin/strip
+./usr/alpha-unknown-openbsd2.1/lib/ldscripts/alpha.x
+./usr/alpha-unknown-openbsd2.1/lib/ldscripts/alpha.xbn
+./usr/alpha-unknown-openbsd2.1/lib/ldscripts/alpha.xn
+./usr/alpha-unknown-openbsd2.1/lib/ldscripts/alpha.xr
+./usr/alpha-unknown-openbsd2.1/lib/ldscripts/alpha.xu
+./usr/alpha-unknown-openbsd2.1/lib/ldscripts/alphabsd.x
+./usr/alpha-unknown-openbsd2.1/lib/ldscripts/alphabsd.xbn
+./usr/alpha-unknown-openbsd2.1/lib/ldscripts/alphabsd.xn
+./usr/alpha-unknown-openbsd2.1/lib/ldscripts/alphabsd.xr
+./usr/alpha-unknown-openbsd2.1/lib/ldscripts/alphabsd.xu
 ./usr/bin/c++filt
 ./usr/bin/gasp
 ./usr/bin/gdb
diff --git a/distrib/sets/lists/comp/md.amiga b/distrib/sets/lists/comp/md.amiga
index cb9dab5b8a5..63e55210a9c 100644
--- a/distrib/sets/lists/comp/md.amiga
+++ b/distrib/sets/lists/comp/md.amiga
@@ -60,20 +60,16 @@
 ./usr/include/machine/types.h
 ./usr/include/machine/varargs.h
 ./usr/include/machine/vmparam.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.1
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/SYSCALLS.c.X
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/cc1
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/cc1obj
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/cc1plus
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/cpp
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/f771
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/include
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/include/README
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/include/f2c.h
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/include/float.h
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/include/limits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/include/objc
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/include/objc/NXConstStr.h
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/include/objc/Object.h
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/include/objc/Protocol.h
diff --git a/distrib/sets/lists/comp/md.arc b/distrib/sets/lists/comp/md.arc
index e536eb1faed..e72b03ebde8 100644
--- a/distrib/sets/lists/comp/md.arc
+++ b/distrib/sets/lists/comp/md.arc
@@ -55,35 +55,31 @@
 ./usr/include/machine/vmparam.h
 ./usr/include/obstack.h
 ./usr/lib/crtn.o
-./usr/lib/gcc-lib/mips-arc-openbsd2.0
-./usr/lib/gcc-lib/mips-arc-openbsd2.0/2.7.2.1
-./usr/lib/gcc-lib/mips-arc-openbsd2.0/2.7.2.1/SYSCALLS.c.X
-./usr/lib/gcc-lib/mips-arc-openbsd2.0/2.7.2.1/cc1
-./usr/lib/gcc-lib/mips-arc-openbsd2.0/2.7.2.1/cc1obj
-./usr/lib/gcc-lib/mips-arc-openbsd2.0/2.7.2.1/cc1plus
-./usr/lib/gcc-lib/mips-arc-openbsd2.0/2.7.2.1/cpp
-./usr/lib/gcc-lib/mips-arc-openbsd2.0/2.7.2.1/f771
-./usr/lib/gcc-lib/mips-arc-openbsd2.0/2.7.2.1/include
-./usr/lib/gcc-lib/mips-arc-openbsd2.0/2.7.2.1/include/README
-./usr/lib/gcc-lib/mips-arc-openbsd2.0/2.7.2.1/include/f2c.h
-./usr/lib/gcc-lib/mips-arc-openbsd2.0/2.7.2.1/include/float.h
-./usr/lib/gcc-lib/mips-arc-openbsd2.0/2.7.2.1/include/limits.h
-./usr/lib/gcc-lib/mips-arc-openbsd2.0/2.7.2.1/include/objc
-./usr/lib/gcc-lib/mips-arc-openbsd2.0/2.7.2.1/include/objc/NXConstStr.h
-./usr/lib/gcc-lib/mips-arc-openbsd2.0/2.7.2.1/include/objc/Object.h
-./usr/lib/gcc-lib/mips-arc-openbsd2.0/2.7.2.1/include/objc/Protocol.h
-./usr/lib/gcc-lib/mips-arc-openbsd2.0/2.7.2.1/include/objc/encoding.h
-./usr/lib/gcc-lib/mips-arc-openbsd2.0/2.7.2.1/include/objc/hash.h
-./usr/lib/gcc-lib/mips-arc-openbsd2.0/2.7.2.1/include/objc/list.h
-./usr/lib/gcc-lib/mips-arc-openbsd2.0/2.7.2.1/include/objc/objc-api.h
-./usr/lib/gcc-lib/mips-arc-openbsd2.0/2.7.2.1/include/objc/objc.h
-./usr/lib/gcc-lib/mips-arc-openbsd2.0/2.7.2.1/include/objc/sarray.h
-./usr/lib/gcc-lib/mips-arc-openbsd2.0/2.7.2.1/include/objc/typedstream.h
-./usr/lib/gcc-lib/mips-arc-openbsd2.0/2.7.2.1/include/syslimits.h
-./usr/lib/gcc-lib/mips-arc-openbsd2.0/2.7.2.1/libf2c.a
-./usr/lib/gcc-lib/mips-arc-openbsd2.0/2.7.2.1/libgcc.a
-./usr/lib/gcc-lib/mips-arc-openbsd2.0/2.7.2.1/libobjc.a
-./usr/lib/gcc-lib/mips-arc-openbsd2.0/2.7.2.1/specs
+./usr/lib/gcc-lib/mips-arc-openbsd2.1/2.7.2.1/SYSCALLS.c.X
+./usr/lib/gcc-lib/mips-arc-openbsd2.1/2.7.2.1/cc1
+./usr/lib/gcc-lib/mips-arc-openbsd2.1/2.7.2.1/cc1obj
+./usr/lib/gcc-lib/mips-arc-openbsd2.1/2.7.2.1/cc1plus
+./usr/lib/gcc-lib/mips-arc-openbsd2.1/2.7.2.1/cpp
+./usr/lib/gcc-lib/mips-arc-openbsd2.1/2.7.2.1/f771
+./usr/lib/gcc-lib/mips-arc-openbsd2.1/2.7.2.1/include/README
+./usr/lib/gcc-lib/mips-arc-openbsd2.1/2.7.2.1/include/f2c.h
+./usr/lib/gcc-lib/mips-arc-openbsd2.1/2.7.2.1/include/float.h
+./usr/lib/gcc-lib/mips-arc-openbsd2.1/2.7.2.1/include/limits.h
+./usr/lib/gcc-lib/mips-arc-openbsd2.1/2.7.2.1/include/objc/NXConstStr.h
+./usr/lib/gcc-lib/mips-arc-openbsd2.1/2.7.2.1/include/objc/Object.h
+./usr/lib/gcc-lib/mips-arc-openbsd2.1/2.7.2.1/include/objc/Protocol.h
+./usr/lib/gcc-lib/mips-arc-openbsd2.1/2.7.2.1/include/objc/encoding.h
+./usr/lib/gcc-lib/mips-arc-openbsd2.1/2.7.2.1/include/objc/hash.h
+./usr/lib/gcc-lib/mips-arc-openbsd2.1/2.7.2.1/include/objc/list.h
+./usr/lib/gcc-lib/mips-arc-openbsd2.1/2.7.2.1/include/objc/objc-api.h
+./usr/lib/gcc-lib/mips-arc-openbsd2.1/2.7.2.1/include/objc/objc.h
+./usr/lib/gcc-lib/mips-arc-openbsd2.1/2.7.2.1/include/objc/sarray.h
+./usr/lib/gcc-lib/mips-arc-openbsd2.1/2.7.2.1/include/objc/typedstream.h
+./usr/lib/gcc-lib/mips-arc-openbsd2.1/2.7.2.1/include/syslimits.h
+./usr/lib/gcc-lib/mips-arc-openbsd2.1/2.7.2.1/libf2c.a
+./usr/lib/gcc-lib/mips-arc-openbsd2.1/2.7.2.1/libgcc.a
+./usr/lib/gcc-lib/mips-arc-openbsd2.1/2.7.2.1/libobjc.a
+./usr/lib/gcc-lib/mips-arc-openbsd2.1/2.7.2.1/specs
 ./usr/lib/libbfd.a
 ./usr/share/man/cat3/dlclose.0
 ./usr/share/man/cat3/dlctl.0
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index f7f6f6cb9b4..78ed6f39657 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -54,35 +54,31 @@
 ./usr/include/machine/varargs.h
 ./usr/include/machine/vm86.h
 ./usr/include/machine/vmparam.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.0
-./usr/lib/gcc-lib/i386-unknown-openbsd2.0/2.7.2.1
-./usr/lib/gcc-lib/i386-unknown-openbsd2.0/2.7.2.1/SYSCALLS.c.X
-./usr/lib/gcc-lib/i386-unknown-openbsd2.0/2.7.2.1/cc1
-./usr/lib/gcc-lib/i386-unknown-openbsd2.0/2.7.2.1/cc1obj
-./usr/lib/gcc-lib/i386-unknown-openbsd2.0/2.7.2.1/cc1plus
-./usr/lib/gcc-lib/i386-unknown-openbsd2.0/2.7.2.1/cpp
-./usr/lib/gcc-lib/i386-unknown-openbsd2.0/2.7.2.1/f771
-./usr/lib/gcc-lib/i386-unknown-openbsd2.0/2.7.2.1/include
-./usr/lib/gcc-lib/i386-unknown-openbsd2.0/2.7.2.1/include/README
-./usr/lib/gcc-lib/i386-unknown-openbsd2.0/2.7.2.1/include/f2c.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.0/2.7.2.1/include/float.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.0/2.7.2.1/include/limits.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.0/2.7.2.1/include/objc
-./usr/lib/gcc-lib/i386-unknown-openbsd2.0/2.7.2.1/include/objc/NXConstStr.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.0/2.7.2.1/include/objc/Object.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.0/2.7.2.1/include/objc/Protocol.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.0/2.7.2.1/include/objc/encoding.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.0/2.7.2.1/include/objc/hash.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.0/2.7.2.1/include/objc/list.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.0/2.7.2.1/include/objc/objc-api.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.0/2.7.2.1/include/objc/objc.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.0/2.7.2.1/include/objc/sarray.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.0/2.7.2.1/include/objc/typedstream.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.0/2.7.2.1/include/syslimits.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.0/2.7.2.1/libf2c.a
-./usr/lib/gcc-lib/i386-unknown-openbsd2.0/2.7.2.1/libgcc.a
-./usr/lib/gcc-lib/i386-unknown-openbsd2.0/2.7.2.1/libobjc.a
-./usr/lib/gcc-lib/i386-unknown-openbsd2.0/2.7.2.1/specs
+./usr/lib/gcc-lib/i386-unknown-openbsd2.1/2.7.2.1/SYSCALLS.c.X
+./usr/lib/gcc-lib/i386-unknown-openbsd2.1/2.7.2.1/cc1
+./usr/lib/gcc-lib/i386-unknown-openbsd2.1/2.7.2.1/cc1obj
+./usr/lib/gcc-lib/i386-unknown-openbsd2.1/2.7.2.1/cc1plus
+./usr/lib/gcc-lib/i386-unknown-openbsd2.1/2.7.2.1/cpp
+./usr/lib/gcc-lib/i386-unknown-openbsd2.1/2.7.2.1/f771
+./usr/lib/gcc-lib/i386-unknown-openbsd2.1/2.7.2.1/include/README
+./usr/lib/gcc-lib/i386-unknown-openbsd2.1/2.7.2.1/include/f2c.h
+./usr/lib/gcc-lib/i386-unknown-openbsd2.1/2.7.2.1/include/float.h
+./usr/lib/gcc-lib/i386-unknown-openbsd2.1/2.7.2.1/include/limits.h
+./usr/lib/gcc-lib/i386-unknown-openbsd2.1/2.7.2.1/include/objc/NXConstStr.h
+./usr/lib/gcc-lib/i386-unknown-openbsd2.1/2.7.2.1/include/objc/Object.h
+./usr/lib/gcc-lib/i386-unknown-openbsd2.1/2.7.2.1/include/objc/Protocol.h
+./usr/lib/gcc-lib/i386-unknown-openbsd2.1/2.7.2.1/include/objc/encoding.h
+./usr/lib/gcc-lib/i386-unknown-openbsd2.1/2.7.2.1/include/objc/hash.h
+./usr/lib/gcc-lib/i386-unknown-openbsd2.1/2.7.2.1/include/objc/list.h
+./usr/lib/gcc-lib/i386-unknown-openbsd2.1/2.7.2.1/include/objc/objc-api.h
+./usr/lib/gcc-lib/i386-unknown-openbsd2.1/2.7.2.1/include/objc/objc.h
+./usr/lib/gcc-lib/i386-unknown-openbsd2.1/2.7.2.1/include/objc/sarray.h
+./usr/lib/gcc-lib/i386-unknown-openbsd2.1/2.7.2.1/include/objc/typedstream.h
+./usr/lib/gcc-lib/i386-unknown-openbsd2.1/2.7.2.1/include/syslimits.h
+./usr/lib/gcc-lib/i386-unknown-openbsd2.1/2.7.2.1/libf2c.a
+./usr/lib/gcc-lib/i386-unknown-openbsd2.1/2.7.2.1/libgcc.a
+./usr/lib/gcc-lib/i386-unknown-openbsd2.1/2.7.2.1/libobjc.a
+./usr/lib/gcc-lib/i386-unknown-openbsd2.1/2.7.2.1/specs
 ./usr/lib/libacl_pic.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
diff --git a/distrib/sets/lists/comp/md.mac68k b/distrib/sets/lists/comp/md.mac68k
index 332eed19835..5009de4399c 100644
--- a/distrib/sets/lists/comp/md.mac68k
+++ b/distrib/sets/lists/comp/md.mac68k
@@ -65,35 +65,31 @@
 ./usr/include/machine/viareg.h
 ./usr/include/machine/vmparam.h
 ./usr/include/machine/z8530var.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.0
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/SYSCALLS.c.X
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/cc1
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/cc1obj
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/cpp
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/f771
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/README
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/f2c.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/float.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/limits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/objc
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/objc/NXConstStr.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/objc/Object.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/objc/Protocol.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/objc/encoding.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/objc/hash.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/objc/list.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/objc/objc-api.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/objc/objc.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/objc/sarray.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/objc/typedstream.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/include/syslimits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/libf2c.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/libobjc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.0/2.7.2.1/specs
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/SYSCALLS.c.X
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/cc1
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/cc1obj
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/cc1plus
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/cpp
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/f771
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/include/README
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/include/f2c.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/include/float.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/include/limits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/include/objc/NXConstStr.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/include/objc/Object.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/include/objc/Protocol.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/include/objc/encoding.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/include/objc/hash.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/include/objc/list.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/include/objc/objc-api.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/include/objc/objc.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/include/objc/sarray.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/include/objc/typedstream.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/include/syslimits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/libf2c.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/libobjc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.1/2.7.2.1/specs
 ./usr/lib/libacl_pic.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
diff --git a/distrib/sets/lists/comp/md.mvme68k b/distrib/sets/lists/comp/md.mvme68k
index e6546ec0fcc..93cdd990055 100644
--- a/distrib/sets/lists/comp/md.mvme68k
+++ b/distrib/sets/lists/comp/md.mvme68k
@@ -54,35 +54,31 @@
 ./usr/include/machine/types.h
 ./usr/include/machine/varargs.h
 ./usr/include/machine/vmparam.h
-./usr/lib/gcc-lib/m68k-motorola-openbsd2.0
-./usr/lib/gcc-lib/m68k-motorola-openbsd2.0/2.7.2.1
-./usr/lib/gcc-lib/m68k-motorola-openbsd2.0/2.7.2.1/SYSCALLS.c.X
-./usr/lib/gcc-lib/m68k-motorola-openbsd2.0/2.7.2.1/cc1
-./usr/lib/gcc-lib/m68k-motorola-openbsd2.0/2.7.2.1/cc1obj
-./usr/lib/gcc-lib/m68k-motorola-openbsd2.0/2.7.2.1/cc1plus
-./usr/lib/gcc-lib/m68k-motorola-openbsd2.0/2.7.2.1/cpp
-./usr/lib/gcc-lib/m68k-motorola-openbsd2.0/2.7.2.1/f771
-./usr/lib/gcc-lib/m68k-motorola-openbsd2.0/2.7.2.1/include
-./usr/lib/gcc-lib/m68k-motorola-openbsd2.0/2.7.2.1/include/README
-./usr/lib/gcc-lib/m68k-motorola-openbsd2.0/2.7.2.1/include/f2c.h
-./usr/lib/gcc-lib/m68k-motorola-openbsd2.0/2.7.2.1/include/float.h
-./usr/lib/gcc-lib/m68k-motorola-openbsd2.0/2.7.2.1/include/limits.h
-./usr/lib/gcc-lib/m68k-motorola-openbsd2.0/2.7.2.1/include/objc
-./usr/lib/gcc-lib/m68k-motorola-openbsd2.0/2.7.2.1/include/objc/NXConstStr.h
-./usr/lib/gcc-lib/m68k-motorola-openbsd2.0/2.7.2.1/include/objc/Object.h
-./usr/lib/gcc-lib/m68k-motorola-openbsd2.0/2.7.2.1/include/objc/Protocol.h
-./usr/lib/gcc-lib/m68k-motorola-openbsd2.0/2.7.2.1/include/objc/encoding.h
-./usr/lib/gcc-lib/m68k-motorola-openbsd2.0/2.7.2.1/include/objc/hash.h
-./usr/lib/gcc-lib/m68k-motorola-openbsd2.0/2.7.2.1/include/objc/list.h
-./usr/lib/gcc-lib/m68k-motorola-openbsd2.0/2.7.2.1/include/objc/objc-api.h
-./usr/lib/gcc-lib/m68k-motorola-openbsd2.0/2.7.2.1/include/objc/objc.h
-./usr/lib/gcc-lib/m68k-motorola-openbsd2.0/2.7.2.1/include/objc/sarray.h
-./usr/lib/gcc-lib/m68k-motorola-openbsd2.0/2.7.2.1/include/objc/typedstream.h
-./usr/lib/gcc-lib/m68k-motorola-openbsd2.0/2.7.2.1/include/syslimits.h
-./usr/lib/gcc-lib/m68k-motorola-openbsd2.0/2.7.2.1/libf2c.a
-./usr/lib/gcc-lib/m68k-motorola-openbsd2.0/2.7.2.1/libgcc.a
-./usr/lib/gcc-lib/m68k-motorola-openbsd2.0/2.7.2.1/libobjc.a
-./usr/lib/gcc-lib/m68k-motorola-openbsd2.0/2.7.2.1/specs
+./usr/lib/gcc-lib/m68k-motorola-openbsd2.1/2.7.2.1/SYSCALLS.c.X
+./usr/lib/gcc-lib/m68k-motorola-openbsd2.1/2.7.2.1/cc1
+./usr/lib/gcc-lib/m68k-motorola-openbsd2.1/2.7.2.1/cc1obj
+./usr/lib/gcc-lib/m68k-motorola-openbsd2.1/2.7.2.1/cc1plus
+./usr/lib/gcc-lib/m68k-motorola-openbsd2.1/2.7.2.1/cpp
+./usr/lib/gcc-lib/m68k-motorola-openbsd2.1/2.7.2.1/f771
+./usr/lib/gcc-lib/m68k-motorola-openbsd2.1/2.7.2.1/include/README
+./usr/lib/gcc-lib/m68k-motorola-openbsd2.1/2.7.2.1/include/f2c.h
+./usr/lib/gcc-lib/m68k-motorola-openbsd2.1/2.7.2.1/include/float.h
+./usr/lib/gcc-lib/m68k-motorola-openbsd2.1/2.7.2.1/include/limits.h
+./usr/lib/gcc-lib/m68k-motorola-openbsd2.1/2.7.2.1/include/objc/NXConstStr.h
+./usr/lib/gcc-lib/m68k-motorola-openbsd2.1/2.7.2.1/include/objc/Object.h
+./usr/lib/gcc-lib/m68k-motorola-openbsd2.1/2.7.2.1/include/objc/Protocol.h
+./usr/lib/gcc-lib/m68k-motorola-openbsd2.1/2.7.2.1/include/objc/encoding.h
+./usr/lib/gcc-lib/m68k-motorola-openbsd2.1/2.7.2.1/include/objc/hash.h
+./usr/lib/gcc-lib/m68k-motorola-openbsd2.1/2.7.2.1/include/objc/list.h
+./usr/lib/gcc-lib/m68k-motorola-openbsd2.1/2.7.2.1/include/objc/objc-api.h
+./usr/lib/gcc-lib/m68k-motorola-openbsd2.1/2.7.2.1/include/objc/objc.h
+./usr/lib/gcc-lib/m68k-motorola-openbsd2.1/2.7.2.1/include/objc/sarray.h
+./usr/lib/gcc-lib/m68k-motorola-openbsd2.1/2.7.2.1/include/objc/typedstream.h
+./usr/lib/gcc-lib/m68k-motorola-openbsd2.1/2.7.2.1/include/syslimits.h
+./usr/lib/gcc-lib/m68k-motorola-openbsd2.1/2.7.2.1/libf2c.a
+./usr/lib/gcc-lib/m68k-motorola-openbsd2.1/2.7.2.1/libgcc.a
+./usr/lib/gcc-lib/m68k-motorola-openbsd2.1/2.7.2.1/libobjc.a
+./usr/lib/gcc-lib/m68k-motorola-openbsd2.1/2.7.2.1/specs
 ./usr/lib/libacl_pic.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
diff --git a/distrib/sets/lists/comp/md.pc532 b/distrib/sets/lists/comp/md.pc532
index 33fe725d747..b438eb0255c 100644
--- a/distrib/sets/lists/comp/md.pc532
+++ b/distrib/sets/lists/comp/md.pc532
@@ -30,7 +30,6 @@
 ./usr/include/machine/types.h
 ./usr/include/machine/varargs.h
 ./usr/include/machine/vmparam.h
-./usr/include/ns32k
 ./usr/lib/libc_pic.a
 ./usr/lib/libcrypt_pic.a
 ./usr/lib/libcurses_pic.a
diff --git a/distrib/sets/lists/comp/md.sparc b/distrib/sets/lists/comp/md.sparc
index 9c500e209e1..e40f6ba745f 100644
--- a/distrib/sets/lists/comp/md.sparc
+++ b/distrib/sets/lists/comp/md.sparc
@@ -53,36 +53,31 @@
 ./usr/include/machine/varargs.h
 ./usr/include/machine/vmparam.h
 ./usr/include/machine/vuid_event.h
-./usr/include/sparc
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.0
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.0/2.7.2.1
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.0/2.7.2.1/SYSCALLS.c.X
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.0/2.7.2.1/cc1
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.0/2.7.2.1/cc1obj
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.0/2.7.2.1/cc1plus
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.0/2.7.2.1/cpp
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.0/2.7.2.1/f771
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.0/2.7.2.1/include
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.0/2.7.2.1/include/README
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.0/2.7.2.1/include/f2c.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.0/2.7.2.1/include/float.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.0/2.7.2.1/include/limits.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.0/2.7.2.1/include/objc
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.0/2.7.2.1/include/objc/NXConstStr.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.0/2.7.2.1/include/objc/Object.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.0/2.7.2.1/include/objc/Protocol.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.0/2.7.2.1/include/objc/encoding.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.0/2.7.2.1/include/objc/hash.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.0/2.7.2.1/include/objc/list.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.0/2.7.2.1/include/objc/objc-api.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.0/2.7.2.1/include/objc/objc.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.0/2.7.2.1/include/objc/sarray.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.0/2.7.2.1/include/objc/typedstream.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.0/2.7.2.1/include/syslimits.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.0/2.7.2.1/libf2c.a
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.0/2.7.2.1/libgcc.a
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.0/2.7.2.1/libobjc.a
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.0/2.7.2.1/specs
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.1/2.7.2.1/SYSCALLS.c.X
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.1/2.7.2.1/cc1
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.1/2.7.2.1/cc1obj
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.1/2.7.2.1/cc1plus
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.1/2.7.2.1/cpp
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.1/2.7.2.1/f771
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.1/2.7.2.1/include/README
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.1/2.7.2.1/include/f2c.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.1/2.7.2.1/include/float.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.1/2.7.2.1/include/limits.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.1/2.7.2.1/include/objc/NXConstStr.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.1/2.7.2.1/include/objc/Object.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.1/2.7.2.1/include/objc/Protocol.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.1/2.7.2.1/include/objc/encoding.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.1/2.7.2.1/include/objc/hash.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.1/2.7.2.1/include/objc/list.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.1/2.7.2.1/include/objc/objc-api.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.1/2.7.2.1/include/objc/objc.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.1/2.7.2.1/include/objc/sarray.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.1/2.7.2.1/include/objc/typedstream.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.1/2.7.2.1/include/syslimits.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.1/2.7.2.1/libf2c.a
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.1/2.7.2.1/libgcc.a
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.1/2.7.2.1/libobjc.a
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.1/2.7.2.1/specs
 ./usr/lib/libacl_pic.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a