38 files changed, 1021 insertions, 1021 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 606e05b1c2c..7d37f4d7efe 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -1407,29 +1407,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.7
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.7/bits
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.7/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.7/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.7/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.7/bits/c++config.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.7/bits/c++io.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.7/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.7/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.7/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.7/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.7/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.7/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.7/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.7/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.7/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.7/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.7/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.7/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.7/bits/gthr.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.7/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.7/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.7/bits/time_members.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.8
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.8/bits
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.8/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.8/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.8/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.8/bits/c++config.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.8/bits/c++io.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.8/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.8/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.8/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.8/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.8/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.8/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.8/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.8/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.8/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.8/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.8/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.8/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.8/bits/gthr.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.8/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.8/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.8/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 f08880b046f..cc217ea7d18 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -1436,29 +1436,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.7
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.7/bits
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.7/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.7/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.7/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.7/bits/c++config.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.7/bits/c++io.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.7/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.7/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.7/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.7/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.7/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.7/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.7/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.7/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.7/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.7/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.7/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.7/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.7/bits/gthr.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.7/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.7/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.7/bits/time_members.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.8
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.8/bits
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.8/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.8/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.8/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.8/bits/c++config.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.8/bits/c++io.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.8/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.8/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.8/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.8/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.8/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.8/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.8/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.8/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.8/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.8/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.8/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.8/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.8/bits/gthr.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.8/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.8/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.8/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 a5afc5c0cd8..674f4617950 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -1421,29 +1421,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.7
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/c++config.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/c++io.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/gthr.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/time_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/c++config.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/c++io.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/gthr.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/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 5fb942ba6ff..2256c75a7a5 100644
--- a/distrib/sets/lists/base/md.armv7
+++ b/distrib/sets/lists/base/md.armv7
@@ -1419,29 +1419,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.7
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/c++config.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/c++io.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/gthr.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/time_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/c++config.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/c++io.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/gthr.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/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.aviion b/distrib/sets/lists/base/md.aviion
index 58074c66f2a..235ef61a929 100644
--- a/distrib/sets/lists/base/md.aviion
+++ b/distrib/sets/lists/base/md.aviion
@@ -1444,24 +1444,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.7
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/c++config.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/c++io.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/gthr.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/time_members.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits/c++config.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits/c++io.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits/gthr.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/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.hppa b/distrib/sets/lists/base/md.hppa
index 176a923aa2f..52f68ae1a52 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -1487,29 +1487,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.7
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.7/bits
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.7/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.7/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.7/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.7/bits/c++config.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.7/bits/c++io.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.7/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.7/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.7/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.7/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.7/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.7/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.7/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.7/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.7/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.7/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.7/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.7/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.7/bits/gthr.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.7/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.7/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.7/bits/time_members.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.8
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.8/bits
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.8/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.8/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.8/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.8/bits/c++config.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.8/bits/c++io.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.8/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.8/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.8/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.8/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.8/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.8/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.8/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.8/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.8/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.8/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.8/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.8/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.8/bits/gthr.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.8/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.8/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.8/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 60320b56b1c..0910f79f970 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -1454,24 +1454,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.7
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.7/bits
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.7/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.7/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.7/bits/c++config.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.7/bits/c++io.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.7/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.7/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.7/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.7/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.7/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.7/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.7/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.7/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.7/bits/gthr.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.7/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.7/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.7/bits/time_members.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.8
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.8/bits
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.8/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.8/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.8/bits/c++config.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.8/bits/c++io.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.8/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.8/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.8/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.8/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.8/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.8/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.8/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.8/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.8/bits/gthr.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.8/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.8/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.8/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 3827a3e85cd..ff72980a2e6 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -1495,29 +1495,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.7
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.7/bits
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.7/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.7/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.7/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.7/bits/c++config.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.7/bits/c++io.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.7/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.7/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.7/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.7/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.7/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.7/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.7/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.7/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.7/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.7/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.7/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.7/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.7/bits/gthr.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.7/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.7/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.7/bits/time_members.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.8
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.8/bits
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.8/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.8/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.8/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.8/bits/c++config.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.8/bits/c++io.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.8/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.8/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.8/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.8/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.8/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.8/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.8/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.8/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.8/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.8/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.8/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.8/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.8/bits/gthr.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.8/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.8/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.8/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 cd0f881ac32..6830e608432 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -1453,29 +1453,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.7
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.7/bits
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.7/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.7/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.7/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.7/bits/c++config.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.7/bits/c++io.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.7/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.7/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.7/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.7/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.7/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.7/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.7/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.7/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.7/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.7/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.7/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.7/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.7/bits/gthr.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.7/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.7/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.7/bits/time_members.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.8
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.8/bits
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.8/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.8/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.8/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.8/bits/c++config.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.8/bits/c++io.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.8/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.8/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.8/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.8/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.8/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.8/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.8/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.8/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.8/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.8/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.8/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.8/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.8/bits/gthr.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.8/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.8/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.8/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 ac39a9e291e..abf37e885af 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -1458,29 +1458,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.7
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.7/bits
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.7/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.7/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.7/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.7/bits/c++config.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.7/bits/c++io.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.7/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.7/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.7/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.7/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.7/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.7/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.7/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.7/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.7/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.7/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.7/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.7/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.7/bits/gthr.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.7/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.7/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.7/bits/time_members.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.8
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.8/bits
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.8/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.8/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.8/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.8/bits/c++config.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.8/bits/c++io.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.8/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.8/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.8/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.8/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.8/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.8/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.8/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.8/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.8/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.8/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.8/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.8/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.8/bits/gthr.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.8/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.8/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.8/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 86e97eb923e..3bff318dcd3 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -1392,24 +1392,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.7
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/c++config.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/c++io.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/gthr.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.7/bits/time_members.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits/c++config.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits/c++io.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits/gthr.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.8/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 759b8d5db1b..b6e6572afb4 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -1489,29 +1489,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.7
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/c++config.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/c++io.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/gthr.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/time_members.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/c++config.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/c++io.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/gthr.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/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 bd6f2268184..33729148855 100644
--- a/distrib/sets/lists/base/md.octeon
+++ b/distrib/sets/lists/base/md.octeon
@@ -1423,29 +1423,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.7
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/c++config.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/c++io.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/gthr.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/time_members.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/c++config.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/c++io.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/gthr.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/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 afe06c9c5c9..195a6c5c1b8 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -1487,29 +1487,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.7
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/c++config.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/c++io.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/gthr.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.7/bits/time_members.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/c++config.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/c++io.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/gthr.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.8/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 e7b372046f4..6cc51f978ec 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -1482,29 +1482,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.7
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/c++config.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/c++io.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/gthr.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.7/bits/time_members.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/c++config.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/c++io.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/gthr.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.8/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 2d5016c0e7a..3cd22219119 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -1033,29 +1033,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.7
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.7/bits
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.7/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.7/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.7/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.7/bits/c++config.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.7/bits/c++io.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.7/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.7/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.7/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.7/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.7/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.7/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.7/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.7/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.7/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.7/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.7/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.7/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.7/bits/gthr.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.7/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.7/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.7/bits/time_members.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.8
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.8/bits
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.8/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.8/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.8/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.8/bits/c++config.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.8/bits/c++io.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.8/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.8/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.8/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.8/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.8/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.8/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.8/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.8/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.8/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.8/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.8/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.8/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.8/bits/gthr.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.8/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.8/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.8/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 4883c7e88a3..0e59836b42b 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -1091,29 +1091,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.7
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.7/bits
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.7/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.7/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.7/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.7/bits/c++config.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.7/bits/c++io.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.7/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.7/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.7/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.7/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.7/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.7/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.7/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.7/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.7/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.7/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.7/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.7/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.7/bits/gthr.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.7/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.7/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.7/bits/time_members.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.8
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.8/bits
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.8/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.8/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.8/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.8/bits/c++config.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.8/bits/c++io.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.8/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.8/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.8/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.8/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.8/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.8/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.8/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.8/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.8/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.8/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.8/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.8/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.8/bits/gthr.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.8/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.8/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.8/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.vax b/distrib/sets/lists/base/md.vax
index 8186a16a47a..8981c16a695 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -956,24 +956,24 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/g++/ext/stl_hash_fun.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/g++/ext/stl_hashtable.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/g++/ext/stl_rope.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.7
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.7/bits
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.7/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.7/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.7/bits/c++config.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.7/bits/c++io.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.7/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.7/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.7/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.7/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.7/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.7/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.7/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.7/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.7/bits/gthr.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.7/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.7/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.7/bits/time_members.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.8
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.8/bits
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.8/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.8/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.8/bits/c++config.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.8/bits/c++io.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.8/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.8/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.8/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.8/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.8/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.8/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.8/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.8/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.8/bits/gthr.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.8/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.8/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/g++/vax-unknown-openbsd5.8/bits/time_members.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/getopt.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/glob.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/grp.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index 97ec2eadc41..83a457d77ce 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -1375,29 +1375,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.7
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/c++config.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/c++io.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/gthr.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.7/bits/time_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/c++config.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/c++io.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/gthr.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.8/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 7e557ab1407..05daa68c38d 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.7
-./usr/include/g++/alpha-unknown-openbsd5.7/bits
-./usr/include/g++/alpha-unknown-openbsd5.7/bits/atomic_word.h
-./usr/include/g++/alpha-unknown-openbsd5.7/bits/basic_file.h
-./usr/include/g++/alpha-unknown-openbsd5.7/bits/c++allocator.h
-./usr/include/g++/alpha-unknown-openbsd5.7/bits/c++config.h
-./usr/include/g++/alpha-unknown-openbsd5.7/bits/c++io.h
-./usr/include/g++/alpha-unknown-openbsd5.7/bits/c++locale.h
-./usr/include/g++/alpha-unknown-openbsd5.7/bits/c++locale_internal.h
-./usr/include/g++/alpha-unknown-openbsd5.7/bits/compatibility.h
-./usr/include/g++/alpha-unknown-openbsd5.7/bits/cpu_defines.h
-./usr/include/g++/alpha-unknown-openbsd5.7/bits/ctype_base.h
-./usr/include/g++/alpha-unknown-openbsd5.7/bits/ctype_inline.h
-./usr/include/g++/alpha-unknown-openbsd5.7/bits/ctype_noninline.h
-./usr/include/g++/alpha-unknown-openbsd5.7/bits/cxxabi_tweaks.h
-./usr/include/g++/alpha-unknown-openbsd5.7/bits/gthr-default.h
-./usr/include/g++/alpha-unknown-openbsd5.7/bits/gthr-posix.h
-./usr/include/g++/alpha-unknown-openbsd5.7/bits/gthr-single.h
-./usr/include/g++/alpha-unknown-openbsd5.7/bits/gthr-tpf.h
-./usr/include/g++/alpha-unknown-openbsd5.7/bits/gthr.h
-./usr/include/g++/alpha-unknown-openbsd5.7/bits/messages_members.h
-./usr/include/g++/alpha-unknown-openbsd5.7/bits/os_defines.h
-./usr/include/g++/alpha-unknown-openbsd5.7/bits/time_members.h
+./usr/include/g++/alpha-unknown-openbsd5.8
+./usr/include/g++/alpha-unknown-openbsd5.8/bits
+./usr/include/g++/alpha-unknown-openbsd5.8/bits/atomic_word.h
+./usr/include/g++/alpha-unknown-openbsd5.8/bits/basic_file.h
+./usr/include/g++/alpha-unknown-openbsd5.8/bits/c++allocator.h
+./usr/include/g++/alpha-unknown-openbsd5.8/bits/c++config.h
+./usr/include/g++/alpha-unknown-openbsd5.8/bits/c++io.h
+./usr/include/g++/alpha-unknown-openbsd5.8/bits/c++locale.h
+./usr/include/g++/alpha-unknown-openbsd5.8/bits/c++locale_internal.h
+./usr/include/g++/alpha-unknown-openbsd5.8/bits/compatibility.h
+./usr/include/g++/alpha-unknown-openbsd5.8/bits/cpu_defines.h
+./usr/include/g++/alpha-unknown-openbsd5.8/bits/ctype_base.h
+./usr/include/g++/alpha-unknown-openbsd5.8/bits/ctype_inline.h
+./usr/include/g++/alpha-unknown-openbsd5.8/bits/ctype_noninline.h
+./usr/include/g++/alpha-unknown-openbsd5.8/bits/cxxabi_tweaks.h
+./usr/include/g++/alpha-unknown-openbsd5.8/bits/gthr-default.h
+./usr/include/g++/alpha-unknown-openbsd5.8/bits/gthr-posix.h
+./usr/include/g++/alpha-unknown-openbsd5.8/bits/gthr-single.h
+./usr/include/g++/alpha-unknown-openbsd5.8/bits/gthr-tpf.h
+./usr/include/g++/alpha-unknown-openbsd5.8/bits/gthr.h
+./usr/include/g++/alpha-unknown-openbsd5.8/bits/messages_members.h
+./usr/include/g++/alpha-unknown-openbsd5.8/bits/os_defines.h
+./usr/include/g++/alpha-unknown-openbsd5.8/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -605,15 +605,15 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.7
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.7/4.2.1
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.7/4.2.1/cc1
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.7/4.2.1/cc1obj
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.7/4.2.1/cc1plus
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.7/4.2.1/collect2
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.7/4.2.1/libgcc.a
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.7/4.2.1/libgcov.a
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.7/4.2.1/specs
+./usr/lib/gcc-lib/alpha-unknown-openbsd5.8
+./usr/lib/gcc-lib/alpha-unknown-openbsd5.8/4.2.1
+./usr/lib/gcc-lib/alpha-unknown-openbsd5.8/4.2.1/cc1
+./usr/lib/gcc-lib/alpha-unknown-openbsd5.8/4.2.1/cc1obj
+./usr/lib/gcc-lib/alpha-unknown-openbsd5.8/4.2.1/cc1plus
+./usr/lib/gcc-lib/alpha-unknown-openbsd5.8/4.2.1/collect2
+./usr/lib/gcc-lib/alpha-unknown-openbsd5.8/4.2.1/libgcc.a
+./usr/lib/gcc-lib/alpha-unknown-openbsd5.8/4.2.1/libgcov.a
+./usr/lib/gcc-lib/alpha-unknown-openbsd5.8/4.2.1/specs
 ./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 cd1aaa4acb5..6475f7969e0 100644
--- a/distrib/sets/lists/comp/md.amd64
+++ b/distrib/sets/lists/comp/md.amd64
@@ -78,29 +78,29 @@
 ./usr/include/amd64/vmparam.h
 ./usr/include/cpuid.h
 ./usr/include/emmintrin.h
-./usr/include/g++/amd64-unknown-openbsd5.7
-./usr/include/g++/amd64-unknown-openbsd5.7/bits
-./usr/include/g++/amd64-unknown-openbsd5.7/bits/atomic_word.h
-./usr/include/g++/amd64-unknown-openbsd5.7/bits/basic_file.h
-./usr/include/g++/amd64-unknown-openbsd5.7/bits/c++allocator.h
-./usr/include/g++/amd64-unknown-openbsd5.7/bits/c++config.h
-./usr/include/g++/amd64-unknown-openbsd5.7/bits/c++io.h
-./usr/include/g++/amd64-unknown-openbsd5.7/bits/c++locale.h
-./usr/include/g++/amd64-unknown-openbsd5.7/bits/c++locale_internal.h
-./usr/include/g++/amd64-unknown-openbsd5.7/bits/compatibility.h
-./usr/include/g++/amd64-unknown-openbsd5.7/bits/cpu_defines.h
-./usr/include/g++/amd64-unknown-openbsd5.7/bits/ctype_base.h
-./usr/include/g++/amd64-unknown-openbsd5.7/bits/ctype_inline.h
-./usr/include/g++/amd64-unknown-openbsd5.7/bits/ctype_noninline.h
-./usr/include/g++/amd64-unknown-openbsd5.7/bits/cxxabi_tweaks.h
-./usr/include/g++/amd64-unknown-openbsd5.7/bits/gthr-default.h
-./usr/include/g++/amd64-unknown-openbsd5.7/bits/gthr-posix.h
-./usr/include/g++/amd64-unknown-openbsd5.7/bits/gthr-single.h
-./usr/include/g++/amd64-unknown-openbsd5.7/bits/gthr-tpf.h
-./usr/include/g++/amd64-unknown-openbsd5.7/bits/gthr.h
-./usr/include/g++/amd64-unknown-openbsd5.7/bits/messages_members.h
-./usr/include/g++/amd64-unknown-openbsd5.7/bits/os_defines.h
-./usr/include/g++/amd64-unknown-openbsd5.7/bits/time_members.h
+./usr/include/g++/amd64-unknown-openbsd5.8
+./usr/include/g++/amd64-unknown-openbsd5.8/bits
+./usr/include/g++/amd64-unknown-openbsd5.8/bits/atomic_word.h
+./usr/include/g++/amd64-unknown-openbsd5.8/bits/basic_file.h
+./usr/include/g++/amd64-unknown-openbsd5.8/bits/c++allocator.h
+./usr/include/g++/amd64-unknown-openbsd5.8/bits/c++config.h
+./usr/include/g++/amd64-unknown-openbsd5.8/bits/c++io.h
+./usr/include/g++/amd64-unknown-openbsd5.8/bits/c++locale.h
+./usr/include/g++/amd64-unknown-openbsd5.8/bits/c++locale_internal.h
+./usr/include/g++/amd64-unknown-openbsd5.8/bits/compatibility.h
+./usr/include/g++/amd64-unknown-openbsd5.8/bits/cpu_defines.h
+./usr/include/g++/amd64-unknown-openbsd5.8/bits/ctype_base.h
+./usr/include/g++/amd64-unknown-openbsd5.8/bits/ctype_inline.h
+./usr/include/g++/amd64-unknown-openbsd5.8/bits/ctype_noninline.h
+./usr/include/g++/amd64-unknown-openbsd5.8/bits/cxxabi_tweaks.h
+./usr/include/g++/amd64-unknown-openbsd5.8/bits/gthr-default.h
+./usr/include/g++/amd64-unknown-openbsd5.8/bits/gthr-posix.h
+./usr/include/g++/amd64-unknown-openbsd5.8/bits/gthr-single.h
+./usr/include/g++/amd64-unknown-openbsd5.8/bits/gthr-tpf.h
+./usr/include/g++/amd64-unknown-openbsd5.8/bits/gthr.h
+./usr/include/g++/amd64-unknown-openbsd5.8/bits/messages_members.h
+./usr/include/g++/amd64-unknown-openbsd5.8/bits/os_defines.h
+./usr/include/g++/amd64-unknown-openbsd5.8/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -632,15 +632,15 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.7
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.7/4.2.1
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.7/4.2.1/cc1
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.7/4.2.1/cc1obj
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.7/4.2.1/cc1plus
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.7/4.2.1/collect2
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.7/4.2.1/libgcc.a
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.7/4.2.1/libgcov.a
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.7/4.2.1/specs
+./usr/lib/gcc-lib/amd64-unknown-openbsd5.8
+./usr/lib/gcc-lib/amd64-unknown-openbsd5.8/4.2.1
+./usr/lib/gcc-lib/amd64-unknown-openbsd5.8/4.2.1/cc1
+./usr/lib/gcc-lib/amd64-unknown-openbsd5.8/4.2.1/cc1obj
+./usr/lib/gcc-lib/amd64-unknown-openbsd5.8/4.2.1/cc1plus
+./usr/lib/gcc-lib/amd64-unknown-openbsd5.8/4.2.1/collect2
+./usr/lib/gcc-lib/amd64-unknown-openbsd5.8/4.2.1/libgcc.a
+./usr/lib/gcc-lib/amd64-unknown-openbsd5.8/4.2.1/libgcov.a
+./usr/lib/gcc-lib/amd64-unknown-openbsd5.8/4.2.1/specs
 ./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 4408541f85e..fde09083534 100644
--- a/distrib/sets/lists/comp/md.armish
+++ b/distrib/sets/lists/comp/md.armish
@@ -96,29 +96,29 @@
 ./usr/include/armish/tcb.h
 ./usr/include/armish/trap.h
 ./usr/include/armish/vmparam.h
-./usr/include/g++/arm-unknown-openbsd5.7
-./usr/include/g++/arm-unknown-openbsd5.7/bits
-./usr/include/g++/arm-unknown-openbsd5.7/bits/atomic_word.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/basic_file.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/c++allocator.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/c++config.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/c++io.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/c++locale.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/c++locale_internal.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/compatibility.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/cpu_defines.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/ctype_base.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/ctype_inline.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/ctype_noninline.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/cxxabi_tweaks.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/gthr-default.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/gthr-posix.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/gthr-single.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/gthr-tpf.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/gthr.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/messages_members.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/os_defines.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/time_members.h
+./usr/include/g++/arm-unknown-openbsd5.8
+./usr/include/g++/arm-unknown-openbsd5.8/bits
+./usr/include/g++/arm-unknown-openbsd5.8/bits/atomic_word.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/basic_file.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/c++allocator.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/c++config.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/c++io.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/c++locale.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/c++locale_internal.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/compatibility.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/cpu_defines.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/ctype_base.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/ctype_inline.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/ctype_noninline.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/cxxabi_tweaks.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/gthr-default.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/gthr-posix.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/gthr-single.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/gthr-tpf.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/gthr.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/messages_members.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/os_defines.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -647,15 +647,15 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/arm-unknown-openbsd5.7
-./usr/lib/gcc-lib/arm-unknown-openbsd5.7/4.2.1
-./usr/lib/gcc-lib/arm-unknown-openbsd5.7/4.2.1/cc1
-./usr/lib/gcc-lib/arm-unknown-openbsd5.7/4.2.1/cc1obj
-./usr/lib/gcc-lib/arm-unknown-openbsd5.7/4.2.1/cc1plus
-./usr/lib/gcc-lib/arm-unknown-openbsd5.7/4.2.1/collect2
-./usr/lib/gcc-lib/arm-unknown-openbsd5.7/4.2.1/libgcc.a
-./usr/lib/gcc-lib/arm-unknown-openbsd5.7/4.2.1/libgcov.a
-./usr/lib/gcc-lib/arm-unknown-openbsd5.7/4.2.1/specs
+./usr/lib/gcc-lib/arm-unknown-openbsd5.8
+./usr/lib/gcc-lib/arm-unknown-openbsd5.8/4.2.1
+./usr/lib/gcc-lib/arm-unknown-openbsd5.8/4.2.1/cc1
+./usr/lib/gcc-lib/arm-unknown-openbsd5.8/4.2.1/cc1obj
+./usr/lib/gcc-lib/arm-unknown-openbsd5.8/4.2.1/cc1plus
+./usr/lib/gcc-lib/arm-unknown-openbsd5.8/4.2.1/collect2
+./usr/lib/gcc-lib/arm-unknown-openbsd5.8/4.2.1/libgcc.a
+./usr/lib/gcc-lib/arm-unknown-openbsd5.8/4.2.1/libgcov.a
+./usr/lib/gcc-lib/arm-unknown-openbsd5.8/4.2.1/specs
 ./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 4cc153cb98d..cbc389e03b4 100644
--- a/distrib/sets/lists/comp/md.armv7
+++ b/distrib/sets/lists/comp/md.armv7
@@ -99,29 +99,29 @@
 ./usr/include/armv7/tcb.h
 ./usr/include/armv7/trap.h
 ./usr/include/armv7/vmparam.h
-./usr/include/g++/arm-unknown-openbsd5.7
-./usr/include/g++/arm-unknown-openbsd5.7/bits
-./usr/include/g++/arm-unknown-openbsd5.7/bits/atomic_word.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/basic_file.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/c++allocator.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/c++config.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/c++io.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/c++locale.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/c++locale_internal.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/compatibility.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/cpu_defines.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/ctype_base.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/ctype_inline.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/ctype_noninline.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/cxxabi_tweaks.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/gthr-default.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/gthr-posix.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/gthr-single.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/gthr-tpf.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/gthr.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/messages_members.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/os_defines.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/time_members.h
+./usr/include/g++/arm-unknown-openbsd5.8
+./usr/include/g++/arm-unknown-openbsd5.8/bits
+./usr/include/g++/arm-unknown-openbsd5.8/bits/atomic_word.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/basic_file.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/c++allocator.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/c++config.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/c++io.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/c++locale.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/c++locale_internal.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/compatibility.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/cpu_defines.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/ctype_base.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/ctype_inline.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/ctype_noninline.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/cxxabi_tweaks.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/gthr-default.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/gthr-posix.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/gthr-single.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/gthr-tpf.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/gthr.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/messages_members.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/os_defines.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -650,15 +650,15 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/arm-unknown-openbsd5.7
-./usr/lib/gcc-lib/arm-unknown-openbsd5.7/4.2.1
-./usr/lib/gcc-lib/arm-unknown-openbsd5.7/4.2.1/cc1
-./usr/lib/gcc-lib/arm-unknown-openbsd5.7/4.2.1/cc1obj
-./usr/lib/gcc-lib/arm-unknown-openbsd5.7/4.2.1/cc1plus
-./usr/lib/gcc-lib/arm-unknown-openbsd5.7/4.2.1/collect2
-./usr/lib/gcc-lib/arm-unknown-openbsd5.7/4.2.1/libgcc.a
-./usr/lib/gcc-lib/arm-unknown-openbsd5.7/4.2.1/libgcov.a
-./usr/lib/gcc-lib/arm-unknown-openbsd5.7/4.2.1/specs
+./usr/lib/gcc-lib/arm-unknown-openbsd5.8
+./usr/lib/gcc-lib/arm-unknown-openbsd5.8/4.2.1
+./usr/lib/gcc-lib/arm-unknown-openbsd5.8/4.2.1/cc1
+./usr/lib/gcc-lib/arm-unknown-openbsd5.8/4.2.1/cc1obj
+./usr/lib/gcc-lib/arm-unknown-openbsd5.8/4.2.1/cc1plus
+./usr/lib/gcc-lib/arm-unknown-openbsd5.8/4.2.1/collect2
+./usr/lib/gcc-lib/arm-unknown-openbsd5.8/4.2.1/libgcc.a
+./usr/lib/gcc-lib/arm-unknown-openbsd5.8/4.2.1/libgcov.a
+./usr/lib/gcc-lib/arm-unknown-openbsd5.8/4.2.1/specs
 ./usr/lib/libarm.a
 ./usr/lib/libarm_p.a
 ./usr/lib/libstdc++_p.a
diff --git a/distrib/sets/lists/comp/md.aviion b/distrib/sets/lists/comp/md.aviion
index 75ee54b5178..ea5235b194c 100644
--- a/distrib/sets/lists/comp/md.aviion
+++ b/distrib/sets/lists/comp/md.aviion
@@ -186,24 +186,24 @@
 ./usr/include/g++/istream
 ./usr/include/g++/limits
 ./usr/include/g++/locale
-./usr/include/g++/m88k-unknown-openbsd5.7
-./usr/include/g++/m88k-unknown-openbsd5.7/bits
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/atomicity.h
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/basic_file.h
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/c++config.h
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/c++io.h
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/c++locale.h
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/codecvt_specializations.h
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/ctype_base.h
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/ctype_inline.h
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/ctype_noninline.h
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/gthr-default.h
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/gthr-posix.h
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/gthr-single.h
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/gthr.h
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/messages_members.h
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/os_defines.h
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/time_members.h
+./usr/include/g++/m88k-unknown-openbsd5.8
+./usr/include/g++/m88k-unknown-openbsd5.8/bits
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/atomicity.h
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/basic_file.h
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/c++config.h
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/c++io.h
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/c++locale.h
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/codecvt_specializations.h
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/ctype_base.h
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/ctype_inline.h
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/ctype_noninline.h
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/gthr-default.h
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/gthr-posix.h
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/gthr-single.h
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/gthr.h
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/messages_members.h
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/os_defines.h
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/time_members.h
 ./usr/include/g++/ostream
 ./usr/include/g++/streambuf
 ./usr/include/ieeefp.h
@@ -256,21 +256,21 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.7
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.7/3.3.6
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.7/3.3.6/SYSCALLS.c.X
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.7/3.3.6/cc1
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.7/3.3.6/cc1obj
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.7/3.3.6/cc1plus
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.7/3.3.6/collect2
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.7/3.3.6/fPIC
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.7/3.3.6/fPIC/libgcc.a
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.7/3.3.6/fpic
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.7/3.3.6/fpic/libgcc.a
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.7/3.3.6/include
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.7/3.3.6/include/unwind.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.7/3.3.6/libgcc.a
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.7/3.3.6/specs
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.8
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.8/3.3.6
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.8/3.3.6/SYSCALLS.c.X
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.8/3.3.6/cc1
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.8/3.3.6/cc1obj
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.8/3.3.6/cc1plus
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.8/3.3.6/collect2
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.8/3.3.6/fPIC
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.8/3.3.6/fPIC/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.8/3.3.6/fpic
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.8/3.3.6/fpic/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.8/3.3.6/include
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.8/3.3.6/include/unwind.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.8/3.3.6/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.8/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.hppa b/distrib/sets/lists/comp/md.hppa
index 0dc358da169..ba6347fbee1 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.7
-./usr/include/g++/hppa-unknown-openbsd5.7/bits
-./usr/include/g++/hppa-unknown-openbsd5.7/bits/atomic_word.h
-./usr/include/g++/hppa-unknown-openbsd5.7/bits/basic_file.h
-./usr/include/g++/hppa-unknown-openbsd5.7/bits/c++allocator.h
-./usr/include/g++/hppa-unknown-openbsd5.7/bits/c++config.h
-./usr/include/g++/hppa-unknown-openbsd5.7/bits/c++io.h
-./usr/include/g++/hppa-unknown-openbsd5.7/bits/c++locale.h
-./usr/include/g++/hppa-unknown-openbsd5.7/bits/c++locale_internal.h
-./usr/include/g++/hppa-unknown-openbsd5.7/bits/compatibility.h
-./usr/include/g++/hppa-unknown-openbsd5.7/bits/cpu_defines.h
-./usr/include/g++/hppa-unknown-openbsd5.7/bits/ctype_base.h
-./usr/include/g++/hppa-unknown-openbsd5.7/bits/ctype_inline.h
-./usr/include/g++/hppa-unknown-openbsd5.7/bits/ctype_noninline.h
-./usr/include/g++/hppa-unknown-openbsd5.7/bits/cxxabi_tweaks.h
-./usr/include/g++/hppa-unknown-openbsd5.7/bits/gthr-default.h
-./usr/include/g++/hppa-unknown-openbsd5.7/bits/gthr-posix.h
-./usr/include/g++/hppa-unknown-openbsd5.7/bits/gthr-single.h
-./usr/include/g++/hppa-unknown-openbsd5.7/bits/gthr-tpf.h
-./usr/include/g++/hppa-unknown-openbsd5.7/bits/gthr.h
-./usr/include/g++/hppa-unknown-openbsd5.7/bits/messages_members.h
-./usr/include/g++/hppa-unknown-openbsd5.7/bits/os_defines.h
-./usr/include/g++/hppa-unknown-openbsd5.7/bits/time_members.h
+./usr/include/g++/hppa-unknown-openbsd5.8
+./usr/include/g++/hppa-unknown-openbsd5.8/bits
+./usr/include/g++/hppa-unknown-openbsd5.8/bits/atomic_word.h
+./usr/include/g++/hppa-unknown-openbsd5.8/bits/basic_file.h
+./usr/include/g++/hppa-unknown-openbsd5.8/bits/c++allocator.h
+./usr/include/g++/hppa-unknown-openbsd5.8/bits/c++config.h
+./usr/include/g++/hppa-unknown-openbsd5.8/bits/c++io.h
+./usr/include/g++/hppa-unknown-openbsd5.8/bits/c++locale.h
+./usr/include/g++/hppa-unknown-openbsd5.8/bits/c++locale_internal.h
+./usr/include/g++/hppa-unknown-openbsd5.8/bits/compatibility.h
+./usr/include/g++/hppa-unknown-openbsd5.8/bits/cpu_defines.h
+./usr/include/g++/hppa-unknown-openbsd5.8/bits/ctype_base.h
+./usr/include/g++/hppa-unknown-openbsd5.8/bits/ctype_inline.h
+./usr/include/g++/hppa-unknown-openbsd5.8/bits/ctype_noninline.h
+./usr/include/g++/hppa-unknown-openbsd5.8/bits/cxxabi_tweaks.h
+./usr/include/g++/hppa-unknown-openbsd5.8/bits/gthr-default.h
+./usr/include/g++/hppa-unknown-openbsd5.8/bits/gthr-posix.h
+./usr/include/g++/hppa-unknown-openbsd5.8/bits/gthr-single.h
+./usr/include/g++/hppa-unknown-openbsd5.8/bits/gthr-tpf.h
+./usr/include/g++/hppa-unknown-openbsd5.8/bits/gthr.h
+./usr/include/g++/hppa-unknown-openbsd5.8/bits/messages_members.h
+./usr/include/g++/hppa-unknown-openbsd5.8/bits/os_defines.h
+./usr/include/g++/hppa-unknown-openbsd5.8/bits/time_members.h
 ./usr/include/g++/ios
 ./usr/include/g++/istream
 ./usr/include/g++/limits
@@ -605,15 +605,15 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.7
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.7/4.2.1
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.7/4.2.1/cc1
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.7/4.2.1/cc1obj
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.7/4.2.1/cc1plus
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.7/4.2.1/collect2
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.7/4.2.1/libgcc.a
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.7/4.2.1/libgcov.a
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.7/4.2.1/specs
+./usr/lib/gcc-lib/hppa-unknown-openbsd5.8
+./usr/lib/gcc-lib/hppa-unknown-openbsd5.8/4.2.1
+./usr/lib/gcc-lib/hppa-unknown-openbsd5.8/4.2.1/cc1
+./usr/lib/gcc-lib/hppa-unknown-openbsd5.8/4.2.1/cc1obj
+./usr/lib/gcc-lib/hppa-unknown-openbsd5.8/4.2.1/cc1plus
+./usr/lib/gcc-lib/hppa-unknown-openbsd5.8/4.2.1/collect2
+./usr/lib/gcc-lib/hppa-unknown-openbsd5.8/4.2.1/libgcc.a
+./usr/lib/gcc-lib/hppa-unknown-openbsd5.8/4.2.1/libgcov.a
+./usr/lib/gcc-lib/hppa-unknown-openbsd5.8/4.2.1/specs
 ./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 0fcfb789072..5f7d59c1eef 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.7
-./usr/include/g++/hppa64-unknown-openbsd5.7/bits
-./usr/include/g++/hppa64-unknown-openbsd5.7/bits/atomicity.h
-./usr/include/g++/hppa64-unknown-openbsd5.7/bits/basic_file.h
-./usr/include/g++/hppa64-unknown-openbsd5.7/bits/c++config.h
-./usr/include/g++/hppa64-unknown-openbsd5.7/bits/c++io.h
-./usr/include/g++/hppa64-unknown-openbsd5.7/bits/c++locale.h
-./usr/include/g++/hppa64-unknown-openbsd5.7/bits/codecvt_specializations.h
-./usr/include/g++/hppa64-unknown-openbsd5.7/bits/ctype_base.h
-./usr/include/g++/hppa64-unknown-openbsd5.7/bits/ctype_inline.h
-./usr/include/g++/hppa64-unknown-openbsd5.7/bits/ctype_noninline.h
-./usr/include/g++/hppa64-unknown-openbsd5.7/bits/gthr-default.h
-./usr/include/g++/hppa64-unknown-openbsd5.7/bits/gthr-posix.h
-./usr/include/g++/hppa64-unknown-openbsd5.7/bits/gthr-single.h
-./usr/include/g++/hppa64-unknown-openbsd5.7/bits/gthr.h
-./usr/include/g++/hppa64-unknown-openbsd5.7/bits/messages_members.h
-./usr/include/g++/hppa64-unknown-openbsd5.7/bits/os_defines.h
-./usr/include/g++/hppa64-unknown-openbsd5.7/bits/time_members.h
+./usr/include/g++/hppa64-unknown-openbsd5.8
+./usr/include/g++/hppa64-unknown-openbsd5.8/bits
+./usr/include/g++/hppa64-unknown-openbsd5.8/bits/atomicity.h
+./usr/include/g++/hppa64-unknown-openbsd5.8/bits/basic_file.h
+./usr/include/g++/hppa64-unknown-openbsd5.8/bits/c++config.h
+./usr/include/g++/hppa64-unknown-openbsd5.8/bits/c++io.h
+./usr/include/g++/hppa64-unknown-openbsd5.8/bits/c++locale.h
+./usr/include/g++/hppa64-unknown-openbsd5.8/bits/codecvt_specializations.h
+./usr/include/g++/hppa64-unknown-openbsd5.8/bits/ctype_base.h
+./usr/include/g++/hppa64-unknown-openbsd5.8/bits/ctype_inline.h
+./usr/include/g++/hppa64-unknown-openbsd5.8/bits/ctype_noninline.h
+./usr/include/g++/hppa64-unknown-openbsd5.8/bits/gthr-default.h
+./usr/include/g++/hppa64-unknown-openbsd5.8/bits/gthr-posix.h
+./usr/include/g++/hppa64-unknown-openbsd5.8/bits/gthr-single.h
+./usr/include/g++/hppa64-unknown-openbsd5.8/bits/gthr.h
+./usr/include/g++/hppa64-unknown-openbsd5.8/bits/messages_members.h
+./usr/include/g++/hppa64-unknown-openbsd5.8/bits/os_defines.h
+./usr/include/g++/hppa64-unknown-openbsd5.8/bits/time_members.h
 ./usr/include/g++/ios
 ./usr/include/g++/istream
 ./usr/include/g++/limits
@@ -208,17 +208,17 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.7
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.7/3.3.5
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.7/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.7/3.3.5/cc1
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.7/3.3.5/cc1obj
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.7/3.3.5/cc1plus
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.7/3.3.5/collect2
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.7/3.3.5/include
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.7/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.7/3.3.5/libgcc.a
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.7/3.3.5/specs
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.8
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.8/3.3.5
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.8/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.8/3.3.5/cc1
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.8/3.3.5/cc1obj
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.8/3.3.5/cc1plus
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.8/3.3.5/collect2
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.8/3.3.5/include
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.8/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.8/3.3.5/libgcc.a
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.8/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 29d7ad0fab9..2077e2ba677 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.7
-./usr/include/g++/i386-unknown-openbsd5.7/bits
-./usr/include/g++/i386-unknown-openbsd5.7/bits/atomic_word.h
-./usr/include/g++/i386-unknown-openbsd5.7/bits/basic_file.h
-./usr/include/g++/i386-unknown-openbsd5.7/bits/c++allocator.h
-./usr/include/g++/i386-unknown-openbsd5.7/bits/c++config.h
-./usr/include/g++/i386-unknown-openbsd5.7/bits/c++io.h
-./usr/include/g++/i386-unknown-openbsd5.7/bits/c++locale.h
-./usr/include/g++/i386-unknown-openbsd5.7/bits/c++locale_internal.h
-./usr/include/g++/i386-unknown-openbsd5.7/bits/compatibility.h
-./usr/include/g++/i386-unknown-openbsd5.7/bits/cpu_defines.h
-./usr/include/g++/i386-unknown-openbsd5.7/bits/ctype_base.h
-./usr/include/g++/i386-unknown-openbsd5.7/bits/ctype_inline.h
-./usr/include/g++/i386-unknown-openbsd5.7/bits/ctype_noninline.h
-./usr/include/g++/i386-unknown-openbsd5.7/bits/cxxabi_tweaks.h
-./usr/include/g++/i386-unknown-openbsd5.7/bits/gthr-default.h
-./usr/include/g++/i386-unknown-openbsd5.7/bits/gthr-posix.h
-./usr/include/g++/i386-unknown-openbsd5.7/bits/gthr-single.h
-./usr/include/g++/i386-unknown-openbsd5.7/bits/gthr-tpf.h
-./usr/include/g++/i386-unknown-openbsd5.7/bits/gthr.h
-./usr/include/g++/i386-unknown-openbsd5.7/bits/messages_members.h
-./usr/include/g++/i386-unknown-openbsd5.7/bits/os_defines.h
-./usr/include/g++/i386-unknown-openbsd5.7/bits/time_members.h
+./usr/include/g++/i386-unknown-openbsd5.8
+./usr/include/g++/i386-unknown-openbsd5.8/bits
+./usr/include/g++/i386-unknown-openbsd5.8/bits/atomic_word.h
+./usr/include/g++/i386-unknown-openbsd5.8/bits/basic_file.h
+./usr/include/g++/i386-unknown-openbsd5.8/bits/c++allocator.h
+./usr/include/g++/i386-unknown-openbsd5.8/bits/c++config.h
+./usr/include/g++/i386-unknown-openbsd5.8/bits/c++io.h
+./usr/include/g++/i386-unknown-openbsd5.8/bits/c++locale.h
+./usr/include/g++/i386-unknown-openbsd5.8/bits/c++locale_internal.h
+./usr/include/g++/i386-unknown-openbsd5.8/bits/compatibility.h
+./usr/include/g++/i386-unknown-openbsd5.8/bits/cpu_defines.h
+./usr/include/g++/i386-unknown-openbsd5.8/bits/ctype_base.h
+./usr/include/g++/i386-unknown-openbsd5.8/bits/ctype_inline.h
+./usr/include/g++/i386-unknown-openbsd5.8/bits/ctype_noninline.h
+./usr/include/g++/i386-unknown-openbsd5.8/bits/cxxabi_tweaks.h
+./usr/include/g++/i386-unknown-openbsd5.8/bits/gthr-default.h
+./usr/include/g++/i386-unknown-openbsd5.8/bits/gthr-posix.h
+./usr/include/g++/i386-unknown-openbsd5.8/bits/gthr-single.h
+./usr/include/g++/i386-unknown-openbsd5.8/bits/gthr-tpf.h
+./usr/include/g++/i386-unknown-openbsd5.8/bits/gthr.h
+./usr/include/g++/i386-unknown-openbsd5.8/bits/messages_members.h
+./usr/include/g++/i386-unknown-openbsd5.8/bits/os_defines.h
+./usr/include/g++/i386-unknown-openbsd5.8/bits/time_members.h
 ./usr/include/g++/ios
 ./usr/include/g++/istream
 ./usr/include/g++/limits
@@ -636,15 +636,15 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/i386-unknown-openbsd5.7
-./usr/lib/gcc-lib/i386-unknown-openbsd5.7/4.2.1
-./usr/lib/gcc-lib/i386-unknown-openbsd5.7/4.2.1/cc1
-./usr/lib/gcc-lib/i386-unknown-openbsd5.7/4.2.1/cc1obj
-./usr/lib/gcc-lib/i386-unknown-openbsd5.7/4.2.1/cc1plus
-./usr/lib/gcc-lib/i386-unknown-openbsd5.7/4.2.1/collect2
-./usr/lib/gcc-lib/i386-unknown-openbsd5.7/4.2.1/libgcc.a
-./usr/lib/gcc-lib/i386-unknown-openbsd5.7/4.2.1/libgcov.a
-./usr/lib/gcc-lib/i386-unknown-openbsd5.7/4.2.1/specs
+./usr/lib/gcc-lib/i386-unknown-openbsd5.8
+./usr/lib/gcc-lib/i386-unknown-openbsd5.8/4.2.1
+./usr/lib/gcc-lib/i386-unknown-openbsd5.8/4.2.1/cc1
+./usr/lib/gcc-lib/i386-unknown-openbsd5.8/4.2.1/cc1obj
+./usr/lib/gcc-lib/i386-unknown-openbsd5.8/4.2.1/cc1plus
+./usr/lib/gcc-lib/i386-unknown-openbsd5.8/4.2.1/collect2
+./usr/lib/gcc-lib/i386-unknown-openbsd5.8/4.2.1/libgcc.a
+./usr/lib/gcc-lib/i386-unknown-openbsd5.8/4.2.1/libgcov.a
+./usr/lib/gcc-lib/i386-unknown-openbsd5.8/4.2.1/specs
 ./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 a2ecfcd783b..ce480ec23f1 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.7
-./usr/include/g++/sh-unknown-openbsd5.7/bits
-./usr/include/g++/sh-unknown-openbsd5.7/bits/atomic_word.h
-./usr/include/g++/sh-unknown-openbsd5.7/bits/basic_file.h
-./usr/include/g++/sh-unknown-openbsd5.7/bits/c++allocator.h
-./usr/include/g++/sh-unknown-openbsd5.7/bits/c++config.h
-./usr/include/g++/sh-unknown-openbsd5.7/bits/c++io.h
-./usr/include/g++/sh-unknown-openbsd5.7/bits/c++locale.h
-./usr/include/g++/sh-unknown-openbsd5.7/bits/c++locale_internal.h
-./usr/include/g++/sh-unknown-openbsd5.7/bits/compatibility.h
-./usr/include/g++/sh-unknown-openbsd5.7/bits/cpu_defines.h
-./usr/include/g++/sh-unknown-openbsd5.7/bits/ctype_base.h
-./usr/include/g++/sh-unknown-openbsd5.7/bits/ctype_inline.h
-./usr/include/g++/sh-unknown-openbsd5.7/bits/ctype_noninline.h
-./usr/include/g++/sh-unknown-openbsd5.7/bits/cxxabi_tweaks.h
-./usr/include/g++/sh-unknown-openbsd5.7/bits/gthr-default.h
-./usr/include/g++/sh-unknown-openbsd5.7/bits/gthr-posix.h
-./usr/include/g++/sh-unknown-openbsd5.7/bits/gthr-single.h
-./usr/include/g++/sh-unknown-openbsd5.7/bits/gthr-tpf.h
-./usr/include/g++/sh-unknown-openbsd5.7/bits/gthr.h
-./usr/include/g++/sh-unknown-openbsd5.7/bits/messages_members.h
-./usr/include/g++/sh-unknown-openbsd5.7/bits/os_defines.h
-./usr/include/g++/sh-unknown-openbsd5.7/bits/time_members.h
+./usr/include/g++/sh-unknown-openbsd5.8
+./usr/include/g++/sh-unknown-openbsd5.8/bits
+./usr/include/g++/sh-unknown-openbsd5.8/bits/atomic_word.h
+./usr/include/g++/sh-unknown-openbsd5.8/bits/basic_file.h
+./usr/include/g++/sh-unknown-openbsd5.8/bits/c++allocator.h
+./usr/include/g++/sh-unknown-openbsd5.8/bits/c++config.h
+./usr/include/g++/sh-unknown-openbsd5.8/bits/c++io.h
+./usr/include/g++/sh-unknown-openbsd5.8/bits/c++locale.h
+./usr/include/g++/sh-unknown-openbsd5.8/bits/c++locale_internal.h
+./usr/include/g++/sh-unknown-openbsd5.8/bits/compatibility.h
+./usr/include/g++/sh-unknown-openbsd5.8/bits/cpu_defines.h
+./usr/include/g++/sh-unknown-openbsd5.8/bits/ctype_base.h
+./usr/include/g++/sh-unknown-openbsd5.8/bits/ctype_inline.h
+./usr/include/g++/sh-unknown-openbsd5.8/bits/ctype_noninline.h
+./usr/include/g++/sh-unknown-openbsd5.8/bits/cxxabi_tweaks.h
+./usr/include/g++/sh-unknown-openbsd5.8/bits/gthr-default.h
+./usr/include/g++/sh-unknown-openbsd5.8/bits/gthr-posix.h
+./usr/include/g++/sh-unknown-openbsd5.8/bits/gthr-single.h
+./usr/include/g++/sh-unknown-openbsd5.8/bits/gthr-tpf.h
+./usr/include/g++/sh-unknown-openbsd5.8/bits/gthr.h
+./usr/include/g++/sh-unknown-openbsd5.8/bits/messages_members.h
+./usr/include/g++/sh-unknown-openbsd5.8/bits/os_defines.h
+./usr/include/g++/sh-unknown-openbsd5.8/bits/time_members.h
 ./usr/include/g++/streambuf
 ./usr/include/g++/tr1
 ./usr/include/g++/tr1/array
@@ -652,15 +652,15 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sh-unknown-openbsd5.7
-./usr/lib/gcc-lib/sh-unknown-openbsd5.7/4.2.1
-./usr/lib/gcc-lib/sh-unknown-openbsd5.7/4.2.1/cc1
-./usr/lib/gcc-lib/sh-unknown-openbsd5.7/4.2.1/cc1obj
-./usr/lib/gcc-lib/sh-unknown-openbsd5.7/4.2.1/cc1plus
-./usr/lib/gcc-lib/sh-unknown-openbsd5.7/4.2.1/collect2
-./usr/lib/gcc-lib/sh-unknown-openbsd5.7/4.2.1/libgcc.a
-./usr/lib/gcc-lib/sh-unknown-openbsd5.7/4.2.1/libgcov.a
-./usr/lib/gcc-lib/sh-unknown-openbsd5.7/4.2.1/specs
+./usr/lib/gcc-lib/sh-unknown-openbsd5.8
+./usr/lib/gcc-lib/sh-unknown-openbsd5.8/4.2.1
+./usr/lib/gcc-lib/sh-unknown-openbsd5.8/4.2.1/cc1
+./usr/lib/gcc-lib/sh-unknown-openbsd5.8/4.2.1/cc1obj
+./usr/lib/gcc-lib/sh-unknown-openbsd5.8/4.2.1/cc1plus
+./usr/lib/gcc-lib/sh-unknown-openbsd5.8/4.2.1/collect2
+./usr/lib/gcc-lib/sh-unknown-openbsd5.8/4.2.1/libgcc.a
+./usr/lib/gcc-lib/sh-unknown-openbsd5.8/4.2.1/libgcov.a
+./usr/lib/gcc-lib/sh-unknown-openbsd5.8/4.2.1/specs
 ./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 551b34f19f0..419ad10677a 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.7
-./usr/include/g++/mips64el-unknown-openbsd5.7/bits
-./usr/include/g++/mips64el-unknown-openbsd5.7/bits/atomic_word.h
-./usr/include/g++/mips64el-unknown-openbsd5.7/bits/basic_file.h
-./usr/include/g++/mips64el-unknown-openbsd5.7/bits/c++allocator.h
-./usr/include/g++/mips64el-unknown-openbsd5.7/bits/c++config.h
-./usr/include/g++/mips64el-unknown-openbsd5.7/bits/c++io.h
-./usr/include/g++/mips64el-unknown-openbsd5.7/bits/c++locale.h
-./usr/include/g++/mips64el-unknown-openbsd5.7/bits/c++locale_internal.h
-./usr/include/g++/mips64el-unknown-openbsd5.7/bits/compatibility.h
-./usr/include/g++/mips64el-unknown-openbsd5.7/bits/cpu_defines.h
-./usr/include/g++/mips64el-unknown-openbsd5.7/bits/ctype_base.h
-./usr/include/g++/mips64el-unknown-openbsd5.7/bits/ctype_inline.h
-./usr/include/g++/mips64el-unknown-openbsd5.7/bits/ctype_noninline.h
-./usr/include/g++/mips64el-unknown-openbsd5.7/bits/cxxabi_tweaks.h
-./usr/include/g++/mips64el-unknown-openbsd5.7/bits/gthr-default.h
-./usr/include/g++/mips64el-unknown-openbsd5.7/bits/gthr-posix.h
-./usr/include/g++/mips64el-unknown-openbsd5.7/bits/gthr-single.h
-./usr/include/g++/mips64el-unknown-openbsd5.7/bits/gthr-tpf.h
-./usr/include/g++/mips64el-unknown-openbsd5.7/bits/gthr.h
-./usr/include/g++/mips64el-unknown-openbsd5.7/bits/messages_members.h
-./usr/include/g++/mips64el-unknown-openbsd5.7/bits/os_defines.h
-./usr/include/g++/mips64el-unknown-openbsd5.7/bits/time_members.h
+./usr/include/g++/mips64el-unknown-openbsd5.8
+./usr/include/g++/mips64el-unknown-openbsd5.8/bits
+./usr/include/g++/mips64el-unknown-openbsd5.8/bits/atomic_word.h
+./usr/include/g++/mips64el-unknown-openbsd5.8/bits/basic_file.h
+./usr/include/g++/mips64el-unknown-openbsd5.8/bits/c++allocator.h
+./usr/include/g++/mips64el-unknown-openbsd5.8/bits/c++config.h
+./usr/include/g++/mips64el-unknown-openbsd5.8/bits/c++io.h
+./usr/include/g++/mips64el-unknown-openbsd5.8/bits/c++locale.h
+./usr/include/g++/mips64el-unknown-openbsd5.8/bits/c++locale_internal.h
+./usr/include/g++/mips64el-unknown-openbsd5.8/bits/compatibility.h
+./usr/include/g++/mips64el-unknown-openbsd5.8/bits/cpu_defines.h
+./usr/include/g++/mips64el-unknown-openbsd5.8/bits/ctype_base.h
+./usr/include/g++/mips64el-unknown-openbsd5.8/bits/ctype_inline.h
+./usr/include/g++/mips64el-unknown-openbsd5.8/bits/ctype_noninline.h
+./usr/include/g++/mips64el-unknown-openbsd5.8/bits/cxxabi_tweaks.h
+./usr/include/g++/mips64el-unknown-openbsd5.8/bits/gthr-default.h
+./usr/include/g++/mips64el-unknown-openbsd5.8/bits/gthr-posix.h
+./usr/include/g++/mips64el-unknown-openbsd5.8/bits/gthr-single.h
+./usr/include/g++/mips64el-unknown-openbsd5.8/bits/gthr-tpf.h
+./usr/include/g++/mips64el-unknown-openbsd5.8/bits/gthr.h
+./usr/include/g++/mips64el-unknown-openbsd5.8/bits/messages_members.h
+./usr/include/g++/mips64el-unknown-openbsd5.8/bits/os_defines.h
+./usr/include/g++/mips64el-unknown-openbsd5.8/bits/time_members.h
 ./usr/include/g++/ostream
 ./usr/include/g++/streambuf
 ./usr/include/g++/tr1
@@ -652,15 +652,15 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.7
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.7/4.2.1
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.7/4.2.1/cc1
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.7/4.2.1/cc1obj
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.7/4.2.1/cc1plus
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.7/4.2.1/collect2
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.7/4.2.1/libgcc.a
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.7/4.2.1/libgcov.a
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.7/4.2.1/specs
+./usr/lib/gcc-lib/mips64el-unknown-openbsd5.8
+./usr/lib/gcc-lib/mips64el-unknown-openbsd5.8/4.2.1
+./usr/lib/gcc-lib/mips64el-unknown-openbsd5.8/4.2.1/cc1
+./usr/lib/gcc-lib/mips64el-unknown-openbsd5.8/4.2.1/cc1obj
+./usr/lib/gcc-lib/mips64el-unknown-openbsd5.8/4.2.1/cc1plus
+./usr/lib/gcc-lib/mips64el-unknown-openbsd5.8/4.2.1/collect2
+./usr/lib/gcc-lib/mips64el-unknown-openbsd5.8/4.2.1/libgcc.a
+./usr/lib/gcc-lib/mips64el-unknown-openbsd5.8/4.2.1/libgcov.a
+./usr/lib/gcc-lib/mips64el-unknown-openbsd5.8/4.2.1/specs
 ./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 af7d0454c81..82f8e3af366 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.7
-./usr/include/g++/m88k-unknown-openbsd5.7/bits
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/atomicity.h
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/basic_file.h
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/c++config.h
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/c++io.h
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/c++locale.h
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/codecvt_specializations.h
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/ctype_base.h
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/ctype_inline.h
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/ctype_noninline.h
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/gthr-default.h
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/gthr-posix.h
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/gthr-single.h
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/gthr.h
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/messages_members.h
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/os_defines.h
-./usr/include/g++/m88k-unknown-openbsd5.7/bits/time_members.h
+./usr/include/g++/m88k-unknown-openbsd5.8
+./usr/include/g++/m88k-unknown-openbsd5.8/bits
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/atomicity.h
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/basic_file.h
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/c++config.h
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/c++io.h
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/c++locale.h
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/codecvt_specializations.h
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/ctype_base.h
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/ctype_inline.h
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/ctype_noninline.h
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/gthr-default.h
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/gthr-posix.h
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/gthr-single.h
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/gthr.h
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/messages_members.h
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/os_defines.h
+./usr/include/g++/m88k-unknown-openbsd5.8/bits/time_members.h
 ./usr/include/g++/ostream
 ./usr/include/g++/streambuf
 ./usr/include/ieeefp.h
@@ -253,21 +253,21 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.7
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.7/3.3.6
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.7/3.3.6/SYSCALLS.c.X
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.7/3.3.6/cc1
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.7/3.3.6/cc1obj
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.7/3.3.6/cc1plus
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.7/3.3.6/collect2
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.7/3.3.6/fPIC
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.7/3.3.6/fPIC/libgcc.a
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.7/3.3.6/fpic
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.7/3.3.6/fpic/libgcc.a
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.7/3.3.6/include
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.7/3.3.6/include/unwind.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.7/3.3.6/libgcc.a
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.7/3.3.6/specs
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.8
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.8/3.3.6
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.8/3.3.6/SYSCALLS.c.X
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.8/3.3.6/cc1
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.8/3.3.6/cc1obj
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.8/3.3.6/cc1plus
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.8/3.3.6/collect2
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.8/3.3.6/fPIC
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.8/3.3.6/fPIC/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.8/3.3.6/fpic
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.8/3.3.6/fpic/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.8/3.3.6/include
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.8/3.3.6/include/unwind.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.8/3.3.6/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.8/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 30fa69209e3..f392572f73f 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.7
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/atomic_word.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/basic_file.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/c++allocator.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/c++config.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/c++io.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/c++locale.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/c++locale_internal.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/compatibility.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/cpu_defines.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/ctype_base.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/ctype_inline.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/ctype_noninline.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/cxxabi_tweaks.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/gthr-default.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/gthr-posix.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/gthr-single.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/gthr-tpf.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/gthr.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/messages_members.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/os_defines.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/time_members.h
+./usr/include/g++/powerpc-unknown-openbsd5.8
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/atomic_word.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/basic_file.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/c++allocator.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/c++config.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/c++io.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/c++locale.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/c++locale_internal.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/compatibility.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/cpu_defines.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/ctype_base.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/ctype_inline.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/ctype_noninline.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/cxxabi_tweaks.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/gthr-default.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/gthr-posix.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/gthr-single.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/gthr-tpf.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/gthr.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/messages_members.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/os_defines.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/time_members.h
 ./usr/include/g++/streambuf
 ./usr/include/g++/tr1
 ./usr/include/g++/tr1/array
@@ -648,15 +648,15 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.7
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.7/4.2.1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.7/4.2.1/cc1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.7/4.2.1/cc1obj
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.7/4.2.1/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.7/4.2.1/collect2
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.7/4.2.1/libgcc.a
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.7/4.2.1/libgcov.a
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.7/4.2.1/specs
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.8
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.8/4.2.1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.8/4.2.1/cc1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.8/4.2.1/cc1obj
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.8/4.2.1/cc1plus
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.8/4.2.1/collect2
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.8/4.2.1/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.8/4.2.1/libgcov.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.8/4.2.1/specs
 ./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 89970b86318..dec40f87543 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.7
-./usr/include/g++/mips64-unknown-openbsd5.7/bits
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/atomic_word.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/basic_file.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/c++allocator.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/c++config.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/c++io.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/c++locale.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/c++locale_internal.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/compatibility.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/cpu_defines.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/ctype_base.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/ctype_inline.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/ctype_noninline.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/cxxabi_tweaks.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/gthr-default.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/gthr-posix.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/gthr-single.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/gthr-tpf.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/gthr.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/messages_members.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/os_defines.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/time_members.h
+./usr/include/g++/mips64-unknown-openbsd5.8
+./usr/include/g++/mips64-unknown-openbsd5.8/bits
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/atomic_word.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/basic_file.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/c++allocator.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/c++config.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/c++io.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/c++locale.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/c++locale_internal.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/compatibility.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/cpu_defines.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/ctype_base.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/ctype_inline.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/ctype_noninline.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/cxxabi_tweaks.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/gthr-default.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/gthr-posix.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/gthr-single.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/gthr-tpf.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/gthr.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/messages_members.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/os_defines.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/time_members.h
 ./usr/include/g++/ostream
 ./usr/include/g++/streambuf
 ./usr/include/g++/tr1
@@ -650,15 +650,15 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.7
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.7/4.2.1
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.7/4.2.1/cc1
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.7/4.2.1/cc1obj
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.7/4.2.1/cc1plus
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.7/4.2.1/collect2
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.7/4.2.1/libgcc.a
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.7/4.2.1/libgcov.a
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.7/4.2.1/specs
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.8
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.8/4.2.1
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.8/4.2.1/cc1
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.8/4.2.1/cc1obj
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.8/4.2.1/cc1plus
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.8/4.2.1/collect2
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.8/4.2.1/libgcc.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.8/4.2.1/libgcov.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.8/4.2.1/specs
 ./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 eb7a9b2e957..626ee86ad42 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.7
-./usr/include/g++/mips64-unknown-openbsd5.7/bits
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/atomic_word.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/basic_file.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/c++allocator.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/c++config.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/c++io.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/c++locale.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/c++locale_internal.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/compatibility.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/cpu_defines.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/ctype_base.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/ctype_inline.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/ctype_noninline.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/cxxabi_tweaks.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/gthr-default.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/gthr-posix.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/gthr-single.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/gthr-tpf.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/gthr.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/messages_members.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/os_defines.h
-./usr/include/g++/mips64-unknown-openbsd5.7/bits/time_members.h
+./usr/include/g++/mips64-unknown-openbsd5.8
+./usr/include/g++/mips64-unknown-openbsd5.8/bits
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/atomic_word.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/basic_file.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/c++allocator.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/c++config.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/c++io.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/c++locale.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/c++locale_internal.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/compatibility.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/cpu_defines.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/ctype_base.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/ctype_inline.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/ctype_noninline.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/cxxabi_tweaks.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/gthr-default.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/gthr-posix.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/gthr-single.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/gthr-tpf.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/gthr.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/messages_members.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/os_defines.h
+./usr/include/g++/mips64-unknown-openbsd5.8/bits/time_members.h
 ./usr/include/g++/ostream
 ./usr/include/g++/streambuf
 ./usr/include/g++/tr1
@@ -650,15 +650,15 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.7
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.7/4.2.1
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.7/4.2.1/cc1
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.7/4.2.1/cc1obj
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.7/4.2.1/cc1plus
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.7/4.2.1/collect2
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.7/4.2.1/libgcc.a
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.7/4.2.1/libgcov.a
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.7/4.2.1/specs
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.8
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.8/4.2.1
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.8/4.2.1/cc1
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.8/4.2.1/cc1obj
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.8/4.2.1/cc1plus
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.8/4.2.1/collect2
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.8/4.2.1/libgcc.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.8/4.2.1/libgcov.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.8/4.2.1/specs
 ./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 bf819fedd5c..5f9af98f58a 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.7
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/atomic_word.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/basic_file.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/c++allocator.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/c++config.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/c++io.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/c++locale.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/c++locale_internal.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/compatibility.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/cpu_defines.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/ctype_base.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/ctype_inline.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/ctype_noninline.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/cxxabi_tweaks.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/gthr-default.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/gthr-posix.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/gthr-single.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/gthr-tpf.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/gthr.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/messages_members.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/os_defines.h
-./usr/include/g++/powerpc-unknown-openbsd5.7/bits/time_members.h
+./usr/include/g++/powerpc-unknown-openbsd5.8
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/atomic_word.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/basic_file.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/c++allocator.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/c++config.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/c++io.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/c++locale.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/c++locale_internal.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/compatibility.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/cpu_defines.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/ctype_base.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/ctype_inline.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/ctype_noninline.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/cxxabi_tweaks.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/gthr-default.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/gthr-posix.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/gthr-single.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/gthr-tpf.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/gthr.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/messages_members.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/os_defines.h
+./usr/include/g++/powerpc-unknown-openbsd5.8/bits/time_members.h
 ./usr/include/g++/streambuf
 ./usr/include/g++/tr1
 ./usr/include/g++/tr1/array
@@ -642,15 +642,15 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.7
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.7/4.2.1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.7/4.2.1/cc1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.7/4.2.1/cc1obj
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.7/4.2.1/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.7/4.2.1/collect2
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.7/4.2.1/libgcc.a
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.7/4.2.1/libgcov.a
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.7/4.2.1/specs
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.8
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.8/4.2.1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.8/4.2.1/cc1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.8/4.2.1/cc1obj
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.8/4.2.1/cc1plus
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.8/4.2.1/collect2
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.8/4.2.1/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.8/4.2.1/libgcov.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.8/4.2.1/specs
 ./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 5a0a7dec792..5dda8fc88d2 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.7
-./usr/include/g++/sparc-unknown-openbsd5.7/bits
-./usr/include/g++/sparc-unknown-openbsd5.7/bits/atomic_word.h
-./usr/include/g++/sparc-unknown-openbsd5.7/bits/basic_file.h
-./usr/include/g++/sparc-unknown-openbsd5.7/bits/c++allocator.h
-./usr/include/g++/sparc-unknown-openbsd5.7/bits/c++config.h
-./usr/include/g++/sparc-unknown-openbsd5.7/bits/c++io.h
-./usr/include/g++/sparc-unknown-openbsd5.7/bits/c++locale.h
-./usr/include/g++/sparc-unknown-openbsd5.7/bits/c++locale_internal.h
-./usr/include/g++/sparc-unknown-openbsd5.7/bits/compatibility.h
-./usr/include/g++/sparc-unknown-openbsd5.7/bits/cpu_defines.h
-./usr/include/g++/sparc-unknown-openbsd5.7/bits/ctype_base.h
-./usr/include/g++/sparc-unknown-openbsd5.7/bits/ctype_inline.h
-./usr/include/g++/sparc-unknown-openbsd5.7/bits/ctype_noninline.h
-./usr/include/g++/sparc-unknown-openbsd5.7/bits/cxxabi_tweaks.h
-./usr/include/g++/sparc-unknown-openbsd5.7/bits/gthr-default.h
-./usr/include/g++/sparc-unknown-openbsd5.7/bits/gthr-posix.h
-./usr/include/g++/sparc-unknown-openbsd5.7/bits/gthr-single.h
-./usr/include/g++/sparc-unknown-openbsd5.7/bits/gthr-tpf.h
-./usr/include/g++/sparc-unknown-openbsd5.7/bits/gthr.h
-./usr/include/g++/sparc-unknown-openbsd5.7/bits/messages_members.h
-./usr/include/g++/sparc-unknown-openbsd5.7/bits/os_defines.h
-./usr/include/g++/sparc-unknown-openbsd5.7/bits/time_members.h
+./usr/include/g++/sparc-unknown-openbsd5.8
+./usr/include/g++/sparc-unknown-openbsd5.8/bits
+./usr/include/g++/sparc-unknown-openbsd5.8/bits/atomic_word.h
+./usr/include/g++/sparc-unknown-openbsd5.8/bits/basic_file.h
+./usr/include/g++/sparc-unknown-openbsd5.8/bits/c++allocator.h
+./usr/include/g++/sparc-unknown-openbsd5.8/bits/c++config.h
+./usr/include/g++/sparc-unknown-openbsd5.8/bits/c++io.h
+./usr/include/g++/sparc-unknown-openbsd5.8/bits/c++locale.h
+./usr/include/g++/sparc-unknown-openbsd5.8/bits/c++locale_internal.h
+./usr/include/g++/sparc-unknown-openbsd5.8/bits/compatibility.h
+./usr/include/g++/sparc-unknown-openbsd5.8/bits/cpu_defines.h
+./usr/include/g++/sparc-unknown-openbsd5.8/bits/ctype_base.h
+./usr/include/g++/sparc-unknown-openbsd5.8/bits/ctype_inline.h
+./usr/include/g++/sparc-unknown-openbsd5.8/bits/ctype_noninline.h
+./usr/include/g++/sparc-unknown-openbsd5.8/bits/cxxabi_tweaks.h
+./usr/include/g++/sparc-unknown-openbsd5.8/bits/gthr-default.h
+./usr/include/g++/sparc-unknown-openbsd5.8/bits/gthr-posix.h
+./usr/include/g++/sparc-unknown-openbsd5.8/bits/gthr-single.h
+./usr/include/g++/sparc-unknown-openbsd5.8/bits/gthr-tpf.h
+./usr/include/g++/sparc-unknown-openbsd5.8/bits/gthr.h
+./usr/include/g++/sparc-unknown-openbsd5.8/bits/messages_members.h
+./usr/include/g++/sparc-unknown-openbsd5.8/bits/os_defines.h
+./usr/include/g++/sparc-unknown-openbsd5.8/bits/time_members.h
 ./usr/include/g++/streambuf
 ./usr/include/g++/tr1
 ./usr/include/g++/tr1/array
@@ -609,15 +609,15 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.7
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.7/4.2.1
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.7/4.2.1/cc1
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.7/4.2.1/cc1obj
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.7/4.2.1/cc1plus
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.7/4.2.1/collect2
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.7/4.2.1/libgcc.a
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.7/4.2.1/libgcov.a
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.7/4.2.1/specs
+./usr/lib/gcc-lib/sparc-unknown-openbsd5.8
+./usr/lib/gcc-lib/sparc-unknown-openbsd5.8/4.2.1
+./usr/lib/gcc-lib/sparc-unknown-openbsd5.8/4.2.1/cc1
+./usr/lib/gcc-lib/sparc-unknown-openbsd5.8/4.2.1/cc1obj
+./usr/lib/gcc-lib/sparc-unknown-openbsd5.8/4.2.1/cc1plus
+./usr/lib/gcc-lib/sparc-unknown-openbsd5.8/4.2.1/collect2
+./usr/lib/gcc-lib/sparc-unknown-openbsd5.8/4.2.1/libgcc.a
+./usr/lib/gcc-lib/sparc-unknown-openbsd5.8/4.2.1/libgcov.a
+./usr/lib/gcc-lib/sparc-unknown-openbsd5.8/4.2.1/specs
 ./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 11c1647eb24..46b352c255f 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.7
-./usr/include/g++/sparc64-unknown-openbsd5.7/bits
-./usr/include/g++/sparc64-unknown-openbsd5.7/bits/atomic_word.h
-./usr/include/g++/sparc64-unknown-openbsd5.7/bits/basic_file.h
-./usr/include/g++/sparc64-unknown-openbsd5.7/bits/c++allocator.h
-./usr/include/g++/sparc64-unknown-openbsd5.7/bits/c++config.h
-./usr/include/g++/sparc64-unknown-openbsd5.7/bits/c++io.h
-./usr/include/g++/sparc64-unknown-openbsd5.7/bits/c++locale.h
-./usr/include/g++/sparc64-unknown-openbsd5.7/bits/c++locale_internal.h
-./usr/include/g++/sparc64-unknown-openbsd5.7/bits/compatibility.h
-./usr/include/g++/sparc64-unknown-openbsd5.7/bits/cpu_defines.h
-./usr/include/g++/sparc64-unknown-openbsd5.7/bits/ctype_base.h
-./usr/include/g++/sparc64-unknown-openbsd5.7/bits/ctype_inline.h
-./usr/include/g++/sparc64-unknown-openbsd5.7/bits/ctype_noninline.h
-./usr/include/g++/sparc64-unknown-openbsd5.7/bits/cxxabi_tweaks.h
-./usr/include/g++/sparc64-unknown-openbsd5.7/bits/gthr-default.h
-./usr/include/g++/sparc64-unknown-openbsd5.7/bits/gthr-posix.h
-./usr/include/g++/sparc64-unknown-openbsd5.7/bits/gthr-single.h
-./usr/include/g++/sparc64-unknown-openbsd5.7/bits/gthr-tpf.h
-./usr/include/g++/sparc64-unknown-openbsd5.7/bits/gthr.h
-./usr/include/g++/sparc64-unknown-openbsd5.7/bits/messages_members.h
-./usr/include/g++/sparc64-unknown-openbsd5.7/bits/os_defines.h
-./usr/include/g++/sparc64-unknown-openbsd5.7/bits/time_members.h
+./usr/include/g++/sparc64-unknown-openbsd5.8
+./usr/include/g++/sparc64-unknown-openbsd5.8/bits
+./usr/include/g++/sparc64-unknown-openbsd5.8/bits/atomic_word.h
+./usr/include/g++/sparc64-unknown-openbsd5.8/bits/basic_file.h
+./usr/include/g++/sparc64-unknown-openbsd5.8/bits/c++allocator.h
+./usr/include/g++/sparc64-unknown-openbsd5.8/bits/c++config.h
+./usr/include/g++/sparc64-unknown-openbsd5.8/bits/c++io.h
+./usr/include/g++/sparc64-unknown-openbsd5.8/bits/c++locale.h
+./usr/include/g++/sparc64-unknown-openbsd5.8/bits/c++locale_internal.h
+./usr/include/g++/sparc64-unknown-openbsd5.8/bits/compatibility.h
+./usr/include/g++/sparc64-unknown-openbsd5.8/bits/cpu_defines.h
+./usr/include/g++/sparc64-unknown-openbsd5.8/bits/ctype_base.h
+./usr/include/g++/sparc64-unknown-openbsd5.8/bits/ctype_inline.h
+./usr/include/g++/sparc64-unknown-openbsd5.8/bits/ctype_noninline.h
+./usr/include/g++/sparc64-unknown-openbsd5.8/bits/cxxabi_tweaks.h
+./usr/include/g++/sparc64-unknown-openbsd5.8/bits/gthr-default.h
+./usr/include/g++/sparc64-unknown-openbsd5.8/bits/gthr-posix.h
+./usr/include/g++/sparc64-unknown-openbsd5.8/bits/gthr-single.h
+./usr/include/g++/sparc64-unknown-openbsd5.8/bits/gthr-tpf.h
+./usr/include/g++/sparc64-unknown-openbsd5.8/bits/gthr.h
+./usr/include/g++/sparc64-unknown-openbsd5.8/bits/messages_members.h
+./usr/include/g++/sparc64-unknown-openbsd5.8/bits/os_defines.h
+./usr/include/g++/sparc64-unknown-openbsd5.8/bits/time_members.h
 ./usr/include/g++/streambuf
 ./usr/include/g++/tr1
 ./usr/include/g++/tr1/array
@@ -611,15 +611,15 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.7
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.7/4.2.1
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.7/4.2.1/cc1
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.7/4.2.1/cc1obj
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.7/4.2.1/cc1plus
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.7/4.2.1/collect2
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.7/4.2.1/libgcc.a
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.7/4.2.1/libgcov.a
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.7/4.2.1/specs
+./usr/lib/gcc-lib/sparc64-unknown-openbsd5.8
+./usr/lib/gcc-lib/sparc64-unknown-openbsd5.8/4.2.1
+./usr/lib/gcc-lib/sparc64-unknown-openbsd5.8/4.2.1/cc1
+./usr/lib/gcc-lib/sparc64-unknown-openbsd5.8/4.2.1/cc1obj
+./usr/lib/gcc-lib/sparc64-unknown-openbsd5.8/4.2.1/cc1plus
+./usr/lib/gcc-lib/sparc64-unknown-openbsd5.8/4.2.1/collect2
+./usr/lib/gcc-lib/sparc64-unknown-openbsd5.8/4.2.1/libgcc.a
+./usr/lib/gcc-lib/sparc64-unknown-openbsd5.8/4.2.1/libgcov.a
+./usr/lib/gcc-lib/sparc64-unknown-openbsd5.8/4.2.1/specs
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
 ./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.vax b/distrib/sets/lists/comp/md.vax
index dc2834f5f5c..df0038eb442 100644
--- a/distrib/sets/lists/comp/md.vax
+++ b/distrib/sets/lists/comp/md.vax
@@ -133,24 +133,24 @@
 ./usr/include/g++/locale
 ./usr/include/g++/ostream
 ./usr/include/g++/streambuf
-./usr/include/g++/vax-unknown-openbsd5.7
-./usr/include/g++/vax-unknown-openbsd5.7/bits
-./usr/include/g++/vax-unknown-openbsd5.7/bits/atomicity.h
-./usr/include/g++/vax-unknown-openbsd5.7/bits/basic_file.h
-./usr/include/g++/vax-unknown-openbsd5.7/bits/c++config.h
-./usr/include/g++/vax-unknown-openbsd5.7/bits/c++io.h
-./usr/include/g++/vax-unknown-openbsd5.7/bits/c++locale.h
-./usr/include/g++/vax-unknown-openbsd5.7/bits/codecvt_specializations.h
-./usr/include/g++/vax-unknown-openbsd5.7/bits/ctype_base.h
-./usr/include/g++/vax-unknown-openbsd5.7/bits/ctype_inline.h
-./usr/include/g++/vax-unknown-openbsd5.7/bits/ctype_noninline.h
-./usr/include/g++/vax-unknown-openbsd5.7/bits/gthr-default.h
-./usr/include/g++/vax-unknown-openbsd5.7/bits/gthr-posix.h
-./usr/include/g++/vax-unknown-openbsd5.7/bits/gthr-single.h
-./usr/include/g++/vax-unknown-openbsd5.7/bits/gthr.h
-./usr/include/g++/vax-unknown-openbsd5.7/bits/messages_members.h
-./usr/include/g++/vax-unknown-openbsd5.7/bits/os_defines.h
-./usr/include/g++/vax-unknown-openbsd5.7/bits/time_members.h
+./usr/include/g++/vax-unknown-openbsd5.8
+./usr/include/g++/vax-unknown-openbsd5.8/bits
+./usr/include/g++/vax-unknown-openbsd5.8/bits/atomicity.h
+./usr/include/g++/vax-unknown-openbsd5.8/bits/basic_file.h
+./usr/include/g++/vax-unknown-openbsd5.8/bits/c++config.h
+./usr/include/g++/vax-unknown-openbsd5.8/bits/c++io.h
+./usr/include/g++/vax-unknown-openbsd5.8/bits/c++locale.h
+./usr/include/g++/vax-unknown-openbsd5.8/bits/codecvt_specializations.h
+./usr/include/g++/vax-unknown-openbsd5.8/bits/ctype_base.h
+./usr/include/g++/vax-unknown-openbsd5.8/bits/ctype_inline.h
+./usr/include/g++/vax-unknown-openbsd5.8/bits/ctype_noninline.h
+./usr/include/g++/vax-unknown-openbsd5.8/bits/gthr-default.h
+./usr/include/g++/vax-unknown-openbsd5.8/bits/gthr-posix.h
+./usr/include/g++/vax-unknown-openbsd5.8/bits/gthr-single.h
+./usr/include/g++/vax-unknown-openbsd5.8/bits/gthr.h
+./usr/include/g++/vax-unknown-openbsd5.8/bits/messages_members.h
+./usr/include/g++/vax-unknown-openbsd5.8/bits/os_defines.h
+./usr/include/g++/vax-unknown-openbsd5.8/bits/time_members.h
 ./usr/include/unwind.h
 ./usr/include/vax
 ./usr/include/vax/_float.h
@@ -215,17 +215,17 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/vax-unknown-openbsd5.7
-./usr/lib/gcc-lib/vax-unknown-openbsd5.7/3.3.6
-./usr/lib/gcc-lib/vax-unknown-openbsd5.7/3.3.6/SYSCALLS.c.X
-./usr/lib/gcc-lib/vax-unknown-openbsd5.7/3.3.6/cc1
-./usr/lib/gcc-lib/vax-unknown-openbsd5.7/3.3.6/cc1obj
-./usr/lib/gcc-lib/vax-unknown-openbsd5.7/3.3.6/cc1plus
-./usr/lib/gcc-lib/vax-unknown-openbsd5.7/3.3.6/collect2
-./usr/lib/gcc-lib/vax-unknown-openbsd5.7/3.3.6/include
-./usr/lib/gcc-lib/vax-unknown-openbsd5.7/3.3.6/include/unwind.h
-./usr/lib/gcc-lib/vax-unknown-openbsd5.7/3.3.6/libgcc.a
-./usr/lib/gcc-lib/vax-unknown-openbsd5.7/3.3.6/specs
+./usr/lib/gcc-lib/vax-unknown-openbsd5.8
+./usr/lib/gcc-lib/vax-unknown-openbsd5.8/3.3.6
+./usr/lib/gcc-lib/vax-unknown-openbsd5.8/3.3.6/SYSCALLS.c.X
+./usr/lib/gcc-lib/vax-unknown-openbsd5.8/3.3.6/cc1
+./usr/lib/gcc-lib/vax-unknown-openbsd5.8/3.3.6/cc1obj
+./usr/lib/gcc-lib/vax-unknown-openbsd5.8/3.3.6/cc1plus
+./usr/lib/gcc-lib/vax-unknown-openbsd5.8/3.3.6/collect2
+./usr/lib/gcc-lib/vax-unknown-openbsd5.8/3.3.6/include
+./usr/lib/gcc-lib/vax-unknown-openbsd5.8/3.3.6/include/unwind.h
+./usr/lib/gcc-lib/vax-unknown-openbsd5.8/3.3.6/libgcc.a
+./usr/lib/gcc-lib/vax-unknown-openbsd5.8/3.3.6/specs
 ./usr/lib/libsupc++.a
 ./usr/libdata/ldscripts
 ./usr/libdata/ldscripts/elf32vax_obsd.x
diff --git a/distrib/sets/lists/comp/md.zaurus b/distrib/sets/lists/comp/md.zaurus
index 700b186c9b9..a3dccbc3739 100644
--- a/distrib/sets/lists/comp/md.zaurus
+++ b/distrib/sets/lists/comp/md.zaurus
@@ -52,29 +52,29 @@
 ./usr/include/arm/trap.h
 ./usr/include/arm/undefined.h
 ./usr/include/arm/vmparam.h
-./usr/include/g++/arm-unknown-openbsd5.7
-./usr/include/g++/arm-unknown-openbsd5.7/bits
-./usr/include/g++/arm-unknown-openbsd5.7/bits/atomic_word.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/basic_file.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/c++allocator.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/c++config.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/c++io.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/c++locale.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/c++locale_internal.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/compatibility.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/cpu_defines.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/ctype_base.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/ctype_inline.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/ctype_noninline.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/cxxabi_tweaks.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/gthr-default.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/gthr-posix.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/gthr-single.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/gthr-tpf.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/gthr.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/messages_members.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/os_defines.h
-./usr/include/g++/arm-unknown-openbsd5.7/bits/time_members.h
+./usr/include/g++/arm-unknown-openbsd5.8
+./usr/include/g++/arm-unknown-openbsd5.8/bits
+./usr/include/g++/arm-unknown-openbsd5.8/bits/atomic_word.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/basic_file.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/c++allocator.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/c++config.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/c++io.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/c++locale.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/c++locale_internal.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/compatibility.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/cpu_defines.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/ctype_base.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/ctype_inline.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/ctype_noninline.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/cxxabi_tweaks.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/gthr-default.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/gthr-posix.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/gthr-single.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/gthr-tpf.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/gthr.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/messages_members.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/os_defines.h
+./usr/include/g++/arm-unknown-openbsd5.8/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -647,15 +647,15 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/arm-unknown-openbsd5.7
-./usr/lib/gcc-lib/arm-unknown-openbsd5.7/4.2.1
-./usr/lib/gcc-lib/arm-unknown-openbsd5.7/4.2.1/cc1
-./usr/lib/gcc-lib/arm-unknown-openbsd5.7/4.2.1/cc1obj
-./usr/lib/gcc-lib/arm-unknown-openbsd5.7/4.2.1/cc1plus
-./usr/lib/gcc-lib/arm-unknown-openbsd5.7/4.2.1/collect2
-./usr/lib/gcc-lib/arm-unknown-openbsd5.7/4.2.1/libgcc.a
-./usr/lib/gcc-lib/arm-unknown-openbsd5.7/4.2.1/libgcov.a
-./usr/lib/gcc-lib/arm-unknown-openbsd5.7/4.2.1/specs
+./usr/lib/gcc-lib/arm-unknown-openbsd5.8
+./usr/lib/gcc-lib/arm-unknown-openbsd5.8/4.2.1
+./usr/lib/gcc-lib/arm-unknown-openbsd5.8/4.2.1/cc1
+./usr/lib/gcc-lib/arm-unknown-openbsd5.8/4.2.1/cc1obj
+./usr/lib/gcc-lib/arm-unknown-openbsd5.8/4.2.1/cc1plus
+./usr/lib/gcc-lib/arm-unknown-openbsd5.8/4.2.1/collect2
+./usr/lib/gcc-lib/arm-unknown-openbsd5.8/4.2.1/libgcc.a
+./usr/lib/gcc-lib/arm-unknown-openbsd5.8/4.2.1/libgcov.a
+./usr/lib/gcc-lib/arm-unknown-openbsd5.8/4.2.1/specs
 ./usr/lib/libarm.a
 ./usr/lib/libarm_p.a
 ./usr/lib/libstdc++_p.a