summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--distrib/sets/lists/base/md.alpha48
-rw-r--r--distrib/sets/lists/base/md.amd6446
-rw-r--r--distrib/sets/lists/base/md.armish54
-rw-r--r--distrib/sets/lists/base/md.aviion14
-rw-r--r--distrib/sets/lists/base/md.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.landisk36
-rw-r--r--distrib/sets/lists/base/md.luna88k14
-rw-r--r--distrib/sets/lists/base/md.mac68k14
-rw-r--r--distrib/sets/lists/base/md.macppc48
-rw-r--r--distrib/sets/lists/base/md.mvme68k14
-rw-r--r--distrib/sets/lists/base/md.mvme88k14
-rw-r--r--distrib/sets/lists/base/md.mvmeppc14
-rw-r--r--distrib/sets/lists/base/md.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.alpha48
-rw-r--r--distrib/sets/lists/comp/md.amd6462
-rw-r--r--distrib/sets/lists/comp/md.armish42
-rw-r--r--distrib/sets/lists/comp/md.aviion26
-rw-r--r--distrib/sets/lists/comp/md.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.landisk60
-rw-r--r--distrib/sets/lists/comp/md.luna88k26
-rw-r--r--distrib/sets/lists/comp/md.mac68k34
-rw-r--r--distrib/sets/lists/comp/md.macppc58
-rw-r--r--distrib/sets/lists/comp/md.mvme68k34
-rw-r--r--distrib/sets/lists/comp/md.mvme88k26
-rw-r--r--distrib/sets/lists/comp/md.mvmeppc30
-rw-r--r--distrib/sets/lists/comp/md.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
42 files changed, 791 insertions, 791 deletions
diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 6411e82e7f4..3ac05f76929 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -67,12 +67,12 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.1
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.1/3.3.5
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.1/3.3.5/cc1
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.1/3.3.5/collect2
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.1/3.3.5/include
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.1/3.3.5/specs
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.2
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.2/3.3.5
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.2/3.3.5/cc1
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.2/3.3.5/collect2
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.2/3.3.5/include
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.2/3.3.5/specs
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.41.0
./usr/lib/libcom_err.so.16.0
@@ -1522,24 +1522,24 @@
./usr/libdata/perl5/site_perl/alpha-openbsd/ftw.ph
./usr/libdata/perl5/site_perl/alpha-openbsd/g++
./usr/libdata/perl5/site_perl/alpha-openbsd/g++/FlexLexer.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.1
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.1/bits
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.1/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.1/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.1/bits/c++config.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.1/bits/c++io.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.1/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.1/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.1/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.1/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.1/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.1/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.1/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.1/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.1/bits/gthr.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.1/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.1/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.1/bits/time_members.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.2
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.2/bits
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.2/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.2/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.2/bits/c++config.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.2/bits/c++io.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.2/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.2/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.2/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.2/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.2/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.2/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.2/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.2/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.2/bits/gthr.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.2/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.2/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/g++/alpha-unknown-openbsd4.2/bits/time_members.ph
./usr/libdata/perl5/site_perl/alpha-openbsd/g++/backward
./usr/libdata/perl5/site_perl/alpha-openbsd/g++/backward/algo.ph
./usr/libdata/perl5/site_perl/alpha-openbsd/g++/backward/algobase.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 43e30243967..c38046e9ebe 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -70,11 +70,11 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.1
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.1/3.3.5
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.1/3.3.5/cc1
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.1/3.3.5/collect2
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.1/3.3.5/specs
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.2
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.2/3.3.5
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.2/3.3.5/cc1
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.2/3.3.5/collect2
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.2/3.3.5/specs
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.41.0
./usr/lib/libcom_err.so.16.0
@@ -1544,24 +1544,24 @@
./usr/libdata/perl5/site_perl/amd64-openbsd/ftw.ph
./usr/libdata/perl5/site_perl/amd64-openbsd/g++
./usr/libdata/perl5/site_perl/amd64-openbsd/g++/FlexLexer.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.1
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.1/bits
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.1/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.1/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.1/bits/c++config.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.1/bits/c++io.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.1/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.1/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.1/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.1/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.1/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.1/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.1/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.1/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.1/bits/gthr.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.1/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.1/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.1/bits/time_members.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.2
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.2/bits
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.2/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.2/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.2/bits/c++config.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.2/bits/c++io.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.2/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.2/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.2/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.2/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.2/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.2/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.2/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.2/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.2/bits/gthr.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.2/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.2/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd4.2/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 37e846a9417..713c414b868 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -46,15 +46,15 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5/cc1
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5/cc1obj
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5/cc1plus
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5/collect2
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5/f771
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5/specs
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/3.3.5
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/3.3.5/cc1
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/3.3.5/cc1obj
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/3.3.5/cc1plus
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/3.3.5/collect2
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/3.3.5/f771
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/3.3.5/specs
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.41.0
./usr/lib/libcom_err.so.16.0
@@ -1547,24 +1547,24 @@
./usr/libdata/perl5/site_perl/arm-openbsd/ftw.ph
./usr/libdata/perl5/site_perl/arm-openbsd/g++
./usr/libdata/perl5/site_perl/arm-openbsd/g++/FlexLexer.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/c++config.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/c++io.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/gthr.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/time_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/c++config.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/c++io.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/gthr.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/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 effb9d9dded..c8035df929b 100644
--- a/distrib/sets/lists/base/md.aviion
+++ b/distrib/sets/lists/base/md.aviion
@@ -1,10 +1,10 @@
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/cc1
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/collect2
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/cpp0
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/include
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/specs
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/cc1
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/collect2
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/cpp0
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/include
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/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 1625ea607f0..78c466b322b 100644
--- a/distrib/sets/lists/base/md.cats
+++ b/distrib/sets/lists/base/md.cats
@@ -62,15 +62,15 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5/cc1
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5/cc1obj
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5/cc1plus
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5/collect2
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5/f771
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5/specs
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/3.3.5
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/3.3.5/cc1
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/3.3.5/cc1obj
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/3.3.5/cc1plus
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/3.3.5/collect2
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/3.3.5/f771
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/3.3.5/specs
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.41.0
./usr/lib/libcom_err.so.16.0
@@ -1561,24 +1561,24 @@
./usr/libdata/perl5/site_perl/arm-openbsd/ftw.ph
./usr/libdata/perl5/site_perl/arm-openbsd/g++
./usr/libdata/perl5/site_perl/arm-openbsd/g++/FlexLexer.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/c++config.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/c++io.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/gthr.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/time_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/c++config.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/c++io.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/gthr.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/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 4b847ee4fc6..45d7d2a978e 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -20,13 +20,13 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/cc1
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/collect2
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/cpp0
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/include
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/specs
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/cc1
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/collect2
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/cpp0
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/include
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/specs
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.41.0
./usr/lib/libcom_err.so.16.0
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 6931d4b7fd9..ae9150c0b8c 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -68,11 +68,11 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.1
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.1/3.3.5
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.1/3.3.5/cc1
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.1/3.3.5/collect2
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.1/3.3.5/specs
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.2
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.2/3.3.5
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.2/3.3.5/cc1
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.2/3.3.5/collect2
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.2/3.3.5/specs
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.41.0
./usr/lib/libcom_err.so.16.0
@@ -1569,24 +1569,24 @@
./usr/libdata/perl5/site_perl/hppa-openbsd/g++/ext/stl_hash_fun.ph
./usr/libdata/perl5/site_perl/hppa-openbsd/g++/ext/stl_hashtable.ph
./usr/libdata/perl5/site_perl/hppa-openbsd/g++/ext/stl_rope.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.1
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.1/bits
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.1/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.1/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.1/bits/c++config.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.1/bits/c++io.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.1/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.1/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.1/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.1/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.1/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.1/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.1/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.1/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.1/bits/gthr.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.1/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.1/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.1/bits/time_members.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.2
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.2/bits
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.2/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.2/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.2/bits/c++config.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.2/bits/c++io.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.2/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.2/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.2/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.2/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.2/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.2/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.2/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.2/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.2/bits/gthr.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.2/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.2/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd4.2/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 2c1aedeffcd..781dbb4ab81 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -66,11 +66,11 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.1
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.1/3.3.5
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.1/3.3.5/cc1
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.1/3.3.5/collect2
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.1/3.3.5/specs
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.2
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.2/3.3.5
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.2/3.3.5/cc1
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.2/3.3.5/collect2
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.2/3.3.5/specs
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.41.0
./usr/lib/libcom_err.so.16.0
@@ -1567,24 +1567,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-openbsd4.1
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.1/bits
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.1/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.1/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.1/bits/c++config.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.1/bits/c++io.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.1/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.1/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.1/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.1/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.1/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.1/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.1/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.1/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.1/bits/gthr.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.1/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.1/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.1/bits/time_members.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.2
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.2/bits
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.2/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.2/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.2/bits/c++config.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.2/bits/c++io.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.2/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.2/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.2/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.2/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.2/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.2/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.2/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.2/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.2/bits/gthr.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.2/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.2/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd4.2/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 feb75e1e93c..a62d8f9088a 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -76,12 +76,12 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/i386-unknown-openbsd4.1
-./usr/lib/gcc-lib/i386-unknown-openbsd4.1/3.3.5
-./usr/lib/gcc-lib/i386-unknown-openbsd4.1/3.3.5/cc1
-./usr/lib/gcc-lib/i386-unknown-openbsd4.1/3.3.5/collect2
-./usr/lib/gcc-lib/i386-unknown-openbsd4.1/3.3.5/include
-./usr/lib/gcc-lib/i386-unknown-openbsd4.1/3.3.5/specs
+./usr/lib/gcc-lib/i386-unknown-openbsd4.2
+./usr/lib/gcc-lib/i386-unknown-openbsd4.2/3.3.5
+./usr/lib/gcc-lib/i386-unknown-openbsd4.2/3.3.5/cc1
+./usr/lib/gcc-lib/i386-unknown-openbsd4.2/3.3.5/collect2
+./usr/lib/gcc-lib/i386-unknown-openbsd4.2/3.3.5/include
+./usr/lib/gcc-lib/i386-unknown-openbsd4.2/3.3.5/specs
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.41.0
./usr/lib/libcom_err.so.16.0
@@ -1579,24 +1579,24 @@
./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/stl_hash_fun.ph
./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/stl_hashtable.ph
./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/stl_rope.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.1
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.1/bits
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.1/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.1/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.1/bits/c++config.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.1/bits/c++io.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.1/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.1/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.1/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.1/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.1/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.1/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.1/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.1/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.1/bits/gthr.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.1/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.1/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.1/bits/time_members.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.2
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.2/bits
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.2/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.2/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.2/bits/c++config.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.2/bits/c++io.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.2/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.2/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.2/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.2/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.2/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.2/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.2/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.2/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.2/bits/gthr.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.2/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.2/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd4.2/bits/time_members.ph
./usr/libdata/perl5/site_perl/i386-openbsd/g2c.ph
./usr/libdata/perl5/site_perl/i386-openbsd/getopt.ph
./usr/libdata/perl5/site_perl/i386-openbsd/glob.ph
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index 0389141a235..655de5f58f3 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -1470,24 +1470,24 @@
./usr/libdata/perl5/site_perl/sh-openbsd/g++/ext/stl_hash_fun.ph
./usr/libdata/perl5/site_perl/sh-openbsd/g++/ext/stl_hashtable.ph
./usr/libdata/perl5/site_perl/sh-openbsd/g++/ext/stl_rope.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.1
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.1/bits
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.1/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.1/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.1/bits/c++config.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.1/bits/c++io.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.1/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.1/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.1/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.1/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.1/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.1/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.1/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.1/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.1/bits/gthr.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.1/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.1/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.1/bits/time_members.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.2
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.2/bits
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.2/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.2/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.2/bits/c++config.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.2/bits/c++io.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.2/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.2/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.2/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.2/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.2/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.2/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.2/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.2/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.2/bits/gthr.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.2/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.2/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/g++/sh-unknown-openbsd4.2/bits/time_members.ph
./usr/libdata/perl5/site_perl/sh-openbsd/g2c.ph
./usr/libdata/perl5/site_perl/sh-openbsd/getopt.ph
./usr/libdata/perl5/site_perl/sh-openbsd/glob.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index d4f48467354..5f10ed58aac 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -1,11 +1,11 @@
./sbin/wsconsctl
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/cc1
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/collect2
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/cpp0
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/include
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/specs
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/cc1
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/collect2
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/cpp0
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/include
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/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 5f0926a3912..131caaf11f2 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -21,13 +21,13 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/cc1
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/collect2
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/cpp0
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/include
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/specs
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/cc1
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/collect2
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/cpp0
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/include
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/specs
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.41.0
./usr/lib/libcom_err.so.16.0
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index f9255abd0d4..6732362c22b 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -71,12 +71,12 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/3.3.5
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/3.3.5/cc1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/3.3.5/collect2
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/3.3.5/include
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/3.3.5/specs
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/3.3.5
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/3.3.5/cc1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/3.3.5/collect2
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/3.3.5/include
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/3.3.5/specs
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.41.0
./usr/lib/libcom_err.so.16.0
@@ -1574,24 +1574,24 @@
./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/ext/stl_hash_fun.ph
./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/ext/stl_hashtable.ph
./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/ext/stl_rope.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.1
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.1/bits
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.1/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.1/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.1/bits/c++config.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.1/bits/c++io.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.1/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.1/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.1/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.1/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.1/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.1/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.1/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.1/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.1/bits/gthr.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.1/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.1/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.1/bits/time_members.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.2
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.2/bits
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.2/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.2/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.2/bits/c++config.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.2/bits/c++io.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.2/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.2/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.2/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.2/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.2/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.2/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.2/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.2/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.2/bits/gthr.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.2/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.2/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd4.2/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 5c17cc8ac4d..bd1dd856db6 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -18,13 +18,13 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/cc1
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/collect2
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/cpp0
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/include
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/specs
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/cc1
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/collect2
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/cpp0
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/include
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/specs
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.41.0
./usr/lib/libcom_err.so.16.0
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 96b18ba8828..1a0e1b1a2ef 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -1,10 +1,10 @@
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/cc1
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/collect2
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/cpp0
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/include
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/specs
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/cc1
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/collect2
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/cpp0
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/include
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/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 20e612405dc..b3fecff0887 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -53,13 +53,13 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/2.95.3
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/2.95.3/cc1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/2.95.3/collect2
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/2.95.3/cpp0
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/2.95.3/include
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/2.95.3/specs
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/2.95.3
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/2.95.3/cc1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/2.95.3/collect2
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/2.95.3/cpp0
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/2.95.3/include
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/2.95.3/specs
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.41.0
./usr/lib/libcom_err.so.16.0
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index fcf2aacc761..dea1ae51212 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -69,13 +69,13 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.1
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.1/3.3.5
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.1/3.3.5/cc1
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.1/3.3.5/collect2
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.1/3.3.5/f771
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.1/3.3.5/include
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.1/3.3.5/specs
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.2
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.2/3.3.5
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.2/3.3.5/cc1
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.2/3.3.5/collect2
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.2/3.3.5/f771
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.2/3.3.5/include
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.2/3.3.5/specs
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.41.0
./usr/lib/libcom_err.so.16.0
@@ -1573,24 +1573,24 @@
./usr/libdata/perl5/site_perl/mips64-openbsd/g++/ext/stl_hash_fun.ph
./usr/libdata/perl5/site_perl/mips64-openbsd/g++/ext/stl_hashtable.ph
./usr/libdata/perl5/site_perl/mips64-openbsd/g++/ext/stl_rope.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.1
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.1/bits
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.1/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.1/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.1/bits/c++config.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.1/bits/c++io.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.1/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.1/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.1/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.1/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.1/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.1/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.1/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.1/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.1/bits/gthr.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.1/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.1/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.1/bits/time_members.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.2
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.2/bits
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.2/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.2/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.2/bits/c++config.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.2/bits/c++io.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.2/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.2/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.2/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.2/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.2/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.2/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.2/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.2/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.2/bits/gthr.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.2/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.2/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd4.2/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 7d40d728e67..9cb0f19774e 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-openbsd4.1
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.1/2.95.3
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.1/2.95.3/cc1
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.1/2.95.3/collect2
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.1/2.95.3/cpp0
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.1/2.95.3/include
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.1/2.95.3/specs
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.2
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.2/2.95.3
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.2/2.95.3/cc1
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.2/2.95.3/collect2
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.2/2.95.3/cpp0
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.2/2.95.3/include
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.2/2.95.3/specs
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.41.0
./usr/lib/libcom_err.so.16.0
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index d368495daa6..30bdb05b57f 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -68,8 +68,8 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.1
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.1/3.3.5/cc1
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.2
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.2/3.3.5/cc1
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.41.0
./usr/lib/libcom_err.so.16.0
@@ -1058,24 +1058,24 @@
./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/ext/stl_hash_fun.ph
./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/ext/stl_hashtable.ph
./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/ext/stl_rope.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.1
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.1/bits
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.1/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.1/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.1/bits/c++config.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.1/bits/c++io.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.1/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.1/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.1/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.1/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.1/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.1/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.1/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.1/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.1/bits/gthr.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.1/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.1/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.1/bits/time_members.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.2
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.2/bits
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.2/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.2/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.2/bits/c++config.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.2/bits/c++io.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.2/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.2/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.2/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.2/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.2/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.2/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.2/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.2/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.2/bits/gthr.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.2/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.2/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd4.2/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 3c4ab6e7821..5a53b5e7b53 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -1,13 +1,13 @@
./pcs750.bin
./sbin/kbd
./sbin/wsconsctl
-./usr/lib/gcc-lib/vax-unknown-openbsd4.1
-./usr/lib/gcc-lib/vax-unknown-openbsd4.1/2.95.3
-./usr/lib/gcc-lib/vax-unknown-openbsd4.1/2.95.3/cc1
-./usr/lib/gcc-lib/vax-unknown-openbsd4.1/2.95.3/collect2
-./usr/lib/gcc-lib/vax-unknown-openbsd4.1/2.95.3/cpp0
-./usr/lib/gcc-lib/vax-unknown-openbsd4.1/2.95.3/include
-./usr/lib/gcc-lib/vax-unknown-openbsd4.1/2.95.3/specs
+./usr/lib/gcc-lib/vax-unknown-openbsd4.2
+./usr/lib/gcc-lib/vax-unknown-openbsd4.2/2.95.3
+./usr/lib/gcc-lib/vax-unknown-openbsd4.2/2.95.3/cc1
+./usr/lib/gcc-lib/vax-unknown-openbsd4.2/2.95.3/collect2
+./usr/lib/gcc-lib/vax-unknown-openbsd4.2/2.95.3/cpp0
+./usr/lib/gcc-lib/vax-unknown-openbsd4.2/2.95.3/include
+./usr/lib/gcc-lib/vax-unknown-openbsd4.2/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 c0654f567c7..cd12ee6bdb3 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -46,15 +46,15 @@
./usr/lib/apache/modules/mod_unique_id.so
./usr/lib/apache/modules/mod_usertrack.so
./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5/cc1
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5/cc1obj
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5/cc1plus
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5/collect2
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5/f771
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5/specs
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/3.3.5
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/3.3.5/cc1
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/3.3.5/cc1obj
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/3.3.5/cc1plus
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/3.3.5/collect2
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/3.3.5/f771
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/3.3.5/specs
./usr/lib/libasn1.so.16.0
./usr/lib/libc.so.41.0
./usr/lib/libcom_err.so.16.0
@@ -1503,24 +1503,24 @@
./usr/libdata/perl5/site_perl/arm-openbsd/ftw.ph
./usr/libdata/perl5/site_perl/arm-openbsd/g++
./usr/libdata/perl5/site_perl/arm-openbsd/g++/FlexLexer.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/c++config.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/c++io.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/gthr.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.1/bits/time_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/c++config.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/c++io.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/gthr.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd4.2/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 4d3e47628f1..7e8ce162b84 100644
--- a/distrib/sets/lists/comp/md.alpha
+++ b/distrib/sets/lists/comp/md.alpha
@@ -56,24 +56,24 @@
./usr/include/bfd.h
./usr/include/bfdlink.h
./usr/include/dis-asm.h
-./usr/include/g++/alpha-unknown-openbsd4.1
-./usr/include/g++/alpha-unknown-openbsd4.1/bits
-./usr/include/g++/alpha-unknown-openbsd4.1/bits/atomicity.h
-./usr/include/g++/alpha-unknown-openbsd4.1/bits/basic_file.h
-./usr/include/g++/alpha-unknown-openbsd4.1/bits/c++config.h
-./usr/include/g++/alpha-unknown-openbsd4.1/bits/c++io.h
-./usr/include/g++/alpha-unknown-openbsd4.1/bits/c++locale.h
-./usr/include/g++/alpha-unknown-openbsd4.1/bits/codecvt_specializations.h
-./usr/include/g++/alpha-unknown-openbsd4.1/bits/ctype_base.h
-./usr/include/g++/alpha-unknown-openbsd4.1/bits/ctype_inline.h
-./usr/include/g++/alpha-unknown-openbsd4.1/bits/ctype_noninline.h
-./usr/include/g++/alpha-unknown-openbsd4.1/bits/gthr-default.h
-./usr/include/g++/alpha-unknown-openbsd4.1/bits/gthr-posix.h
-./usr/include/g++/alpha-unknown-openbsd4.1/bits/gthr-single.h
-./usr/include/g++/alpha-unknown-openbsd4.1/bits/gthr.h
-./usr/include/g++/alpha-unknown-openbsd4.1/bits/messages_members.h
-./usr/include/g++/alpha-unknown-openbsd4.1/bits/os_defines.h
-./usr/include/g++/alpha-unknown-openbsd4.1/bits/time_members.h
+./usr/include/g++/alpha-unknown-openbsd4.2
+./usr/include/g++/alpha-unknown-openbsd4.2/bits
+./usr/include/g++/alpha-unknown-openbsd4.2/bits/atomicity.h
+./usr/include/g++/alpha-unknown-openbsd4.2/bits/basic_file.h
+./usr/include/g++/alpha-unknown-openbsd4.2/bits/c++config.h
+./usr/include/g++/alpha-unknown-openbsd4.2/bits/c++io.h
+./usr/include/g++/alpha-unknown-openbsd4.2/bits/c++locale.h
+./usr/include/g++/alpha-unknown-openbsd4.2/bits/codecvt_specializations.h
+./usr/include/g++/alpha-unknown-openbsd4.2/bits/ctype_base.h
+./usr/include/g++/alpha-unknown-openbsd4.2/bits/ctype_inline.h
+./usr/include/g++/alpha-unknown-openbsd4.2/bits/ctype_noninline.h
+./usr/include/g++/alpha-unknown-openbsd4.2/bits/gthr-default.h
+./usr/include/g++/alpha-unknown-openbsd4.2/bits/gthr-posix.h
+./usr/include/g++/alpha-unknown-openbsd4.2/bits/gthr-single.h
+./usr/include/g++/alpha-unknown-openbsd4.2/bits/gthr.h
+./usr/include/g++/alpha-unknown-openbsd4.2/bits/messages_members.h
+./usr/include/g++/alpha-unknown-openbsd4.2/bits/os_defines.h
+./usr/include/g++/alpha-unknown-openbsd4.2/bits/time_members.h
./usr/include/g++/backward
./usr/include/g++/backward/algo.h
./usr/include/g++/backward/algobase.h
@@ -209,12 +209,12 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.1/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.1/3.3.5/cc1obj
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.1/3.3.5/cc1plus
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.1/3.3.5/f771
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.1/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.1/3.3.5/libgcc.a
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.2/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.2/3.3.5/cc1obj
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.2/3.3.5/cc1plus
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.2/3.3.5/f771
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.2/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.2/3.3.5/libgcc.a
./usr/lib/libalpha.a
./usr/lib/libalpha_p.a
./usr/lib/libasn1_pic.a
diff --git a/distrib/sets/lists/comp/md.amd64 b/distrib/sets/lists/comp/md.amd64
index 4570a8de6c6..e8c7873f597 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-openbsd4.1
-./usr/include/g++/amd64-unknown-openbsd4.1/bits
-./usr/include/g++/amd64-unknown-openbsd4.1/bits/atomicity.h
-./usr/include/g++/amd64-unknown-openbsd4.1/bits/basic_file.h
-./usr/include/g++/amd64-unknown-openbsd4.1/bits/c++config.h
-./usr/include/g++/amd64-unknown-openbsd4.1/bits/c++io.h
-./usr/include/g++/amd64-unknown-openbsd4.1/bits/c++locale.h
-./usr/include/g++/amd64-unknown-openbsd4.1/bits/codecvt_specializations.h
-./usr/include/g++/amd64-unknown-openbsd4.1/bits/ctype_base.h
-./usr/include/g++/amd64-unknown-openbsd4.1/bits/ctype_inline.h
-./usr/include/g++/amd64-unknown-openbsd4.1/bits/ctype_noninline.h
-./usr/include/g++/amd64-unknown-openbsd4.1/bits/gthr-default.h
-./usr/include/g++/amd64-unknown-openbsd4.1/bits/gthr-posix.h
-./usr/include/g++/amd64-unknown-openbsd4.1/bits/gthr-single.h
-./usr/include/g++/amd64-unknown-openbsd4.1/bits/gthr.h
-./usr/include/g++/amd64-unknown-openbsd4.1/bits/messages_members.h
-./usr/include/g++/amd64-unknown-openbsd4.1/bits/os_defines.h
-./usr/include/g++/amd64-unknown-openbsd4.1/bits/time_members.h
+./usr/include/g++/amd64-unknown-openbsd4.2
+./usr/include/g++/amd64-unknown-openbsd4.2/bits
+./usr/include/g++/amd64-unknown-openbsd4.2/bits/atomicity.h
+./usr/include/g++/amd64-unknown-openbsd4.2/bits/basic_file.h
+./usr/include/g++/amd64-unknown-openbsd4.2/bits/c++config.h
+./usr/include/g++/amd64-unknown-openbsd4.2/bits/c++io.h
+./usr/include/g++/amd64-unknown-openbsd4.2/bits/c++locale.h
+./usr/include/g++/amd64-unknown-openbsd4.2/bits/codecvt_specializations.h
+./usr/include/g++/amd64-unknown-openbsd4.2/bits/ctype_base.h
+./usr/include/g++/amd64-unknown-openbsd4.2/bits/ctype_inline.h
+./usr/include/g++/amd64-unknown-openbsd4.2/bits/ctype_noninline.h
+./usr/include/g++/amd64-unknown-openbsd4.2/bits/gthr-default.h
+./usr/include/g++/amd64-unknown-openbsd4.2/bits/gthr-posix.h
+./usr/include/g++/amd64-unknown-openbsd4.2/bits/gthr-single.h
+./usr/include/g++/amd64-unknown-openbsd4.2/bits/gthr.h
+./usr/include/g++/amd64-unknown-openbsd4.2/bits/messages_members.h
+./usr/include/g++/amd64-unknown-openbsd4.2/bits/os_defines.h
+./usr/include/g++/amd64-unknown-openbsd4.2/bits/time_members.h
./usr/include/g++/backward
./usr/include/g++/backward/algo.h
./usr/include/g++/backward/algobase.h
@@ -232,19 +232,19 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.1/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.1/3.3.5/cc1obj
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.1/3.3.5/cc1plus
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.1/3.3.5/f771
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.1/3.3.5/fpic
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.1/3.3.5/fpic/libgcc.a
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.1/3.3.5/include
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.1/3.3.5/include/emmintrin.h
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.1/3.3.5/include/mmintrin.h
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.1/3.3.5/include/pmmintrin.h
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.1/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.1/3.3.5/include/xmmintrin.h
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.1/3.3.5/libgcc.a
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.2/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.2/3.3.5/cc1obj
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.2/3.3.5/cc1plus
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.2/3.3.5/f771
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.2/3.3.5/fpic
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.2/3.3.5/fpic/libgcc.a
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.2/3.3.5/include
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.2/3.3.5/include/emmintrin.h
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.2/3.3.5/include/mmintrin.h
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.2/3.3.5/include/pmmintrin.h
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.2/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.2/3.3.5/include/xmmintrin.h
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.2/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 6731285a756..859a668ae05 100644
--- a/distrib/sets/lists/comp/md.armish
+++ b/distrib/sets/lists/comp/md.armish
@@ -100,24 +100,24 @@
./usr/include/bfd.h
./usr/include/bfdlink.h
./usr/include/dis-asm.h
-./usr/include/g++/arm-unknown-openbsd4.1
-./usr/include/g++/arm-unknown-openbsd4.1/bits
-./usr/include/g++/arm-unknown-openbsd4.1/bits/atomicity.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/basic_file.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/c++config.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/c++io.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/c++locale.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/codecvt_specializations.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/ctype_base.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/ctype_inline.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/ctype_noninline.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/gthr-default.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/gthr-posix.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/gthr-single.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/gthr.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/messages_members.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/os_defines.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/time_members.h
+./usr/include/g++/arm-unknown-openbsd4.2
+./usr/include/g++/arm-unknown-openbsd4.2/bits
+./usr/include/g++/arm-unknown-openbsd4.2/bits/atomicity.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/basic_file.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/c++config.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/c++io.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/c++locale.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/codecvt_specializations.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/ctype_base.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/ctype_inline.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/ctype_noninline.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/gthr-default.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/gthr-posix.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/gthr-single.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/gthr.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/messages_members.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/os_defines.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/time_members.h
./usr/include/g++/backward
./usr/include/g++/backward/algo.h
./usr/include/g++/backward/algobase.h
@@ -253,9 +253,9 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5/include
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5/libgcc.a
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/3.3.5/include
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/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 00bfeae7778..22b4e90e108 100644
--- a/distrib/sets/lists/comp/md.aviion
+++ b/distrib/sets/lists/comp/md.aviion
@@ -200,18 +200,18 @@
./usr/include/m88k/va-m88k.h
./usr/include/m88k/varargs.h
./usr/include/m88k/vmparam.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/cc1obj
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/cc1plus
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/f771
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/include/README
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/include/exception
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/include/float.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/include/new
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/include/new.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/cc1obj
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/cc1plus
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/f771
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/include/README
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/include/exception
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/include/float.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/include/new
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/include/new.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/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 9fe627411db..cf7b38d3bd3 100644
--- a/distrib/sets/lists/comp/md.cats
+++ b/distrib/sets/lists/comp/md.cats
@@ -98,24 +98,24 @@
./usr/include/cats/trap.h
./usr/include/cats/vmparam.h
./usr/include/dis-asm.h
-./usr/include/g++/arm-unknown-openbsd4.1
-./usr/include/g++/arm-unknown-openbsd4.1/bits
-./usr/include/g++/arm-unknown-openbsd4.1/bits/atomicity.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/basic_file.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/c++config.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/c++io.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/c++locale.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/codecvt_specializations.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/ctype_base.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/ctype_inline.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/ctype_noninline.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/gthr-default.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/gthr-posix.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/gthr-single.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/gthr.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/messages_members.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/os_defines.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/time_members.h
+./usr/include/g++/arm-unknown-openbsd4.2
+./usr/include/g++/arm-unknown-openbsd4.2/bits
+./usr/include/g++/arm-unknown-openbsd4.2/bits/atomicity.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/basic_file.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/c++config.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/c++io.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/c++locale.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/codecvt_specializations.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/ctype_base.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/ctype_inline.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/ctype_noninline.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/gthr-default.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/gthr-posix.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/gthr-single.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/gthr.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/messages_members.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/os_defines.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/time_members.h
./usr/include/g++/backward
./usr/include/g++/backward/algo.h
./usr/include/g++/backward/algobase.h
@@ -251,9 +251,9 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5/include
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5/libgcc.a
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/3.3.5/include
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/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 092bd6ee358..f8b68b703bf 100644
--- a/distrib/sets/lists/comp/md.hp300
+++ b/distrib/sets/lists/comp/md.hp300
@@ -186,23 +186,23 @@
./usr/include/m68k/trap.h
./usr/include/m68k/varargs.h
./usr/include/m68k/vmparam.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/cc1obj
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/f771
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/fPIC
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/fPIC/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/fpic
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/fpic/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/include/README
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/include/exception
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/include/float.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/include/new
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/include/new.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/cc1obj
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/cc1plus
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/f771
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/fPIC
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/fPIC/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/fpic
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/fpic/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/include/README
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/include/exception
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/include/float.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/include/new
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/include/new.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/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 b492a5ffd60..23c290c98b1 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-openbsd4.1
-./usr/include/g++/hppa-unknown-openbsd4.1/bits
-./usr/include/g++/hppa-unknown-openbsd4.1/bits/atomicity.h
-./usr/include/g++/hppa-unknown-openbsd4.1/bits/basic_file.h
-./usr/include/g++/hppa-unknown-openbsd4.1/bits/c++config.h
-./usr/include/g++/hppa-unknown-openbsd4.1/bits/c++io.h
-./usr/include/g++/hppa-unknown-openbsd4.1/bits/c++locale.h
-./usr/include/g++/hppa-unknown-openbsd4.1/bits/codecvt_specializations.h
-./usr/include/g++/hppa-unknown-openbsd4.1/bits/ctype_base.h
-./usr/include/g++/hppa-unknown-openbsd4.1/bits/ctype_inline.h
-./usr/include/g++/hppa-unknown-openbsd4.1/bits/ctype_noninline.h
-./usr/include/g++/hppa-unknown-openbsd4.1/bits/gthr-default.h
-./usr/include/g++/hppa-unknown-openbsd4.1/bits/gthr-posix.h
-./usr/include/g++/hppa-unknown-openbsd4.1/bits/gthr-single.h
-./usr/include/g++/hppa-unknown-openbsd4.1/bits/gthr.h
-./usr/include/g++/hppa-unknown-openbsd4.1/bits/messages_members.h
-./usr/include/g++/hppa-unknown-openbsd4.1/bits/os_defines.h
-./usr/include/g++/hppa-unknown-openbsd4.1/bits/time_members.h
+./usr/include/g++/hppa-unknown-openbsd4.2
+./usr/include/g++/hppa-unknown-openbsd4.2/bits
+./usr/include/g++/hppa-unknown-openbsd4.2/bits/atomicity.h
+./usr/include/g++/hppa-unknown-openbsd4.2/bits/basic_file.h
+./usr/include/g++/hppa-unknown-openbsd4.2/bits/c++config.h
+./usr/include/g++/hppa-unknown-openbsd4.2/bits/c++io.h
+./usr/include/g++/hppa-unknown-openbsd4.2/bits/c++locale.h
+./usr/include/g++/hppa-unknown-openbsd4.2/bits/codecvt_specializations.h
+./usr/include/g++/hppa-unknown-openbsd4.2/bits/ctype_base.h
+./usr/include/g++/hppa-unknown-openbsd4.2/bits/ctype_inline.h
+./usr/include/g++/hppa-unknown-openbsd4.2/bits/ctype_noninline.h
+./usr/include/g++/hppa-unknown-openbsd4.2/bits/gthr-default.h
+./usr/include/g++/hppa-unknown-openbsd4.2/bits/gthr-posix.h
+./usr/include/g++/hppa-unknown-openbsd4.2/bits/gthr-single.h
+./usr/include/g++/hppa-unknown-openbsd4.2/bits/gthr.h
+./usr/include/g++/hppa-unknown-openbsd4.2/bits/messages_members.h
+./usr/include/g++/hppa-unknown-openbsd4.2/bits/os_defines.h
+./usr/include/g++/hppa-unknown-openbsd4.2/bits/time_members.h
./usr/include/g++/ios
./usr/include/g++/istream
./usr/include/g++/limits
@@ -209,13 +209,13 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.1/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.1/3.3.5/cc1obj
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.1/3.3.5/cc1plus
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.1/3.3.5/f771
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.1/3.3.5/include
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.1/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.1/3.3.5/libgcc.a
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.2/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.2/3.3.5/cc1obj
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.2/3.3.5/cc1plus
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.2/3.3.5/f771
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.2/3.3.5/include
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.2/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.2/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 425353b4d95..ba813f63a17 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-openbsd4.1
-./usr/include/g++/hppa64-unknown-openbsd4.1/bits
-./usr/include/g++/hppa64-unknown-openbsd4.1/bits/atomicity.h
-./usr/include/g++/hppa64-unknown-openbsd4.1/bits/basic_file.h
-./usr/include/g++/hppa64-unknown-openbsd4.1/bits/c++config.h
-./usr/include/g++/hppa64-unknown-openbsd4.1/bits/c++io.h
-./usr/include/g++/hppa64-unknown-openbsd4.1/bits/c++locale.h
-./usr/include/g++/hppa64-unknown-openbsd4.1/bits/codecvt_specializations.h
-./usr/include/g++/hppa64-unknown-openbsd4.1/bits/ctype_base.h
-./usr/include/g++/hppa64-unknown-openbsd4.1/bits/ctype_inline.h
-./usr/include/g++/hppa64-unknown-openbsd4.1/bits/ctype_noninline.h
-./usr/include/g++/hppa64-unknown-openbsd4.1/bits/gthr-default.h
-./usr/include/g++/hppa64-unknown-openbsd4.1/bits/gthr-posix.h
-./usr/include/g++/hppa64-unknown-openbsd4.1/bits/gthr-single.h
-./usr/include/g++/hppa64-unknown-openbsd4.1/bits/gthr.h
-./usr/include/g++/hppa64-unknown-openbsd4.1/bits/messages_members.h
-./usr/include/g++/hppa64-unknown-openbsd4.1/bits/os_defines.h
-./usr/include/g++/hppa64-unknown-openbsd4.1/bits/time_members.h
+./usr/include/g++/hppa64-unknown-openbsd4.2
+./usr/include/g++/hppa64-unknown-openbsd4.2/bits
+./usr/include/g++/hppa64-unknown-openbsd4.2/bits/atomicity.h
+./usr/include/g++/hppa64-unknown-openbsd4.2/bits/basic_file.h
+./usr/include/g++/hppa64-unknown-openbsd4.2/bits/c++config.h
+./usr/include/g++/hppa64-unknown-openbsd4.2/bits/c++io.h
+./usr/include/g++/hppa64-unknown-openbsd4.2/bits/c++locale.h
+./usr/include/g++/hppa64-unknown-openbsd4.2/bits/codecvt_specializations.h
+./usr/include/g++/hppa64-unknown-openbsd4.2/bits/ctype_base.h
+./usr/include/g++/hppa64-unknown-openbsd4.2/bits/ctype_inline.h
+./usr/include/g++/hppa64-unknown-openbsd4.2/bits/ctype_noninline.h
+./usr/include/g++/hppa64-unknown-openbsd4.2/bits/gthr-default.h
+./usr/include/g++/hppa64-unknown-openbsd4.2/bits/gthr-posix.h
+./usr/include/g++/hppa64-unknown-openbsd4.2/bits/gthr-single.h
+./usr/include/g++/hppa64-unknown-openbsd4.2/bits/gthr.h
+./usr/include/g++/hppa64-unknown-openbsd4.2/bits/messages_members.h
+./usr/include/g++/hppa64-unknown-openbsd4.2/bits/os_defines.h
+./usr/include/g++/hppa64-unknown-openbsd4.2/bits/time_members.h
./usr/include/g++/ios
./usr/include/g++/istream
./usr/include/g++/limits
@@ -208,13 +208,13 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.1/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.1/3.3.5/cc1obj
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.1/3.3.5/cc1plus
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.1/3.3.5/f771
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.1/3.3.5/include
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.1/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.1/3.3.5/libgcc.a
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.2/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.2/3.3.5/cc1obj
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.2/3.3.5/cc1plus
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.2/3.3.5/f771
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.2/3.3.5/include
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.2/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.2/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 c643f00607a..514153e84cb 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-openbsd4.1
-./usr/include/g++/i386-unknown-openbsd4.1/bits
-./usr/include/g++/i386-unknown-openbsd4.1/bits/atomicity.h
-./usr/include/g++/i386-unknown-openbsd4.1/bits/basic_file.h
-./usr/include/g++/i386-unknown-openbsd4.1/bits/c++config.h
-./usr/include/g++/i386-unknown-openbsd4.1/bits/c++io.h
-./usr/include/g++/i386-unknown-openbsd4.1/bits/c++locale.h
-./usr/include/g++/i386-unknown-openbsd4.1/bits/codecvt_specializations.h
-./usr/include/g++/i386-unknown-openbsd4.1/bits/ctype_base.h
-./usr/include/g++/i386-unknown-openbsd4.1/bits/ctype_inline.h
-./usr/include/g++/i386-unknown-openbsd4.1/bits/ctype_noninline.h
-./usr/include/g++/i386-unknown-openbsd4.1/bits/gthr-default.h
-./usr/include/g++/i386-unknown-openbsd4.1/bits/gthr-posix.h
-./usr/include/g++/i386-unknown-openbsd4.1/bits/gthr-single.h
-./usr/include/g++/i386-unknown-openbsd4.1/bits/gthr.h
-./usr/include/g++/i386-unknown-openbsd4.1/bits/messages_members.h
-./usr/include/g++/i386-unknown-openbsd4.1/bits/os_defines.h
-./usr/include/g++/i386-unknown-openbsd4.1/bits/time_members.h
+./usr/include/g++/i386-unknown-openbsd4.2
+./usr/include/g++/i386-unknown-openbsd4.2/bits
+./usr/include/g++/i386-unknown-openbsd4.2/bits/atomicity.h
+./usr/include/g++/i386-unknown-openbsd4.2/bits/basic_file.h
+./usr/include/g++/i386-unknown-openbsd4.2/bits/c++config.h
+./usr/include/g++/i386-unknown-openbsd4.2/bits/c++io.h
+./usr/include/g++/i386-unknown-openbsd4.2/bits/c++locale.h
+./usr/include/g++/i386-unknown-openbsd4.2/bits/codecvt_specializations.h
+./usr/include/g++/i386-unknown-openbsd4.2/bits/ctype_base.h
+./usr/include/g++/i386-unknown-openbsd4.2/bits/ctype_inline.h
+./usr/include/g++/i386-unknown-openbsd4.2/bits/ctype_noninline.h
+./usr/include/g++/i386-unknown-openbsd4.2/bits/gthr-default.h
+./usr/include/g++/i386-unknown-openbsd4.2/bits/gthr-posix.h
+./usr/include/g++/i386-unknown-openbsd4.2/bits/gthr-single.h
+./usr/include/g++/i386-unknown-openbsd4.2/bits/gthr.h
+./usr/include/g++/i386-unknown-openbsd4.2/bits/messages_members.h
+./usr/include/g++/i386-unknown-openbsd4.2/bits/os_defines.h
+./usr/include/g++/i386-unknown-openbsd4.2/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-openbsd4.1/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/i386-unknown-openbsd4.1/3.3.5/cc1obj
-./usr/lib/gcc-lib/i386-unknown-openbsd4.1/3.3.5/cc1plus
-./usr/lib/gcc-lib/i386-unknown-openbsd4.1/3.3.5/f771
-./usr/lib/gcc-lib/i386-unknown-openbsd4.1/3.3.5/fpic
-./usr/lib/gcc-lib/i386-unknown-openbsd4.1/3.3.5/fpic/libgcc.a
-./usr/lib/gcc-lib/i386-unknown-openbsd4.1/3.3.5/include/emmintrin.h
-./usr/lib/gcc-lib/i386-unknown-openbsd4.1/3.3.5/include/mmintrin.h
-./usr/lib/gcc-lib/i386-unknown-openbsd4.1/3.3.5/include/pmmintrin.h
-./usr/lib/gcc-lib/i386-unknown-openbsd4.1/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/i386-unknown-openbsd4.1/3.3.5/include/xmmintrin.h
-./usr/lib/gcc-lib/i386-unknown-openbsd4.1/3.3.5/libgcc.a
+./usr/lib/gcc-lib/i386-unknown-openbsd4.2/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/i386-unknown-openbsd4.2/3.3.5/cc1obj
+./usr/lib/gcc-lib/i386-unknown-openbsd4.2/3.3.5/cc1plus
+./usr/lib/gcc-lib/i386-unknown-openbsd4.2/3.3.5/f771
+./usr/lib/gcc-lib/i386-unknown-openbsd4.2/3.3.5/fpic
+./usr/lib/gcc-lib/i386-unknown-openbsd4.2/3.3.5/fpic/libgcc.a
+./usr/lib/gcc-lib/i386-unknown-openbsd4.2/3.3.5/include/emmintrin.h
+./usr/lib/gcc-lib/i386-unknown-openbsd4.2/3.3.5/include/mmintrin.h
+./usr/lib/gcc-lib/i386-unknown-openbsd4.2/3.3.5/include/pmmintrin.h
+./usr/lib/gcc-lib/i386-unknown-openbsd4.2/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/i386-unknown-openbsd4.2/3.3.5/include/xmmintrin.h
+./usr/lib/gcc-lib/i386-unknown-openbsd4.2/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.landisk b/distrib/sets/lists/comp/md.landisk
index f9de0c71df1..1cf892f35e6 100644
--- a/distrib/sets/lists/comp/md.landisk
+++ b/distrib/sets/lists/comp/md.landisk
@@ -133,24 +133,24 @@
./usr/include/g++/limits
./usr/include/g++/locale
./usr/include/g++/ostream
-./usr/include/g++/sh-unknown-openbsd4.1
-./usr/include/g++/sh-unknown-openbsd4.1/bits
-./usr/include/g++/sh-unknown-openbsd4.1/bits/atomicity.h
-./usr/include/g++/sh-unknown-openbsd4.1/bits/basic_file.h
-./usr/include/g++/sh-unknown-openbsd4.1/bits/c++config.h
-./usr/include/g++/sh-unknown-openbsd4.1/bits/c++io.h
-./usr/include/g++/sh-unknown-openbsd4.1/bits/c++locale.h
-./usr/include/g++/sh-unknown-openbsd4.1/bits/codecvt_specializations.h
-./usr/include/g++/sh-unknown-openbsd4.1/bits/ctype_base.h
-./usr/include/g++/sh-unknown-openbsd4.1/bits/ctype_inline.h
-./usr/include/g++/sh-unknown-openbsd4.1/bits/ctype_noninline.h
-./usr/include/g++/sh-unknown-openbsd4.1/bits/gthr-default.h
-./usr/include/g++/sh-unknown-openbsd4.1/bits/gthr-posix.h
-./usr/include/g++/sh-unknown-openbsd4.1/bits/gthr-single.h
-./usr/include/g++/sh-unknown-openbsd4.1/bits/gthr.h
-./usr/include/g++/sh-unknown-openbsd4.1/bits/messages_members.h
-./usr/include/g++/sh-unknown-openbsd4.1/bits/os_defines.h
-./usr/include/g++/sh-unknown-openbsd4.1/bits/time_members.h
+./usr/include/g++/sh-unknown-openbsd4.2
+./usr/include/g++/sh-unknown-openbsd4.2/bits
+./usr/include/g++/sh-unknown-openbsd4.2/bits/atomicity.h
+./usr/include/g++/sh-unknown-openbsd4.2/bits/basic_file.h
+./usr/include/g++/sh-unknown-openbsd4.2/bits/c++config.h
+./usr/include/g++/sh-unknown-openbsd4.2/bits/c++io.h
+./usr/include/g++/sh-unknown-openbsd4.2/bits/c++locale.h
+./usr/include/g++/sh-unknown-openbsd4.2/bits/codecvt_specializations.h
+./usr/include/g++/sh-unknown-openbsd4.2/bits/ctype_base.h
+./usr/include/g++/sh-unknown-openbsd4.2/bits/ctype_inline.h
+./usr/include/g++/sh-unknown-openbsd4.2/bits/ctype_noninline.h
+./usr/include/g++/sh-unknown-openbsd4.2/bits/gthr-default.h
+./usr/include/g++/sh-unknown-openbsd4.2/bits/gthr-posix.h
+./usr/include/g++/sh-unknown-openbsd4.2/bits/gthr-single.h
+./usr/include/g++/sh-unknown-openbsd4.2/bits/gthr.h
+./usr/include/g++/sh-unknown-openbsd4.2/bits/messages_members.h
+./usr/include/g++/sh-unknown-openbsd4.2/bits/os_defines.h
+./usr/include/g++/sh-unknown-openbsd4.2/bits/time_members.h
./usr/include/g++/streambuf
./usr/include/ieeefp.h
./usr/include/landisk
@@ -258,18 +258,18 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sh-unknown-openbsd4.1
-./usr/lib/gcc-lib/sh-unknown-openbsd4.1/3.3.5
-./usr/lib/gcc-lib/sh-unknown-openbsd4.1/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/sh-unknown-openbsd4.1/3.3.5/cc1
-./usr/lib/gcc-lib/sh-unknown-openbsd4.1/3.3.5/cc1obj
-./usr/lib/gcc-lib/sh-unknown-openbsd4.1/3.3.5/cc1plus
-./usr/lib/gcc-lib/sh-unknown-openbsd4.1/3.3.5/collect2
-./usr/lib/gcc-lib/sh-unknown-openbsd4.1/3.3.5/f771
-./usr/lib/gcc-lib/sh-unknown-openbsd4.1/3.3.5/include
-./usr/lib/gcc-lib/sh-unknown-openbsd4.1/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/sh-unknown-openbsd4.1/3.3.5/libgcc.a
-./usr/lib/gcc-lib/sh-unknown-openbsd4.1/3.3.5/specs
+./usr/lib/gcc-lib/sh-unknown-openbsd4.2
+./usr/lib/gcc-lib/sh-unknown-openbsd4.2/3.3.5
+./usr/lib/gcc-lib/sh-unknown-openbsd4.2/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/sh-unknown-openbsd4.2/3.3.5/cc1
+./usr/lib/gcc-lib/sh-unknown-openbsd4.2/3.3.5/cc1obj
+./usr/lib/gcc-lib/sh-unknown-openbsd4.2/3.3.5/cc1plus
+./usr/lib/gcc-lib/sh-unknown-openbsd4.2/3.3.5/collect2
+./usr/lib/gcc-lib/sh-unknown-openbsd4.2/3.3.5/f771
+./usr/lib/gcc-lib/sh-unknown-openbsd4.2/3.3.5/include
+./usr/lib/gcc-lib/sh-unknown-openbsd4.2/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/sh-unknown-openbsd4.2/3.3.5/libgcc.a
+./usr/lib/gcc-lib/sh-unknown-openbsd4.2/3.3.5/specs
./usr/lib/libbfd.a
./usr/lib/libbfd.la
./usr/lib/libopcodes.a
diff --git a/distrib/sets/lists/comp/md.luna88k b/distrib/sets/lists/comp/md.luna88k
index 207ef51308f..92fd8824ad7 100644
--- a/distrib/sets/lists/comp/md.luna88k
+++ b/distrib/sets/lists/comp/md.luna88k
@@ -194,18 +194,18 @@
./usr/include/m88k/va-m88k.h
./usr/include/m88k/varargs.h
./usr/include/m88k/vmparam.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/cc1obj
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/cc1plus
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/f771
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/include/README
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/include/exception
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/include/float.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/include/new
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/include/new.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/cc1obj
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/cc1plus
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/f771
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/include/README
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/include/exception
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/include/float.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/include/new
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/include/new.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/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 564214a752b..efb3c8a027b 100644
--- a/distrib/sets/lists/comp/md.mac68k
+++ b/distrib/sets/lists/comp/md.mac68k
@@ -189,23 +189,23 @@
./usr/include/mac68k/viareg.h
./usr/include/mac68k/vmparam.h
./usr/include/mac68k/z8530var.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/cc1obj
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/f771
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/fPIC
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/fPIC/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/fpic
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/fpic/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/include/README
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/include/exception
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/include/float.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/include/new
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/include/new.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/cc1obj
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/cc1plus
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/f771
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/fPIC
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/fPIC/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/fpic
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/fpic/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/include/README
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/include/exception
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/include/float.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/include/new
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/include/new.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/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 51c3d7d2577..1bf6ecfcde4 100644
--- a/distrib/sets/lists/comp/md.macppc
+++ b/distrib/sets/lists/comp/md.macppc
@@ -133,24 +133,24 @@
./usr/include/g++/limits
./usr/include/g++/locale
./usr/include/g++/ostream
-./usr/include/g++/powerpc-unknown-openbsd4.1
-./usr/include/g++/powerpc-unknown-openbsd4.1/bits
-./usr/include/g++/powerpc-unknown-openbsd4.1/bits/atomicity.h
-./usr/include/g++/powerpc-unknown-openbsd4.1/bits/basic_file.h
-./usr/include/g++/powerpc-unknown-openbsd4.1/bits/c++config.h
-./usr/include/g++/powerpc-unknown-openbsd4.1/bits/c++io.h
-./usr/include/g++/powerpc-unknown-openbsd4.1/bits/c++locale.h
-./usr/include/g++/powerpc-unknown-openbsd4.1/bits/codecvt_specializations.h
-./usr/include/g++/powerpc-unknown-openbsd4.1/bits/ctype_base.h
-./usr/include/g++/powerpc-unknown-openbsd4.1/bits/ctype_inline.h
-./usr/include/g++/powerpc-unknown-openbsd4.1/bits/ctype_noninline.h
-./usr/include/g++/powerpc-unknown-openbsd4.1/bits/gthr-default.h
-./usr/include/g++/powerpc-unknown-openbsd4.1/bits/gthr-posix.h
-./usr/include/g++/powerpc-unknown-openbsd4.1/bits/gthr-single.h
-./usr/include/g++/powerpc-unknown-openbsd4.1/bits/gthr.h
-./usr/include/g++/powerpc-unknown-openbsd4.1/bits/messages_members.h
-./usr/include/g++/powerpc-unknown-openbsd4.1/bits/os_defines.h
-./usr/include/g++/powerpc-unknown-openbsd4.1/bits/time_members.h
+./usr/include/g++/powerpc-unknown-openbsd4.2
+./usr/include/g++/powerpc-unknown-openbsd4.2/bits
+./usr/include/g++/powerpc-unknown-openbsd4.2/bits/atomicity.h
+./usr/include/g++/powerpc-unknown-openbsd4.2/bits/basic_file.h
+./usr/include/g++/powerpc-unknown-openbsd4.2/bits/c++config.h
+./usr/include/g++/powerpc-unknown-openbsd4.2/bits/c++io.h
+./usr/include/g++/powerpc-unknown-openbsd4.2/bits/c++locale.h
+./usr/include/g++/powerpc-unknown-openbsd4.2/bits/codecvt_specializations.h
+./usr/include/g++/powerpc-unknown-openbsd4.2/bits/ctype_base.h
+./usr/include/g++/powerpc-unknown-openbsd4.2/bits/ctype_inline.h
+./usr/include/g++/powerpc-unknown-openbsd4.2/bits/ctype_noninline.h
+./usr/include/g++/powerpc-unknown-openbsd4.2/bits/gthr-default.h
+./usr/include/g++/powerpc-unknown-openbsd4.2/bits/gthr-posix.h
+./usr/include/g++/powerpc-unknown-openbsd4.2/bits/gthr-single.h
+./usr/include/g++/powerpc-unknown-openbsd4.2/bits/gthr.h
+./usr/include/g++/powerpc-unknown-openbsd4.2/bits/messages_members.h
+./usr/include/g++/powerpc-unknown-openbsd4.2/bits/os_defines.h
+./usr/include/g++/powerpc-unknown-openbsd4.2/bits/time_members.h
./usr/include/g++/streambuf
./usr/include/ieeefp.h
./usr/include/macppc
@@ -253,17 +253,17 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/3.3.5/cc1obj
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/3.3.5/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/3.3.5/crtsavres.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/3.3.5/f771
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/3.3.5/include/altivec.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/3.3.5/libgcc.a
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/3.3.5/nof
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/3.3.5/nof/crtsavres.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/3.3.5/nof/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/3.3.5/cc1obj
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/3.3.5/cc1plus
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/3.3.5/crtsavres.o
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/3.3.5/f771
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/3.3.5/include/altivec.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/3.3.5/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/3.3.5/nof
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/3.3.5/nof/crtsavres.o
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/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 66bbac7b6b8..ae44fd669e5 100644
--- a/distrib/sets/lists/comp/md.mvme68k
+++ b/distrib/sets/lists/comp/md.mvme68k
@@ -188,23 +188,23 @@
./usr/include/mvme68k/trap.h
./usr/include/mvme68k/varargs.h
./usr/include/mvme68k/vmparam.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/cc1obj
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/f771
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/fPIC
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/fPIC/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/fpic
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/fpic/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/include/README
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/include/exception
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/include/float.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/include/new
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/include/new.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.1/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/cc1obj
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/cc1plus
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/f771
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/fPIC
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/fPIC/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/fpic
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/fpic/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/include/README
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/include/exception
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/include/float.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/include/new
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/include/new.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.2/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 adfd659cf1b..9a9d4eaf37f 100644
--- a/distrib/sets/lists/comp/md.mvme88k
+++ b/distrib/sets/lists/comp/md.mvme88k
@@ -204,18 +204,18 @@
./usr/include/mvme88k/va-m88k.h
./usr/include/mvme88k/varargs.h
./usr/include/mvme88k/vmparam.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/cc1obj
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/cc1plus
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/f771
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/include/README
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/include/exception
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/include/float.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/include/new
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/include/new.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.1/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/cc1obj
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/cc1plus
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/f771
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/include/README
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/include/exception
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/include/float.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/include/new
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/include/new.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.2/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 df18dd855a5..7cc20738cad 100644
--- a/distrib/sets/lists/comp/md.mvmeppc
+++ b/distrib/sets/lists/comp/md.mvmeppc
@@ -167,21 +167,21 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/2.95.3/cc1obj
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/2.95.3/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/2.95.3/f771
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/2.95.3/include/README
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/2.95.3/include/exception
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/2.95.3/include/float.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/2.95.3/include/limits.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/2.95.3/include/new
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/2.95.3/include/new.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/2.95.3/libgcc.a
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/2.95.3/soft-float
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.1/2.95.3/soft-float/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/2.95.3/cc1obj
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/2.95.3/cc1plus
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/2.95.3/f771
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/2.95.3/include/README
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/2.95.3/include/exception
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/2.95.3/include/float.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/2.95.3/include/limits.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/2.95.3/include/new
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/2.95.3/include/new.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/2.95.3/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/2.95.3/soft-float
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.2/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 9915d001d3a..b80da498910 100644
--- a/distrib/sets/lists/comp/md.sgi
+++ b/distrib/sets/lists/comp/md.sgi
@@ -131,24 +131,24 @@
./usr/include/g++/istream
./usr/include/g++/limits
./usr/include/g++/locale
-./usr/include/g++/mips64-unknown-openbsd4.1
-./usr/include/g++/mips64-unknown-openbsd4.1/bits
-./usr/include/g++/mips64-unknown-openbsd4.1/bits/atomicity.h
-./usr/include/g++/mips64-unknown-openbsd4.1/bits/basic_file.h
-./usr/include/g++/mips64-unknown-openbsd4.1/bits/c++config.h
-./usr/include/g++/mips64-unknown-openbsd4.1/bits/c++io.h
-./usr/include/g++/mips64-unknown-openbsd4.1/bits/c++locale.h
-./usr/include/g++/mips64-unknown-openbsd4.1/bits/codecvt_specializations.h
-./usr/include/g++/mips64-unknown-openbsd4.1/bits/ctype_base.h
-./usr/include/g++/mips64-unknown-openbsd4.1/bits/ctype_inline.h
-./usr/include/g++/mips64-unknown-openbsd4.1/bits/ctype_noninline.h
-./usr/include/g++/mips64-unknown-openbsd4.1/bits/gthr-default.h
-./usr/include/g++/mips64-unknown-openbsd4.1/bits/gthr-posix.h
-./usr/include/g++/mips64-unknown-openbsd4.1/bits/gthr-single.h
-./usr/include/g++/mips64-unknown-openbsd4.1/bits/gthr.h
-./usr/include/g++/mips64-unknown-openbsd4.1/bits/messages_members.h
-./usr/include/g++/mips64-unknown-openbsd4.1/bits/os_defines.h
-./usr/include/g++/mips64-unknown-openbsd4.1/bits/time_members.h
+./usr/include/g++/mips64-unknown-openbsd4.2
+./usr/include/g++/mips64-unknown-openbsd4.2/bits
+./usr/include/g++/mips64-unknown-openbsd4.2/bits/atomicity.h
+./usr/include/g++/mips64-unknown-openbsd4.2/bits/basic_file.h
+./usr/include/g++/mips64-unknown-openbsd4.2/bits/c++config.h
+./usr/include/g++/mips64-unknown-openbsd4.2/bits/c++io.h
+./usr/include/g++/mips64-unknown-openbsd4.2/bits/c++locale.h
+./usr/include/g++/mips64-unknown-openbsd4.2/bits/codecvt_specializations.h
+./usr/include/g++/mips64-unknown-openbsd4.2/bits/ctype_base.h
+./usr/include/g++/mips64-unknown-openbsd4.2/bits/ctype_inline.h
+./usr/include/g++/mips64-unknown-openbsd4.2/bits/ctype_noninline.h
+./usr/include/g++/mips64-unknown-openbsd4.2/bits/gthr-default.h
+./usr/include/g++/mips64-unknown-openbsd4.2/bits/gthr-posix.h
+./usr/include/g++/mips64-unknown-openbsd4.2/bits/gthr-single.h
+./usr/include/g++/mips64-unknown-openbsd4.2/bits/gthr.h
+./usr/include/g++/mips64-unknown-openbsd4.2/bits/messages_members.h
+./usr/include/g++/mips64-unknown-openbsd4.2/bits/os_defines.h
+./usr/include/g++/mips64-unknown-openbsd4.2/bits/time_members.h
./usr/include/g++/ostream
./usr/include/g++/streambuf
./usr/include/ieeefp.h
@@ -245,11 +245,11 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.1/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.1/3.3.5/cc1obj
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.1/3.3.5/cc1plus
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.1/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.1/3.3.5/libgcc.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.2/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.2/3.3.5/cc1obj
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.2/3.3.5/cc1plus
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.2/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.2/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 6cdaff30992..658c83d1500 100644
--- a/distrib/sets/lists/comp/md.sparc
+++ b/distrib/sets/lists/comp/md.sparc
@@ -175,23 +175,23 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.1/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.1/2.95.3/cc1obj
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.1/2.95.3/cc1plus
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.1/2.95.3/f771
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.1/2.95.3/fPIC
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.1/2.95.3/fPIC/libgcc.a
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.1/2.95.3/fpic
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.1/2.95.3/fpic/libgcc.a
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.1/2.95.3/include/README
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.1/2.95.3/include/exception
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.1/2.95.3/include/float.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.1/2.95.3/include/limits.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.1/2.95.3/include/new
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.1/2.95.3/include/new.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.1/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.1/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.1/2.95.3/libgcc.a
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.2/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.2/2.95.3/cc1obj
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.2/2.95.3/cc1plus
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.2/2.95.3/f771
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.2/2.95.3/fPIC
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.2/2.95.3/fPIC/libgcc.a
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.2/2.95.3/fpic
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.2/2.95.3/fpic/libgcc.a
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.2/2.95.3/include/README
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.2/2.95.3/include/exception
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.2/2.95.3/include/float.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.2/2.95.3/include/limits.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.2/2.95.3/include/new
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.2/2.95.3/include/new.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.2/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.2/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.2/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 505f6ecad0d..5fbf20b9a2d 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-openbsd4.1
-./usr/include/g++/sparc64-unknown-openbsd4.1/bits
-./usr/include/g++/sparc64-unknown-openbsd4.1/bits/atomicity.h
-./usr/include/g++/sparc64-unknown-openbsd4.1/bits/basic_file.h
-./usr/include/g++/sparc64-unknown-openbsd4.1/bits/c++config.h
-./usr/include/g++/sparc64-unknown-openbsd4.1/bits/c++io.h
-./usr/include/g++/sparc64-unknown-openbsd4.1/bits/c++locale.h
-./usr/include/g++/sparc64-unknown-openbsd4.1/bits/codecvt_specializations.h
-./usr/include/g++/sparc64-unknown-openbsd4.1/bits/ctype_base.h
-./usr/include/g++/sparc64-unknown-openbsd4.1/bits/ctype_inline.h
-./usr/include/g++/sparc64-unknown-openbsd4.1/bits/ctype_noninline.h
-./usr/include/g++/sparc64-unknown-openbsd4.1/bits/gthr-default.h
-./usr/include/g++/sparc64-unknown-openbsd4.1/bits/gthr-posix.h
-./usr/include/g++/sparc64-unknown-openbsd4.1/bits/gthr-single.h
-./usr/include/g++/sparc64-unknown-openbsd4.1/bits/gthr.h
-./usr/include/g++/sparc64-unknown-openbsd4.1/bits/messages_members.h
-./usr/include/g++/sparc64-unknown-openbsd4.1/bits/os_defines.h
-./usr/include/g++/sparc64-unknown-openbsd4.1/bits/time_members.h
+./usr/include/g++/sparc64-unknown-openbsd4.2
+./usr/include/g++/sparc64-unknown-openbsd4.2/bits
+./usr/include/g++/sparc64-unknown-openbsd4.2/bits/atomicity.h
+./usr/include/g++/sparc64-unknown-openbsd4.2/bits/basic_file.h
+./usr/include/g++/sparc64-unknown-openbsd4.2/bits/c++config.h
+./usr/include/g++/sparc64-unknown-openbsd4.2/bits/c++io.h
+./usr/include/g++/sparc64-unknown-openbsd4.2/bits/c++locale.h
+./usr/include/g++/sparc64-unknown-openbsd4.2/bits/codecvt_specializations.h
+./usr/include/g++/sparc64-unknown-openbsd4.2/bits/ctype_base.h
+./usr/include/g++/sparc64-unknown-openbsd4.2/bits/ctype_inline.h
+./usr/include/g++/sparc64-unknown-openbsd4.2/bits/ctype_noninline.h
+./usr/include/g++/sparc64-unknown-openbsd4.2/bits/gthr-default.h
+./usr/include/g++/sparc64-unknown-openbsd4.2/bits/gthr-posix.h
+./usr/include/g++/sparc64-unknown-openbsd4.2/bits/gthr-single.h
+./usr/include/g++/sparc64-unknown-openbsd4.2/bits/gthr.h
+./usr/include/g++/sparc64-unknown-openbsd4.2/bits/messages_members.h
+./usr/include/g++/sparc64-unknown-openbsd4.2/bits/os_defines.h
+./usr/include/g++/sparc64-unknown-openbsd4.2/bits/time_members.h
./usr/include/g++/streambuf
./usr/include/ieeefp.h
./usr/include/sparc64
@@ -214,16 +214,16 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.1/3.3.5
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.1/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.1/3.3.5/cc1obj
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.1/3.3.5/cc1plus
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.1/3.3.5/collect2
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.1/3.3.5/f771
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.1/3.3.5/include
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.1/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.1/3.3.5/libgcc.a
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.1/3.3.5/specs
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.2/3.3.5
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.2/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.2/3.3.5/cc1obj
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.2/3.3.5/cc1plus
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.2/3.3.5/collect2
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.2/3.3.5/f771
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.2/3.3.5/include
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.2/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.2/3.3.5/libgcc.a
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.2/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 dc2f212fd2f..44050f79041 100644
--- a/distrib/sets/lists/comp/md.vax
+++ b/distrib/sets/lists/comp/md.vax
@@ -167,18 +167,18 @@
./usr/include/vax/varargs.h
./usr/include/vax/vmparam.h
./usr/include/vax/vsbus.h
-./usr/lib/gcc-lib/vax-unknown-openbsd4.1/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/vax-unknown-openbsd4.1/2.95.3/cc1obj
-./usr/lib/gcc-lib/vax-unknown-openbsd4.1/2.95.3/cc1plus
-./usr/lib/gcc-lib/vax-unknown-openbsd4.1/2.95.3/f771
-./usr/lib/gcc-lib/vax-unknown-openbsd4.1/2.95.3/include/README
-./usr/lib/gcc-lib/vax-unknown-openbsd4.1/2.95.3/include/exception
-./usr/lib/gcc-lib/vax-unknown-openbsd4.1/2.95.3/include/float.h
-./usr/lib/gcc-lib/vax-unknown-openbsd4.1/2.95.3/include/limits.h
-./usr/lib/gcc-lib/vax-unknown-openbsd4.1/2.95.3/include/new
-./usr/lib/gcc-lib/vax-unknown-openbsd4.1/2.95.3/include/new.h
-./usr/lib/gcc-lib/vax-unknown-openbsd4.1/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/vax-unknown-openbsd4.1/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/vax-unknown-openbsd4.1/2.95.3/libgcc.a
+./usr/lib/gcc-lib/vax-unknown-openbsd4.2/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/vax-unknown-openbsd4.2/2.95.3/cc1obj
+./usr/lib/gcc-lib/vax-unknown-openbsd4.2/2.95.3/cc1plus
+./usr/lib/gcc-lib/vax-unknown-openbsd4.2/2.95.3/f771
+./usr/lib/gcc-lib/vax-unknown-openbsd4.2/2.95.3/include/README
+./usr/lib/gcc-lib/vax-unknown-openbsd4.2/2.95.3/include/exception
+./usr/lib/gcc-lib/vax-unknown-openbsd4.2/2.95.3/include/float.h
+./usr/lib/gcc-lib/vax-unknown-openbsd4.2/2.95.3/include/limits.h
+./usr/lib/gcc-lib/vax-unknown-openbsd4.2/2.95.3/include/new
+./usr/lib/gcc-lib/vax-unknown-openbsd4.2/2.95.3/include/new.h
+./usr/lib/gcc-lib/vax-unknown-openbsd4.2/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/vax-unknown-openbsd4.2/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/vax-unknown-openbsd4.2/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 020099839d8..f52a33dbfb2 100644
--- a/distrib/sets/lists/comp/md.zaurus
+++ b/distrib/sets/lists/comp/md.zaurus
@@ -56,24 +56,24 @@
./usr/include/bfd.h
./usr/include/bfdlink.h
./usr/include/dis-asm.h
-./usr/include/g++/arm-unknown-openbsd4.1
-./usr/include/g++/arm-unknown-openbsd4.1/bits
-./usr/include/g++/arm-unknown-openbsd4.1/bits/atomicity.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/basic_file.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/c++config.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/c++io.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/c++locale.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/codecvt_specializations.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/ctype_base.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/ctype_inline.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/ctype_noninline.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/gthr-default.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/gthr-posix.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/gthr-single.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/gthr.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/messages_members.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/os_defines.h
-./usr/include/g++/arm-unknown-openbsd4.1/bits/time_members.h
+./usr/include/g++/arm-unknown-openbsd4.2
+./usr/include/g++/arm-unknown-openbsd4.2/bits
+./usr/include/g++/arm-unknown-openbsd4.2/bits/atomicity.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/basic_file.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/c++config.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/c++io.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/c++locale.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/codecvt_specializations.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/ctype_base.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/ctype_inline.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/ctype_noninline.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/gthr-default.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/gthr-posix.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/gthr-single.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/gthr.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/messages_members.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/os_defines.h
+./usr/include/g++/arm-unknown-openbsd4.2/bits/time_members.h
./usr/include/g++/backward
./usr/include/g++/backward/algo.h
./usr/include/g++/backward/algobase.h
@@ -254,9 +254,9 @@
./usr/lib/crtbeginS.o
./usr/lib/crtend.o
./usr/lib/crtendS.o
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5/include
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/arm-unknown-openbsd4.1/3.3.5/libgcc.a
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/3.3.5/include
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/arm-unknown-openbsd4.2/3.3.5/libgcc.a
./usr/lib/libarm.a
./usr/lib/libarm_p.a
./usr/lib/libasn1_pic.a