summaryrefslogtreecommitdiff
path: root/distrib/sets
diff options
context:
space:
mode:
Diffstat (limited to 'distrib/sets')
-rw-r--r--distrib/sets/lists/base/md.alpha56
-rw-r--r--distrib/sets/lists/base/md.amd6456
-rw-r--r--distrib/sets/lists/base/md.armish56
-rw-r--r--distrib/sets/lists/base/md.armv756
-rw-r--r--distrib/sets/lists/base/md.hppa56
-rw-r--r--distrib/sets/lists/base/md.hppa6446
-rw-r--r--distrib/sets/lists/base/md.i38656
-rw-r--r--distrib/sets/lists/base/md.landisk56
-rw-r--r--distrib/sets/lists/base/md.loongson56
-rw-r--r--distrib/sets/lists/base/md.luna88k44
-rw-r--r--distrib/sets/lists/base/md.macppc56
-rw-r--r--distrib/sets/lists/base/md.octeon56
-rw-r--r--distrib/sets/lists/base/md.sgi56
-rw-r--r--distrib/sets/lists/base/md.socppc56
-rw-r--r--distrib/sets/lists/base/md.sparc56
-rw-r--r--distrib/sets/lists/base/md.sparc6456
-rw-r--r--distrib/sets/lists/base/md.zaurus56
-rw-r--r--distrib/sets/lists/comp/md.alpha54
-rw-r--r--distrib/sets/lists/comp/md.amd6454
-rw-r--r--distrib/sets/lists/comp/md.armish54
-rw-r--r--distrib/sets/lists/comp/md.armv754
-rw-r--r--distrib/sets/lists/comp/md.hppa54
-rw-r--r--distrib/sets/lists/comp/md.hppa6454
-rw-r--r--distrib/sets/lists/comp/md.i38654
-rw-r--r--distrib/sets/lists/comp/md.landisk54
-rw-r--r--distrib/sets/lists/comp/md.loongson54
-rw-r--r--distrib/sets/lists/comp/md.luna88k58
-rw-r--r--distrib/sets/lists/comp/md.macppc54
-rw-r--r--distrib/sets/lists/comp/md.octeon54
-rw-r--r--distrib/sets/lists/comp/md.sgi54
-rw-r--r--distrib/sets/lists/comp/md.socppc54
-rw-r--r--distrib/sets/lists/comp/md.sparc54
-rw-r--r--distrib/sets/lists/comp/md.sparc6454
-rw-r--r--distrib/sets/lists/comp/md.zaurus54
34 files changed, 926 insertions, 926 deletions
diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 482ebe4efe5..40206c24cce 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -61,11 +61,11 @@
./sbin/kbd
./sbin/mount_ntfs
./sbin/wsconsctl
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.9
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.9/4.2.1
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.9/4.2.1/collect2
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.9/4.2.1/libgcc.a
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.9/4.2.1/specs
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.0
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.0/4.2.1
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.0/4.2.1/collect2
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.0/4.2.1/libgcc.a
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.0/4.2.1/specs
./usr/libdata/perl5/alpha-openbsd
./usr/libdata/perl5/alpha-openbsd/5.20.2
./usr/libdata/perl5/alpha-openbsd/5.20.2/.packlist
@@ -1351,29 +1351,29 @@
./usr/libdata/perl5/site_perl/alpha-openbsd/fuse_opt.ph
./usr/libdata/perl5/site_perl/alpha-openbsd/g++
./usr/libdata/perl5/site_perl/alpha-openbsd/g++/FlexLexer.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.9
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.9/bits
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.9/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.9/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.9/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.9/bits/c++config.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.9/bits/c++io.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.9/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.9/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.9/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.9/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.9/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.9/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.9/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.9/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.9/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.9/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.9/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.9/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.9/bits/gthr.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.9/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.9/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.9/bits/time_members.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd6.0
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd6.0/bits
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd6.0/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd6.0/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd6.0/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd6.0/bits/c++config.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd6.0/bits/c++io.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd6.0/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd6.0/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd6.0/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd6.0/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd6.0/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd6.0/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd6.0/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd6.0/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd6.0/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd6.0/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd6.0/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd6.0/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd6.0/bits/gthr.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd6.0/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd6.0/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd6.0/bits/time_members.ph
./usr/libdata/perl5/site_perl/alpha-openbsd/g++/backward
./usr/libdata/perl5/site_perl/alpha-openbsd/g++/backward/algo.ph
./usr/libdata/perl5/site_perl/alpha-openbsd/g++/backward/algobase.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index d53663931b9..5a4a2ed1fcf 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -67,11 +67,11 @@
./sbin/mount_ntfs
./sbin/wsconsctl
./usr/bin/pctr
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.9
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.9/4.2.1
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.9/4.2.1/collect2
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.9/4.2.1/libgcc.a
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.9/4.2.1/specs
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.0
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.0/4.2.1
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.0/4.2.1/collect2
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.0/4.2.1/libgcc.a
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.0/4.2.1/specs
./usr/libdata/perl5/amd64-openbsd
./usr/libdata/perl5/amd64-openbsd/5.20.2
./usr/libdata/perl5/amd64-openbsd/5.20.2/.packlist
@@ -1382,29 +1382,29 @@
./usr/libdata/perl5/site_perl/amd64-openbsd/fuse_opt.ph
./usr/libdata/perl5/site_perl/amd64-openbsd/g++
./usr/libdata/perl5/site_perl/amd64-openbsd/g++/FlexLexer.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.9
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.9/bits
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.9/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.9/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.9/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.9/bits/c++config.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.9/bits/c++io.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.9/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.9/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.9/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.9/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.9/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.9/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.9/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.9/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.9/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.9/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.9/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.9/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.9/bits/gthr.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.9/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.9/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.9/bits/time_members.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd6.0
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd6.0/bits
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd6.0/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd6.0/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd6.0/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd6.0/bits/c++config.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd6.0/bits/c++io.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd6.0/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd6.0/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd6.0/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd6.0/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd6.0/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd6.0/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd6.0/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd6.0/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd6.0/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd6.0/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd6.0/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd6.0/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd6.0/bits/gthr.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd6.0/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd6.0/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd6.0/bits/time_members.ph
./usr/libdata/perl5/site_perl/amd64-openbsd/g++/backward
./usr/libdata/perl5/site_perl/amd64-openbsd/g++/backward/algo.ph
./usr/libdata/perl5/site_perl/amd64-openbsd/g++/backward/algobase.ph
diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish
index 2e058d7e4b7..6e45957c743 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -34,11 +34,11 @@
./etc/firmware/zd1211b
./sbin/kbd
./sbin/wsconsctl
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/collect2
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/libgcc.a
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/specs
+./usr/lib/gcc-lib/arm-unknown-openbsd6.0
+./usr/lib/gcc-lib/arm-unknown-openbsd6.0/4.2.1
+./usr/lib/gcc-lib/arm-unknown-openbsd6.0/4.2.1/collect2
+./usr/lib/gcc-lib/arm-unknown-openbsd6.0/4.2.1/libgcc.a
+./usr/lib/gcc-lib/arm-unknown-openbsd6.0/4.2.1/specs
./usr/libdata/perl5/arm-openbsd
./usr/libdata/perl5/arm-openbsd/5.20.2
./usr/libdata/perl5/arm-openbsd/5.20.2/.packlist
@@ -1366,29 +1366,29 @@
./usr/libdata/perl5/site_perl/arm-openbsd/fuse_opt.ph
./usr/libdata/perl5/site_perl/arm-openbsd/g++
./usr/libdata/perl5/site_perl/arm-openbsd/g++/FlexLexer.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/c++config.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/c++io.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/gthr.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/time_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/c++config.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/c++io.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/gthr.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/time_members.ph
./usr/libdata/perl5/site_perl/arm-openbsd/g++/backward
./usr/libdata/perl5/site_perl/arm-openbsd/g++/backward/algo.ph
./usr/libdata/perl5/site_perl/arm-openbsd/g++/backward/algobase.ph
diff --git a/distrib/sets/lists/base/md.armv7 b/distrib/sets/lists/base/md.armv7
index 32f6d38566d..2a3b87960d8 100644
--- a/distrib/sets/lists/base/md.armv7
+++ b/distrib/sets/lists/base/md.armv7
@@ -29,11 +29,11 @@
./etc/firmware/zd1211b
./sbin/kbd
./sbin/wsconsctl
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/collect2
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/libgcc.a
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/specs
+./usr/lib/gcc-lib/arm-unknown-openbsd6.0
+./usr/lib/gcc-lib/arm-unknown-openbsd6.0/4.2.1
+./usr/lib/gcc-lib/arm-unknown-openbsd6.0/4.2.1/collect2
+./usr/lib/gcc-lib/arm-unknown-openbsd6.0/4.2.1/libgcc.a
+./usr/lib/gcc-lib/arm-unknown-openbsd6.0/4.2.1/specs
./usr/libdata/perl5/arm-openbsd
./usr/libdata/perl5/arm-openbsd/5.20.2
./usr/libdata/perl5/arm-openbsd/5.20.2/.packlist
@@ -1366,29 +1366,29 @@
./usr/libdata/perl5/site_perl/arm-openbsd/fuse_opt.ph
./usr/libdata/perl5/site_perl/arm-openbsd/g++
./usr/libdata/perl5/site_perl/arm-openbsd/g++/FlexLexer.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/c++config.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/c++io.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/gthr.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/time_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/c++config.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/c++io.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/gthr.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/time_members.ph
./usr/libdata/perl5/site_perl/arm-openbsd/g++/backward
./usr/libdata/perl5/site_perl/arm-openbsd/g++/backward/algo.ph
./usr/libdata/perl5/site_perl/arm-openbsd/g++/backward/algobase.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index d61f0d311d4..fcf1df2a5d0 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -63,11 +63,11 @@
./etc/firmware/zd1211b
./sbin/kbd
./sbin/wsconsctl
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.9
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.9/4.2.1
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.9/4.2.1/collect2
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.9/4.2.1/libgcc.a
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.9/4.2.1/specs
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.0
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.0/4.2.1
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.0/4.2.1/collect2
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.0/4.2.1/libgcc.a
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.0/4.2.1/specs
./usr/libdata/perl5/hppa-openbsd
./usr/libdata/perl5/hppa-openbsd/5.20.2
./usr/libdata/perl5/hppa-openbsd/5.20.2/.packlist
@@ -1431,29 +1431,29 @@
./usr/libdata/perl5/site_perl/hppa-openbsd/g++/ext/vstring.ph
./usr/libdata/perl5/site_perl/hppa-openbsd/g++/ext/vstring_fwd.ph
./usr/libdata/perl5/site_perl/hppa-openbsd/g++/ext/vstring_util.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.9
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.9/bits
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.9/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.9/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.9/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.9/bits/c++config.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.9/bits/c++io.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.9/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.9/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.9/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.9/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.9/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.9/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.9/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.9/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.9/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.9/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.9/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.9/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.9/bits/gthr.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.9/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.9/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.9/bits/time_members.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd6.0
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd6.0/bits
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd6.0/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd6.0/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd6.0/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd6.0/bits/c++config.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd6.0/bits/c++io.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd6.0/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd6.0/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd6.0/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd6.0/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd6.0/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd6.0/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd6.0/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd6.0/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd6.0/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd6.0/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd6.0/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd6.0/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd6.0/bits/gthr.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd6.0/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd6.0/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd6.0/bits/time_members.ph
./usr/libdata/perl5/site_perl/hppa-openbsd/g++/tr1
./usr/libdata/perl5/site_perl/hppa-openbsd/g++/tr1/bind_iterate.ph
./usr/libdata/perl5/site_perl/hppa-openbsd/g++/tr1/bind_repeat.ph
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index 0711f39a445..41ca732ac4b 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -61,11 +61,11 @@
./etc/firmware/zd1211
./etc/firmware/zd1211-license
./etc/firmware/zd1211b
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.9
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.9/4.2.1
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.9/4.2.1/collect2
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.9/4.2.1/libgcc.a
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.9/4.2.1/specs
+./usr/lib/gcc-lib/hppa64-unknown-openbsd6.0
+./usr/lib/gcc-lib/hppa64-unknown-openbsd6.0/4.2.1
+./usr/lib/gcc-lib/hppa64-unknown-openbsd6.0/4.2.1/collect2
+./usr/lib/gcc-lib/hppa64-unknown-openbsd6.0/4.2.1/libgcc.a
+./usr/lib/gcc-lib/hppa64-unknown-openbsd6.0/4.2.1/specs
./usr/libdata/perl5/hppa64-openbsd
./usr/libdata/perl5/hppa64-openbsd/5.20.2
./usr/libdata/perl5/hppa64-openbsd/5.20.2/.packlist
@@ -1396,24 +1396,24 @@
./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/ext/stl_hash_fun.ph
./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/ext/stl_hashtable.ph
./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/ext/stl_rope.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.9
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.9/bits
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.9/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.9/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.9/bits/c++config.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.9/bits/c++io.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.9/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.9/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.9/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.9/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.9/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.9/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.9/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.9/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.9/bits/gthr.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.9/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.9/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.9/bits/time_members.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd6.0
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd6.0/bits
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd6.0/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd6.0/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd6.0/bits/c++config.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd6.0/bits/c++io.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd6.0/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd6.0/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd6.0/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd6.0/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd6.0/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd6.0/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd6.0/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd6.0/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd6.0/bits/gthr.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd6.0/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd6.0/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd6.0/bits/time_members.ph
./usr/libdata/perl5/site_perl/hppa64-openbsd/getopt.ph
./usr/libdata/perl5/site_perl/hppa64-openbsd/glob.ph
./usr/libdata/perl5/site_perl/hppa64-openbsd/grp.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 162908740b6..2fd4b8ae6e0 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -69,11 +69,11 @@
./sbin/mount_ntfs
./sbin/wsconsctl
./usr/bin/pctr
-./usr/lib/gcc-lib/i386-unknown-openbsd5.9
-./usr/lib/gcc-lib/i386-unknown-openbsd5.9/4.2.1
-./usr/lib/gcc-lib/i386-unknown-openbsd5.9/4.2.1/collect2
-./usr/lib/gcc-lib/i386-unknown-openbsd5.9/4.2.1/libgcc.a
-./usr/lib/gcc-lib/i386-unknown-openbsd5.9/4.2.1/specs
+./usr/lib/gcc-lib/i386-unknown-openbsd6.0
+./usr/lib/gcc-lib/i386-unknown-openbsd6.0/4.2.1
+./usr/lib/gcc-lib/i386-unknown-openbsd6.0/4.2.1/collect2
+./usr/lib/gcc-lib/i386-unknown-openbsd6.0/4.2.1/libgcc.a
+./usr/lib/gcc-lib/i386-unknown-openbsd6.0/4.2.1/specs
./usr/libdata/perl5/i386-openbsd
./usr/libdata/perl5/i386-openbsd/5.20.2
./usr/libdata/perl5/i386-openbsd/5.20.2/.packlist
@@ -1439,29 +1439,29 @@
./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/vstring.ph
./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/vstring_fwd.ph
./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/vstring_util.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.9
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.9/bits
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.9/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.9/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.9/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.9/bits/c++config.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.9/bits/c++io.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.9/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.9/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.9/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.9/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.9/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.9/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.9/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.9/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.9/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.9/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.9/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.9/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.9/bits/gthr.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.9/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.9/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.9/bits/time_members.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd6.0
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd6.0/bits
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd6.0/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd6.0/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd6.0/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd6.0/bits/c++config.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd6.0/bits/c++io.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd6.0/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd6.0/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd6.0/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd6.0/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd6.0/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd6.0/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd6.0/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd6.0/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd6.0/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd6.0/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd6.0/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd6.0/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd6.0/bits/gthr.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd6.0/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd6.0/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd6.0/bits/time_members.ph
./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1
./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1/bind_iterate.ph
./usr/libdata/perl5/site_perl/i386-openbsd/g++/tr1/bind_repeat.ph
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index 299e77f1c4a..76ef001e53f 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -29,11 +29,11 @@
./etc/firmware/zd1211b
./sbin/kbd
./sbin/wsconsctl
-./usr/lib/gcc-lib/sh-unknown-openbsd5.9
-./usr/lib/gcc-lib/sh-unknown-openbsd5.9/4.2.1
-./usr/lib/gcc-lib/sh-unknown-openbsd5.9/4.2.1/collect2
-./usr/lib/gcc-lib/sh-unknown-openbsd5.9/4.2.1/libgcc.a
-./usr/lib/gcc-lib/sh-unknown-openbsd5.9/4.2.1/specs
+./usr/lib/gcc-lib/sh-unknown-openbsd6.0
+./usr/lib/gcc-lib/sh-unknown-openbsd6.0/4.2.1
+./usr/lib/gcc-lib/sh-unknown-openbsd6.0/4.2.1/collect2
+./usr/lib/gcc-lib/sh-unknown-openbsd6.0/4.2.1/libgcc.a
+./usr/lib/gcc-lib/sh-unknown-openbsd6.0/4.2.1/specs
./usr/libdata/perl5/sh-openbsd
./usr/libdata/perl5/sh-openbsd/5.20.2
./usr/libdata/perl5/sh-openbsd/5.20.2/.packlist
@@ -1397,29 +1397,29 @@
./usr/libdata/perl5/site_perl/sh-openbsd/g++/ext/vstring.ph
./usr/libdata/perl5/site_perl/sh-openbsd/g++/ext/vstring_fwd.ph
./usr/libdata/perl5/site_perl/sh-openbsd/g++/ext/vstring_util.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.9
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.9/bits
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.9/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.9/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.9/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.9/bits/c++config.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.9/bits/c++io.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.9/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.9/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.9/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.9/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.9/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.9/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.9/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.9/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.9/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.9/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.9/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.9/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.9/bits/gthr.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.9/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.9/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.9/bits/time_members.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd6.0
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd6.0/bits
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd6.0/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd6.0/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd6.0/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd6.0/bits/c++config.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd6.0/bits/c++io.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd6.0/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd6.0/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd6.0/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd6.0/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd6.0/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd6.0/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd6.0/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd6.0/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd6.0/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd6.0/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd6.0/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd6.0/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd6.0/bits/gthr.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd6.0/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd6.0/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd6.0/bits/time_members.ph
./usr/libdata/perl5/site_perl/sh-openbsd/g++/tr1
./usr/libdata/perl5/site_perl/sh-openbsd/g++/tr1/bind_iterate.ph
./usr/libdata/perl5/site_perl/sh-openbsd/g++/tr1/bind_repeat.ph
diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson
index e1661411dc5..5c8046aca9d 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -34,11 +34,11 @@
./etc/firmware/zd1211b
./sbin/kbd
./sbin/wsconsctl
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.9
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.9/4.2.1
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.9/4.2.1/collect2
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.9/4.2.1/libgcc.a
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.9/4.2.1/specs
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.0
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.0/4.2.1
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.0/4.2.1/collect2
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.0/4.2.1/libgcc.a
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.0/4.2.1/specs
./usr/libdata/perl5/mips64el-openbsd
./usr/libdata/perl5/mips64el-openbsd/5.20.2
./usr/libdata/perl5/mips64el-openbsd/5.20.2/.packlist
@@ -1402,29 +1402,29 @@
./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/ext/vstring.ph
./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/ext/vstring_fwd.ph
./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/ext/vstring_util.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.9
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.9/bits
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.9/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.9/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.9/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.9/bits/c++config.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.9/bits/c++io.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.9/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.9/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.9/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.9/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.9/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.9/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.9/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.9/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.9/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.9/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.9/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.9/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.9/bits/gthr.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.9/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.9/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.9/bits/time_members.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd6.0
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd6.0/bits
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd6.0/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd6.0/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd6.0/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd6.0/bits/c++config.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd6.0/bits/c++io.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd6.0/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd6.0/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd6.0/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd6.0/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd6.0/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd6.0/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd6.0/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd6.0/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd6.0/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd6.0/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd6.0/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd6.0/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd6.0/bits/gthr.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd6.0/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd6.0/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd6.0/bits/time_members.ph
./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/tr1
./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/tr1/bind_iterate.ph
./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/tr1/bind_repeat.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 6f091e12141..dfc3b2c51b3 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -1,10 +1,10 @@
./etc/examples/wsconsctl.conf
./sbin/kbd
./sbin/wsconsctl
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.9
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.9/3.3.6/fPIC/libgcc.a
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.9/3.3.6/fpic/libgcc.a
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.9/3.3.6/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.0
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.0/3.3.6/fPIC/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.0/3.3.6/fpic/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.0/3.3.6/libgcc.a
./usr/libdata/perl5/m88k-openbsd
./usr/libdata/perl5/m88k-openbsd/5.20.2
./usr/libdata/perl5/m88k-openbsd/5.20.2/.packlist
@@ -1335,24 +1335,24 @@
./usr/libdata/perl5/site_perl/m88k-openbsd/g++/ext/stl_hash_fun.ph
./usr/libdata/perl5/site_perl/m88k-openbsd/g++/ext/stl_hashtable.ph
./usr/libdata/perl5/site_perl/m88k-openbsd/g++/ext/stl_rope.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.9
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.9/bits
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.9/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.9/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.9/bits/c++config.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.9/bits/c++io.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.9/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.9/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.9/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.9/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.9/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.9/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.9/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.9/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.9/bits/gthr.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.9/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.9/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.9/bits/time_members.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd6.0
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd6.0/bits
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd6.0/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd6.0/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd6.0/bits/c++config.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd6.0/bits/c++io.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd6.0/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd6.0/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd6.0/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd6.0/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd6.0/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd6.0/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd6.0/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd6.0/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd6.0/bits/gthr.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd6.0/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd6.0/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd6.0/bits/time_members.ph
./usr/libdata/perl5/site_perl/m88k-openbsd/getopt.ph
./usr/libdata/perl5/site_perl/m88k-openbsd/glob.ph
./usr/libdata/perl5/site_perl/m88k-openbsd/grp.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 32493b9ae72..1d3b88903c4 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -64,11 +64,11 @@
./sbin/kbd
./sbin/pdisk
./sbin/wsconsctl
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/collect2
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/libgcc.a
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/specs
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.0
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.0/4.2.1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.0/4.2.1/collect2
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.0/4.2.1/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.0/4.2.1/specs
./usr/libdata/perl5/powerpc-openbsd
./usr/libdata/perl5/powerpc-openbsd/5.20.2
./usr/libdata/perl5/powerpc-openbsd/5.20.2/.packlist
@@ -1433,29 +1433,29 @@
./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/ext/vstring.ph
./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/ext/vstring_fwd.ph
./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/ext/vstring_util.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/c++config.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/c++io.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/gthr.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/time_members.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/c++config.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/c++io.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/gthr.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/time_members.ph
./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/tr1
./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/tr1/bind_iterate.ph
./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/tr1/bind_repeat.ph
diff --git a/distrib/sets/lists/base/md.octeon b/distrib/sets/lists/base/md.octeon
index 9a7fa70b5f6..fbd030de865 100644
--- a/distrib/sets/lists/base/md.octeon
+++ b/distrib/sets/lists/base/md.octeon
@@ -1,9 +1,9 @@
./etc/examples/wsconsctl.conf
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.9
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/collect2
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/libgcc.a
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/specs
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.0
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.0/4.2.1
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.0/4.2.1/collect2
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.0/4.2.1/libgcc.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.0/4.2.1/specs
./usr/libdata/perl5/mips64-openbsd
./usr/libdata/perl5/mips64-openbsd/5.20.2
./usr/libdata/perl5/mips64-openbsd/5.20.2/.packlist
@@ -1367,29 +1367,29 @@
./usr/libdata/perl5/site_perl/mips64-openbsd/g++/ext/vstring.ph
./usr/libdata/perl5/site_perl/mips64-openbsd/g++/ext/vstring_fwd.ph
./usr/libdata/perl5/site_perl/mips64-openbsd/g++/ext/vstring_util.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/c++config.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/c++io.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/gthr.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/time_members.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/c++config.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/c++io.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/gthr.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/time_members.ph
./usr/libdata/perl5/site_perl/mips64-openbsd/g++/tr1
./usr/libdata/perl5/site_perl/mips64-openbsd/g++/tr1/bind_iterate.ph
./usr/libdata/perl5/site_perl/mips64-openbsd/g++/tr1/bind_repeat.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 43fbd788095..746eb39f9c4 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -63,11 +63,11 @@
./etc/firmware/zd1211b
./sbin/kbd
./sbin/wsconsctl
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.9
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/collect2
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/libgcc.a
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/specs
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.0
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.0/4.2.1
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.0/4.2.1/collect2
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.0/4.2.1/libgcc.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.0/4.2.1/specs
./usr/libdata/perl5/mips64-openbsd
./usr/libdata/perl5/mips64-openbsd/5.20.2
./usr/libdata/perl5/mips64-openbsd/5.20.2/.packlist
@@ -1431,29 +1431,29 @@
./usr/libdata/perl5/site_perl/mips64-openbsd/g++/ext/vstring.ph
./usr/libdata/perl5/site_perl/mips64-openbsd/g++/ext/vstring_fwd.ph
./usr/libdata/perl5/site_perl/mips64-openbsd/g++/ext/vstring_util.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/c++config.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/c++io.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/gthr.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.9/bits/time_members.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/c++config.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/c++io.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/gthr.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd6.0/bits/time_members.ph
./usr/libdata/perl5/site_perl/mips64-openbsd/g++/tr1
./usr/libdata/perl5/site_perl/mips64-openbsd/g++/tr1/bind_iterate.ph
./usr/libdata/perl5/site_perl/mips64-openbsd/g++/tr1/bind_repeat.ph
diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc
index 2d647e03ce4..de662dbcb14 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -57,11 +57,11 @@
./etc/firmware/zd1211b
./sbin/kbd
./sbin/wsconsctl
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/collect2
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/libgcc.a
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/specs
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.0
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.0/4.2.1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.0/4.2.1/collect2
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.0/4.2.1/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.0/4.2.1/specs
./usr/libdata/perl5/powerpc-openbsd
./usr/libdata/perl5/powerpc-openbsd/5.20.2
./usr/libdata/perl5/powerpc-openbsd/5.20.2/.packlist
@@ -1426,29 +1426,29 @@
./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/ext/vstring.ph
./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/ext/vstring_fwd.ph
./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/ext/vstring_util.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/c++config.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/c++io.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/gthr.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.9/bits/time_members.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/c++config.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/c++io.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/gthr.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd6.0/bits/time_members.ph
./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/tr1
./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/tr1/bind_iterate.ph
./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/tr1/bind_repeat.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 47b616036c6..498f568a1f8 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -6,11 +6,11 @@
./etc/firmware/tigon2
./sbin/kbd
./sbin/wsconsctl
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.9
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.9/4.2.1
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.9/4.2.1/collect2
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.9/4.2.1/libgcc.a
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.9/4.2.1/specs
+./usr/lib/gcc-lib/sparc-unknown-openbsd6.0
+./usr/lib/gcc-lib/sparc-unknown-openbsd6.0/4.2.1
+./usr/lib/gcc-lib/sparc-unknown-openbsd6.0/4.2.1/collect2
+./usr/lib/gcc-lib/sparc-unknown-openbsd6.0/4.2.1/libgcc.a
+./usr/lib/gcc-lib/sparc-unknown-openbsd6.0/4.2.1/specs
./usr/libdata/perl5/site_perl/sparc-openbsd
./usr/libdata/perl5/site_perl/sparc-openbsd/_h2ph_pre.ph
./usr/libdata/perl5/site_perl/sparc-openbsd/a.out.ph
@@ -970,29 +970,29 @@
./usr/libdata/perl5/site_perl/sparc-openbsd/g++/ext/vstring.ph
./usr/libdata/perl5/site_perl/sparc-openbsd/g++/ext/vstring_fwd.ph
./usr/libdata/perl5/site_perl/sparc-openbsd/g++/ext/vstring_util.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.9
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.9/bits
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.9/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.9/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.9/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.9/bits/c++config.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.9/bits/c++io.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.9/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.9/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.9/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.9/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.9/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.9/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.9/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.9/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.9/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.9/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.9/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.9/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.9/bits/gthr.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.9/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.9/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.9/bits/time_members.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd6.0
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd6.0/bits
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd6.0/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd6.0/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd6.0/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd6.0/bits/c++config.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd6.0/bits/c++io.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd6.0/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd6.0/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd6.0/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd6.0/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd6.0/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd6.0/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd6.0/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd6.0/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd6.0/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd6.0/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd6.0/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd6.0/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd6.0/bits/gthr.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd6.0/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd6.0/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd6.0/bits/time_members.ph
./usr/libdata/perl5/site_perl/sparc-openbsd/g++/tr1
./usr/libdata/perl5/site_perl/sparc-openbsd/g++/tr1/bind_iterate.ph
./usr/libdata/perl5/site_perl/sparc-openbsd/g++/tr1/bind_repeat.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 5ba1a0fb1f1..847f41df10f 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -65,11 +65,11 @@
./etc/firmware/zd1211b
./sbin/kbd
./sbin/wsconsctl
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.9
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.9/4.2.1
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.9/4.2.1/collect2
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.9/4.2.1/libgcc.a
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.9/4.2.1/specs
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.0
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.0/4.2.1
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.0/4.2.1/collect2
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.0/4.2.1/libgcc.a
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.0/4.2.1/specs
./usr/libdata/perl5/site_perl/sparc64-openbsd
./usr/libdata/perl5/site_perl/sparc64-openbsd/_h2ph_pre.ph
./usr/libdata/perl5/site_perl/sparc64-openbsd/a.out.ph
@@ -1029,29 +1029,29 @@
./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/ext/vstring.ph
./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/ext/vstring_fwd.ph
./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/ext/vstring_util.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.9
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.9/bits
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.9/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.9/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.9/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.9/bits/c++config.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.9/bits/c++io.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.9/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.9/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.9/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.9/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.9/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.9/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.9/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.9/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.9/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.9/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.9/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.9/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.9/bits/gthr.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.9/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.9/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.9/bits/time_members.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd6.0
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd6.0/bits
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd6.0/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd6.0/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd6.0/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd6.0/bits/c++config.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd6.0/bits/c++io.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd6.0/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd6.0/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd6.0/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd6.0/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd6.0/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd6.0/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd6.0/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd6.0/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd6.0/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd6.0/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd6.0/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd6.0/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd6.0/bits/gthr.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd6.0/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd6.0/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd6.0/bits/time_members.ph
./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/tr1
./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/tr1/bind_iterate.ph
./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/tr1/bind_repeat.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index d16cbc51742..7d235187e8a 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -32,11 +32,11 @@
./etc/firmware/zd1211b
./sbin/kbd
./sbin/wsconsctl
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/collect2
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/libgcc.a
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/specs
+./usr/lib/gcc-lib/arm-unknown-openbsd6.0
+./usr/lib/gcc-lib/arm-unknown-openbsd6.0/4.2.1
+./usr/lib/gcc-lib/arm-unknown-openbsd6.0/4.2.1/collect2
+./usr/lib/gcc-lib/arm-unknown-openbsd6.0/4.2.1/libgcc.a
+./usr/lib/gcc-lib/arm-unknown-openbsd6.0/4.2.1/specs
./usr/libdata/perl5/arm-openbsd
./usr/libdata/perl5/arm-openbsd/5.20.2
./usr/libdata/perl5/arm-openbsd/5.20.2/.packlist
@@ -1320,29 +1320,29 @@
./usr/libdata/perl5/site_perl/arm-openbsd/fuse_opt.ph
./usr/libdata/perl5/site_perl/arm-openbsd/g++
./usr/libdata/perl5/site_perl/arm-openbsd/g++/FlexLexer.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/c++config.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/c++io.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/gthr.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.9/bits/time_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/c++config.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/c++io.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/gthr.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd6.0/bits/time_members.ph
./usr/libdata/perl5/site_perl/arm-openbsd/g++/backward
./usr/libdata/perl5/site_perl/arm-openbsd/g++/backward/algo.ph
./usr/libdata/perl5/site_perl/arm-openbsd/g++/backward/algobase.ph
diff --git a/distrib/sets/lists/comp/md.alpha b/distrib/sets/lists/comp/md.alpha
index 35bd0068331..50f20e36061 100644
--- a/distrib/sets/lists/comp/md.alpha
+++ b/distrib/sets/lists/comp/md.alpha
@@ -55,29 +55,29 @@
./usr/include/alpha/tcb.h
./usr/include/alpha/varargs.h
./usr/include/alpha/vmparam.h
-./usr/include/g++/alpha-unknown-openbsd5.9
-./usr/include/g++/alpha-unknown-openbsd5.9/bits
-./usr/include/g++/alpha-unknown-openbsd5.9/bits/atomic_word.h
-./usr/include/g++/alpha-unknown-openbsd5.9/bits/basic_file.h
-./usr/include/g++/alpha-unknown-openbsd5.9/bits/c++allocator.h
-./usr/include/g++/alpha-unknown-openbsd5.9/bits/c++config.h
-./usr/include/g++/alpha-unknown-openbsd5.9/bits/c++io.h
-./usr/include/g++/alpha-unknown-openbsd5.9/bits/c++locale.h
-./usr/include/g++/alpha-unknown-openbsd5.9/bits/c++locale_internal.h
-./usr/include/g++/alpha-unknown-openbsd5.9/bits/compatibility.h
-./usr/include/g++/alpha-unknown-openbsd5.9/bits/cpu_defines.h
-./usr/include/g++/alpha-unknown-openbsd5.9/bits/ctype_base.h
-./usr/include/g++/alpha-unknown-openbsd5.9/bits/ctype_inline.h
-./usr/include/g++/alpha-unknown-openbsd5.9/bits/ctype_noninline.h
-./usr/include/g++/alpha-unknown-openbsd5.9/bits/cxxabi_tweaks.h
-./usr/include/g++/alpha-unknown-openbsd5.9/bits/gthr-default.h
-./usr/include/g++/alpha-unknown-openbsd5.9/bits/gthr-posix.h
-./usr/include/g++/alpha-unknown-openbsd5.9/bits/gthr-single.h
-./usr/include/g++/alpha-unknown-openbsd5.9/bits/gthr-tpf.h
-./usr/include/g++/alpha-unknown-openbsd5.9/bits/gthr.h
-./usr/include/g++/alpha-unknown-openbsd5.9/bits/messages_members.h
-./usr/include/g++/alpha-unknown-openbsd5.9/bits/os_defines.h
-./usr/include/g++/alpha-unknown-openbsd5.9/bits/time_members.h
+./usr/include/g++/alpha-unknown-openbsd6.0
+./usr/include/g++/alpha-unknown-openbsd6.0/bits
+./usr/include/g++/alpha-unknown-openbsd6.0/bits/atomic_word.h
+./usr/include/g++/alpha-unknown-openbsd6.0/bits/basic_file.h
+./usr/include/g++/alpha-unknown-openbsd6.0/bits/c++allocator.h
+./usr/include/g++/alpha-unknown-openbsd6.0/bits/c++config.h
+./usr/include/g++/alpha-unknown-openbsd6.0/bits/c++io.h
+./usr/include/g++/alpha-unknown-openbsd6.0/bits/c++locale.h
+./usr/include/g++/alpha-unknown-openbsd6.0/bits/c++locale_internal.h
+./usr/include/g++/alpha-unknown-openbsd6.0/bits/compatibility.h
+./usr/include/g++/alpha-unknown-openbsd6.0/bits/cpu_defines.h
+./usr/include/g++/alpha-unknown-openbsd6.0/bits/ctype_base.h
+./usr/include/g++/alpha-unknown-openbsd6.0/bits/ctype_inline.h
+./usr/include/g++/alpha-unknown-openbsd6.0/bits/ctype_noninline.h
+./usr/include/g++/alpha-unknown-openbsd6.0/bits/cxxabi_tweaks.h
+./usr/include/g++/alpha-unknown-openbsd6.0/bits/gthr-default.h
+./usr/include/g++/alpha-unknown-openbsd6.0/bits/gthr-posix.h
+./usr/include/g++/alpha-unknown-openbsd6.0/bits/gthr-single.h
+./usr/include/g++/alpha-unknown-openbsd6.0/bits/gthr-tpf.h
+./usr/include/g++/alpha-unknown-openbsd6.0/bits/gthr.h
+./usr/include/g++/alpha-unknown-openbsd6.0/bits/messages_members.h
+./usr/include/g++/alpha-unknown-openbsd6.0/bits/os_defines.h
+./usr/include/g++/alpha-unknown-openbsd6.0/bits/time_members.h
./usr/include/g++/backward
./usr/include/g++/backward/algo.h
./usr/include/g++/backward/algobase.h
@@ -605,10 +605,10 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.9/4.2.1/cc1
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.9/4.2.1/cc1obj
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.9/4.2.1/cc1plus
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.9/4.2.1/libgcov.a
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.0/4.2.1/cc1
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.0/4.2.1/cc1obj
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.0/4.2.1/cc1plus
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.0/4.2.1/libgcov.a
./usr/lib/libalpha.a
./usr/lib/libalpha_p.a
./usr/lib/libstdc++_p.a
diff --git a/distrib/sets/lists/comp/md.amd64 b/distrib/sets/lists/comp/md.amd64
index d63e16357ae..0f79c225e0c 100644
--- a/distrib/sets/lists/comp/md.amd64
+++ b/distrib/sets/lists/comp/md.amd64
@@ -80,29 +80,29 @@
./usr/include/amd64/vmparam.h
./usr/include/cpuid.h
./usr/include/emmintrin.h
-./usr/include/g++/amd64-unknown-openbsd5.9
-./usr/include/g++/amd64-unknown-openbsd5.9/bits
-./usr/include/g++/amd64-unknown-openbsd5.9/bits/atomic_word.h
-./usr/include/g++/amd64-unknown-openbsd5.9/bits/basic_file.h
-./usr/include/g++/amd64-unknown-openbsd5.9/bits/c++allocator.h
-./usr/include/g++/amd64-unknown-openbsd5.9/bits/c++config.h
-./usr/include/g++/amd64-unknown-openbsd5.9/bits/c++io.h
-./usr/include/g++/amd64-unknown-openbsd5.9/bits/c++locale.h
-./usr/include/g++/amd64-unknown-openbsd5.9/bits/c++locale_internal.h
-./usr/include/g++/amd64-unknown-openbsd5.9/bits/compatibility.h
-./usr/include/g++/amd64-unknown-openbsd5.9/bits/cpu_defines.h
-./usr/include/g++/amd64-unknown-openbsd5.9/bits/ctype_base.h
-./usr/include/g++/amd64-unknown-openbsd5.9/bits/ctype_inline.h
-./usr/include/g++/amd64-unknown-openbsd5.9/bits/ctype_noninline.h
-./usr/include/g++/amd64-unknown-openbsd5.9/bits/cxxabi_tweaks.h
-./usr/include/g++/amd64-unknown-openbsd5.9/bits/gthr-default.h
-./usr/include/g++/amd64-unknown-openbsd5.9/bits/gthr-posix.h
-./usr/include/g++/amd64-unknown-openbsd5.9/bits/gthr-single.h
-./usr/include/g++/amd64-unknown-openbsd5.9/bits/gthr-tpf.h
-./usr/include/g++/amd64-unknown-openbsd5.9/bits/gthr.h
-./usr/include/g++/amd64-unknown-openbsd5.9/bits/messages_members.h
-./usr/include/g++/amd64-unknown-openbsd5.9/bits/os_defines.h
-./usr/include/g++/amd64-unknown-openbsd5.9/bits/time_members.h
+./usr/include/g++/amd64-unknown-openbsd6.0
+./usr/include/g++/amd64-unknown-openbsd6.0/bits
+./usr/include/g++/amd64-unknown-openbsd6.0/bits/atomic_word.h
+./usr/include/g++/amd64-unknown-openbsd6.0/bits/basic_file.h
+./usr/include/g++/amd64-unknown-openbsd6.0/bits/c++allocator.h
+./usr/include/g++/amd64-unknown-openbsd6.0/bits/c++config.h
+./usr/include/g++/amd64-unknown-openbsd6.0/bits/c++io.h
+./usr/include/g++/amd64-unknown-openbsd6.0/bits/c++locale.h
+./usr/include/g++/amd64-unknown-openbsd6.0/bits/c++locale_internal.h
+./usr/include/g++/amd64-unknown-openbsd6.0/bits/compatibility.h
+./usr/include/g++/amd64-unknown-openbsd6.0/bits/cpu_defines.h
+./usr/include/g++/amd64-unknown-openbsd6.0/bits/ctype_base.h
+./usr/include/g++/amd64-unknown-openbsd6.0/bits/ctype_inline.h
+./usr/include/g++/amd64-unknown-openbsd6.0/bits/ctype_noninline.h
+./usr/include/g++/amd64-unknown-openbsd6.0/bits/cxxabi_tweaks.h
+./usr/include/g++/amd64-unknown-openbsd6.0/bits/gthr-default.h
+./usr/include/g++/amd64-unknown-openbsd6.0/bits/gthr-posix.h
+./usr/include/g++/amd64-unknown-openbsd6.0/bits/gthr-single.h
+./usr/include/g++/amd64-unknown-openbsd6.0/bits/gthr-tpf.h
+./usr/include/g++/amd64-unknown-openbsd6.0/bits/gthr.h
+./usr/include/g++/amd64-unknown-openbsd6.0/bits/messages_members.h
+./usr/include/g++/amd64-unknown-openbsd6.0/bits/os_defines.h
+./usr/include/g++/amd64-unknown-openbsd6.0/bits/time_members.h
./usr/include/g++/backward
./usr/include/g++/backward/algo.h
./usr/include/g++/backward/algobase.h
@@ -634,10 +634,10 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.9/4.2.1/cc1
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.9/4.2.1/cc1obj
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.9/4.2.1/cc1plus
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.9/4.2.1/libgcov.a
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.0/4.2.1/cc1
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.0/4.2.1/cc1obj
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.0/4.2.1/cc1plus
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.0/4.2.1/libgcov.a
./usr/lib/libamd64.a
./usr/lib/libamd64_p.a
./usr/lib/libstdc++_p.a
diff --git a/distrib/sets/lists/comp/md.armish b/distrib/sets/lists/comp/md.armish
index b5b9194328c..29cbf5ea203 100644
--- a/distrib/sets/lists/comp/md.armish
+++ b/distrib/sets/lists/comp/md.armish
@@ -97,29 +97,29 @@
./usr/include/armish/tcb.h
./usr/include/armish/trap.h
./usr/include/armish/vmparam.h
-./usr/include/g++/arm-unknown-openbsd5.9
-./usr/include/g++/arm-unknown-openbsd5.9/bits
-./usr/include/g++/arm-unknown-openbsd5.9/bits/atomic_word.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/basic_file.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/c++allocator.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/c++config.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/c++io.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/c++locale.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/c++locale_internal.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/compatibility.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/cpu_defines.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/ctype_base.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/ctype_inline.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/ctype_noninline.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/cxxabi_tweaks.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/gthr-default.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/gthr-posix.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/gthr-single.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/gthr-tpf.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/gthr.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/messages_members.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/os_defines.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/time_members.h
+./usr/include/g++/arm-unknown-openbsd6.0
+./usr/include/g++/arm-unknown-openbsd6.0/bits
+./usr/include/g++/arm-unknown-openbsd6.0/bits/atomic_word.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/basic_file.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/c++allocator.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/c++config.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/c++io.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/c++locale.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/c++locale_internal.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/compatibility.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/cpu_defines.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/ctype_base.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/ctype_inline.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/ctype_noninline.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/cxxabi_tweaks.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/gthr-default.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/gthr-posix.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/gthr-single.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/gthr-tpf.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/gthr.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/messages_members.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/os_defines.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/time_members.h
./usr/include/g++/backward
./usr/include/g++/backward/algo.h
./usr/include/g++/backward/algobase.h
@@ -648,10 +648,10 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/cc1
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/cc1obj
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/cc1plus
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/libgcov.a
+./usr/lib/gcc-lib/arm-unknown-openbsd6.0/4.2.1/cc1
+./usr/lib/gcc-lib/arm-unknown-openbsd6.0/4.2.1/cc1obj
+./usr/lib/gcc-lib/arm-unknown-openbsd6.0/4.2.1/cc1plus
+./usr/lib/gcc-lib/arm-unknown-openbsd6.0/4.2.1/libgcov.a
./usr/lib/libarm.a
./usr/lib/libarm_p.a
./usr/lib/libstdc++_p.a
diff --git a/distrib/sets/lists/comp/md.armv7 b/distrib/sets/lists/comp/md.armv7
index bf85de02cd9..9f355af784e 100644
--- a/distrib/sets/lists/comp/md.armv7
+++ b/distrib/sets/lists/comp/md.armv7
@@ -102,29 +102,29 @@
./usr/include/armv7/tcb.h
./usr/include/armv7/trap.h
./usr/include/armv7/vmparam.h
-./usr/include/g++/arm-unknown-openbsd5.9
-./usr/include/g++/arm-unknown-openbsd5.9/bits
-./usr/include/g++/arm-unknown-openbsd5.9/bits/atomic_word.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/basic_file.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/c++allocator.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/c++config.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/c++io.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/c++locale.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/c++locale_internal.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/compatibility.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/cpu_defines.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/ctype_base.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/ctype_inline.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/ctype_noninline.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/cxxabi_tweaks.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/gthr-default.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/gthr-posix.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/gthr-single.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/gthr-tpf.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/gthr.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/messages_members.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/os_defines.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/time_members.h
+./usr/include/g++/arm-unknown-openbsd6.0
+./usr/include/g++/arm-unknown-openbsd6.0/bits
+./usr/include/g++/arm-unknown-openbsd6.0/bits/atomic_word.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/basic_file.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/c++allocator.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/c++config.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/c++io.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/c++locale.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/c++locale_internal.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/compatibility.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/cpu_defines.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/ctype_base.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/ctype_inline.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/ctype_noninline.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/cxxabi_tweaks.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/gthr-default.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/gthr-posix.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/gthr-single.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/gthr-tpf.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/gthr.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/messages_members.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/os_defines.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/time_members.h
./usr/include/g++/backward
./usr/include/g++/backward/algo.h
./usr/include/g++/backward/algobase.h
@@ -653,10 +653,10 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/cc1
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/cc1obj
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/cc1plus
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/libgcov.a
+./usr/lib/gcc-lib/arm-unknown-openbsd6.0/4.2.1/cc1
+./usr/lib/gcc-lib/arm-unknown-openbsd6.0/4.2.1/cc1obj
+./usr/lib/gcc-lib/arm-unknown-openbsd6.0/4.2.1/cc1plus
+./usr/lib/gcc-lib/arm-unknown-openbsd6.0/4.2.1/libgcov.a
./usr/lib/libarm.a
./usr/lib/libarm_p.a
./usr/lib/libstdc++_p.a
diff --git a/distrib/sets/lists/comp/md.hppa b/distrib/sets/lists/comp/md.hppa
index 8b0c12fda68..3e60a3f5970 100644
--- a/distrib/sets/lists/comp/md.hppa
+++ b/distrib/sets/lists/comp/md.hppa
@@ -458,29 +458,29 @@
./usr/include/g++/ext/vstring.tcc
./usr/include/g++/ext/vstring_fwd.h
./usr/include/g++/ext/vstring_util.h
-./usr/include/g++/hppa-unknown-openbsd5.9
-./usr/include/g++/hppa-unknown-openbsd5.9/bits
-./usr/include/g++/hppa-unknown-openbsd5.9/bits/atomic_word.h
-./usr/include/g++/hppa-unknown-openbsd5.9/bits/basic_file.h
-./usr/include/g++/hppa-unknown-openbsd5.9/bits/c++allocator.h
-./usr/include/g++/hppa-unknown-openbsd5.9/bits/c++config.h
-./usr/include/g++/hppa-unknown-openbsd5.9/bits/c++io.h
-./usr/include/g++/hppa-unknown-openbsd5.9/bits/c++locale.h
-./usr/include/g++/hppa-unknown-openbsd5.9/bits/c++locale_internal.h
-./usr/include/g++/hppa-unknown-openbsd5.9/bits/compatibility.h
-./usr/include/g++/hppa-unknown-openbsd5.9/bits/cpu_defines.h
-./usr/include/g++/hppa-unknown-openbsd5.9/bits/ctype_base.h
-./usr/include/g++/hppa-unknown-openbsd5.9/bits/ctype_inline.h
-./usr/include/g++/hppa-unknown-openbsd5.9/bits/ctype_noninline.h
-./usr/include/g++/hppa-unknown-openbsd5.9/bits/cxxabi_tweaks.h
-./usr/include/g++/hppa-unknown-openbsd5.9/bits/gthr-default.h
-./usr/include/g++/hppa-unknown-openbsd5.9/bits/gthr-posix.h
-./usr/include/g++/hppa-unknown-openbsd5.9/bits/gthr-single.h
-./usr/include/g++/hppa-unknown-openbsd5.9/bits/gthr-tpf.h
-./usr/include/g++/hppa-unknown-openbsd5.9/bits/gthr.h
-./usr/include/g++/hppa-unknown-openbsd5.9/bits/messages_members.h
-./usr/include/g++/hppa-unknown-openbsd5.9/bits/os_defines.h
-./usr/include/g++/hppa-unknown-openbsd5.9/bits/time_members.h
+./usr/include/g++/hppa-unknown-openbsd6.0
+./usr/include/g++/hppa-unknown-openbsd6.0/bits
+./usr/include/g++/hppa-unknown-openbsd6.0/bits/atomic_word.h
+./usr/include/g++/hppa-unknown-openbsd6.0/bits/basic_file.h
+./usr/include/g++/hppa-unknown-openbsd6.0/bits/c++allocator.h
+./usr/include/g++/hppa-unknown-openbsd6.0/bits/c++config.h
+./usr/include/g++/hppa-unknown-openbsd6.0/bits/c++io.h
+./usr/include/g++/hppa-unknown-openbsd6.0/bits/c++locale.h
+./usr/include/g++/hppa-unknown-openbsd6.0/bits/c++locale_internal.h
+./usr/include/g++/hppa-unknown-openbsd6.0/bits/compatibility.h
+./usr/include/g++/hppa-unknown-openbsd6.0/bits/cpu_defines.h
+./usr/include/g++/hppa-unknown-openbsd6.0/bits/ctype_base.h
+./usr/include/g++/hppa-unknown-openbsd6.0/bits/ctype_inline.h
+./usr/include/g++/hppa-unknown-openbsd6.0/bits/ctype_noninline.h
+./usr/include/g++/hppa-unknown-openbsd6.0/bits/cxxabi_tweaks.h
+./usr/include/g++/hppa-unknown-openbsd6.0/bits/gthr-default.h
+./usr/include/g++/hppa-unknown-openbsd6.0/bits/gthr-posix.h
+./usr/include/g++/hppa-unknown-openbsd6.0/bits/gthr-single.h
+./usr/include/g++/hppa-unknown-openbsd6.0/bits/gthr-tpf.h
+./usr/include/g++/hppa-unknown-openbsd6.0/bits/gthr.h
+./usr/include/g++/hppa-unknown-openbsd6.0/bits/messages_members.h
+./usr/include/g++/hppa-unknown-openbsd6.0/bits/os_defines.h
+./usr/include/g++/hppa-unknown-openbsd6.0/bits/time_members.h
./usr/include/g++/ios
./usr/include/g++/istream
./usr/include/g++/limits
@@ -605,10 +605,10 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.9/4.2.1/cc1
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.9/4.2.1/cc1obj
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.9/4.2.1/cc1plus
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.9/4.2.1/libgcov.a
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.0/4.2.1/cc1
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.0/4.2.1/cc1obj
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.0/4.2.1/cc1plus
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.0/4.2.1/libgcov.a
./usr/lib/libstdc++_p.a
./usr/lib/libsupc++.a
./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.hppa64 b/distrib/sets/lists/comp/md.hppa64
index 6e04a1ba6f7..1d2fa4a6482 100644
--- a/distrib/sets/lists/comp/md.hppa64
+++ b/distrib/sets/lists/comp/md.hppa64
@@ -127,24 +127,24 @@
./usr/include/g++/ext/stl_hash_fun.h
./usr/include/g++/ext/stl_hashtable.h
./usr/include/g++/ext/stl_rope.h
-./usr/include/g++/hppa64-unknown-openbsd5.9
-./usr/include/g++/hppa64-unknown-openbsd5.9/bits
-./usr/include/g++/hppa64-unknown-openbsd5.9/bits/atomicity.h
-./usr/include/g++/hppa64-unknown-openbsd5.9/bits/basic_file.h
-./usr/include/g++/hppa64-unknown-openbsd5.9/bits/c++config.h
-./usr/include/g++/hppa64-unknown-openbsd5.9/bits/c++io.h
-./usr/include/g++/hppa64-unknown-openbsd5.9/bits/c++locale.h
-./usr/include/g++/hppa64-unknown-openbsd5.9/bits/codecvt_specializations.h
-./usr/include/g++/hppa64-unknown-openbsd5.9/bits/ctype_base.h
-./usr/include/g++/hppa64-unknown-openbsd5.9/bits/ctype_inline.h
-./usr/include/g++/hppa64-unknown-openbsd5.9/bits/ctype_noninline.h
-./usr/include/g++/hppa64-unknown-openbsd5.9/bits/gthr-default.h
-./usr/include/g++/hppa64-unknown-openbsd5.9/bits/gthr-posix.h
-./usr/include/g++/hppa64-unknown-openbsd5.9/bits/gthr-single.h
-./usr/include/g++/hppa64-unknown-openbsd5.9/bits/gthr.h
-./usr/include/g++/hppa64-unknown-openbsd5.9/bits/messages_members.h
-./usr/include/g++/hppa64-unknown-openbsd5.9/bits/os_defines.h
-./usr/include/g++/hppa64-unknown-openbsd5.9/bits/time_members.h
+./usr/include/g++/hppa64-unknown-openbsd6.0
+./usr/include/g++/hppa64-unknown-openbsd6.0/bits
+./usr/include/g++/hppa64-unknown-openbsd6.0/bits/atomicity.h
+./usr/include/g++/hppa64-unknown-openbsd6.0/bits/basic_file.h
+./usr/include/g++/hppa64-unknown-openbsd6.0/bits/c++config.h
+./usr/include/g++/hppa64-unknown-openbsd6.0/bits/c++io.h
+./usr/include/g++/hppa64-unknown-openbsd6.0/bits/c++locale.h
+./usr/include/g++/hppa64-unknown-openbsd6.0/bits/codecvt_specializations.h
+./usr/include/g++/hppa64-unknown-openbsd6.0/bits/ctype_base.h
+./usr/include/g++/hppa64-unknown-openbsd6.0/bits/ctype_inline.h
+./usr/include/g++/hppa64-unknown-openbsd6.0/bits/ctype_noninline.h
+./usr/include/g++/hppa64-unknown-openbsd6.0/bits/gthr-default.h
+./usr/include/g++/hppa64-unknown-openbsd6.0/bits/gthr-posix.h
+./usr/include/g++/hppa64-unknown-openbsd6.0/bits/gthr-single.h
+./usr/include/g++/hppa64-unknown-openbsd6.0/bits/gthr.h
+./usr/include/g++/hppa64-unknown-openbsd6.0/bits/messages_members.h
+./usr/include/g++/hppa64-unknown-openbsd6.0/bits/os_defines.h
+./usr/include/g++/hppa64-unknown-openbsd6.0/bits/time_members.h
./usr/include/g++/ios
./usr/include/g++/istream
./usr/include/g++/limits
@@ -208,15 +208,15 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.9/3.3.5
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.9/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.9/3.3.5/cc1
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.9/3.3.5/cc1obj
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.9/3.3.5/cc1plus
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.9/3.3.5/collect2
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.9/3.3.5/include
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.9/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.9/3.3.5/specs
+./usr/lib/gcc-lib/hppa64-unknown-openbsd6.0/3.3.5
+./usr/lib/gcc-lib/hppa64-unknown-openbsd6.0/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/hppa64-unknown-openbsd6.0/3.3.5/cc1
+./usr/lib/gcc-lib/hppa64-unknown-openbsd6.0/3.3.5/cc1obj
+./usr/lib/gcc-lib/hppa64-unknown-openbsd6.0/3.3.5/cc1plus
+./usr/lib/gcc-lib/hppa64-unknown-openbsd6.0/3.3.5/collect2
+./usr/lib/gcc-lib/hppa64-unknown-openbsd6.0/3.3.5/include
+./usr/lib/gcc-lib/hppa64-unknown-openbsd6.0/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/hppa64-unknown-openbsd6.0/3.3.5/specs
./usr/lib/libsupc++.a
./usr/libdata/ldscripts
./usr/libdata/ldscripts/hppa64obsd.x
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index c87d798cd03..d6f4fd243a4 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -460,29 +460,29 @@
./usr/include/g++/ext/vstring.tcc
./usr/include/g++/ext/vstring_fwd.h
./usr/include/g++/ext/vstring_util.h
-./usr/include/g++/i386-unknown-openbsd5.9
-./usr/include/g++/i386-unknown-openbsd5.9/bits
-./usr/include/g++/i386-unknown-openbsd5.9/bits/atomic_word.h
-./usr/include/g++/i386-unknown-openbsd5.9/bits/basic_file.h
-./usr/include/g++/i386-unknown-openbsd5.9/bits/c++allocator.h
-./usr/include/g++/i386-unknown-openbsd5.9/bits/c++config.h
-./usr/include/g++/i386-unknown-openbsd5.9/bits/c++io.h
-./usr/include/g++/i386-unknown-openbsd5.9/bits/c++locale.h
-./usr/include/g++/i386-unknown-openbsd5.9/bits/c++locale_internal.h
-./usr/include/g++/i386-unknown-openbsd5.9/bits/compatibility.h
-./usr/include/g++/i386-unknown-openbsd5.9/bits/cpu_defines.h
-./usr/include/g++/i386-unknown-openbsd5.9/bits/ctype_base.h
-./usr/include/g++/i386-unknown-openbsd5.9/bits/ctype_inline.h
-./usr/include/g++/i386-unknown-openbsd5.9/bits/ctype_noninline.h
-./usr/include/g++/i386-unknown-openbsd5.9/bits/cxxabi_tweaks.h
-./usr/include/g++/i386-unknown-openbsd5.9/bits/gthr-default.h
-./usr/include/g++/i386-unknown-openbsd5.9/bits/gthr-posix.h
-./usr/include/g++/i386-unknown-openbsd5.9/bits/gthr-single.h
-./usr/include/g++/i386-unknown-openbsd5.9/bits/gthr-tpf.h
-./usr/include/g++/i386-unknown-openbsd5.9/bits/gthr.h
-./usr/include/g++/i386-unknown-openbsd5.9/bits/messages_members.h
-./usr/include/g++/i386-unknown-openbsd5.9/bits/os_defines.h
-./usr/include/g++/i386-unknown-openbsd5.9/bits/time_members.h
+./usr/include/g++/i386-unknown-openbsd6.0
+./usr/include/g++/i386-unknown-openbsd6.0/bits
+./usr/include/g++/i386-unknown-openbsd6.0/bits/atomic_word.h
+./usr/include/g++/i386-unknown-openbsd6.0/bits/basic_file.h
+./usr/include/g++/i386-unknown-openbsd6.0/bits/c++allocator.h
+./usr/include/g++/i386-unknown-openbsd6.0/bits/c++config.h
+./usr/include/g++/i386-unknown-openbsd6.0/bits/c++io.h
+./usr/include/g++/i386-unknown-openbsd6.0/bits/c++locale.h
+./usr/include/g++/i386-unknown-openbsd6.0/bits/c++locale_internal.h
+./usr/include/g++/i386-unknown-openbsd6.0/bits/compatibility.h
+./usr/include/g++/i386-unknown-openbsd6.0/bits/cpu_defines.h
+./usr/include/g++/i386-unknown-openbsd6.0/bits/ctype_base.h
+./usr/include/g++/i386-unknown-openbsd6.0/bits/ctype_inline.h
+./usr/include/g++/i386-unknown-openbsd6.0/bits/ctype_noninline.h
+./usr/include/g++/i386-unknown-openbsd6.0/bits/cxxabi_tweaks.h
+./usr/include/g++/i386-unknown-openbsd6.0/bits/gthr-default.h
+./usr/include/g++/i386-unknown-openbsd6.0/bits/gthr-posix.h
+./usr/include/g++/i386-unknown-openbsd6.0/bits/gthr-single.h
+./usr/include/g++/i386-unknown-openbsd6.0/bits/gthr-tpf.h
+./usr/include/g++/i386-unknown-openbsd6.0/bits/gthr.h
+./usr/include/g++/i386-unknown-openbsd6.0/bits/messages_members.h
+./usr/include/g++/i386-unknown-openbsd6.0/bits/os_defines.h
+./usr/include/g++/i386-unknown-openbsd6.0/bits/time_members.h
./usr/include/g++/ios
./usr/include/g++/istream
./usr/include/g++/limits
@@ -635,10 +635,10 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/i386-unknown-openbsd5.9/4.2.1/cc1
-./usr/lib/gcc-lib/i386-unknown-openbsd5.9/4.2.1/cc1obj
-./usr/lib/gcc-lib/i386-unknown-openbsd5.9/4.2.1/cc1plus
-./usr/lib/gcc-lib/i386-unknown-openbsd5.9/4.2.1/libgcov.a
+./usr/lib/gcc-lib/i386-unknown-openbsd6.0/4.2.1/cc1
+./usr/lib/gcc-lib/i386-unknown-openbsd6.0/4.2.1/cc1obj
+./usr/lib/gcc-lib/i386-unknown-openbsd6.0/4.2.1/cc1plus
+./usr/lib/gcc-lib/i386-unknown-openbsd6.0/4.2.1/libgcov.a
./usr/lib/libi386.a
./usr/lib/libi386_p.a
./usr/lib/libstdc++_p.a
diff --git a/distrib/sets/lists/comp/md.landisk b/distrib/sets/lists/comp/md.landisk
index 36ee1dc6232..b91b0a98b8d 100644
--- a/distrib/sets/lists/comp/md.landisk
+++ b/distrib/sets/lists/comp/md.landisk
@@ -463,29 +463,29 @@
./usr/include/g++/limits
./usr/include/g++/locale
./usr/include/g++/ostream
-./usr/include/g++/sh-unknown-openbsd5.9
-./usr/include/g++/sh-unknown-openbsd5.9/bits
-./usr/include/g++/sh-unknown-openbsd5.9/bits/atomic_word.h
-./usr/include/g++/sh-unknown-openbsd5.9/bits/basic_file.h
-./usr/include/g++/sh-unknown-openbsd5.9/bits/c++allocator.h
-./usr/include/g++/sh-unknown-openbsd5.9/bits/c++config.h
-./usr/include/g++/sh-unknown-openbsd5.9/bits/c++io.h
-./usr/include/g++/sh-unknown-openbsd5.9/bits/c++locale.h
-./usr/include/g++/sh-unknown-openbsd5.9/bits/c++locale_internal.h
-./usr/include/g++/sh-unknown-openbsd5.9/bits/compatibility.h
-./usr/include/g++/sh-unknown-openbsd5.9/bits/cpu_defines.h
-./usr/include/g++/sh-unknown-openbsd5.9/bits/ctype_base.h
-./usr/include/g++/sh-unknown-openbsd5.9/bits/ctype_inline.h
-./usr/include/g++/sh-unknown-openbsd5.9/bits/ctype_noninline.h
-./usr/include/g++/sh-unknown-openbsd5.9/bits/cxxabi_tweaks.h
-./usr/include/g++/sh-unknown-openbsd5.9/bits/gthr-default.h
-./usr/include/g++/sh-unknown-openbsd5.9/bits/gthr-posix.h
-./usr/include/g++/sh-unknown-openbsd5.9/bits/gthr-single.h
-./usr/include/g++/sh-unknown-openbsd5.9/bits/gthr-tpf.h
-./usr/include/g++/sh-unknown-openbsd5.9/bits/gthr.h
-./usr/include/g++/sh-unknown-openbsd5.9/bits/messages_members.h
-./usr/include/g++/sh-unknown-openbsd5.9/bits/os_defines.h
-./usr/include/g++/sh-unknown-openbsd5.9/bits/time_members.h
+./usr/include/g++/sh-unknown-openbsd6.0
+./usr/include/g++/sh-unknown-openbsd6.0/bits
+./usr/include/g++/sh-unknown-openbsd6.0/bits/atomic_word.h
+./usr/include/g++/sh-unknown-openbsd6.0/bits/basic_file.h
+./usr/include/g++/sh-unknown-openbsd6.0/bits/c++allocator.h
+./usr/include/g++/sh-unknown-openbsd6.0/bits/c++config.h
+./usr/include/g++/sh-unknown-openbsd6.0/bits/c++io.h
+./usr/include/g++/sh-unknown-openbsd6.0/bits/c++locale.h
+./usr/include/g++/sh-unknown-openbsd6.0/bits/c++locale_internal.h
+./usr/include/g++/sh-unknown-openbsd6.0/bits/compatibility.h
+./usr/include/g++/sh-unknown-openbsd6.0/bits/cpu_defines.h
+./usr/include/g++/sh-unknown-openbsd6.0/bits/ctype_base.h
+./usr/include/g++/sh-unknown-openbsd6.0/bits/ctype_inline.h
+./usr/include/g++/sh-unknown-openbsd6.0/bits/ctype_noninline.h
+./usr/include/g++/sh-unknown-openbsd6.0/bits/cxxabi_tweaks.h
+./usr/include/g++/sh-unknown-openbsd6.0/bits/gthr-default.h
+./usr/include/g++/sh-unknown-openbsd6.0/bits/gthr-posix.h
+./usr/include/g++/sh-unknown-openbsd6.0/bits/gthr-single.h
+./usr/include/g++/sh-unknown-openbsd6.0/bits/gthr-tpf.h
+./usr/include/g++/sh-unknown-openbsd6.0/bits/gthr.h
+./usr/include/g++/sh-unknown-openbsd6.0/bits/messages_members.h
+./usr/include/g++/sh-unknown-openbsd6.0/bits/os_defines.h
+./usr/include/g++/sh-unknown-openbsd6.0/bits/time_members.h
./usr/include/g++/streambuf
./usr/include/g++/tr1
./usr/include/g++/tr1/array
@@ -652,10 +652,10 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sh-unknown-openbsd5.9/4.2.1/cc1
-./usr/lib/gcc-lib/sh-unknown-openbsd5.9/4.2.1/cc1obj
-./usr/lib/gcc-lib/sh-unknown-openbsd5.9/4.2.1/cc1plus
-./usr/lib/gcc-lib/sh-unknown-openbsd5.9/4.2.1/libgcov.a
+./usr/lib/gcc-lib/sh-unknown-openbsd6.0/4.2.1/cc1
+./usr/lib/gcc-lib/sh-unknown-openbsd6.0/4.2.1/cc1obj
+./usr/lib/gcc-lib/sh-unknown-openbsd6.0/4.2.1/cc1plus
+./usr/lib/gcc-lib/sh-unknown-openbsd6.0/4.2.1/libgcov.a
./usr/lib/libstdc++_p.a
./usr/lib/libsupc++.a
./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.loongson b/distrib/sets/lists/comp/md.loongson
index 503d5e19821..6e96d46307b 100644
--- a/distrib/sets/lists/comp/md.loongson
+++ b/distrib/sets/lists/comp/md.loongson
@@ -462,29 +462,29 @@
./usr/include/g++/istream
./usr/include/g++/limits
./usr/include/g++/locale
-./usr/include/g++/mips64el-unknown-openbsd5.9
-./usr/include/g++/mips64el-unknown-openbsd5.9/bits
-./usr/include/g++/mips64el-unknown-openbsd5.9/bits/atomic_word.h
-./usr/include/g++/mips64el-unknown-openbsd5.9/bits/basic_file.h
-./usr/include/g++/mips64el-unknown-openbsd5.9/bits/c++allocator.h
-./usr/include/g++/mips64el-unknown-openbsd5.9/bits/c++config.h
-./usr/include/g++/mips64el-unknown-openbsd5.9/bits/c++io.h
-./usr/include/g++/mips64el-unknown-openbsd5.9/bits/c++locale.h
-./usr/include/g++/mips64el-unknown-openbsd5.9/bits/c++locale_internal.h
-./usr/include/g++/mips64el-unknown-openbsd5.9/bits/compatibility.h
-./usr/include/g++/mips64el-unknown-openbsd5.9/bits/cpu_defines.h
-./usr/include/g++/mips64el-unknown-openbsd5.9/bits/ctype_base.h
-./usr/include/g++/mips64el-unknown-openbsd5.9/bits/ctype_inline.h
-./usr/include/g++/mips64el-unknown-openbsd5.9/bits/ctype_noninline.h
-./usr/include/g++/mips64el-unknown-openbsd5.9/bits/cxxabi_tweaks.h
-./usr/include/g++/mips64el-unknown-openbsd5.9/bits/gthr-default.h
-./usr/include/g++/mips64el-unknown-openbsd5.9/bits/gthr-posix.h
-./usr/include/g++/mips64el-unknown-openbsd5.9/bits/gthr-single.h
-./usr/include/g++/mips64el-unknown-openbsd5.9/bits/gthr-tpf.h
-./usr/include/g++/mips64el-unknown-openbsd5.9/bits/gthr.h
-./usr/include/g++/mips64el-unknown-openbsd5.9/bits/messages_members.h
-./usr/include/g++/mips64el-unknown-openbsd5.9/bits/os_defines.h
-./usr/include/g++/mips64el-unknown-openbsd5.9/bits/time_members.h
+./usr/include/g++/mips64el-unknown-openbsd6.0
+./usr/include/g++/mips64el-unknown-openbsd6.0/bits
+./usr/include/g++/mips64el-unknown-openbsd6.0/bits/atomic_word.h
+./usr/include/g++/mips64el-unknown-openbsd6.0/bits/basic_file.h
+./usr/include/g++/mips64el-unknown-openbsd6.0/bits/c++allocator.h
+./usr/include/g++/mips64el-unknown-openbsd6.0/bits/c++config.h
+./usr/include/g++/mips64el-unknown-openbsd6.0/bits/c++io.h
+./usr/include/g++/mips64el-unknown-openbsd6.0/bits/c++locale.h
+./usr/include/g++/mips64el-unknown-openbsd6.0/bits/c++locale_internal.h
+./usr/include/g++/mips64el-unknown-openbsd6.0/bits/compatibility.h
+./usr/include/g++/mips64el-unknown-openbsd6.0/bits/cpu_defines.h
+./usr/include/g++/mips64el-unknown-openbsd6.0/bits/ctype_base.h
+./usr/include/g++/mips64el-unknown-openbsd6.0/bits/ctype_inline.h
+./usr/include/g++/mips64el-unknown-openbsd6.0/bits/ctype_noninline.h
+./usr/include/g++/mips64el-unknown-openbsd6.0/bits/cxxabi_tweaks.h
+./usr/include/g++/mips64el-unknown-openbsd6.0/bits/gthr-default.h
+./usr/include/g++/mips64el-unknown-openbsd6.0/bits/gthr-posix.h
+./usr/include/g++/mips64el-unknown-openbsd6.0/bits/gthr-single.h
+./usr/include/g++/mips64el-unknown-openbsd6.0/bits/gthr-tpf.h
+./usr/include/g++/mips64el-unknown-openbsd6.0/bits/gthr.h
+./usr/include/g++/mips64el-unknown-openbsd6.0/bits/messages_members.h
+./usr/include/g++/mips64el-unknown-openbsd6.0/bits/os_defines.h
+./usr/include/g++/mips64el-unknown-openbsd6.0/bits/time_members.h
./usr/include/g++/ostream
./usr/include/g++/streambuf
./usr/include/g++/tr1
@@ -654,10 +654,10 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.9/4.2.1/cc1
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.9/4.2.1/cc1obj
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.9/4.2.1/cc1plus
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.9/4.2.1/libgcov.a
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.0/4.2.1/cc1
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.0/4.2.1/cc1obj
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.0/4.2.1/cc1plus
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.0/4.2.1/libgcov.a
./usr/lib/libstdc++_p.a
./usr/lib/libsupc++.a
./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.luna88k b/distrib/sets/lists/comp/md.luna88k
index 67979f197a3..5ead6ad8e13 100644
--- a/distrib/sets/lists/comp/md.luna88k
+++ b/distrib/sets/lists/comp/md.luna88k
@@ -131,24 +131,24 @@
./usr/include/g++/istream
./usr/include/g++/limits
./usr/include/g++/locale
-./usr/include/g++/m88k-unknown-openbsd5.9
-./usr/include/g++/m88k-unknown-openbsd5.9/bits
-./usr/include/g++/m88k-unknown-openbsd5.9/bits/atomicity.h
-./usr/include/g++/m88k-unknown-openbsd5.9/bits/basic_file.h
-./usr/include/g++/m88k-unknown-openbsd5.9/bits/c++config.h
-./usr/include/g++/m88k-unknown-openbsd5.9/bits/c++io.h
-./usr/include/g++/m88k-unknown-openbsd5.9/bits/c++locale.h
-./usr/include/g++/m88k-unknown-openbsd5.9/bits/codecvt_specializations.h
-./usr/include/g++/m88k-unknown-openbsd5.9/bits/ctype_base.h
-./usr/include/g++/m88k-unknown-openbsd5.9/bits/ctype_inline.h
-./usr/include/g++/m88k-unknown-openbsd5.9/bits/ctype_noninline.h
-./usr/include/g++/m88k-unknown-openbsd5.9/bits/gthr-default.h
-./usr/include/g++/m88k-unknown-openbsd5.9/bits/gthr-posix.h
-./usr/include/g++/m88k-unknown-openbsd5.9/bits/gthr-single.h
-./usr/include/g++/m88k-unknown-openbsd5.9/bits/gthr.h
-./usr/include/g++/m88k-unknown-openbsd5.9/bits/messages_members.h
-./usr/include/g++/m88k-unknown-openbsd5.9/bits/os_defines.h
-./usr/include/g++/m88k-unknown-openbsd5.9/bits/time_members.h
+./usr/include/g++/m88k-unknown-openbsd6.0
+./usr/include/g++/m88k-unknown-openbsd6.0/bits
+./usr/include/g++/m88k-unknown-openbsd6.0/bits/atomicity.h
+./usr/include/g++/m88k-unknown-openbsd6.0/bits/basic_file.h
+./usr/include/g++/m88k-unknown-openbsd6.0/bits/c++config.h
+./usr/include/g++/m88k-unknown-openbsd6.0/bits/c++io.h
+./usr/include/g++/m88k-unknown-openbsd6.0/bits/c++locale.h
+./usr/include/g++/m88k-unknown-openbsd6.0/bits/codecvt_specializations.h
+./usr/include/g++/m88k-unknown-openbsd6.0/bits/ctype_base.h
+./usr/include/g++/m88k-unknown-openbsd6.0/bits/ctype_inline.h
+./usr/include/g++/m88k-unknown-openbsd6.0/bits/ctype_noninline.h
+./usr/include/g++/m88k-unknown-openbsd6.0/bits/gthr-default.h
+./usr/include/g++/m88k-unknown-openbsd6.0/bits/gthr-posix.h
+./usr/include/g++/m88k-unknown-openbsd6.0/bits/gthr-single.h
+./usr/include/g++/m88k-unknown-openbsd6.0/bits/gthr.h
+./usr/include/g++/m88k-unknown-openbsd6.0/bits/messages_members.h
+./usr/include/g++/m88k-unknown-openbsd6.0/bits/os_defines.h
+./usr/include/g++/m88k-unknown-openbsd6.0/bits/time_members.h
./usr/include/g++/ostream
./usr/include/g++/streambuf
./usr/include/ieeefp.h
@@ -253,17 +253,17 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.9/3.3.6
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.9/3.3.6/SYSCALLS.c.X
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.9/3.3.6/cc1
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.9/3.3.6/cc1obj
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.9/3.3.6/cc1plus
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.9/3.3.6/collect2
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.9/3.3.6/fPIC
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.9/3.3.6/fpic
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.9/3.3.6/include
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.9/3.3.6/include/unwind.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.9/3.3.6/specs
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.0/3.3.6
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.0/3.3.6/SYSCALLS.c.X
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.0/3.3.6/cc1
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.0/3.3.6/cc1obj
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.0/3.3.6/cc1plus
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.0/3.3.6/collect2
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.0/3.3.6/fPIC
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.0/3.3.6/fpic
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.0/3.3.6/include
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.0/3.3.6/include/unwind.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.0/3.3.6/specs
./usr/lib/libsupc++.a
./usr/libdata/ldscripts
./usr/libdata/ldscripts/elf32m88k_obsd.x
diff --git a/distrib/sets/lists/comp/md.macppc b/distrib/sets/lists/comp/md.macppc
index 0558afb503e..2016a297d63 100644
--- a/distrib/sets/lists/comp/md.macppc
+++ b/distrib/sets/lists/comp/md.macppc
@@ -464,29 +464,29 @@
./usr/include/g++/limits
./usr/include/g++/locale
./usr/include/g++/ostream
-./usr/include/g++/powerpc-unknown-openbsd5.9
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/atomic_word.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/basic_file.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/c++allocator.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/c++config.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/c++io.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/c++locale.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/c++locale_internal.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/compatibility.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/cpu_defines.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/ctype_base.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/ctype_inline.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/ctype_noninline.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/cxxabi_tweaks.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/gthr-default.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/gthr-posix.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/gthr-single.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/gthr-tpf.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/gthr.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/messages_members.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/os_defines.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/time_members.h
+./usr/include/g++/powerpc-unknown-openbsd6.0
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/atomic_word.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/basic_file.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/c++allocator.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/c++config.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/c++io.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/c++locale.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/c++locale_internal.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/compatibility.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/cpu_defines.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/ctype_base.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/ctype_inline.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/ctype_noninline.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/cxxabi_tweaks.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/gthr-default.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/gthr-posix.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/gthr-single.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/gthr-tpf.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/gthr.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/messages_members.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/os_defines.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/time_members.h
./usr/include/g++/streambuf
./usr/include/g++/tr1
./usr/include/g++/tr1/array
@@ -649,10 +649,10 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/cc1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/cc1obj
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/libgcov.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.0/4.2.1/cc1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.0/4.2.1/cc1obj
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.0/4.2.1/cc1plus
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.0/4.2.1/libgcov.a
./usr/lib/libstdc++_p.a
./usr/lib/libsupc++.a
./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.octeon b/distrib/sets/lists/comp/md.octeon
index c07501666b9..0f543c51730 100644
--- a/distrib/sets/lists/comp/md.octeon
+++ b/distrib/sets/lists/comp/md.octeon
@@ -462,29 +462,29 @@
./usr/include/g++/istream
./usr/include/g++/limits
./usr/include/g++/locale
-./usr/include/g++/mips64-unknown-openbsd5.9
-./usr/include/g++/mips64-unknown-openbsd5.9/bits
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/atomic_word.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/basic_file.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/c++allocator.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/c++config.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/c++io.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/c++locale.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/c++locale_internal.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/compatibility.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/cpu_defines.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/ctype_base.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/ctype_inline.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/ctype_noninline.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/cxxabi_tweaks.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/gthr-default.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/gthr-posix.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/gthr-single.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/gthr-tpf.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/gthr.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/messages_members.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/os_defines.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/time_members.h
+./usr/include/g++/mips64-unknown-openbsd6.0
+./usr/include/g++/mips64-unknown-openbsd6.0/bits
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/atomic_word.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/basic_file.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/c++allocator.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/c++config.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/c++io.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/c++locale.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/c++locale_internal.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/compatibility.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/cpu_defines.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/ctype_base.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/ctype_inline.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/ctype_noninline.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/cxxabi_tweaks.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/gthr-default.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/gthr-posix.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/gthr-single.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/gthr-tpf.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/gthr.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/messages_members.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/os_defines.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/time_members.h
./usr/include/g++/ostream
./usr/include/g++/streambuf
./usr/include/g++/tr1
@@ -652,10 +652,10 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/cc1
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/cc1obj
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/cc1plus
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/libgcov.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.0/4.2.1/cc1
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.0/4.2.1/cc1obj
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.0/4.2.1/cc1plus
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.0/4.2.1/libgcov.a
./usr/lib/libstdc++_p.a
./usr/lib/libsupc++.a
./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.sgi b/distrib/sets/lists/comp/md.sgi
index fe223be7e0a..186673d7653 100644
--- a/distrib/sets/lists/comp/md.sgi
+++ b/distrib/sets/lists/comp/md.sgi
@@ -462,29 +462,29 @@
./usr/include/g++/istream
./usr/include/g++/limits
./usr/include/g++/locale
-./usr/include/g++/mips64-unknown-openbsd5.9
-./usr/include/g++/mips64-unknown-openbsd5.9/bits
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/atomic_word.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/basic_file.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/c++allocator.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/c++config.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/c++io.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/c++locale.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/c++locale_internal.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/compatibility.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/cpu_defines.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/ctype_base.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/ctype_inline.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/ctype_noninline.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/cxxabi_tweaks.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/gthr-default.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/gthr-posix.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/gthr-single.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/gthr-tpf.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/gthr.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/messages_members.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/os_defines.h
-./usr/include/g++/mips64-unknown-openbsd5.9/bits/time_members.h
+./usr/include/g++/mips64-unknown-openbsd6.0
+./usr/include/g++/mips64-unknown-openbsd6.0/bits
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/atomic_word.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/basic_file.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/c++allocator.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/c++config.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/c++io.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/c++locale.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/c++locale_internal.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/compatibility.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/cpu_defines.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/ctype_base.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/ctype_inline.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/ctype_noninline.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/cxxabi_tweaks.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/gthr-default.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/gthr-posix.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/gthr-single.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/gthr-tpf.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/gthr.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/messages_members.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/os_defines.h
+./usr/include/g++/mips64-unknown-openbsd6.0/bits/time_members.h
./usr/include/g++/ostream
./usr/include/g++/streambuf
./usr/include/g++/tr1
@@ -652,10 +652,10 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/cc1
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/cc1obj
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/cc1plus
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.9/4.2.1/libgcov.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.0/4.2.1/cc1
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.0/4.2.1/cc1obj
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.0/4.2.1/cc1plus
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.0/4.2.1/libgcov.a
./usr/lib/libstdc++_p.a
./usr/lib/libsupc++.a
./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.socppc b/distrib/sets/lists/comp/md.socppc
index 1a4acbdbbdf..274a2bf98e7 100644
--- a/distrib/sets/lists/comp/md.socppc
+++ b/distrib/sets/lists/comp/md.socppc
@@ -464,29 +464,29 @@
./usr/include/g++/limits
./usr/include/g++/locale
./usr/include/g++/ostream
-./usr/include/g++/powerpc-unknown-openbsd5.9
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/atomic_word.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/basic_file.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/c++allocator.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/c++config.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/c++io.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/c++locale.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/c++locale_internal.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/compatibility.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/cpu_defines.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/ctype_base.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/ctype_inline.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/ctype_noninline.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/cxxabi_tweaks.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/gthr-default.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/gthr-posix.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/gthr-single.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/gthr-tpf.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/gthr.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/messages_members.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/os_defines.h
-./usr/include/g++/powerpc-unknown-openbsd5.9/bits/time_members.h
+./usr/include/g++/powerpc-unknown-openbsd6.0
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/atomic_word.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/basic_file.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/c++allocator.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/c++config.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/c++io.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/c++locale.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/c++locale_internal.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/compatibility.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/cpu_defines.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/ctype_base.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/ctype_inline.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/ctype_noninline.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/cxxabi_tweaks.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/gthr-default.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/gthr-posix.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/gthr-single.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/gthr-tpf.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/gthr.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/messages_members.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/os_defines.h
+./usr/include/g++/powerpc-unknown-openbsd6.0/bits/time_members.h
./usr/include/g++/streambuf
./usr/include/g++/tr1
./usr/include/g++/tr1/array
@@ -643,10 +643,10 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/cc1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/cc1obj
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.9/4.2.1/libgcov.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.0/4.2.1/cc1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.0/4.2.1/cc1obj
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.0/4.2.1/cc1plus
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.0/4.2.1/libgcov.a
./usr/lib/libstdc++_p.a
./usr/lib/libsupc++.a
./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.sparc b/distrib/sets/lists/comp/md.sparc
index de0f3f0db23..930278c94f2 100644
--- a/distrib/sets/lists/comp/md.sparc
+++ b/distrib/sets/lists/comp/md.sparc
@@ -463,29 +463,29 @@
./usr/include/g++/limits
./usr/include/g++/locale
./usr/include/g++/ostream
-./usr/include/g++/sparc-unknown-openbsd5.9
-./usr/include/g++/sparc-unknown-openbsd5.9/bits
-./usr/include/g++/sparc-unknown-openbsd5.9/bits/atomic_word.h
-./usr/include/g++/sparc-unknown-openbsd5.9/bits/basic_file.h
-./usr/include/g++/sparc-unknown-openbsd5.9/bits/c++allocator.h
-./usr/include/g++/sparc-unknown-openbsd5.9/bits/c++config.h
-./usr/include/g++/sparc-unknown-openbsd5.9/bits/c++io.h
-./usr/include/g++/sparc-unknown-openbsd5.9/bits/c++locale.h
-./usr/include/g++/sparc-unknown-openbsd5.9/bits/c++locale_internal.h
-./usr/include/g++/sparc-unknown-openbsd5.9/bits/compatibility.h
-./usr/include/g++/sparc-unknown-openbsd5.9/bits/cpu_defines.h
-./usr/include/g++/sparc-unknown-openbsd5.9/bits/ctype_base.h
-./usr/include/g++/sparc-unknown-openbsd5.9/bits/ctype_inline.h
-./usr/include/g++/sparc-unknown-openbsd5.9/bits/ctype_noninline.h
-./usr/include/g++/sparc-unknown-openbsd5.9/bits/cxxabi_tweaks.h
-./usr/include/g++/sparc-unknown-openbsd5.9/bits/gthr-default.h
-./usr/include/g++/sparc-unknown-openbsd5.9/bits/gthr-posix.h
-./usr/include/g++/sparc-unknown-openbsd5.9/bits/gthr-single.h
-./usr/include/g++/sparc-unknown-openbsd5.9/bits/gthr-tpf.h
-./usr/include/g++/sparc-unknown-openbsd5.9/bits/gthr.h
-./usr/include/g++/sparc-unknown-openbsd5.9/bits/messages_members.h
-./usr/include/g++/sparc-unknown-openbsd5.9/bits/os_defines.h
-./usr/include/g++/sparc-unknown-openbsd5.9/bits/time_members.h
+./usr/include/g++/sparc-unknown-openbsd6.0
+./usr/include/g++/sparc-unknown-openbsd6.0/bits
+./usr/include/g++/sparc-unknown-openbsd6.0/bits/atomic_word.h
+./usr/include/g++/sparc-unknown-openbsd6.0/bits/basic_file.h
+./usr/include/g++/sparc-unknown-openbsd6.0/bits/c++allocator.h
+./usr/include/g++/sparc-unknown-openbsd6.0/bits/c++config.h
+./usr/include/g++/sparc-unknown-openbsd6.0/bits/c++io.h
+./usr/include/g++/sparc-unknown-openbsd6.0/bits/c++locale.h
+./usr/include/g++/sparc-unknown-openbsd6.0/bits/c++locale_internal.h
+./usr/include/g++/sparc-unknown-openbsd6.0/bits/compatibility.h
+./usr/include/g++/sparc-unknown-openbsd6.0/bits/cpu_defines.h
+./usr/include/g++/sparc-unknown-openbsd6.0/bits/ctype_base.h
+./usr/include/g++/sparc-unknown-openbsd6.0/bits/ctype_inline.h
+./usr/include/g++/sparc-unknown-openbsd6.0/bits/ctype_noninline.h
+./usr/include/g++/sparc-unknown-openbsd6.0/bits/cxxabi_tweaks.h
+./usr/include/g++/sparc-unknown-openbsd6.0/bits/gthr-default.h
+./usr/include/g++/sparc-unknown-openbsd6.0/bits/gthr-posix.h
+./usr/include/g++/sparc-unknown-openbsd6.0/bits/gthr-single.h
+./usr/include/g++/sparc-unknown-openbsd6.0/bits/gthr-tpf.h
+./usr/include/g++/sparc-unknown-openbsd6.0/bits/gthr.h
+./usr/include/g++/sparc-unknown-openbsd6.0/bits/messages_members.h
+./usr/include/g++/sparc-unknown-openbsd6.0/bits/os_defines.h
+./usr/include/g++/sparc-unknown-openbsd6.0/bits/time_members.h
./usr/include/g++/streambuf
./usr/include/g++/tr1
./usr/include/g++/tr1/array
@@ -609,10 +609,10 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.9/4.2.1/cc1
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.9/4.2.1/cc1obj
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.9/4.2.1/cc1plus
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.9/4.2.1/libgcov.a
+./usr/lib/gcc-lib/sparc-unknown-openbsd6.0/4.2.1/cc1
+./usr/lib/gcc-lib/sparc-unknown-openbsd6.0/4.2.1/cc1obj
+./usr/lib/gcc-lib/sparc-unknown-openbsd6.0/4.2.1/cc1plus
+./usr/lib/gcc-lib/sparc-unknown-openbsd6.0/4.2.1/libgcov.a
./usr/lib/libstdc++_p.a
./usr/lib/libsupc++.a
./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.sparc64 b/distrib/sets/lists/comp/md.sparc64
index 96da39ba989..805368af5c3 100644
--- a/distrib/sets/lists/comp/md.sparc64
+++ b/distrib/sets/lists/comp/md.sparc64
@@ -463,29 +463,29 @@
./usr/include/g++/limits
./usr/include/g++/locale
./usr/include/g++/ostream
-./usr/include/g++/sparc64-unknown-openbsd5.9
-./usr/include/g++/sparc64-unknown-openbsd5.9/bits
-./usr/include/g++/sparc64-unknown-openbsd5.9/bits/atomic_word.h
-./usr/include/g++/sparc64-unknown-openbsd5.9/bits/basic_file.h
-./usr/include/g++/sparc64-unknown-openbsd5.9/bits/c++allocator.h
-./usr/include/g++/sparc64-unknown-openbsd5.9/bits/c++config.h
-./usr/include/g++/sparc64-unknown-openbsd5.9/bits/c++io.h
-./usr/include/g++/sparc64-unknown-openbsd5.9/bits/c++locale.h
-./usr/include/g++/sparc64-unknown-openbsd5.9/bits/c++locale_internal.h
-./usr/include/g++/sparc64-unknown-openbsd5.9/bits/compatibility.h
-./usr/include/g++/sparc64-unknown-openbsd5.9/bits/cpu_defines.h
-./usr/include/g++/sparc64-unknown-openbsd5.9/bits/ctype_base.h
-./usr/include/g++/sparc64-unknown-openbsd5.9/bits/ctype_inline.h
-./usr/include/g++/sparc64-unknown-openbsd5.9/bits/ctype_noninline.h
-./usr/include/g++/sparc64-unknown-openbsd5.9/bits/cxxabi_tweaks.h
-./usr/include/g++/sparc64-unknown-openbsd5.9/bits/gthr-default.h
-./usr/include/g++/sparc64-unknown-openbsd5.9/bits/gthr-posix.h
-./usr/include/g++/sparc64-unknown-openbsd5.9/bits/gthr-single.h
-./usr/include/g++/sparc64-unknown-openbsd5.9/bits/gthr-tpf.h
-./usr/include/g++/sparc64-unknown-openbsd5.9/bits/gthr.h
-./usr/include/g++/sparc64-unknown-openbsd5.9/bits/messages_members.h
-./usr/include/g++/sparc64-unknown-openbsd5.9/bits/os_defines.h
-./usr/include/g++/sparc64-unknown-openbsd5.9/bits/time_members.h
+./usr/include/g++/sparc64-unknown-openbsd6.0
+./usr/include/g++/sparc64-unknown-openbsd6.0/bits
+./usr/include/g++/sparc64-unknown-openbsd6.0/bits/atomic_word.h
+./usr/include/g++/sparc64-unknown-openbsd6.0/bits/basic_file.h
+./usr/include/g++/sparc64-unknown-openbsd6.0/bits/c++allocator.h
+./usr/include/g++/sparc64-unknown-openbsd6.0/bits/c++config.h
+./usr/include/g++/sparc64-unknown-openbsd6.0/bits/c++io.h
+./usr/include/g++/sparc64-unknown-openbsd6.0/bits/c++locale.h
+./usr/include/g++/sparc64-unknown-openbsd6.0/bits/c++locale_internal.h
+./usr/include/g++/sparc64-unknown-openbsd6.0/bits/compatibility.h
+./usr/include/g++/sparc64-unknown-openbsd6.0/bits/cpu_defines.h
+./usr/include/g++/sparc64-unknown-openbsd6.0/bits/ctype_base.h
+./usr/include/g++/sparc64-unknown-openbsd6.0/bits/ctype_inline.h
+./usr/include/g++/sparc64-unknown-openbsd6.0/bits/ctype_noninline.h
+./usr/include/g++/sparc64-unknown-openbsd6.0/bits/cxxabi_tweaks.h
+./usr/include/g++/sparc64-unknown-openbsd6.0/bits/gthr-default.h
+./usr/include/g++/sparc64-unknown-openbsd6.0/bits/gthr-posix.h
+./usr/include/g++/sparc64-unknown-openbsd6.0/bits/gthr-single.h
+./usr/include/g++/sparc64-unknown-openbsd6.0/bits/gthr-tpf.h
+./usr/include/g++/sparc64-unknown-openbsd6.0/bits/gthr.h
+./usr/include/g++/sparc64-unknown-openbsd6.0/bits/messages_members.h
+./usr/include/g++/sparc64-unknown-openbsd6.0/bits/os_defines.h
+./usr/include/g++/sparc64-unknown-openbsd6.0/bits/time_members.h
./usr/include/g++/streambuf
./usr/include/g++/tr1
./usr/include/g++/tr1/array
@@ -611,10 +611,10 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.9/4.2.1/cc1
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.9/4.2.1/cc1obj
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.9/4.2.1/cc1plus
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.9/4.2.1/libgcov.a
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.0/4.2.1/cc1
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.0/4.2.1/cc1obj
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.0/4.2.1/cc1plus
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.0/4.2.1/libgcov.a
./usr/lib/libstdc++_p.a
./usr/lib/libsupc++.a
./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.zaurus b/distrib/sets/lists/comp/md.zaurus
index 59de76b16a4..a66ca077613 100644
--- a/distrib/sets/lists/comp/md.zaurus
+++ b/distrib/sets/lists/comp/md.zaurus
@@ -53,29 +53,29 @@
./usr/include/arm/trap.h
./usr/include/arm/undefined.h
./usr/include/arm/vmparam.h
-./usr/include/g++/arm-unknown-openbsd5.9
-./usr/include/g++/arm-unknown-openbsd5.9/bits
-./usr/include/g++/arm-unknown-openbsd5.9/bits/atomic_word.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/basic_file.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/c++allocator.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/c++config.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/c++io.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/c++locale.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/c++locale_internal.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/compatibility.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/cpu_defines.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/ctype_base.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/ctype_inline.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/ctype_noninline.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/cxxabi_tweaks.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/gthr-default.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/gthr-posix.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/gthr-single.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/gthr-tpf.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/gthr.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/messages_members.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/os_defines.h
-./usr/include/g++/arm-unknown-openbsd5.9/bits/time_members.h
+./usr/include/g++/arm-unknown-openbsd6.0
+./usr/include/g++/arm-unknown-openbsd6.0/bits
+./usr/include/g++/arm-unknown-openbsd6.0/bits/atomic_word.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/basic_file.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/c++allocator.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/c++config.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/c++io.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/c++locale.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/c++locale_internal.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/compatibility.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/cpu_defines.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/ctype_base.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/ctype_inline.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/ctype_noninline.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/cxxabi_tweaks.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/gthr-default.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/gthr-posix.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/gthr-single.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/gthr-tpf.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/gthr.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/messages_members.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/os_defines.h
+./usr/include/g++/arm-unknown-openbsd6.0/bits/time_members.h
./usr/include/g++/backward
./usr/include/g++/backward/algo.h
./usr/include/g++/backward/algobase.h
@@ -648,10 +648,10 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/cc1
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/cc1obj
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/cc1plus
-./usr/lib/gcc-lib/arm-unknown-openbsd5.9/4.2.1/libgcov.a
+./usr/lib/gcc-lib/arm-unknown-openbsd6.0/4.2.1/cc1
+./usr/lib/gcc-lib/arm-unknown-openbsd6.0/4.2.1/cc1obj
+./usr/lib/gcc-lib/arm-unknown-openbsd6.0/4.2.1/cc1plus
+./usr/lib/gcc-lib/arm-unknown-openbsd6.0/4.2.1/libgcov.a
./usr/lib/libarm.a
./usr/lib/libarm_p.a
./usr/lib/libstdc++_p.a