summaryrefslogtreecommitdiff
path: root/distrib/sets/lists
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2006-07-26 22:18:17 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2006-07-26 22:18:17 +0000
commit0bc761ddd14c237a75247952fac6405ea1fe6387 (patch)
treeba494daf491a4876f7672f0d01fab49bb0a1ebd1 /distrib/sets/lists
parent9e2786347a7934511bb7ca9f8045d41ae0861ce9 (diff)
3.9 -> 4.0 sync
Diffstat (limited to 'distrib/sets/lists')
-rw-r--r--distrib/sets/lists/base/md.alpha14
-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.cats54
-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.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.sgi50
-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.alpha82
-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.cats42
-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.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.sgi46
-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
40 files changed, 743 insertions, 743 deletions
diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index a12e44e2d46..dfdb9cfc1f1 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -60,13 +60,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/alpha-unknown-openbsd3.9
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/cc1
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/collect2
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/cpp0
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/specs
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/cc1
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/collect2
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/cpp0
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/specs
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.39.2
./usr/lib/libcom_err.so.16.0
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 8bc18877f92..70402b10a15 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -64,11 +64,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-openbsd3.9
-./usr/lib/gcc-lib/amd64-unknown-openbsd3.9/3.3.5
-./usr/lib/gcc-lib/amd64-unknown-openbsd3.9/3.3.5/cc1
-./usr/lib/gcc-lib/amd64-unknown-openbsd3.9/3.3.5/collect2
-./usr/lib/gcc-lib/amd64-unknown-openbsd3.9/3.3.5/specs
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.0
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.0/3.3.5
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.0/3.3.5/cc1
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.0/3.3.5/collect2
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.0/3.3.5/specs
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.39.2
./usr/lib/libcom_err.so.16.0
@@ -1523,24 +1523,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-openbsd3.9
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/c++config.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/c++io.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/gthr.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/time_members.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.0
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.0/bits
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.0/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.0/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.0/bits/c++config.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.0/bits/c++io.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.0/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.0/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.0/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.0/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.0/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.0/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.0/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.0/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.0/bits/gthr.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.0/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.0/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.0/bits/time_members.ph
./usr/libdata/perl5/site_perl/amd64-openbsd/g++/backward
./usr/libdata/perl5/site_perl/amd64-openbsd/g++/backward/algo.ph
./usr/libdata/perl5/site_perl/amd64-openbsd/g++/backward/algobase.ph
diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish
index 138a1b9f461..b8e7e75a0ef 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -44,15 +44,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-openbsd3.9
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/cc1
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/cc1obj
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/cc1plus
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/collect2
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/f771
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/specs
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/3.3.5
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/3.3.5/cc1
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/3.3.5/cc1obj
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/3.3.5/cc1plus
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/3.3.5/collect2
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/3.3.5/f771
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/3.3.5/specs
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.39.2
./usr/lib/libcom_err.so.16.0
@@ -1525,24 +1525,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-openbsd3.9
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/c++config.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/c++io.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/gthr.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/time_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/c++config.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/c++io.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/gthr.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/time_members.ph
./usr/libdata/perl5/site_perl/arm-openbsd/g++/backward
./usr/libdata/perl5/site_perl/arm-openbsd/g++/backward/algo.ph
./usr/libdata/perl5/site_perl/arm-openbsd/g++/backward/algobase.ph
diff --git a/distrib/sets/lists/base/md.aviion b/distrib/sets/lists/base/md.aviion
index f8e46fe7a28..2dd374b73be 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-openbsd3.9
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/cc1
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/collect2
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/cpp0
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/include
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/specs
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/cc1
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/collect2
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/cpp0
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/include
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/specs
./usr/libdata/perl5/m88k-openbsd
./usr/libdata/perl5/m88k-openbsd/5.8.8
./usr/libdata/perl5/m88k-openbsd/5.8.8/.packlist
diff --git a/distrib/sets/lists/base/md.cats b/distrib/sets/lists/base/md.cats
index f404fe67f76..5bc914d8331 100644
--- a/distrib/sets/lists/base/md.cats
+++ b/distrib/sets/lists/base/md.cats
@@ -60,15 +60,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-openbsd3.9
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/cc1
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/cc1obj
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/cc1plus
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/collect2
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/f771
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/specs
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/3.3.5
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/3.3.5/cc1
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/3.3.5/cc1obj
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/3.3.5/cc1plus
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/3.3.5/collect2
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/3.3.5/f771
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/3.3.5/specs
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.39.2
./usr/lib/libcom_err.so.16.0
@@ -1541,24 +1541,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-openbsd3.9
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/c++config.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/c++io.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/gthr.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/time_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/c++config.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/c++io.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/gthr.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/time_members.ph
./usr/libdata/perl5/site_perl/arm-openbsd/g++/backward
./usr/libdata/perl5/site_perl/arm-openbsd/g++/backward/algo.ph
./usr/libdata/perl5/site_perl/arm-openbsd/g++/backward/algobase.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 70d1e265b75..0a2bc733452 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-openbsd3.9
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/cc1
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/collect2
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/cpp0
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/include
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/specs
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/cc1
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/collect2
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/cpp0
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/include
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/specs
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.39.2
./usr/lib/libcom_err.so.16.0
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index c6918ff6d02..210913c5d93 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -62,11 +62,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-openbsd3.9
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.9/3.3.5
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.9/3.3.5/cc1
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.9/3.3.5/collect2
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.9/3.3.5/specs
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.0
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.0/3.3.5
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.0/3.3.5/cc1
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.0/3.3.5/collect2
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.0/3.3.5/specs
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.39.2
./usr/lib/libcom_err.so.16.0
@@ -1548,24 +1548,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-openbsd3.9
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/c++config.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/c++io.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/gthr.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/time_members.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.0
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.0/bits
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.0/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.0/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.0/bits/c++config.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.0/bits/c++io.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.0/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.0/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.0/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.0/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.0/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.0/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.0/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.0/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.0/bits/gthr.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.0/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.0/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.0/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 12f980f8b65..68c742a0f48 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -62,11 +62,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-openbsd3.9
-./usr/lib/gcc-lib/hppa64-unknown-openbsd3.9/3.3.5
-./usr/lib/gcc-lib/hppa64-unknown-openbsd3.9/3.3.5/cc1
-./usr/lib/gcc-lib/hppa64-unknown-openbsd3.9/3.3.5/collect2
-./usr/lib/gcc-lib/hppa64-unknown-openbsd3.9/3.3.5/specs
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.0
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.0/3.3.5
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.0/3.3.5/cc1
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.0/3.3.5/collect2
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.0/3.3.5/specs
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.39.2
./usr/lib/libcom_err.so.16.0
@@ -1548,24 +1548,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++/hppa-unknown-openbsd3.9
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/c++config.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/c++io.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/gthr.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/time_members.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.0
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.0/bits
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.0/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.0/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.0/bits/c++config.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.0/bits/c++io.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.0/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.0/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.0/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.0/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.0/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.0/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.0/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.0/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.0/bits/gthr.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.0/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.0/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.0/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 00753d73eb6..9b2e625a796 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -70,12 +70,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-openbsd3.9
-./usr/lib/gcc-lib/i386-unknown-openbsd3.9/3.3.5
-./usr/lib/gcc-lib/i386-unknown-openbsd3.9/3.3.5/cc1
-./usr/lib/gcc-lib/i386-unknown-openbsd3.9/3.3.5/collect2
-./usr/lib/gcc-lib/i386-unknown-openbsd3.9/3.3.5/include
-./usr/lib/gcc-lib/i386-unknown-openbsd3.9/3.3.5/specs
+./usr/lib/gcc-lib/i386-unknown-openbsd4.0
+./usr/lib/gcc-lib/i386-unknown-openbsd4.0/3.3.5
+./usr/lib/gcc-lib/i386-unknown-openbsd4.0/3.3.5/cc1
+./usr/lib/gcc-lib/i386-unknown-openbsd4.0/3.3.5/collect2
+./usr/lib/gcc-lib/i386-unknown-openbsd4.0/3.3.5/include
+./usr/lib/gcc-lib/i386-unknown-openbsd4.0/3.3.5/specs
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.39.2
./usr/lib/libcom_err.so.16.0
@@ -1558,24 +1558,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-openbsd3.9
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/c++config.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/c++io.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/gthr.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/time_members.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.0
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.0/bits
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.0/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.0/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.0/bits/c++config.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.0/bits/c++io.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.0/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.0/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.0/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.0/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.0/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.0/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.0/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.0/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.0/bits/gthr.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.0/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.0/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.0/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.luna88k b/distrib/sets/lists/base/md.luna88k
index 38b2849c4f8..fe9af285ac5 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-openbsd3.9
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/cc1
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/collect2
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/cpp0
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/include
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/specs
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/cc1
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/collect2
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/cpp0
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/include
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/specs
./usr/libdata/perl5/m88k-openbsd
./usr/libdata/perl5/m88k-openbsd/5.8.8
./usr/libdata/perl5/m88k-openbsd/5.8.8/.packlist
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 9475d63773d..2e0204f003a 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-openbsd3.9
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/cc1
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/collect2
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/cpp0
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/include
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/specs
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/cc1
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/collect2
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/cpp0
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/include
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/specs
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.39.2
./usr/lib/libcom_err.so.16.0
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index e90fad0b7cf..9ece3b3da40 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -66,12 +66,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-openbsd3.9
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/3.3.5
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/3.3.5/cc1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/3.3.5/collect2
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/3.3.5/include
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/3.3.5/specs
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/3.3.5
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/3.3.5/cc1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/3.3.5/collect2
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/3.3.5/include
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/3.3.5/specs
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.39.2
./usr/lib/libcom_err.so.16.0
@@ -1554,24 +1554,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-openbsd3.9
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/c++config.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/c++io.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/gthr.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/time_members.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.0
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.0/bits
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.0/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.0/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.0/bits/c++config.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.0/bits/c++io.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.0/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.0/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.0/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.0/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.0/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.0/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.0/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.0/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.0/bits/gthr.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.0/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.0/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.0/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 a93a92f23c9..497b89fc292 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-openbsd3.9
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/cc1
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/collect2
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/cpp0
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/include
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/specs
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/cc1
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/collect2
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/cpp0
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/include
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/specs
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.39.2
./usr/lib/libcom_err.so.16.0
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index d3ab62fb9cc..31150ffa7d8 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-openbsd3.9
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/cc1
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/collect2
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/cpp0
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/include
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/specs
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/cc1
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/collect2
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/cpp0
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/include
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/specs
./usr/libdata/perl5/m88k-openbsd
./usr/libdata/perl5/m88k-openbsd/5.8.8
./usr/libdata/perl5/m88k-openbsd/5.8.8/.packlist
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index c438164d068..6d39fdbfee4 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -51,13 +51,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-openbsd3.9
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/2.95.3
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/2.95.3/cc1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/2.95.3/collect2
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/2.95.3/cpp0
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/2.95.3/include
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/2.95.3/specs
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/2.95.3
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/2.95.3/cc1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/2.95.3/collect2
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/2.95.3/cpp0
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/2.95.3/include
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/2.95.3/specs
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.39.2
./usr/lib/libcom_err.so.16.0
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 22c35865bf8..736f78733b3 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -65,13 +65,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-openbsd3.9
-./usr/lib/gcc-lib/mips64-unknown-openbsd3.9/3.3.5
-./usr/lib/gcc-lib/mips64-unknown-openbsd3.9/3.3.5/cc1
-./usr/lib/gcc-lib/mips64-unknown-openbsd3.9/3.3.5/collect2
-./usr/lib/gcc-lib/mips64-unknown-openbsd3.9/3.3.5/f771
-./usr/lib/gcc-lib/mips64-unknown-openbsd3.9/3.3.5/include
-./usr/lib/gcc-lib/mips64-unknown-openbsd3.9/3.3.5/specs
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.0
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.0/3.3.5
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.0/3.3.5/cc1
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.0/3.3.5/collect2
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.0/3.3.5/f771
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.0/3.3.5/include
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.0/3.3.5/specs
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.39.2
./usr/lib/libcom_err.so.16.0
@@ -1554,24 +1554,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-openbsd3.9
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/c++config.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/c++io.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/gthr.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/time_members.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.0
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.0/bits
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.0/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.0/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.0/bits/c++config.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.0/bits/c++io.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.0/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.0/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.0/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.0/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.0/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.0/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.0/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.0/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.0/bits/gthr.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.0/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.0/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.0/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.sparc b/distrib/sets/lists/base/md.sparc
index 4d8a1273e68..ed5bf484dda 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -23,13 +23,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-openbsd3.9
-./usr/lib/gcc-lib/sparc-unknown-openbsd3.9/2.95.3
-./usr/lib/gcc-lib/sparc-unknown-openbsd3.9/2.95.3/cc1
-./usr/lib/gcc-lib/sparc-unknown-openbsd3.9/2.95.3/collect2
-./usr/lib/gcc-lib/sparc-unknown-openbsd3.9/2.95.3/cpp0
-./usr/lib/gcc-lib/sparc-unknown-openbsd3.9/2.95.3/include
-./usr/lib/gcc-lib/sparc-unknown-openbsd3.9/2.95.3/specs
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.0
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.0/2.95.3
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.0/2.95.3/cc1
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.0/2.95.3/collect2
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.0/2.95.3/cpp0
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.0/2.95.3/include
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.0/2.95.3/specs
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.39.2
./usr/lib/libcom_err.so.16.0
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index fffe01c4324..6e0e5670172 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -62,8 +62,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-openbsd3.9
-./usr/lib/gcc-lib/sparc64-unknown-openbsd3.9/3.3.5/cc1
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.0
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.0/3.3.5/cc1
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.39.2
./usr/lib/libcom_err.so.16.0
@@ -1037,24 +1037,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-openbsd3.9
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/c++config.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/c++io.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/gthr.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/time_members.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.0
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.0/bits
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.0/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.0/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.0/bits/c++config.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.0/bits/c++io.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.0/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.0/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.0/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.0/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.0/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.0/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.0/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.0/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.0/bits/gthr.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.0/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.0/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.0/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 11f822dd13b..19970ae064d 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-openbsd3.9
-./usr/lib/gcc-lib/vax-unknown-openbsd3.9/2.95.3
-./usr/lib/gcc-lib/vax-unknown-openbsd3.9/2.95.3/cc1
-./usr/lib/gcc-lib/vax-unknown-openbsd3.9/2.95.3/collect2
-./usr/lib/gcc-lib/vax-unknown-openbsd3.9/2.95.3/cpp0
-./usr/lib/gcc-lib/vax-unknown-openbsd3.9/2.95.3/include
-./usr/lib/gcc-lib/vax-unknown-openbsd3.9/2.95.3/specs
+./usr/lib/gcc-lib/vax-unknown-openbsd4.0
+./usr/lib/gcc-lib/vax-unknown-openbsd4.0/2.95.3
+./usr/lib/gcc-lib/vax-unknown-openbsd4.0/2.95.3/cc1
+./usr/lib/gcc-lib/vax-unknown-openbsd4.0/2.95.3/collect2
+./usr/lib/gcc-lib/vax-unknown-openbsd4.0/2.95.3/cpp0
+./usr/lib/gcc-lib/vax-unknown-openbsd4.0/2.95.3/include
+./usr/lib/gcc-lib/vax-unknown-openbsd4.0/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 1caf65e70fb..807032f4727 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -43,15 +43,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-openbsd3.9
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/cc1
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/cc1obj
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/cc1plus
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/collect2
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/f771
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/specs
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/3.3.5
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/3.3.5/cc1
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/3.3.5/cc1obj
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/3.3.5/cc1plus
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/3.3.5/collect2
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/3.3.5/f771
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/3.3.5/specs
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.39.2
./usr/lib/libcom_err.so.16.0
@@ -1482,24 +1482,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-openbsd3.9
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/c++config.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/c++io.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/gthr.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/time_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/c++config.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/c++io.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/gthr.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.0/bits/time_members.ph
./usr/libdata/perl5/site_perl/arm-openbsd/g++/backward
./usr/libdata/perl5/site_perl/arm-openbsd/g++/backward/algo.ph
./usr/libdata/perl5/site_perl/arm-openbsd/g++/backward/algobase.ph
diff --git a/distrib/sets/lists/comp/md.alpha b/distrib/sets/lists/comp/md.alpha
index bf0324e0b93..06594f52fc0 100644
--- a/distrib/sets/lists/comp/md.alpha
+++ b/distrib/sets/lists/comp/md.alpha
@@ -170,47 +170,47 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/cc1obj
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/cc1plus
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/f771
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/ieee
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/ieee/libgcc.a
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/README
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/exception
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/fixed
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/float.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/iso646.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/limits.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/new
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/new.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/proto.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/stdarg.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/stdbool.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/stddef.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/va-alpha.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/va-arc.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/va-c4x.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/va-clipper.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/va-h8300.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/va-i860.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/va-i960.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/va-m32r.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/va-m88k.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/va-mips.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/va-mn10200.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/va-mn10300.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/va-pa.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/va-ppc.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/va-pyr.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/va-sh.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/va-sparc.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/va-spur.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/va-v850.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include/varargs.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/libgcc.a
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/cc1obj
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/cc1plus
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/f771
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/ieee
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/ieee/libgcc.a
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/README
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/exception
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/fixed
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/float.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/iso646.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/limits.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/new
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/new.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/proto.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/stdarg.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/stdbool.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/stddef.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-alpha.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-arc.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-c4x.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-clipper.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-h8300.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-i860.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-i960.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-m32r.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-m88k.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-mips.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-mn10200.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-mn10300.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-pa.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-ppc.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-pyr.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-sh.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-sparc.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-spur.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/va-v850.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/include/varargs.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.0/2.95.3/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 6c99ee910d5..b2367ba7f17 100644
--- a/distrib/sets/lists/comp/md.amd64
+++ b/distrib/sets/lists/comp/md.amd64
@@ -76,24 +76,24 @@
./usr/include/bfdlink.h
./usr/include/dis-asm.h
./usr/include/emmintrin.h
-./usr/include/g++/amd64-unknown-openbsd3.9
-./usr/include/g++/amd64-unknown-openbsd3.9/bits
-./usr/include/g++/amd64-unknown-openbsd3.9/bits/atomicity.h
-./usr/include/g++/amd64-unknown-openbsd3.9/bits/basic_file.h
-./usr/include/g++/amd64-unknown-openbsd3.9/bits/c++config.h
-./usr/include/g++/amd64-unknown-openbsd3.9/bits/c++io.h
-./usr/include/g++/amd64-unknown-openbsd3.9/bits/c++locale.h
-./usr/include/g++/amd64-unknown-openbsd3.9/bits/codecvt_specializations.h
-./usr/include/g++/amd64-unknown-openbsd3.9/bits/ctype_base.h
-./usr/include/g++/amd64-unknown-openbsd3.9/bits/ctype_inline.h
-./usr/include/g++/amd64-unknown-openbsd3.9/bits/ctype_noninline.h
-./usr/include/g++/amd64-unknown-openbsd3.9/bits/gthr-default.h
-./usr/include/g++/amd64-unknown-openbsd3.9/bits/gthr-posix.h
-./usr/include/g++/amd64-unknown-openbsd3.9/bits/gthr-single.h
-./usr/include/g++/amd64-unknown-openbsd3.9/bits/gthr.h
-./usr/include/g++/amd64-unknown-openbsd3.9/bits/messages_members.h
-./usr/include/g++/amd64-unknown-openbsd3.9/bits/os_defines.h
-./usr/include/g++/amd64-unknown-openbsd3.9/bits/time_members.h
+./usr/include/g++/amd64-unknown-openbsd4.0
+./usr/include/g++/amd64-unknown-openbsd4.0/bits
+./usr/include/g++/amd64-unknown-openbsd4.0/bits/atomicity.h
+./usr/include/g++/amd64-unknown-openbsd4.0/bits/basic_file.h
+./usr/include/g++/amd64-unknown-openbsd4.0/bits/c++config.h
+./usr/include/g++/amd64-unknown-openbsd4.0/bits/c++io.h
+./usr/include/g++/amd64-unknown-openbsd4.0/bits/c++locale.h
+./usr/include/g++/amd64-unknown-openbsd4.0/bits/codecvt_specializations.h
+./usr/include/g++/amd64-unknown-openbsd4.0/bits/ctype_base.h
+./usr/include/g++/amd64-unknown-openbsd4.0/bits/ctype_inline.h
+./usr/include/g++/amd64-unknown-openbsd4.0/bits/ctype_noninline.h
+./usr/include/g++/amd64-unknown-openbsd4.0/bits/gthr-default.h
+./usr/include/g++/amd64-unknown-openbsd4.0/bits/gthr-posix.h
+./usr/include/g++/amd64-unknown-openbsd4.0/bits/gthr-single.h
+./usr/include/g++/amd64-unknown-openbsd4.0/bits/gthr.h
+./usr/include/g++/amd64-unknown-openbsd4.0/bits/messages_members.h
+./usr/include/g++/amd64-unknown-openbsd4.0/bits/os_defines.h
+./usr/include/g++/amd64-unknown-openbsd4.0/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-openbsd3.9/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/amd64-unknown-openbsd3.9/3.3.5/cc1obj
-./usr/lib/gcc-lib/amd64-unknown-openbsd3.9/3.3.5/cc1plus
-./usr/lib/gcc-lib/amd64-unknown-openbsd3.9/3.3.5/f771
-./usr/lib/gcc-lib/amd64-unknown-openbsd3.9/3.3.5/fpic
-./usr/lib/gcc-lib/amd64-unknown-openbsd3.9/3.3.5/fpic/libgcc.a
-./usr/lib/gcc-lib/amd64-unknown-openbsd3.9/3.3.5/include
-./usr/lib/gcc-lib/amd64-unknown-openbsd3.9/3.3.5/include/emmintrin.h
-./usr/lib/gcc-lib/amd64-unknown-openbsd3.9/3.3.5/include/mmintrin.h
-./usr/lib/gcc-lib/amd64-unknown-openbsd3.9/3.3.5/include/pmmintrin.h
-./usr/lib/gcc-lib/amd64-unknown-openbsd3.9/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/amd64-unknown-openbsd3.9/3.3.5/include/xmmintrin.h
-./usr/lib/gcc-lib/amd64-unknown-openbsd3.9/3.3.5/libgcc.a
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.0/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.0/3.3.5/cc1obj
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.0/3.3.5/cc1plus
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.0/3.3.5/f771
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.0/3.3.5/fpic
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.0/3.3.5/fpic/libgcc.a
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.0/3.3.5/include
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.0/3.3.5/include/emmintrin.h
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.0/3.3.5/include/mmintrin.h
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.0/3.3.5/include/pmmintrin.h
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.0/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.0/3.3.5/include/xmmintrin.h
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.0/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 f01afb469be..6f4422a8ed2 100644
--- a/distrib/sets/lists/comp/md.armish
+++ b/distrib/sets/lists/comp/md.armish
@@ -95,24 +95,24 @@
./usr/include/bfd.h
./usr/include/bfdlink.h
./usr/include/dis-asm.h
-./usr/include/g++/arm-unknown-openbsd3.9
-./usr/include/g++/arm-unknown-openbsd3.9/bits
-./usr/include/g++/arm-unknown-openbsd3.9/bits/atomicity.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/basic_file.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/c++config.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/c++io.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/c++locale.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/codecvt_specializations.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/ctype_base.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/ctype_inline.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/ctype_noninline.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/gthr-default.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/gthr-posix.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/gthr-single.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/gthr.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/messages_members.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/os_defines.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/time_members.h
+./usr/include/g++/arm-unknown-openbsd4.0
+./usr/include/g++/arm-unknown-openbsd4.0/bits
+./usr/include/g++/arm-unknown-openbsd4.0/bits/atomicity.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/basic_file.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/c++config.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/c++io.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/c++locale.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/codecvt_specializations.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/ctype_base.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/ctype_inline.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/ctype_noninline.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/gthr-default.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/gthr-posix.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/gthr-single.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/gthr.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/messages_members.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/os_defines.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/time_members.h
./usr/include/g++/backward
./usr/include/g++/backward/algo.h
./usr/include/g++/backward/algobase.h
@@ -248,9 +248,9 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/include
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/libgcc.a
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/3.3.5/include
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/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 b4013255573..f22fdc18d6d 100644
--- a/distrib/sets/lists/comp/md.aviion
+++ b/distrib/sets/lists/comp/md.aviion
@@ -197,18 +197,18 @@
./usr/include/m88k/va-m88k.h
./usr/include/m88k/varargs.h
./usr/include/m88k/vmparam.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/cc1obj
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/cc1plus
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/f771
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/include/README
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/include/exception
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/include/float.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/include/new
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/include/new.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/cc1obj
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/cc1plus
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/f771
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/include/README
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/include/exception
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/include/float.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/include/new
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/include/new.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/libgcc.a
./usr/lib/libstdc++_p.a
./usr/lib/scrt0.o
diff --git a/distrib/sets/lists/comp/md.cats b/distrib/sets/lists/comp/md.cats
index c9517631dbd..8262f51dde5 100644
--- a/distrib/sets/lists/comp/md.cats
+++ b/distrib/sets/lists/comp/md.cats
@@ -95,24 +95,24 @@
./usr/include/cats/trap.h
./usr/include/cats/vmparam.h
./usr/include/dis-asm.h
-./usr/include/g++/arm-unknown-openbsd3.9
-./usr/include/g++/arm-unknown-openbsd3.9/bits
-./usr/include/g++/arm-unknown-openbsd3.9/bits/atomicity.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/basic_file.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/c++config.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/c++io.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/c++locale.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/codecvt_specializations.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/ctype_base.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/ctype_inline.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/ctype_noninline.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/gthr-default.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/gthr-posix.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/gthr-single.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/gthr.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/messages_members.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/os_defines.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/time_members.h
+./usr/include/g++/arm-unknown-openbsd4.0
+./usr/include/g++/arm-unknown-openbsd4.0/bits
+./usr/include/g++/arm-unknown-openbsd4.0/bits/atomicity.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/basic_file.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/c++config.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/c++io.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/c++locale.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/codecvt_specializations.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/ctype_base.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/ctype_inline.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/ctype_noninline.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/gthr-default.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/gthr-posix.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/gthr-single.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/gthr.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/messages_members.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/os_defines.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/time_members.h
./usr/include/g++/backward
./usr/include/g++/backward/algo.h
./usr/include/g++/backward/algobase.h
@@ -248,9 +248,9 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/include
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/libgcc.a
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/3.3.5/include
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/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.hp300 b/distrib/sets/lists/comp/md.hp300
index dda67d089b6..8eb16bf410b 100644
--- a/distrib/sets/lists/comp/md.hp300
+++ b/distrib/sets/lists/comp/md.hp300
@@ -180,23 +180,23 @@
./usr/include/m68k/trap.h
./usr/include/m68k/varargs.h
./usr/include/m68k/vmparam.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/cc1obj
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/f771
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/fPIC
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/fPIC/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/fpic
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/fpic/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/include/README
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/include/exception
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/include/float.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/include/new
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/include/new.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/cc1obj
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/cc1plus
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/f771
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/fPIC
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/fPIC/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/fpic
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/fpic/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/include/README
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/include/exception
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/include/float.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/include/new
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/include/new.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/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 5131bc25311..faaf41cde2d 100644
--- a/distrib/sets/lists/comp/md.hppa
+++ b/distrib/sets/lists/comp/md.hppa
@@ -127,24 +127,24 @@
./usr/include/g++/ext/stl_hash_fun.h
./usr/include/g++/ext/stl_hashtable.h
./usr/include/g++/ext/stl_rope.h
-./usr/include/g++/hppa-unknown-openbsd3.9
-./usr/include/g++/hppa-unknown-openbsd3.9/bits
-./usr/include/g++/hppa-unknown-openbsd3.9/bits/atomicity.h
-./usr/include/g++/hppa-unknown-openbsd3.9/bits/basic_file.h
-./usr/include/g++/hppa-unknown-openbsd3.9/bits/c++config.h
-./usr/include/g++/hppa-unknown-openbsd3.9/bits/c++io.h
-./usr/include/g++/hppa-unknown-openbsd3.9/bits/c++locale.h
-./usr/include/g++/hppa-unknown-openbsd3.9/bits/codecvt_specializations.h
-./usr/include/g++/hppa-unknown-openbsd3.9/bits/ctype_base.h
-./usr/include/g++/hppa-unknown-openbsd3.9/bits/ctype_inline.h
-./usr/include/g++/hppa-unknown-openbsd3.9/bits/ctype_noninline.h
-./usr/include/g++/hppa-unknown-openbsd3.9/bits/gthr-default.h
-./usr/include/g++/hppa-unknown-openbsd3.9/bits/gthr-posix.h
-./usr/include/g++/hppa-unknown-openbsd3.9/bits/gthr-single.h
-./usr/include/g++/hppa-unknown-openbsd3.9/bits/gthr.h
-./usr/include/g++/hppa-unknown-openbsd3.9/bits/messages_members.h
-./usr/include/g++/hppa-unknown-openbsd3.9/bits/os_defines.h
-./usr/include/g++/hppa-unknown-openbsd3.9/bits/time_members.h
+./usr/include/g++/hppa-unknown-openbsd4.0
+./usr/include/g++/hppa-unknown-openbsd4.0/bits
+./usr/include/g++/hppa-unknown-openbsd4.0/bits/atomicity.h
+./usr/include/g++/hppa-unknown-openbsd4.0/bits/basic_file.h
+./usr/include/g++/hppa-unknown-openbsd4.0/bits/c++config.h
+./usr/include/g++/hppa-unknown-openbsd4.0/bits/c++io.h
+./usr/include/g++/hppa-unknown-openbsd4.0/bits/c++locale.h
+./usr/include/g++/hppa-unknown-openbsd4.0/bits/codecvt_specializations.h
+./usr/include/g++/hppa-unknown-openbsd4.0/bits/ctype_base.h
+./usr/include/g++/hppa-unknown-openbsd4.0/bits/ctype_inline.h
+./usr/include/g++/hppa-unknown-openbsd4.0/bits/ctype_noninline.h
+./usr/include/g++/hppa-unknown-openbsd4.0/bits/gthr-default.h
+./usr/include/g++/hppa-unknown-openbsd4.0/bits/gthr-posix.h
+./usr/include/g++/hppa-unknown-openbsd4.0/bits/gthr-single.h
+./usr/include/g++/hppa-unknown-openbsd4.0/bits/gthr.h
+./usr/include/g++/hppa-unknown-openbsd4.0/bits/messages_members.h
+./usr/include/g++/hppa-unknown-openbsd4.0/bits/os_defines.h
+./usr/include/g++/hppa-unknown-openbsd4.0/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-openbsd3.9/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.9/3.3.5/cc1obj
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.9/3.3.5/cc1plus
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.9/3.3.5/f771
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.9/3.3.5/include
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.9/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.9/3.3.5/libgcc.a
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.0/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.0/3.3.5/cc1obj
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.0/3.3.5/cc1plus
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.0/3.3.5/f771
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.0/3.3.5/include
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.0/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.0/3.3.5/libgcc.a
./usr/lib/libasn1_pic.a
./usr/lib/libbfd.a
./usr/lib/libbfd.la
diff --git a/distrib/sets/lists/comp/md.hppa64 b/distrib/sets/lists/comp/md.hppa64
index 14a6ab4b56a..9062f02b707 100644
--- a/distrib/sets/lists/comp/md.hppa64
+++ b/distrib/sets/lists/comp/md.hppa64
@@ -127,24 +127,24 @@
./usr/include/g++/ext/stl_hash_fun.h
./usr/include/g++/ext/stl_hashtable.h
./usr/include/g++/ext/stl_rope.h
-./usr/include/g++/hppa64-unknown-openbsd3.9
-./usr/include/g++/hppa64-unknown-openbsd3.9/bits
-./usr/include/g++/hppa64-unknown-openbsd3.9/bits/atomicity.h
-./usr/include/g++/hppa64-unknown-openbsd3.9/bits/basic_file.h
-./usr/include/g++/hppa64-unknown-openbsd3.9/bits/c++config.h
-./usr/include/g++/hppa64-unknown-openbsd3.9/bits/c++io.h
-./usr/include/g++/hppa64-unknown-openbsd3.9/bits/c++locale.h
-./usr/include/g++/hppa64-unknown-openbsd3.9/bits/codecvt_specializations.h
-./usr/include/g++/hppa64-unknown-openbsd3.9/bits/ctype_base.h
-./usr/include/g++/hppa64-unknown-openbsd3.9/bits/ctype_inline.h
-./usr/include/g++/hppa64-unknown-openbsd3.9/bits/ctype_noninline.h
-./usr/include/g++/hppa64-unknown-openbsd3.9/bits/gthr-default.h
-./usr/include/g++/hppa64-unknown-openbsd3.9/bits/gthr-posix.h
-./usr/include/g++/hppa64-unknown-openbsd3.9/bits/gthr-single.h
-./usr/include/g++/hppa64-unknown-openbsd3.9/bits/gthr.h
-./usr/include/g++/hppa64-unknown-openbsd3.9/bits/messages_members.h
-./usr/include/g++/hppa64-unknown-openbsd3.9/bits/os_defines.h
-./usr/include/g++/hppa64-unknown-openbsd3.9/bits/time_members.h
+./usr/include/g++/hppa64-unknown-openbsd4.0
+./usr/include/g++/hppa64-unknown-openbsd4.0/bits
+./usr/include/g++/hppa64-unknown-openbsd4.0/bits/atomicity.h
+./usr/include/g++/hppa64-unknown-openbsd4.0/bits/basic_file.h
+./usr/include/g++/hppa64-unknown-openbsd4.0/bits/c++config.h
+./usr/include/g++/hppa64-unknown-openbsd4.0/bits/c++io.h
+./usr/include/g++/hppa64-unknown-openbsd4.0/bits/c++locale.h
+./usr/include/g++/hppa64-unknown-openbsd4.0/bits/codecvt_specializations.h
+./usr/include/g++/hppa64-unknown-openbsd4.0/bits/ctype_base.h
+./usr/include/g++/hppa64-unknown-openbsd4.0/bits/ctype_inline.h
+./usr/include/g++/hppa64-unknown-openbsd4.0/bits/ctype_noninline.h
+./usr/include/g++/hppa64-unknown-openbsd4.0/bits/gthr-default.h
+./usr/include/g++/hppa64-unknown-openbsd4.0/bits/gthr-posix.h
+./usr/include/g++/hppa64-unknown-openbsd4.0/bits/gthr-single.h
+./usr/include/g++/hppa64-unknown-openbsd4.0/bits/gthr.h
+./usr/include/g++/hppa64-unknown-openbsd4.0/bits/messages_members.h
+./usr/include/g++/hppa64-unknown-openbsd4.0/bits/os_defines.h
+./usr/include/g++/hppa64-unknown-openbsd4.0/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/hppa64-unknown-openbsd3.9/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/hppa64-unknown-openbsd3.9/3.3.5/cc1obj
-./usr/lib/gcc-lib/hppa64-unknown-openbsd3.9/3.3.5/cc1plus
-./usr/lib/gcc-lib/hppa64-unknown-openbsd3.9/3.3.5/f771
-./usr/lib/gcc-lib/hppa64-unknown-openbsd3.9/3.3.5/include
-./usr/lib/gcc-lib/hppa64-unknown-openbsd3.9/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/hppa64-unknown-openbsd3.9/3.3.5/libgcc.a
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.0/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.0/3.3.5/cc1obj
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.0/3.3.5/cc1plus
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.0/3.3.5/f771
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.0/3.3.5/include
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.0/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.0/3.3.5/libgcc.a
./usr/lib/libasn1_pic.a
./usr/lib/libbfd.a
./usr/lib/libbfd.la
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index a89fcf2a2b9..338d3cd1bb0 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -128,24 +128,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-openbsd3.9
-./usr/include/g++/i386-unknown-openbsd3.9/bits
-./usr/include/g++/i386-unknown-openbsd3.9/bits/atomicity.h
-./usr/include/g++/i386-unknown-openbsd3.9/bits/basic_file.h
-./usr/include/g++/i386-unknown-openbsd3.9/bits/c++config.h
-./usr/include/g++/i386-unknown-openbsd3.9/bits/c++io.h
-./usr/include/g++/i386-unknown-openbsd3.9/bits/c++locale.h
-./usr/include/g++/i386-unknown-openbsd3.9/bits/codecvt_specializations.h
-./usr/include/g++/i386-unknown-openbsd3.9/bits/ctype_base.h
-./usr/include/g++/i386-unknown-openbsd3.9/bits/ctype_inline.h
-./usr/include/g++/i386-unknown-openbsd3.9/bits/ctype_noninline.h
-./usr/include/g++/i386-unknown-openbsd3.9/bits/gthr-default.h
-./usr/include/g++/i386-unknown-openbsd3.9/bits/gthr-posix.h
-./usr/include/g++/i386-unknown-openbsd3.9/bits/gthr-single.h
-./usr/include/g++/i386-unknown-openbsd3.9/bits/gthr.h
-./usr/include/g++/i386-unknown-openbsd3.9/bits/messages_members.h
-./usr/include/g++/i386-unknown-openbsd3.9/bits/os_defines.h
-./usr/include/g++/i386-unknown-openbsd3.9/bits/time_members.h
+./usr/include/g++/i386-unknown-openbsd4.0
+./usr/include/g++/i386-unknown-openbsd4.0/bits
+./usr/include/g++/i386-unknown-openbsd4.0/bits/atomicity.h
+./usr/include/g++/i386-unknown-openbsd4.0/bits/basic_file.h
+./usr/include/g++/i386-unknown-openbsd4.0/bits/c++config.h
+./usr/include/g++/i386-unknown-openbsd4.0/bits/c++io.h
+./usr/include/g++/i386-unknown-openbsd4.0/bits/c++locale.h
+./usr/include/g++/i386-unknown-openbsd4.0/bits/codecvt_specializations.h
+./usr/include/g++/i386-unknown-openbsd4.0/bits/ctype_base.h
+./usr/include/g++/i386-unknown-openbsd4.0/bits/ctype_inline.h
+./usr/include/g++/i386-unknown-openbsd4.0/bits/ctype_noninline.h
+./usr/include/g++/i386-unknown-openbsd4.0/bits/gthr-default.h
+./usr/include/g++/i386-unknown-openbsd4.0/bits/gthr-posix.h
+./usr/include/g++/i386-unknown-openbsd4.0/bits/gthr-single.h
+./usr/include/g++/i386-unknown-openbsd4.0/bits/gthr.h
+./usr/include/g++/i386-unknown-openbsd4.0/bits/messages_members.h
+./usr/include/g++/i386-unknown-openbsd4.0/bits/os_defines.h
+./usr/include/g++/i386-unknown-openbsd4.0/bits/time_members.h
./usr/include/g++/ios
./usr/include/g++/istream
./usr/include/g++/limits
@@ -233,18 +233,18 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/i386-unknown-openbsd3.9/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/i386-unknown-openbsd3.9/3.3.5/cc1obj
-./usr/lib/gcc-lib/i386-unknown-openbsd3.9/3.3.5/cc1plus
-./usr/lib/gcc-lib/i386-unknown-openbsd3.9/3.3.5/f771
-./usr/lib/gcc-lib/i386-unknown-openbsd3.9/3.3.5/fpic
-./usr/lib/gcc-lib/i386-unknown-openbsd3.9/3.3.5/fpic/libgcc.a
-./usr/lib/gcc-lib/i386-unknown-openbsd3.9/3.3.5/include/emmintrin.h
-./usr/lib/gcc-lib/i386-unknown-openbsd3.9/3.3.5/include/mmintrin.h
-./usr/lib/gcc-lib/i386-unknown-openbsd3.9/3.3.5/include/pmmintrin.h
-./usr/lib/gcc-lib/i386-unknown-openbsd3.9/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/i386-unknown-openbsd3.9/3.3.5/include/xmmintrin.h
-./usr/lib/gcc-lib/i386-unknown-openbsd3.9/3.3.5/libgcc.a
+./usr/lib/gcc-lib/i386-unknown-openbsd4.0/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/i386-unknown-openbsd4.0/3.3.5/cc1obj
+./usr/lib/gcc-lib/i386-unknown-openbsd4.0/3.3.5/cc1plus
+./usr/lib/gcc-lib/i386-unknown-openbsd4.0/3.3.5/f771
+./usr/lib/gcc-lib/i386-unknown-openbsd4.0/3.3.5/fpic
+./usr/lib/gcc-lib/i386-unknown-openbsd4.0/3.3.5/fpic/libgcc.a
+./usr/lib/gcc-lib/i386-unknown-openbsd4.0/3.3.5/include/emmintrin.h
+./usr/lib/gcc-lib/i386-unknown-openbsd4.0/3.3.5/include/mmintrin.h
+./usr/lib/gcc-lib/i386-unknown-openbsd4.0/3.3.5/include/pmmintrin.h
+./usr/lib/gcc-lib/i386-unknown-openbsd4.0/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/i386-unknown-openbsd4.0/3.3.5/include/xmmintrin.h
+./usr/lib/gcc-lib/i386-unknown-openbsd4.0/3.3.5/libgcc.a
./usr/lib/libasn1_pic.a
./usr/lib/libbfd.a
./usr/lib/libbfd.la
diff --git a/distrib/sets/lists/comp/md.luna88k b/distrib/sets/lists/comp/md.luna88k
index e64a3a766c7..d03145306f8 100644
--- a/distrib/sets/lists/comp/md.luna88k
+++ b/distrib/sets/lists/comp/md.luna88k
@@ -195,18 +195,18 @@
./usr/include/m88k/va-m88k.h
./usr/include/m88k/varargs.h
./usr/include/m88k/vmparam.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/cc1obj
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/cc1plus
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/f771
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/include/README
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/include/exception
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/include/float.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/include/new
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/include/new.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/cc1obj
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/cc1plus
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/f771
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/include/README
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/include/exception
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/include/float.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/include/new
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/include/new.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/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 c32ca1ee62d..3b96b1022ad 100644
--- a/distrib/sets/lists/comp/md.mac68k
+++ b/distrib/sets/lists/comp/md.mac68k
@@ -183,23 +183,23 @@
./usr/include/mac68k/viareg.h
./usr/include/mac68k/vmparam.h
./usr/include/mac68k/z8530var.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/cc1obj
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/f771
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/fPIC
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/fPIC/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/fpic
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/fpic/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/include/README
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/include/exception
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/include/float.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/include/new
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/include/new.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/cc1obj
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/cc1plus
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/f771
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/fPIC
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/fPIC/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/fpic
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/fpic/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/include/README
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/include/exception
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/include/float.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/include/new
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/include/new.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/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 80e942ac4de..7361002b753 100644
--- a/distrib/sets/lists/comp/md.macppc
+++ b/distrib/sets/lists/comp/md.macppc
@@ -132,24 +132,24 @@
./usr/include/g++/limits
./usr/include/g++/locale
./usr/include/g++/ostream
-./usr/include/g++/powerpc-unknown-openbsd3.9
-./usr/include/g++/powerpc-unknown-openbsd3.9/bits
-./usr/include/g++/powerpc-unknown-openbsd3.9/bits/atomicity.h
-./usr/include/g++/powerpc-unknown-openbsd3.9/bits/basic_file.h
-./usr/include/g++/powerpc-unknown-openbsd3.9/bits/c++config.h
-./usr/include/g++/powerpc-unknown-openbsd3.9/bits/c++io.h
-./usr/include/g++/powerpc-unknown-openbsd3.9/bits/c++locale.h
-./usr/include/g++/powerpc-unknown-openbsd3.9/bits/codecvt_specializations.h
-./usr/include/g++/powerpc-unknown-openbsd3.9/bits/ctype_base.h
-./usr/include/g++/powerpc-unknown-openbsd3.9/bits/ctype_inline.h
-./usr/include/g++/powerpc-unknown-openbsd3.9/bits/ctype_noninline.h
-./usr/include/g++/powerpc-unknown-openbsd3.9/bits/gthr-default.h
-./usr/include/g++/powerpc-unknown-openbsd3.9/bits/gthr-posix.h
-./usr/include/g++/powerpc-unknown-openbsd3.9/bits/gthr-single.h
-./usr/include/g++/powerpc-unknown-openbsd3.9/bits/gthr.h
-./usr/include/g++/powerpc-unknown-openbsd3.9/bits/messages_members.h
-./usr/include/g++/powerpc-unknown-openbsd3.9/bits/os_defines.h
-./usr/include/g++/powerpc-unknown-openbsd3.9/bits/time_members.h
+./usr/include/g++/powerpc-unknown-openbsd4.0
+./usr/include/g++/powerpc-unknown-openbsd4.0/bits
+./usr/include/g++/powerpc-unknown-openbsd4.0/bits/atomicity.h
+./usr/include/g++/powerpc-unknown-openbsd4.0/bits/basic_file.h
+./usr/include/g++/powerpc-unknown-openbsd4.0/bits/c++config.h
+./usr/include/g++/powerpc-unknown-openbsd4.0/bits/c++io.h
+./usr/include/g++/powerpc-unknown-openbsd4.0/bits/c++locale.h
+./usr/include/g++/powerpc-unknown-openbsd4.0/bits/codecvt_specializations.h
+./usr/include/g++/powerpc-unknown-openbsd4.0/bits/ctype_base.h
+./usr/include/g++/powerpc-unknown-openbsd4.0/bits/ctype_inline.h
+./usr/include/g++/powerpc-unknown-openbsd4.0/bits/ctype_noninline.h
+./usr/include/g++/powerpc-unknown-openbsd4.0/bits/gthr-default.h
+./usr/include/g++/powerpc-unknown-openbsd4.0/bits/gthr-posix.h
+./usr/include/g++/powerpc-unknown-openbsd4.0/bits/gthr-single.h
+./usr/include/g++/powerpc-unknown-openbsd4.0/bits/gthr.h
+./usr/include/g++/powerpc-unknown-openbsd4.0/bits/messages_members.h
+./usr/include/g++/powerpc-unknown-openbsd4.0/bits/os_defines.h
+./usr/include/g++/powerpc-unknown-openbsd4.0/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-openbsd3.9/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/3.3.5/cc1obj
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/3.3.5/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/3.3.5/crtsavres.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/3.3.5/f771
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/3.3.5/include/altivec.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/3.3.5/libgcc.a
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/3.3.5/nof
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/3.3.5/nof/crtsavres.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/3.3.5/nof/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/3.3.5/cc1obj
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/3.3.5/cc1plus
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/3.3.5/crtsavres.o
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/3.3.5/f771
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/3.3.5/include/altivec.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/3.3.5/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/3.3.5/nof
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/3.3.5/nof/crtsavres.o
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/3.3.5/nof/libgcc.a
./usr/lib/libasn1_pic.a
./usr/lib/libbfd.a
./usr/lib/libbfd.la
diff --git a/distrib/sets/lists/comp/md.mvme68k b/distrib/sets/lists/comp/md.mvme68k
index 9c8a85ed7f6..f1920c6e091 100644
--- a/distrib/sets/lists/comp/md.mvme68k
+++ b/distrib/sets/lists/comp/md.mvme68k
@@ -181,23 +181,23 @@
./usr/include/mvme68k/trap.h
./usr/include/mvme68k/varargs.h
./usr/include/mvme68k/vmparam.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/cc1obj
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/f771
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/fPIC
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/fPIC/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/fpic
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/fpic/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/include/README
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/include/exception
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/include/float.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/include/new
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/include/new.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/cc1obj
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/cc1plus
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/f771
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/fPIC
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/fPIC/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/fpic
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/fpic/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/include/README
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/include/exception
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/include/float.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/include/new
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/include/new.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.0/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 336da3dd40e..a71832c96ca 100644
--- a/distrib/sets/lists/comp/md.mvme88k
+++ b/distrib/sets/lists/comp/md.mvme88k
@@ -204,18 +204,18 @@
./usr/include/mvme88k/varargs.h
./usr/include/mvme88k/vid.h
./usr/include/mvme88k/vmparam.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/cc1obj
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/cc1plus
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/f771
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/include/README
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/include/exception
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/include/float.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/include/new
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/include/new.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/cc1obj
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/cc1plus
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/f771
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/include/README
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/include/exception
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/include/float.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/include/new
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/include/new.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.0/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 8193a72421a..9982a76c947 100644
--- a/distrib/sets/lists/comp/md.mvmeppc
+++ b/distrib/sets/lists/comp/md.mvmeppc
@@ -164,21 +164,21 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/2.95.3/cc1obj
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/2.95.3/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/2.95.3/f771
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/2.95.3/include/README
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/2.95.3/include/exception
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/2.95.3/include/float.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/2.95.3/include/limits.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/2.95.3/include/new
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/2.95.3/include/new.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/2.95.3/libgcc.a
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/2.95.3/soft-float
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/2.95.3/soft-float/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/2.95.3/cc1obj
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/2.95.3/cc1plus
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/2.95.3/f771
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/2.95.3/include/README
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/2.95.3/include/exception
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/2.95.3/include/float.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/2.95.3/include/limits.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/2.95.3/include/new
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/2.95.3/include/new.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/2.95.3/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/2.95.3/soft-float
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.0/2.95.3/soft-float/libgcc.a
./usr/lib/libbfd.a
./usr/lib/libbfd.la
./usr/lib/libc_pic.a
diff --git a/distrib/sets/lists/comp/md.sgi b/distrib/sets/lists/comp/md.sgi
index 0d5247ee6fc..62762d65f55 100644
--- a/distrib/sets/lists/comp/md.sgi
+++ b/distrib/sets/lists/comp/md.sgi
@@ -129,24 +129,24 @@
./usr/include/g++/istream
./usr/include/g++/limits
./usr/include/g++/locale
-./usr/include/g++/mips64-unknown-openbsd3.9
-./usr/include/g++/mips64-unknown-openbsd3.9/bits
-./usr/include/g++/mips64-unknown-openbsd3.9/bits/atomicity.h
-./usr/include/g++/mips64-unknown-openbsd3.9/bits/basic_file.h
-./usr/include/g++/mips64-unknown-openbsd3.9/bits/c++config.h
-./usr/include/g++/mips64-unknown-openbsd3.9/bits/c++io.h
-./usr/include/g++/mips64-unknown-openbsd3.9/bits/c++locale.h
-./usr/include/g++/mips64-unknown-openbsd3.9/bits/codecvt_specializations.h
-./usr/include/g++/mips64-unknown-openbsd3.9/bits/ctype_base.h
-./usr/include/g++/mips64-unknown-openbsd3.9/bits/ctype_inline.h
-./usr/include/g++/mips64-unknown-openbsd3.9/bits/ctype_noninline.h
-./usr/include/g++/mips64-unknown-openbsd3.9/bits/gthr-default.h
-./usr/include/g++/mips64-unknown-openbsd3.9/bits/gthr-posix.h
-./usr/include/g++/mips64-unknown-openbsd3.9/bits/gthr-single.h
-./usr/include/g++/mips64-unknown-openbsd3.9/bits/gthr.h
-./usr/include/g++/mips64-unknown-openbsd3.9/bits/messages_members.h
-./usr/include/g++/mips64-unknown-openbsd3.9/bits/os_defines.h
-./usr/include/g++/mips64-unknown-openbsd3.9/bits/time_members.h
+./usr/include/g++/mips64-unknown-openbsd4.0
+./usr/include/g++/mips64-unknown-openbsd4.0/bits
+./usr/include/g++/mips64-unknown-openbsd4.0/bits/atomicity.h
+./usr/include/g++/mips64-unknown-openbsd4.0/bits/basic_file.h
+./usr/include/g++/mips64-unknown-openbsd4.0/bits/c++config.h
+./usr/include/g++/mips64-unknown-openbsd4.0/bits/c++io.h
+./usr/include/g++/mips64-unknown-openbsd4.0/bits/c++locale.h
+./usr/include/g++/mips64-unknown-openbsd4.0/bits/codecvt_specializations.h
+./usr/include/g++/mips64-unknown-openbsd4.0/bits/ctype_base.h
+./usr/include/g++/mips64-unknown-openbsd4.0/bits/ctype_inline.h
+./usr/include/g++/mips64-unknown-openbsd4.0/bits/ctype_noninline.h
+./usr/include/g++/mips64-unknown-openbsd4.0/bits/gthr-default.h
+./usr/include/g++/mips64-unknown-openbsd4.0/bits/gthr-posix.h
+./usr/include/g++/mips64-unknown-openbsd4.0/bits/gthr-single.h
+./usr/include/g++/mips64-unknown-openbsd4.0/bits/gthr.h
+./usr/include/g++/mips64-unknown-openbsd4.0/bits/messages_members.h
+./usr/include/g++/mips64-unknown-openbsd4.0/bits/os_defines.h
+./usr/include/g++/mips64-unknown-openbsd4.0/bits/time_members.h
./usr/include/g++/ostream
./usr/include/g++/streambuf
./usr/include/ieeefp.h
@@ -239,11 +239,11 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64-unknown-openbsd3.9/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/mips64-unknown-openbsd3.9/3.3.5/cc1obj
-./usr/lib/gcc-lib/mips64-unknown-openbsd3.9/3.3.5/cc1plus
-./usr/lib/gcc-lib/mips64-unknown-openbsd3.9/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/mips64-unknown-openbsd3.9/3.3.5/libgcc.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.0/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.0/3.3.5/cc1obj
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.0/3.3.5/cc1plus
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.0/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.0/3.3.5/libgcc.a
./usr/lib/libbfd.a
./usr/lib/libbfd.la
./usr/lib/libopcodes.a
diff --git a/distrib/sets/lists/comp/md.sparc b/distrib/sets/lists/comp/md.sparc
index ade15c96bcc..fe8a9b880bc 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-openbsd3.9/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/sparc-unknown-openbsd3.9/2.95.3/cc1obj
-./usr/lib/gcc-lib/sparc-unknown-openbsd3.9/2.95.3/cc1plus
-./usr/lib/gcc-lib/sparc-unknown-openbsd3.9/2.95.3/f771
-./usr/lib/gcc-lib/sparc-unknown-openbsd3.9/2.95.3/fPIC
-./usr/lib/gcc-lib/sparc-unknown-openbsd3.9/2.95.3/fPIC/libgcc.a
-./usr/lib/gcc-lib/sparc-unknown-openbsd3.9/2.95.3/fpic
-./usr/lib/gcc-lib/sparc-unknown-openbsd3.9/2.95.3/fpic/libgcc.a
-./usr/lib/gcc-lib/sparc-unknown-openbsd3.9/2.95.3/include/README
-./usr/lib/gcc-lib/sparc-unknown-openbsd3.9/2.95.3/include/exception
-./usr/lib/gcc-lib/sparc-unknown-openbsd3.9/2.95.3/include/float.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd3.9/2.95.3/include/limits.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd3.9/2.95.3/include/new
-./usr/lib/gcc-lib/sparc-unknown-openbsd3.9/2.95.3/include/new.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd3.9/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd3.9/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/sparc-unknown-openbsd3.9/2.95.3/libgcc.a
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.0/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.0/2.95.3/cc1obj
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.0/2.95.3/cc1plus
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.0/2.95.3/f771
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.0/2.95.3/fPIC
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.0/2.95.3/fPIC/libgcc.a
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.0/2.95.3/fpic
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.0/2.95.3/fpic/libgcc.a
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.0/2.95.3/include/README
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.0/2.95.3/include/exception
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.0/2.95.3/include/float.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.0/2.95.3/include/limits.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.0/2.95.3/include/new
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.0/2.95.3/include/new.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.0/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.0/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.0/2.95.3/libgcc.a
./usr/lib/libasn1_pic.a
./usr/lib/libbfd.a
./usr/lib/libbfd.la
diff --git a/distrib/sets/lists/comp/md.sparc64 b/distrib/sets/lists/comp/md.sparc64
index 1e746e817e6..7e4f2434f17 100644
--- a/distrib/sets/lists/comp/md.sparc64
+++ b/distrib/sets/lists/comp/md.sparc64
@@ -132,24 +132,24 @@
./usr/include/g++/limits
./usr/include/g++/locale
./usr/include/g++/ostream
-./usr/include/g++/sparc64-unknown-openbsd3.9
-./usr/include/g++/sparc64-unknown-openbsd3.9/bits
-./usr/include/g++/sparc64-unknown-openbsd3.9/bits/atomicity.h
-./usr/include/g++/sparc64-unknown-openbsd3.9/bits/basic_file.h
-./usr/include/g++/sparc64-unknown-openbsd3.9/bits/c++config.h
-./usr/include/g++/sparc64-unknown-openbsd3.9/bits/c++io.h
-./usr/include/g++/sparc64-unknown-openbsd3.9/bits/c++locale.h
-./usr/include/g++/sparc64-unknown-openbsd3.9/bits/codecvt_specializations.h
-./usr/include/g++/sparc64-unknown-openbsd3.9/bits/ctype_base.h
-./usr/include/g++/sparc64-unknown-openbsd3.9/bits/ctype_inline.h
-./usr/include/g++/sparc64-unknown-openbsd3.9/bits/ctype_noninline.h
-./usr/include/g++/sparc64-unknown-openbsd3.9/bits/gthr-default.h
-./usr/include/g++/sparc64-unknown-openbsd3.9/bits/gthr-posix.h
-./usr/include/g++/sparc64-unknown-openbsd3.9/bits/gthr-single.h
-./usr/include/g++/sparc64-unknown-openbsd3.9/bits/gthr.h
-./usr/include/g++/sparc64-unknown-openbsd3.9/bits/messages_members.h
-./usr/include/g++/sparc64-unknown-openbsd3.9/bits/os_defines.h
-./usr/include/g++/sparc64-unknown-openbsd3.9/bits/time_members.h
+./usr/include/g++/sparc64-unknown-openbsd4.0
+./usr/include/g++/sparc64-unknown-openbsd4.0/bits
+./usr/include/g++/sparc64-unknown-openbsd4.0/bits/atomicity.h
+./usr/include/g++/sparc64-unknown-openbsd4.0/bits/basic_file.h
+./usr/include/g++/sparc64-unknown-openbsd4.0/bits/c++config.h
+./usr/include/g++/sparc64-unknown-openbsd4.0/bits/c++io.h
+./usr/include/g++/sparc64-unknown-openbsd4.0/bits/c++locale.h
+./usr/include/g++/sparc64-unknown-openbsd4.0/bits/codecvt_specializations.h
+./usr/include/g++/sparc64-unknown-openbsd4.0/bits/ctype_base.h
+./usr/include/g++/sparc64-unknown-openbsd4.0/bits/ctype_inline.h
+./usr/include/g++/sparc64-unknown-openbsd4.0/bits/ctype_noninline.h
+./usr/include/g++/sparc64-unknown-openbsd4.0/bits/gthr-default.h
+./usr/include/g++/sparc64-unknown-openbsd4.0/bits/gthr-posix.h
+./usr/include/g++/sparc64-unknown-openbsd4.0/bits/gthr-single.h
+./usr/include/g++/sparc64-unknown-openbsd4.0/bits/gthr.h
+./usr/include/g++/sparc64-unknown-openbsd4.0/bits/messages_members.h
+./usr/include/g++/sparc64-unknown-openbsd4.0/bits/os_defines.h
+./usr/include/g++/sparc64-unknown-openbsd4.0/bits/time_members.h
./usr/include/g++/streambuf
./usr/include/ieeefp.h
./usr/include/sparc64
@@ -212,16 +212,16 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sparc64-unknown-openbsd3.9/3.3.5
-./usr/lib/gcc-lib/sparc64-unknown-openbsd3.9/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/sparc64-unknown-openbsd3.9/3.3.5/cc1obj
-./usr/lib/gcc-lib/sparc64-unknown-openbsd3.9/3.3.5/cc1plus
-./usr/lib/gcc-lib/sparc64-unknown-openbsd3.9/3.3.5/collect2
-./usr/lib/gcc-lib/sparc64-unknown-openbsd3.9/3.3.5/f771
-./usr/lib/gcc-lib/sparc64-unknown-openbsd3.9/3.3.5/include
-./usr/lib/gcc-lib/sparc64-unknown-openbsd3.9/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/sparc64-unknown-openbsd3.9/3.3.5/libgcc.a
-./usr/lib/gcc-lib/sparc64-unknown-openbsd3.9/3.3.5/specs
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.0/3.3.5
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.0/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.0/3.3.5/cc1obj
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.0/3.3.5/cc1plus
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.0/3.3.5/collect2
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.0/3.3.5/f771
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.0/3.3.5/include
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.0/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.0/3.3.5/libgcc.a
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.0/3.3.5/specs
./usr/lib/libasn1_pic.a
./usr/lib/libbfd.a
./usr/lib/libbfd.la
diff --git a/distrib/sets/lists/comp/md.vax b/distrib/sets/lists/comp/md.vax
index 493311af3a9..711133e7cd8 100644
--- a/distrib/sets/lists/comp/md.vax
+++ b/distrib/sets/lists/comp/md.vax
@@ -164,18 +164,18 @@
./usr/include/vax/varargs.h
./usr/include/vax/vmparam.h
./usr/include/vax/vsbus.h
-./usr/lib/gcc-lib/vax-unknown-openbsd3.9/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/vax-unknown-openbsd3.9/2.95.3/cc1obj
-./usr/lib/gcc-lib/vax-unknown-openbsd3.9/2.95.3/cc1plus
-./usr/lib/gcc-lib/vax-unknown-openbsd3.9/2.95.3/f771
-./usr/lib/gcc-lib/vax-unknown-openbsd3.9/2.95.3/include/README
-./usr/lib/gcc-lib/vax-unknown-openbsd3.9/2.95.3/include/exception
-./usr/lib/gcc-lib/vax-unknown-openbsd3.9/2.95.3/include/float.h
-./usr/lib/gcc-lib/vax-unknown-openbsd3.9/2.95.3/include/limits.h
-./usr/lib/gcc-lib/vax-unknown-openbsd3.9/2.95.3/include/new
-./usr/lib/gcc-lib/vax-unknown-openbsd3.9/2.95.3/include/new.h
-./usr/lib/gcc-lib/vax-unknown-openbsd3.9/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/vax-unknown-openbsd3.9/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/vax-unknown-openbsd3.9/2.95.3/libgcc.a
+./usr/lib/gcc-lib/vax-unknown-openbsd4.0/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/vax-unknown-openbsd4.0/2.95.3/cc1obj
+./usr/lib/gcc-lib/vax-unknown-openbsd4.0/2.95.3/cc1plus
+./usr/lib/gcc-lib/vax-unknown-openbsd4.0/2.95.3/f771
+./usr/lib/gcc-lib/vax-unknown-openbsd4.0/2.95.3/include/README
+./usr/lib/gcc-lib/vax-unknown-openbsd4.0/2.95.3/include/exception
+./usr/lib/gcc-lib/vax-unknown-openbsd4.0/2.95.3/include/float.h
+./usr/lib/gcc-lib/vax-unknown-openbsd4.0/2.95.3/include/limits.h
+./usr/lib/gcc-lib/vax-unknown-openbsd4.0/2.95.3/include/new
+./usr/lib/gcc-lib/vax-unknown-openbsd4.0/2.95.3/include/new.h
+./usr/lib/gcc-lib/vax-unknown-openbsd4.0/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/vax-unknown-openbsd4.0/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/vax-unknown-openbsd4.0/2.95.3/libgcc.a
./usr/lib/libstdc++_p.a
./usr/lib/scrt0.o
diff --git a/distrib/sets/lists/comp/md.zaurus b/distrib/sets/lists/comp/md.zaurus
index 5b88db62f9a..60904306ec9 100644
--- a/distrib/sets/lists/comp/md.zaurus
+++ b/distrib/sets/lists/comp/md.zaurus
@@ -53,24 +53,24 @@
./usr/include/bfd.h
./usr/include/bfdlink.h
./usr/include/dis-asm.h
-./usr/include/g++/arm-unknown-openbsd3.9
-./usr/include/g++/arm-unknown-openbsd3.9/bits
-./usr/include/g++/arm-unknown-openbsd3.9/bits/atomicity.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/basic_file.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/c++config.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/c++io.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/c++locale.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/codecvt_specializations.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/ctype_base.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/ctype_inline.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/ctype_noninline.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/gthr-default.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/gthr-posix.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/gthr-single.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/gthr.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/messages_members.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/os_defines.h
-./usr/include/g++/arm-unknown-openbsd3.9/bits/time_members.h
+./usr/include/g++/arm-unknown-openbsd4.0
+./usr/include/g++/arm-unknown-openbsd4.0/bits
+./usr/include/g++/arm-unknown-openbsd4.0/bits/atomicity.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/basic_file.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/c++config.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/c++io.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/c++locale.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/codecvt_specializations.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/ctype_base.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/ctype_inline.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/ctype_noninline.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/gthr-default.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/gthr-posix.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/gthr-single.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/gthr.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/messages_members.h
+./usr/include/g++/arm-unknown-openbsd4.0/bits/os_defines.h
+./usr/include/g++/arm-unknown-openbsd4.0/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-openbsd3.9/3.3.5/include
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/libgcc.a
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/3.3.5/include
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/arm-unknown-openbsd4.0/3.3.5/libgcc.a
./usr/lib/libarm.a
./usr/lib/libarm_p.a
./usr/lib/libasn1_pic.a