summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2010-01-26 23:04:25 +0000
committermiod <miod@openbsd.org>2010-01-26 23:04:25 +0000
commitc92722735fa1f7465e5f0f07bc340391f36b85e6 (patch)
tree2d1df5dff0c6e0da191b764ba625caac5d80fc27
parentActually use the copy made when no newline is found, from martynas@. (diff)
downloadwireguard-openbsd-c92722735fa1f7465e5f0f07bc340391f36b85e6.tar.xz
wireguard-openbsd-c92722735fa1f7465e5f0f07bc340391f36b85e6.zip
4.7-BETA (also, lo-carb and ozone layer friendly)
-rw-r--r--distrib/sets/lists/base/md.alpha48
-rw-r--r--distrib/sets/lists/base/md.amd6446
-rw-r--r--distrib/sets/lists/base/md.armish54
-rw-r--r--distrib/sets/lists/base/md.aviion14
-rw-r--r--distrib/sets/lists/base/md.hp30014
-rw-r--r--distrib/sets/lists/base/md.hppa46
-rw-r--r--distrib/sets/lists/base/md.hppa6446
-rw-r--r--distrib/sets/lists/base/md.i38648
-rw-r--r--distrib/sets/lists/base/md.landisk36
-rw-r--r--distrib/sets/lists/base/md.luna88k14
-rw-r--r--distrib/sets/lists/base/md.mac68k14
-rw-r--r--distrib/sets/lists/base/md.macppc48
-rw-r--r--distrib/sets/lists/base/md.mvme68k14
-rw-r--r--distrib/sets/lists/base/md.mvme88k14
-rw-r--r--distrib/sets/lists/base/md.mvmeppc14
-rw-r--r--distrib/sets/lists/base/md.palm54
-rw-r--r--distrib/sets/lists/base/md.sgi50
-rw-r--r--distrib/sets/lists/base/md.socppc48
-rw-r--r--distrib/sets/lists/base/md.sparc14
-rw-r--r--distrib/sets/lists/base/md.sparc6440
-rw-r--r--distrib/sets/lists/base/md.vax14
-rw-r--r--distrib/sets/lists/base/md.zaurus54
-rw-r--r--distrib/sets/lists/comp/md.alpha48
-rw-r--r--distrib/sets/lists/comp/md.amd6462
-rw-r--r--distrib/sets/lists/comp/md.armish42
-rw-r--r--distrib/sets/lists/comp/md.aviion26
-rw-r--r--distrib/sets/lists/comp/md.hp30034
-rw-r--r--distrib/sets/lists/comp/md.hppa50
-rw-r--r--distrib/sets/lists/comp/md.hppa6450
-rw-r--r--distrib/sets/lists/comp/md.i38660
-rw-r--r--distrib/sets/lists/comp/md.landisk60
-rw-r--r--distrib/sets/lists/comp/md.luna88k26
-rw-r--r--distrib/sets/lists/comp/md.mac68k34
-rw-r--r--distrib/sets/lists/comp/md.macppc58
-rw-r--r--distrib/sets/lists/comp/md.mvme68k34
-rw-r--r--distrib/sets/lists/comp/md.mvme88k26
-rw-r--r--distrib/sets/lists/comp/md.mvmeppc30
-rw-r--r--distrib/sets/lists/comp/md.palm42
-rw-r--r--distrib/sets/lists/comp/md.sgi46
-rw-r--r--distrib/sets/lists/comp/md.socppc58
-rw-r--r--distrib/sets/lists/comp/md.sparc34
-rw-r--r--distrib/sets/lists/comp/md.sparc6456
-rw-r--r--distrib/sets/lists/comp/md.vax26
-rw-r--r--distrib/sets/lists/comp/md.zaurus42
-rw-r--r--etc/root/root.mail14
-rw-r--r--share/mk/sys.mk4
-rw-r--r--share/tmac/mdoc/doc-common5
-rw-r--r--sys/arch/macppc/stand/tbxidata/bsd.tbxi4
-rw-r--r--sys/conf/newvers.sh8
-rw-r--r--sys/sys/param.h6
50 files changed, 865 insertions, 864 deletions
diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 15668b3f606..8370c34c8f0 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -81,12 +81,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/alpha-unknown-openbsd4.6
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.6/3.3.5
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.6/3.3.5/cc1
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.6/3.3.5/collect2
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.6/3.3.5/include
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.6/3.3.5/specs
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.7
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.7/3.3.5
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.7/3.3.5/cc1
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.7/3.3.5/collect2
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.7/3.3.5/include
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.7/3.3.5/specs
./usr/lib/libasn1.so.17.0
./usr/lib/libc.so.53.1
./usr/lib/libcom_err.so.17.0
@@ -1680,24 +1680,24 @@
./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-openbsd4.6
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.6/bits
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.6/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.6/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.6/bits/c++config.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.6/bits/c++io.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.6/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.6/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.6/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.6/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.6/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.6/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.6/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.6/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.6/bits/gthr.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.6/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.6/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.6/bits/time_members.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.7
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.7/bits
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.7/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.7/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.7/bits/c++config.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.7/bits/c++io.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.7/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.7/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.7/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.7/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.7/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.7/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.7/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.7/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.7/bits/gthr.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.7/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.7/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.7/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 5c90c68ab27..00d45282fdd 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -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/amd64-unknown-openbsd4.6
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.6/3.3.5
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.6/3.3.5/cc1
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.6/3.3.5/collect2
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.6/3.3.5/specs
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.7
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/3.3.5
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/3.3.5/cc1
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/3.3.5/collect2
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/3.3.5/specs
./usr/lib/libasn1.so.17.0
./usr/lib/libc.so.53.1
./usr/lib/libcom_err.so.17.0
@@ -1704,24 +1704,24 @@
./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-openbsd4.6
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.6/bits
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.6/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.6/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.6/bits/c++config.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.6/bits/c++io.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.6/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.6/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.6/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.6/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.6/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.6/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.6/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.6/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.6/bits/gthr.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.6/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.6/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.6/bits/time_members.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.7
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.7/bits
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.7/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.7/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.7/bits/c++config.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.7/bits/c++io.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.7/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.7/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.7/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.7/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.7/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.7/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.7/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.7/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.7/bits/gthr.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.7/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.7/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.7/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 02873ff4d4d..24bc0130584 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -53,15 +53,15 @@
./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-openbsd4.6
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/cc1
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/cc1obj
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/cc1plus
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/collect2
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/f771
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/specs
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/cc1
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/cc1obj
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/cc1plus
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/collect2
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/f771
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/specs
./usr/lib/libasn1.so.17.0
./usr/lib/libc.so.53.1
./usr/lib/libcom_err.so.17.0
@@ -1696,24 +1696,24 @@
./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-openbsd4.6
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/c++config.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/c++io.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/gthr.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/time_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/c++config.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/c++io.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/gthr.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/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 495d0e4419f..406e9da73ca 100644
--- a/distrib/sets/lists/base/md.aviion
+++ b/distrib/sets/lists/base/md.aviion
@@ -1,10 +1,10 @@
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/cc1
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/collect2
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/cpp0
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/specs
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/cc1
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/collect2
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/cpp0
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/specs
./usr/libdata/perl5/m88k-openbsd
./usr/libdata/perl5/m88k-openbsd/5.10.1/.packlist
./usr/libdata/perl5/m88k-openbsd/5.10.1/B
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 043f5470100..50338df79d6 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -20,13 +20,13 @@
./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-openbsd4.6
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/cc1
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/collect2
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/cpp0
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/specs
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/cc1
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/collect2
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/cpp0
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/specs
./usr/lib/libasn1.so.17.0
./usr/lib/libc.so.53.1
./usr/lib/libcom_err.so.17.0
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 6641d7cd9b2..c9fe6bc8a9d 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -82,11 +82,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-openbsd4.6
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.6/3.3.5
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.6/3.3.5/cc1
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.6/3.3.5/collect2
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.6/3.3.5/specs
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.7
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.7/3.3.5
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.7/3.3.5/cc1
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.7/3.3.5/collect2
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.7/3.3.5/specs
./usr/lib/libasn1.so.17.0
./usr/lib/libc.so.53.1
./usr/lib/libcom_err.so.17.0
@@ -1726,24 +1726,24 @@
./usr/libdata/perl5/site_perl/hppa-openbsd/g++/ext/stl_hash_fun.ph
./usr/libdata/perl5/site_perl/hppa-openbsd/g++/ext/stl_hashtable.ph
./usr/libdata/perl5/site_perl/hppa-openbsd/g++/ext/stl_rope.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.6
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.6/bits
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.6/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.6/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.6/bits/c++config.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.6/bits/c++io.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.6/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.6/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.6/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.6/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.6/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.6/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.6/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.6/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.6/bits/gthr.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.6/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.6/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.6/bits/time_members.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.7
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.7/bits
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.7/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.7/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.7/bits/c++config.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.7/bits/c++io.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.7/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.7/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.7/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.7/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.7/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.7/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.7/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.7/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.7/bits/gthr.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.7/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.7/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.7/bits/time_members.ph
./usr/libdata/perl5/site_perl/hppa-openbsd/g2c.ph
./usr/libdata/perl5/site_perl/hppa-openbsd/getopt.ph
./usr/libdata/perl5/site_perl/hppa-openbsd/glob.ph
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index 77cc7e5f9a3..7216e42ac18 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -82,11 +82,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-openbsd4.6
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.6/3.3.5
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.6/3.3.5/cc1
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.6/3.3.5/collect2
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.6/3.3.5/specs
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.7
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.7/3.3.5
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.7/3.3.5/cc1
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.7/3.3.5/collect2
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.7/3.3.5/specs
./usr/lib/libasn1.so.17.0
./usr/lib/libc.so.53.1
./usr/lib/libcom_err.so.17.0
@@ -1726,24 +1726,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-openbsd4.6
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.6/bits
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.6/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.6/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.6/bits/c++config.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.6/bits/c++io.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.6/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.6/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.6/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.6/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.6/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.6/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.6/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.6/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.6/bits/gthr.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.6/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.6/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.6/bits/time_members.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.7
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.7/bits
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.7/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.7/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.7/bits/c++config.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.7/bits/c++io.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.7/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.7/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.7/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.7/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.7/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.7/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.7/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.7/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.7/bits/gthr.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.7/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.7/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa64-unknown-openbsd4.7/bits/time_members.ph
./usr/libdata/perl5/site_perl/hppa64-openbsd/g2c.ph
./usr/libdata/perl5/site_perl/hppa64-openbsd/getopt.ph
./usr/libdata/perl5/site_perl/hppa64-openbsd/glob.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 4dac6915a86..45b06435e3d 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -89,12 +89,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/i386-unknown-openbsd4.6
-./usr/lib/gcc-lib/i386-unknown-openbsd4.6/3.3.5
-./usr/lib/gcc-lib/i386-unknown-openbsd4.6/3.3.5/cc1
-./usr/lib/gcc-lib/i386-unknown-openbsd4.6/3.3.5/collect2
-./usr/lib/gcc-lib/i386-unknown-openbsd4.6/3.3.5/include
-./usr/lib/gcc-lib/i386-unknown-openbsd4.6/3.3.5/specs
+./usr/lib/gcc-lib/i386-unknown-openbsd4.7
+./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5
+./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5/cc1
+./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5/collect2
+./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5/include
+./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5/specs
./usr/lib/libasn1.so.17.0
./usr/lib/libc.so.53.1
./usr/lib/libcom_err.so.17.0
@@ -1735,24 +1735,24 @@
./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/stl_hash_fun.ph
./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/stl_hashtable.ph
./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/stl_rope.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.6
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.6/bits
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.6/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.6/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.6/bits/c++config.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.6/bits/c++io.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.6/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.6/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.6/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.6/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.6/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.6/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.6/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.6/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.6/bits/gthr.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.6/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.6/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.6/bits/time_members.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/c++config.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/c++io.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/gthr.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.7/bits/time_members.ph
./usr/libdata/perl5/site_perl/i386-openbsd/g2c.ph
./usr/libdata/perl5/site_perl/i386-openbsd/getopt.ph
./usr/libdata/perl5/site_perl/i386-openbsd/glob.ph
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index 598e6f56235..ea2b2ba8387 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -1689,24 +1689,24 @@
./usr/libdata/perl5/site_perl/sh-openbsd/g++/ext/stl_hash_fun.ph
./usr/libdata/perl5/site_perl/sh-openbsd/g++/ext/stl_hashtable.ph
./usr/libdata/perl5/site_perl/sh-openbsd/g++/ext/stl_rope.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.6
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.6/bits
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.6/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.6/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.6/bits/c++config.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.6/bits/c++io.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.6/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.6/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.6/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.6/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.6/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.6/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.6/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.6/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.6/bits/gthr.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.6/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.6/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.6/bits/time_members.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.7
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.7/bits
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.7/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.7/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.7/bits/c++config.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.7/bits/c++io.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.7/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.7/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.7/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.7/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.7/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.7/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.7/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.7/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.7/bits/gthr.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.7/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.7/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.7/bits/time_members.ph
./usr/libdata/perl5/site_perl/sh-openbsd/g2c.ph
./usr/libdata/perl5/site_perl/sh-openbsd/getopt.ph
./usr/libdata/perl5/site_perl/sh-openbsd/glob.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index ecce3810308..02bf892d367 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -1,11 +1,11 @@
./sbin/wsconsctl
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/cc1
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/collect2
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/cpp0
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/specs
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/cc1
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/collect2
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/cpp0
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/specs
./usr/libdata/perl5/m88k-openbsd
./usr/libdata/perl5/m88k-openbsd/5.10.1/.packlist
./usr/libdata/perl5/m88k-openbsd/5.10.1/B
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index d195aa26044..dad47ee7cce 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -21,13 +21,13 @@
./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-openbsd4.6
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/cc1
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/collect2
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/cpp0
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/specs
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/cc1
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/collect2
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/cpp0
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/specs
./usr/lib/libasn1.so.17.0
./usr/lib/libc.so.53.1
./usr/lib/libcom_err.so.17.0
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index f32b3cfb79c..e63779a338b 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -84,12 +84,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/powerpc-unknown-openbsd4.6
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/cc1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/collect2
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/include
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/specs
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5/cc1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5/collect2
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5/include
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5/specs
./usr/lib/libasn1.so.17.0
./usr/lib/libc.so.53.1
./usr/lib/libcom_err.so.17.0
@@ -1730,24 +1730,24 @@
./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/ext/stl_hash_fun.ph
./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/ext/stl_hashtable.ph
./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/ext/stl_rope.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/c++config.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/c++io.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/gthr.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/time_members.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/c++config.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/c++io.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/gthr.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/time_members.ph
./usr/libdata/perl5/site_perl/powerpc-openbsd/g2c.ph
./usr/libdata/perl5/site_perl/powerpc-openbsd/getopt.ph
./usr/libdata/perl5/site_perl/powerpc-openbsd/glob.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 739a4885a6e..d3e0e987ea7 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -18,13 +18,13 @@
./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-openbsd4.6
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/cc1
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/collect2
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/cpp0
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/specs
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/cc1
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/collect2
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/cpp0
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/specs
./usr/lib/libasn1.so.17.0
./usr/lib/libc.so.53.1
./usr/lib/libcom_err.so.17.0
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 5027646db06..d3471607b5f 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -1,10 +1,10 @@
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/cc1
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/collect2
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/cpp0
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/specs
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/cc1
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/collect2
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/cpp0
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/specs
./usr/libdata/perl5/m88k-openbsd
./usr/libdata/perl5/m88k-openbsd/5.10.1
./usr/libdata/perl5/m88k-openbsd/5.10.1/.packlist
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index f997745dfb0..5aba505837d 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -52,13 +52,13 @@
./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-openbsd4.6
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/cc1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/collect2
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/cpp0
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/include
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/specs
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/cc1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/collect2
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/cpp0
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/include
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/specs
./usr/lib/libasn1.so.17.0
./usr/lib/libc.so.53.1
./usr/lib/libcom_err.so.17.0
diff --git a/distrib/sets/lists/base/md.palm b/distrib/sets/lists/base/md.palm
index 3867ff3a041..96f8e5eae88 100644
--- a/distrib/sets/lists/base/md.palm
+++ b/distrib/sets/lists/base/md.palm
@@ -51,15 +51,15 @@
./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-openbsd4.6
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/cc1
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/cc1obj
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/cc1plus
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/collect2
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/f771
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/specs
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/cc1
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/cc1obj
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/cc1plus
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/collect2
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/f771
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/specs
./usr/lib/libasn1.so.17.0
./usr/lib/libc.so.53.1
./usr/lib/libcom_err.so.17.0
@@ -1651,24 +1651,24 @@
./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-openbsd4.6
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/c++config.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/c++io.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/gthr.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/time_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/c++config.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/c++io.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/gthr.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/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.sgi b/distrib/sets/lists/base/md.sgi
index abb23bf9f80..0d133eb4e72 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -83,13 +83,13 @@
./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-openbsd4.6
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.6/3.3.5
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.6/3.3.5/cc1
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.6/3.3.5/collect2
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.6/3.3.5/f771
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.6/3.3.5/include
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.6/3.3.5/specs
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.7
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.7/3.3.5
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.7/3.3.5/cc1
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.7/3.3.5/collect2
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.7/3.3.5/f771
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.7/3.3.5/include
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.7/3.3.5/specs
./usr/lib/libasn1.so.17.0
./usr/lib/libc.so.53.1
./usr/lib/libcom_err.so.17.0
@@ -1730,24 +1730,24 @@
./usr/libdata/perl5/site_perl/mips64-openbsd/g++/ext/stl_hash_fun.ph
./usr/libdata/perl5/site_perl/mips64-openbsd/g++/ext/stl_hashtable.ph
./usr/libdata/perl5/site_perl/mips64-openbsd/g++/ext/stl_rope.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.6
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.6/bits
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.6/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.6/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.6/bits/c++config.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.6/bits/c++io.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.6/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.6/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.6/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.6/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.6/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.6/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.6/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.6/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.6/bits/gthr.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.6/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.6/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.6/bits/time_members.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.7
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.7/bits
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.7/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.7/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.7/bits/c++config.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.7/bits/c++io.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.7/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.7/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.7/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.7/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.7/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.7/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.7/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.7/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.7/bits/gthr.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.7/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.7/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.7/bits/time_members.ph
./usr/libdata/perl5/site_perl/mips64-openbsd/g2c.ph
./usr/libdata/perl5/site_perl/mips64-openbsd/getopt.ph
./usr/libdata/perl5/site_perl/mips64-openbsd/glob.ph
diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc
index 8f4763814a9..0dba1eedc1a 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -79,12 +79,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/powerpc-unknown-openbsd4.6
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/cc1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/collect2
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/include
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/specs
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5/cc1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5/collect2
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5/include
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5/specs
./usr/lib/libasn1.so.17.0
./usr/lib/libc.so.53.1
./usr/lib/libcom_err.so.17.0
@@ -1725,24 +1725,24 @@
./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/ext/stl_hash_fun.ph
./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/ext/stl_hashtable.ph
./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/ext/stl_rope.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/c++config.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/c++io.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/gthr.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.6/bits/time_members.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/c++config.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/c++io.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/gthr.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.7/bits/time_members.ph
./usr/libdata/perl5/site_perl/powerpc-openbsd/g2c.ph
./usr/libdata/perl5/site_perl/powerpc-openbsd/getopt.ph
./usr/libdata/perl5/site_perl/powerpc-openbsd/glob.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 7edf66f2b88..6cc2568e6f4 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -26,13 +26,13 @@
./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-openbsd4.6
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/cc1
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/collect2
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/cpp0
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/include
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/specs
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.7
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/cc1
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/collect2
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/cpp0
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/include
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/specs
./usr/lib/libasn1.so.17.0
./usr/lib/libc.so.53.1
./usr/lib/libcom_err.so.17.0
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 03cc731e6bc..9c0eaae1838 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -84,8 +84,8 @@
./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-openbsd4.6
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.6/3.3.5/cc1
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.7
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.7/3.3.5/cc1
./usr/lib/libasn1.so.17.0
./usr/lib/libc.so.53.1
./usr/lib/libcom_err.so.17.0
@@ -1154,24 +1154,24 @@
./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/ext/stl_hash_fun.ph
./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/ext/stl_hashtable.ph
./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/ext/stl_rope.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.6
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.6/bits
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.6/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.6/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.6/bits/c++config.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.6/bits/c++io.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.6/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.6/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.6/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.6/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.6/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.6/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.6/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.6/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.6/bits/gthr.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.6/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.6/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.6/bits/time_members.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.7
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.7/bits
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.7/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.7/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.7/bits/c++config.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.7/bits/c++io.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.7/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.7/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.7/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.7/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.7/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.7/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.7/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.7/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.7/bits/gthr.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.7/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.7/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.7/bits/time_members.ph
./usr/libdata/perl5/site_perl/sparc64-openbsd/g2c.ph
./usr/libdata/perl5/site_perl/sparc64-openbsd/getopt.ph
./usr/libdata/perl5/site_perl/sparc64-openbsd/glob.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 80fa66c1ef3..4bff7bd2cbc 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -1,13 +1,13 @@
./pcs750.bin
./sbin/kbd
./sbin/wsconsctl
-./usr/lib/gcc-lib/vax-unknown-openbsd4.6
-./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3
-./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3/cc1
-./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3/collect2
-./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3/cpp0
-./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3/include
-./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3/specs
+./usr/lib/gcc-lib/vax-unknown-openbsd4.7
+./usr/lib/gcc-lib/vax-unknown-openbsd4.7/2.95.3
+./usr/lib/gcc-lib/vax-unknown-openbsd4.7/2.95.3/cc1
+./usr/lib/gcc-lib/vax-unknown-openbsd4.7/2.95.3/collect2
+./usr/lib/gcc-lib/vax-unknown-openbsd4.7/2.95.3/cpp0
+./usr/lib/gcc-lib/vax-unknown-openbsd4.7/2.95.3/include
+./usr/lib/gcc-lib/vax-unknown-openbsd4.7/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 545f021cd81..9f4adc99184 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -51,15 +51,15 @@
./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-openbsd4.6
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/cc1
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/cc1obj
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/cc1plus
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/collect2
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/f771
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/specs
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/cc1
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/cc1obj
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/cc1plus
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/collect2
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/f771
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/specs
./usr/lib/libasn1.so.17.0
./usr/lib/libc.so.53.1
./usr/lib/libcom_err.so.17.0
@@ -1651,24 +1651,24 @@
./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-openbsd4.6
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/c++config.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/c++io.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/gthr.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.6/bits/time_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/c++config.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/c++io.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/gthr.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.7/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 d15d9d535cc..1a9f1b07b40 100644
--- a/distrib/sets/lists/comp/md.alpha
+++ b/distrib/sets/lists/comp/md.alpha
@@ -54,24 +54,24 @@
./usr/include/alpha/tc_machdep.h
./usr/include/alpha/varargs.h
./usr/include/alpha/vmparam.h
-./usr/include/g++/alpha-unknown-openbsd4.6
-./usr/include/g++/alpha-unknown-openbsd4.6/bits
-./usr/include/g++/alpha-unknown-openbsd4.6/bits/atomicity.h
-./usr/include/g++/alpha-unknown-openbsd4.6/bits/basic_file.h
-./usr/include/g++/alpha-unknown-openbsd4.6/bits/c++config.h
-./usr/include/g++/alpha-unknown-openbsd4.6/bits/c++io.h
-./usr/include/g++/alpha-unknown-openbsd4.6/bits/c++locale.h
-./usr/include/g++/alpha-unknown-openbsd4.6/bits/codecvt_specializations.h
-./usr/include/g++/alpha-unknown-openbsd4.6/bits/ctype_base.h
-./usr/include/g++/alpha-unknown-openbsd4.6/bits/ctype_inline.h
-./usr/include/g++/alpha-unknown-openbsd4.6/bits/ctype_noninline.h
-./usr/include/g++/alpha-unknown-openbsd4.6/bits/gthr-default.h
-./usr/include/g++/alpha-unknown-openbsd4.6/bits/gthr-posix.h
-./usr/include/g++/alpha-unknown-openbsd4.6/bits/gthr-single.h
-./usr/include/g++/alpha-unknown-openbsd4.6/bits/gthr.h
-./usr/include/g++/alpha-unknown-openbsd4.6/bits/messages_members.h
-./usr/include/g++/alpha-unknown-openbsd4.6/bits/os_defines.h
-./usr/include/g++/alpha-unknown-openbsd4.6/bits/time_members.h
+./usr/include/g++/alpha-unknown-openbsd4.7
+./usr/include/g++/alpha-unknown-openbsd4.7/bits
+./usr/include/g++/alpha-unknown-openbsd4.7/bits/atomicity.h
+./usr/include/g++/alpha-unknown-openbsd4.7/bits/basic_file.h
+./usr/include/g++/alpha-unknown-openbsd4.7/bits/c++config.h
+./usr/include/g++/alpha-unknown-openbsd4.7/bits/c++io.h
+./usr/include/g++/alpha-unknown-openbsd4.7/bits/c++locale.h
+./usr/include/g++/alpha-unknown-openbsd4.7/bits/codecvt_specializations.h
+./usr/include/g++/alpha-unknown-openbsd4.7/bits/ctype_base.h
+./usr/include/g++/alpha-unknown-openbsd4.7/bits/ctype_inline.h
+./usr/include/g++/alpha-unknown-openbsd4.7/bits/ctype_noninline.h
+./usr/include/g++/alpha-unknown-openbsd4.7/bits/gthr-default.h
+./usr/include/g++/alpha-unknown-openbsd4.7/bits/gthr-posix.h
+./usr/include/g++/alpha-unknown-openbsd4.7/bits/gthr-single.h
+./usr/include/g++/alpha-unknown-openbsd4.7/bits/gthr.h
+./usr/include/g++/alpha-unknown-openbsd4.7/bits/messages_members.h
+./usr/include/g++/alpha-unknown-openbsd4.7/bits/os_defines.h
+./usr/include/g++/alpha-unknown-openbsd4.7/bits/time_members.h
./usr/include/g++/backward
./usr/include/g++/backward/algo.h
./usr/include/g++/backward/algobase.h
@@ -207,12 +207,12 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.6/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.6/3.3.5/cc1obj
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.6/3.3.5/cc1plus
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.6/3.3.5/f771
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.6/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.6/3.3.5/libgcc.a
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.7/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.7/3.3.5/cc1obj
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.7/3.3.5/cc1plus
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.7/3.3.5/f771
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.7/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.7/3.3.5/libgcc.a
./usr/lib/libalpha.a
./usr/lib/libalpha_p.a
./usr/lib/libasn1_pic.a
diff --git a/distrib/sets/lists/comp/md.amd64 b/distrib/sets/lists/comp/md.amd64
index a280dc721ce..0b72930287b 100644
--- a/distrib/sets/lists/comp/md.amd64
+++ b/distrib/sets/lists/comp/md.amd64
@@ -76,24 +76,24 @@
./usr/include/amd64/vga_post.h
./usr/include/amd64/vmparam.h
./usr/include/emmintrin.h
-./usr/include/g++/amd64-unknown-openbsd4.6
-./usr/include/g++/amd64-unknown-openbsd4.6/bits
-./usr/include/g++/amd64-unknown-openbsd4.6/bits/atomicity.h
-./usr/include/g++/amd64-unknown-openbsd4.6/bits/basic_file.h
-./usr/include/g++/amd64-unknown-openbsd4.6/bits/c++config.h
-./usr/include/g++/amd64-unknown-openbsd4.6/bits/c++io.h
-./usr/include/g++/amd64-unknown-openbsd4.6/bits/c++locale.h
-./usr/include/g++/amd64-unknown-openbsd4.6/bits/codecvt_specializations.h
-./usr/include/g++/amd64-unknown-openbsd4.6/bits/ctype_base.h
-./usr/include/g++/amd64-unknown-openbsd4.6/bits/ctype_inline.h
-./usr/include/g++/amd64-unknown-openbsd4.6/bits/ctype_noninline.h
-./usr/include/g++/amd64-unknown-openbsd4.6/bits/gthr-default.h
-./usr/include/g++/amd64-unknown-openbsd4.6/bits/gthr-posix.h
-./usr/include/g++/amd64-unknown-openbsd4.6/bits/gthr-single.h
-./usr/include/g++/amd64-unknown-openbsd4.6/bits/gthr.h
-./usr/include/g++/amd64-unknown-openbsd4.6/bits/messages_members.h
-./usr/include/g++/amd64-unknown-openbsd4.6/bits/os_defines.h
-./usr/include/g++/amd64-unknown-openbsd4.6/bits/time_members.h
+./usr/include/g++/amd64-unknown-openbsd4.7
+./usr/include/g++/amd64-unknown-openbsd4.7/bits
+./usr/include/g++/amd64-unknown-openbsd4.7/bits/atomicity.h
+./usr/include/g++/amd64-unknown-openbsd4.7/bits/basic_file.h
+./usr/include/g++/amd64-unknown-openbsd4.7/bits/c++config.h
+./usr/include/g++/amd64-unknown-openbsd4.7/bits/c++io.h
+./usr/include/g++/amd64-unknown-openbsd4.7/bits/c++locale.h
+./usr/include/g++/amd64-unknown-openbsd4.7/bits/codecvt_specializations.h
+./usr/include/g++/amd64-unknown-openbsd4.7/bits/ctype_base.h
+./usr/include/g++/amd64-unknown-openbsd4.7/bits/ctype_inline.h
+./usr/include/g++/amd64-unknown-openbsd4.7/bits/ctype_noninline.h
+./usr/include/g++/amd64-unknown-openbsd4.7/bits/gthr-default.h
+./usr/include/g++/amd64-unknown-openbsd4.7/bits/gthr-posix.h
+./usr/include/g++/amd64-unknown-openbsd4.7/bits/gthr-single.h
+./usr/include/g++/amd64-unknown-openbsd4.7/bits/gthr.h
+./usr/include/g++/amd64-unknown-openbsd4.7/bits/messages_members.h
+./usr/include/g++/amd64-unknown-openbsd4.7/bits/os_defines.h
+./usr/include/g++/amd64-unknown-openbsd4.7/bits/time_members.h
./usr/include/g++/backward
./usr/include/g++/backward/algo.h
./usr/include/g++/backward/algobase.h
@@ -232,19 +232,19 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.6/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.6/3.3.5/cc1obj
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.6/3.3.5/cc1plus
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.6/3.3.5/f771
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.6/3.3.5/fpic
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.6/3.3.5/fpic/libgcc.a
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.6/3.3.5/include
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.6/3.3.5/include/emmintrin.h
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.6/3.3.5/include/mmintrin.h
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.6/3.3.5/include/pmmintrin.h
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.6/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.6/3.3.5/include/xmmintrin.h
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.6/3.3.5/libgcc.a
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/3.3.5/cc1obj
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/3.3.5/cc1plus
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/3.3.5/f771
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/3.3.5/fpic
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/3.3.5/fpic/libgcc.a
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/3.3.5/include
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/3.3.5/include/emmintrin.h
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/3.3.5/include/mmintrin.h
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/3.3.5/include/pmmintrin.h
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/3.3.5/include/xmmintrin.h
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/3.3.5/libgcc.a
./usr/lib/libamd64.a
./usr/lib/libamd64_p.a
./usr/lib/libasn1_pic.a
diff --git a/distrib/sets/lists/comp/md.armish b/distrib/sets/lists/comp/md.armish
index 4da2f666837..90dbf9a6611 100644
--- a/distrib/sets/lists/comp/md.armish
+++ b/distrib/sets/lists/comp/md.armish
@@ -96,24 +96,24 @@
./usr/include/armish/sysarch.h
./usr/include/armish/trap.h
./usr/include/armish/vmparam.h
-./usr/include/g++/arm-unknown-openbsd4.6
-./usr/include/g++/arm-unknown-openbsd4.6/bits
-./usr/include/g++/arm-unknown-openbsd4.6/bits/atomicity.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/basic_file.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/c++config.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/c++io.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/c++locale.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/codecvt_specializations.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/ctype_base.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/ctype_inline.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/ctype_noninline.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/gthr-default.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/gthr-posix.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/gthr-single.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/gthr.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/messages_members.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/os_defines.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/time_members.h
+./usr/include/g++/arm-unknown-openbsd4.7
+./usr/include/g++/arm-unknown-openbsd4.7/bits
+./usr/include/g++/arm-unknown-openbsd4.7/bits/atomicity.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/basic_file.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/c++config.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/c++io.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/c++locale.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/codecvt_specializations.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/ctype_base.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/ctype_inline.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/ctype_noninline.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/gthr-default.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/gthr-posix.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/gthr-single.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/gthr.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/messages_members.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/os_defines.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/time_members.h
./usr/include/g++/backward
./usr/include/g++/backward/algo.h
./usr/include/g++/backward/algobase.h
@@ -249,9 +249,9 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/include
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/libgcc.a
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/include
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/libgcc.a
./usr/lib/libarm.a
./usr/lib/libarm_p.a
./usr/lib/libasn1_pic.a
diff --git a/distrib/sets/lists/comp/md.aviion b/distrib/sets/lists/comp/md.aviion
index ca37c6999b7..0b7a4142bd7 100644
--- a/distrib/sets/lists/comp/md.aviion
+++ b/distrib/sets/lists/comp/md.aviion
@@ -204,18 +204,18 @@
./usr/include/m88k/va-m88k.h
./usr/include/m88k/varargs.h
./usr/include/m88k/vmparam.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/cc1obj
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/cc1plus
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/f771
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/README
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/exception
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/float.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/new
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/new.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/cc1obj
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/cc1plus
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/f771
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/README
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/exception
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/float.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/new
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/new.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/libgcc.a
./usr/lib/libstdc++_p.a
./usr/lib/scrt0.o
diff --git a/distrib/sets/lists/comp/md.hp300 b/distrib/sets/lists/comp/md.hp300
index 422568d7d41..4ab28bbc8df 100644
--- a/distrib/sets/lists/comp/md.hp300
+++ b/distrib/sets/lists/comp/md.hp300
@@ -187,23 +187,23 @@
./usr/include/m68k/trap.h
./usr/include/m68k/varargs.h
./usr/include/m68k/vmparam.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/cc1obj
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/f771
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/fPIC
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/fPIC/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/fpic
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/fpic/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/README
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/exception
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/float.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/new
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/new.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/cc1obj
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/cc1plus
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/f771
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/fPIC
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/fPIC/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/fpic
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/fpic/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/README
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/exception
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/float.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/new
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/new.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/libgcc.a
./usr/lib/libasn1_pic.a
./usr/lib/libc_pic.a
./usr/lib/libcom_err_pic.a
diff --git a/distrib/sets/lists/comp/md.hppa b/distrib/sets/lists/comp/md.hppa
index f90c0c8ecaa..b445d6e6448 100644
--- a/distrib/sets/lists/comp/md.hppa
+++ b/distrib/sets/lists/comp/md.hppa
@@ -124,24 +124,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++/hppa-unknown-openbsd4.6
-./usr/include/g++/hppa-unknown-openbsd4.6/bits
-./usr/include/g++/hppa-unknown-openbsd4.6/bits/atomicity.h
-./usr/include/g++/hppa-unknown-openbsd4.6/bits/basic_file.h
-./usr/include/g++/hppa-unknown-openbsd4.6/bits/c++config.h
-./usr/include/g++/hppa-unknown-openbsd4.6/bits/c++io.h
-./usr/include/g++/hppa-unknown-openbsd4.6/bits/c++locale.h
-./usr/include/g++/hppa-unknown-openbsd4.6/bits/codecvt_specializations.h
-./usr/include/g++/hppa-unknown-openbsd4.6/bits/ctype_base.h
-./usr/include/g++/hppa-unknown-openbsd4.6/bits/ctype_inline.h
-./usr/include/g++/hppa-unknown-openbsd4.6/bits/ctype_noninline.h
-./usr/include/g++/hppa-unknown-openbsd4.6/bits/gthr-default.h
-./usr/include/g++/hppa-unknown-openbsd4.6/bits/gthr-posix.h
-./usr/include/g++/hppa-unknown-openbsd4.6/bits/gthr-single.h
-./usr/include/g++/hppa-unknown-openbsd4.6/bits/gthr.h
-./usr/include/g++/hppa-unknown-openbsd4.6/bits/messages_members.h
-./usr/include/g++/hppa-unknown-openbsd4.6/bits/os_defines.h
-./usr/include/g++/hppa-unknown-openbsd4.6/bits/time_members.h
+./usr/include/g++/hppa-unknown-openbsd4.7
+./usr/include/g++/hppa-unknown-openbsd4.7/bits
+./usr/include/g++/hppa-unknown-openbsd4.7/bits/atomicity.h
+./usr/include/g++/hppa-unknown-openbsd4.7/bits/basic_file.h
+./usr/include/g++/hppa-unknown-openbsd4.7/bits/c++config.h
+./usr/include/g++/hppa-unknown-openbsd4.7/bits/c++io.h
+./usr/include/g++/hppa-unknown-openbsd4.7/bits/c++locale.h
+./usr/include/g++/hppa-unknown-openbsd4.7/bits/codecvt_specializations.h
+./usr/include/g++/hppa-unknown-openbsd4.7/bits/ctype_base.h
+./usr/include/g++/hppa-unknown-openbsd4.7/bits/ctype_inline.h
+./usr/include/g++/hppa-unknown-openbsd4.7/bits/ctype_noninline.h
+./usr/include/g++/hppa-unknown-openbsd4.7/bits/gthr-default.h
+./usr/include/g++/hppa-unknown-openbsd4.7/bits/gthr-posix.h
+./usr/include/g++/hppa-unknown-openbsd4.7/bits/gthr-single.h
+./usr/include/g++/hppa-unknown-openbsd4.7/bits/gthr.h
+./usr/include/g++/hppa-unknown-openbsd4.7/bits/messages_members.h
+./usr/include/g++/hppa-unknown-openbsd4.7/bits/os_defines.h
+./usr/include/g++/hppa-unknown-openbsd4.7/bits/time_members.h
./usr/include/g++/ios
./usr/include/g++/istream
./usr/include/g++/limits
@@ -206,13 +206,13 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.6/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.6/3.3.5/cc1obj
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.6/3.3.5/cc1plus
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.6/3.3.5/f771
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.6/3.3.5/include
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.6/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.6/3.3.5/libgcc.a
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.7/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.7/3.3.5/cc1obj
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.7/3.3.5/cc1plus
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.7/3.3.5/f771
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.7/3.3.5/include
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.7/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.7/3.3.5/libgcc.a
./usr/lib/libasn1_pic.a
./usr/lib/libc_pic.a
./usr/lib/libcom_err_pic.a
diff --git a/distrib/sets/lists/comp/md.hppa64 b/distrib/sets/lists/comp/md.hppa64
index 57941e82c01..765dcb41a15 100644
--- a/distrib/sets/lists/comp/md.hppa64
+++ b/distrib/sets/lists/comp/md.hppa64
@@ -124,24 +124,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-openbsd4.6
-./usr/include/g++/hppa64-unknown-openbsd4.6/bits
-./usr/include/g++/hppa64-unknown-openbsd4.6/bits/atomicity.h
-./usr/include/g++/hppa64-unknown-openbsd4.6/bits/basic_file.h
-./usr/include/g++/hppa64-unknown-openbsd4.6/bits/c++config.h
-./usr/include/g++/hppa64-unknown-openbsd4.6/bits/c++io.h
-./usr/include/g++/hppa64-unknown-openbsd4.6/bits/c++locale.h
-./usr/include/g++/hppa64-unknown-openbsd4.6/bits/codecvt_specializations.h
-./usr/include/g++/hppa64-unknown-openbsd4.6/bits/ctype_base.h
-./usr/include/g++/hppa64-unknown-openbsd4.6/bits/ctype_inline.h
-./usr/include/g++/hppa64-unknown-openbsd4.6/bits/ctype_noninline.h
-./usr/include/g++/hppa64-unknown-openbsd4.6/bits/gthr-default.h
-./usr/include/g++/hppa64-unknown-openbsd4.6/bits/gthr-posix.h
-./usr/include/g++/hppa64-unknown-openbsd4.6/bits/gthr-single.h
-./usr/include/g++/hppa64-unknown-openbsd4.6/bits/gthr.h
-./usr/include/g++/hppa64-unknown-openbsd4.6/bits/messages_members.h
-./usr/include/g++/hppa64-unknown-openbsd4.6/bits/os_defines.h
-./usr/include/g++/hppa64-unknown-openbsd4.6/bits/time_members.h
+./usr/include/g++/hppa64-unknown-openbsd4.7
+./usr/include/g++/hppa64-unknown-openbsd4.7/bits
+./usr/include/g++/hppa64-unknown-openbsd4.7/bits/atomicity.h
+./usr/include/g++/hppa64-unknown-openbsd4.7/bits/basic_file.h
+./usr/include/g++/hppa64-unknown-openbsd4.7/bits/c++config.h
+./usr/include/g++/hppa64-unknown-openbsd4.7/bits/c++io.h
+./usr/include/g++/hppa64-unknown-openbsd4.7/bits/c++locale.h
+./usr/include/g++/hppa64-unknown-openbsd4.7/bits/codecvt_specializations.h
+./usr/include/g++/hppa64-unknown-openbsd4.7/bits/ctype_base.h
+./usr/include/g++/hppa64-unknown-openbsd4.7/bits/ctype_inline.h
+./usr/include/g++/hppa64-unknown-openbsd4.7/bits/ctype_noninline.h
+./usr/include/g++/hppa64-unknown-openbsd4.7/bits/gthr-default.h
+./usr/include/g++/hppa64-unknown-openbsd4.7/bits/gthr-posix.h
+./usr/include/g++/hppa64-unknown-openbsd4.7/bits/gthr-single.h
+./usr/include/g++/hppa64-unknown-openbsd4.7/bits/gthr.h
+./usr/include/g++/hppa64-unknown-openbsd4.7/bits/messages_members.h
+./usr/include/g++/hppa64-unknown-openbsd4.7/bits/os_defines.h
+./usr/include/g++/hppa64-unknown-openbsd4.7/bits/time_members.h
./usr/include/g++/ios
./usr/include/g++/istream
./usr/include/g++/limits
@@ -205,13 +205,13 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.6/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.6/3.3.5/cc1obj
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.6/3.3.5/cc1plus
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.6/3.3.5/f771
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.6/3.3.5/include
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.6/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.6/3.3.5/libgcc.a
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.7/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.7/3.3.5/cc1obj
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.7/3.3.5/cc1plus
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.7/3.3.5/f771
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.7/3.3.5/include
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.7/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.7/3.3.5/libgcc.a
./usr/lib/libasn1_pic.a
./usr/lib/libc_pic.a
./usr/lib/libcom_err_pic.a
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index 94d22ee7afa..aa366da3520 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -125,24 +125,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++/i386-unknown-openbsd4.6
-./usr/include/g++/i386-unknown-openbsd4.6/bits
-./usr/include/g++/i386-unknown-openbsd4.6/bits/atomicity.h
-./usr/include/g++/i386-unknown-openbsd4.6/bits/basic_file.h
-./usr/include/g++/i386-unknown-openbsd4.6/bits/c++config.h
-./usr/include/g++/i386-unknown-openbsd4.6/bits/c++io.h
-./usr/include/g++/i386-unknown-openbsd4.6/bits/c++locale.h
-./usr/include/g++/i386-unknown-openbsd4.6/bits/codecvt_specializations.h
-./usr/include/g++/i386-unknown-openbsd4.6/bits/ctype_base.h
-./usr/include/g++/i386-unknown-openbsd4.6/bits/ctype_inline.h
-./usr/include/g++/i386-unknown-openbsd4.6/bits/ctype_noninline.h
-./usr/include/g++/i386-unknown-openbsd4.6/bits/gthr-default.h
-./usr/include/g++/i386-unknown-openbsd4.6/bits/gthr-posix.h
-./usr/include/g++/i386-unknown-openbsd4.6/bits/gthr-single.h
-./usr/include/g++/i386-unknown-openbsd4.6/bits/gthr.h
-./usr/include/g++/i386-unknown-openbsd4.6/bits/messages_members.h
-./usr/include/g++/i386-unknown-openbsd4.6/bits/os_defines.h
-./usr/include/g++/i386-unknown-openbsd4.6/bits/time_members.h
+./usr/include/g++/i386-unknown-openbsd4.7
+./usr/include/g++/i386-unknown-openbsd4.7/bits
+./usr/include/g++/i386-unknown-openbsd4.7/bits/atomicity.h
+./usr/include/g++/i386-unknown-openbsd4.7/bits/basic_file.h
+./usr/include/g++/i386-unknown-openbsd4.7/bits/c++config.h
+./usr/include/g++/i386-unknown-openbsd4.7/bits/c++io.h
+./usr/include/g++/i386-unknown-openbsd4.7/bits/c++locale.h
+./usr/include/g++/i386-unknown-openbsd4.7/bits/codecvt_specializations.h
+./usr/include/g++/i386-unknown-openbsd4.7/bits/ctype_base.h
+./usr/include/g++/i386-unknown-openbsd4.7/bits/ctype_inline.h
+./usr/include/g++/i386-unknown-openbsd4.7/bits/ctype_noninline.h
+./usr/include/g++/i386-unknown-openbsd4.7/bits/gthr-default.h
+./usr/include/g++/i386-unknown-openbsd4.7/bits/gthr-posix.h
+./usr/include/g++/i386-unknown-openbsd4.7/bits/gthr-single.h
+./usr/include/g++/i386-unknown-openbsd4.7/bits/gthr.h
+./usr/include/g++/i386-unknown-openbsd4.7/bits/messages_members.h
+./usr/include/g++/i386-unknown-openbsd4.7/bits/os_defines.h
+./usr/include/g++/i386-unknown-openbsd4.7/bits/time_members.h
./usr/include/g++/ios
./usr/include/g++/istream
./usr/include/g++/limits
@@ -234,18 +234,18 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/i386-unknown-openbsd4.6/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/i386-unknown-openbsd4.6/3.3.5/cc1obj
-./usr/lib/gcc-lib/i386-unknown-openbsd4.6/3.3.5/cc1plus
-./usr/lib/gcc-lib/i386-unknown-openbsd4.6/3.3.5/f771
-./usr/lib/gcc-lib/i386-unknown-openbsd4.6/3.3.5/fpic
-./usr/lib/gcc-lib/i386-unknown-openbsd4.6/3.3.5/fpic/libgcc.a
-./usr/lib/gcc-lib/i386-unknown-openbsd4.6/3.3.5/include/emmintrin.h
-./usr/lib/gcc-lib/i386-unknown-openbsd4.6/3.3.5/include/mmintrin.h
-./usr/lib/gcc-lib/i386-unknown-openbsd4.6/3.3.5/include/pmmintrin.h
-./usr/lib/gcc-lib/i386-unknown-openbsd4.6/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/i386-unknown-openbsd4.6/3.3.5/include/xmmintrin.h
-./usr/lib/gcc-lib/i386-unknown-openbsd4.6/3.3.5/libgcc.a
+./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5/cc1obj
+./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5/cc1plus
+./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5/f771
+./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5/fpic
+./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5/fpic/libgcc.a
+./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5/include/emmintrin.h
+./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5/include/mmintrin.h
+./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5/include/pmmintrin.h
+./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5/include/xmmintrin.h
+./usr/lib/gcc-lib/i386-unknown-openbsd4.7/3.3.5/libgcc.a
./usr/lib/libasn1_pic.a
./usr/lib/libc_pic.a
./usr/lib/libcom_err_pic.a
diff --git a/distrib/sets/lists/comp/md.landisk b/distrib/sets/lists/comp/md.landisk
index 3c692a479e1..6f9c7820193 100644
--- a/distrib/sets/lists/comp/md.landisk
+++ b/distrib/sets/lists/comp/md.landisk
@@ -130,24 +130,24 @@
./usr/include/g++/limits
./usr/include/g++/locale
./usr/include/g++/ostream
-./usr/include/g++/sh-unknown-openbsd4.6
-./usr/include/g++/sh-unknown-openbsd4.6/bits
-./usr/include/g++/sh-unknown-openbsd4.6/bits/atomicity.h
-./usr/include/g++/sh-unknown-openbsd4.6/bits/basic_file.h
-./usr/include/g++/sh-unknown-openbsd4.6/bits/c++config.h
-./usr/include/g++/sh-unknown-openbsd4.6/bits/c++io.h
-./usr/include/g++/sh-unknown-openbsd4.6/bits/c++locale.h
-./usr/include/g++/sh-unknown-openbsd4.6/bits/codecvt_specializations.h
-./usr/include/g++/sh-unknown-openbsd4.6/bits/ctype_base.h
-./usr/include/g++/sh-unknown-openbsd4.6/bits/ctype_inline.h
-./usr/include/g++/sh-unknown-openbsd4.6/bits/ctype_noninline.h
-./usr/include/g++/sh-unknown-openbsd4.6/bits/gthr-default.h
-./usr/include/g++/sh-unknown-openbsd4.6/bits/gthr-posix.h
-./usr/include/g++/sh-unknown-openbsd4.6/bits/gthr-single.h
-./usr/include/g++/sh-unknown-openbsd4.6/bits/gthr.h
-./usr/include/g++/sh-unknown-openbsd4.6/bits/messages_members.h
-./usr/include/g++/sh-unknown-openbsd4.6/bits/os_defines.h
-./usr/include/g++/sh-unknown-openbsd4.6/bits/time_members.h
+./usr/include/g++/sh-unknown-openbsd4.7
+./usr/include/g++/sh-unknown-openbsd4.7/bits
+./usr/include/g++/sh-unknown-openbsd4.7/bits/atomicity.h
+./usr/include/g++/sh-unknown-openbsd4.7/bits/basic_file.h
+./usr/include/g++/sh-unknown-openbsd4.7/bits/c++config.h
+./usr/include/g++/sh-unknown-openbsd4.7/bits/c++io.h
+./usr/include/g++/sh-unknown-openbsd4.7/bits/c++locale.h
+./usr/include/g++/sh-unknown-openbsd4.7/bits/codecvt_specializations.h
+./usr/include/g++/sh-unknown-openbsd4.7/bits/ctype_base.h
+./usr/include/g++/sh-unknown-openbsd4.7/bits/ctype_inline.h
+./usr/include/g++/sh-unknown-openbsd4.7/bits/ctype_noninline.h
+./usr/include/g++/sh-unknown-openbsd4.7/bits/gthr-default.h
+./usr/include/g++/sh-unknown-openbsd4.7/bits/gthr-posix.h
+./usr/include/g++/sh-unknown-openbsd4.7/bits/gthr-single.h
+./usr/include/g++/sh-unknown-openbsd4.7/bits/gthr.h
+./usr/include/g++/sh-unknown-openbsd4.7/bits/messages_members.h
+./usr/include/g++/sh-unknown-openbsd4.7/bits/os_defines.h
+./usr/include/g++/sh-unknown-openbsd4.7/bits/time_members.h
./usr/include/g++/streambuf
./usr/include/ieeefp.h
./usr/include/landisk
@@ -255,18 +255,18 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sh-unknown-openbsd4.6
-./usr/lib/gcc-lib/sh-unknown-openbsd4.6/3.3.5
-./usr/lib/gcc-lib/sh-unknown-openbsd4.6/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/sh-unknown-openbsd4.6/3.3.5/cc1
-./usr/lib/gcc-lib/sh-unknown-openbsd4.6/3.3.5/cc1obj
-./usr/lib/gcc-lib/sh-unknown-openbsd4.6/3.3.5/cc1plus
-./usr/lib/gcc-lib/sh-unknown-openbsd4.6/3.3.5/collect2
-./usr/lib/gcc-lib/sh-unknown-openbsd4.6/3.3.5/f771
-./usr/lib/gcc-lib/sh-unknown-openbsd4.6/3.3.5/include
-./usr/lib/gcc-lib/sh-unknown-openbsd4.6/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/sh-unknown-openbsd4.6/3.3.5/libgcc.a
-./usr/lib/gcc-lib/sh-unknown-openbsd4.6/3.3.5/specs
+./usr/lib/gcc-lib/sh-unknown-openbsd4.7
+./usr/lib/gcc-lib/sh-unknown-openbsd4.7/3.3.5
+./usr/lib/gcc-lib/sh-unknown-openbsd4.7/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/sh-unknown-openbsd4.7/3.3.5/cc1
+./usr/lib/gcc-lib/sh-unknown-openbsd4.7/3.3.5/cc1obj
+./usr/lib/gcc-lib/sh-unknown-openbsd4.7/3.3.5/cc1plus
+./usr/lib/gcc-lib/sh-unknown-openbsd4.7/3.3.5/collect2
+./usr/lib/gcc-lib/sh-unknown-openbsd4.7/3.3.5/f771
+./usr/lib/gcc-lib/sh-unknown-openbsd4.7/3.3.5/include
+./usr/lib/gcc-lib/sh-unknown-openbsd4.7/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/sh-unknown-openbsd4.7/3.3.5/libgcc.a
+./usr/lib/gcc-lib/sh-unknown-openbsd4.7/3.3.5/specs
./usr/lib/libasn1_pic.a
./usr/lib/libc_pic.a
./usr/lib/libcom_err_pic.a
diff --git a/distrib/sets/lists/comp/md.luna88k b/distrib/sets/lists/comp/md.luna88k
index 1d0210cfa7a..7b4f0fcdfd2 100644
--- a/distrib/sets/lists/comp/md.luna88k
+++ b/distrib/sets/lists/comp/md.luna88k
@@ -198,18 +198,18 @@
./usr/include/m88k/va-m88k.h
./usr/include/m88k/varargs.h
./usr/include/m88k/vmparam.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/cc1obj
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/cc1plus
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/f771
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/README
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/exception
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/float.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/new
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/new.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/cc1obj
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/cc1plus
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/f771
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/README
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/exception
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/float.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/new
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/new.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/libgcc.a
./usr/lib/libstdc++_p.a
./usr/lib/scrt0.o
diff --git a/distrib/sets/lists/comp/md.mac68k b/distrib/sets/lists/comp/md.mac68k
index 41505f2447b..01a9d1c3034 100644
--- a/distrib/sets/lists/comp/md.mac68k
+++ b/distrib/sets/lists/comp/md.mac68k
@@ -190,23 +190,23 @@
./usr/include/mac68k/viareg.h
./usr/include/mac68k/vmparam.h
./usr/include/mac68k/z8530var.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/cc1obj
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/f771
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/fPIC
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/fPIC/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/fpic
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/fpic/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/README
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/exception
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/float.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/new
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/new.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/cc1obj
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/cc1plus
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/f771
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/fPIC
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/fPIC/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/fpic
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/fpic/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/README
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/exception
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/float.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/new
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/new.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/libgcc.a
./usr/lib/libasn1_pic.a
./usr/lib/libc_pic.a
./usr/lib/libcom_err_pic.a
diff --git a/distrib/sets/lists/comp/md.macppc b/distrib/sets/lists/comp/md.macppc
index a99e0a19c52..e03c3908445 100644
--- a/distrib/sets/lists/comp/md.macppc
+++ b/distrib/sets/lists/comp/md.macppc
@@ -130,24 +130,24 @@
./usr/include/g++/limits
./usr/include/g++/locale
./usr/include/g++/ostream
-./usr/include/g++/powerpc-unknown-openbsd4.6
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/atomicity.h
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/basic_file.h
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/c++config.h
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/c++io.h
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/c++locale.h
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/codecvt_specializations.h
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/ctype_base.h
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/ctype_inline.h
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/ctype_noninline.h
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/gthr-default.h
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/gthr-posix.h
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/gthr-single.h
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/gthr.h
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/messages_members.h
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/os_defines.h
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/time_members.h
+./usr/include/g++/powerpc-unknown-openbsd4.7
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/atomicity.h
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/basic_file.h
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/c++config.h
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/c++io.h
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/c++locale.h
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/codecvt_specializations.h
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/ctype_base.h
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/ctype_inline.h
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/ctype_noninline.h
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/gthr-default.h
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/gthr-posix.h
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/gthr-single.h
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/gthr.h
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/messages_members.h
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/os_defines.h
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/time_members.h
./usr/include/g++/streambuf
./usr/include/ieeefp.h
./usr/include/macppc
@@ -246,17 +246,17 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/cc1obj
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/crtsavres.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/f771
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/include/altivec.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/libgcc.a
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/nof
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/nof/crtsavres.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/nof/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5/cc1obj
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5/cc1plus
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5/crtsavres.o
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5/f771
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5/include/altivec.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5/nof
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5/nof/crtsavres.o
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5/nof/libgcc.a
./usr/lib/libasn1_pic.a
./usr/lib/libc_pic.a
./usr/lib/libcom_err_pic.a
diff --git a/distrib/sets/lists/comp/md.mvme68k b/distrib/sets/lists/comp/md.mvme68k
index 1bd27639b04..9cf5a55a0ac 100644
--- a/distrib/sets/lists/comp/md.mvme68k
+++ b/distrib/sets/lists/comp/md.mvme68k
@@ -189,23 +189,23 @@
./usr/include/mvme68k/trap.h
./usr/include/mvme68k/varargs.h
./usr/include/mvme68k/vmparam.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/cc1obj
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/f771
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/fPIC
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/fPIC/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/fpic
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/fpic/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/README
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/exception
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/float.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/new
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/new.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/cc1obj
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/cc1plus
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/f771
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/fPIC
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/fPIC/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/fpic
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/fpic/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/README
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/exception
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/float.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/new
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/new.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/libgcc.a
./usr/lib/libasn1_pic.a
./usr/lib/libc_pic.a
./usr/lib/libcom_err_pic.a
diff --git a/distrib/sets/lists/comp/md.mvme88k b/distrib/sets/lists/comp/md.mvme88k
index 91c2b8d23b7..a7fb928dd6c 100644
--- a/distrib/sets/lists/comp/md.mvme88k
+++ b/distrib/sets/lists/comp/md.mvme88k
@@ -209,18 +209,18 @@
./usr/include/mvme88k/va-m88k.h
./usr/include/mvme88k/varargs.h
./usr/include/mvme88k/vmparam.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/cc1obj
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/cc1plus
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/f771
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/README
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/exception
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/float.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/new
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/new.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/cc1obj
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/cc1plus
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/f771
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/README
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/exception
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/float.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/new
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/new.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/libgcc.a
./usr/lib/libstdc++_p.a
./usr/lib/scrt0.o
diff --git a/distrib/sets/lists/comp/md.mvmeppc b/distrib/sets/lists/comp/md.mvmeppc
index a83df3f463c..82377aace29 100644
--- a/distrib/sets/lists/comp/md.mvmeppc
+++ b/distrib/sets/lists/comp/md.mvmeppc
@@ -161,21 +161,21 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/cc1obj
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/f771
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/include/README
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/include/exception
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/include/float.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/include/limits.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/include/new
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/include/new.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/libgcc.a
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/soft-float
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/soft-float/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/cc1obj
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/cc1plus
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/f771
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/include/README
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/include/exception
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/include/float.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/include/limits.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/include/new
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/include/new.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/soft-float
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/soft-float/libgcc.a
./usr/lib/libc_pic.a
./usr/lib/libcom_err_pic.a
./usr/lib/libcrypto_pic.a
diff --git a/distrib/sets/lists/comp/md.palm b/distrib/sets/lists/comp/md.palm
index 71d62367fb7..d1a39ff853b 100644
--- a/distrib/sets/lists/comp/md.palm
+++ b/distrib/sets/lists/comp/md.palm
@@ -53,24 +53,24 @@
./usr/include/arm/trap.h
./usr/include/arm/undefined.h
./usr/include/arm/vmparam.h
-./usr/include/g++/arm-unknown-openbsd4.6
-./usr/include/g++/arm-unknown-openbsd4.6/bits
-./usr/include/g++/arm-unknown-openbsd4.6/bits/atomicity.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/basic_file.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/c++config.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/c++io.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/c++locale.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/codecvt_specializations.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/ctype_base.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/ctype_inline.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/ctype_noninline.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/gthr-default.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/gthr-posix.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/gthr-single.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/gthr.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/messages_members.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/os_defines.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/time_members.h
+./usr/include/g++/arm-unknown-openbsd4.7
+./usr/include/g++/arm-unknown-openbsd4.7/bits
+./usr/include/g++/arm-unknown-openbsd4.7/bits/atomicity.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/basic_file.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/c++config.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/c++io.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/c++locale.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/codecvt_specializations.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/ctype_base.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/ctype_inline.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/ctype_noninline.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/gthr-default.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/gthr-posix.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/gthr-single.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/gthr.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/messages_members.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/os_defines.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/time_members.h
./usr/include/g++/backward
./usr/include/g++/backward/algo.h
./usr/include/g++/backward/algobase.h
@@ -250,9 +250,9 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/include
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/libgcc.a
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/include
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/libgcc.a
./usr/lib/libarm.a
./usr/lib/libarm_p.a
./usr/lib/libasn1_pic.a
diff --git a/distrib/sets/lists/comp/md.sgi b/distrib/sets/lists/comp/md.sgi
index 40ebd9b0c9c..5b54a23b174 100644
--- a/distrib/sets/lists/comp/md.sgi
+++ b/distrib/sets/lists/comp/md.sgi
@@ -128,24 +128,24 @@
./usr/include/g++/istream
./usr/include/g++/limits
./usr/include/g++/locale
-./usr/include/g++/mips64-unknown-openbsd4.6
-./usr/include/g++/mips64-unknown-openbsd4.6/bits
-./usr/include/g++/mips64-unknown-openbsd4.6/bits/atomicity.h
-./usr/include/g++/mips64-unknown-openbsd4.6/bits/basic_file.h
-./usr/include/g++/mips64-unknown-openbsd4.6/bits/c++config.h
-./usr/include/g++/mips64-unknown-openbsd4.6/bits/c++io.h
-./usr/include/g++/mips64-unknown-openbsd4.6/bits/c++locale.h
-./usr/include/g++/mips64-unknown-openbsd4.6/bits/codecvt_specializations.h
-./usr/include/g++/mips64-unknown-openbsd4.6/bits/ctype_base.h
-./usr/include/g++/mips64-unknown-openbsd4.6/bits/ctype_inline.h
-./usr/include/g++/mips64-unknown-openbsd4.6/bits/ctype_noninline.h
-./usr/include/g++/mips64-unknown-openbsd4.6/bits/gthr-default.h
-./usr/include/g++/mips64-unknown-openbsd4.6/bits/gthr-posix.h
-./usr/include/g++/mips64-unknown-openbsd4.6/bits/gthr-single.h
-./usr/include/g++/mips64-unknown-openbsd4.6/bits/gthr.h
-./usr/include/g++/mips64-unknown-openbsd4.6/bits/messages_members.h
-./usr/include/g++/mips64-unknown-openbsd4.6/bits/os_defines.h
-./usr/include/g++/mips64-unknown-openbsd4.6/bits/time_members.h
+./usr/include/g++/mips64-unknown-openbsd4.7
+./usr/include/g++/mips64-unknown-openbsd4.7/bits
+./usr/include/g++/mips64-unknown-openbsd4.7/bits/atomicity.h
+./usr/include/g++/mips64-unknown-openbsd4.7/bits/basic_file.h
+./usr/include/g++/mips64-unknown-openbsd4.7/bits/c++config.h
+./usr/include/g++/mips64-unknown-openbsd4.7/bits/c++io.h
+./usr/include/g++/mips64-unknown-openbsd4.7/bits/c++locale.h
+./usr/include/g++/mips64-unknown-openbsd4.7/bits/codecvt_specializations.h
+./usr/include/g++/mips64-unknown-openbsd4.7/bits/ctype_base.h
+./usr/include/g++/mips64-unknown-openbsd4.7/bits/ctype_inline.h
+./usr/include/g++/mips64-unknown-openbsd4.7/bits/ctype_noninline.h
+./usr/include/g++/mips64-unknown-openbsd4.7/bits/gthr-default.h
+./usr/include/g++/mips64-unknown-openbsd4.7/bits/gthr-posix.h
+./usr/include/g++/mips64-unknown-openbsd4.7/bits/gthr-single.h
+./usr/include/g++/mips64-unknown-openbsd4.7/bits/gthr.h
+./usr/include/g++/mips64-unknown-openbsd4.7/bits/messages_members.h
+./usr/include/g++/mips64-unknown-openbsd4.7/bits/os_defines.h
+./usr/include/g++/mips64-unknown-openbsd4.7/bits/time_members.h
./usr/include/g++/ostream
./usr/include/g++/streambuf
./usr/include/ieeefp.h
@@ -246,11 +246,11 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.6/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.6/3.3.5/cc1obj
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.6/3.3.5/cc1plus
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.6/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.6/3.3.5/libgcc.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.7/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.7/3.3.5/cc1obj
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.7/3.3.5/cc1plus
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.7/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.7/3.3.5/libgcc.a
./usr/lib/libsupc++.a
./usr/libdata/ldscripts
./usr/libdata/ldscripts/elf32btsmip.x
diff --git a/distrib/sets/lists/comp/md.socppc b/distrib/sets/lists/comp/md.socppc
index 14d5ac7ed31..993898c1cde 100644
--- a/distrib/sets/lists/comp/md.socppc
+++ b/distrib/sets/lists/comp/md.socppc
@@ -130,24 +130,24 @@
./usr/include/g++/limits
./usr/include/g++/locale
./usr/include/g++/ostream
-./usr/include/g++/powerpc-unknown-openbsd4.6
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/atomicity.h
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/basic_file.h
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/c++config.h
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/c++io.h
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/c++locale.h
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/codecvt_specializations.h
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/ctype_base.h
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/ctype_inline.h
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/ctype_noninline.h
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/gthr-default.h
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/gthr-posix.h
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/gthr-single.h
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/gthr.h
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/messages_members.h
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/os_defines.h
-./usr/include/g++/powerpc-unknown-openbsd4.6/bits/time_members.h
+./usr/include/g++/powerpc-unknown-openbsd4.7
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/atomicity.h
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/basic_file.h
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/c++config.h
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/c++io.h
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/c++locale.h
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/codecvt_specializations.h
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/ctype_base.h
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/ctype_inline.h
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/ctype_noninline.h
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/gthr-default.h
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/gthr-posix.h
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/gthr-single.h
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/gthr.h
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/messages_members.h
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/os_defines.h
+./usr/include/g++/powerpc-unknown-openbsd4.7/bits/time_members.h
./usr/include/g++/streambuf
./usr/include/ieeefp.h
./usr/include/powerpc
@@ -240,17 +240,17 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/cc1obj
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/crtsavres.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/f771
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/include/altivec.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/libgcc.a
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/nof
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/nof/crtsavres.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/nof/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5/cc1obj
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5/cc1plus
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5/crtsavres.o
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5/f771
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5/include/altivec.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5/nof
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5/nof/crtsavres.o
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/3.3.5/nof/libgcc.a
./usr/lib/libasn1_pic.a
./usr/lib/libc_pic.a
./usr/lib/libcom_err_pic.a
diff --git a/distrib/sets/lists/comp/md.sparc b/distrib/sets/lists/comp/md.sparc
index 74a96e61f5a..5c2c75b3385 100644
--- a/distrib/sets/lists/comp/md.sparc
+++ b/distrib/sets/lists/comp/md.sparc
@@ -173,23 +173,23 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/cc1obj
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/cc1plus
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/f771
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/fPIC
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/fPIC/libgcc.a
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/fpic
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/fpic/libgcc.a
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/include/README
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/include/exception
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/include/float.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/include/limits.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/include/new
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/include/new.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/libgcc.a
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/cc1obj
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/cc1plus
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/f771
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/fPIC
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/fPIC/libgcc.a
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/fpic
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/fpic/libgcc.a
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/include/README
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/include/exception
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/include/float.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/include/limits.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/include/new
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/include/new.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/libgcc.a
./usr/lib/libasn1_pic.a
./usr/lib/libc_pic.a
./usr/lib/libcom_err_pic.a
diff --git a/distrib/sets/lists/comp/md.sparc64 b/distrib/sets/lists/comp/md.sparc64
index 83221272822..bf65b2f505b 100644
--- a/distrib/sets/lists/comp/md.sparc64
+++ b/distrib/sets/lists/comp/md.sparc64
@@ -129,24 +129,24 @@
./usr/include/g++/limits
./usr/include/g++/locale
./usr/include/g++/ostream
-./usr/include/g++/sparc64-unknown-openbsd4.6
-./usr/include/g++/sparc64-unknown-openbsd4.6/bits
-./usr/include/g++/sparc64-unknown-openbsd4.6/bits/atomicity.h
-./usr/include/g++/sparc64-unknown-openbsd4.6/bits/basic_file.h
-./usr/include/g++/sparc64-unknown-openbsd4.6/bits/c++config.h
-./usr/include/g++/sparc64-unknown-openbsd4.6/bits/c++io.h
-./usr/include/g++/sparc64-unknown-openbsd4.6/bits/c++locale.h
-./usr/include/g++/sparc64-unknown-openbsd4.6/bits/codecvt_specializations.h
-./usr/include/g++/sparc64-unknown-openbsd4.6/bits/ctype_base.h
-./usr/include/g++/sparc64-unknown-openbsd4.6/bits/ctype_inline.h
-./usr/include/g++/sparc64-unknown-openbsd4.6/bits/ctype_noninline.h
-./usr/include/g++/sparc64-unknown-openbsd4.6/bits/gthr-default.h
-./usr/include/g++/sparc64-unknown-openbsd4.6/bits/gthr-posix.h
-./usr/include/g++/sparc64-unknown-openbsd4.6/bits/gthr-single.h
-./usr/include/g++/sparc64-unknown-openbsd4.6/bits/gthr.h
-./usr/include/g++/sparc64-unknown-openbsd4.6/bits/messages_members.h
-./usr/include/g++/sparc64-unknown-openbsd4.6/bits/os_defines.h
-./usr/include/g++/sparc64-unknown-openbsd4.6/bits/time_members.h
+./usr/include/g++/sparc64-unknown-openbsd4.7
+./usr/include/g++/sparc64-unknown-openbsd4.7/bits
+./usr/include/g++/sparc64-unknown-openbsd4.7/bits/atomicity.h
+./usr/include/g++/sparc64-unknown-openbsd4.7/bits/basic_file.h
+./usr/include/g++/sparc64-unknown-openbsd4.7/bits/c++config.h
+./usr/include/g++/sparc64-unknown-openbsd4.7/bits/c++io.h
+./usr/include/g++/sparc64-unknown-openbsd4.7/bits/c++locale.h
+./usr/include/g++/sparc64-unknown-openbsd4.7/bits/codecvt_specializations.h
+./usr/include/g++/sparc64-unknown-openbsd4.7/bits/ctype_base.h
+./usr/include/g++/sparc64-unknown-openbsd4.7/bits/ctype_inline.h
+./usr/include/g++/sparc64-unknown-openbsd4.7/bits/ctype_noninline.h
+./usr/include/g++/sparc64-unknown-openbsd4.7/bits/gthr-default.h
+./usr/include/g++/sparc64-unknown-openbsd4.7/bits/gthr-posix.h
+./usr/include/g++/sparc64-unknown-openbsd4.7/bits/gthr-single.h
+./usr/include/g++/sparc64-unknown-openbsd4.7/bits/gthr.h
+./usr/include/g++/sparc64-unknown-openbsd4.7/bits/messages_members.h
+./usr/include/g++/sparc64-unknown-openbsd4.7/bits/os_defines.h
+./usr/include/g++/sparc64-unknown-openbsd4.7/bits/time_members.h
./usr/include/g++/streambuf
./usr/include/ieeefp.h
./usr/include/sparc64
@@ -213,16 +213,16 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.6/3.3.5
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.6/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.6/3.3.5/cc1obj
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.6/3.3.5/cc1plus
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.6/3.3.5/collect2
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.6/3.3.5/f771
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.6/3.3.5/include
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.6/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.6/3.3.5/libgcc.a
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.6/3.3.5/specs
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.7/3.3.5
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.7/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.7/3.3.5/cc1obj
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.7/3.3.5/cc1plus
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.7/3.3.5/collect2
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.7/3.3.5/f771
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.7/3.3.5/include
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.7/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.7/3.3.5/libgcc.a
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.7/3.3.5/specs
./usr/lib/libasn1_pic.a
./usr/lib/libc_pic.a
./usr/lib/libcom_err_pic.a
diff --git a/distrib/sets/lists/comp/md.vax b/distrib/sets/lists/comp/md.vax
index 6dba4ef3ca3..847672a9f05 100644
--- a/distrib/sets/lists/comp/md.vax
+++ b/distrib/sets/lists/comp/md.vax
@@ -171,19 +171,19 @@
./usr/include/vax/vaxfp.h
./usr/include/vax/vmparam.h
./usr/include/vax/vsbus.h
-./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3/cc1obj
-./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3/cc1plus
-./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3/f771
-./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3/include/README
-./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3/include/exception
-./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3/include/float.h
-./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3/include/limits.h
-./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3/include/new
-./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3/include/new.h
-./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3/libgcc.a
+./usr/lib/gcc-lib/vax-unknown-openbsd4.7/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/vax-unknown-openbsd4.7/2.95.3/cc1obj
+./usr/lib/gcc-lib/vax-unknown-openbsd4.7/2.95.3/cc1plus
+./usr/lib/gcc-lib/vax-unknown-openbsd4.7/2.95.3/f771
+./usr/lib/gcc-lib/vax-unknown-openbsd4.7/2.95.3/include/README
+./usr/lib/gcc-lib/vax-unknown-openbsd4.7/2.95.3/include/exception
+./usr/lib/gcc-lib/vax-unknown-openbsd4.7/2.95.3/include/float.h
+./usr/lib/gcc-lib/vax-unknown-openbsd4.7/2.95.3/include/limits.h
+./usr/lib/gcc-lib/vax-unknown-openbsd4.7/2.95.3/include/new
+./usr/lib/gcc-lib/vax-unknown-openbsd4.7/2.95.3/include/new.h
+./usr/lib/gcc-lib/vax-unknown-openbsd4.7/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/vax-unknown-openbsd4.7/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/vax-unknown-openbsd4.7/2.95.3/libgcc.a
./usr/lib/libstdc++_p.a
./usr/lib/scrt0.o
./usr/share/man/cat3/infnan.0
diff --git a/distrib/sets/lists/comp/md.zaurus b/distrib/sets/lists/comp/md.zaurus
index e2d36a31b88..ded5273f39f 100644
--- a/distrib/sets/lists/comp/md.zaurus
+++ b/distrib/sets/lists/comp/md.zaurus
@@ -53,24 +53,24 @@
./usr/include/arm/trap.h
./usr/include/arm/undefined.h
./usr/include/arm/vmparam.h
-./usr/include/g++/arm-unknown-openbsd4.6
-./usr/include/g++/arm-unknown-openbsd4.6/bits
-./usr/include/g++/arm-unknown-openbsd4.6/bits/atomicity.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/basic_file.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/c++config.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/c++io.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/c++locale.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/codecvt_specializations.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/ctype_base.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/ctype_inline.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/ctype_noninline.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/gthr-default.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/gthr-posix.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/gthr-single.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/gthr.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/messages_members.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/os_defines.h
-./usr/include/g++/arm-unknown-openbsd4.6/bits/time_members.h
+./usr/include/g++/arm-unknown-openbsd4.7
+./usr/include/g++/arm-unknown-openbsd4.7/bits
+./usr/include/g++/arm-unknown-openbsd4.7/bits/atomicity.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/basic_file.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/c++config.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/c++io.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/c++locale.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/codecvt_specializations.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/ctype_base.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/ctype_inline.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/ctype_noninline.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/gthr-default.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/gthr-posix.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/gthr-single.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/gthr.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/messages_members.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/os_defines.h
+./usr/include/g++/arm-unknown-openbsd4.7/bits/time_members.h
./usr/include/g++/backward
./usr/include/g++/backward/algo.h
./usr/include/g++/backward/algobase.h
@@ -250,9 +250,9 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/include
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/libgcc.a
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/include
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/libgcc.a
./usr/lib/libarm.a
./usr/lib/libarm_p.a
./usr/lib/libasn1_pic.a
diff --git a/etc/root/root.mail b/etc/root/root.mail
index 15bf37b3c83..4d3596fdf22 100644
--- a/etc/root/root.mail
+++ b/etc/root/root.mail
@@ -1,9 +1,9 @@
-From deraadt@do-not-reply.openbsd.org Thu Oct 1 06:46:46 MDT 2009
+From deraadt@do-not-reply.openbsd.org Wed Mar 1 07:47:47 MDT 2010
Return-Path: root
-Date: Oct 1 06:46:46 MDT 2009
+Date: Mar 1 07:47:47 MDT 2010
From: deraadt@do-not-reply.openbsd.org (Theo de Raadt)
To: root
-Subject: Welcome to OpenBSD 4.6!
+Subject: Welcome to OpenBSD 4.7!
This message attempts to describe the most basic initial questions that a
system administrator of an OpenBSD box might have. You are urged to save
@@ -27,13 +27,13 @@ find further information regarding configuration in the file /usr/X11R6/README.
Several popular binary packages (pre-compiled applications) are available
for most architectures. If you installed from a CD-ROM the packages
-are on the same CD-ROM you installed from in the directory 4.6/packages.
+are on the same CD-ROM you installed from in the directory 4.7/packages.
CD-ROM space permitted us to include a subset of the full FTP packages
for the most common architectures. Please see the FTP sites to see a
full list of packages for each architecture:
- ftp://ftp.openbsd.org/pub/OpenBSD/4.6/packages/
+ ftp://ftp.openbsd.org/pub/OpenBSD/4.7/packages/
If you do not find a package you want on the CD, please go look at your
nearest FTP mirror site.
@@ -41,9 +41,9 @@ nearest FTP mirror site.
Select your architecture and download the tarballs of your choice. For example
to install the emacs package for i386, execute:
# mount /dev/cd0a /cdrom
- # pkg_add -v /cdrom/4.6/packages/i386/emacs-21.4p8.tgz
+ # pkg_add -v /cdrom/4.7/packages/i386/emacs-22.3p1.tgz
or alternatively install them via FTP this way:
- # pkg_add -v ftp://ftp.openbsd.org/pub/OpenBSD/4.6/packages/i386/emacs-21.4p8.tgz
+ # pkg_add -v ftp://ftp.openbsd.org/pub/OpenBSD/4.7/packages/i386/emacs-22.3p1.tgz
Significant efforts were made to centralize all system configuration in the
/etc directory. You should be able to find each of the configuration files
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index c417e459a2d..524b3e4ae76 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: sys.mk,v 1.57 2009/06/20 23:38:12 miod Exp $
+# $OpenBSD: sys.mk,v 1.58 2010/01/26 23:04:28 miod Exp $
# $NetBSD: sys.mk,v 1.27 1996/04/10 05:47:19 mycroft Exp $
# @(#)sys.mk 5.11 (Berkeley) 3/13/91
@@ -10,7 +10,7 @@
unix= We run OpenBSD.
OSMAJOR= 4
-OSMINOR= 6
+OSMINOR= 7
OSREV= $(OSMAJOR).$(OSMINOR)
OSrev= $(OSMAJOR)$(OSMINOR)
diff --git a/share/tmac/mdoc/doc-common b/share/tmac/mdoc/doc-common
index 26d8d753398..11eed95c1e2 100644
--- a/share/tmac/mdoc/doc-common
+++ b/share/tmac/mdoc/doc-common
@@ -1,4 +1,4 @@
-.\" $OpenBSD: doc-common,v 1.64 2010/01/24 15:37:12 jmc Exp $
+.\" $OpenBSD: doc-common,v 1.65 2010/01/26 23:04:28 miod Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -204,7 +204,7 @@
.de Os
.ds oS Null
.if "\\$1"" \{\
-. ds oS OpenBSD 4.6
+. ds oS OpenBSD 4.7
.\}
.if "\\$2"" \{\
. ds aa Non-Null
@@ -289,6 +289,7 @@
. if "\\$2"4.4" .as oS \04.4
. if "\\$2"4.5" .as oS \04.5
. if "\\$2"4.6" .as oS \04.6
+. if "\\$2"4.7" .as oS \04.7
.\}
.if "\\*(oS"Null" .ds oS \0\\$1
.if "\\*(aa"Non-Null" .as oS \0\\$2
diff --git a/sys/arch/macppc/stand/tbxidata/bsd.tbxi b/sys/arch/macppc/stand/tbxidata/bsd.tbxi
index a59712fd295..e3d90b7ba5f 100644
--- a/sys/arch/macppc/stand/tbxidata/bsd.tbxi
+++ b/sys/arch/macppc/stand/tbxidata/bsd.tbxi
@@ -1,6 +1,6 @@
<CHRP-BOOT>
<LICENSE>
-/* $OpenBSD: bsd.tbxi,v 1.23 2009/06/20 23:38:12 miod Exp $ */
+/* $OpenBSD: bsd.tbxi,v 1.24 2010/01/26 23:04:28 miod Exp $ */
/*
* Copyright (c) 2001 Dale Rahn.
* All rights reserved.
@@ -34,7 +34,7 @@ MacRISC MacRISC3 MacRISC4
OpenBSD/macppc bootloader
</DESCRIPTION>
<BOOT-SCRIPT>
-boot cd:,ofwboot /4.6/macppc/bsd.rd
+boot cd:,ofwboot /4.7/macppc/bsd.rd
</BOOT-SCRIPT>
<OS-BADGE-ICONS>
201B
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 7c7de7359b9..dcb680d04a6 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: newvers.sh,v 1.100 2009/07/05 23:42:51 dlg Exp $
+# $OpenBSD: newvers.sh,v 1.101 2010/01/26 23:04:28 miod Exp $
# $NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $
#
# Copyright (c) 1984, 1986, 1990, 1993
@@ -62,14 +62,14 @@ id=`basename ${d}`
# A month or so before release, select STATUS "-beta"
ost="OpenBSD"
-osr="4.6"
+osr="4.7"
cat >vers.c <<eof
-#define STATUS "-current" /* just after a release */
#if 0
+#define STATUS "-current" /* just after a release */
#define STATUS "" /* release */
-#define STATUS "-beta" /* just before a release */
#endif
+#define STATUS "-beta" /* just before a release */
const char ostype[] = "${ost}";
const char osrelease[] = "${osr}";
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 04655564b65..6348fc9bded 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.84 2009/06/20 23:38:12 miod Exp $ */
+/* $OpenBSD: param.h,v 1.85 2010/01/26 23:04:28 miod Exp $ */
/* $NetBSD: param.h,v 1.23 1996/03/17 01:02:29 thorpej Exp $ */
/*-
@@ -41,8 +41,8 @@
#define BSD4_3 1
#define BSD4_4 1
-#define OpenBSD 200910 /* OpenBSD version (year & month). */
-#define OpenBSD4_6 1 /* OpenBSD 4.6 */
+#define OpenBSD 201005 /* OpenBSD version (year & month). */
+#define OpenBSD4_7 1 /* OpenBSD 4.6 */
#ifndef NULL
#ifdef __GNUG__