4.6-BETA

21 files changed, 451 insertions, 451 deletions

diff --git a/distrib/sets/lists/comp/md.alpha b/distrib/sets/lists/comp/md.alpha
index ffa8c77a142..d15d9d535cc 100644
--- a/distrib/sets/lists/comp/md.alpha
+++ b/distrib/sets/lists/comp/md.alpha
@@ -54,24 +54,24 @@
 ./usr/include/alpha/tc_machdep.h
 ./usr/include/alpha/varargs.h
 ./usr/include/alpha/vmparam.h
-./usr/include/g++/alpha-unknown-openbsd4.5
-./usr/include/g++/alpha-unknown-openbsd4.5/bits
-./usr/include/g++/alpha-unknown-openbsd4.5/bits/atomicity.h
-./usr/include/g++/alpha-unknown-openbsd4.5/bits/basic_file.h
-./usr/include/g++/alpha-unknown-openbsd4.5/bits/c++config.h
-./usr/include/g++/alpha-unknown-openbsd4.5/bits/c++io.h
-./usr/include/g++/alpha-unknown-openbsd4.5/bits/c++locale.h
-./usr/include/g++/alpha-unknown-openbsd4.5/bits/codecvt_specializations.h
-./usr/include/g++/alpha-unknown-openbsd4.5/bits/ctype_base.h
-./usr/include/g++/alpha-unknown-openbsd4.5/bits/ctype_inline.h
-./usr/include/g++/alpha-unknown-openbsd4.5/bits/ctype_noninline.h
-./usr/include/g++/alpha-unknown-openbsd4.5/bits/gthr-default.h
-./usr/include/g++/alpha-unknown-openbsd4.5/bits/gthr-posix.h
-./usr/include/g++/alpha-unknown-openbsd4.5/bits/gthr-single.h
-./usr/include/g++/alpha-unknown-openbsd4.5/bits/gthr.h
-./usr/include/g++/alpha-unknown-openbsd4.5/bits/messages_members.h
-./usr/include/g++/alpha-unknown-openbsd4.5/bits/os_defines.h
-./usr/include/g++/alpha-unknown-openbsd4.5/bits/time_members.h
+./usr/include/g++/alpha-unknown-openbsd4.6
+./usr/include/g++/alpha-unknown-openbsd4.6/bits
+./usr/include/g++/alpha-unknown-openbsd4.6/bits/atomicity.h
+./usr/include/g++/alpha-unknown-openbsd4.6/bits/basic_file.h
+./usr/include/g++/alpha-unknown-openbsd4.6/bits/c++config.h
+./usr/include/g++/alpha-unknown-openbsd4.6/bits/c++io.h
+./usr/include/g++/alpha-unknown-openbsd4.6/bits/c++locale.h
+./usr/include/g++/alpha-unknown-openbsd4.6/bits/codecvt_specializations.h
+./usr/include/g++/alpha-unknown-openbsd4.6/bits/ctype_base.h
+./usr/include/g++/alpha-unknown-openbsd4.6/bits/ctype_inline.h
+./usr/include/g++/alpha-unknown-openbsd4.6/bits/ctype_noninline.h
+./usr/include/g++/alpha-unknown-openbsd4.6/bits/gthr-default.h
+./usr/include/g++/alpha-unknown-openbsd4.6/bits/gthr-posix.h
+./usr/include/g++/alpha-unknown-openbsd4.6/bits/gthr-single.h
+./usr/include/g++/alpha-unknown-openbsd4.6/bits/gthr.h
+./usr/include/g++/alpha-unknown-openbsd4.6/bits/messages_members.h
+./usr/include/g++/alpha-unknown-openbsd4.6/bits/os_defines.h
+./usr/include/g++/alpha-unknown-openbsd4.6/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -207,12 +207,12 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.5/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.5/3.3.5/cc1obj
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.5/3.3.5/cc1plus
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.5/3.3.5/f771
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.5/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.5/3.3.5/libgcc.a
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.6/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.6/3.3.5/cc1obj
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.6/3.3.5/cc1plus
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.6/3.3.5/f771
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.6/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.6/3.3.5/libgcc.a
 ./usr/lib/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 2d9eb9bafc0..a280dc721ce 100644
--- a/distrib/sets/lists/comp/md.amd64
+++ b/distrib/sets/lists/comp/md.amd64
@@ -76,24 +76,24 @@
 ./usr/include/amd64/vga_post.h
 ./usr/include/amd64/vmparam.h
 ./usr/include/emmintrin.h
-./usr/include/g++/amd64-unknown-openbsd4.5
-./usr/include/g++/amd64-unknown-openbsd4.5/bits
-./usr/include/g++/amd64-unknown-openbsd4.5/bits/atomicity.h
-./usr/include/g++/amd64-unknown-openbsd4.5/bits/basic_file.h
-./usr/include/g++/amd64-unknown-openbsd4.5/bits/c++config.h
-./usr/include/g++/amd64-unknown-openbsd4.5/bits/c++io.h
-./usr/include/g++/amd64-unknown-openbsd4.5/bits/c++locale.h
-./usr/include/g++/amd64-unknown-openbsd4.5/bits/codecvt_specializations.h
-./usr/include/g++/amd64-unknown-openbsd4.5/bits/ctype_base.h
-./usr/include/g++/amd64-unknown-openbsd4.5/bits/ctype_inline.h
-./usr/include/g++/amd64-unknown-openbsd4.5/bits/ctype_noninline.h
-./usr/include/g++/amd64-unknown-openbsd4.5/bits/gthr-default.h
-./usr/include/g++/amd64-unknown-openbsd4.5/bits/gthr-posix.h
-./usr/include/g++/amd64-unknown-openbsd4.5/bits/gthr-single.h
-./usr/include/g++/amd64-unknown-openbsd4.5/bits/gthr.h
-./usr/include/g++/amd64-unknown-openbsd4.5/bits/messages_members.h
-./usr/include/g++/amd64-unknown-openbsd4.5/bits/os_defines.h
-./usr/include/g++/amd64-unknown-openbsd4.5/bits/time_members.h
+./usr/include/g++/amd64-unknown-openbsd4.6
+./usr/include/g++/amd64-unknown-openbsd4.6/bits
+./usr/include/g++/amd64-unknown-openbsd4.6/bits/atomicity.h
+./usr/include/g++/amd64-unknown-openbsd4.6/bits/basic_file.h
+./usr/include/g++/amd64-unknown-openbsd4.6/bits/c++config.h
+./usr/include/g++/amd64-unknown-openbsd4.6/bits/c++io.h
+./usr/include/g++/amd64-unknown-openbsd4.6/bits/c++locale.h
+./usr/include/g++/amd64-unknown-openbsd4.6/bits/codecvt_specializations.h
+./usr/include/g++/amd64-unknown-openbsd4.6/bits/ctype_base.h
+./usr/include/g++/amd64-unknown-openbsd4.6/bits/ctype_inline.h
+./usr/include/g++/amd64-unknown-openbsd4.6/bits/ctype_noninline.h
+./usr/include/g++/amd64-unknown-openbsd4.6/bits/gthr-default.h
+./usr/include/g++/amd64-unknown-openbsd4.6/bits/gthr-posix.h
+./usr/include/g++/amd64-unknown-openbsd4.6/bits/gthr-single.h
+./usr/include/g++/amd64-unknown-openbsd4.6/bits/gthr.h
+./usr/include/g++/amd64-unknown-openbsd4.6/bits/messages_members.h
+./usr/include/g++/amd64-unknown-openbsd4.6/bits/os_defines.h
+./usr/include/g++/amd64-unknown-openbsd4.6/bits/time_members.h
 ./usr/include/g++/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.5/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.5/3.3.5/cc1obj
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.5/3.3.5/cc1plus
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.5/3.3.5/f771
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.5/3.3.5/fpic
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.5/3.3.5/fpic/libgcc.a
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.5/3.3.5/include
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.5/3.3.5/include/emmintrin.h
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.5/3.3.5/include/mmintrin.h
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.5/3.3.5/include/pmmintrin.h
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.5/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.5/3.3.5/include/xmmintrin.h
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.5/3.3.5/libgcc.a
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.6/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.6/3.3.5/cc1obj
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.6/3.3.5/cc1plus
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.6/3.3.5/f771
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.6/3.3.5/fpic
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.6/3.3.5/fpic/libgcc.a
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.6/3.3.5/include
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.6/3.3.5/include/emmintrin.h
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.6/3.3.5/include/mmintrin.h
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.6/3.3.5/include/pmmintrin.h
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.6/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.6/3.3.5/include/xmmintrin.h
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.6/3.3.5/libgcc.a
 ./usr/lib/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 d7558f9905f..4da2f666837 100644
--- a/distrib/sets/lists/comp/md.armish
+++ b/distrib/sets/lists/comp/md.armish
@@ -96,24 +96,24 @@
 ./usr/include/armish/sysarch.h
 ./usr/include/armish/trap.h
 ./usr/include/armish/vmparam.h
-./usr/include/g++/arm-unknown-openbsd4.5
-./usr/include/g++/arm-unknown-openbsd4.5/bits
-./usr/include/g++/arm-unknown-openbsd4.5/bits/atomicity.h
-./usr/include/g++/arm-unknown-openbsd4.5/bits/basic_file.h
-./usr/include/g++/arm-unknown-openbsd4.5/bits/c++config.h
-./usr/include/g++/arm-unknown-openbsd4.5/bits/c++io.h
-./usr/include/g++/arm-unknown-openbsd4.5/bits/c++locale.h
-./usr/include/g++/arm-unknown-openbsd4.5/bits/codecvt_specializations.h
-./usr/include/g++/arm-unknown-openbsd4.5/bits/ctype_base.h
-./usr/include/g++/arm-unknown-openbsd4.5/bits/ctype_inline.h
-./usr/include/g++/arm-unknown-openbsd4.5/bits/ctype_noninline.h
-./usr/include/g++/arm-unknown-openbsd4.5/bits/gthr-default.h
-./usr/include/g++/arm-unknown-openbsd4.5/bits/gthr-posix.h
-./usr/include/g++/arm-unknown-openbsd4.5/bits/gthr-single.h
-./usr/include/g++/arm-unknown-openbsd4.5/bits/gthr.h
-./usr/include/g++/arm-unknown-openbsd4.5/bits/messages_members.h
-./usr/include/g++/arm-unknown-openbsd4.5/bits/os_defines.h
-./usr/include/g++/arm-unknown-openbsd4.5/bits/time_members.h
+./usr/include/g++/arm-unknown-openbsd4.6
+./usr/include/g++/arm-unknown-openbsd4.6/bits
+./usr/include/g++/arm-unknown-openbsd4.6/bits/atomicity.h
+./usr/include/g++/arm-unknown-openbsd4.6/bits/basic_file.h
+./usr/include/g++/arm-unknown-openbsd4.6/bits/c++config.h
+./usr/include/g++/arm-unknown-openbsd4.6/bits/c++io.h
+./usr/include/g++/arm-unknown-openbsd4.6/bits/c++locale.h
+./usr/include/g++/arm-unknown-openbsd4.6/bits/codecvt_specializations.h
+./usr/include/g++/arm-unknown-openbsd4.6/bits/ctype_base.h
+./usr/include/g++/arm-unknown-openbsd4.6/bits/ctype_inline.h
+./usr/include/g++/arm-unknown-openbsd4.6/bits/ctype_noninline.h
+./usr/include/g++/arm-unknown-openbsd4.6/bits/gthr-default.h
+./usr/include/g++/arm-unknown-openbsd4.6/bits/gthr-posix.h
+./usr/include/g++/arm-unknown-openbsd4.6/bits/gthr-single.h
+./usr/include/g++/arm-unknown-openbsd4.6/bits/gthr.h
+./usr/include/g++/arm-unknown-openbsd4.6/bits/messages_members.h
+./usr/include/g++/arm-unknown-openbsd4.6/bits/os_defines.h
+./usr/include/g++/arm-unknown-openbsd4.6/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -249,9 +249,9 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/arm-unknown-openbsd4.5/3.3.5/include
-./usr/lib/gcc-lib/arm-unknown-openbsd4.5/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/arm-unknown-openbsd4.5/3.3.5/libgcc.a
+./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/include
+./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/libgcc.a
 ./usr/lib/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 c0017a363ec..ca37c6999b7 100644
--- a/distrib/sets/lists/comp/md.aviion
+++ b/distrib/sets/lists/comp/md.aviion
@@ -204,18 +204,18 @@
 ./usr/include/m88k/va-m88k.h
 ./usr/include/m88k/varargs.h
 ./usr/include/m88k/vmparam.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/cc1obj
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/cc1plus
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/f771
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/include/README
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/include/exception
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/include/float.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/include/new
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/include/new.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/cc1obj
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/cc1plus
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/f771
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/README
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/exception
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/float.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/new
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/new.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/libgcc.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/scrt0.o
diff --git a/distrib/sets/lists/comp/md.hp300 b/distrib/sets/lists/comp/md.hp300
index de3d45c0bf4..422568d7d41 100644
--- a/distrib/sets/lists/comp/md.hp300
+++ b/distrib/sets/lists/comp/md.hp300
@@ -187,23 +187,23 @@
 ./usr/include/m68k/trap.h
 ./usr/include/m68k/varargs.h
 ./usr/include/m68k/vmparam.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/cc1obj
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/f771
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/fPIC
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/fPIC/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/fpic
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/fpic/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/include/README
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/include/exception
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/include/float.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/include/new
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/include/new.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/cc1obj
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/cc1plus
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/f771
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/fPIC
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/fPIC/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/fpic
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/fpic/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/README
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/exception
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/float.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/new
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/new.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/libgcc.a
 ./usr/lib/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 8f314f6bc43..f90c0c8ecaa 100644
--- a/distrib/sets/lists/comp/md.hppa
+++ b/distrib/sets/lists/comp/md.hppa
@@ -124,24 +124,24 @@
 ./usr/include/g++/ext/stl_hash_fun.h
 ./usr/include/g++/ext/stl_hashtable.h
 ./usr/include/g++/ext/stl_rope.h
-./usr/include/g++/hppa-unknown-openbsd4.5
-./usr/include/g++/hppa-unknown-openbsd4.5/bits
-./usr/include/g++/hppa-unknown-openbsd4.5/bits/atomicity.h
-./usr/include/g++/hppa-unknown-openbsd4.5/bits/basic_file.h
-./usr/include/g++/hppa-unknown-openbsd4.5/bits/c++config.h
-./usr/include/g++/hppa-unknown-openbsd4.5/bits/c++io.h
-./usr/include/g++/hppa-unknown-openbsd4.5/bits/c++locale.h
-./usr/include/g++/hppa-unknown-openbsd4.5/bits/codecvt_specializations.h
-./usr/include/g++/hppa-unknown-openbsd4.5/bits/ctype_base.h
-./usr/include/g++/hppa-unknown-openbsd4.5/bits/ctype_inline.h
-./usr/include/g++/hppa-unknown-openbsd4.5/bits/ctype_noninline.h
-./usr/include/g++/hppa-unknown-openbsd4.5/bits/gthr-default.h
-./usr/include/g++/hppa-unknown-openbsd4.5/bits/gthr-posix.h
-./usr/include/g++/hppa-unknown-openbsd4.5/bits/gthr-single.h
-./usr/include/g++/hppa-unknown-openbsd4.5/bits/gthr.h
-./usr/include/g++/hppa-unknown-openbsd4.5/bits/messages_members.h
-./usr/include/g++/hppa-unknown-openbsd4.5/bits/os_defines.h
-./usr/include/g++/hppa-unknown-openbsd4.5/bits/time_members.h
+./usr/include/g++/hppa-unknown-openbsd4.6
+./usr/include/g++/hppa-unknown-openbsd4.6/bits
+./usr/include/g++/hppa-unknown-openbsd4.6/bits/atomicity.h
+./usr/include/g++/hppa-unknown-openbsd4.6/bits/basic_file.h
+./usr/include/g++/hppa-unknown-openbsd4.6/bits/c++config.h
+./usr/include/g++/hppa-unknown-openbsd4.6/bits/c++io.h
+./usr/include/g++/hppa-unknown-openbsd4.6/bits/c++locale.h
+./usr/include/g++/hppa-unknown-openbsd4.6/bits/codecvt_specializations.h
+./usr/include/g++/hppa-unknown-openbsd4.6/bits/ctype_base.h
+./usr/include/g++/hppa-unknown-openbsd4.6/bits/ctype_inline.h
+./usr/include/g++/hppa-unknown-openbsd4.6/bits/ctype_noninline.h
+./usr/include/g++/hppa-unknown-openbsd4.6/bits/gthr-default.h
+./usr/include/g++/hppa-unknown-openbsd4.6/bits/gthr-posix.h
+./usr/include/g++/hppa-unknown-openbsd4.6/bits/gthr-single.h
+./usr/include/g++/hppa-unknown-openbsd4.6/bits/gthr.h
+./usr/include/g++/hppa-unknown-openbsd4.6/bits/messages_members.h
+./usr/include/g++/hppa-unknown-openbsd4.6/bits/os_defines.h
+./usr/include/g++/hppa-unknown-openbsd4.6/bits/time_members.h
 ./usr/include/g++/ios
 ./usr/include/g++/istream
 ./usr/include/g++/limits
@@ -206,13 +206,13 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.5/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.5/3.3.5/cc1obj
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.5/3.3.5/cc1plus
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.5/3.3.5/f771
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.5/3.3.5/include
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.5/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.5/3.3.5/libgcc.a
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.6/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.6/3.3.5/cc1obj
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.6/3.3.5/cc1plus
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.6/3.3.5/f771
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.6/3.3.5/include
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.6/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.6/3.3.5/libgcc.a
 ./usr/lib/libasn1_pic.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
diff --git a/distrib/sets/lists/comp/md.hppa64 b/distrib/sets/lists/comp/md.hppa64
index 5cb4b91b5d3..57941e82c01 100644
--- a/distrib/sets/lists/comp/md.hppa64
+++ b/distrib/sets/lists/comp/md.hppa64
@@ -124,24 +124,24 @@
 ./usr/include/g++/ext/stl_hash_fun.h
 ./usr/include/g++/ext/stl_hashtable.h
 ./usr/include/g++/ext/stl_rope.h
-./usr/include/g++/hppa64-unknown-openbsd4.5
-./usr/include/g++/hppa64-unknown-openbsd4.5/bits
-./usr/include/g++/hppa64-unknown-openbsd4.5/bits/atomicity.h
-./usr/include/g++/hppa64-unknown-openbsd4.5/bits/basic_file.h
-./usr/include/g++/hppa64-unknown-openbsd4.5/bits/c++config.h
-./usr/include/g++/hppa64-unknown-openbsd4.5/bits/c++io.h
-./usr/include/g++/hppa64-unknown-openbsd4.5/bits/c++locale.h
-./usr/include/g++/hppa64-unknown-openbsd4.5/bits/codecvt_specializations.h
-./usr/include/g++/hppa64-unknown-openbsd4.5/bits/ctype_base.h
-./usr/include/g++/hppa64-unknown-openbsd4.5/bits/ctype_inline.h
-./usr/include/g++/hppa64-unknown-openbsd4.5/bits/ctype_noninline.h
-./usr/include/g++/hppa64-unknown-openbsd4.5/bits/gthr-default.h
-./usr/include/g++/hppa64-unknown-openbsd4.5/bits/gthr-posix.h
-./usr/include/g++/hppa64-unknown-openbsd4.5/bits/gthr-single.h
-./usr/include/g++/hppa64-unknown-openbsd4.5/bits/gthr.h
-./usr/include/g++/hppa64-unknown-openbsd4.5/bits/messages_members.h
-./usr/include/g++/hppa64-unknown-openbsd4.5/bits/os_defines.h
-./usr/include/g++/hppa64-unknown-openbsd4.5/bits/time_members.h
+./usr/include/g++/hppa64-unknown-openbsd4.6
+./usr/include/g++/hppa64-unknown-openbsd4.6/bits
+./usr/include/g++/hppa64-unknown-openbsd4.6/bits/atomicity.h
+./usr/include/g++/hppa64-unknown-openbsd4.6/bits/basic_file.h
+./usr/include/g++/hppa64-unknown-openbsd4.6/bits/c++config.h
+./usr/include/g++/hppa64-unknown-openbsd4.6/bits/c++io.h
+./usr/include/g++/hppa64-unknown-openbsd4.6/bits/c++locale.h
+./usr/include/g++/hppa64-unknown-openbsd4.6/bits/codecvt_specializations.h
+./usr/include/g++/hppa64-unknown-openbsd4.6/bits/ctype_base.h
+./usr/include/g++/hppa64-unknown-openbsd4.6/bits/ctype_inline.h
+./usr/include/g++/hppa64-unknown-openbsd4.6/bits/ctype_noninline.h
+./usr/include/g++/hppa64-unknown-openbsd4.6/bits/gthr-default.h
+./usr/include/g++/hppa64-unknown-openbsd4.6/bits/gthr-posix.h
+./usr/include/g++/hppa64-unknown-openbsd4.6/bits/gthr-single.h
+./usr/include/g++/hppa64-unknown-openbsd4.6/bits/gthr.h
+./usr/include/g++/hppa64-unknown-openbsd4.6/bits/messages_members.h
+./usr/include/g++/hppa64-unknown-openbsd4.6/bits/os_defines.h
+./usr/include/g++/hppa64-unknown-openbsd4.6/bits/time_members.h
 ./usr/include/g++/ios
 ./usr/include/g++/istream
 ./usr/include/g++/limits
@@ -205,13 +205,13 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.5/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.5/3.3.5/cc1obj
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.5/3.3.5/cc1plus
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.5/3.3.5/f771
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.5/3.3.5/include
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.5/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.5/3.3.5/libgcc.a
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.6/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.6/3.3.5/cc1obj
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.6/3.3.5/cc1plus
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.6/3.3.5/f771
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.6/3.3.5/include
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.6/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.6/3.3.5/libgcc.a
 ./usr/lib/libasn1_pic.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index a3781c28516..3bc7004bccd 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -125,24 +125,24 @@
 ./usr/include/g++/ext/stl_hash_fun.h
 ./usr/include/g++/ext/stl_hashtable.h
 ./usr/include/g++/ext/stl_rope.h
-./usr/include/g++/i386-unknown-openbsd4.5
-./usr/include/g++/i386-unknown-openbsd4.5/bits
-./usr/include/g++/i386-unknown-openbsd4.5/bits/atomicity.h
-./usr/include/g++/i386-unknown-openbsd4.5/bits/basic_file.h
-./usr/include/g++/i386-unknown-openbsd4.5/bits/c++config.h
-./usr/include/g++/i386-unknown-openbsd4.5/bits/c++io.h
-./usr/include/g++/i386-unknown-openbsd4.5/bits/c++locale.h
-./usr/include/g++/i386-unknown-openbsd4.5/bits/codecvt_specializations.h
-./usr/include/g++/i386-unknown-openbsd4.5/bits/ctype_base.h
-./usr/include/g++/i386-unknown-openbsd4.5/bits/ctype_inline.h
-./usr/include/g++/i386-unknown-openbsd4.5/bits/ctype_noninline.h
-./usr/include/g++/i386-unknown-openbsd4.5/bits/gthr-default.h
-./usr/include/g++/i386-unknown-openbsd4.5/bits/gthr-posix.h
-./usr/include/g++/i386-unknown-openbsd4.5/bits/gthr-single.h
-./usr/include/g++/i386-unknown-openbsd4.5/bits/gthr.h
-./usr/include/g++/i386-unknown-openbsd4.5/bits/messages_members.h
-./usr/include/g++/i386-unknown-openbsd4.5/bits/os_defines.h
-./usr/include/g++/i386-unknown-openbsd4.5/bits/time_members.h
+./usr/include/g++/i386-unknown-openbsd4.6
+./usr/include/g++/i386-unknown-openbsd4.6/bits
+./usr/include/g++/i386-unknown-openbsd4.6/bits/atomicity.h
+./usr/include/g++/i386-unknown-openbsd4.6/bits/basic_file.h
+./usr/include/g++/i386-unknown-openbsd4.6/bits/c++config.h
+./usr/include/g++/i386-unknown-openbsd4.6/bits/c++io.h
+./usr/include/g++/i386-unknown-openbsd4.6/bits/c++locale.h
+./usr/include/g++/i386-unknown-openbsd4.6/bits/codecvt_specializations.h
+./usr/include/g++/i386-unknown-openbsd4.6/bits/ctype_base.h
+./usr/include/g++/i386-unknown-openbsd4.6/bits/ctype_inline.h
+./usr/include/g++/i386-unknown-openbsd4.6/bits/ctype_noninline.h
+./usr/include/g++/i386-unknown-openbsd4.6/bits/gthr-default.h
+./usr/include/g++/i386-unknown-openbsd4.6/bits/gthr-posix.h
+./usr/include/g++/i386-unknown-openbsd4.6/bits/gthr-single.h
+./usr/include/g++/i386-unknown-openbsd4.6/bits/gthr.h
+./usr/include/g++/i386-unknown-openbsd4.6/bits/messages_members.h
+./usr/include/g++/i386-unknown-openbsd4.6/bits/os_defines.h
+./usr/include/g++/i386-unknown-openbsd4.6/bits/time_members.h
 ./usr/include/g++/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.5/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/i386-unknown-openbsd4.5/3.3.5/cc1obj
-./usr/lib/gcc-lib/i386-unknown-openbsd4.5/3.3.5/cc1plus
-./usr/lib/gcc-lib/i386-unknown-openbsd4.5/3.3.5/f771
-./usr/lib/gcc-lib/i386-unknown-openbsd4.5/3.3.5/fpic
-./usr/lib/gcc-lib/i386-unknown-openbsd4.5/3.3.5/fpic/libgcc.a
-./usr/lib/gcc-lib/i386-unknown-openbsd4.5/3.3.5/include/emmintrin.h
-./usr/lib/gcc-lib/i386-unknown-openbsd4.5/3.3.5/include/mmintrin.h
-./usr/lib/gcc-lib/i386-unknown-openbsd4.5/3.3.5/include/pmmintrin.h
-./usr/lib/gcc-lib/i386-unknown-openbsd4.5/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/i386-unknown-openbsd4.5/3.3.5/include/xmmintrin.h
-./usr/lib/gcc-lib/i386-unknown-openbsd4.5/3.3.5/libgcc.a
+./usr/lib/gcc-lib/i386-unknown-openbsd4.6/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/i386-unknown-openbsd4.6/3.3.5/cc1obj
+./usr/lib/gcc-lib/i386-unknown-openbsd4.6/3.3.5/cc1plus
+./usr/lib/gcc-lib/i386-unknown-openbsd4.6/3.3.5/f771
+./usr/lib/gcc-lib/i386-unknown-openbsd4.6/3.3.5/fpic
+./usr/lib/gcc-lib/i386-unknown-openbsd4.6/3.3.5/fpic/libgcc.a
+./usr/lib/gcc-lib/i386-unknown-openbsd4.6/3.3.5/include/emmintrin.h
+./usr/lib/gcc-lib/i386-unknown-openbsd4.6/3.3.5/include/mmintrin.h
+./usr/lib/gcc-lib/i386-unknown-openbsd4.6/3.3.5/include/pmmintrin.h
+./usr/lib/gcc-lib/i386-unknown-openbsd4.6/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/i386-unknown-openbsd4.6/3.3.5/include/xmmintrin.h
+./usr/lib/gcc-lib/i386-unknown-openbsd4.6/3.3.5/libgcc.a
 ./usr/lib/libasn1_pic.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
diff --git a/distrib/sets/lists/comp/md.landisk b/distrib/sets/lists/comp/md.landisk
index 0c8e8c0d133..3c692a479e1 100644
--- a/distrib/sets/lists/comp/md.landisk
+++ b/distrib/sets/lists/comp/md.landisk
@@ -130,24 +130,24 @@
 ./usr/include/g++/limits
 ./usr/include/g++/locale
 ./usr/include/g++/ostream
-./usr/include/g++/sh-unknown-openbsd4.5
-./usr/include/g++/sh-unknown-openbsd4.5/bits
-./usr/include/g++/sh-unknown-openbsd4.5/bits/atomicity.h
-./usr/include/g++/sh-unknown-openbsd4.5/bits/basic_file.h
-./usr/include/g++/sh-unknown-openbsd4.5/bits/c++config.h
-./usr/include/g++/sh-unknown-openbsd4.5/bits/c++io.h
-./usr/include/g++/sh-unknown-openbsd4.5/bits/c++locale.h
-./usr/include/g++/sh-unknown-openbsd4.5/bits/codecvt_specializations.h
-./usr/include/g++/sh-unknown-openbsd4.5/bits/ctype_base.h
-./usr/include/g++/sh-unknown-openbsd4.5/bits/ctype_inline.h
-./usr/include/g++/sh-unknown-openbsd4.5/bits/ctype_noninline.h
-./usr/include/g++/sh-unknown-openbsd4.5/bits/gthr-default.h
-./usr/include/g++/sh-unknown-openbsd4.5/bits/gthr-posix.h
-./usr/include/g++/sh-unknown-openbsd4.5/bits/gthr-single.h
-./usr/include/g++/sh-unknown-openbsd4.5/bits/gthr.h
-./usr/include/g++/sh-unknown-openbsd4.5/bits/messages_members.h
-./usr/include/g++/sh-unknown-openbsd4.5/bits/os_defines.h
-./usr/include/g++/sh-unknown-openbsd4.5/bits/time_members.h
+./usr/include/g++/sh-unknown-openbsd4.6
+./usr/include/g++/sh-unknown-openbsd4.6/bits
+./usr/include/g++/sh-unknown-openbsd4.6/bits/atomicity.h
+./usr/include/g++/sh-unknown-openbsd4.6/bits/basic_file.h
+./usr/include/g++/sh-unknown-openbsd4.6/bits/c++config.h
+./usr/include/g++/sh-unknown-openbsd4.6/bits/c++io.h
+./usr/include/g++/sh-unknown-openbsd4.6/bits/c++locale.h
+./usr/include/g++/sh-unknown-openbsd4.6/bits/codecvt_specializations.h
+./usr/include/g++/sh-unknown-openbsd4.6/bits/ctype_base.h
+./usr/include/g++/sh-unknown-openbsd4.6/bits/ctype_inline.h
+./usr/include/g++/sh-unknown-openbsd4.6/bits/ctype_noninline.h
+./usr/include/g++/sh-unknown-openbsd4.6/bits/gthr-default.h
+./usr/include/g++/sh-unknown-openbsd4.6/bits/gthr-posix.h
+./usr/include/g++/sh-unknown-openbsd4.6/bits/gthr-single.h
+./usr/include/g++/sh-unknown-openbsd4.6/bits/gthr.h
+./usr/include/g++/sh-unknown-openbsd4.6/bits/messages_members.h
+./usr/include/g++/sh-unknown-openbsd4.6/bits/os_defines.h
+./usr/include/g++/sh-unknown-openbsd4.6/bits/time_members.h
 ./usr/include/g++/streambuf
 ./usr/include/ieeefp.h
 ./usr/include/landisk
@@ -255,18 +255,18 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sh-unknown-openbsd4.5
-./usr/lib/gcc-lib/sh-unknown-openbsd4.5/3.3.5
-./usr/lib/gcc-lib/sh-unknown-openbsd4.5/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/sh-unknown-openbsd4.5/3.3.5/cc1
-./usr/lib/gcc-lib/sh-unknown-openbsd4.5/3.3.5/cc1obj
-./usr/lib/gcc-lib/sh-unknown-openbsd4.5/3.3.5/cc1plus
-./usr/lib/gcc-lib/sh-unknown-openbsd4.5/3.3.5/collect2
-./usr/lib/gcc-lib/sh-unknown-openbsd4.5/3.3.5/f771
-./usr/lib/gcc-lib/sh-unknown-openbsd4.5/3.3.5/include
-./usr/lib/gcc-lib/sh-unknown-openbsd4.5/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/sh-unknown-openbsd4.5/3.3.5/libgcc.a
-./usr/lib/gcc-lib/sh-unknown-openbsd4.5/3.3.5/specs
+./usr/lib/gcc-lib/sh-unknown-openbsd4.6
+./usr/lib/gcc-lib/sh-unknown-openbsd4.6/3.3.5
+./usr/lib/gcc-lib/sh-unknown-openbsd4.6/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/sh-unknown-openbsd4.6/3.3.5/cc1
+./usr/lib/gcc-lib/sh-unknown-openbsd4.6/3.3.5/cc1obj
+./usr/lib/gcc-lib/sh-unknown-openbsd4.6/3.3.5/cc1plus
+./usr/lib/gcc-lib/sh-unknown-openbsd4.6/3.3.5/collect2
+./usr/lib/gcc-lib/sh-unknown-openbsd4.6/3.3.5/f771
+./usr/lib/gcc-lib/sh-unknown-openbsd4.6/3.3.5/include
+./usr/lib/gcc-lib/sh-unknown-openbsd4.6/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/sh-unknown-openbsd4.6/3.3.5/libgcc.a
+./usr/lib/gcc-lib/sh-unknown-openbsd4.6/3.3.5/specs
 ./usr/lib/libasn1_pic.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
diff --git a/distrib/sets/lists/comp/md.luna88k b/distrib/sets/lists/comp/md.luna88k
index 65cdbece75c..1d0210cfa7a 100644
--- a/distrib/sets/lists/comp/md.luna88k
+++ b/distrib/sets/lists/comp/md.luna88k
@@ -198,18 +198,18 @@
 ./usr/include/m88k/va-m88k.h
 ./usr/include/m88k/varargs.h
 ./usr/include/m88k/vmparam.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/cc1obj
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/cc1plus
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/f771
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/include/README
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/include/exception
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/include/float.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/include/new
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/include/new.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/cc1obj
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/cc1plus
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/f771
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/README
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/exception
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/float.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/new
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/new.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/libgcc.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/scrt0.o
diff --git a/distrib/sets/lists/comp/md.mac68k b/distrib/sets/lists/comp/md.mac68k
index 5e10149f56b..41505f2447b 100644
--- a/distrib/sets/lists/comp/md.mac68k
+++ b/distrib/sets/lists/comp/md.mac68k
@@ -190,23 +190,23 @@
 ./usr/include/mac68k/viareg.h
 ./usr/include/mac68k/vmparam.h
 ./usr/include/mac68k/z8530var.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/cc1obj
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/f771
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/fPIC
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/fPIC/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/fpic
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/fpic/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/include/README
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/include/exception
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/include/float.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/include/new
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/include/new.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/cc1obj
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/cc1plus
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/f771
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/fPIC
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/fPIC/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/fpic
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/fpic/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/README
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/exception
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/float.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/new
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/new.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/libgcc.a
 ./usr/lib/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 3fe8b36e292..a99e0a19c52 100644
--- a/distrib/sets/lists/comp/md.macppc
+++ b/distrib/sets/lists/comp/md.macppc
@@ -130,24 +130,24 @@
 ./usr/include/g++/limits
 ./usr/include/g++/locale
 ./usr/include/g++/ostream
-./usr/include/g++/powerpc-unknown-openbsd4.5
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/atomicity.h
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/basic_file.h
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/c++config.h
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/c++io.h
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/c++locale.h
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/codecvt_specializations.h
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/ctype_base.h
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/ctype_inline.h
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/ctype_noninline.h
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/gthr-default.h
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/gthr-posix.h
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/gthr-single.h
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/gthr.h
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/messages_members.h
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/os_defines.h
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/time_members.h
+./usr/include/g++/powerpc-unknown-openbsd4.6
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/atomicity.h
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/basic_file.h
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/c++config.h
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/c++io.h
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/c++locale.h
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/codecvt_specializations.h
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/ctype_base.h
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/ctype_inline.h
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/ctype_noninline.h
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/gthr-default.h
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/gthr-posix.h
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/gthr-single.h
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/gthr.h
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/messages_members.h
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/os_defines.h
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/time_members.h
 ./usr/include/g++/streambuf
 ./usr/include/ieeefp.h
 ./usr/include/macppc
@@ -246,17 +246,17 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/3.3.5/cc1obj
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/3.3.5/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/3.3.5/crtsavres.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/3.3.5/f771
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/3.3.5/include/altivec.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/3.3.5/libgcc.a
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/3.3.5/nof
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/3.3.5/nof/crtsavres.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/3.3.5/nof/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/cc1obj
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/cc1plus
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/crtsavres.o
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/f771
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/include/altivec.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/nof
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/nof/crtsavres.o
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/nof/libgcc.a
 ./usr/lib/libasn1_pic.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
diff --git a/distrib/sets/lists/comp/md.mvme68k b/distrib/sets/lists/comp/md.mvme68k
index c0dc670812f..1bd27639b04 100644
--- a/distrib/sets/lists/comp/md.mvme68k
+++ b/distrib/sets/lists/comp/md.mvme68k
@@ -189,23 +189,23 @@
 ./usr/include/mvme68k/trap.h
 ./usr/include/mvme68k/varargs.h
 ./usr/include/mvme68k/vmparam.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/cc1obj
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/f771
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/fPIC
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/fPIC/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/fpic
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/fpic/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/include/README
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/include/exception
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/include/float.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/include/new
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/include/new.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.5/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/cc1obj
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/cc1plus
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/f771
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/fPIC
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/fPIC/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/fpic
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/fpic/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/README
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/exception
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/float.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/new
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/new.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.6/2.95.3/libgcc.a
 ./usr/lib/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 895d83f64f9..91c2b8d23b7 100644
--- a/distrib/sets/lists/comp/md.mvme88k
+++ b/distrib/sets/lists/comp/md.mvme88k
@@ -209,18 +209,18 @@
 ./usr/include/mvme88k/va-m88k.h
 ./usr/include/mvme88k/varargs.h
 ./usr/include/mvme88k/vmparam.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/cc1obj
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/cc1plus
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/f771
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/include/README
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/include/exception
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/include/float.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/include/new
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/include/new.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.5/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/cc1obj
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/cc1plus
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/f771
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/README
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/exception
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/float.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/new
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/new.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.6/2.95.3/libgcc.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/scrt0.o
diff --git a/distrib/sets/lists/comp/md.mvmeppc b/distrib/sets/lists/comp/md.mvmeppc
index 00b603504c9..a83df3f463c 100644
--- a/distrib/sets/lists/comp/md.mvmeppc
+++ b/distrib/sets/lists/comp/md.mvmeppc
@@ -161,21 +161,21 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/2.95.3/cc1obj
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/2.95.3/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/2.95.3/f771
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/2.95.3/include/README
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/2.95.3/include/exception
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/2.95.3/include/float.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/2.95.3/include/limits.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/2.95.3/include/new
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/2.95.3/include/new.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/2.95.3/libgcc.a
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/2.95.3/soft-float
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/2.95.3/soft-float/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/cc1obj
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/cc1plus
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/f771
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/include/README
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/include/exception
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/include/float.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/include/limits.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/include/new
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/include/new.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/soft-float
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/2.95.3/soft-float/libgcc.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
 ./usr/lib/libcrypto_pic.a
diff --git a/distrib/sets/lists/comp/md.sgi b/distrib/sets/lists/comp/md.sgi
index dbad457411a..8bb3f77e6b1 100644
--- a/distrib/sets/lists/comp/md.sgi
+++ b/distrib/sets/lists/comp/md.sgi
@@ -128,24 +128,24 @@
 ./usr/include/g++/istream
 ./usr/include/g++/limits
 ./usr/include/g++/locale
-./usr/include/g++/mips64-unknown-openbsd4.5
-./usr/include/g++/mips64-unknown-openbsd4.5/bits
-./usr/include/g++/mips64-unknown-openbsd4.5/bits/atomicity.h
-./usr/include/g++/mips64-unknown-openbsd4.5/bits/basic_file.h
-./usr/include/g++/mips64-unknown-openbsd4.5/bits/c++config.h
-./usr/include/g++/mips64-unknown-openbsd4.5/bits/c++io.h
-./usr/include/g++/mips64-unknown-openbsd4.5/bits/c++locale.h
-./usr/include/g++/mips64-unknown-openbsd4.5/bits/codecvt_specializations.h
-./usr/include/g++/mips64-unknown-openbsd4.5/bits/ctype_base.h
-./usr/include/g++/mips64-unknown-openbsd4.5/bits/ctype_inline.h
-./usr/include/g++/mips64-unknown-openbsd4.5/bits/ctype_noninline.h
-./usr/include/g++/mips64-unknown-openbsd4.5/bits/gthr-default.h
-./usr/include/g++/mips64-unknown-openbsd4.5/bits/gthr-posix.h
-./usr/include/g++/mips64-unknown-openbsd4.5/bits/gthr-single.h
-./usr/include/g++/mips64-unknown-openbsd4.5/bits/gthr.h
-./usr/include/g++/mips64-unknown-openbsd4.5/bits/messages_members.h
-./usr/include/g++/mips64-unknown-openbsd4.5/bits/os_defines.h
-./usr/include/g++/mips64-unknown-openbsd4.5/bits/time_members.h
+./usr/include/g++/mips64-unknown-openbsd4.6
+./usr/include/g++/mips64-unknown-openbsd4.6/bits
+./usr/include/g++/mips64-unknown-openbsd4.6/bits/atomicity.h
+./usr/include/g++/mips64-unknown-openbsd4.6/bits/basic_file.h
+./usr/include/g++/mips64-unknown-openbsd4.6/bits/c++config.h
+./usr/include/g++/mips64-unknown-openbsd4.6/bits/c++io.h
+./usr/include/g++/mips64-unknown-openbsd4.6/bits/c++locale.h
+./usr/include/g++/mips64-unknown-openbsd4.6/bits/codecvt_specializations.h
+./usr/include/g++/mips64-unknown-openbsd4.6/bits/ctype_base.h
+./usr/include/g++/mips64-unknown-openbsd4.6/bits/ctype_inline.h
+./usr/include/g++/mips64-unknown-openbsd4.6/bits/ctype_noninline.h
+./usr/include/g++/mips64-unknown-openbsd4.6/bits/gthr-default.h
+./usr/include/g++/mips64-unknown-openbsd4.6/bits/gthr-posix.h
+./usr/include/g++/mips64-unknown-openbsd4.6/bits/gthr-single.h
+./usr/include/g++/mips64-unknown-openbsd4.6/bits/gthr.h
+./usr/include/g++/mips64-unknown-openbsd4.6/bits/messages_members.h
+./usr/include/g++/mips64-unknown-openbsd4.6/bits/os_defines.h
+./usr/include/g++/mips64-unknown-openbsd4.6/bits/time_members.h
 ./usr/include/g++/ostream
 ./usr/include/g++/streambuf
 ./usr/include/ieeefp.h
@@ -239,11 +239,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.5/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.5/3.3.5/cc1obj
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.5/3.3.5/cc1plus
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.5/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.5/3.3.5/libgcc.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.6/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.6/3.3.5/cc1obj
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.6/3.3.5/cc1plus
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.6/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.6/3.3.5/libgcc.a
 ./usr/lib/libsupc++.a
 ./usr/libdata/ldscripts
 ./usr/libdata/ldscripts/elf32btsmip.x
diff --git a/distrib/sets/lists/comp/md.socppc b/distrib/sets/lists/comp/md.socppc
index 87ec84fe0b9..907ef8c8bf8 100644
--- a/distrib/sets/lists/comp/md.socppc
+++ b/distrib/sets/lists/comp/md.socppc
@@ -130,24 +130,24 @@
 ./usr/include/g++/limits
 ./usr/include/g++/locale
 ./usr/include/g++/ostream
-./usr/include/g++/powerpc-unknown-openbsd4.5
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/atomicity.h
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/basic_file.h
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/c++config.h
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/c++io.h
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/c++locale.h
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/codecvt_specializations.h
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/ctype_base.h
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/ctype_inline.h
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/ctype_noninline.h
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/gthr-default.h
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/gthr-posix.h
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/gthr-single.h
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/gthr.h
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/messages_members.h
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/os_defines.h
-./usr/include/g++/powerpc-unknown-openbsd4.5/bits/time_members.h
+./usr/include/g++/powerpc-unknown-openbsd4.6
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/atomicity.h
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/basic_file.h
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/c++config.h
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/c++io.h
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/c++locale.h
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/codecvt_specializations.h
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/ctype_base.h
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/ctype_inline.h
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/ctype_noninline.h
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/gthr-default.h
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/gthr-posix.h
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/gthr-single.h
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/gthr.h
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/messages_members.h
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/os_defines.h
+./usr/include/g++/powerpc-unknown-openbsd4.6/bits/time_members.h
 ./usr/include/g++/streambuf
 ./usr/include/ieeefp.h
 ./usr/include/powerpc
@@ -239,17 +239,17 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/3.3.5/cc1obj
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/3.3.5/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/3.3.5/crtsavres.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/3.3.5/f771
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/3.3.5/include/altivec.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/3.3.5/libgcc.a
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/3.3.5/nof
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/3.3.5/nof/crtsavres.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.5/3.3.5/nof/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/cc1obj
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/cc1plus
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/crtsavres.o
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/f771
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/include/altivec.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/nof
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/nof/crtsavres.o
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.6/3.3.5/nof/libgcc.a
 ./usr/lib/libasn1_pic.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
diff --git a/distrib/sets/lists/comp/md.sparc b/distrib/sets/lists/comp/md.sparc
index 034119bbabc..74a96e61f5a 100644
--- a/distrib/sets/lists/comp/md.sparc
+++ b/distrib/sets/lists/comp/md.sparc
@@ -173,23 +173,23 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.5/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.5/2.95.3/cc1obj
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.5/2.95.3/cc1plus
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.5/2.95.3/f771
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.5/2.95.3/fPIC
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.5/2.95.3/fPIC/libgcc.a
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.5/2.95.3/fpic
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.5/2.95.3/fpic/libgcc.a
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.5/2.95.3/include/README
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.5/2.95.3/include/exception
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.5/2.95.3/include/float.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.5/2.95.3/include/limits.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.5/2.95.3/include/new
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.5/2.95.3/include/new.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.5/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.5/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.5/2.95.3/libgcc.a
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/cc1obj
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/cc1plus
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/f771
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/fPIC
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/fPIC/libgcc.a
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/fpic
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/fpic/libgcc.a
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/include/README
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/include/exception
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/include/float.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/include/limits.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/include/new
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/include/new.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.6/2.95.3/libgcc.a
 ./usr/lib/libasn1_pic.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
diff --git a/distrib/sets/lists/comp/md.sparc64 b/distrib/sets/lists/comp/md.sparc64
index adb6955a9d3..83221272822 100644
--- a/distrib/sets/lists/comp/md.sparc64
+++ b/distrib/sets/lists/comp/md.sparc64
@@ -129,24 +129,24 @@
 ./usr/include/g++/limits
 ./usr/include/g++/locale
 ./usr/include/g++/ostream
-./usr/include/g++/sparc64-unknown-openbsd4.5
-./usr/include/g++/sparc64-unknown-openbsd4.5/bits
-./usr/include/g++/sparc64-unknown-openbsd4.5/bits/atomicity.h
-./usr/include/g++/sparc64-unknown-openbsd4.5/bits/basic_file.h
-./usr/include/g++/sparc64-unknown-openbsd4.5/bits/c++config.h
-./usr/include/g++/sparc64-unknown-openbsd4.5/bits/c++io.h
-./usr/include/g++/sparc64-unknown-openbsd4.5/bits/c++locale.h
-./usr/include/g++/sparc64-unknown-openbsd4.5/bits/codecvt_specializations.h
-./usr/include/g++/sparc64-unknown-openbsd4.5/bits/ctype_base.h
-./usr/include/g++/sparc64-unknown-openbsd4.5/bits/ctype_inline.h
-./usr/include/g++/sparc64-unknown-openbsd4.5/bits/ctype_noninline.h
-./usr/include/g++/sparc64-unknown-openbsd4.5/bits/gthr-default.h
-./usr/include/g++/sparc64-unknown-openbsd4.5/bits/gthr-posix.h
-./usr/include/g++/sparc64-unknown-openbsd4.5/bits/gthr-single.h
-./usr/include/g++/sparc64-unknown-openbsd4.5/bits/gthr.h
-./usr/include/g++/sparc64-unknown-openbsd4.5/bits/messages_members.h
-./usr/include/g++/sparc64-unknown-openbsd4.5/bits/os_defines.h
-./usr/include/g++/sparc64-unknown-openbsd4.5/bits/time_members.h
+./usr/include/g++/sparc64-unknown-openbsd4.6
+./usr/include/g++/sparc64-unknown-openbsd4.6/bits
+./usr/include/g++/sparc64-unknown-openbsd4.6/bits/atomicity.h
+./usr/include/g++/sparc64-unknown-openbsd4.6/bits/basic_file.h
+./usr/include/g++/sparc64-unknown-openbsd4.6/bits/c++config.h
+./usr/include/g++/sparc64-unknown-openbsd4.6/bits/c++io.h
+./usr/include/g++/sparc64-unknown-openbsd4.6/bits/c++locale.h
+./usr/include/g++/sparc64-unknown-openbsd4.6/bits/codecvt_specializations.h
+./usr/include/g++/sparc64-unknown-openbsd4.6/bits/ctype_base.h
+./usr/include/g++/sparc64-unknown-openbsd4.6/bits/ctype_inline.h
+./usr/include/g++/sparc64-unknown-openbsd4.6/bits/ctype_noninline.h
+./usr/include/g++/sparc64-unknown-openbsd4.6/bits/gthr-default.h
+./usr/include/g++/sparc64-unknown-openbsd4.6/bits/gthr-posix.h
+./usr/include/g++/sparc64-unknown-openbsd4.6/bits/gthr-single.h
+./usr/include/g++/sparc64-unknown-openbsd4.6/bits/gthr.h
+./usr/include/g++/sparc64-unknown-openbsd4.6/bits/messages_members.h
+./usr/include/g++/sparc64-unknown-openbsd4.6/bits/os_defines.h
+./usr/include/g++/sparc64-unknown-openbsd4.6/bits/time_members.h
 ./usr/include/g++/streambuf
 ./usr/include/ieeefp.h
 ./usr/include/sparc64
@@ -213,16 +213,16 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.5/3.3.5
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.5/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.5/3.3.5/cc1obj
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.5/3.3.5/cc1plus
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.5/3.3.5/collect2
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.5/3.3.5/f771
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.5/3.3.5/include
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.5/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.5/3.3.5/libgcc.a
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.5/3.3.5/specs
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.6/3.3.5
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.6/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.6/3.3.5/cc1obj
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.6/3.3.5/cc1plus
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.6/3.3.5/collect2
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.6/3.3.5/f771
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.6/3.3.5/include
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.6/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.6/3.3.5/libgcc.a
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.6/3.3.5/specs
 ./usr/lib/libasn1_pic.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
diff --git a/distrib/sets/lists/comp/md.vax b/distrib/sets/lists/comp/md.vax
index b9055869ece..6dba4ef3ca3 100644
--- a/distrib/sets/lists/comp/md.vax
+++ b/distrib/sets/lists/comp/md.vax
@@ -171,19 +171,19 @@
 ./usr/include/vax/vaxfp.h
 ./usr/include/vax/vmparam.h
 ./usr/include/vax/vsbus.h
-./usr/lib/gcc-lib/vax-unknown-openbsd4.5/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/vax-unknown-openbsd4.5/2.95.3/cc1obj
-./usr/lib/gcc-lib/vax-unknown-openbsd4.5/2.95.3/cc1plus
-./usr/lib/gcc-lib/vax-unknown-openbsd4.5/2.95.3/f771
-./usr/lib/gcc-lib/vax-unknown-openbsd4.5/2.95.3/include/README
-./usr/lib/gcc-lib/vax-unknown-openbsd4.5/2.95.3/include/exception
-./usr/lib/gcc-lib/vax-unknown-openbsd4.5/2.95.3/include/float.h
-./usr/lib/gcc-lib/vax-unknown-openbsd4.5/2.95.3/include/limits.h
-./usr/lib/gcc-lib/vax-unknown-openbsd4.5/2.95.3/include/new
-./usr/lib/gcc-lib/vax-unknown-openbsd4.5/2.95.3/include/new.h
-./usr/lib/gcc-lib/vax-unknown-openbsd4.5/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/vax-unknown-openbsd4.5/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/vax-unknown-openbsd4.5/2.95.3/libgcc.a
+./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3/cc1obj
+./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3/cc1plus
+./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3/f771
+./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3/include/README
+./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3/include/exception
+./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3/include/float.h
+./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3/include/limits.h
+./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3/include/new
+./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3/include/new.h
+./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/vax-unknown-openbsd4.6/2.95.3/libgcc.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/scrt0.o
 ./usr/share/man/cat3/infnan.0
diff --git a/distrib/sets/lists/comp/md.zaurus b/distrib/sets/lists/comp/md.zaurus
index 71f8a4de807..e2d36a31b88 100644
--- a/distrib/sets/lists/comp/md.zaurus
+++ b/distrib/sets/lists/comp/md.zaurus
@@ -53,24 +53,24 @@
 ./usr/include/arm/trap.h
 ./usr/include/arm/undefined.h
 ./usr/include/arm/vmparam.h
-./usr/include/g++/arm-unknown-openbsd4.5
-./usr/include/g++/arm-unknown-openbsd4.5/bits
-./usr/include/g++/arm-unknown-openbsd4.5/bits/atomicity.h
-./usr/include/g++/arm-unknown-openbsd4.5/bits/basic_file.h
-./usr/include/g++/arm-unknown-openbsd4.5/bits/c++config.h
-./usr/include/g++/arm-unknown-openbsd4.5/bits/c++io.h
-./usr/include/g++/arm-unknown-openbsd4.5/bits/c++locale.h
-./usr/include/g++/arm-unknown-openbsd4.5/bits/codecvt_specializations.h
-./usr/include/g++/arm-unknown-openbsd4.5/bits/ctype_base.h
-./usr/include/g++/arm-unknown-openbsd4.5/bits/ctype_inline.h
-./usr/include/g++/arm-unknown-openbsd4.5/bits/ctype_noninline.h
-./usr/include/g++/arm-unknown-openbsd4.5/bits/gthr-default.h
-./usr/include/g++/arm-unknown-openbsd4.5/bits/gthr-posix.h
-./usr/include/g++/arm-unknown-openbsd4.5/bits/gthr-single.h
-./usr/include/g++/arm-unknown-openbsd4.5/bits/gthr.h
-./usr/include/g++/arm-unknown-openbsd4.5/bits/messages_members.h
-./usr/include/g++/arm-unknown-openbsd4.5/bits/os_defines.h
-./usr/include/g++/arm-unknown-openbsd4.5/bits/time_members.h
+./usr/include/g++/arm-unknown-openbsd4.6
+./usr/include/g++/arm-unknown-openbsd4.6/bits
+./usr/include/g++/arm-unknown-openbsd4.6/bits/atomicity.h
+./usr/include/g++/arm-unknown-openbsd4.6/bits/basic_file.h
+./usr/include/g++/arm-unknown-openbsd4.6/bits/c++config.h
+./usr/include/g++/arm-unknown-openbsd4.6/bits/c++io.h
+./usr/include/g++/arm-unknown-openbsd4.6/bits/c++locale.h
+./usr/include/g++/arm-unknown-openbsd4.6/bits/codecvt_specializations.h
+./usr/include/g++/arm-unknown-openbsd4.6/bits/ctype_base.h
+./usr/include/g++/arm-unknown-openbsd4.6/bits/ctype_inline.h
+./usr/include/g++/arm-unknown-openbsd4.6/bits/ctype_noninline.h
+./usr/include/g++/arm-unknown-openbsd4.6/bits/gthr-default.h
+./usr/include/g++/arm-unknown-openbsd4.6/bits/gthr-posix.h
+./usr/include/g++/arm-unknown-openbsd4.6/bits/gthr-single.h
+./usr/include/g++/arm-unknown-openbsd4.6/bits/gthr.h
+./usr/include/g++/arm-unknown-openbsd4.6/bits/messages_members.h
+./usr/include/g++/arm-unknown-openbsd4.6/bits/os_defines.h
+./usr/include/g++/arm-unknown-openbsd4.6/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -250,9 +250,9 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/arm-unknown-openbsd4.5/3.3.5/include
-./usr/lib/gcc-lib/arm-unknown-openbsd4.5/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/arm-unknown-openbsd4.5/3.3.5/libgcc.a
+./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/include
+./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/arm-unknown-openbsd4.6/3.3.5/libgcc.a
 ./usr/lib/libarm.a
 ./usr/lib/libarm_p.a
 ./usr/lib/libasn1_pic.a