18 files changed, 279 insertions, 279 deletions
diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 5d66cc94e28..ee9cbdb5945 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -58,13 +58,13 @@
 ./usr/lib/apache/modules/mod_unique_id.so
 ./usr/lib/apache/modules/mod_usertrack.so
 ./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.8
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.8/2.95.3
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.8/2.95.3/cc1
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.8/2.95.3/collect2
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.8/2.95.3/cpp0
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.8/2.95.3/include
-./usr/lib/gcc-lib/alpha-unknown-openbsd3.8/2.95.3/specs
+./usr/lib/gcc-lib/alpha-unknown-openbsd3.9
+./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3
+./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/cc1
+./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/collect2
+./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/cpp0
+./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/include
+./usr/lib/gcc-lib/alpha-unknown-openbsd3.9/2.95.3/specs
 ./usr/lib/libasn1.so.15.0
 ./usr/lib/libc.so.39.0
 ./usr/lib/libcom_err.so.15.0
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index fbd746f5bc5..c0798621e2f 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -60,11 +60,11 @@
 ./usr/lib/apache/modules/mod_unique_id.so
 ./usr/lib/apache/modules/mod_usertrack.so
 ./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/amd64-unknown-openbsd3.8
-./usr/lib/gcc-lib/amd64-unknown-openbsd3.8/3.3.5
-./usr/lib/gcc-lib/amd64-unknown-openbsd3.8/3.3.5/cc1
-./usr/lib/gcc-lib/amd64-unknown-openbsd3.8/3.3.5/collect2
-./usr/lib/gcc-lib/amd64-unknown-openbsd3.8/3.3.5/specs
+./usr/lib/gcc-lib/amd64-unknown-openbsd3.9
+./usr/lib/gcc-lib/amd64-unknown-openbsd3.9/3.3.5
+./usr/lib/gcc-lib/amd64-unknown-openbsd3.9/3.3.5/cc1
+./usr/lib/gcc-lib/amd64-unknown-openbsd3.9/3.3.5/collect2
+./usr/lib/gcc-lib/amd64-unknown-openbsd3.9/3.3.5/specs
 ./usr/lib/libasn1.so.15.0
 ./usr/lib/libc.so.39.0
 ./usr/lib/libcom_err.so.15.0
@@ -1491,24 +1491,24 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/ftw.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/g++
 ./usr/libdata/perl5/site_perl/amd64-openbsd/g++/FlexLexer.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.8
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.8/bits
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.8/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.8/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.8/bits/c++config.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.8/bits/c++io.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.8/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.8/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.8/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.8/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.8/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.8/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.8/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.8/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.8/bits/gthr.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.8/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.8/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.8/bits/time_members.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/c++config.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/c++io.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/gthr.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/g++/amd64-unknown-openbsd3.9/bits/time_members.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/g++/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.cats b/distrib/sets/lists/base/md.cats
index 0fd3078596c..3ebfad37a88 100644
--- a/distrib/sets/lists/base/md.cats
+++ b/distrib/sets/lists/base/md.cats
@@ -58,15 +58,15 @@
 ./usr/lib/apache/modules/mod_unique_id.so
 ./usr/lib/apache/modules/mod_usertrack.so
 ./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/arm-unknown-openbsd3.8
-./usr/lib/gcc-lib/arm-unknown-openbsd3.8/3.3.5
-./usr/lib/gcc-lib/arm-unknown-openbsd3.8/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/arm-unknown-openbsd3.8/3.3.5/cc1
-./usr/lib/gcc-lib/arm-unknown-openbsd3.8/3.3.5/cc1obj
-./usr/lib/gcc-lib/arm-unknown-openbsd3.8/3.3.5/cc1plus
-./usr/lib/gcc-lib/arm-unknown-openbsd3.8/3.3.5/collect2
-./usr/lib/gcc-lib/arm-unknown-openbsd3.8/3.3.5/f771
-./usr/lib/gcc-lib/arm-unknown-openbsd3.8/3.3.5/specs
+./usr/lib/gcc-lib/arm-unknown-openbsd3.9
+./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5
+./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/cc1
+./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/cc1obj
+./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/cc1plus
+./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/collect2
+./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/f771
+./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/specs
 ./usr/lib/libasn1.so.15.0
 ./usr/lib/libc.so.39.0
 ./usr/lib/libcom_err.so.15.0
@@ -1519,24 +1519,24 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/ftw.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/g++
 ./usr/libdata/perl5/site_perl/arm-openbsd/g++/FlexLexer.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/c++config.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/c++io.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/gthr.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/time_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/c++config.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/c++io.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/gthr.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/time_members.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/g++/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 ea86e874183..9a1172ace4c 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -20,13 +20,13 @@
 ./usr/lib/apache/modules/mod_unique_id.so
 ./usr/lib/apache/modules/mod_usertrack.so
 ./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.8
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.8/2.95.3
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.8/2.95.3/cc1
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.8/2.95.3/collect2
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.8/2.95.3/cpp0
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.8/2.95.3/include
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.8/2.95.3/specs
+./usr/lib/gcc-lib/m68k-unknown-openbsd3.9
+./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3
+./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/cc1
+./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/collect2
+./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/cpp0
+./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/include
+./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/specs
 ./usr/lib/libasn1.so.15.0
 ./usr/lib/libc.so.39.0
 ./usr/lib/libcom_err.so.15.0
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 494c3d49597..e7bea30a14a 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -60,11 +60,11 @@
 ./usr/lib/apache/modules/mod_unique_id.so
 ./usr/lib/apache/modules/mod_usertrack.so
 ./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.8
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.8/3.3.5
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.8/3.3.5/cc1
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.8/3.3.5/collect2
-./usr/lib/gcc-lib/hppa-unknown-openbsd3.8/3.3.5/specs
+./usr/lib/gcc-lib/hppa-unknown-openbsd3.9
+./usr/lib/gcc-lib/hppa-unknown-openbsd3.9/3.3.5
+./usr/lib/gcc-lib/hppa-unknown-openbsd3.9/3.3.5/cc1
+./usr/lib/gcc-lib/hppa-unknown-openbsd3.9/3.3.5/collect2
+./usr/lib/gcc-lib/hppa-unknown-openbsd3.9/3.3.5/specs
 ./usr/lib/libasn1.so.15.0
 ./usr/lib/libc.so.39.0
 ./usr/lib/libcom_err.so.15.0
@@ -1519,24 +1519,24 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/g++/ext/stl_hash_fun.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/g++/ext/stl_hashtable.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/g++/ext/stl_rope.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.8
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.8/bits
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.8/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.8/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.8/bits/c++config.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.8/bits/c++io.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.8/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.8/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.8/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.8/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.8/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.8/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.8/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.8/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.8/bits/gthr.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.8/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.8/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.8/bits/time_members.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/c++config.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/c++io.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/gthr.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/g++/hppa-unknown-openbsd3.9/bits/time_members.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/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 8315f435047..54c54f86df3 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -60,11 +60,11 @@
 ./usr/lib/apache/modules/mod_unique_id.so
 ./usr/lib/apache/modules/mod_usertrack.so
 ./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/hppa64-unknown-openbsd3.8
-./usr/lib/gcc-lib/hppa64-unknown-openbsd3.8/3.3.5
-./usr/lib/gcc-lib/hppa64-unknown-openbsd3.8/3.3.5/cc1
-./usr/lib/gcc-lib/hppa64-unknown-openbsd3.8/3.3.5/collect2
-./usr/lib/gcc-lib/hppa64-unknown-openbsd3.8/3.3.5/specs
+./usr/lib/gcc-lib/hppa64-unknown-openbsd3.9
+./usr/lib/gcc-lib/hppa64-unknown-openbsd3.9/3.3.5
+./usr/lib/gcc-lib/hppa64-unknown-openbsd3.9/3.3.5/cc1
+./usr/lib/gcc-lib/hppa64-unknown-openbsd3.9/3.3.5/collect2
+./usr/lib/gcc-lib/hppa64-unknown-openbsd3.9/3.3.5/specs
 ./usr/lib/libasn1.so.15.0
 ./usr/lib/libc.so.39.0
 ./usr/lib/libcom_err.so.15.0
@@ -1519,24 +1519,24 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/ext/stl_hash_fun.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/ext/stl_hashtable.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/ext/stl_rope.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.8
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.8/bits
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.8/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.8/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.8/bits/c++config.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.8/bits/c++io.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.8/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.8/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.8/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.8/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.8/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.8/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.8/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.8/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.8/bits/gthr.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.8/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.8/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.8/bits/time_members.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/c++config.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/c++io.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/gthr.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/g++/hppa-unknown-openbsd3.9/bits/time_members.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/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 83f3911edbc..2e4ceb878cf 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -68,12 +68,12 @@
 ./usr/lib/apache/modules/mod_unique_id.so
 ./usr/lib/apache/modules/mod_usertrack.so
 ./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/i386-unknown-openbsd3.8
-./usr/lib/gcc-lib/i386-unknown-openbsd3.8/3.3.5
-./usr/lib/gcc-lib/i386-unknown-openbsd3.8/3.3.5/cc1
-./usr/lib/gcc-lib/i386-unknown-openbsd3.8/3.3.5/collect2
-./usr/lib/gcc-lib/i386-unknown-openbsd3.8/3.3.5/include
-./usr/lib/gcc-lib/i386-unknown-openbsd3.8/3.3.5/specs
+./usr/lib/gcc-lib/i386-unknown-openbsd3.9
+./usr/lib/gcc-lib/i386-unknown-openbsd3.9/3.3.5
+./usr/lib/gcc-lib/i386-unknown-openbsd3.9/3.3.5/cc1
+./usr/lib/gcc-lib/i386-unknown-openbsd3.9/3.3.5/collect2
+./usr/lib/gcc-lib/i386-unknown-openbsd3.9/3.3.5/include
+./usr/lib/gcc-lib/i386-unknown-openbsd3.9/3.3.5/specs
 ./usr/lib/libasn1.so.15.0
 ./usr/lib/libc.so.39.0
 ./usr/lib/libcom_err.so.15.0
@@ -1529,24 +1529,24 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/stl_hash_fun.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/stl_hashtable.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g++/ext/stl_rope.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.8
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.8/bits
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.8/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.8/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.8/bits/c++config.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.8/bits/c++io.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.8/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.8/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.8/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.8/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.8/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.8/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.8/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.8/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.8/bits/gthr.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.8/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.8/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.8/bits/time_members.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/c++config.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/c++io.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/gthr.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/g++/i386-unknown-openbsd3.9/bits/time_members.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/g2c.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/getopt.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/glob.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 2f3fdbafa94..81e9fffaa08 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -1,11 +1,11 @@
 ./sbin/wsconsctl
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.8
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.8/2.95.3
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.8/2.95.3/cc1
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.8/2.95.3/collect2
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.8/2.95.3/cpp0
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.8/2.95.3/include
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.8/2.95.3/specs
+./usr/lib/gcc-lib/m88k-unknown-openbsd3.9
+./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3
+./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/cc1
+./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/collect2
+./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/cpp0
+./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/include
+./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/specs
 ./usr/libdata/perl5/m88k-openbsd
 ./usr/libdata/perl5/m88k-openbsd/5.8.6
 ./usr/libdata/perl5/m88k-openbsd/5.8.6/.packlist
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 72c291f1a2f..69477a25e73 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -19,13 +19,13 @@
 ./usr/lib/apache/modules/mod_unique_id.so
 ./usr/lib/apache/modules/mod_usertrack.so
 ./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.8
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.8/2.95.3
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.8/2.95.3/cc1
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.8/2.95.3/collect2
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.8/2.95.3/cpp0
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.8/2.95.3/include
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.8/2.95.3/specs
+./usr/lib/gcc-lib/m68k-unknown-openbsd3.9
+./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3
+./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/cc1
+./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/collect2
+./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/cpp0
+./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/include
+./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/specs
 ./usr/lib/libasn1.so.15.0
 ./usr/lib/libc.so.39.0
 ./usr/lib/libcom_err.so.15.0
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index aa751799e26..44aacdb8c91 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -64,12 +64,12 @@
 ./usr/lib/apache/modules/mod_unique_id.so
 ./usr/lib/apache/modules/mod_usertrack.so
 ./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.8
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.8/3.3.5
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.8/3.3.5/cc1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.8/3.3.5/collect2
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.8/3.3.5/include
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.8/3.3.5/specs
+./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9
+./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/3.3.5
+./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/3.3.5/cc1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/3.3.5/collect2
+./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/3.3.5/include
+./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/3.3.5/specs
 ./usr/lib/libasn1.so.15.0
 ./usr/lib/libc.so.39.0
 ./usr/lib/libcom_err.so.15.0
@@ -1525,24 +1525,24 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/ext/stl_hash_fun.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/ext/stl_hashtable.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/ext/stl_rope.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.8
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.8/bits
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.8/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.8/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.8/bits/c++config.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.8/bits/c++io.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.8/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.8/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.8/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.8/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.8/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.8/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.8/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.8/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.8/bits/gthr.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.8/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.8/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.8/bits/time_members.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/c++config.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/c++io.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/gthr.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/g++/powerpc-unknown-openbsd3.9/bits/time_members.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/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 5136c915c6e..212e834da3b 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -18,13 +18,13 @@
 ./usr/lib/apache/modules/mod_unique_id.so
 ./usr/lib/apache/modules/mod_usertrack.so
 ./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.8
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.8/2.95.3
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.8/2.95.3/cc1
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.8/2.95.3/collect2
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.8/2.95.3/cpp0
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.8/2.95.3/include
-./usr/lib/gcc-lib/m68k-unknown-openbsd3.8/2.95.3/specs
+./usr/lib/gcc-lib/m68k-unknown-openbsd3.9
+./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3
+./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/cc1
+./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/collect2
+./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/cpp0
+./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/include
+./usr/lib/gcc-lib/m68k-unknown-openbsd3.9/2.95.3/specs
 ./usr/lib/libasn1.so.15.0
 ./usr/lib/libc.so.39.0
 ./usr/lib/libcom_err.so.15.0
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 82a968f36db..1f6d50dbfc2 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -1,10 +1,10 @@
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.8
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.8/2.95.3
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.8/2.95.3/cc1
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.8/2.95.3/collect2
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.8/2.95.3/cpp0
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.8/2.95.3/include
-./usr/lib/gcc-lib/m88k-unknown-openbsd3.8/2.95.3/specs
+./usr/lib/gcc-lib/m88k-unknown-openbsd3.9
+./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3
+./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/cc1
+./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/collect2
+./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/cpp0
+./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/include
+./usr/lib/gcc-lib/m88k-unknown-openbsd3.9/2.95.3/specs
 ./usr/libdata/perl5/m88k-openbsd
 ./usr/libdata/perl5/m88k-openbsd/5.8.6
 ./usr/libdata/perl5/m88k-openbsd/5.8.6/.packlist
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index ad9e059eff0..4dfa53ea5be 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -49,13 +49,13 @@
 ./usr/lib/apache/modules/mod_unique_id.so
 ./usr/lib/apache/modules/mod_usertrack.so
 ./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.8
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.8/2.95.3
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.8/2.95.3/cc1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.8/2.95.3/collect2
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.8/2.95.3/cpp0
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.8/2.95.3/include
-./usr/lib/gcc-lib/powerpc-unknown-openbsd3.8/2.95.3/specs
+./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9
+./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/2.95.3
+./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/2.95.3/cc1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/2.95.3/collect2
+./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/2.95.3/cpp0
+./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/2.95.3/include
+./usr/lib/gcc-lib/powerpc-unknown-openbsd3.9/2.95.3/specs
 ./usr/lib/libasn1.so.15.0
 ./usr/lib/libc.so.39.0
 ./usr/lib/libcom_err.so.15.0
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index c4ec60cb9cc..eb690835671 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -62,13 +62,13 @@
 ./usr/lib/apache/modules/mod_unique_id.so
 ./usr/lib/apache/modules/mod_usertrack.so
 ./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/mips64-unknown-openbsd3.8
-./usr/lib/gcc-lib/mips64-unknown-openbsd3.8/3.3.5
-./usr/lib/gcc-lib/mips64-unknown-openbsd3.8/3.3.5/cc1
-./usr/lib/gcc-lib/mips64-unknown-openbsd3.8/3.3.5/collect2
-./usr/lib/gcc-lib/mips64-unknown-openbsd3.8/3.3.5/f771
-./usr/lib/gcc-lib/mips64-unknown-openbsd3.8/3.3.5/include
-./usr/lib/gcc-lib/mips64-unknown-openbsd3.8/3.3.5/specs
+./usr/lib/gcc-lib/mips64-unknown-openbsd3.9
+./usr/lib/gcc-lib/mips64-unknown-openbsd3.9/3.3.5
+./usr/lib/gcc-lib/mips64-unknown-openbsd3.9/3.3.5/cc1
+./usr/lib/gcc-lib/mips64-unknown-openbsd3.9/3.3.5/collect2
+./usr/lib/gcc-lib/mips64-unknown-openbsd3.9/3.3.5/f771
+./usr/lib/gcc-lib/mips64-unknown-openbsd3.9/3.3.5/include
+./usr/lib/gcc-lib/mips64-unknown-openbsd3.9/3.3.5/specs
 ./usr/lib/libasn1.so.15.0
 ./usr/lib/libc.so.39.0
 ./usr/lib/libcom_err.so.15.0
@@ -1524,24 +1524,24 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/g++/ext/stl_hash_fun.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/g++/ext/stl_hashtable.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/g++/ext/stl_rope.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.8
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.8/bits
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.8/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.8/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.8/bits/c++config.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.8/bits/c++io.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.8/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.8/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.8/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.8/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.8/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.8/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.8/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.8/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.8/bits/gthr.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.8/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.8/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.8/bits/time_members.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/c++config.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/c++io.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/gthr.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/g++/mips64-unknown-openbsd3.9/bits/time_members.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/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 0d78e23d50f..2cadad1ab63 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -24,13 +24,13 @@
 ./usr/lib/apache/modules/mod_unique_id.so
 ./usr/lib/apache/modules/mod_usertrack.so
 ./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/sparc-unknown-openbsd3.8
-./usr/lib/gcc-lib/sparc-unknown-openbsd3.8/2.95.3
-./usr/lib/gcc-lib/sparc-unknown-openbsd3.8/2.95.3/cc1
-./usr/lib/gcc-lib/sparc-unknown-openbsd3.8/2.95.3/collect2
-./usr/lib/gcc-lib/sparc-unknown-openbsd3.8/2.95.3/cpp0
-./usr/lib/gcc-lib/sparc-unknown-openbsd3.8/2.95.3/include
-./usr/lib/gcc-lib/sparc-unknown-openbsd3.8/2.95.3/specs
+./usr/lib/gcc-lib/sparc-unknown-openbsd3.9
+./usr/lib/gcc-lib/sparc-unknown-openbsd3.9/2.95.3
+./usr/lib/gcc-lib/sparc-unknown-openbsd3.9/2.95.3/cc1
+./usr/lib/gcc-lib/sparc-unknown-openbsd3.9/2.95.3/collect2
+./usr/lib/gcc-lib/sparc-unknown-openbsd3.9/2.95.3/cpp0
+./usr/lib/gcc-lib/sparc-unknown-openbsd3.9/2.95.3/include
+./usr/lib/gcc-lib/sparc-unknown-openbsd3.9/2.95.3/specs
 ./usr/lib/libasn1.so.15.0
 ./usr/lib/libc.so.39.0
 ./usr/lib/libcom_err.so.15.0
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 4380fe3e465..a1cc77e6f34 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -60,8 +60,8 @@
 ./usr/lib/apache/modules/mod_unique_id.so
 ./usr/lib/apache/modules/mod_usertrack.so
 ./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/sparc64-unknown-openbsd3.8
-./usr/lib/gcc-lib/sparc64-unknown-openbsd3.8/3.3.5/cc1
+./usr/lib/gcc-lib/sparc64-unknown-openbsd3.9
+./usr/lib/gcc-lib/sparc64-unknown-openbsd3.9/3.3.5/cc1
 ./usr/lib/libasn1.so.15.0
 ./usr/lib/libc.so.39.0
 ./usr/lib/libcom_err.so.15.0
@@ -1009,24 +1009,24 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/ext/stl_hash_fun.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/ext/stl_hashtable.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/ext/stl_rope.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.8
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.8/bits
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.8/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.8/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.8/bits/c++config.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.8/bits/c++io.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.8/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.8/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.8/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.8/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.8/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.8/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.8/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.8/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.8/bits/gthr.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.8/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.8/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.8/bits/time_members.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/c++config.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/c++io.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/gthr.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/g++/sparc64-unknown-openbsd3.9/bits/time_members.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/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 b978f5c22e8..d7c7e031791 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -1,12 +1,12 @@
 ./pcs750.bin
 ./sbin/kbd
-./usr/lib/gcc-lib/vax-unknown-openbsd3.8
-./usr/lib/gcc-lib/vax-unknown-openbsd3.8/2.95.3
-./usr/lib/gcc-lib/vax-unknown-openbsd3.8/2.95.3/cc1
-./usr/lib/gcc-lib/vax-unknown-openbsd3.8/2.95.3/collect2
-./usr/lib/gcc-lib/vax-unknown-openbsd3.8/2.95.3/cpp0
-./usr/lib/gcc-lib/vax-unknown-openbsd3.8/2.95.3/include
-./usr/lib/gcc-lib/vax-unknown-openbsd3.8/2.95.3/specs
+./usr/lib/gcc-lib/vax-unknown-openbsd3.9
+./usr/lib/gcc-lib/vax-unknown-openbsd3.9/2.95.3
+./usr/lib/gcc-lib/vax-unknown-openbsd3.9/2.95.3/cc1
+./usr/lib/gcc-lib/vax-unknown-openbsd3.9/2.95.3/collect2
+./usr/lib/gcc-lib/vax-unknown-openbsd3.9/2.95.3/cpp0
+./usr/lib/gcc-lib/vax-unknown-openbsd3.9/2.95.3/include
+./usr/lib/gcc-lib/vax-unknown-openbsd3.9/2.95.3/specs
 ./usr/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 7fecd82be8b..189da4fc6d9 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -42,15 +42,15 @@
 ./usr/lib/apache/modules/mod_unique_id.so
 ./usr/lib/apache/modules/mod_usertrack.so
 ./usr/lib/apache/modules/mod_vhost_alias.so
-./usr/lib/gcc-lib/arm-unknown-openbsd3.8
-./usr/lib/gcc-lib/arm-unknown-openbsd3.8/3.3.5
-./usr/lib/gcc-lib/arm-unknown-openbsd3.8/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/arm-unknown-openbsd3.8/3.3.5/cc1
-./usr/lib/gcc-lib/arm-unknown-openbsd3.8/3.3.5/cc1obj
-./usr/lib/gcc-lib/arm-unknown-openbsd3.8/3.3.5/cc1plus
-./usr/lib/gcc-lib/arm-unknown-openbsd3.8/3.3.5/collect2
-./usr/lib/gcc-lib/arm-unknown-openbsd3.8/3.3.5/f771
-./usr/lib/gcc-lib/arm-unknown-openbsd3.8/3.3.5/specs
+./usr/lib/gcc-lib/arm-unknown-openbsd3.9
+./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5
+./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/cc1
+./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/cc1obj
+./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/cc1plus
+./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/collect2
+./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/f771
+./usr/lib/gcc-lib/arm-unknown-openbsd3.9/3.3.5/specs
 ./usr/lib/libasn1.so.15.0
 ./usr/lib/libc.so.39.0
 ./usr/lib/libcom_err.so.15.0
@@ -1458,24 +1458,24 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/ftw.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/g++
 ./usr/libdata/perl5/site_perl/arm-openbsd/g++/FlexLexer.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/atomicity.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/basic_file.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/c++config.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/c++io.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/c++locale.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/codecvt_specializations.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/ctype_base.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/ctype_inline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/ctype_noninline.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/gthr-default.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/gthr-posix.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/gthr-single.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/gthr.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/messages_members.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/os_defines.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.8/bits/time_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/atomicity.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/basic_file.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/c++config.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/c++io.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/c++locale.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/codecvt_specializations.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/ctype_base.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/ctype_inline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/ctype_noninline.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/gthr-default.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/gthr-posix.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/gthr-single.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/gthr.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/messages_members.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/os_defines.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/g++/arm-unknown-openbsd3.9/bits/time_members.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/g++/backward
 ./usr/libdata/perl5/site_perl/arm-openbsd/g++/backward/algo.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/g++/backward/algobase.ph