summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2013-07-07 21:07:42 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2013-07-07 21:07:42 +0000
commitd098f44be10c74a73bac76c10d070a406b3a1c05 (patch)
tree06654ed1f0cb72f18beda0c40dd967fa4ab17641 /distrib
parent279c14a4c9ac668ee2c0c763431496ad6ac9b9a4 (diff)
sync
Diffstat (limited to 'distrib')
-rw-r--r--distrib/sets/lists/base/md.alpha56
-rw-r--r--distrib/sets/lists/base/md.amd6456
-rw-r--r--distrib/sets/lists/base/md.armish56
-rw-r--r--distrib/sets/lists/base/md.aviion48
-rw-r--r--distrib/sets/lists/base/md.beagle56
-rw-r--r--distrib/sets/lists/base/md.hp30048
-rw-r--r--distrib/sets/lists/base/md.hppa56
-rw-r--r--distrib/sets/lists/base/md.hppa6446
-rw-r--r--distrib/sets/lists/base/md.i38656
-rw-r--r--distrib/sets/lists/base/md.landisk46
-rw-r--r--distrib/sets/lists/base/md.loongson48
-rw-r--r--distrib/sets/lists/base/md.luna88k48
-rw-r--r--distrib/sets/lists/base/md.macppc56
-rw-r--r--distrib/sets/lists/base/md.mvme68k48
-rw-r--r--distrib/sets/lists/base/md.mvme88k48
-rw-r--r--distrib/sets/lists/base/md.octeon48
-rw-r--r--distrib/sets/lists/base/md.sgi48
-rw-r--r--distrib/sets/lists/base/md.socppc56
-rw-r--r--distrib/sets/lists/base/md.sparc56
-rw-r--r--distrib/sets/lists/base/md.sparc6456
-rw-r--r--distrib/sets/lists/base/md.vax14
-rw-r--r--distrib/sets/lists/base/md.zaurus56
-rw-r--r--distrib/sets/lists/comp/md.alpha54
-rw-r--r--distrib/sets/lists/comp/md.amd6454
-rw-r--r--distrib/sets/lists/comp/md.armish54
-rw-r--r--distrib/sets/lists/comp/md.aviion46
-rw-r--r--distrib/sets/lists/comp/md.beagle54
-rw-r--r--distrib/sets/lists/comp/md.hp30054
-rw-r--r--distrib/sets/lists/comp/md.hppa54
-rw-r--r--distrib/sets/lists/comp/md.hppa6448
-rw-r--r--distrib/sets/lists/comp/md.i38654
-rw-r--r--distrib/sets/lists/comp/md.landisk64
-rw-r--r--distrib/sets/lists/comp/md.loongson62
-rw-r--r--distrib/sets/lists/comp/md.luna88k54
-rw-r--r--distrib/sets/lists/comp/md.macppc54
-rw-r--r--distrib/sets/lists/comp/md.mvme68k54
-rw-r--r--distrib/sets/lists/comp/md.mvme88k54
-rw-r--r--distrib/sets/lists/comp/md.octeon62
-rw-r--r--distrib/sets/lists/comp/md.sgi62
-rw-r--r--distrib/sets/lists/comp/md.socppc54
-rw-r--r--distrib/sets/lists/comp/md.sparc54
-rw-r--r--distrib/sets/lists/comp/md.sparc6454
-rw-r--r--distrib/sets/lists/comp/md.vax24
-rw-r--r--distrib/sets/lists/comp/md.zaurus54
44 files changed, 1142 insertions, 1142 deletions
diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 031b9d2fc9f..849d4e74a92 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -83,11 +83,11 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.3
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.3/4.2.1
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.3/4.2.1/cc1
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.3/4.2.1/collect2
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.3/4.2.1/specs
+./usr/lib/gcc-lib/alpha-unknown-openbsd5.4
+./usr/lib/gcc-lib/alpha-unknown-openbsd5.4/4.2.1
+./usr/lib/gcc-lib/alpha-unknown-openbsd5.4/4.2.1/cc1
+./usr/lib/gcc-lib/alpha-unknown-openbsd5.4/4.2.1/collect2
+./usr/lib/gcc-lib/alpha-unknown-openbsd5.4/4.2.1/specs
./usr/lib/libasn1.so.19.0
./usr/lib/libc.so.68.4
./usr/lib/libcom_err.so.19.0
@@ -1520,29 +1520,29 @@
./usr/libdata/perl5/site_perl/alpha-openbsd/ftw.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.3
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.3/bits
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.3/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.3/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.3/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.3/bits/c++config.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.3/bits/c++io.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.3/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.3/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.3/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.3/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.3/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.3/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.3/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.3/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.3/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.3/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.3/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.3/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.3/bits/gthr.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.3/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.3/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.3/bits/time_members.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.4
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.4/bits
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.4/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.4/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.4/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.4/bits/c++config.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.4/bits/c++io.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.4/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.4/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.4/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.4/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.4/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.4/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.4/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.4/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.4/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.4/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.4/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.4/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.4/bits/gthr.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.4/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.4/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd5.4/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 32024a24178..9b06377292c 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -89,11 +89,11 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.3
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.3/4.2.1
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.3/4.2.1/cc1
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.3/4.2.1/collect2
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.3/4.2.1/specs
+./usr/lib/gcc-lib/amd64-unknown-openbsd5.4
+./usr/lib/gcc-lib/amd64-unknown-openbsd5.4/4.2.1
+./usr/lib/gcc-lib/amd64-unknown-openbsd5.4/4.2.1/cc1
+./usr/lib/gcc-lib/amd64-unknown-openbsd5.4/4.2.1/collect2
+./usr/lib/gcc-lib/amd64-unknown-openbsd5.4/4.2.1/specs
./usr/lib/libasn1.so.19.0
./usr/lib/libc.so.68.4
./usr/lib/libcom_err.so.19.0
@@ -1547,29 +1547,29 @@
./usr/libdata/perl5/site_perl/amd64-openbsd/ftw.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.3
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.3/bits
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.3/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.3/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.3/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.3/bits/c++config.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.3/bits/c++io.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.3/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.3/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.3/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.3/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.3/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.3/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.3/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.3/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.3/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.3/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.3/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.3/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.3/bits/gthr.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.3/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.3/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.3/bits/time_members.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.4
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.4/bits
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.4/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.4/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.4/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.4/bits/c++config.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.4/bits/c++io.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.4/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.4/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.4/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.4/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.4/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.4/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.4/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.4/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.4/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.4/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.4/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.4/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.4/bits/gthr.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.4/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.4/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd5.4/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 28f112b6b80..3386e991946 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -55,11 +55,11 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/arm-unknown-openbsd5.3
-./usr/lib/gcc-lib/arm-unknown-openbsd5.3/4.2.1
-./usr/lib/gcc-lib/arm-unknown-openbsd5.3/4.2.1/cc1
-./usr/lib/gcc-lib/arm-unknown-openbsd5.3/4.2.1/collect2
-./usr/lib/gcc-lib/arm-unknown-openbsd5.3/4.2.1/specs
+./usr/lib/gcc-lib/arm-unknown-openbsd5.4
+./usr/lib/gcc-lib/arm-unknown-openbsd5.4/4.2.1
+./usr/lib/gcc-lib/arm-unknown-openbsd5.4/4.2.1/cc1
+./usr/lib/gcc-lib/arm-unknown-openbsd5.4/4.2.1/collect2
+./usr/lib/gcc-lib/arm-unknown-openbsd5.4/4.2.1/specs
./usr/lib/libasn1.so.19.0
./usr/lib/libc.so.68.4
./usr/lib/libcom_err.so.19.0
@@ -1533,29 +1533,29 @@
./usr/libdata/perl5/site_perl/arm-openbsd/ftw.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.3
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/c++config.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/c++io.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/gthr.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/time_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/c++config.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/c++io.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/gthr.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/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 994464cf806..991cff8363a 100644
--- a/distrib/sets/lists/base/md.aviion
+++ b/distrib/sets/lists/base/md.aviion
@@ -9,14 +9,14 @@
./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++/m88k-unknown-openbsd5.3/bits/atomicity.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/codecvt_specializations.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/cc1
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/collect2
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/include
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/specs
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/atomicity.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/codecvt_specializations.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/cc1
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/collect2
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/include
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/specs
./usr/lib/libhdb.so.0.0
./usr/lib/libheimbase.so.0.0
./usr/lib/libkadm5clnt.so.0.0
@@ -1162,22 +1162,22 @@
./usr/libdata/perl5/site_perl/m88k-openbsd/g++/ext
./usr/libdata/perl5/site_perl/m88k-openbsd/g++/ext/ropeimpl.ph
./usr/libdata/perl5/site_perl/m88k-openbsd/g++/ext/stdio_filebuf.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/c++config.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/c++io.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/gthr.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/time_members.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/c++config.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/c++io.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/gthr.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/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.beagle b/distrib/sets/lists/base/md.beagle
index 2201ecdbb31..df6b1eaaa2b 100644
--- a/distrib/sets/lists/base/md.beagle
+++ b/distrib/sets/lists/base/md.beagle
@@ -19,11 +19,11 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/arm-unknown-openbsd5.3
-./usr/lib/gcc-lib/arm-unknown-openbsd5.3/4.2.1
-./usr/lib/gcc-lib/arm-unknown-openbsd5.3/4.2.1/cc1
-./usr/lib/gcc-lib/arm-unknown-openbsd5.3/4.2.1/collect2
-./usr/lib/gcc-lib/arm-unknown-openbsd5.3/4.2.1/specs
+./usr/lib/gcc-lib/arm-unknown-openbsd5.4
+./usr/lib/gcc-lib/arm-unknown-openbsd5.4/4.2.1
+./usr/lib/gcc-lib/arm-unknown-openbsd5.4/4.2.1/cc1
+./usr/lib/gcc-lib/arm-unknown-openbsd5.4/4.2.1/collect2
+./usr/lib/gcc-lib/arm-unknown-openbsd5.4/4.2.1/specs
./usr/lib/libasn1.so.19.0
./usr/lib/libc.so.68.4
./usr/lib/libcom_err.so.19.0
@@ -1508,29 +1508,29 @@
./usr/libdata/perl5/site_perl/arm-openbsd/ftw.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.3
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/c++config.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/c++io.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/gthr.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/time_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/c++config.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/c++io.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/gthr.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/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.hp300 b/distrib/sets/lists/base/md.hp300
index de7b1839992..dc7b9deb186 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -20,12 +20,12 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.3
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.3/3.3.6
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.3/3.3.6/cc1
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.3/3.3.6/collect2
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.3/3.3.6/include
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.3/3.3.6/specs
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.4
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.4/3.3.6
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.4/3.3.6/cc1
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.4/3.3.6/collect2
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.4/3.3.6/include
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.4/3.3.6/specs
./usr/lib/libasn1.so.19.0
./usr/lib/libc.so.68.4
./usr/lib/libcom_err.so.19.0
@@ -1503,24 +1503,24 @@
./usr/libdata/perl5/site_perl/m68k-openbsd/g++/ext/stl_hash_fun.ph
./usr/libdata/perl5/site_perl/m68k-openbsd/g++/ext/stl_hashtable.ph
./usr/libdata/perl5/site_perl/m68k-openbsd/g++/ext/stl_rope.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/c++config.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/c++io.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/gthr.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/time_members.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/c++config.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/c++io.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/gthr.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/time_members.ph
./usr/libdata/perl5/site_perl/m68k-openbsd/getopt.ph
./usr/libdata/perl5/site_perl/m68k-openbsd/glob.ph
./usr/libdata/perl5/site_perl/m68k-openbsd/grp.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 04a2621e935..d94c45a0830 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -84,11 +84,11 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.3
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.3/4.2.1
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.3/4.2.1/cc1
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.3/4.2.1/collect2
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.3/4.2.1/specs
+./usr/lib/gcc-lib/hppa-unknown-openbsd5.4
+./usr/lib/gcc-lib/hppa-unknown-openbsd5.4/4.2.1
+./usr/lib/gcc-lib/hppa-unknown-openbsd5.4/4.2.1/cc1
+./usr/lib/gcc-lib/hppa-unknown-openbsd5.4/4.2.1/collect2
+./usr/lib/gcc-lib/hppa-unknown-openbsd5.4/4.2.1/specs
./usr/lib/libasn1.so.19.0
./usr/lib/libc.so.68.4
./usr/lib/libcom_err.so.19.0
@@ -1599,29 +1599,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.3
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.3/bits
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.3/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.3/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.3/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.3/bits/c++config.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.3/bits/c++io.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.3/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.3/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.3/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.3/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.3/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.3/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.3/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.3/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.3/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.3/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.3/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.3/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.3/bits/gthr.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.3/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.3/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.3/bits/time_members.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.4
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.4/bits
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.4/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.4/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.4/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.4/bits/c++config.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.4/bits/c++io.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.4/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.4/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.4/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.4/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.4/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.4/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.4/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.4/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.4/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.4/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.4/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.4/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.4/bits/gthr.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.4/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.4/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd5.4/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 48badc2ac0e..53c0b4fe9b0 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -85,11 +85,11 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.3
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.3/3.3.5
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.3/3.3.5/cc1
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.3/3.3.5/collect2
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.3/3.3.5/specs
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.4
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.4/3.3.5
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.4/3.3.5/cc1
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.4/3.3.5/collect2
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.4/3.3.5/specs
./usr/lib/libasn1.so.19.0
./usr/lib/libc.so.68.4
./usr/lib/libcom_err.so.19.0
@@ -1568,24 +1568,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.3
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.3/bits
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.3/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.3/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.3/bits/c++config.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.3/bits/c++io.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.3/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.3/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.3/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.3/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.3/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.3/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.3/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.3/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.3/bits/gthr.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.3/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.3/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.3/bits/time_members.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.4
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.4/bits
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.4/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.4/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.4/bits/c++config.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.4/bits/c++io.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.4/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.4/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.4/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.4/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.4/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.4/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.4/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.4/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.4/bits/gthr.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.4/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.4/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd5.4/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 25ad25e9e04..958d4c0c25c 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -91,11 +91,11 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/i386-unknown-openbsd5.3
-./usr/lib/gcc-lib/i386-unknown-openbsd5.3/4.2.1
-./usr/lib/gcc-lib/i386-unknown-openbsd5.3/4.2.1/cc1
-./usr/lib/gcc-lib/i386-unknown-openbsd5.3/4.2.1/collect2
-./usr/lib/gcc-lib/i386-unknown-openbsd5.3/4.2.1/specs
+./usr/lib/gcc-lib/i386-unknown-openbsd5.4
+./usr/lib/gcc-lib/i386-unknown-openbsd5.4/4.2.1
+./usr/lib/gcc-lib/i386-unknown-openbsd5.4/4.2.1/cc1
+./usr/lib/gcc-lib/i386-unknown-openbsd5.4/4.2.1/collect2
+./usr/lib/gcc-lib/i386-unknown-openbsd5.4/4.2.1/specs
./usr/lib/libasn1.so.19.0
./usr/lib/libc.so.68.4
./usr/lib/libcom_err.so.19.0
@@ -1607,29 +1607,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.3
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.3/bits
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.3/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.3/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.3/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.3/bits/c++config.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.3/bits/c++io.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.3/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.3/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.3/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.3/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.3/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.3/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.3/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.3/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.3/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.3/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.3/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.3/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.3/bits/gthr.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.3/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.3/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.3/bits/time_members.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.4
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.4/bits
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.4/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.4/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.4/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.4/bits/c++config.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.4/bits/c++io.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.4/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.4/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.4/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.4/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.4/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.4/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.4/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.4/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.4/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.4/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.4/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.4/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.4/bits/gthr.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.4/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.4/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd5.4/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 51595c67385..02f05cb20a7 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -1560,29 +1560,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.3
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.3/bits
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.3/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.3/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.3/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.3/bits/c++config.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.3/bits/c++io.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.3/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.3/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.3/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.3/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.3/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.3/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.3/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.3/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.3/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.3/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.3/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.3/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.3/bits/gthr.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.3/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.3/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.3/bits/time_members.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.4
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.4/bits
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.4/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.4/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.4/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.4/bits/c++config.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.4/bits/c++io.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.4/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.4/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.4/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.4/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.4/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.4/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.4/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.4/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.4/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.4/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.4/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.4/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.4/bits/gthr.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.4/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.4/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd5.4/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 adc1caf74ac..f287452d0e7 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -55,7 +55,7 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.3
+./usr/lib/gcc-lib/mips64el-unknown-openbsd5.4
./usr/lib/libasn1.so.19.0
./usr/lib/libc.so.68.4
./usr/lib/libcom_err.so.19.0
@@ -1567,29 +1567,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.3
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.3/bits
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.3/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.3/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.3/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.3/bits/c++config.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.3/bits/c++io.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.3/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.3/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.3/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.3/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.3/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.3/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.3/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.3/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.3/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.3/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.3/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.3/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.3/bits/gthr.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.3/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.3/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.3/bits/time_members.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.4
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.4/bits
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.4/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.4/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.4/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.4/bits/c++config.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.4/bits/c++io.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.4/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.4/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.4/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.4/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.4/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.4/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.4/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.4/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.4/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.4/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.4/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.4/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.4/bits/gthr.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.4/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.4/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/g++/mips64el-unknown-openbsd5.4/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 d63bec5f144..11c6eed8130 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -11,8 +11,8 @@
./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++/m88k-unknown-openbsd5.3/bits/atomicity.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/codecvt_specializations.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/atomicity.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/codecvt_specializations.h
./usr/lib/apache/modules/libproxy.so
./usr/lib/apache/modules/mod_auth_anon.so
./usr/lib/apache/modules/mod_auth_db.so
@@ -33,12 +33,12 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/cc1
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/collect2
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/include
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/specs
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/cc1
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/collect2
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/include
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/specs
./usr/lib/libasn1.so.19.0
./usr/lib/libc.so.68.4
./usr/lib/libcom_err.so.19.0
@@ -1505,22 +1505,22 @@
./usr/libdata/perl5/site_perl/m88k-openbsd/g++/ext
./usr/libdata/perl5/site_perl/m88k-openbsd/g++/ext/ropeimpl.ph
./usr/libdata/perl5/site_perl/m88k-openbsd/g++/ext/stdio_filebuf.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/c++config.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/c++io.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/gthr.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/time_members.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/c++config.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/c++io.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/gthr.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/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 e1e241e8318..56eaf1ef092 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -86,11 +86,11 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.3
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.3/4.2.1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.3/4.2.1/cc1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.3/4.2.1/collect2
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.3/4.2.1/specs
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.4
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.4/4.2.1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.4/4.2.1/cc1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.4/4.2.1/collect2
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.4/4.2.1/specs
./usr/lib/libasn1.so.19.0
./usr/lib/libc.so.68.4
./usr/lib/libcom_err.so.19.0
@@ -1602,29 +1602,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.3
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/c++config.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/c++io.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/gthr.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/time_members.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/c++config.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/c++io.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/gthr.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/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.mvme68k b/distrib/sets/lists/base/md.mvme68k
index d2092ac1ba0..7616deb9a3e 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -18,12 +18,12 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.3
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.3/3.3.6
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.3/3.3.6/cc1
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.3/3.3.6/collect2
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.3/3.3.6/include
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.3/3.3.6/specs
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.4
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.4/3.3.6
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.4/3.3.6/cc1
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.4/3.3.6/collect2
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.4/3.3.6/include
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.4/3.3.6/specs
./usr/lib/libasn1.so.19.0
./usr/lib/libc.so.68.4
./usr/lib/libcom_err.so.19.0
@@ -1501,24 +1501,24 @@
./usr/libdata/perl5/site_perl/m68k-openbsd/g++/ext/stl_hash_fun.ph
./usr/libdata/perl5/site_perl/m68k-openbsd/g++/ext/stl_hashtable.ph
./usr/libdata/perl5/site_perl/m68k-openbsd/g++/ext/stl_rope.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/c++config.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/c++io.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/gthr.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.3/bits/time_members.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/c++config.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/c++io.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/gthr.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/g++/m68k-unknown-openbsd5.4/bits/time_members.ph
./usr/libdata/perl5/site_perl/m68k-openbsd/getopt.ph
./usr/libdata/perl5/site_perl/m68k-openbsd/glob.ph
./usr/libdata/perl5/site_perl/m68k-openbsd/grp.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index f163129bbd3..d1b8c7c3118 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -10,8 +10,8 @@
./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++/m88k-unknown-openbsd5.3/bits/atomicity.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/codecvt_specializations.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/atomicity.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/codecvt_specializations.h
./usr/lib/apache/modules/libproxy.so
./usr/lib/apache/modules/mod_auth_anon.so
./usr/lib/apache/modules/mod_auth_db.so
@@ -32,12 +32,12 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/cc1
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/collect2
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/include
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/specs
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/cc1
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/collect2
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/include
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/specs
./usr/lib/libasn1.so.19.0
./usr/lib/libc.so.68.4
./usr/lib/libcom_err.so.19.0
@@ -1504,22 +1504,22 @@
./usr/libdata/perl5/site_perl/m88k-openbsd/g++/ext
./usr/libdata/perl5/site_perl/m88k-openbsd/g++/ext/ropeimpl.ph
./usr/libdata/perl5/site_perl/m88k-openbsd/g++/ext/stdio_filebuf.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/c++config.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/c++io.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/gthr.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/time_members.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/c++config.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/c++io.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/gthr.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/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.octeon b/distrib/sets/lists/base/md.octeon
index e9955fadc01..ada4a0c8268 100644
--- a/distrib/sets/lists/base/md.octeon
+++ b/distrib/sets/lists/base/md.octeon
@@ -19,7 +19,7 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.3
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.4
./usr/lib/libasn1.so.19.0
./usr/lib/libc.so.68.4
./usr/lib/libcom_err.so.19.0
@@ -1531,29 +1531,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.3
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/c++config.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/c++io.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/gthr.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/time_members.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/c++config.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/c++io.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/gthr.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/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 7c03e04dc04..7cdd06c2249 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -85,7 +85,7 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.3
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.4
./usr/lib/libasn1.so.19.0
./usr/lib/libc.so.68.4
./usr/lib/libcom_err.so.19.0
@@ -1597,29 +1597,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.3
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/c++config.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/c++io.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/gthr.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.3/bits/time_members.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/c++config.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/c++io.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/gthr.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd5.4/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 c5c0983f6af..20572cdf2d1 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -78,11 +78,11 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.3
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.3/4.2.1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.3/4.2.1/cc1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.3/4.2.1/collect2
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.3/4.2.1/specs
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.4
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.4/4.2.1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.4/4.2.1/cc1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.4/4.2.1/collect2
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.4/4.2.1/specs
./usr/lib/libasn1.so.19.0
./usr/lib/libc.so.68.4
./usr/lib/libcom_err.so.19.0
@@ -1594,29 +1594,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.3
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/c++config.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/c++io.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/gthr.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.3/bits/time_members.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/c++config.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/c++io.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/gthr.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd5.4/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 f45e8481eb9..3203a135dd5 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -26,11 +26,11 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.3
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.3/4.2.1
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.3/4.2.1/cc1
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.3/4.2.1/collect2
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.3/4.2.1/specs
+./usr/lib/gcc-lib/sparc-unknown-openbsd5.4
+./usr/lib/gcc-lib/sparc-unknown-openbsd5.4/4.2.1
+./usr/lib/gcc-lib/sparc-unknown-openbsd5.4/4.2.1/cc1
+./usr/lib/gcc-lib/sparc-unknown-openbsd5.4/4.2.1/collect2
+./usr/lib/gcc-lib/sparc-unknown-openbsd5.4/4.2.1/specs
./usr/lib/libasn1.so.19.0
./usr/lib/libc.so.68.4
./usr/lib/libcom_err.so.19.0
@@ -1085,29 +1085,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.3
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.3/bits
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.3/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.3/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.3/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.3/bits/c++config.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.3/bits/c++io.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.3/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.3/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.3/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.3/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.3/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.3/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.3/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.3/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.3/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.3/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.3/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.3/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.3/bits/gthr.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.3/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.3/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.3/bits/time_members.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.4
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.4/bits
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.4/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.4/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.4/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.4/bits/c++config.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.4/bits/c++io.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.4/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.4/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.4/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.4/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.4/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.4/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.4/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.4/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.4/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.4/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.4/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.4/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.4/bits/gthr.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.4/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.4/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/g++/sparc-unknown-openbsd5.4/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 5863df4c54c..17524beefcc 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -86,11 +86,11 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.3
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.3/4.2.1
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.3/4.2.1/cc1
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.3/4.2.1/collect2
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.3/4.2.1/specs
+./usr/lib/gcc-lib/sparc64-unknown-openbsd5.4
+./usr/lib/gcc-lib/sparc64-unknown-openbsd5.4/4.2.1
+./usr/lib/gcc-lib/sparc64-unknown-openbsd5.4/4.2.1/cc1
+./usr/lib/gcc-lib/sparc64-unknown-openbsd5.4/4.2.1/collect2
+./usr/lib/gcc-lib/sparc64-unknown-openbsd5.4/4.2.1/specs
./usr/lib/libasn1.so.19.0
./usr/lib/libc.so.68.4
./usr/lib/libcom_err.so.19.0
@@ -1145,29 +1145,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.3
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.3/bits
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.3/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.3/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.3/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.3/bits/c++config.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.3/bits/c++io.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.3/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.3/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.3/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.3/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.3/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.3/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.3/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.3/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.3/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.3/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.3/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.3/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.3/bits/gthr.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.3/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.3/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.3/bits/time_members.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.4
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.4/bits
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.4/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.4/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.4/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.4/bits/c++config.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.4/bits/c++io.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.4/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.4/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.4/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.4/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.4/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.4/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.4/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.4/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.4/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.4/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.4/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.4/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.4/bits/gthr.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.4/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.4/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd5.4/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 d58498cc5a5..f25a843160d 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -1,12 +1,12 @@
./sbin/kbd
./sbin/wsconsctl
-./usr/lib/gcc-lib/vax-unknown-openbsd5.3
-./usr/lib/gcc-lib/vax-unknown-openbsd5.3/2.95.3
-./usr/lib/gcc-lib/vax-unknown-openbsd5.3/2.95.3/cc1
-./usr/lib/gcc-lib/vax-unknown-openbsd5.3/2.95.3/collect2
-./usr/lib/gcc-lib/vax-unknown-openbsd5.3/2.95.3/cpp0
-./usr/lib/gcc-lib/vax-unknown-openbsd5.3/2.95.3/include
-./usr/lib/gcc-lib/vax-unknown-openbsd5.3/2.95.3/specs
+./usr/lib/gcc-lib/vax-unknown-openbsd5.4
+./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3
+./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/cc1
+./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/collect2
+./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/cpp0
+./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/include
+./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/specs
./usr/libdata/perl5/site_perl/vax-openbsd
./usr/libdata/perl5/site_perl/vax-openbsd/_h2ph_pre.ph
./usr/libdata/perl5/site_perl/vax-openbsd/a.out.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index a3534e12f30..257cb984ff5 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -53,11 +53,11 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/arm-unknown-openbsd5.3
-./usr/lib/gcc-lib/arm-unknown-openbsd5.3/4.2.1
-./usr/lib/gcc-lib/arm-unknown-openbsd5.3/4.2.1/cc1
-./usr/lib/gcc-lib/arm-unknown-openbsd5.3/4.2.1/collect2
-./usr/lib/gcc-lib/arm-unknown-openbsd5.3/4.2.1/specs
+./usr/lib/gcc-lib/arm-unknown-openbsd5.4
+./usr/lib/gcc-lib/arm-unknown-openbsd5.4/4.2.1
+./usr/lib/gcc-lib/arm-unknown-openbsd5.4/4.2.1/cc1
+./usr/lib/gcc-lib/arm-unknown-openbsd5.4/4.2.1/collect2
+./usr/lib/gcc-lib/arm-unknown-openbsd5.4/4.2.1/specs
./usr/lib/libasn1.so.19.0
./usr/lib/libc.so.68.4
./usr/lib/libcom_err.so.19.0
@@ -1487,29 +1487,29 @@
./usr/libdata/perl5/site_perl/arm-openbsd/ftw.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.3
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/atomic_word.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/c++allocator.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/c++config.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/c++io.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/c++locale_internal.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/compatibility.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/cpu_defines.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/cxxabi_tweaks.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/gthr-tpf.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/gthr.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.3/bits/time_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/atomic_word.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/c++allocator.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/c++config.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/c++io.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/c++locale_internal.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/compatibility.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/cpu_defines.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/cxxabi_tweaks.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/gthr-tpf.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/gthr.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd5.4/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 eb8e024e333..bb1ab13b7a8 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.3
-./usr/include/g++/alpha-unknown-openbsd5.3/bits
-./usr/include/g++/alpha-unknown-openbsd5.3/bits/atomic_word.h
-./usr/include/g++/alpha-unknown-openbsd5.3/bits/basic_file.h
-./usr/include/g++/alpha-unknown-openbsd5.3/bits/c++allocator.h
-./usr/include/g++/alpha-unknown-openbsd5.3/bits/c++config.h
-./usr/include/g++/alpha-unknown-openbsd5.3/bits/c++io.h
-./usr/include/g++/alpha-unknown-openbsd5.3/bits/c++locale.h
-./usr/include/g++/alpha-unknown-openbsd5.3/bits/c++locale_internal.h
-./usr/include/g++/alpha-unknown-openbsd5.3/bits/compatibility.h
-./usr/include/g++/alpha-unknown-openbsd5.3/bits/cpu_defines.h
-./usr/include/g++/alpha-unknown-openbsd5.3/bits/ctype_base.h
-./usr/include/g++/alpha-unknown-openbsd5.3/bits/ctype_inline.h
-./usr/include/g++/alpha-unknown-openbsd5.3/bits/ctype_noninline.h
-./usr/include/g++/alpha-unknown-openbsd5.3/bits/cxxabi_tweaks.h
-./usr/include/g++/alpha-unknown-openbsd5.3/bits/gthr-default.h
-./usr/include/g++/alpha-unknown-openbsd5.3/bits/gthr-posix.h
-./usr/include/g++/alpha-unknown-openbsd5.3/bits/gthr-single.h
-./usr/include/g++/alpha-unknown-openbsd5.3/bits/gthr-tpf.h
-./usr/include/g++/alpha-unknown-openbsd5.3/bits/gthr.h
-./usr/include/g++/alpha-unknown-openbsd5.3/bits/messages_members.h
-./usr/include/g++/alpha-unknown-openbsd5.3/bits/os_defines.h
-./usr/include/g++/alpha-unknown-openbsd5.3/bits/time_members.h
+./usr/include/g++/alpha-unknown-openbsd5.4
+./usr/include/g++/alpha-unknown-openbsd5.4/bits
+./usr/include/g++/alpha-unknown-openbsd5.4/bits/atomic_word.h
+./usr/include/g++/alpha-unknown-openbsd5.4/bits/basic_file.h
+./usr/include/g++/alpha-unknown-openbsd5.4/bits/c++allocator.h
+./usr/include/g++/alpha-unknown-openbsd5.4/bits/c++config.h
+./usr/include/g++/alpha-unknown-openbsd5.4/bits/c++io.h
+./usr/include/g++/alpha-unknown-openbsd5.4/bits/c++locale.h
+./usr/include/g++/alpha-unknown-openbsd5.4/bits/c++locale_internal.h
+./usr/include/g++/alpha-unknown-openbsd5.4/bits/compatibility.h
+./usr/include/g++/alpha-unknown-openbsd5.4/bits/cpu_defines.h
+./usr/include/g++/alpha-unknown-openbsd5.4/bits/ctype_base.h
+./usr/include/g++/alpha-unknown-openbsd5.4/bits/ctype_inline.h
+./usr/include/g++/alpha-unknown-openbsd5.4/bits/ctype_noninline.h
+./usr/include/g++/alpha-unknown-openbsd5.4/bits/cxxabi_tweaks.h
+./usr/include/g++/alpha-unknown-openbsd5.4/bits/gthr-default.h
+./usr/include/g++/alpha-unknown-openbsd5.4/bits/gthr-posix.h
+./usr/include/g++/alpha-unknown-openbsd5.4/bits/gthr-single.h
+./usr/include/g++/alpha-unknown-openbsd5.4/bits/gthr-tpf.h
+./usr/include/g++/alpha-unknown-openbsd5.4/bits/gthr.h
+./usr/include/g++/alpha-unknown-openbsd5.4/bits/messages_members.h
+./usr/include/g++/alpha-unknown-openbsd5.4/bits/os_defines.h
+./usr/include/g++/alpha-unknown-openbsd5.4/bits/time_members.h
./usr/include/g++/backward
./usr/include/g++/backward/algo.h
./usr/include/g++/backward/algobase.h
@@ -605,10 +605,10 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.3/4.2.1/cc1obj
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.3/4.2.1/cc1plus
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.3/4.2.1/libgcc.a
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.3/4.2.1/libgcov.a
+./usr/lib/gcc-lib/alpha-unknown-openbsd5.4/4.2.1/cc1obj
+./usr/lib/gcc-lib/alpha-unknown-openbsd5.4/4.2.1/cc1plus
+./usr/lib/gcc-lib/alpha-unknown-openbsd5.4/4.2.1/libgcc.a
+./usr/lib/gcc-lib/alpha-unknown-openbsd5.4/4.2.1/libgcov.a
./usr/lib/libalpha.a
./usr/lib/libalpha_p.a
./usr/lib/libstdc++_p.a
diff --git a/distrib/sets/lists/comp/md.amd64 b/distrib/sets/lists/comp/md.amd64
index 982ec6226b5..13b3e724267 100644
--- a/distrib/sets/lists/comp/md.amd64
+++ b/distrib/sets/lists/comp/md.amd64
@@ -76,29 +76,29 @@
./usr/include/amd64/vga_post.h
./usr/include/amd64/vmparam.h
./usr/include/emmintrin.h
-./usr/include/g++/amd64-unknown-openbsd5.3
-./usr/include/g++/amd64-unknown-openbsd5.3/bits
-./usr/include/g++/amd64-unknown-openbsd5.3/bits/atomic_word.h
-./usr/include/g++/amd64-unknown-openbsd5.3/bits/basic_file.h
-./usr/include/g++/amd64-unknown-openbsd5.3/bits/c++allocator.h
-./usr/include/g++/amd64-unknown-openbsd5.3/bits/c++config.h
-./usr/include/g++/amd64-unknown-openbsd5.3/bits/c++io.h
-./usr/include/g++/amd64-unknown-openbsd5.3/bits/c++locale.h
-./usr/include/g++/amd64-unknown-openbsd5.3/bits/c++locale_internal.h
-./usr/include/g++/amd64-unknown-openbsd5.3/bits/compatibility.h
-./usr/include/g++/amd64-unknown-openbsd5.3/bits/cpu_defines.h
-./usr/include/g++/amd64-unknown-openbsd5.3/bits/ctype_base.h
-./usr/include/g++/amd64-unknown-openbsd5.3/bits/ctype_inline.h
-./usr/include/g++/amd64-unknown-openbsd5.3/bits/ctype_noninline.h
-./usr/include/g++/amd64-unknown-openbsd5.3/bits/cxxabi_tweaks.h
-./usr/include/g++/amd64-unknown-openbsd5.3/bits/gthr-default.h
-./usr/include/g++/amd64-unknown-openbsd5.3/bits/gthr-posix.h
-./usr/include/g++/amd64-unknown-openbsd5.3/bits/gthr-single.h
-./usr/include/g++/amd64-unknown-openbsd5.3/bits/gthr-tpf.h
-./usr/include/g++/amd64-unknown-openbsd5.3/bits/gthr.h
-./usr/include/g++/amd64-unknown-openbsd5.3/bits/messages_members.h
-./usr/include/g++/amd64-unknown-openbsd5.3/bits/os_defines.h
-./usr/include/g++/amd64-unknown-openbsd5.3/bits/time_members.h
+./usr/include/g++/amd64-unknown-openbsd5.4
+./usr/include/g++/amd64-unknown-openbsd5.4/bits
+./usr/include/g++/amd64-unknown-openbsd5.4/bits/atomic_word.h
+./usr/include/g++/amd64-unknown-openbsd5.4/bits/basic_file.h
+./usr/include/g++/amd64-unknown-openbsd5.4/bits/c++allocator.h
+./usr/include/g++/amd64-unknown-openbsd5.4/bits/c++config.h
+./usr/include/g++/amd64-unknown-openbsd5.4/bits/c++io.h
+./usr/include/g++/amd64-unknown-openbsd5.4/bits/c++locale.h
+./usr/include/g++/amd64-unknown-openbsd5.4/bits/c++locale_internal.h
+./usr/include/g++/amd64-unknown-openbsd5.4/bits/compatibility.h
+./usr/include/g++/amd64-unknown-openbsd5.4/bits/cpu_defines.h
+./usr/include/g++/amd64-unknown-openbsd5.4/bits/ctype_base.h
+./usr/include/g++/amd64-unknown-openbsd5.4/bits/ctype_inline.h
+./usr/include/g++/amd64-unknown-openbsd5.4/bits/ctype_noninline.h
+./usr/include/g++/amd64-unknown-openbsd5.4/bits/cxxabi_tweaks.h
+./usr/include/g++/amd64-unknown-openbsd5.4/bits/gthr-default.h
+./usr/include/g++/amd64-unknown-openbsd5.4/bits/gthr-posix.h
+./usr/include/g++/amd64-unknown-openbsd5.4/bits/gthr-single.h
+./usr/include/g++/amd64-unknown-openbsd5.4/bits/gthr-tpf.h
+./usr/include/g++/amd64-unknown-openbsd5.4/bits/gthr.h
+./usr/include/g++/amd64-unknown-openbsd5.4/bits/messages_members.h
+./usr/include/g++/amd64-unknown-openbsd5.4/bits/os_defines.h
+./usr/include/g++/amd64-unknown-openbsd5.4/bits/time_members.h
./usr/include/g++/backward
./usr/include/g++/backward/algo.h
./usr/include/g++/backward/algobase.h
@@ -630,10 +630,10 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.3/4.2.1/cc1obj
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.3/4.2.1/cc1plus
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.3/4.2.1/libgcc.a
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.3/4.2.1/libgcov.a
+./usr/lib/gcc-lib/amd64-unknown-openbsd5.4/4.2.1/cc1obj
+./usr/lib/gcc-lib/amd64-unknown-openbsd5.4/4.2.1/cc1plus
+./usr/lib/gcc-lib/amd64-unknown-openbsd5.4/4.2.1/libgcc.a
+./usr/lib/gcc-lib/amd64-unknown-openbsd5.4/4.2.1/libgcov.a
./usr/lib/libamd64.a
./usr/lib/libamd64_p.a
./usr/lib/libstdc++_p.a
diff --git a/distrib/sets/lists/comp/md.armish b/distrib/sets/lists/comp/md.armish
index a67509ad07a..65a873f79f3 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.3
-./usr/include/g++/arm-unknown-openbsd5.3/bits
-./usr/include/g++/arm-unknown-openbsd5.3/bits/atomic_word.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/basic_file.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/c++allocator.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/c++config.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/c++io.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/c++locale.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/c++locale_internal.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/compatibility.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/cpu_defines.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/ctype_base.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/ctype_inline.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/ctype_noninline.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/cxxabi_tweaks.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/gthr-default.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/gthr-posix.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/gthr-single.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/gthr-tpf.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/gthr.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/messages_members.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/os_defines.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/time_members.h
+./usr/include/g++/arm-unknown-openbsd5.4
+./usr/include/g++/arm-unknown-openbsd5.4/bits
+./usr/include/g++/arm-unknown-openbsd5.4/bits/atomic_word.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/basic_file.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/c++allocator.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/c++config.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/c++io.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/c++locale.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/c++locale_internal.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/compatibility.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/cpu_defines.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/ctype_base.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/ctype_inline.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/ctype_noninline.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/cxxabi_tweaks.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/gthr-default.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/gthr-posix.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/gthr-single.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/gthr-tpf.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/gthr.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/messages_members.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/os_defines.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/time_members.h
./usr/include/g++/backward
./usr/include/g++/backward/algo.h
./usr/include/g++/backward/algobase.h
@@ -647,10 +647,10 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/arm-unknown-openbsd5.3/4.2.1/cc1obj
-./usr/lib/gcc-lib/arm-unknown-openbsd5.3/4.2.1/cc1plus
-./usr/lib/gcc-lib/arm-unknown-openbsd5.3/4.2.1/libgcc.a
-./usr/lib/gcc-lib/arm-unknown-openbsd5.3/4.2.1/libgcov.a
+./usr/lib/gcc-lib/arm-unknown-openbsd5.4/4.2.1/cc1obj
+./usr/lib/gcc-lib/arm-unknown-openbsd5.4/4.2.1/cc1plus
+./usr/lib/gcc-lib/arm-unknown-openbsd5.4/4.2.1/libgcc.a
+./usr/lib/gcc-lib/arm-unknown-openbsd5.4/4.2.1/libgcov.a
./usr/lib/libarm.a
./usr/lib/libarm_p.a
./usr/lib/libstdc++_p.a
diff --git a/distrib/sets/lists/comp/md.aviion b/distrib/sets/lists/comp/md.aviion
index 3dbb9e70922..628a61df57f 100644
--- a/distrib/sets/lists/comp/md.aviion
+++ b/distrib/sets/lists/comp/md.aviion
@@ -173,22 +173,22 @@
./usr/include/g++/istream
./usr/include/g++/limits
./usr/include/g++/locale
-./usr/include/g++/m88k-unknown-openbsd5.3
-./usr/include/g++/m88k-unknown-openbsd5.3/bits
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/basic_file.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/c++config.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/c++io.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/c++locale.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/ctype_base.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/ctype_inline.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/ctype_noninline.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/gthr-default.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/gthr-posix.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/gthr-single.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/gthr.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/messages_members.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/os_defines.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/time_members.h
+./usr/include/g++/m88k-unknown-openbsd5.4
+./usr/include/g++/m88k-unknown-openbsd5.4/bits
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/basic_file.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/c++config.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/c++io.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/c++locale.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/ctype_base.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/ctype_inline.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/ctype_noninline.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/gthr-default.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/gthr-posix.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/gthr-single.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/gthr.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/messages_members.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/os_defines.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/time_members.h
./usr/include/g++/ostream
./usr/include/g++/streambuf
./usr/include/ieeefp.h
@@ -241,11 +241,11 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/SYSCALLS.c.X
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/cc1obj
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/cc1plus
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/include/unwind.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/SYSCALLS.c.X
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/cc1obj
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/cc1plus
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/include/unwind.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/libgcc.a
./usr/lib/libsupc++.a
./usr/libdata/ldscripts
./usr/libdata/ldscripts/elf32m88k_obsd.x
@@ -272,5 +272,5 @@
./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.3/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/codecvt_specializations.ph
diff --git a/distrib/sets/lists/comp/md.beagle b/distrib/sets/lists/comp/md.beagle
index ba972168ce7..7f305e4502c 100644
--- a/distrib/sets/lists/comp/md.beagle
+++ b/distrib/sets/lists/comp/md.beagle
@@ -101,29 +101,29 @@
./usr/include/beagle/tcb.h
./usr/include/beagle/trap.h
./usr/include/beagle/vmparam.h
-./usr/include/g++/arm-unknown-openbsd5.3
-./usr/include/g++/arm-unknown-openbsd5.3/bits
-./usr/include/g++/arm-unknown-openbsd5.3/bits/atomic_word.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/basic_file.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/c++allocator.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/c++config.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/c++io.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/c++locale.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/c++locale_internal.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/compatibility.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/cpu_defines.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/ctype_base.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/ctype_inline.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/ctype_noninline.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/cxxabi_tweaks.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/gthr-default.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/gthr-posix.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/gthr-single.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/gthr-tpf.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/gthr.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/messages_members.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/os_defines.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/time_members.h
+./usr/include/g++/arm-unknown-openbsd5.4
+./usr/include/g++/arm-unknown-openbsd5.4/bits
+./usr/include/g++/arm-unknown-openbsd5.4/bits/atomic_word.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/basic_file.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/c++allocator.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/c++config.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/c++io.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/c++locale.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/c++locale_internal.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/compatibility.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/cpu_defines.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/ctype_base.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/ctype_inline.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/ctype_noninline.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/cxxabi_tweaks.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/gthr-default.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/gthr-posix.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/gthr-single.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/gthr-tpf.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/gthr.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/messages_members.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/os_defines.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/time_members.h
./usr/include/g++/backward
./usr/include/g++/backward/algo.h
./usr/include/g++/backward/algobase.h
@@ -652,10 +652,10 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/arm-unknown-openbsd5.3/4.2.1/cc1obj
-./usr/lib/gcc-lib/arm-unknown-openbsd5.3/4.2.1/cc1plus
-./usr/lib/gcc-lib/arm-unknown-openbsd5.3/4.2.1/libgcc.a
-./usr/lib/gcc-lib/arm-unknown-openbsd5.3/4.2.1/libgcov.a
+./usr/lib/gcc-lib/arm-unknown-openbsd5.4/4.2.1/cc1obj
+./usr/lib/gcc-lib/arm-unknown-openbsd5.4/4.2.1/cc1plus
+./usr/lib/gcc-lib/arm-unknown-openbsd5.4/4.2.1/libgcc.a
+./usr/lib/gcc-lib/arm-unknown-openbsd5.4/4.2.1/libgcov.a
./usr/lib/libarm.a
./usr/lib/libarm_p.a
./usr/lib/libstdc++_p.a
diff --git a/distrib/sets/lists/comp/md.hp300 b/distrib/sets/lists/comp/md.hp300
index 1d090fdb9c3..4e5c8ebee43 100644
--- a/distrib/sets/lists/comp/md.hp300
+++ b/distrib/sets/lists/comp/md.hp300
@@ -131,24 +131,24 @@
./usr/include/g++/istream
./usr/include/g++/limits
./usr/include/g++/locale
-./usr/include/g++/m68k-unknown-openbsd5.3
-./usr/include/g++/m68k-unknown-openbsd5.3/bits
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/atomicity.h
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/basic_file.h
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/c++config.h
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/c++io.h
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/c++locale.h
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/codecvt_specializations.h
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/ctype_base.h
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/ctype_inline.h
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/ctype_noninline.h
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/gthr-default.h
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/gthr-posix.h
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/gthr-single.h
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/gthr.h
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/messages_members.h
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/os_defines.h
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/time_members.h
+./usr/include/g++/m68k-unknown-openbsd5.4
+./usr/include/g++/m68k-unknown-openbsd5.4/bits
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/atomicity.h
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/basic_file.h
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/c++config.h
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/c++io.h
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/c++locale.h
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/codecvt_specializations.h
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/ctype_base.h
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/ctype_inline.h
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/ctype_noninline.h
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/gthr-default.h
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/gthr-posix.h
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/gthr-single.h
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/gthr.h
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/messages_members.h
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/os_defines.h
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/time_members.h
./usr/include/g++/ostream
./usr/include/g++/streambuf
./usr/include/hp300
@@ -237,15 +237,15 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.3/3.3.6/SYSCALLS.c.X
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.3/3.3.6/cc1obj
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.3/3.3.6/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.3/3.3.6/fPIC
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.3/3.3.6/fPIC/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.3/3.3.6/fpic
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.3/3.3.6/fpic/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.3/3.3.6/include/unwind.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.3/3.3.6/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.4/3.3.6/SYSCALLS.c.X
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.4/3.3.6/cc1obj
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.4/3.3.6/cc1plus
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.4/3.3.6/fPIC
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.4/3.3.6/fPIC/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.4/3.3.6/fpic
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.4/3.3.6/fpic/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.4/3.3.6/include/unwind.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.4/3.3.6/libgcc.a
./usr/lib/libsupc++.a
./usr/libdata/ldscripts
./usr/libdata/ldscripts/m68k4knbsd.x
diff --git a/distrib/sets/lists/comp/md.hppa b/distrib/sets/lists/comp/md.hppa
index 86cb0f4a8f8..182cea81884 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.3
-./usr/include/g++/hppa-unknown-openbsd5.3/bits
-./usr/include/g++/hppa-unknown-openbsd5.3/bits/atomic_word.h
-./usr/include/g++/hppa-unknown-openbsd5.3/bits/basic_file.h
-./usr/include/g++/hppa-unknown-openbsd5.3/bits/c++allocator.h
-./usr/include/g++/hppa-unknown-openbsd5.3/bits/c++config.h
-./usr/include/g++/hppa-unknown-openbsd5.3/bits/c++io.h
-./usr/include/g++/hppa-unknown-openbsd5.3/bits/c++locale.h
-./usr/include/g++/hppa-unknown-openbsd5.3/bits/c++locale_internal.h
-./usr/include/g++/hppa-unknown-openbsd5.3/bits/compatibility.h
-./usr/include/g++/hppa-unknown-openbsd5.3/bits/cpu_defines.h
-./usr/include/g++/hppa-unknown-openbsd5.3/bits/ctype_base.h
-./usr/include/g++/hppa-unknown-openbsd5.3/bits/ctype_inline.h
-./usr/include/g++/hppa-unknown-openbsd5.3/bits/ctype_noninline.h
-./usr/include/g++/hppa-unknown-openbsd5.3/bits/cxxabi_tweaks.h
-./usr/include/g++/hppa-unknown-openbsd5.3/bits/gthr-default.h
-./usr/include/g++/hppa-unknown-openbsd5.3/bits/gthr-posix.h
-./usr/include/g++/hppa-unknown-openbsd5.3/bits/gthr-single.h
-./usr/include/g++/hppa-unknown-openbsd5.3/bits/gthr-tpf.h
-./usr/include/g++/hppa-unknown-openbsd5.3/bits/gthr.h
-./usr/include/g++/hppa-unknown-openbsd5.3/bits/messages_members.h
-./usr/include/g++/hppa-unknown-openbsd5.3/bits/os_defines.h
-./usr/include/g++/hppa-unknown-openbsd5.3/bits/time_members.h
+./usr/include/g++/hppa-unknown-openbsd5.4
+./usr/include/g++/hppa-unknown-openbsd5.4/bits
+./usr/include/g++/hppa-unknown-openbsd5.4/bits/atomic_word.h
+./usr/include/g++/hppa-unknown-openbsd5.4/bits/basic_file.h
+./usr/include/g++/hppa-unknown-openbsd5.4/bits/c++allocator.h
+./usr/include/g++/hppa-unknown-openbsd5.4/bits/c++config.h
+./usr/include/g++/hppa-unknown-openbsd5.4/bits/c++io.h
+./usr/include/g++/hppa-unknown-openbsd5.4/bits/c++locale.h
+./usr/include/g++/hppa-unknown-openbsd5.4/bits/c++locale_internal.h
+./usr/include/g++/hppa-unknown-openbsd5.4/bits/compatibility.h
+./usr/include/g++/hppa-unknown-openbsd5.4/bits/cpu_defines.h
+./usr/include/g++/hppa-unknown-openbsd5.4/bits/ctype_base.h
+./usr/include/g++/hppa-unknown-openbsd5.4/bits/ctype_inline.h
+./usr/include/g++/hppa-unknown-openbsd5.4/bits/ctype_noninline.h
+./usr/include/g++/hppa-unknown-openbsd5.4/bits/cxxabi_tweaks.h
+./usr/include/g++/hppa-unknown-openbsd5.4/bits/gthr-default.h
+./usr/include/g++/hppa-unknown-openbsd5.4/bits/gthr-posix.h
+./usr/include/g++/hppa-unknown-openbsd5.4/bits/gthr-single.h
+./usr/include/g++/hppa-unknown-openbsd5.4/bits/gthr-tpf.h
+./usr/include/g++/hppa-unknown-openbsd5.4/bits/gthr.h
+./usr/include/g++/hppa-unknown-openbsd5.4/bits/messages_members.h
+./usr/include/g++/hppa-unknown-openbsd5.4/bits/os_defines.h
+./usr/include/g++/hppa-unknown-openbsd5.4/bits/time_members.h
./usr/include/g++/ios
./usr/include/g++/istream
./usr/include/g++/limits
@@ -605,10 +605,10 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.3/4.2.1/cc1obj
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.3/4.2.1/cc1plus
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.3/4.2.1/libgcc.a
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.3/4.2.1/libgcov.a
+./usr/lib/gcc-lib/hppa-unknown-openbsd5.4/4.2.1/cc1obj
+./usr/lib/gcc-lib/hppa-unknown-openbsd5.4/4.2.1/cc1plus
+./usr/lib/gcc-lib/hppa-unknown-openbsd5.4/4.2.1/libgcc.a
+./usr/lib/gcc-lib/hppa-unknown-openbsd5.4/4.2.1/libgcov.a
./usr/lib/libstdc++_p.a
./usr/lib/libsupc++.a
./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.hppa64 b/distrib/sets/lists/comp/md.hppa64
index 34204b7f5fd..ba1e5ac5a8a 100644
--- a/distrib/sets/lists/comp/md.hppa64
+++ b/distrib/sets/lists/comp/md.hppa64
@@ -126,24 +126,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.3
-./usr/include/g++/hppa64-unknown-openbsd5.3/bits
-./usr/include/g++/hppa64-unknown-openbsd5.3/bits/atomicity.h
-./usr/include/g++/hppa64-unknown-openbsd5.3/bits/basic_file.h
-./usr/include/g++/hppa64-unknown-openbsd5.3/bits/c++config.h
-./usr/include/g++/hppa64-unknown-openbsd5.3/bits/c++io.h
-./usr/include/g++/hppa64-unknown-openbsd5.3/bits/c++locale.h
-./usr/include/g++/hppa64-unknown-openbsd5.3/bits/codecvt_specializations.h
-./usr/include/g++/hppa64-unknown-openbsd5.3/bits/ctype_base.h
-./usr/include/g++/hppa64-unknown-openbsd5.3/bits/ctype_inline.h
-./usr/include/g++/hppa64-unknown-openbsd5.3/bits/ctype_noninline.h
-./usr/include/g++/hppa64-unknown-openbsd5.3/bits/gthr-default.h
-./usr/include/g++/hppa64-unknown-openbsd5.3/bits/gthr-posix.h
-./usr/include/g++/hppa64-unknown-openbsd5.3/bits/gthr-single.h
-./usr/include/g++/hppa64-unknown-openbsd5.3/bits/gthr.h
-./usr/include/g++/hppa64-unknown-openbsd5.3/bits/messages_members.h
-./usr/include/g++/hppa64-unknown-openbsd5.3/bits/os_defines.h
-./usr/include/g++/hppa64-unknown-openbsd5.3/bits/time_members.h
+./usr/include/g++/hppa64-unknown-openbsd5.4
+./usr/include/g++/hppa64-unknown-openbsd5.4/bits
+./usr/include/g++/hppa64-unknown-openbsd5.4/bits/atomicity.h
+./usr/include/g++/hppa64-unknown-openbsd5.4/bits/basic_file.h
+./usr/include/g++/hppa64-unknown-openbsd5.4/bits/c++config.h
+./usr/include/g++/hppa64-unknown-openbsd5.4/bits/c++io.h
+./usr/include/g++/hppa64-unknown-openbsd5.4/bits/c++locale.h
+./usr/include/g++/hppa64-unknown-openbsd5.4/bits/codecvt_specializations.h
+./usr/include/g++/hppa64-unknown-openbsd5.4/bits/ctype_base.h
+./usr/include/g++/hppa64-unknown-openbsd5.4/bits/ctype_inline.h
+./usr/include/g++/hppa64-unknown-openbsd5.4/bits/ctype_noninline.h
+./usr/include/g++/hppa64-unknown-openbsd5.4/bits/gthr-default.h
+./usr/include/g++/hppa64-unknown-openbsd5.4/bits/gthr-posix.h
+./usr/include/g++/hppa64-unknown-openbsd5.4/bits/gthr-single.h
+./usr/include/g++/hppa64-unknown-openbsd5.4/bits/gthr.h
+./usr/include/g++/hppa64-unknown-openbsd5.4/bits/messages_members.h
+./usr/include/g++/hppa64-unknown-openbsd5.4/bits/os_defines.h
+./usr/include/g++/hppa64-unknown-openbsd5.4/bits/time_members.h
./usr/include/g++/ios
./usr/include/g++/istream
./usr/include/g++/limits
@@ -207,12 +207,12 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.3/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.3/3.3.5/cc1obj
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.3/3.3.5/cc1plus
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.3/3.3.5/include
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.3/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.3/3.3.5/libgcc.a
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.4/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.4/3.3.5/cc1obj
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.4/3.3.5/cc1plus
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.4/3.3.5/include
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.4/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.4/3.3.5/libgcc.a
./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 710e6cad540..088343ddbb8 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -459,29 +459,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.3
-./usr/include/g++/i386-unknown-openbsd5.3/bits
-./usr/include/g++/i386-unknown-openbsd5.3/bits/atomic_word.h
-./usr/include/g++/i386-unknown-openbsd5.3/bits/basic_file.h
-./usr/include/g++/i386-unknown-openbsd5.3/bits/c++allocator.h
-./usr/include/g++/i386-unknown-openbsd5.3/bits/c++config.h
-./usr/include/g++/i386-unknown-openbsd5.3/bits/c++io.h
-./usr/include/g++/i386-unknown-openbsd5.3/bits/c++locale.h
-./usr/include/g++/i386-unknown-openbsd5.3/bits/c++locale_internal.h
-./usr/include/g++/i386-unknown-openbsd5.3/bits/compatibility.h
-./usr/include/g++/i386-unknown-openbsd5.3/bits/cpu_defines.h
-./usr/include/g++/i386-unknown-openbsd5.3/bits/ctype_base.h
-./usr/include/g++/i386-unknown-openbsd5.3/bits/ctype_inline.h
-./usr/include/g++/i386-unknown-openbsd5.3/bits/ctype_noninline.h
-./usr/include/g++/i386-unknown-openbsd5.3/bits/cxxabi_tweaks.h
-./usr/include/g++/i386-unknown-openbsd5.3/bits/gthr-default.h
-./usr/include/g++/i386-unknown-openbsd5.3/bits/gthr-posix.h
-./usr/include/g++/i386-unknown-openbsd5.3/bits/gthr-single.h
-./usr/include/g++/i386-unknown-openbsd5.3/bits/gthr-tpf.h
-./usr/include/g++/i386-unknown-openbsd5.3/bits/gthr.h
-./usr/include/g++/i386-unknown-openbsd5.3/bits/messages_members.h
-./usr/include/g++/i386-unknown-openbsd5.3/bits/os_defines.h
-./usr/include/g++/i386-unknown-openbsd5.3/bits/time_members.h
+./usr/include/g++/i386-unknown-openbsd5.4
+./usr/include/g++/i386-unknown-openbsd5.4/bits
+./usr/include/g++/i386-unknown-openbsd5.4/bits/atomic_word.h
+./usr/include/g++/i386-unknown-openbsd5.4/bits/basic_file.h
+./usr/include/g++/i386-unknown-openbsd5.4/bits/c++allocator.h
+./usr/include/g++/i386-unknown-openbsd5.4/bits/c++config.h
+./usr/include/g++/i386-unknown-openbsd5.4/bits/c++io.h
+./usr/include/g++/i386-unknown-openbsd5.4/bits/c++locale.h
+./usr/include/g++/i386-unknown-openbsd5.4/bits/c++locale_internal.h
+./usr/include/g++/i386-unknown-openbsd5.4/bits/compatibility.h
+./usr/include/g++/i386-unknown-openbsd5.4/bits/cpu_defines.h
+./usr/include/g++/i386-unknown-openbsd5.4/bits/ctype_base.h
+./usr/include/g++/i386-unknown-openbsd5.4/bits/ctype_inline.h
+./usr/include/g++/i386-unknown-openbsd5.4/bits/ctype_noninline.h
+./usr/include/g++/i386-unknown-openbsd5.4/bits/cxxabi_tweaks.h
+./usr/include/g++/i386-unknown-openbsd5.4/bits/gthr-default.h
+./usr/include/g++/i386-unknown-openbsd5.4/bits/gthr-posix.h
+./usr/include/g++/i386-unknown-openbsd5.4/bits/gthr-single.h
+./usr/include/g++/i386-unknown-openbsd5.4/bits/gthr-tpf.h
+./usr/include/g++/i386-unknown-openbsd5.4/bits/gthr.h
+./usr/include/g++/i386-unknown-openbsd5.4/bits/messages_members.h
+./usr/include/g++/i386-unknown-openbsd5.4/bits/os_defines.h
+./usr/include/g++/i386-unknown-openbsd5.4/bits/time_members.h
./usr/include/g++/ios
./usr/include/g++/istream
./usr/include/g++/limits
@@ -634,10 +634,10 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/i386-unknown-openbsd5.3/4.2.1/cc1obj
-./usr/lib/gcc-lib/i386-unknown-openbsd5.3/4.2.1/cc1plus
-./usr/lib/gcc-lib/i386-unknown-openbsd5.3/4.2.1/libgcc.a
-./usr/lib/gcc-lib/i386-unknown-openbsd5.3/4.2.1/libgcov.a
+./usr/lib/gcc-lib/i386-unknown-openbsd5.4/4.2.1/cc1obj
+./usr/lib/gcc-lib/i386-unknown-openbsd5.4/4.2.1/cc1plus
+./usr/lib/gcc-lib/i386-unknown-openbsd5.4/4.2.1/libgcc.a
+./usr/lib/gcc-lib/i386-unknown-openbsd5.4/4.2.1/libgcov.a
./usr/lib/libi386.a
./usr/lib/libi386_p.a
./usr/lib/libstdc++_p.a
diff --git a/distrib/sets/lists/comp/md.landisk b/distrib/sets/lists/comp/md.landisk
index 30111858ac2..94a2bb7b48a 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.3
-./usr/include/g++/sh-unknown-openbsd5.3/bits
-./usr/include/g++/sh-unknown-openbsd5.3/bits/atomic_word.h
-./usr/include/g++/sh-unknown-openbsd5.3/bits/basic_file.h
-./usr/include/g++/sh-unknown-openbsd5.3/bits/c++allocator.h
-./usr/include/g++/sh-unknown-openbsd5.3/bits/c++config.h
-./usr/include/g++/sh-unknown-openbsd5.3/bits/c++io.h
-./usr/include/g++/sh-unknown-openbsd5.3/bits/c++locale.h
-./usr/include/g++/sh-unknown-openbsd5.3/bits/c++locale_internal.h
-./usr/include/g++/sh-unknown-openbsd5.3/bits/compatibility.h
-./usr/include/g++/sh-unknown-openbsd5.3/bits/cpu_defines.h
-./usr/include/g++/sh-unknown-openbsd5.3/bits/ctype_base.h
-./usr/include/g++/sh-unknown-openbsd5.3/bits/ctype_inline.h
-./usr/include/g++/sh-unknown-openbsd5.3/bits/ctype_noninline.h
-./usr/include/g++/sh-unknown-openbsd5.3/bits/cxxabi_tweaks.h
-./usr/include/g++/sh-unknown-openbsd5.3/bits/gthr-default.h
-./usr/include/g++/sh-unknown-openbsd5.3/bits/gthr-posix.h
-./usr/include/g++/sh-unknown-openbsd5.3/bits/gthr-single.h
-./usr/include/g++/sh-unknown-openbsd5.3/bits/gthr-tpf.h
-./usr/include/g++/sh-unknown-openbsd5.3/bits/gthr.h
-./usr/include/g++/sh-unknown-openbsd5.3/bits/messages_members.h
-./usr/include/g++/sh-unknown-openbsd5.3/bits/os_defines.h
-./usr/include/g++/sh-unknown-openbsd5.3/bits/time_members.h
+./usr/include/g++/sh-unknown-openbsd5.4
+./usr/include/g++/sh-unknown-openbsd5.4/bits
+./usr/include/g++/sh-unknown-openbsd5.4/bits/atomic_word.h
+./usr/include/g++/sh-unknown-openbsd5.4/bits/basic_file.h
+./usr/include/g++/sh-unknown-openbsd5.4/bits/c++allocator.h
+./usr/include/g++/sh-unknown-openbsd5.4/bits/c++config.h
+./usr/include/g++/sh-unknown-openbsd5.4/bits/c++io.h
+./usr/include/g++/sh-unknown-openbsd5.4/bits/c++locale.h
+./usr/include/g++/sh-unknown-openbsd5.4/bits/c++locale_internal.h
+./usr/include/g++/sh-unknown-openbsd5.4/bits/compatibility.h
+./usr/include/g++/sh-unknown-openbsd5.4/bits/cpu_defines.h
+./usr/include/g++/sh-unknown-openbsd5.4/bits/ctype_base.h
+./usr/include/g++/sh-unknown-openbsd5.4/bits/ctype_inline.h
+./usr/include/g++/sh-unknown-openbsd5.4/bits/ctype_noninline.h
+./usr/include/g++/sh-unknown-openbsd5.4/bits/cxxabi_tweaks.h
+./usr/include/g++/sh-unknown-openbsd5.4/bits/gthr-default.h
+./usr/include/g++/sh-unknown-openbsd5.4/bits/gthr-posix.h
+./usr/include/g++/sh-unknown-openbsd5.4/bits/gthr-single.h
+./usr/include/g++/sh-unknown-openbsd5.4/bits/gthr-tpf.h
+./usr/include/g++/sh-unknown-openbsd5.4/bits/gthr.h
+./usr/include/g++/sh-unknown-openbsd5.4/bits/messages_members.h
+./usr/include/g++/sh-unknown-openbsd5.4/bits/os_defines.h
+./usr/include/g++/sh-unknown-openbsd5.4/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.3
-./usr/lib/gcc-lib/sh-unknown-openbsd5.3/4.2.1
-./usr/lib/gcc-lib/sh-unknown-openbsd5.3/4.2.1/cc1
-./usr/lib/gcc-lib/sh-unknown-openbsd5.3/4.2.1/cc1obj
-./usr/lib/gcc-lib/sh-unknown-openbsd5.3/4.2.1/cc1plus
-./usr/lib/gcc-lib/sh-unknown-openbsd5.3/4.2.1/collect2
-./usr/lib/gcc-lib/sh-unknown-openbsd5.3/4.2.1/libgcc.a
-./usr/lib/gcc-lib/sh-unknown-openbsd5.3/4.2.1/libgcov.a
-./usr/lib/gcc-lib/sh-unknown-openbsd5.3/4.2.1/specs
+./usr/lib/gcc-lib/sh-unknown-openbsd5.4
+./usr/lib/gcc-lib/sh-unknown-openbsd5.4/4.2.1
+./usr/lib/gcc-lib/sh-unknown-openbsd5.4/4.2.1/cc1
+./usr/lib/gcc-lib/sh-unknown-openbsd5.4/4.2.1/cc1obj
+./usr/lib/gcc-lib/sh-unknown-openbsd5.4/4.2.1/cc1plus
+./usr/lib/gcc-lib/sh-unknown-openbsd5.4/4.2.1/collect2
+./usr/lib/gcc-lib/sh-unknown-openbsd5.4/4.2.1/libgcc.a
+./usr/lib/gcc-lib/sh-unknown-openbsd5.4/4.2.1/libgcov.a
+./usr/lib/gcc-lib/sh-unknown-openbsd5.4/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 b5b66533c5f..9dedab194a4 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.3
-./usr/include/g++/mips64el-unknown-openbsd5.3/bits
-./usr/include/g++/mips64el-unknown-openbsd5.3/bits/atomic_word.h
-./usr/include/g++/mips64el-unknown-openbsd5.3/bits/basic_file.h
-./usr/include/g++/mips64el-unknown-openbsd5.3/bits/c++allocator.h
-./usr/include/g++/mips64el-unknown-openbsd5.3/bits/c++config.h
-./usr/include/g++/mips64el-unknown-openbsd5.3/bits/c++io.h
-./usr/include/g++/mips64el-unknown-openbsd5.3/bits/c++locale.h
-./usr/include/g++/mips64el-unknown-openbsd5.3/bits/c++locale_internal.h
-./usr/include/g++/mips64el-unknown-openbsd5.3/bits/compatibility.h
-./usr/include/g++/mips64el-unknown-openbsd5.3/bits/cpu_defines.h
-./usr/include/g++/mips64el-unknown-openbsd5.3/bits/ctype_base.h
-./usr/include/g++/mips64el-unknown-openbsd5.3/bits/ctype_inline.h
-./usr/include/g++/mips64el-unknown-openbsd5.3/bits/ctype_noninline.h
-./usr/include/g++/mips64el-unknown-openbsd5.3/bits/cxxabi_tweaks.h
-./usr/include/g++/mips64el-unknown-openbsd5.3/bits/gthr-default.h
-./usr/include/g++/mips64el-unknown-openbsd5.3/bits/gthr-posix.h
-./usr/include/g++/mips64el-unknown-openbsd5.3/bits/gthr-single.h
-./usr/include/g++/mips64el-unknown-openbsd5.3/bits/gthr-tpf.h
-./usr/include/g++/mips64el-unknown-openbsd5.3/bits/gthr.h
-./usr/include/g++/mips64el-unknown-openbsd5.3/bits/messages_members.h
-./usr/include/g++/mips64el-unknown-openbsd5.3/bits/os_defines.h
-./usr/include/g++/mips64el-unknown-openbsd5.3/bits/time_members.h
+./usr/include/g++/mips64el-unknown-openbsd5.4
+./usr/include/g++/mips64el-unknown-openbsd5.4/bits
+./usr/include/g++/mips64el-unknown-openbsd5.4/bits/atomic_word.h
+./usr/include/g++/mips64el-unknown-openbsd5.4/bits/basic_file.h
+./usr/include/g++/mips64el-unknown-openbsd5.4/bits/c++allocator.h
+./usr/include/g++/mips64el-unknown-openbsd5.4/bits/c++config.h
+./usr/include/g++/mips64el-unknown-openbsd5.4/bits/c++io.h
+./usr/include/g++/mips64el-unknown-openbsd5.4/bits/c++locale.h
+./usr/include/g++/mips64el-unknown-openbsd5.4/bits/c++locale_internal.h
+./usr/include/g++/mips64el-unknown-openbsd5.4/bits/compatibility.h
+./usr/include/g++/mips64el-unknown-openbsd5.4/bits/cpu_defines.h
+./usr/include/g++/mips64el-unknown-openbsd5.4/bits/ctype_base.h
+./usr/include/g++/mips64el-unknown-openbsd5.4/bits/ctype_inline.h
+./usr/include/g++/mips64el-unknown-openbsd5.4/bits/ctype_noninline.h
+./usr/include/g++/mips64el-unknown-openbsd5.4/bits/cxxabi_tweaks.h
+./usr/include/g++/mips64el-unknown-openbsd5.4/bits/gthr-default.h
+./usr/include/g++/mips64el-unknown-openbsd5.4/bits/gthr-posix.h
+./usr/include/g++/mips64el-unknown-openbsd5.4/bits/gthr-single.h
+./usr/include/g++/mips64el-unknown-openbsd5.4/bits/gthr-tpf.h
+./usr/include/g++/mips64el-unknown-openbsd5.4/bits/gthr.h
+./usr/include/g++/mips64el-unknown-openbsd5.4/bits/messages_members.h
+./usr/include/g++/mips64el-unknown-openbsd5.4/bits/os_defines.h
+./usr/include/g++/mips64el-unknown-openbsd5.4/bits/time_members.h
./usr/include/g++/ostream
./usr/include/g++/streambuf
./usr/include/g++/tr1
@@ -652,14 +652,14 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.3/4.2.1
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.3/4.2.1/cc1
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.3/4.2.1/cc1obj
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.3/4.2.1/cc1plus
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.3/4.2.1/collect2
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.3/4.2.1/libgcc.a
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.3/4.2.1/libgcov.a
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.3/4.2.1/specs
+./usr/lib/gcc-lib/mips64el-unknown-openbsd5.4/4.2.1
+./usr/lib/gcc-lib/mips64el-unknown-openbsd5.4/4.2.1/cc1
+./usr/lib/gcc-lib/mips64el-unknown-openbsd5.4/4.2.1/cc1obj
+./usr/lib/gcc-lib/mips64el-unknown-openbsd5.4/4.2.1/cc1plus
+./usr/lib/gcc-lib/mips64el-unknown-openbsd5.4/4.2.1/collect2
+./usr/lib/gcc-lib/mips64el-unknown-openbsd5.4/4.2.1/libgcc.a
+./usr/lib/gcc-lib/mips64el-unknown-openbsd5.4/4.2.1/libgcov.a
+./usr/lib/gcc-lib/mips64el-unknown-openbsd5.4/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 04984416940..1c49afea3ef 100644
--- a/distrib/sets/lists/comp/md.luna88k
+++ b/distrib/sets/lists/comp/md.luna88k
@@ -119,22 +119,22 @@
./usr/include/g++/istream
./usr/include/g++/limits
./usr/include/g++/locale
-./usr/include/g++/m88k-unknown-openbsd5.3
-./usr/include/g++/m88k-unknown-openbsd5.3/bits
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/basic_file.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/c++config.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/c++io.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/c++locale.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/ctype_base.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/ctype_inline.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/ctype_noninline.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/gthr-default.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/gthr-posix.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/gthr-single.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/gthr.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/messages_members.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/os_defines.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/time_members.h
+./usr/include/g++/m88k-unknown-openbsd5.4
+./usr/include/g++/m88k-unknown-openbsd5.4/bits
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/basic_file.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/c++config.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/c++io.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/c++locale.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/ctype_base.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/ctype_inline.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/ctype_noninline.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/gthr-default.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/gthr-posix.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/gthr-single.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/gthr.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/messages_members.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/os_defines.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/time_members.h
./usr/include/g++/ostream
./usr/include/g++/streambuf
./usr/include/ieeefp.h
@@ -234,15 +234,15 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/SYSCALLS.c.X
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/cc1obj
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/cc1plus
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/fPIC
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/fPIC/libgcc.a
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/fpic
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/fpic/libgcc.a
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/include/unwind.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/SYSCALLS.c.X
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/cc1obj
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/cc1plus
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/fPIC
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/fPIC/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/fpic
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/fpic/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/include/unwind.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/libgcc.a
./usr/lib/libsupc++.a
./usr/libdata/ldscripts
./usr/libdata/ldscripts/elf32m88k_obsd.x
@@ -269,5 +269,5 @@
./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.3/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/codecvt_specializations.ph
diff --git a/distrib/sets/lists/comp/md.macppc b/distrib/sets/lists/comp/md.macppc
index 375338f844a..e0160a3b212 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.3
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/atomic_word.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/basic_file.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/c++allocator.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/c++config.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/c++io.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/c++locale.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/c++locale_internal.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/compatibility.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/cpu_defines.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/ctype_base.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/ctype_inline.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/ctype_noninline.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/cxxabi_tweaks.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/gthr-default.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/gthr-posix.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/gthr-single.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/gthr-tpf.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/gthr.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/messages_members.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/os_defines.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/time_members.h
+./usr/include/g++/powerpc-unknown-openbsd5.4
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/atomic_word.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/basic_file.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/c++allocator.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/c++config.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/c++io.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/c++locale.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/c++locale_internal.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/compatibility.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/cpu_defines.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/ctype_base.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/ctype_inline.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/ctype_noninline.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/cxxabi_tweaks.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/gthr-default.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/gthr-posix.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/gthr-single.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/gthr-tpf.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/gthr.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/messages_members.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/os_defines.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/time_members.h
./usr/include/g++/streambuf
./usr/include/g++/tr1
./usr/include/g++/tr1/array
@@ -647,10 +647,10 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.3/4.2.1/cc1obj
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.3/4.2.1/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.3/4.2.1/libgcc.a
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.3/4.2.1/libgcov.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.4/4.2.1/cc1obj
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.4/4.2.1/cc1plus
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.4/4.2.1/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.4/4.2.1/libgcov.a
./usr/lib/libstdc++_p.a
./usr/lib/libsupc++.a
./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.mvme68k b/distrib/sets/lists/comp/md.mvme68k
index 06f16fe5527..1c4abd07aa9 100644
--- a/distrib/sets/lists/comp/md.mvme68k
+++ b/distrib/sets/lists/comp/md.mvme68k
@@ -131,24 +131,24 @@
./usr/include/g++/istream
./usr/include/g++/limits
./usr/include/g++/locale
-./usr/include/g++/m68k-unknown-openbsd5.3
-./usr/include/g++/m68k-unknown-openbsd5.3/bits
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/atomicity.h
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/basic_file.h
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/c++config.h
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/c++io.h
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/c++locale.h
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/codecvt_specializations.h
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/ctype_base.h
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/ctype_inline.h
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/ctype_noninline.h
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/gthr-default.h
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/gthr-posix.h
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/gthr-single.h
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/gthr.h
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/messages_members.h
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/os_defines.h
-./usr/include/g++/m68k-unknown-openbsd5.3/bits/time_members.h
+./usr/include/g++/m68k-unknown-openbsd5.4
+./usr/include/g++/m68k-unknown-openbsd5.4/bits
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/atomicity.h
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/basic_file.h
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/c++config.h
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/c++io.h
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/c++locale.h
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/codecvt_specializations.h
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/ctype_base.h
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/ctype_inline.h
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/ctype_noninline.h
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/gthr-default.h
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/gthr-posix.h
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/gthr-single.h
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/gthr.h
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/messages_members.h
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/os_defines.h
+./usr/include/g++/m68k-unknown-openbsd5.4/bits/time_members.h
./usr/include/g++/ostream
./usr/include/g++/streambuf
./usr/include/ieeefp.h
@@ -239,15 +239,15 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.3/3.3.6/SYSCALLS.c.X
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.3/3.3.6/cc1obj
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.3/3.3.6/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.3/3.3.6/fPIC
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.3/3.3.6/fPIC/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.3/3.3.6/fpic
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.3/3.3.6/fpic/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.3/3.3.6/include/unwind.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.3/3.3.6/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.4/3.3.6/SYSCALLS.c.X
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.4/3.3.6/cc1obj
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.4/3.3.6/cc1plus
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.4/3.3.6/fPIC
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.4/3.3.6/fPIC/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.4/3.3.6/fpic
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.4/3.3.6/fpic/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.4/3.3.6/include/unwind.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.4/3.3.6/libgcc.a
./usr/lib/libsupc++.a
./usr/libdata/ldscripts
./usr/libdata/ldscripts/m68k4knbsd.x
diff --git a/distrib/sets/lists/comp/md.mvme88k b/distrib/sets/lists/comp/md.mvme88k
index 8d8eeb00659..6f68464a905 100644
--- a/distrib/sets/lists/comp/md.mvme88k
+++ b/distrib/sets/lists/comp/md.mvme88k
@@ -119,22 +119,22 @@
./usr/include/g++/istream
./usr/include/g++/limits
./usr/include/g++/locale
-./usr/include/g++/m88k-unknown-openbsd5.3
-./usr/include/g++/m88k-unknown-openbsd5.3/bits
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/basic_file.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/c++config.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/c++io.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/c++locale.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/ctype_base.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/ctype_inline.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/ctype_noninline.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/gthr-default.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/gthr-posix.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/gthr-single.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/gthr.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/messages_members.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/os_defines.h
-./usr/include/g++/m88k-unknown-openbsd5.3/bits/time_members.h
+./usr/include/g++/m88k-unknown-openbsd5.4
+./usr/include/g++/m88k-unknown-openbsd5.4/bits
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/basic_file.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/c++config.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/c++io.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/c++locale.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/ctype_base.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/ctype_inline.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/ctype_noninline.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/gthr-default.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/gthr-posix.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/gthr-single.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/gthr.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/messages_members.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/os_defines.h
+./usr/include/g++/m88k-unknown-openbsd5.4/bits/time_members.h
./usr/include/g++/ostream
./usr/include/g++/streambuf
./usr/include/ieeefp.h
@@ -247,15 +247,15 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/SYSCALLS.c.X
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/cc1obj
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/cc1plus
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/fPIC
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/fPIC/libgcc.a
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/fpic
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/fpic/libgcc.a
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/include/unwind.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/SYSCALLS.c.X
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/cc1obj
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/cc1plus
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/fPIC
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/fPIC/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/fpic
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/fpic/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/include/unwind.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.4/3.3.6/libgcc.a
./usr/lib/libsupc++.a
./usr/libdata/ldscripts
./usr/libdata/ldscripts/elf32m88k_obsd.x
@@ -282,5 +282,5 @@
./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.3/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.3/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/g++/m88k-unknown-openbsd5.4/bits/codecvt_specializations.ph
diff --git a/distrib/sets/lists/comp/md.octeon b/distrib/sets/lists/comp/md.octeon
index f250777e52b..aa78deece37 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.3
-./usr/include/g++/mips64-unknown-openbsd5.3/bits
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/atomic_word.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/basic_file.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/c++allocator.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/c++config.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/c++io.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/c++locale.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/c++locale_internal.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/compatibility.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/cpu_defines.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/ctype_base.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/ctype_inline.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/ctype_noninline.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/cxxabi_tweaks.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/gthr-default.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/gthr-posix.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/gthr-single.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/gthr-tpf.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/gthr.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/messages_members.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/os_defines.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/time_members.h
+./usr/include/g++/mips64-unknown-openbsd5.4
+./usr/include/g++/mips64-unknown-openbsd5.4/bits
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/atomic_word.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/basic_file.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/c++allocator.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/c++config.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/c++io.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/c++locale.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/c++locale_internal.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/compatibility.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/cpu_defines.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/ctype_base.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/ctype_inline.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/ctype_noninline.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/cxxabi_tweaks.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/gthr-default.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/gthr-posix.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/gthr-single.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/gthr-tpf.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/gthr.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/messages_members.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/os_defines.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/time_members.h
./usr/include/g++/ostream
./usr/include/g++/streambuf
./usr/include/g++/tr1
@@ -649,14 +649,14 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.3/4.2.1
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.3/4.2.1/cc1
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.3/4.2.1/cc1obj
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.3/4.2.1/cc1plus
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.3/4.2.1/collect2
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.3/4.2.1/libgcc.a
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.3/4.2.1/libgcov.a
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.3/4.2.1/specs
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.4/4.2.1
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.4/4.2.1/cc1
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.4/4.2.1/cc1obj
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.4/4.2.1/cc1plus
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.4/4.2.1/collect2
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.4/4.2.1/libgcc.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.4/4.2.1/libgcov.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.4/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 a2298af6712..2c6d577fe38 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.3
-./usr/include/g++/mips64-unknown-openbsd5.3/bits
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/atomic_word.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/basic_file.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/c++allocator.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/c++config.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/c++io.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/c++locale.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/c++locale_internal.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/compatibility.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/cpu_defines.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/ctype_base.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/ctype_inline.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/ctype_noninline.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/cxxabi_tweaks.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/gthr-default.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/gthr-posix.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/gthr-single.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/gthr-tpf.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/gthr.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/messages_members.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/os_defines.h
-./usr/include/g++/mips64-unknown-openbsd5.3/bits/time_members.h
+./usr/include/g++/mips64-unknown-openbsd5.4
+./usr/include/g++/mips64-unknown-openbsd5.4/bits
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/atomic_word.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/basic_file.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/c++allocator.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/c++config.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/c++io.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/c++locale.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/c++locale_internal.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/compatibility.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/cpu_defines.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/ctype_base.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/ctype_inline.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/ctype_noninline.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/cxxabi_tweaks.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/gthr-default.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/gthr-posix.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/gthr-single.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/gthr-tpf.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/gthr.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/messages_members.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/os_defines.h
+./usr/include/g++/mips64-unknown-openbsd5.4/bits/time_members.h
./usr/include/g++/ostream
./usr/include/g++/streambuf
./usr/include/g++/tr1
@@ -651,14 +651,14 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.3/4.2.1
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.3/4.2.1/cc1
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.3/4.2.1/cc1obj
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.3/4.2.1/cc1plus
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.3/4.2.1/collect2
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.3/4.2.1/libgcc.a
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.3/4.2.1/libgcov.a
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.3/4.2.1/specs
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.4/4.2.1
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.4/4.2.1/cc1
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.4/4.2.1/cc1obj
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.4/4.2.1/cc1plus
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.4/4.2.1/collect2
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.4/4.2.1/libgcc.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.4/4.2.1/libgcov.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.4/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 4bfdd57ef1e..d07de3342b5 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.3
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/atomic_word.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/basic_file.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/c++allocator.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/c++config.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/c++io.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/c++locale.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/c++locale_internal.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/compatibility.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/cpu_defines.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/ctype_base.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/ctype_inline.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/ctype_noninline.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/cxxabi_tweaks.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/gthr-default.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/gthr-posix.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/gthr-single.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/gthr-tpf.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/gthr.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/messages_members.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/os_defines.h
-./usr/include/g++/powerpc-unknown-openbsd5.3/bits/time_members.h
+./usr/include/g++/powerpc-unknown-openbsd5.4
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/atomic_word.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/basic_file.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/c++allocator.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/c++config.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/c++io.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/c++locale.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/c++locale_internal.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/compatibility.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/cpu_defines.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/ctype_base.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/ctype_inline.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/ctype_noninline.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/cxxabi_tweaks.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/gthr-default.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/gthr-posix.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/gthr-single.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/gthr-tpf.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/gthr.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/messages_members.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/os_defines.h
+./usr/include/g++/powerpc-unknown-openbsd5.4/bits/time_members.h
./usr/include/g++/streambuf
./usr/include/g++/tr1
./usr/include/g++/tr1/array
@@ -641,10 +641,10 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.3/4.2.1/cc1obj
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.3/4.2.1/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.3/4.2.1/libgcc.a
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.3/4.2.1/libgcov.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.4/4.2.1/cc1obj
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.4/4.2.1/cc1plus
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.4/4.2.1/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.4/4.2.1/libgcov.a
./usr/lib/libstdc++_p.a
./usr/lib/libsupc++.a
./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.sparc b/distrib/sets/lists/comp/md.sparc
index 78ea3865482..d05a9025ea5 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.3
-./usr/include/g++/sparc-unknown-openbsd5.3/bits
-./usr/include/g++/sparc-unknown-openbsd5.3/bits/atomic_word.h
-./usr/include/g++/sparc-unknown-openbsd5.3/bits/basic_file.h
-./usr/include/g++/sparc-unknown-openbsd5.3/bits/c++allocator.h
-./usr/include/g++/sparc-unknown-openbsd5.3/bits/c++config.h
-./usr/include/g++/sparc-unknown-openbsd5.3/bits/c++io.h
-./usr/include/g++/sparc-unknown-openbsd5.3/bits/c++locale.h
-./usr/include/g++/sparc-unknown-openbsd5.3/bits/c++locale_internal.h
-./usr/include/g++/sparc-unknown-openbsd5.3/bits/compatibility.h
-./usr/include/g++/sparc-unknown-openbsd5.3/bits/cpu_defines.h
-./usr/include/g++/sparc-unknown-openbsd5.3/bits/ctype_base.h
-./usr/include/g++/sparc-unknown-openbsd5.3/bits/ctype_inline.h
-./usr/include/g++/sparc-unknown-openbsd5.3/bits/ctype_noninline.h
-./usr/include/g++/sparc-unknown-openbsd5.3/bits/cxxabi_tweaks.h
-./usr/include/g++/sparc-unknown-openbsd5.3/bits/gthr-default.h
-./usr/include/g++/sparc-unknown-openbsd5.3/bits/gthr-posix.h
-./usr/include/g++/sparc-unknown-openbsd5.3/bits/gthr-single.h
-./usr/include/g++/sparc-unknown-openbsd5.3/bits/gthr-tpf.h
-./usr/include/g++/sparc-unknown-openbsd5.3/bits/gthr.h
-./usr/include/g++/sparc-unknown-openbsd5.3/bits/messages_members.h
-./usr/include/g++/sparc-unknown-openbsd5.3/bits/os_defines.h
-./usr/include/g++/sparc-unknown-openbsd5.3/bits/time_members.h
+./usr/include/g++/sparc-unknown-openbsd5.4
+./usr/include/g++/sparc-unknown-openbsd5.4/bits
+./usr/include/g++/sparc-unknown-openbsd5.4/bits/atomic_word.h
+./usr/include/g++/sparc-unknown-openbsd5.4/bits/basic_file.h
+./usr/include/g++/sparc-unknown-openbsd5.4/bits/c++allocator.h
+./usr/include/g++/sparc-unknown-openbsd5.4/bits/c++config.h
+./usr/include/g++/sparc-unknown-openbsd5.4/bits/c++io.h
+./usr/include/g++/sparc-unknown-openbsd5.4/bits/c++locale.h
+./usr/include/g++/sparc-unknown-openbsd5.4/bits/c++locale_internal.h
+./usr/include/g++/sparc-unknown-openbsd5.4/bits/compatibility.h
+./usr/include/g++/sparc-unknown-openbsd5.4/bits/cpu_defines.h
+./usr/include/g++/sparc-unknown-openbsd5.4/bits/ctype_base.h
+./usr/include/g++/sparc-unknown-openbsd5.4/bits/ctype_inline.h
+./usr/include/g++/sparc-unknown-openbsd5.4/bits/ctype_noninline.h
+./usr/include/g++/sparc-unknown-openbsd5.4/bits/cxxabi_tweaks.h
+./usr/include/g++/sparc-unknown-openbsd5.4/bits/gthr-default.h
+./usr/include/g++/sparc-unknown-openbsd5.4/bits/gthr-posix.h
+./usr/include/g++/sparc-unknown-openbsd5.4/bits/gthr-single.h
+./usr/include/g++/sparc-unknown-openbsd5.4/bits/gthr-tpf.h
+./usr/include/g++/sparc-unknown-openbsd5.4/bits/gthr.h
+./usr/include/g++/sparc-unknown-openbsd5.4/bits/messages_members.h
+./usr/include/g++/sparc-unknown-openbsd5.4/bits/os_defines.h
+./usr/include/g++/sparc-unknown-openbsd5.4/bits/time_members.h
./usr/include/g++/streambuf
./usr/include/g++/tr1
./usr/include/g++/tr1/array
@@ -609,10 +609,10 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.3/4.2.1/cc1obj
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.3/4.2.1/cc1plus
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.3/4.2.1/libgcc.a
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.3/4.2.1/libgcov.a
+./usr/lib/gcc-lib/sparc-unknown-openbsd5.4/4.2.1/cc1obj
+./usr/lib/gcc-lib/sparc-unknown-openbsd5.4/4.2.1/cc1plus
+./usr/lib/gcc-lib/sparc-unknown-openbsd5.4/4.2.1/libgcc.a
+./usr/lib/gcc-lib/sparc-unknown-openbsd5.4/4.2.1/libgcov.a
./usr/lib/libstdc++_p.a
./usr/lib/libsupc++.a
./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.sparc64 b/distrib/sets/lists/comp/md.sparc64
index 968948c44aa..4ddde2dc250 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.3
-./usr/include/g++/sparc64-unknown-openbsd5.3/bits
-./usr/include/g++/sparc64-unknown-openbsd5.3/bits/atomic_word.h
-./usr/include/g++/sparc64-unknown-openbsd5.3/bits/basic_file.h
-./usr/include/g++/sparc64-unknown-openbsd5.3/bits/c++allocator.h
-./usr/include/g++/sparc64-unknown-openbsd5.3/bits/c++config.h
-./usr/include/g++/sparc64-unknown-openbsd5.3/bits/c++io.h
-./usr/include/g++/sparc64-unknown-openbsd5.3/bits/c++locale.h
-./usr/include/g++/sparc64-unknown-openbsd5.3/bits/c++locale_internal.h
-./usr/include/g++/sparc64-unknown-openbsd5.3/bits/compatibility.h
-./usr/include/g++/sparc64-unknown-openbsd5.3/bits/cpu_defines.h
-./usr/include/g++/sparc64-unknown-openbsd5.3/bits/ctype_base.h
-./usr/include/g++/sparc64-unknown-openbsd5.3/bits/ctype_inline.h
-./usr/include/g++/sparc64-unknown-openbsd5.3/bits/ctype_noninline.h
-./usr/include/g++/sparc64-unknown-openbsd5.3/bits/cxxabi_tweaks.h
-./usr/include/g++/sparc64-unknown-openbsd5.3/bits/gthr-default.h
-./usr/include/g++/sparc64-unknown-openbsd5.3/bits/gthr-posix.h
-./usr/include/g++/sparc64-unknown-openbsd5.3/bits/gthr-single.h
-./usr/include/g++/sparc64-unknown-openbsd5.3/bits/gthr-tpf.h
-./usr/include/g++/sparc64-unknown-openbsd5.3/bits/gthr.h
-./usr/include/g++/sparc64-unknown-openbsd5.3/bits/messages_members.h
-./usr/include/g++/sparc64-unknown-openbsd5.3/bits/os_defines.h
-./usr/include/g++/sparc64-unknown-openbsd5.3/bits/time_members.h
+./usr/include/g++/sparc64-unknown-openbsd5.4
+./usr/include/g++/sparc64-unknown-openbsd5.4/bits
+./usr/include/g++/sparc64-unknown-openbsd5.4/bits/atomic_word.h
+./usr/include/g++/sparc64-unknown-openbsd5.4/bits/basic_file.h
+./usr/include/g++/sparc64-unknown-openbsd5.4/bits/c++allocator.h
+./usr/include/g++/sparc64-unknown-openbsd5.4/bits/c++config.h
+./usr/include/g++/sparc64-unknown-openbsd5.4/bits/c++io.h
+./usr/include/g++/sparc64-unknown-openbsd5.4/bits/c++locale.h
+./usr/include/g++/sparc64-unknown-openbsd5.4/bits/c++locale_internal.h
+./usr/include/g++/sparc64-unknown-openbsd5.4/bits/compatibility.h
+./usr/include/g++/sparc64-unknown-openbsd5.4/bits/cpu_defines.h
+./usr/include/g++/sparc64-unknown-openbsd5.4/bits/ctype_base.h
+./usr/include/g++/sparc64-unknown-openbsd5.4/bits/ctype_inline.h
+./usr/include/g++/sparc64-unknown-openbsd5.4/bits/ctype_noninline.h
+./usr/include/g++/sparc64-unknown-openbsd5.4/bits/cxxabi_tweaks.h
+./usr/include/g++/sparc64-unknown-openbsd5.4/bits/gthr-default.h
+./usr/include/g++/sparc64-unknown-openbsd5.4/bits/gthr-posix.h
+./usr/include/g++/sparc64-unknown-openbsd5.4/bits/gthr-single.h
+./usr/include/g++/sparc64-unknown-openbsd5.4/bits/gthr-tpf.h
+./usr/include/g++/sparc64-unknown-openbsd5.4/bits/gthr.h
+./usr/include/g++/sparc64-unknown-openbsd5.4/bits/messages_members.h
+./usr/include/g++/sparc64-unknown-openbsd5.4/bits/os_defines.h
+./usr/include/g++/sparc64-unknown-openbsd5.4/bits/time_members.h
./usr/include/g++/streambuf
./usr/include/g++/tr1
./usr/include/g++/tr1/array
@@ -611,10 +611,10 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.3/4.2.1/cc1obj
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.3/4.2.1/cc1plus
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.3/4.2.1/libgcc.a
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.3/4.2.1/libgcov.a
+./usr/lib/gcc-lib/sparc64-unknown-openbsd5.4/4.2.1/cc1obj
+./usr/lib/gcc-lib/sparc64-unknown-openbsd5.4/4.2.1/cc1plus
+./usr/lib/gcc-lib/sparc64-unknown-openbsd5.4/4.2.1/libgcc.a
+./usr/lib/gcc-lib/sparc64-unknown-openbsd5.4/4.2.1/libgcov.a
./usr/lib/libstdc++_p.a
./usr/lib/libsupc++.a
./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.vax b/distrib/sets/lists/comp/md.vax
index d9e20893479..d6937175c75 100644
--- a/distrib/sets/lists/comp/md.vax
+++ b/distrib/sets/lists/comp/md.vax
@@ -176,18 +176,18 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/vax-unknown-openbsd5.3/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/vax-unknown-openbsd5.3/2.95.3/cc1obj
-./usr/lib/gcc-lib/vax-unknown-openbsd5.3/2.95.3/cc1plus
-./usr/lib/gcc-lib/vax-unknown-openbsd5.3/2.95.3/include/README
-./usr/lib/gcc-lib/vax-unknown-openbsd5.3/2.95.3/include/exception
-./usr/lib/gcc-lib/vax-unknown-openbsd5.3/2.95.3/include/float.h
-./usr/lib/gcc-lib/vax-unknown-openbsd5.3/2.95.3/include/limits.h
-./usr/lib/gcc-lib/vax-unknown-openbsd5.3/2.95.3/include/new
-./usr/lib/gcc-lib/vax-unknown-openbsd5.3/2.95.3/include/new.h
-./usr/lib/gcc-lib/vax-unknown-openbsd5.3/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/vax-unknown-openbsd5.3/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/vax-unknown-openbsd5.3/2.95.3/libgcc.a
+./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/cc1obj
+./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/cc1plus
+./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/include/README
+./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/include/exception
+./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/include/float.h
+./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/include/limits.h
+./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/include/new
+./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/include/new.h
+./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/vax-unknown-openbsd5.4/2.95.3/libgcc.a
./usr/lib/libstdc++_p.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 e93db47c47e..e131e85a031 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.3
-./usr/include/g++/arm-unknown-openbsd5.3/bits
-./usr/include/g++/arm-unknown-openbsd5.3/bits/atomic_word.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/basic_file.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/c++allocator.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/c++config.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/c++io.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/c++locale.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/c++locale_internal.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/compatibility.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/cpu_defines.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/ctype_base.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/ctype_inline.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/ctype_noninline.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/cxxabi_tweaks.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/gthr-default.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/gthr-posix.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/gthr-single.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/gthr-tpf.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/gthr.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/messages_members.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/os_defines.h
-./usr/include/g++/arm-unknown-openbsd5.3/bits/time_members.h
+./usr/include/g++/arm-unknown-openbsd5.4
+./usr/include/g++/arm-unknown-openbsd5.4/bits
+./usr/include/g++/arm-unknown-openbsd5.4/bits/atomic_word.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/basic_file.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/c++allocator.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/c++config.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/c++io.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/c++locale.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/c++locale_internal.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/compatibility.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/cpu_defines.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/ctype_base.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/ctype_inline.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/ctype_noninline.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/cxxabi_tweaks.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/gthr-default.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/gthr-posix.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/gthr-single.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/gthr-tpf.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/gthr.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/messages_members.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/os_defines.h
+./usr/include/g++/arm-unknown-openbsd5.4/bits/time_members.h
./usr/include/g++/backward
./usr/include/g++/backward/algo.h
./usr/include/g++/backward/algobase.h
@@ -647,10 +647,10 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/arm-unknown-openbsd5.3/4.2.1/cc1obj
-./usr/lib/gcc-lib/arm-unknown-openbsd5.3/4.2.1/cc1plus
-./usr/lib/gcc-lib/arm-unknown-openbsd5.3/4.2.1/libgcc.a
-./usr/lib/gcc-lib/arm-unknown-openbsd5.3/4.2.1/libgcov.a
+./usr/lib/gcc-lib/arm-unknown-openbsd5.4/4.2.1/cc1obj
+./usr/lib/gcc-lib/arm-unknown-openbsd5.4/4.2.1/cc1plus
+./usr/lib/gcc-lib/arm-unknown-openbsd5.4/4.2.1/libgcc.a
+./usr/lib/gcc-lib/arm-unknown-openbsd5.4/4.2.1/libgcov.a
./usr/lib/libarm.a
./usr/lib/libarm_p.a
./usr/lib/libstdc++_p.a