sync

15 files changed, 356 insertions, 354 deletions

diff --git a/distrib/sets/lists/comp/gcc.alpha b/distrib/sets/lists/comp/gcc.alpha
index d07eb98ebce..0fbfdabfa8f 100644
--- a/distrib/sets/lists/comp/gcc.alpha
+++ b/distrib/sets/lists/comp/gcc.alpha
@@ -3,29 +3,29 @@
 ./usr/bin/gcov
 ./usr/include/g++
 ./usr/include/g++/algorithm
-./usr/include/g++/alpha-unknown-openbsd6.1
-./usr/include/g++/alpha-unknown-openbsd6.1/bits
-./usr/include/g++/alpha-unknown-openbsd6.1/bits/atomic_word.h
-./usr/include/g++/alpha-unknown-openbsd6.1/bits/basic_file.h
-./usr/include/g++/alpha-unknown-openbsd6.1/bits/c++allocator.h
-./usr/include/g++/alpha-unknown-openbsd6.1/bits/c++config.h
-./usr/include/g++/alpha-unknown-openbsd6.1/bits/c++io.h
-./usr/include/g++/alpha-unknown-openbsd6.1/bits/c++locale.h
-./usr/include/g++/alpha-unknown-openbsd6.1/bits/c++locale_internal.h
-./usr/include/g++/alpha-unknown-openbsd6.1/bits/compatibility.h
-./usr/include/g++/alpha-unknown-openbsd6.1/bits/cpu_defines.h
-./usr/include/g++/alpha-unknown-openbsd6.1/bits/ctype_base.h
-./usr/include/g++/alpha-unknown-openbsd6.1/bits/ctype_inline.h
-./usr/include/g++/alpha-unknown-openbsd6.1/bits/ctype_noninline.h
-./usr/include/g++/alpha-unknown-openbsd6.1/bits/cxxabi_tweaks.h
-./usr/include/g++/alpha-unknown-openbsd6.1/bits/gthr-default.h
-./usr/include/g++/alpha-unknown-openbsd6.1/bits/gthr-posix.h
-./usr/include/g++/alpha-unknown-openbsd6.1/bits/gthr-single.h
-./usr/include/g++/alpha-unknown-openbsd6.1/bits/gthr-tpf.h
-./usr/include/g++/alpha-unknown-openbsd6.1/bits/gthr.h
-./usr/include/g++/alpha-unknown-openbsd6.1/bits/messages_members.h
-./usr/include/g++/alpha-unknown-openbsd6.1/bits/os_defines.h
-./usr/include/g++/alpha-unknown-openbsd6.1/bits/time_members.h
+./usr/include/g++/alpha-unknown-openbsd6.2
+./usr/include/g++/alpha-unknown-openbsd6.2/bits
+./usr/include/g++/alpha-unknown-openbsd6.2/bits/atomic_word.h
+./usr/include/g++/alpha-unknown-openbsd6.2/bits/basic_file.h
+./usr/include/g++/alpha-unknown-openbsd6.2/bits/c++allocator.h
+./usr/include/g++/alpha-unknown-openbsd6.2/bits/c++config.h
+./usr/include/g++/alpha-unknown-openbsd6.2/bits/c++io.h
+./usr/include/g++/alpha-unknown-openbsd6.2/bits/c++locale.h
+./usr/include/g++/alpha-unknown-openbsd6.2/bits/c++locale_internal.h
+./usr/include/g++/alpha-unknown-openbsd6.2/bits/compatibility.h
+./usr/include/g++/alpha-unknown-openbsd6.2/bits/cpu_defines.h
+./usr/include/g++/alpha-unknown-openbsd6.2/bits/ctype_base.h
+./usr/include/g++/alpha-unknown-openbsd6.2/bits/ctype_inline.h
+./usr/include/g++/alpha-unknown-openbsd6.2/bits/ctype_noninline.h
+./usr/include/g++/alpha-unknown-openbsd6.2/bits/cxxabi_tweaks.h
+./usr/include/g++/alpha-unknown-openbsd6.2/bits/gthr-default.h
+./usr/include/g++/alpha-unknown-openbsd6.2/bits/gthr-posix.h
+./usr/include/g++/alpha-unknown-openbsd6.2/bits/gthr-single.h
+./usr/include/g++/alpha-unknown-openbsd6.2/bits/gthr-tpf.h
+./usr/include/g++/alpha-unknown-openbsd6.2/bits/gthr.h
+./usr/include/g++/alpha-unknown-openbsd6.2/bits/messages_members.h
+./usr/include/g++/alpha-unknown-openbsd6.2/bits/os_defines.h
+./usr/include/g++/alpha-unknown-openbsd6.2/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -603,10 +603,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.1/4.2.1/cc1
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.1/4.2.1/cc1obj
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.1/4.2.1/cc1plus
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.1/4.2.1/libgcov.a
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.2/4.2.1/cc1
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.2/4.2.1/cc1obj
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.2/4.2.1/cc1plus
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.2/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
diff --git a/distrib/sets/lists/comp/gcc.amd64 b/distrib/sets/lists/comp/gcc.amd64
index 37cda7fa72f..6e4375a985a 100644
--- a/distrib/sets/lists/comp/gcc.amd64
+++ b/distrib/sets/lists/comp/gcc.amd64
@@ -3,29 +3,29 @@
 ./usr/bin/gcov
 ./usr/include/g++
 ./usr/include/g++/algorithm
-./usr/include/g++/amd64-unknown-openbsd6.1
-./usr/include/g++/amd64-unknown-openbsd6.1/bits
-./usr/include/g++/amd64-unknown-openbsd6.1/bits/atomic_word.h
-./usr/include/g++/amd64-unknown-openbsd6.1/bits/basic_file.h
-./usr/include/g++/amd64-unknown-openbsd6.1/bits/c++allocator.h
-./usr/include/g++/amd64-unknown-openbsd6.1/bits/c++config.h
-./usr/include/g++/amd64-unknown-openbsd6.1/bits/c++io.h
-./usr/include/g++/amd64-unknown-openbsd6.1/bits/c++locale.h
-./usr/include/g++/amd64-unknown-openbsd6.1/bits/c++locale_internal.h
-./usr/include/g++/amd64-unknown-openbsd6.1/bits/compatibility.h
-./usr/include/g++/amd64-unknown-openbsd6.1/bits/cpu_defines.h
-./usr/include/g++/amd64-unknown-openbsd6.1/bits/ctype_base.h
-./usr/include/g++/amd64-unknown-openbsd6.1/bits/ctype_inline.h
-./usr/include/g++/amd64-unknown-openbsd6.1/bits/ctype_noninline.h
-./usr/include/g++/amd64-unknown-openbsd6.1/bits/cxxabi_tweaks.h
-./usr/include/g++/amd64-unknown-openbsd6.1/bits/gthr-default.h
-./usr/include/g++/amd64-unknown-openbsd6.1/bits/gthr-posix.h
-./usr/include/g++/amd64-unknown-openbsd6.1/bits/gthr-single.h
-./usr/include/g++/amd64-unknown-openbsd6.1/bits/gthr-tpf.h
-./usr/include/g++/amd64-unknown-openbsd6.1/bits/gthr.h
-./usr/include/g++/amd64-unknown-openbsd6.1/bits/messages_members.h
-./usr/include/g++/amd64-unknown-openbsd6.1/bits/os_defines.h
-./usr/include/g++/amd64-unknown-openbsd6.1/bits/time_members.h
+./usr/include/g++/amd64-unknown-openbsd6.2
+./usr/include/g++/amd64-unknown-openbsd6.2/bits
+./usr/include/g++/amd64-unknown-openbsd6.2/bits/atomic_word.h
+./usr/include/g++/amd64-unknown-openbsd6.2/bits/basic_file.h
+./usr/include/g++/amd64-unknown-openbsd6.2/bits/c++allocator.h
+./usr/include/g++/amd64-unknown-openbsd6.2/bits/c++config.h
+./usr/include/g++/amd64-unknown-openbsd6.2/bits/c++io.h
+./usr/include/g++/amd64-unknown-openbsd6.2/bits/c++locale.h
+./usr/include/g++/amd64-unknown-openbsd6.2/bits/c++locale_internal.h
+./usr/include/g++/amd64-unknown-openbsd6.2/bits/compatibility.h
+./usr/include/g++/amd64-unknown-openbsd6.2/bits/cpu_defines.h
+./usr/include/g++/amd64-unknown-openbsd6.2/bits/ctype_base.h
+./usr/include/g++/amd64-unknown-openbsd6.2/bits/ctype_inline.h
+./usr/include/g++/amd64-unknown-openbsd6.2/bits/ctype_noninline.h
+./usr/include/g++/amd64-unknown-openbsd6.2/bits/cxxabi_tweaks.h
+./usr/include/g++/amd64-unknown-openbsd6.2/bits/gthr-default.h
+./usr/include/g++/amd64-unknown-openbsd6.2/bits/gthr-posix.h
+./usr/include/g++/amd64-unknown-openbsd6.2/bits/gthr-single.h
+./usr/include/g++/amd64-unknown-openbsd6.2/bits/gthr-tpf.h
+./usr/include/g++/amd64-unknown-openbsd6.2/bits/gthr.h
+./usr/include/g++/amd64-unknown-openbsd6.2/bits/messages_members.h
+./usr/include/g++/amd64-unknown-openbsd6.2/bits/os_defines.h
+./usr/include/g++/amd64-unknown-openbsd6.2/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -603,10 +603,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.1/4.2.1/cc1
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.1/4.2.1/cc1obj
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.1/4.2.1/cc1plus
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.1/4.2.1/libgcov.a
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.2/4.2.1/cc1
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.2/4.2.1/cc1obj
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.2/4.2.1/cc1plus
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.2/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
diff --git a/distrib/sets/lists/comp/gcc.armv7 b/distrib/sets/lists/comp/gcc.armv7
index d05b4b3f730..1eeeeb61ee6 100644
--- a/distrib/sets/lists/comp/gcc.armv7
+++ b/distrib/sets/lists/comp/gcc.armv7
@@ -3,29 +3,29 @@
 ./usr/bin/gcov
 ./usr/include/g++
 ./usr/include/g++/algorithm
-./usr/include/g++/arm-unknown-openbsd6.1
-./usr/include/g++/arm-unknown-openbsd6.1/bits
-./usr/include/g++/arm-unknown-openbsd6.1/bits/atomic_word.h
-./usr/include/g++/arm-unknown-openbsd6.1/bits/basic_file.h
-./usr/include/g++/arm-unknown-openbsd6.1/bits/c++allocator.h
-./usr/include/g++/arm-unknown-openbsd6.1/bits/c++config.h
-./usr/include/g++/arm-unknown-openbsd6.1/bits/c++io.h
-./usr/include/g++/arm-unknown-openbsd6.1/bits/c++locale.h
-./usr/include/g++/arm-unknown-openbsd6.1/bits/c++locale_internal.h
-./usr/include/g++/arm-unknown-openbsd6.1/bits/compatibility.h
-./usr/include/g++/arm-unknown-openbsd6.1/bits/cpu_defines.h
-./usr/include/g++/arm-unknown-openbsd6.1/bits/ctype_base.h
-./usr/include/g++/arm-unknown-openbsd6.1/bits/ctype_inline.h
-./usr/include/g++/arm-unknown-openbsd6.1/bits/ctype_noninline.h
-./usr/include/g++/arm-unknown-openbsd6.1/bits/cxxabi_tweaks.h
-./usr/include/g++/arm-unknown-openbsd6.1/bits/gthr-default.h
-./usr/include/g++/arm-unknown-openbsd6.1/bits/gthr-posix.h
-./usr/include/g++/arm-unknown-openbsd6.1/bits/gthr-single.h
-./usr/include/g++/arm-unknown-openbsd6.1/bits/gthr-tpf.h
-./usr/include/g++/arm-unknown-openbsd6.1/bits/gthr.h
-./usr/include/g++/arm-unknown-openbsd6.1/bits/messages_members.h
-./usr/include/g++/arm-unknown-openbsd6.1/bits/os_defines.h
-./usr/include/g++/arm-unknown-openbsd6.1/bits/time_members.h
+./usr/include/g++/arm-unknown-openbsd6.2
+./usr/include/g++/arm-unknown-openbsd6.2/bits
+./usr/include/g++/arm-unknown-openbsd6.2/bits/atomic_word.h
+./usr/include/g++/arm-unknown-openbsd6.2/bits/basic_file.h
+./usr/include/g++/arm-unknown-openbsd6.2/bits/c++allocator.h
+./usr/include/g++/arm-unknown-openbsd6.2/bits/c++config.h
+./usr/include/g++/arm-unknown-openbsd6.2/bits/c++io.h
+./usr/include/g++/arm-unknown-openbsd6.2/bits/c++locale.h
+./usr/include/g++/arm-unknown-openbsd6.2/bits/c++locale_internal.h
+./usr/include/g++/arm-unknown-openbsd6.2/bits/compatibility.h
+./usr/include/g++/arm-unknown-openbsd6.2/bits/cpu_defines.h
+./usr/include/g++/arm-unknown-openbsd6.2/bits/ctype_base.h
+./usr/include/g++/arm-unknown-openbsd6.2/bits/ctype_inline.h
+./usr/include/g++/arm-unknown-openbsd6.2/bits/ctype_noninline.h
+./usr/include/g++/arm-unknown-openbsd6.2/bits/cxxabi_tweaks.h
+./usr/include/g++/arm-unknown-openbsd6.2/bits/gthr-default.h
+./usr/include/g++/arm-unknown-openbsd6.2/bits/gthr-posix.h
+./usr/include/g++/arm-unknown-openbsd6.2/bits/gthr-single.h
+./usr/include/g++/arm-unknown-openbsd6.2/bits/gthr-tpf.h
+./usr/include/g++/arm-unknown-openbsd6.2/bits/gthr.h
+./usr/include/g++/arm-unknown-openbsd6.2/bits/messages_members.h
+./usr/include/g++/arm-unknown-openbsd6.2/bits/os_defines.h
+./usr/include/g++/arm-unknown-openbsd6.2/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -603,10 +603,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/arm-unknown-openbsd6.1/4.2.1/cc1
-./usr/lib/gcc-lib/arm-unknown-openbsd6.1/4.2.1/cc1obj
-./usr/lib/gcc-lib/arm-unknown-openbsd6.1/4.2.1/cc1plus
-./usr/lib/gcc-lib/arm-unknown-openbsd6.1/4.2.1/libgcov.a
+./usr/lib/gcc-lib/arm-unknown-openbsd6.2/4.2.1/cc1
+./usr/lib/gcc-lib/arm-unknown-openbsd6.2/4.2.1/cc1obj
+./usr/lib/gcc-lib/arm-unknown-openbsd6.2/4.2.1/cc1plus
+./usr/lib/gcc-lib/arm-unknown-openbsd6.2/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
diff --git a/distrib/sets/lists/comp/gcc.hppa b/distrib/sets/lists/comp/gcc.hppa
index d0a5fe248a6..81c1657eea7 100644
--- a/distrib/sets/lists/comp/gcc.hppa
+++ b/distrib/sets/lists/comp/gcc.hppa
@@ -484,29 +484,29 @@
 ./usr/include/g++/ext/vstring_util.h
 ./usr/include/g++/fstream
 ./usr/include/g++/functional
-./usr/include/g++/hppa-unknown-openbsd6.1
-./usr/include/g++/hppa-unknown-openbsd6.1/bits
-./usr/include/g++/hppa-unknown-openbsd6.1/bits/atomic_word.h
-./usr/include/g++/hppa-unknown-openbsd6.1/bits/basic_file.h
-./usr/include/g++/hppa-unknown-openbsd6.1/bits/c++allocator.h
-./usr/include/g++/hppa-unknown-openbsd6.1/bits/c++config.h
-./usr/include/g++/hppa-unknown-openbsd6.1/bits/c++io.h
-./usr/include/g++/hppa-unknown-openbsd6.1/bits/c++locale.h
-./usr/include/g++/hppa-unknown-openbsd6.1/bits/c++locale_internal.h
-./usr/include/g++/hppa-unknown-openbsd6.1/bits/compatibility.h
-./usr/include/g++/hppa-unknown-openbsd6.1/bits/cpu_defines.h
-./usr/include/g++/hppa-unknown-openbsd6.1/bits/ctype_base.h
-./usr/include/g++/hppa-unknown-openbsd6.1/bits/ctype_inline.h
-./usr/include/g++/hppa-unknown-openbsd6.1/bits/ctype_noninline.h
-./usr/include/g++/hppa-unknown-openbsd6.1/bits/cxxabi_tweaks.h
-./usr/include/g++/hppa-unknown-openbsd6.1/bits/gthr-default.h
-./usr/include/g++/hppa-unknown-openbsd6.1/bits/gthr-posix.h
-./usr/include/g++/hppa-unknown-openbsd6.1/bits/gthr-single.h
-./usr/include/g++/hppa-unknown-openbsd6.1/bits/gthr-tpf.h
-./usr/include/g++/hppa-unknown-openbsd6.1/bits/gthr.h
-./usr/include/g++/hppa-unknown-openbsd6.1/bits/messages_members.h
-./usr/include/g++/hppa-unknown-openbsd6.1/bits/os_defines.h
-./usr/include/g++/hppa-unknown-openbsd6.1/bits/time_members.h
+./usr/include/g++/hppa-unknown-openbsd6.2
+./usr/include/g++/hppa-unknown-openbsd6.2/bits
+./usr/include/g++/hppa-unknown-openbsd6.2/bits/atomic_word.h
+./usr/include/g++/hppa-unknown-openbsd6.2/bits/basic_file.h
+./usr/include/g++/hppa-unknown-openbsd6.2/bits/c++allocator.h
+./usr/include/g++/hppa-unknown-openbsd6.2/bits/c++config.h
+./usr/include/g++/hppa-unknown-openbsd6.2/bits/c++io.h
+./usr/include/g++/hppa-unknown-openbsd6.2/bits/c++locale.h
+./usr/include/g++/hppa-unknown-openbsd6.2/bits/c++locale_internal.h
+./usr/include/g++/hppa-unknown-openbsd6.2/bits/compatibility.h
+./usr/include/g++/hppa-unknown-openbsd6.2/bits/cpu_defines.h
+./usr/include/g++/hppa-unknown-openbsd6.2/bits/ctype_base.h
+./usr/include/g++/hppa-unknown-openbsd6.2/bits/ctype_inline.h
+./usr/include/g++/hppa-unknown-openbsd6.2/bits/ctype_noninline.h
+./usr/include/g++/hppa-unknown-openbsd6.2/bits/cxxabi_tweaks.h
+./usr/include/g++/hppa-unknown-openbsd6.2/bits/gthr-default.h
+./usr/include/g++/hppa-unknown-openbsd6.2/bits/gthr-posix.h
+./usr/include/g++/hppa-unknown-openbsd6.2/bits/gthr-single.h
+./usr/include/g++/hppa-unknown-openbsd6.2/bits/gthr-tpf.h
+./usr/include/g++/hppa-unknown-openbsd6.2/bits/gthr.h
+./usr/include/g++/hppa-unknown-openbsd6.2/bits/messages_members.h
+./usr/include/g++/hppa-unknown-openbsd6.2/bits/os_defines.h
+./usr/include/g++/hppa-unknown-openbsd6.2/bits/time_members.h
 ./usr/include/g++/iomanip
 ./usr/include/g++/ios
 ./usr/include/g++/iosfwd
@@ -603,10 +603,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.1/4.2.1/cc1
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.1/4.2.1/cc1obj
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.1/4.2.1/cc1plus
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.1/4.2.1/libgcov.a
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.2/4.2.1/cc1
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.2/4.2.1/cc1obj
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.2/4.2.1/cc1plus
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.2/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
diff --git a/distrib/sets/lists/comp/gcc.i386 b/distrib/sets/lists/comp/gcc.i386
index fb020a9e699..6775d95a38d 100644
--- a/distrib/sets/lists/comp/gcc.i386
+++ b/distrib/sets/lists/comp/gcc.i386
@@ -484,29 +484,29 @@
 ./usr/include/g++/ext/vstring_util.h
 ./usr/include/g++/fstream
 ./usr/include/g++/functional
-./usr/include/g++/i386-unknown-openbsd6.1
-./usr/include/g++/i386-unknown-openbsd6.1/bits
-./usr/include/g++/i386-unknown-openbsd6.1/bits/atomic_word.h
-./usr/include/g++/i386-unknown-openbsd6.1/bits/basic_file.h
-./usr/include/g++/i386-unknown-openbsd6.1/bits/c++allocator.h
-./usr/include/g++/i386-unknown-openbsd6.1/bits/c++config.h
-./usr/include/g++/i386-unknown-openbsd6.1/bits/c++io.h
-./usr/include/g++/i386-unknown-openbsd6.1/bits/c++locale.h
-./usr/include/g++/i386-unknown-openbsd6.1/bits/c++locale_internal.h
-./usr/include/g++/i386-unknown-openbsd6.1/bits/compatibility.h
-./usr/include/g++/i386-unknown-openbsd6.1/bits/cpu_defines.h
-./usr/include/g++/i386-unknown-openbsd6.1/bits/ctype_base.h
-./usr/include/g++/i386-unknown-openbsd6.1/bits/ctype_inline.h
-./usr/include/g++/i386-unknown-openbsd6.1/bits/ctype_noninline.h
-./usr/include/g++/i386-unknown-openbsd6.1/bits/cxxabi_tweaks.h
-./usr/include/g++/i386-unknown-openbsd6.1/bits/gthr-default.h
-./usr/include/g++/i386-unknown-openbsd6.1/bits/gthr-posix.h
-./usr/include/g++/i386-unknown-openbsd6.1/bits/gthr-single.h
-./usr/include/g++/i386-unknown-openbsd6.1/bits/gthr-tpf.h
-./usr/include/g++/i386-unknown-openbsd6.1/bits/gthr.h
-./usr/include/g++/i386-unknown-openbsd6.1/bits/messages_members.h
-./usr/include/g++/i386-unknown-openbsd6.1/bits/os_defines.h
-./usr/include/g++/i386-unknown-openbsd6.1/bits/time_members.h
+./usr/include/g++/i386-unknown-openbsd6.2
+./usr/include/g++/i386-unknown-openbsd6.2/bits
+./usr/include/g++/i386-unknown-openbsd6.2/bits/atomic_word.h
+./usr/include/g++/i386-unknown-openbsd6.2/bits/basic_file.h
+./usr/include/g++/i386-unknown-openbsd6.2/bits/c++allocator.h
+./usr/include/g++/i386-unknown-openbsd6.2/bits/c++config.h
+./usr/include/g++/i386-unknown-openbsd6.2/bits/c++io.h
+./usr/include/g++/i386-unknown-openbsd6.2/bits/c++locale.h
+./usr/include/g++/i386-unknown-openbsd6.2/bits/c++locale_internal.h
+./usr/include/g++/i386-unknown-openbsd6.2/bits/compatibility.h
+./usr/include/g++/i386-unknown-openbsd6.2/bits/cpu_defines.h
+./usr/include/g++/i386-unknown-openbsd6.2/bits/ctype_base.h
+./usr/include/g++/i386-unknown-openbsd6.2/bits/ctype_inline.h
+./usr/include/g++/i386-unknown-openbsd6.2/bits/ctype_noninline.h
+./usr/include/g++/i386-unknown-openbsd6.2/bits/cxxabi_tweaks.h
+./usr/include/g++/i386-unknown-openbsd6.2/bits/gthr-default.h
+./usr/include/g++/i386-unknown-openbsd6.2/bits/gthr-posix.h
+./usr/include/g++/i386-unknown-openbsd6.2/bits/gthr-single.h
+./usr/include/g++/i386-unknown-openbsd6.2/bits/gthr-tpf.h
+./usr/include/g++/i386-unknown-openbsd6.2/bits/gthr.h
+./usr/include/g++/i386-unknown-openbsd6.2/bits/messages_members.h
+./usr/include/g++/i386-unknown-openbsd6.2/bits/os_defines.h
+./usr/include/g++/i386-unknown-openbsd6.2/bits/time_members.h
 ./usr/include/g++/iomanip
 ./usr/include/g++/ios
 ./usr/include/g++/iosfwd
@@ -603,10 +603,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/i386-unknown-openbsd6.1/4.2.1/cc1
-./usr/lib/gcc-lib/i386-unknown-openbsd6.1/4.2.1/cc1obj
-./usr/lib/gcc-lib/i386-unknown-openbsd6.1/4.2.1/cc1plus
-./usr/lib/gcc-lib/i386-unknown-openbsd6.1/4.2.1/libgcov.a
+./usr/lib/gcc-lib/i386-unknown-openbsd6.2/4.2.1/cc1
+./usr/lib/gcc-lib/i386-unknown-openbsd6.2/4.2.1/cc1obj
+./usr/lib/gcc-lib/i386-unknown-openbsd6.2/4.2.1/cc1plus
+./usr/lib/gcc-lib/i386-unknown-openbsd6.2/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
diff --git a/distrib/sets/lists/comp/gcc.landisk b/distrib/sets/lists/comp/gcc.landisk
index 5a0496b3d03..df0b82c37d6 100644
--- a/distrib/sets/lists/comp/gcc.landisk
+++ b/distrib/sets/lists/comp/gcc.landisk
@@ -500,29 +500,29 @@
 ./usr/include/g++/ostream
 ./usr/include/g++/queue
 ./usr/include/g++/set
-./usr/include/g++/sh-unknown-openbsd6.1
-./usr/include/g++/sh-unknown-openbsd6.1/bits
-./usr/include/g++/sh-unknown-openbsd6.1/bits/atomic_word.h
-./usr/include/g++/sh-unknown-openbsd6.1/bits/basic_file.h
-./usr/include/g++/sh-unknown-openbsd6.1/bits/c++allocator.h
-./usr/include/g++/sh-unknown-openbsd6.1/bits/c++config.h
-./usr/include/g++/sh-unknown-openbsd6.1/bits/c++io.h
-./usr/include/g++/sh-unknown-openbsd6.1/bits/c++locale.h
-./usr/include/g++/sh-unknown-openbsd6.1/bits/c++locale_internal.h
-./usr/include/g++/sh-unknown-openbsd6.1/bits/compatibility.h
-./usr/include/g++/sh-unknown-openbsd6.1/bits/cpu_defines.h
-./usr/include/g++/sh-unknown-openbsd6.1/bits/ctype_base.h
-./usr/include/g++/sh-unknown-openbsd6.1/bits/ctype_inline.h
-./usr/include/g++/sh-unknown-openbsd6.1/bits/ctype_noninline.h
-./usr/include/g++/sh-unknown-openbsd6.1/bits/cxxabi_tweaks.h
-./usr/include/g++/sh-unknown-openbsd6.1/bits/gthr-default.h
-./usr/include/g++/sh-unknown-openbsd6.1/bits/gthr-posix.h
-./usr/include/g++/sh-unknown-openbsd6.1/bits/gthr-single.h
-./usr/include/g++/sh-unknown-openbsd6.1/bits/gthr-tpf.h
-./usr/include/g++/sh-unknown-openbsd6.1/bits/gthr.h
-./usr/include/g++/sh-unknown-openbsd6.1/bits/messages_members.h
-./usr/include/g++/sh-unknown-openbsd6.1/bits/os_defines.h
-./usr/include/g++/sh-unknown-openbsd6.1/bits/time_members.h
+./usr/include/g++/sh-unknown-openbsd6.2
+./usr/include/g++/sh-unknown-openbsd6.2/bits
+./usr/include/g++/sh-unknown-openbsd6.2/bits/atomic_word.h
+./usr/include/g++/sh-unknown-openbsd6.2/bits/basic_file.h
+./usr/include/g++/sh-unknown-openbsd6.2/bits/c++allocator.h
+./usr/include/g++/sh-unknown-openbsd6.2/bits/c++config.h
+./usr/include/g++/sh-unknown-openbsd6.2/bits/c++io.h
+./usr/include/g++/sh-unknown-openbsd6.2/bits/c++locale.h
+./usr/include/g++/sh-unknown-openbsd6.2/bits/c++locale_internal.h
+./usr/include/g++/sh-unknown-openbsd6.2/bits/compatibility.h
+./usr/include/g++/sh-unknown-openbsd6.2/bits/cpu_defines.h
+./usr/include/g++/sh-unknown-openbsd6.2/bits/ctype_base.h
+./usr/include/g++/sh-unknown-openbsd6.2/bits/ctype_inline.h
+./usr/include/g++/sh-unknown-openbsd6.2/bits/ctype_noninline.h
+./usr/include/g++/sh-unknown-openbsd6.2/bits/cxxabi_tweaks.h
+./usr/include/g++/sh-unknown-openbsd6.2/bits/gthr-default.h
+./usr/include/g++/sh-unknown-openbsd6.2/bits/gthr-posix.h
+./usr/include/g++/sh-unknown-openbsd6.2/bits/gthr-single.h
+./usr/include/g++/sh-unknown-openbsd6.2/bits/gthr-tpf.h
+./usr/include/g++/sh-unknown-openbsd6.2/bits/gthr.h
+./usr/include/g++/sh-unknown-openbsd6.2/bits/messages_members.h
+./usr/include/g++/sh-unknown-openbsd6.2/bits/os_defines.h
+./usr/include/g++/sh-unknown-openbsd6.2/bits/time_members.h
 ./usr/include/g++/sstream
 ./usr/include/g++/stack
 ./usr/include/g++/stdexcept
@@ -603,10 +603,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/sh-unknown-openbsd6.1/4.2.1/cc1
-./usr/lib/gcc-lib/sh-unknown-openbsd6.1/4.2.1/cc1obj
-./usr/lib/gcc-lib/sh-unknown-openbsd6.1/4.2.1/cc1plus
-./usr/lib/gcc-lib/sh-unknown-openbsd6.1/4.2.1/libgcov.a
+./usr/lib/gcc-lib/sh-unknown-openbsd6.2/4.2.1/cc1
+./usr/lib/gcc-lib/sh-unknown-openbsd6.2/4.2.1/cc1obj
+./usr/lib/gcc-lib/sh-unknown-openbsd6.2/4.2.1/cc1plus
+./usr/lib/gcc-lib/sh-unknown-openbsd6.2/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
diff --git a/distrib/sets/lists/comp/gcc.loongson b/distrib/sets/lists/comp/gcc.loongson
index 54ebcd8fe07..c275b81628f 100644
--- a/distrib/sets/lists/comp/gcc.loongson
+++ b/distrib/sets/lists/comp/gcc.loongson
@@ -495,29 +495,29 @@
 ./usr/include/g++/locale
 ./usr/include/g++/map
 ./usr/include/g++/memory
-./usr/include/g++/mips64el-unknown-openbsd6.1
-./usr/include/g++/mips64el-unknown-openbsd6.1/bits
-./usr/include/g++/mips64el-unknown-openbsd6.1/bits/atomic_word.h
-./usr/include/g++/mips64el-unknown-openbsd6.1/bits/basic_file.h
-./usr/include/g++/mips64el-unknown-openbsd6.1/bits/c++allocator.h
-./usr/include/g++/mips64el-unknown-openbsd6.1/bits/c++config.h
-./usr/include/g++/mips64el-unknown-openbsd6.1/bits/c++io.h
-./usr/include/g++/mips64el-unknown-openbsd6.1/bits/c++locale.h
-./usr/include/g++/mips64el-unknown-openbsd6.1/bits/c++locale_internal.h
-./usr/include/g++/mips64el-unknown-openbsd6.1/bits/compatibility.h
-./usr/include/g++/mips64el-unknown-openbsd6.1/bits/cpu_defines.h
-./usr/include/g++/mips64el-unknown-openbsd6.1/bits/ctype_base.h
-./usr/include/g++/mips64el-unknown-openbsd6.1/bits/ctype_inline.h
-./usr/include/g++/mips64el-unknown-openbsd6.1/bits/ctype_noninline.h
-./usr/include/g++/mips64el-unknown-openbsd6.1/bits/cxxabi_tweaks.h
-./usr/include/g++/mips64el-unknown-openbsd6.1/bits/gthr-default.h
-./usr/include/g++/mips64el-unknown-openbsd6.1/bits/gthr-posix.h
-./usr/include/g++/mips64el-unknown-openbsd6.1/bits/gthr-single.h
-./usr/include/g++/mips64el-unknown-openbsd6.1/bits/gthr-tpf.h
-./usr/include/g++/mips64el-unknown-openbsd6.1/bits/gthr.h
-./usr/include/g++/mips64el-unknown-openbsd6.1/bits/messages_members.h
-./usr/include/g++/mips64el-unknown-openbsd6.1/bits/os_defines.h
-./usr/include/g++/mips64el-unknown-openbsd6.1/bits/time_members.h
+./usr/include/g++/mips64el-unknown-openbsd6.2
+./usr/include/g++/mips64el-unknown-openbsd6.2/bits
+./usr/include/g++/mips64el-unknown-openbsd6.2/bits/atomic_word.h
+./usr/include/g++/mips64el-unknown-openbsd6.2/bits/basic_file.h
+./usr/include/g++/mips64el-unknown-openbsd6.2/bits/c++allocator.h
+./usr/include/g++/mips64el-unknown-openbsd6.2/bits/c++config.h
+./usr/include/g++/mips64el-unknown-openbsd6.2/bits/c++io.h
+./usr/include/g++/mips64el-unknown-openbsd6.2/bits/c++locale.h
+./usr/include/g++/mips64el-unknown-openbsd6.2/bits/c++locale_internal.h
+./usr/include/g++/mips64el-unknown-openbsd6.2/bits/compatibility.h
+./usr/include/g++/mips64el-unknown-openbsd6.2/bits/cpu_defines.h
+./usr/include/g++/mips64el-unknown-openbsd6.2/bits/ctype_base.h
+./usr/include/g++/mips64el-unknown-openbsd6.2/bits/ctype_inline.h
+./usr/include/g++/mips64el-unknown-openbsd6.2/bits/ctype_noninline.h
+./usr/include/g++/mips64el-unknown-openbsd6.2/bits/cxxabi_tweaks.h
+./usr/include/g++/mips64el-unknown-openbsd6.2/bits/gthr-default.h
+./usr/include/g++/mips64el-unknown-openbsd6.2/bits/gthr-posix.h
+./usr/include/g++/mips64el-unknown-openbsd6.2/bits/gthr-single.h
+./usr/include/g++/mips64el-unknown-openbsd6.2/bits/gthr-tpf.h
+./usr/include/g++/mips64el-unknown-openbsd6.2/bits/gthr.h
+./usr/include/g++/mips64el-unknown-openbsd6.2/bits/messages_members.h
+./usr/include/g++/mips64el-unknown-openbsd6.2/bits/os_defines.h
+./usr/include/g++/mips64el-unknown-openbsd6.2/bits/time_members.h
 ./usr/include/g++/new
 ./usr/include/g++/numeric
 ./usr/include/g++/ostream
@@ -603,10 +603,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.1/4.2.1/cc1
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.1/4.2.1/cc1obj
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.1/4.2.1/cc1plus
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.1/4.2.1/libgcov.a
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.2/4.2.1/cc1
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.2/4.2.1/cc1obj
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.2/4.2.1/cc1plus
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.2/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
diff --git a/distrib/sets/lists/comp/gcc.luna88k b/distrib/sets/lists/comp/gcc.luna88k
index 3921f4c00a8..b30dc50f7a2 100644
--- a/distrib/sets/lists/comp/gcc.luna88k
+++ b/distrib/sets/lists/comp/gcc.luna88k
@@ -160,24 +160,24 @@
 ./usr/include/g++/limits
 ./usr/include/g++/list
 ./usr/include/g++/locale
-./usr/include/g++/m88k-unknown-openbsd6.1
-./usr/include/g++/m88k-unknown-openbsd6.1/bits
-./usr/include/g++/m88k-unknown-openbsd6.1/bits/atomicity.h
-./usr/include/g++/m88k-unknown-openbsd6.1/bits/basic_file.h
-./usr/include/g++/m88k-unknown-openbsd6.1/bits/c++config.h
-./usr/include/g++/m88k-unknown-openbsd6.1/bits/c++io.h
-./usr/include/g++/m88k-unknown-openbsd6.1/bits/c++locale.h
-./usr/include/g++/m88k-unknown-openbsd6.1/bits/codecvt_specializations.h
-./usr/include/g++/m88k-unknown-openbsd6.1/bits/ctype_base.h
-./usr/include/g++/m88k-unknown-openbsd6.1/bits/ctype_inline.h
-./usr/include/g++/m88k-unknown-openbsd6.1/bits/ctype_noninline.h
-./usr/include/g++/m88k-unknown-openbsd6.1/bits/gthr-default.h
-./usr/include/g++/m88k-unknown-openbsd6.1/bits/gthr-posix.h
-./usr/include/g++/m88k-unknown-openbsd6.1/bits/gthr-single.h
-./usr/include/g++/m88k-unknown-openbsd6.1/bits/gthr.h
-./usr/include/g++/m88k-unknown-openbsd6.1/bits/messages_members.h
-./usr/include/g++/m88k-unknown-openbsd6.1/bits/os_defines.h
-./usr/include/g++/m88k-unknown-openbsd6.1/bits/time_members.h
+./usr/include/g++/m88k-unknown-openbsd6.2
+./usr/include/g++/m88k-unknown-openbsd6.2/bits
+./usr/include/g++/m88k-unknown-openbsd6.2/bits/atomicity.h
+./usr/include/g++/m88k-unknown-openbsd6.2/bits/basic_file.h
+./usr/include/g++/m88k-unknown-openbsd6.2/bits/c++config.h
+./usr/include/g++/m88k-unknown-openbsd6.2/bits/c++io.h
+./usr/include/g++/m88k-unknown-openbsd6.2/bits/c++locale.h
+./usr/include/g++/m88k-unknown-openbsd6.2/bits/codecvt_specializations.h
+./usr/include/g++/m88k-unknown-openbsd6.2/bits/ctype_base.h
+./usr/include/g++/m88k-unknown-openbsd6.2/bits/ctype_inline.h
+./usr/include/g++/m88k-unknown-openbsd6.2/bits/ctype_noninline.h
+./usr/include/g++/m88k-unknown-openbsd6.2/bits/gthr-default.h
+./usr/include/g++/m88k-unknown-openbsd6.2/bits/gthr-posix.h
+./usr/include/g++/m88k-unknown-openbsd6.2/bits/gthr-single.h
+./usr/include/g++/m88k-unknown-openbsd6.2/bits/gthr.h
+./usr/include/g++/m88k-unknown-openbsd6.2/bits/messages_members.h
+./usr/include/g++/m88k-unknown-openbsd6.2/bits/os_defines.h
+./usr/include/g++/m88k-unknown-openbsd6.2/bits/time_members.h
 ./usr/include/g++/map
 ./usr/include/g++/memory
 ./usr/include/g++/new
@@ -207,17 +207,17 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.1/3.3.6
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.1/3.3.6/SYSCALLS.c.X
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.1/3.3.6/cc1
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.1/3.3.6/cc1obj
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.1/3.3.6/cc1plus
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.1/3.3.6/collect2
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.1/3.3.6/fPIC
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.1/3.3.6/fpic
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.1/3.3.6/include
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.1/3.3.6/include/unwind.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.1/3.3.6/specs
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.2/3.3.6
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.2/3.3.6/SYSCALLS.c.X
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.2/3.3.6/cc1
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.2/3.3.6/cc1obj
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.2/3.3.6/cc1plus
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.2/3.3.6/collect2
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.2/3.3.6/fPIC
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.2/3.3.6/fpic
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.2/3.3.6/include
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.2/3.3.6/include/unwind.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.2/3.3.6/specs
 ./usr/lib/libstdc++.a
 ./usr/lib/libsupc++.a
 ./usr/share/info/cpp.info
diff --git a/distrib/sets/lists/comp/gcc.macppc b/distrib/sets/lists/comp/gcc.macppc
index b90becb5a15..b533dfcdbaa 100644
--- a/distrib/sets/lists/comp/gcc.macppc
+++ b/distrib/sets/lists/comp/gcc.macppc
@@ -498,29 +498,29 @@
 ./usr/include/g++/new
 ./usr/include/g++/numeric
 ./usr/include/g++/ostream
-./usr/include/g++/powerpc-unknown-openbsd6.1
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/atomic_word.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/basic_file.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/c++allocator.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/c++config.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/c++io.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/c++locale.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/c++locale_internal.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/compatibility.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/cpu_defines.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/ctype_base.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/ctype_inline.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/ctype_noninline.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/cxxabi_tweaks.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/gthr-default.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/gthr-posix.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/gthr-single.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/gthr-tpf.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/gthr.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/messages_members.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/os_defines.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/time_members.h
+./usr/include/g++/powerpc-unknown-openbsd6.2
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/atomic_word.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/basic_file.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/c++allocator.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/c++config.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/c++io.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/c++locale.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/c++locale_internal.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/compatibility.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/cpu_defines.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/ctype_base.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/ctype_inline.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/ctype_noninline.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/cxxabi_tweaks.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/gthr-default.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/gthr-posix.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/gthr-single.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/gthr-tpf.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/gthr.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/messages_members.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/os_defines.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/time_members.h
 ./usr/include/g++/queue
 ./usr/include/g++/set
 ./usr/include/g++/sstream
@@ -603,10 +603,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.1/4.2.1/cc1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.1/4.2.1/cc1obj
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.1/4.2.1/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.1/4.2.1/libgcov.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.2/4.2.1/cc1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.2/4.2.1/cc1obj
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.2/4.2.1/cc1plus
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.2/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
diff --git a/distrib/sets/lists/comp/gcc.octeon b/distrib/sets/lists/comp/gcc.octeon
index ea1182abf18..090daba77f5 100644
--- a/distrib/sets/lists/comp/gcc.octeon
+++ b/distrib/sets/lists/comp/gcc.octeon
@@ -495,29 +495,29 @@
 ./usr/include/g++/locale
 ./usr/include/g++/map
 ./usr/include/g++/memory
-./usr/include/g++/mips64-unknown-openbsd6.1
-./usr/include/g++/mips64-unknown-openbsd6.1/bits
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/atomic_word.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/basic_file.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/c++allocator.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/c++config.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/c++io.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/c++locale.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/c++locale_internal.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/compatibility.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/cpu_defines.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/ctype_base.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/ctype_inline.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/ctype_noninline.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/cxxabi_tweaks.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/gthr-default.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/gthr-posix.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/gthr-single.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/gthr-tpf.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/gthr.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/messages_members.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/os_defines.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/time_members.h
+./usr/include/g++/mips64-unknown-openbsd6.2
+./usr/include/g++/mips64-unknown-openbsd6.2/bits
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/atomic_word.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/basic_file.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/c++allocator.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/c++config.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/c++io.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/c++locale.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/c++locale_internal.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/compatibility.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/cpu_defines.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/ctype_base.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/ctype_inline.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/ctype_noninline.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/cxxabi_tweaks.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/gthr-default.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/gthr-posix.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/gthr-single.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/gthr-tpf.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/gthr.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/messages_members.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/os_defines.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/time_members.h
 ./usr/include/g++/new
 ./usr/include/g++/numeric
 ./usr/include/g++/ostream
@@ -603,10 +603,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.1/4.2.1/cc1
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.1/4.2.1/cc1obj
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.1/4.2.1/cc1plus
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.1/4.2.1/libgcov.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.2/4.2.1/cc1
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.2/4.2.1/cc1obj
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.2/4.2.1/cc1plus
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.2/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
diff --git a/distrib/sets/lists/comp/gcc.sgi b/distrib/sets/lists/comp/gcc.sgi
index ea1182abf18..090daba77f5 100644
--- a/distrib/sets/lists/comp/gcc.sgi
+++ b/distrib/sets/lists/comp/gcc.sgi
@@ -495,29 +495,29 @@
 ./usr/include/g++/locale
 ./usr/include/g++/map
 ./usr/include/g++/memory
-./usr/include/g++/mips64-unknown-openbsd6.1
-./usr/include/g++/mips64-unknown-openbsd6.1/bits
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/atomic_word.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/basic_file.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/c++allocator.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/c++config.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/c++io.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/c++locale.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/c++locale_internal.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/compatibility.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/cpu_defines.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/ctype_base.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/ctype_inline.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/ctype_noninline.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/cxxabi_tweaks.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/gthr-default.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/gthr-posix.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/gthr-single.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/gthr-tpf.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/gthr.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/messages_members.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/os_defines.h
-./usr/include/g++/mips64-unknown-openbsd6.1/bits/time_members.h
+./usr/include/g++/mips64-unknown-openbsd6.2
+./usr/include/g++/mips64-unknown-openbsd6.2/bits
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/atomic_word.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/basic_file.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/c++allocator.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/c++config.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/c++io.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/c++locale.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/c++locale_internal.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/compatibility.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/cpu_defines.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/ctype_base.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/ctype_inline.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/ctype_noninline.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/cxxabi_tweaks.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/gthr-default.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/gthr-posix.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/gthr-single.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/gthr-tpf.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/gthr.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/messages_members.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/os_defines.h
+./usr/include/g++/mips64-unknown-openbsd6.2/bits/time_members.h
 ./usr/include/g++/new
 ./usr/include/g++/numeric
 ./usr/include/g++/ostream
@@ -603,10 +603,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.1/4.2.1/cc1
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.1/4.2.1/cc1obj
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.1/4.2.1/cc1plus
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.1/4.2.1/libgcov.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.2/4.2.1/cc1
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.2/4.2.1/cc1obj
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.2/4.2.1/cc1plus
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.2/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
diff --git a/distrib/sets/lists/comp/gcc.socppc b/distrib/sets/lists/comp/gcc.socppc
index b90becb5a15..b533dfcdbaa 100644
--- a/distrib/sets/lists/comp/gcc.socppc
+++ b/distrib/sets/lists/comp/gcc.socppc
@@ -498,29 +498,29 @@
 ./usr/include/g++/new
 ./usr/include/g++/numeric
 ./usr/include/g++/ostream
-./usr/include/g++/powerpc-unknown-openbsd6.1
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/atomic_word.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/basic_file.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/c++allocator.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/c++config.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/c++io.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/c++locale.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/c++locale_internal.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/compatibility.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/cpu_defines.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/ctype_base.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/ctype_inline.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/ctype_noninline.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/cxxabi_tweaks.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/gthr-default.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/gthr-posix.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/gthr-single.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/gthr-tpf.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/gthr.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/messages_members.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/os_defines.h
-./usr/include/g++/powerpc-unknown-openbsd6.1/bits/time_members.h
+./usr/include/g++/powerpc-unknown-openbsd6.2
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/atomic_word.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/basic_file.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/c++allocator.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/c++config.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/c++io.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/c++locale.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/c++locale_internal.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/compatibility.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/cpu_defines.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/ctype_base.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/ctype_inline.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/ctype_noninline.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/cxxabi_tweaks.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/gthr-default.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/gthr-posix.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/gthr-single.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/gthr-tpf.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/gthr.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/messages_members.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/os_defines.h
+./usr/include/g++/powerpc-unknown-openbsd6.2/bits/time_members.h
 ./usr/include/g++/queue
 ./usr/include/g++/set
 ./usr/include/g++/sstream
@@ -603,10 +603,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.1/4.2.1/cc1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.1/4.2.1/cc1obj
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.1/4.2.1/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.1/4.2.1/libgcov.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.2/4.2.1/cc1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.2/4.2.1/cc1obj
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.2/4.2.1/cc1plus
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.2/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
diff --git a/distrib/sets/lists/comp/gcc.sparc64 b/distrib/sets/lists/comp/gcc.sparc64
index 57a5edc2ca8..d3613598c92 100644
--- a/distrib/sets/lists/comp/gcc.sparc64
+++ b/distrib/sets/lists/comp/gcc.sparc64
@@ -500,29 +500,29 @@
 ./usr/include/g++/ostream
 ./usr/include/g++/queue
 ./usr/include/g++/set
-./usr/include/g++/sparc64-unknown-openbsd6.1
-./usr/include/g++/sparc64-unknown-openbsd6.1/bits
-./usr/include/g++/sparc64-unknown-openbsd6.1/bits/atomic_word.h
-./usr/include/g++/sparc64-unknown-openbsd6.1/bits/basic_file.h
-./usr/include/g++/sparc64-unknown-openbsd6.1/bits/c++allocator.h
-./usr/include/g++/sparc64-unknown-openbsd6.1/bits/c++config.h
-./usr/include/g++/sparc64-unknown-openbsd6.1/bits/c++io.h
-./usr/include/g++/sparc64-unknown-openbsd6.1/bits/c++locale.h
-./usr/include/g++/sparc64-unknown-openbsd6.1/bits/c++locale_internal.h
-./usr/include/g++/sparc64-unknown-openbsd6.1/bits/compatibility.h
-./usr/include/g++/sparc64-unknown-openbsd6.1/bits/cpu_defines.h
-./usr/include/g++/sparc64-unknown-openbsd6.1/bits/ctype_base.h
-./usr/include/g++/sparc64-unknown-openbsd6.1/bits/ctype_inline.h
-./usr/include/g++/sparc64-unknown-openbsd6.1/bits/ctype_noninline.h
-./usr/include/g++/sparc64-unknown-openbsd6.1/bits/cxxabi_tweaks.h
-./usr/include/g++/sparc64-unknown-openbsd6.1/bits/gthr-default.h
-./usr/include/g++/sparc64-unknown-openbsd6.1/bits/gthr-posix.h
-./usr/include/g++/sparc64-unknown-openbsd6.1/bits/gthr-single.h
-./usr/include/g++/sparc64-unknown-openbsd6.1/bits/gthr-tpf.h
-./usr/include/g++/sparc64-unknown-openbsd6.1/bits/gthr.h
-./usr/include/g++/sparc64-unknown-openbsd6.1/bits/messages_members.h
-./usr/include/g++/sparc64-unknown-openbsd6.1/bits/os_defines.h
-./usr/include/g++/sparc64-unknown-openbsd6.1/bits/time_members.h
+./usr/include/g++/sparc64-unknown-openbsd6.2
+./usr/include/g++/sparc64-unknown-openbsd6.2/bits
+./usr/include/g++/sparc64-unknown-openbsd6.2/bits/atomic_word.h
+./usr/include/g++/sparc64-unknown-openbsd6.2/bits/basic_file.h
+./usr/include/g++/sparc64-unknown-openbsd6.2/bits/c++allocator.h
+./usr/include/g++/sparc64-unknown-openbsd6.2/bits/c++config.h
+./usr/include/g++/sparc64-unknown-openbsd6.2/bits/c++io.h
+./usr/include/g++/sparc64-unknown-openbsd6.2/bits/c++locale.h
+./usr/include/g++/sparc64-unknown-openbsd6.2/bits/c++locale_internal.h
+./usr/include/g++/sparc64-unknown-openbsd6.2/bits/compatibility.h
+./usr/include/g++/sparc64-unknown-openbsd6.2/bits/cpu_defines.h
+./usr/include/g++/sparc64-unknown-openbsd6.2/bits/ctype_base.h
+./usr/include/g++/sparc64-unknown-openbsd6.2/bits/ctype_inline.h
+./usr/include/g++/sparc64-unknown-openbsd6.2/bits/ctype_noninline.h
+./usr/include/g++/sparc64-unknown-openbsd6.2/bits/cxxabi_tweaks.h
+./usr/include/g++/sparc64-unknown-openbsd6.2/bits/gthr-default.h
+./usr/include/g++/sparc64-unknown-openbsd6.2/bits/gthr-posix.h
+./usr/include/g++/sparc64-unknown-openbsd6.2/bits/gthr-single.h
+./usr/include/g++/sparc64-unknown-openbsd6.2/bits/gthr-tpf.h
+./usr/include/g++/sparc64-unknown-openbsd6.2/bits/gthr.h
+./usr/include/g++/sparc64-unknown-openbsd6.2/bits/messages_members.h
+./usr/include/g++/sparc64-unknown-openbsd6.2/bits/os_defines.h
+./usr/include/g++/sparc64-unknown-openbsd6.2/bits/time_members.h
 ./usr/include/g++/sstream
 ./usr/include/g++/stack
 ./usr/include/g++/stdexcept
@@ -603,10 +603,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.1/4.2.1/cc1
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.1/4.2.1/cc1obj
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.1/4.2.1/cc1plus
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.1/4.2.1/libgcov.a
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.2/4.2.1/cc1
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.2/4.2.1/cc1obj
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.2/4.2.1/cc1plus
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.2/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index cf5323bfaba..060fb2cff03 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1663,6 +1663,7 @@
 ./usr/share/man/man2/write.2
 ./usr/share/man/man3/ACCESS_DESCRIPTION_new.3
 ./usr/share/man/man3/ASN1_OBJECT_new.3
+./usr/share/man/man3/ASN1_STRING_TABLE_add.3
 ./usr/share/man/man3/ASN1_STRING_length.3
 ./usr/share/man/man3/ASN1_STRING_new.3
 ./usr/share/man/man3/ASN1_STRING_print_ex.3
@@ -1781,6 +1782,7 @@
 ./usr/share/man/man3/EVP_PKEY_encrypt.3
 ./usr/share/man/man3/EVP_PKEY_get_default_digest_nid.3
 ./usr/share/man/man3/EVP_PKEY_keygen.3
+./usr/share/man/man3/EVP_PKEY_meth_get0_info.3
 ./usr/share/man/man3/EVP_PKEY_new.3
 ./usr/share/man/man3/EVP_PKEY_print_private.3
 ./usr/share/man/man3/EVP_PKEY_set1_RSA.3
@@ -2347,6 +2349,7 @@
 ./usr/share/man/man3/labs.3
 ./usr/share/man/man3/ldexp.3
 ./usr/share/man/man3/ldiv.3
+./usr/share/man/man3/legacy_coding.3
 ./usr/share/man/man3/lgamma.3
 ./usr/share/man/man3/lh_new.3
 ./usr/share/man/man3/lh_stats.3
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 3173032b1f7..59227743503 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -473,7 +473,6 @@
 ./usr/share/man/man1/zforce.1
 ./usr/share/man/man1/zmore.1
 ./usr/share/man/man1/znew.1
-./usr/share/man/man3/legacy_coding.3
 ./usr/share/man/man3p/AnyDBM_File.3p
 ./usr/share/man/man3p/App::Cpan.3p
 ./usr/share/man/man3p/App::Prove.3p