21 files changed, 481 insertions, 481 deletions
diff --git a/distrib/sets/lists/comp/md.alpha b/distrib/sets/lists/comp/md.alpha
index df25c92005f..6d96bcc419c 100644
--- a/distrib/sets/lists/comp/md.alpha
+++ b/distrib/sets/lists/comp/md.alpha
@@ -57,29 +57,29 @@
 ./usr/include/alpha/tcb.h
 ./usr/include/alpha/varargs.h
 ./usr/include/alpha/vmparam.h
-./usr/include/g++/alpha-unknown-openbsd5.1
-./usr/include/g++/alpha-unknown-openbsd5.1/bits
-./usr/include/g++/alpha-unknown-openbsd5.1/bits/atomic_word.h
-./usr/include/g++/alpha-unknown-openbsd5.1/bits/basic_file.h
-./usr/include/g++/alpha-unknown-openbsd5.1/bits/c++allocator.h
-./usr/include/g++/alpha-unknown-openbsd5.1/bits/c++config.h
-./usr/include/g++/alpha-unknown-openbsd5.1/bits/c++io.h
-./usr/include/g++/alpha-unknown-openbsd5.1/bits/c++locale.h
-./usr/include/g++/alpha-unknown-openbsd5.1/bits/c++locale_internal.h
-./usr/include/g++/alpha-unknown-openbsd5.1/bits/compatibility.h
-./usr/include/g++/alpha-unknown-openbsd5.1/bits/cpu_defines.h
-./usr/include/g++/alpha-unknown-openbsd5.1/bits/ctype_base.h
-./usr/include/g++/alpha-unknown-openbsd5.1/bits/ctype_inline.h
-./usr/include/g++/alpha-unknown-openbsd5.1/bits/ctype_noninline.h
-./usr/include/g++/alpha-unknown-openbsd5.1/bits/cxxabi_tweaks.h
-./usr/include/g++/alpha-unknown-openbsd5.1/bits/gthr-default.h
-./usr/include/g++/alpha-unknown-openbsd5.1/bits/gthr-posix.h
-./usr/include/g++/alpha-unknown-openbsd5.1/bits/gthr-single.h
-./usr/include/g++/alpha-unknown-openbsd5.1/bits/gthr-tpf.h
-./usr/include/g++/alpha-unknown-openbsd5.1/bits/gthr.h
-./usr/include/g++/alpha-unknown-openbsd5.1/bits/messages_members.h
-./usr/include/g++/alpha-unknown-openbsd5.1/bits/os_defines.h
-./usr/include/g++/alpha-unknown-openbsd5.1/bits/time_members.h
+./usr/include/g++/alpha-unknown-openbsd5.2
+./usr/include/g++/alpha-unknown-openbsd5.2/bits
+./usr/include/g++/alpha-unknown-openbsd5.2/bits/atomic_word.h
+./usr/include/g++/alpha-unknown-openbsd5.2/bits/basic_file.h
+./usr/include/g++/alpha-unknown-openbsd5.2/bits/c++allocator.h
+./usr/include/g++/alpha-unknown-openbsd5.2/bits/c++config.h
+./usr/include/g++/alpha-unknown-openbsd5.2/bits/c++io.h
+./usr/include/g++/alpha-unknown-openbsd5.2/bits/c++locale.h
+./usr/include/g++/alpha-unknown-openbsd5.2/bits/c++locale_internal.h
+./usr/include/g++/alpha-unknown-openbsd5.2/bits/compatibility.h
+./usr/include/g++/alpha-unknown-openbsd5.2/bits/cpu_defines.h
+./usr/include/g++/alpha-unknown-openbsd5.2/bits/ctype_base.h
+./usr/include/g++/alpha-unknown-openbsd5.2/bits/ctype_inline.h
+./usr/include/g++/alpha-unknown-openbsd5.2/bits/ctype_noninline.h
+./usr/include/g++/alpha-unknown-openbsd5.2/bits/cxxabi_tweaks.h
+./usr/include/g++/alpha-unknown-openbsd5.2/bits/gthr-default.h
+./usr/include/g++/alpha-unknown-openbsd5.2/bits/gthr-posix.h
+./usr/include/g++/alpha-unknown-openbsd5.2/bits/gthr-single.h
+./usr/include/g++/alpha-unknown-openbsd5.2/bits/gthr-tpf.h
+./usr/include/g++/alpha-unknown-openbsd5.2/bits/gthr.h
+./usr/include/g++/alpha-unknown-openbsd5.2/bits/messages_members.h
+./usr/include/g++/alpha-unknown-openbsd5.2/bits/os_defines.h
+./usr/include/g++/alpha-unknown-openbsd5.2/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -607,9 +607,9 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.1/4.2.1/cc1obj
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.1/4.2.1/cc1plus
-./usr/lib/gcc-lib/alpha-unknown-openbsd5.1/4.2.1/libgcc.a
+./usr/lib/gcc-lib/alpha-unknown-openbsd5.2/4.2.1/cc1obj
+./usr/lib/gcc-lib/alpha-unknown-openbsd5.2/4.2.1/cc1plus
+./usr/lib/gcc-lib/alpha-unknown-openbsd5.2/4.2.1/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 ead9c770d52..abda702106b 100644
--- a/distrib/sets/lists/comp/md.amd64
+++ b/distrib/sets/lists/comp/md.amd64
@@ -76,29 +76,29 @@
 ./usr/include/amd64/vga_post.h
 ./usr/include/amd64/vmparam.h
 ./usr/include/emmintrin.h
-./usr/include/g++/amd64-unknown-openbsd5.1
-./usr/include/g++/amd64-unknown-openbsd5.1/bits
-./usr/include/g++/amd64-unknown-openbsd5.1/bits/atomic_word.h
-./usr/include/g++/amd64-unknown-openbsd5.1/bits/basic_file.h
-./usr/include/g++/amd64-unknown-openbsd5.1/bits/c++allocator.h
-./usr/include/g++/amd64-unknown-openbsd5.1/bits/c++config.h
-./usr/include/g++/amd64-unknown-openbsd5.1/bits/c++io.h
-./usr/include/g++/amd64-unknown-openbsd5.1/bits/c++locale.h
-./usr/include/g++/amd64-unknown-openbsd5.1/bits/c++locale_internal.h
-./usr/include/g++/amd64-unknown-openbsd5.1/bits/compatibility.h
-./usr/include/g++/amd64-unknown-openbsd5.1/bits/cpu_defines.h
-./usr/include/g++/amd64-unknown-openbsd5.1/bits/ctype_base.h
-./usr/include/g++/amd64-unknown-openbsd5.1/bits/ctype_inline.h
-./usr/include/g++/amd64-unknown-openbsd5.1/bits/ctype_noninline.h
-./usr/include/g++/amd64-unknown-openbsd5.1/bits/cxxabi_tweaks.h
-./usr/include/g++/amd64-unknown-openbsd5.1/bits/gthr-default.h
-./usr/include/g++/amd64-unknown-openbsd5.1/bits/gthr-posix.h
-./usr/include/g++/amd64-unknown-openbsd5.1/bits/gthr-single.h
-./usr/include/g++/amd64-unknown-openbsd5.1/bits/gthr-tpf.h
-./usr/include/g++/amd64-unknown-openbsd5.1/bits/gthr.h
-./usr/include/g++/amd64-unknown-openbsd5.1/bits/messages_members.h
-./usr/include/g++/amd64-unknown-openbsd5.1/bits/os_defines.h
-./usr/include/g++/amd64-unknown-openbsd5.1/bits/time_members.h
+./usr/include/g++/amd64-unknown-openbsd5.2
+./usr/include/g++/amd64-unknown-openbsd5.2/bits
+./usr/include/g++/amd64-unknown-openbsd5.2/bits/atomic_word.h
+./usr/include/g++/amd64-unknown-openbsd5.2/bits/basic_file.h
+./usr/include/g++/amd64-unknown-openbsd5.2/bits/c++allocator.h
+./usr/include/g++/amd64-unknown-openbsd5.2/bits/c++config.h
+./usr/include/g++/amd64-unknown-openbsd5.2/bits/c++io.h
+./usr/include/g++/amd64-unknown-openbsd5.2/bits/c++locale.h
+./usr/include/g++/amd64-unknown-openbsd5.2/bits/c++locale_internal.h
+./usr/include/g++/amd64-unknown-openbsd5.2/bits/compatibility.h
+./usr/include/g++/amd64-unknown-openbsd5.2/bits/cpu_defines.h
+./usr/include/g++/amd64-unknown-openbsd5.2/bits/ctype_base.h
+./usr/include/g++/amd64-unknown-openbsd5.2/bits/ctype_inline.h
+./usr/include/g++/amd64-unknown-openbsd5.2/bits/ctype_noninline.h
+./usr/include/g++/amd64-unknown-openbsd5.2/bits/cxxabi_tweaks.h
+./usr/include/g++/amd64-unknown-openbsd5.2/bits/gthr-default.h
+./usr/include/g++/amd64-unknown-openbsd5.2/bits/gthr-posix.h
+./usr/include/g++/amd64-unknown-openbsd5.2/bits/gthr-single.h
+./usr/include/g++/amd64-unknown-openbsd5.2/bits/gthr-tpf.h
+./usr/include/g++/amd64-unknown-openbsd5.2/bits/gthr.h
+./usr/include/g++/amd64-unknown-openbsd5.2/bits/messages_members.h
+./usr/include/g++/amd64-unknown-openbsd5.2/bits/os_defines.h
+./usr/include/g++/amd64-unknown-openbsd5.2/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -630,9 +630,9 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.1/4.2.1/cc1obj
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.1/4.2.1/cc1plus
-./usr/lib/gcc-lib/amd64-unknown-openbsd5.1/4.2.1/libgcc.a
+./usr/lib/gcc-lib/amd64-unknown-openbsd5.2/4.2.1/cc1obj
+./usr/lib/gcc-lib/amd64-unknown-openbsd5.2/4.2.1/cc1plus
+./usr/lib/gcc-lib/amd64-unknown-openbsd5.2/4.2.1/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 300fb1eca57..13090ccd013 100644
--- a/distrib/sets/lists/comp/md.armish
+++ b/distrib/sets/lists/comp/md.armish
@@ -98,29 +98,29 @@
 ./usr/include/armish/tcb.h
 ./usr/include/armish/trap.h
 ./usr/include/armish/vmparam.h
-./usr/include/g++/arm-unknown-openbsd5.1
-./usr/include/g++/arm-unknown-openbsd5.1/bits
-./usr/include/g++/arm-unknown-openbsd5.1/bits/atomic_word.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/basic_file.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/c++allocator.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/c++config.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/c++io.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/c++locale.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/c++locale_internal.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/compatibility.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/cpu_defines.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/ctype_base.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/ctype_inline.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/ctype_noninline.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/cxxabi_tweaks.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/gthr-default.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/gthr-posix.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/gthr-single.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/gthr-tpf.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/gthr.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/messages_members.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/os_defines.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/time_members.h
+./usr/include/g++/arm-unknown-openbsd5.2
+./usr/include/g++/arm-unknown-openbsd5.2/bits
+./usr/include/g++/arm-unknown-openbsd5.2/bits/atomic_word.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/basic_file.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/c++allocator.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/c++config.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/c++io.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/c++locale.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/c++locale_internal.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/compatibility.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/cpu_defines.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/ctype_base.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/ctype_inline.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/ctype_noninline.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/cxxabi_tweaks.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/gthr-default.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/gthr-posix.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/gthr-single.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/gthr-tpf.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/gthr.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/messages_members.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/os_defines.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -649,9 +649,9 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/arm-unknown-openbsd5.1/4.2.1/cc1obj
-./usr/lib/gcc-lib/arm-unknown-openbsd5.1/4.2.1/cc1plus
-./usr/lib/gcc-lib/arm-unknown-openbsd5.1/4.2.1/libgcc.a
+./usr/lib/gcc-lib/arm-unknown-openbsd5.2/4.2.1/cc1obj
+./usr/lib/gcc-lib/arm-unknown-openbsd5.2/4.2.1/cc1plus
+./usr/lib/gcc-lib/arm-unknown-openbsd5.2/4.2.1/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 e1e0d8ad3a8..befb7412400 100644
--- a/distrib/sets/lists/comp/md.aviion
+++ b/distrib/sets/lists/comp/md.aviion
@@ -211,17 +211,17 @@
 ./usr/include/m88k/va-m88k.h
 ./usr/include/m88k/varargs.h
 ./usr/include/m88k/vmparam.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/cc1obj
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/cc1plus
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/include/README
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/include/exception
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/include/float.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/include/new
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/include/new.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/cc1obj
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/cc1plus
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/include/README
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/include/exception
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/include/float.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/include/new
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/include/new.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/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 2c5dc2072bd..5fb08f013c9 100644
--- a/distrib/sets/lists/comp/md.hp300
+++ b/distrib/sets/lists/comp/md.hp300
@@ -192,22 +192,22 @@
 ./usr/include/m68k/trap.h
 ./usr/include/m68k/varargs.h
 ./usr/include/m68k/vmparam.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/cc1obj
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/fPIC
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/fPIC/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/fpic
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/fpic/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/include/README
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/include/exception
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/include/float.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/include/new
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/include/new.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/cc1obj
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/cc1plus
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/fPIC
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/fPIC/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/fpic
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/fpic/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/include/README
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/include/exception
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/include/float.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/include/new
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/include/new.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/libgcc.a
 ./usr/lib/libasn1_pic.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
diff --git a/distrib/sets/lists/comp/md.hppa b/distrib/sets/lists/comp/md.hppa
index 4dbdf80a2b8..c9431e06a8a 100644
--- a/distrib/sets/lists/comp/md.hppa
+++ b/distrib/sets/lists/comp/md.hppa
@@ -458,29 +458,29 @@
 ./usr/include/g++/ext/vstring.tcc
 ./usr/include/g++/ext/vstring_fwd.h
 ./usr/include/g++/ext/vstring_util.h
-./usr/include/g++/hppa-unknown-openbsd5.1
-./usr/include/g++/hppa-unknown-openbsd5.1/bits
-./usr/include/g++/hppa-unknown-openbsd5.1/bits/atomic_word.h
-./usr/include/g++/hppa-unknown-openbsd5.1/bits/basic_file.h
-./usr/include/g++/hppa-unknown-openbsd5.1/bits/c++allocator.h
-./usr/include/g++/hppa-unknown-openbsd5.1/bits/c++config.h
-./usr/include/g++/hppa-unknown-openbsd5.1/bits/c++io.h
-./usr/include/g++/hppa-unknown-openbsd5.1/bits/c++locale.h
-./usr/include/g++/hppa-unknown-openbsd5.1/bits/c++locale_internal.h
-./usr/include/g++/hppa-unknown-openbsd5.1/bits/compatibility.h
-./usr/include/g++/hppa-unknown-openbsd5.1/bits/cpu_defines.h
-./usr/include/g++/hppa-unknown-openbsd5.1/bits/ctype_base.h
-./usr/include/g++/hppa-unknown-openbsd5.1/bits/ctype_inline.h
-./usr/include/g++/hppa-unknown-openbsd5.1/bits/ctype_noninline.h
-./usr/include/g++/hppa-unknown-openbsd5.1/bits/cxxabi_tweaks.h
-./usr/include/g++/hppa-unknown-openbsd5.1/bits/gthr-default.h
-./usr/include/g++/hppa-unknown-openbsd5.1/bits/gthr-posix.h
-./usr/include/g++/hppa-unknown-openbsd5.1/bits/gthr-single.h
-./usr/include/g++/hppa-unknown-openbsd5.1/bits/gthr-tpf.h
-./usr/include/g++/hppa-unknown-openbsd5.1/bits/gthr.h
-./usr/include/g++/hppa-unknown-openbsd5.1/bits/messages_members.h
-./usr/include/g++/hppa-unknown-openbsd5.1/bits/os_defines.h
-./usr/include/g++/hppa-unknown-openbsd5.1/bits/time_members.h
+./usr/include/g++/hppa-unknown-openbsd5.2
+./usr/include/g++/hppa-unknown-openbsd5.2/bits
+./usr/include/g++/hppa-unknown-openbsd5.2/bits/atomic_word.h
+./usr/include/g++/hppa-unknown-openbsd5.2/bits/basic_file.h
+./usr/include/g++/hppa-unknown-openbsd5.2/bits/c++allocator.h
+./usr/include/g++/hppa-unknown-openbsd5.2/bits/c++config.h
+./usr/include/g++/hppa-unknown-openbsd5.2/bits/c++io.h
+./usr/include/g++/hppa-unknown-openbsd5.2/bits/c++locale.h
+./usr/include/g++/hppa-unknown-openbsd5.2/bits/c++locale_internal.h
+./usr/include/g++/hppa-unknown-openbsd5.2/bits/compatibility.h
+./usr/include/g++/hppa-unknown-openbsd5.2/bits/cpu_defines.h
+./usr/include/g++/hppa-unknown-openbsd5.2/bits/ctype_base.h
+./usr/include/g++/hppa-unknown-openbsd5.2/bits/ctype_inline.h
+./usr/include/g++/hppa-unknown-openbsd5.2/bits/ctype_noninline.h
+./usr/include/g++/hppa-unknown-openbsd5.2/bits/cxxabi_tweaks.h
+./usr/include/g++/hppa-unknown-openbsd5.2/bits/gthr-default.h
+./usr/include/g++/hppa-unknown-openbsd5.2/bits/gthr-posix.h
+./usr/include/g++/hppa-unknown-openbsd5.2/bits/gthr-single.h
+./usr/include/g++/hppa-unknown-openbsd5.2/bits/gthr-tpf.h
+./usr/include/g++/hppa-unknown-openbsd5.2/bits/gthr.h
+./usr/include/g++/hppa-unknown-openbsd5.2/bits/messages_members.h
+./usr/include/g++/hppa-unknown-openbsd5.2/bits/os_defines.h
+./usr/include/g++/hppa-unknown-openbsd5.2/bits/time_members.h
 ./usr/include/g++/ios
 ./usr/include/g++/istream
 ./usr/include/g++/limits
@@ -606,9 +606,9 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.1/4.2.1/cc1obj
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.1/4.2.1/cc1plus
-./usr/lib/gcc-lib/hppa-unknown-openbsd5.1/4.2.1/libgcc.a
+./usr/lib/gcc-lib/hppa-unknown-openbsd5.2/4.2.1/cc1obj
+./usr/lib/gcc-lib/hppa-unknown-openbsd5.2/4.2.1/cc1plus
+./usr/lib/gcc-lib/hppa-unknown-openbsd5.2/4.2.1/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 94c22d601f8..2d4ac364e8e 100644
--- a/distrib/sets/lists/comp/md.hppa64
+++ b/distrib/sets/lists/comp/md.hppa64
@@ -126,24 +126,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-openbsd5.1
-./usr/include/g++/hppa64-unknown-openbsd5.1/bits
-./usr/include/g++/hppa64-unknown-openbsd5.1/bits/atomicity.h
-./usr/include/g++/hppa64-unknown-openbsd5.1/bits/basic_file.h
-./usr/include/g++/hppa64-unknown-openbsd5.1/bits/c++config.h
-./usr/include/g++/hppa64-unknown-openbsd5.1/bits/c++io.h
-./usr/include/g++/hppa64-unknown-openbsd5.1/bits/c++locale.h
-./usr/include/g++/hppa64-unknown-openbsd5.1/bits/codecvt_specializations.h
-./usr/include/g++/hppa64-unknown-openbsd5.1/bits/ctype_base.h
-./usr/include/g++/hppa64-unknown-openbsd5.1/bits/ctype_inline.h
-./usr/include/g++/hppa64-unknown-openbsd5.1/bits/ctype_noninline.h
-./usr/include/g++/hppa64-unknown-openbsd5.1/bits/gthr-default.h
-./usr/include/g++/hppa64-unknown-openbsd5.1/bits/gthr-posix.h
-./usr/include/g++/hppa64-unknown-openbsd5.1/bits/gthr-single.h
-./usr/include/g++/hppa64-unknown-openbsd5.1/bits/gthr.h
-./usr/include/g++/hppa64-unknown-openbsd5.1/bits/messages_members.h
-./usr/include/g++/hppa64-unknown-openbsd5.1/bits/os_defines.h
-./usr/include/g++/hppa64-unknown-openbsd5.1/bits/time_members.h
+./usr/include/g++/hppa64-unknown-openbsd5.2
+./usr/include/g++/hppa64-unknown-openbsd5.2/bits
+./usr/include/g++/hppa64-unknown-openbsd5.2/bits/atomicity.h
+./usr/include/g++/hppa64-unknown-openbsd5.2/bits/basic_file.h
+./usr/include/g++/hppa64-unknown-openbsd5.2/bits/c++config.h
+./usr/include/g++/hppa64-unknown-openbsd5.2/bits/c++io.h
+./usr/include/g++/hppa64-unknown-openbsd5.2/bits/c++locale.h
+./usr/include/g++/hppa64-unknown-openbsd5.2/bits/codecvt_specializations.h
+./usr/include/g++/hppa64-unknown-openbsd5.2/bits/ctype_base.h
+./usr/include/g++/hppa64-unknown-openbsd5.2/bits/ctype_inline.h
+./usr/include/g++/hppa64-unknown-openbsd5.2/bits/ctype_noninline.h
+./usr/include/g++/hppa64-unknown-openbsd5.2/bits/gthr-default.h
+./usr/include/g++/hppa64-unknown-openbsd5.2/bits/gthr-posix.h
+./usr/include/g++/hppa64-unknown-openbsd5.2/bits/gthr-single.h
+./usr/include/g++/hppa64-unknown-openbsd5.2/bits/gthr.h
+./usr/include/g++/hppa64-unknown-openbsd5.2/bits/messages_members.h
+./usr/include/g++/hppa64-unknown-openbsd5.2/bits/os_defines.h
+./usr/include/g++/hppa64-unknown-openbsd5.2/bits/time_members.h
 ./usr/include/g++/ios
 ./usr/include/g++/istream
 ./usr/include/g++/limits
@@ -208,12 +208,12 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.1/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.1/3.3.5/cc1obj
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.1/3.3.5/cc1plus
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.1/3.3.5/include
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.1/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/hppa64-unknown-openbsd5.1/3.3.5/libgcc.a
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.2/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.2/3.3.5/cc1obj
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.2/3.3.5/cc1plus
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.2/3.3.5/include
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.2/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/hppa64-unknown-openbsd5.2/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 24c8fc5d29a..2b69851954e 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -459,29 +459,29 @@
 ./usr/include/g++/ext/vstring.tcc
 ./usr/include/g++/ext/vstring_fwd.h
 ./usr/include/g++/ext/vstring_util.h
-./usr/include/g++/i386-unknown-openbsd5.1
-./usr/include/g++/i386-unknown-openbsd5.1/bits
-./usr/include/g++/i386-unknown-openbsd5.1/bits/atomic_word.h
-./usr/include/g++/i386-unknown-openbsd5.1/bits/basic_file.h
-./usr/include/g++/i386-unknown-openbsd5.1/bits/c++allocator.h
-./usr/include/g++/i386-unknown-openbsd5.1/bits/c++config.h
-./usr/include/g++/i386-unknown-openbsd5.1/bits/c++io.h
-./usr/include/g++/i386-unknown-openbsd5.1/bits/c++locale.h
-./usr/include/g++/i386-unknown-openbsd5.1/bits/c++locale_internal.h
-./usr/include/g++/i386-unknown-openbsd5.1/bits/compatibility.h
-./usr/include/g++/i386-unknown-openbsd5.1/bits/cpu_defines.h
-./usr/include/g++/i386-unknown-openbsd5.1/bits/ctype_base.h
-./usr/include/g++/i386-unknown-openbsd5.1/bits/ctype_inline.h
-./usr/include/g++/i386-unknown-openbsd5.1/bits/ctype_noninline.h
-./usr/include/g++/i386-unknown-openbsd5.1/bits/cxxabi_tweaks.h
-./usr/include/g++/i386-unknown-openbsd5.1/bits/gthr-default.h
-./usr/include/g++/i386-unknown-openbsd5.1/bits/gthr-posix.h
-./usr/include/g++/i386-unknown-openbsd5.1/bits/gthr-single.h
-./usr/include/g++/i386-unknown-openbsd5.1/bits/gthr-tpf.h
-./usr/include/g++/i386-unknown-openbsd5.1/bits/gthr.h
-./usr/include/g++/i386-unknown-openbsd5.1/bits/messages_members.h
-./usr/include/g++/i386-unknown-openbsd5.1/bits/os_defines.h
-./usr/include/g++/i386-unknown-openbsd5.1/bits/time_members.h
+./usr/include/g++/i386-unknown-openbsd5.2
+./usr/include/g++/i386-unknown-openbsd5.2/bits
+./usr/include/g++/i386-unknown-openbsd5.2/bits/atomic_word.h
+./usr/include/g++/i386-unknown-openbsd5.2/bits/basic_file.h
+./usr/include/g++/i386-unknown-openbsd5.2/bits/c++allocator.h
+./usr/include/g++/i386-unknown-openbsd5.2/bits/c++config.h
+./usr/include/g++/i386-unknown-openbsd5.2/bits/c++io.h
+./usr/include/g++/i386-unknown-openbsd5.2/bits/c++locale.h
+./usr/include/g++/i386-unknown-openbsd5.2/bits/c++locale_internal.h
+./usr/include/g++/i386-unknown-openbsd5.2/bits/compatibility.h
+./usr/include/g++/i386-unknown-openbsd5.2/bits/cpu_defines.h
+./usr/include/g++/i386-unknown-openbsd5.2/bits/ctype_base.h
+./usr/include/g++/i386-unknown-openbsd5.2/bits/ctype_inline.h
+./usr/include/g++/i386-unknown-openbsd5.2/bits/ctype_noninline.h
+./usr/include/g++/i386-unknown-openbsd5.2/bits/cxxabi_tweaks.h
+./usr/include/g++/i386-unknown-openbsd5.2/bits/gthr-default.h
+./usr/include/g++/i386-unknown-openbsd5.2/bits/gthr-posix.h
+./usr/include/g++/i386-unknown-openbsd5.2/bits/gthr-single.h
+./usr/include/g++/i386-unknown-openbsd5.2/bits/gthr-tpf.h
+./usr/include/g++/i386-unknown-openbsd5.2/bits/gthr.h
+./usr/include/g++/i386-unknown-openbsd5.2/bits/messages_members.h
+./usr/include/g++/i386-unknown-openbsd5.2/bits/os_defines.h
+./usr/include/g++/i386-unknown-openbsd5.2/bits/time_members.h
 ./usr/include/g++/ios
 ./usr/include/g++/istream
 ./usr/include/g++/limits
@@ -635,9 +635,9 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/i386-unknown-openbsd5.1/4.2.1/cc1obj
-./usr/lib/gcc-lib/i386-unknown-openbsd5.1/4.2.1/cc1plus
-./usr/lib/gcc-lib/i386-unknown-openbsd5.1/4.2.1/libgcc.a
+./usr/lib/gcc-lib/i386-unknown-openbsd5.2/4.2.1/cc1obj
+./usr/lib/gcc-lib/i386-unknown-openbsd5.2/4.2.1/cc1plus
+./usr/lib/gcc-lib/i386-unknown-openbsd5.2/4.2.1/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 f84995a938a..413e3d17a4d 100644
--- a/distrib/sets/lists/comp/md.landisk
+++ b/distrib/sets/lists/comp/md.landisk
@@ -463,29 +463,29 @@
 ./usr/include/g++/limits
 ./usr/include/g++/locale
 ./usr/include/g++/ostream
-./usr/include/g++/sh-unknown-openbsd5.1
-./usr/include/g++/sh-unknown-openbsd5.1/bits
-./usr/include/g++/sh-unknown-openbsd5.1/bits/atomic_word.h
-./usr/include/g++/sh-unknown-openbsd5.1/bits/basic_file.h
-./usr/include/g++/sh-unknown-openbsd5.1/bits/c++allocator.h
-./usr/include/g++/sh-unknown-openbsd5.1/bits/c++config.h
-./usr/include/g++/sh-unknown-openbsd5.1/bits/c++io.h
-./usr/include/g++/sh-unknown-openbsd5.1/bits/c++locale.h
-./usr/include/g++/sh-unknown-openbsd5.1/bits/c++locale_internal.h
-./usr/include/g++/sh-unknown-openbsd5.1/bits/compatibility.h
-./usr/include/g++/sh-unknown-openbsd5.1/bits/cpu_defines.h
-./usr/include/g++/sh-unknown-openbsd5.1/bits/ctype_base.h
-./usr/include/g++/sh-unknown-openbsd5.1/bits/ctype_inline.h
-./usr/include/g++/sh-unknown-openbsd5.1/bits/ctype_noninline.h
-./usr/include/g++/sh-unknown-openbsd5.1/bits/cxxabi_tweaks.h
-./usr/include/g++/sh-unknown-openbsd5.1/bits/gthr-default.h
-./usr/include/g++/sh-unknown-openbsd5.1/bits/gthr-posix.h
-./usr/include/g++/sh-unknown-openbsd5.1/bits/gthr-single.h
-./usr/include/g++/sh-unknown-openbsd5.1/bits/gthr-tpf.h
-./usr/include/g++/sh-unknown-openbsd5.1/bits/gthr.h
-./usr/include/g++/sh-unknown-openbsd5.1/bits/messages_members.h
-./usr/include/g++/sh-unknown-openbsd5.1/bits/os_defines.h
-./usr/include/g++/sh-unknown-openbsd5.1/bits/time_members.h
+./usr/include/g++/sh-unknown-openbsd5.2
+./usr/include/g++/sh-unknown-openbsd5.2/bits
+./usr/include/g++/sh-unknown-openbsd5.2/bits/atomic_word.h
+./usr/include/g++/sh-unknown-openbsd5.2/bits/basic_file.h
+./usr/include/g++/sh-unknown-openbsd5.2/bits/c++allocator.h
+./usr/include/g++/sh-unknown-openbsd5.2/bits/c++config.h
+./usr/include/g++/sh-unknown-openbsd5.2/bits/c++io.h
+./usr/include/g++/sh-unknown-openbsd5.2/bits/c++locale.h
+./usr/include/g++/sh-unknown-openbsd5.2/bits/c++locale_internal.h
+./usr/include/g++/sh-unknown-openbsd5.2/bits/compatibility.h
+./usr/include/g++/sh-unknown-openbsd5.2/bits/cpu_defines.h
+./usr/include/g++/sh-unknown-openbsd5.2/bits/ctype_base.h
+./usr/include/g++/sh-unknown-openbsd5.2/bits/ctype_inline.h
+./usr/include/g++/sh-unknown-openbsd5.2/bits/ctype_noninline.h
+./usr/include/g++/sh-unknown-openbsd5.2/bits/cxxabi_tweaks.h
+./usr/include/g++/sh-unknown-openbsd5.2/bits/gthr-default.h
+./usr/include/g++/sh-unknown-openbsd5.2/bits/gthr-posix.h
+./usr/include/g++/sh-unknown-openbsd5.2/bits/gthr-single.h
+./usr/include/g++/sh-unknown-openbsd5.2/bits/gthr-tpf.h
+./usr/include/g++/sh-unknown-openbsd5.2/bits/gthr.h
+./usr/include/g++/sh-unknown-openbsd5.2/bits/messages_members.h
+./usr/include/g++/sh-unknown-openbsd5.2/bits/os_defines.h
+./usr/include/g++/sh-unknown-openbsd5.2/bits/time_members.h
 ./usr/include/g++/streambuf
 ./usr/include/g++/tr1
 ./usr/include/g++/tr1/array
@@ -654,14 +654,14 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sh-unknown-openbsd5.1
-./usr/lib/gcc-lib/sh-unknown-openbsd5.1/4.2.1
-./usr/lib/gcc-lib/sh-unknown-openbsd5.1/4.2.1/cc1
-./usr/lib/gcc-lib/sh-unknown-openbsd5.1/4.2.1/cc1obj
-./usr/lib/gcc-lib/sh-unknown-openbsd5.1/4.2.1/cc1plus
-./usr/lib/gcc-lib/sh-unknown-openbsd5.1/4.2.1/collect2
-./usr/lib/gcc-lib/sh-unknown-openbsd5.1/4.2.1/libgcc.a
-./usr/lib/gcc-lib/sh-unknown-openbsd5.1/4.2.1/specs
+./usr/lib/gcc-lib/sh-unknown-openbsd5.2
+./usr/lib/gcc-lib/sh-unknown-openbsd5.2/4.2.1
+./usr/lib/gcc-lib/sh-unknown-openbsd5.2/4.2.1/cc1
+./usr/lib/gcc-lib/sh-unknown-openbsd5.2/4.2.1/cc1obj
+./usr/lib/gcc-lib/sh-unknown-openbsd5.2/4.2.1/cc1plus
+./usr/lib/gcc-lib/sh-unknown-openbsd5.2/4.2.1/collect2
+./usr/lib/gcc-lib/sh-unknown-openbsd5.2/4.2.1/libgcc.a
+./usr/lib/gcc-lib/sh-unknown-openbsd5.2/4.2.1/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.loongson b/distrib/sets/lists/comp/md.loongson
index 3e17c52588e..e4e2474ddac 100644
--- a/distrib/sets/lists/comp/md.loongson
+++ b/distrib/sets/lists/comp/md.loongson
@@ -462,29 +462,29 @@
 ./usr/include/g++/istream
 ./usr/include/g++/limits
 ./usr/include/g++/locale
-./usr/include/g++/mips64el-unknown-openbsd5.1
-./usr/include/g++/mips64el-unknown-openbsd5.1/bits
-./usr/include/g++/mips64el-unknown-openbsd5.1/bits/atomic_word.h
-./usr/include/g++/mips64el-unknown-openbsd5.1/bits/basic_file.h
-./usr/include/g++/mips64el-unknown-openbsd5.1/bits/c++allocator.h
-./usr/include/g++/mips64el-unknown-openbsd5.1/bits/c++config.h
-./usr/include/g++/mips64el-unknown-openbsd5.1/bits/c++io.h
-./usr/include/g++/mips64el-unknown-openbsd5.1/bits/c++locale.h
-./usr/include/g++/mips64el-unknown-openbsd5.1/bits/c++locale_internal.h
-./usr/include/g++/mips64el-unknown-openbsd5.1/bits/compatibility.h
-./usr/include/g++/mips64el-unknown-openbsd5.1/bits/cpu_defines.h
-./usr/include/g++/mips64el-unknown-openbsd5.1/bits/ctype_base.h
-./usr/include/g++/mips64el-unknown-openbsd5.1/bits/ctype_inline.h
-./usr/include/g++/mips64el-unknown-openbsd5.1/bits/ctype_noninline.h
-./usr/include/g++/mips64el-unknown-openbsd5.1/bits/cxxabi_tweaks.h
-./usr/include/g++/mips64el-unknown-openbsd5.1/bits/gthr-default.h
-./usr/include/g++/mips64el-unknown-openbsd5.1/bits/gthr-posix.h
-./usr/include/g++/mips64el-unknown-openbsd5.1/bits/gthr-single.h
-./usr/include/g++/mips64el-unknown-openbsd5.1/bits/gthr-tpf.h
-./usr/include/g++/mips64el-unknown-openbsd5.1/bits/gthr.h
-./usr/include/g++/mips64el-unknown-openbsd5.1/bits/messages_members.h
-./usr/include/g++/mips64el-unknown-openbsd5.1/bits/os_defines.h
-./usr/include/g++/mips64el-unknown-openbsd5.1/bits/time_members.h
+./usr/include/g++/mips64el-unknown-openbsd5.2
+./usr/include/g++/mips64el-unknown-openbsd5.2/bits
+./usr/include/g++/mips64el-unknown-openbsd5.2/bits/atomic_word.h
+./usr/include/g++/mips64el-unknown-openbsd5.2/bits/basic_file.h
+./usr/include/g++/mips64el-unknown-openbsd5.2/bits/c++allocator.h
+./usr/include/g++/mips64el-unknown-openbsd5.2/bits/c++config.h
+./usr/include/g++/mips64el-unknown-openbsd5.2/bits/c++io.h
+./usr/include/g++/mips64el-unknown-openbsd5.2/bits/c++locale.h
+./usr/include/g++/mips64el-unknown-openbsd5.2/bits/c++locale_internal.h
+./usr/include/g++/mips64el-unknown-openbsd5.2/bits/compatibility.h
+./usr/include/g++/mips64el-unknown-openbsd5.2/bits/cpu_defines.h
+./usr/include/g++/mips64el-unknown-openbsd5.2/bits/ctype_base.h
+./usr/include/g++/mips64el-unknown-openbsd5.2/bits/ctype_inline.h
+./usr/include/g++/mips64el-unknown-openbsd5.2/bits/ctype_noninline.h
+./usr/include/g++/mips64el-unknown-openbsd5.2/bits/cxxabi_tweaks.h
+./usr/include/g++/mips64el-unknown-openbsd5.2/bits/gthr-default.h
+./usr/include/g++/mips64el-unknown-openbsd5.2/bits/gthr-posix.h
+./usr/include/g++/mips64el-unknown-openbsd5.2/bits/gthr-single.h
+./usr/include/g++/mips64el-unknown-openbsd5.2/bits/gthr-tpf.h
+./usr/include/g++/mips64el-unknown-openbsd5.2/bits/gthr.h
+./usr/include/g++/mips64el-unknown-openbsd5.2/bits/messages_members.h
+./usr/include/g++/mips64el-unknown-openbsd5.2/bits/os_defines.h
+./usr/include/g++/mips64el-unknown-openbsd5.2/bits/time_members.h
 ./usr/include/g++/ostream
 ./usr/include/g++/streambuf
 ./usr/include/g++/tr1
@@ -651,13 +651,13 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.1/4.2.1
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.1/4.2.1/cc1
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.1/4.2.1/cc1obj
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.1/4.2.1/cc1plus
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.1/4.2.1/collect2
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.1/4.2.1/libgcc.a
-./usr/lib/gcc-lib/mips64el-unknown-openbsd5.1/4.2.1/specs
+./usr/lib/gcc-lib/mips64el-unknown-openbsd5.2/4.2.1
+./usr/lib/gcc-lib/mips64el-unknown-openbsd5.2/4.2.1/cc1
+./usr/lib/gcc-lib/mips64el-unknown-openbsd5.2/4.2.1/cc1obj
+./usr/lib/gcc-lib/mips64el-unknown-openbsd5.2/4.2.1/cc1plus
+./usr/lib/gcc-lib/mips64el-unknown-openbsd5.2/4.2.1/collect2
+./usr/lib/gcc-lib/mips64el-unknown-openbsd5.2/4.2.1/libgcc.a
+./usr/lib/gcc-lib/mips64el-unknown-openbsd5.2/4.2.1/specs
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
 ./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.luna88k b/distrib/sets/lists/comp/md.luna88k
index 34163cefcfe..85293afdee9 100644
--- a/distrib/sets/lists/comp/md.luna88k
+++ b/distrib/sets/lists/comp/md.luna88k
@@ -204,17 +204,17 @@
 ./usr/include/m88k/va-m88k.h
 ./usr/include/m88k/varargs.h
 ./usr/include/m88k/vmparam.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/cc1obj
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/cc1plus
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/include/README
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/include/exception
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/include/float.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/include/new
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/include/new.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/cc1obj
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/cc1plus
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/include/README
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/include/exception
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/include/float.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/include/new
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/include/new.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/libgcc.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/scrt0.o
diff --git a/distrib/sets/lists/comp/md.macppc b/distrib/sets/lists/comp/md.macppc
index 26ef5096519..b4abc585176 100644
--- a/distrib/sets/lists/comp/md.macppc
+++ b/distrib/sets/lists/comp/md.macppc
@@ -464,29 +464,29 @@
 ./usr/include/g++/limits
 ./usr/include/g++/locale
 ./usr/include/g++/ostream
-./usr/include/g++/powerpc-unknown-openbsd5.1
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/atomic_word.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/basic_file.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/c++allocator.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/c++config.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/c++io.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/c++locale.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/c++locale_internal.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/compatibility.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/cpu_defines.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/ctype_base.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/ctype_inline.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/ctype_noninline.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/cxxabi_tweaks.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/gthr-default.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/gthr-posix.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/gthr-single.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/gthr-tpf.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/gthr.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/messages_members.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/os_defines.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/time_members.h
+./usr/include/g++/powerpc-unknown-openbsd5.2
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/atomic_word.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/basic_file.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/c++allocator.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/c++config.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/c++io.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/c++locale.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/c++locale_internal.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/compatibility.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/cpu_defines.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/ctype_base.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/ctype_inline.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/ctype_noninline.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/cxxabi_tweaks.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/gthr-default.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/gthr-posix.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/gthr-single.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/gthr-tpf.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/gthr.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/messages_members.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/os_defines.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/time_members.h
 ./usr/include/g++/streambuf
 ./usr/include/g++/tr1
 ./usr/include/g++/tr1/array
@@ -649,9 +649,9 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.1/4.2.1/cc1obj
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.1/4.2.1/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.1/4.2.1/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.2/4.2.1/cc1obj
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.2/4.2.1/cc1plus
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.2/4.2.1/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 bdbf066c5d2..92e926ca6e3 100644
--- a/distrib/sets/lists/comp/md.mvme68k
+++ b/distrib/sets/lists/comp/md.mvme68k
@@ -194,22 +194,22 @@
 ./usr/include/mvme68k/trap.h
 ./usr/include/mvme68k/varargs.h
 ./usr/include/mvme68k/vmparam.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/cc1obj
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/fPIC
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/fPIC/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/fpic
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/fpic/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/include/README
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/include/exception
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/include/float.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/include/new
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/include/new.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m68k-unknown-openbsd5.1/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/cc1obj
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/cc1plus
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/fPIC
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/fPIC/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/fpic
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/fpic/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/include/README
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/include/exception
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/include/float.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/include/new
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/include/new.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m68k-unknown-openbsd5.2/2.95.3/libgcc.a
 ./usr/lib/libasn1_pic.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
diff --git a/distrib/sets/lists/comp/md.mvme88k b/distrib/sets/lists/comp/md.mvme88k
index cb3f2e2e60f..6f5a1029fac 100644
--- a/distrib/sets/lists/comp/md.mvme88k
+++ b/distrib/sets/lists/comp/md.mvme88k
@@ -215,17 +215,17 @@
 ./usr/include/mvme88k/va-m88k.h
 ./usr/include/mvme88k/varargs.h
 ./usr/include/mvme88k/vmparam.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/cc1obj
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/cc1plus
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/include/README
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/include/exception
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/include/float.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/include/new
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/include/new.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m88k-unknown-openbsd5.1/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/cc1obj
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/cc1plus
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/include/README
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/include/exception
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/include/float.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/include/new
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/include/new.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/2.95.3/libgcc.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/scrt0.o
diff --git a/distrib/sets/lists/comp/md.palm b/distrib/sets/lists/comp/md.palm
index 4cb90fb0e00..35ddc04b2ee 100644
--- a/distrib/sets/lists/comp/md.palm
+++ b/distrib/sets/lists/comp/md.palm
@@ -53,29 +53,29 @@
 ./usr/include/arm/trap.h
 ./usr/include/arm/undefined.h
 ./usr/include/arm/vmparam.h
-./usr/include/g++/arm-unknown-openbsd5.1
-./usr/include/g++/arm-unknown-openbsd5.1/bits
-./usr/include/g++/arm-unknown-openbsd5.1/bits/atomic_word.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/basic_file.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/c++allocator.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/c++config.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/c++io.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/c++locale.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/c++locale_internal.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/compatibility.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/cpu_defines.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/ctype_base.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/ctype_inline.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/ctype_noninline.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/cxxabi_tweaks.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/gthr-default.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/gthr-posix.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/gthr-single.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/gthr-tpf.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/gthr.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/messages_members.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/os_defines.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/time_members.h
+./usr/include/g++/arm-unknown-openbsd5.2
+./usr/include/g++/arm-unknown-openbsd5.2/bits
+./usr/include/g++/arm-unknown-openbsd5.2/bits/atomic_word.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/basic_file.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/c++allocator.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/c++config.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/c++io.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/c++locale.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/c++locale_internal.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/compatibility.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/cpu_defines.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/ctype_base.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/ctype_inline.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/ctype_noninline.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/cxxabi_tweaks.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/gthr-default.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/gthr-posix.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/gthr-single.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/gthr-tpf.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/gthr.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/messages_members.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/os_defines.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -650,9 +650,9 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/arm-unknown-openbsd5.1/4.2.1/cc1obj
-./usr/lib/gcc-lib/arm-unknown-openbsd5.1/4.2.1/cc1plus
-./usr/lib/gcc-lib/arm-unknown-openbsd5.1/4.2.1/libgcc.a
+./usr/lib/gcc-lib/arm-unknown-openbsd5.2/4.2.1/cc1obj
+./usr/lib/gcc-lib/arm-unknown-openbsd5.2/4.2.1/cc1plus
+./usr/lib/gcc-lib/arm-unknown-openbsd5.2/4.2.1/libgcc.a
 ./usr/lib/libarm.a
 ./usr/lib/libarm_p.a
 ./usr/lib/libasn1_pic.a
diff --git a/distrib/sets/lists/comp/md.sgi b/distrib/sets/lists/comp/md.sgi
index 61b0be40158..bd760a2e05e 100644
--- a/distrib/sets/lists/comp/md.sgi
+++ b/distrib/sets/lists/comp/md.sgi
@@ -462,29 +462,29 @@
 ./usr/include/g++/istream
 ./usr/include/g++/limits
 ./usr/include/g++/locale
-./usr/include/g++/mips64-unknown-openbsd5.1
-./usr/include/g++/mips64-unknown-openbsd5.1/bits
-./usr/include/g++/mips64-unknown-openbsd5.1/bits/atomic_word.h
-./usr/include/g++/mips64-unknown-openbsd5.1/bits/basic_file.h
-./usr/include/g++/mips64-unknown-openbsd5.1/bits/c++allocator.h
-./usr/include/g++/mips64-unknown-openbsd5.1/bits/c++config.h
-./usr/include/g++/mips64-unknown-openbsd5.1/bits/c++io.h
-./usr/include/g++/mips64-unknown-openbsd5.1/bits/c++locale.h
-./usr/include/g++/mips64-unknown-openbsd5.1/bits/c++locale_internal.h
-./usr/include/g++/mips64-unknown-openbsd5.1/bits/compatibility.h
-./usr/include/g++/mips64-unknown-openbsd5.1/bits/cpu_defines.h
-./usr/include/g++/mips64-unknown-openbsd5.1/bits/ctype_base.h
-./usr/include/g++/mips64-unknown-openbsd5.1/bits/ctype_inline.h
-./usr/include/g++/mips64-unknown-openbsd5.1/bits/ctype_noninline.h
-./usr/include/g++/mips64-unknown-openbsd5.1/bits/cxxabi_tweaks.h
-./usr/include/g++/mips64-unknown-openbsd5.1/bits/gthr-default.h
-./usr/include/g++/mips64-unknown-openbsd5.1/bits/gthr-posix.h
-./usr/include/g++/mips64-unknown-openbsd5.1/bits/gthr-single.h
-./usr/include/g++/mips64-unknown-openbsd5.1/bits/gthr-tpf.h
-./usr/include/g++/mips64-unknown-openbsd5.1/bits/gthr.h
-./usr/include/g++/mips64-unknown-openbsd5.1/bits/messages_members.h
-./usr/include/g++/mips64-unknown-openbsd5.1/bits/os_defines.h
-./usr/include/g++/mips64-unknown-openbsd5.1/bits/time_members.h
+./usr/include/g++/mips64-unknown-openbsd5.2
+./usr/include/g++/mips64-unknown-openbsd5.2/bits
+./usr/include/g++/mips64-unknown-openbsd5.2/bits/atomic_word.h
+./usr/include/g++/mips64-unknown-openbsd5.2/bits/basic_file.h
+./usr/include/g++/mips64-unknown-openbsd5.2/bits/c++allocator.h
+./usr/include/g++/mips64-unknown-openbsd5.2/bits/c++config.h
+./usr/include/g++/mips64-unknown-openbsd5.2/bits/c++io.h
+./usr/include/g++/mips64-unknown-openbsd5.2/bits/c++locale.h
+./usr/include/g++/mips64-unknown-openbsd5.2/bits/c++locale_internal.h
+./usr/include/g++/mips64-unknown-openbsd5.2/bits/compatibility.h
+./usr/include/g++/mips64-unknown-openbsd5.2/bits/cpu_defines.h
+./usr/include/g++/mips64-unknown-openbsd5.2/bits/ctype_base.h
+./usr/include/g++/mips64-unknown-openbsd5.2/bits/ctype_inline.h
+./usr/include/g++/mips64-unknown-openbsd5.2/bits/ctype_noninline.h
+./usr/include/g++/mips64-unknown-openbsd5.2/bits/cxxabi_tweaks.h
+./usr/include/g++/mips64-unknown-openbsd5.2/bits/gthr-default.h
+./usr/include/g++/mips64-unknown-openbsd5.2/bits/gthr-posix.h
+./usr/include/g++/mips64-unknown-openbsd5.2/bits/gthr-single.h
+./usr/include/g++/mips64-unknown-openbsd5.2/bits/gthr-tpf.h
+./usr/include/g++/mips64-unknown-openbsd5.2/bits/gthr.h
+./usr/include/g++/mips64-unknown-openbsd5.2/bits/messages_members.h
+./usr/include/g++/mips64-unknown-openbsd5.2/bits/os_defines.h
+./usr/include/g++/mips64-unknown-openbsd5.2/bits/time_members.h
 ./usr/include/g++/ostream
 ./usr/include/g++/streambuf
 ./usr/include/g++/tr1
@@ -652,13 +652,13 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.1/4.2.1
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.1/4.2.1/cc1
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.1/4.2.1/cc1obj
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.1/4.2.1/cc1plus
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.1/4.2.1/collect2
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.1/4.2.1/libgcc.a
-./usr/lib/gcc-lib/mips64-unknown-openbsd5.1/4.2.1/specs
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.2/4.2.1
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.2/4.2.1/cc1
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.2/4.2.1/cc1obj
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.2/4.2.1/cc1plus
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.2/4.2.1/collect2
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.2/4.2.1/libgcc.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd5.2/4.2.1/specs
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
 ./usr/lib/libsupc++_p.a
diff --git a/distrib/sets/lists/comp/md.socppc b/distrib/sets/lists/comp/md.socppc
index 9ab938938e4..12b38de466b 100644
--- a/distrib/sets/lists/comp/md.socppc
+++ b/distrib/sets/lists/comp/md.socppc
@@ -464,29 +464,29 @@
 ./usr/include/g++/limits
 ./usr/include/g++/locale
 ./usr/include/g++/ostream
-./usr/include/g++/powerpc-unknown-openbsd5.1
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/atomic_word.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/basic_file.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/c++allocator.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/c++config.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/c++io.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/c++locale.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/c++locale_internal.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/compatibility.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/cpu_defines.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/ctype_base.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/ctype_inline.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/ctype_noninline.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/cxxabi_tweaks.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/gthr-default.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/gthr-posix.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/gthr-single.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/gthr-tpf.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/gthr.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/messages_members.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/os_defines.h
-./usr/include/g++/powerpc-unknown-openbsd5.1/bits/time_members.h
+./usr/include/g++/powerpc-unknown-openbsd5.2
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/atomic_word.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/basic_file.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/c++allocator.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/c++config.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/c++io.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/c++locale.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/c++locale_internal.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/compatibility.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/cpu_defines.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/ctype_base.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/ctype_inline.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/ctype_noninline.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/cxxabi_tweaks.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/gthr-default.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/gthr-posix.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/gthr-single.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/gthr-tpf.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/gthr.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/messages_members.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/os_defines.h
+./usr/include/g++/powerpc-unknown-openbsd5.2/bits/time_members.h
 ./usr/include/g++/streambuf
 ./usr/include/g++/tr1
 ./usr/include/g++/tr1/array
@@ -643,9 +643,9 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.1/4.2.1/cc1obj
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.1/4.2.1/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd5.1/4.2.1/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.2/4.2.1/cc1obj
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.2/4.2.1/cc1plus
+./usr/lib/gcc-lib/powerpc-unknown-openbsd5.2/4.2.1/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 32282c95c0f..5a925fa9f44 100644
--- a/distrib/sets/lists/comp/md.sparc
+++ b/distrib/sets/lists/comp/md.sparc
@@ -463,29 +463,29 @@
 ./usr/include/g++/limits
 ./usr/include/g++/locale
 ./usr/include/g++/ostream
-./usr/include/g++/sparc-unknown-openbsd5.1
-./usr/include/g++/sparc-unknown-openbsd5.1/bits
-./usr/include/g++/sparc-unknown-openbsd5.1/bits/atomic_word.h
-./usr/include/g++/sparc-unknown-openbsd5.1/bits/basic_file.h
-./usr/include/g++/sparc-unknown-openbsd5.1/bits/c++allocator.h
-./usr/include/g++/sparc-unknown-openbsd5.1/bits/c++config.h
-./usr/include/g++/sparc-unknown-openbsd5.1/bits/c++io.h
-./usr/include/g++/sparc-unknown-openbsd5.1/bits/c++locale.h
-./usr/include/g++/sparc-unknown-openbsd5.1/bits/c++locale_internal.h
-./usr/include/g++/sparc-unknown-openbsd5.1/bits/compatibility.h
-./usr/include/g++/sparc-unknown-openbsd5.1/bits/cpu_defines.h
-./usr/include/g++/sparc-unknown-openbsd5.1/bits/ctype_base.h
-./usr/include/g++/sparc-unknown-openbsd5.1/bits/ctype_inline.h
-./usr/include/g++/sparc-unknown-openbsd5.1/bits/ctype_noninline.h
-./usr/include/g++/sparc-unknown-openbsd5.1/bits/cxxabi_tweaks.h
-./usr/include/g++/sparc-unknown-openbsd5.1/bits/gthr-default.h
-./usr/include/g++/sparc-unknown-openbsd5.1/bits/gthr-posix.h
-./usr/include/g++/sparc-unknown-openbsd5.1/bits/gthr-single.h
-./usr/include/g++/sparc-unknown-openbsd5.1/bits/gthr-tpf.h
-./usr/include/g++/sparc-unknown-openbsd5.1/bits/gthr.h
-./usr/include/g++/sparc-unknown-openbsd5.1/bits/messages_members.h
-./usr/include/g++/sparc-unknown-openbsd5.1/bits/os_defines.h
-./usr/include/g++/sparc-unknown-openbsd5.1/bits/time_members.h
+./usr/include/g++/sparc-unknown-openbsd5.2
+./usr/include/g++/sparc-unknown-openbsd5.2/bits
+./usr/include/g++/sparc-unknown-openbsd5.2/bits/atomic_word.h
+./usr/include/g++/sparc-unknown-openbsd5.2/bits/basic_file.h
+./usr/include/g++/sparc-unknown-openbsd5.2/bits/c++allocator.h
+./usr/include/g++/sparc-unknown-openbsd5.2/bits/c++config.h
+./usr/include/g++/sparc-unknown-openbsd5.2/bits/c++io.h
+./usr/include/g++/sparc-unknown-openbsd5.2/bits/c++locale.h
+./usr/include/g++/sparc-unknown-openbsd5.2/bits/c++locale_internal.h
+./usr/include/g++/sparc-unknown-openbsd5.2/bits/compatibility.h
+./usr/include/g++/sparc-unknown-openbsd5.2/bits/cpu_defines.h
+./usr/include/g++/sparc-unknown-openbsd5.2/bits/ctype_base.h
+./usr/include/g++/sparc-unknown-openbsd5.2/bits/ctype_inline.h
+./usr/include/g++/sparc-unknown-openbsd5.2/bits/ctype_noninline.h
+./usr/include/g++/sparc-unknown-openbsd5.2/bits/cxxabi_tweaks.h
+./usr/include/g++/sparc-unknown-openbsd5.2/bits/gthr-default.h
+./usr/include/g++/sparc-unknown-openbsd5.2/bits/gthr-posix.h
+./usr/include/g++/sparc-unknown-openbsd5.2/bits/gthr-single.h
+./usr/include/g++/sparc-unknown-openbsd5.2/bits/gthr-tpf.h
+./usr/include/g++/sparc-unknown-openbsd5.2/bits/gthr.h
+./usr/include/g++/sparc-unknown-openbsd5.2/bits/messages_members.h
+./usr/include/g++/sparc-unknown-openbsd5.2/bits/os_defines.h
+./usr/include/g++/sparc-unknown-openbsd5.2/bits/time_members.h
 ./usr/include/g++/streambuf
 ./usr/include/g++/tr1
 ./usr/include/g++/tr1/array
@@ -610,9 +610,9 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.1/4.2.1/cc1obj
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.1/4.2.1/cc1plus
-./usr/lib/gcc-lib/sparc-unknown-openbsd5.1/4.2.1/libgcc.a
+./usr/lib/gcc-lib/sparc-unknown-openbsd5.2/4.2.1/cc1obj
+./usr/lib/gcc-lib/sparc-unknown-openbsd5.2/4.2.1/cc1plus
+./usr/lib/gcc-lib/sparc-unknown-openbsd5.2/4.2.1/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 e613fee6535..ed221a5808e 100644
--- a/distrib/sets/lists/comp/md.sparc64
+++ b/distrib/sets/lists/comp/md.sparc64
@@ -463,29 +463,29 @@
 ./usr/include/g++/limits
 ./usr/include/g++/locale
 ./usr/include/g++/ostream
-./usr/include/g++/sparc64-unknown-openbsd5.1
-./usr/include/g++/sparc64-unknown-openbsd5.1/bits
-./usr/include/g++/sparc64-unknown-openbsd5.1/bits/atomic_word.h
-./usr/include/g++/sparc64-unknown-openbsd5.1/bits/basic_file.h
-./usr/include/g++/sparc64-unknown-openbsd5.1/bits/c++allocator.h
-./usr/include/g++/sparc64-unknown-openbsd5.1/bits/c++config.h
-./usr/include/g++/sparc64-unknown-openbsd5.1/bits/c++io.h
-./usr/include/g++/sparc64-unknown-openbsd5.1/bits/c++locale.h
-./usr/include/g++/sparc64-unknown-openbsd5.1/bits/c++locale_internal.h
-./usr/include/g++/sparc64-unknown-openbsd5.1/bits/compatibility.h
-./usr/include/g++/sparc64-unknown-openbsd5.1/bits/cpu_defines.h
-./usr/include/g++/sparc64-unknown-openbsd5.1/bits/ctype_base.h
-./usr/include/g++/sparc64-unknown-openbsd5.1/bits/ctype_inline.h
-./usr/include/g++/sparc64-unknown-openbsd5.1/bits/ctype_noninline.h
-./usr/include/g++/sparc64-unknown-openbsd5.1/bits/cxxabi_tweaks.h
-./usr/include/g++/sparc64-unknown-openbsd5.1/bits/gthr-default.h
-./usr/include/g++/sparc64-unknown-openbsd5.1/bits/gthr-posix.h
-./usr/include/g++/sparc64-unknown-openbsd5.1/bits/gthr-single.h
-./usr/include/g++/sparc64-unknown-openbsd5.1/bits/gthr-tpf.h
-./usr/include/g++/sparc64-unknown-openbsd5.1/bits/gthr.h
-./usr/include/g++/sparc64-unknown-openbsd5.1/bits/messages_members.h
-./usr/include/g++/sparc64-unknown-openbsd5.1/bits/os_defines.h
-./usr/include/g++/sparc64-unknown-openbsd5.1/bits/time_members.h
+./usr/include/g++/sparc64-unknown-openbsd5.2
+./usr/include/g++/sparc64-unknown-openbsd5.2/bits
+./usr/include/g++/sparc64-unknown-openbsd5.2/bits/atomic_word.h
+./usr/include/g++/sparc64-unknown-openbsd5.2/bits/basic_file.h
+./usr/include/g++/sparc64-unknown-openbsd5.2/bits/c++allocator.h
+./usr/include/g++/sparc64-unknown-openbsd5.2/bits/c++config.h
+./usr/include/g++/sparc64-unknown-openbsd5.2/bits/c++io.h
+./usr/include/g++/sparc64-unknown-openbsd5.2/bits/c++locale.h
+./usr/include/g++/sparc64-unknown-openbsd5.2/bits/c++locale_internal.h
+./usr/include/g++/sparc64-unknown-openbsd5.2/bits/compatibility.h
+./usr/include/g++/sparc64-unknown-openbsd5.2/bits/cpu_defines.h
+./usr/include/g++/sparc64-unknown-openbsd5.2/bits/ctype_base.h
+./usr/include/g++/sparc64-unknown-openbsd5.2/bits/ctype_inline.h
+./usr/include/g++/sparc64-unknown-openbsd5.2/bits/ctype_noninline.h
+./usr/include/g++/sparc64-unknown-openbsd5.2/bits/cxxabi_tweaks.h
+./usr/include/g++/sparc64-unknown-openbsd5.2/bits/gthr-default.h
+./usr/include/g++/sparc64-unknown-openbsd5.2/bits/gthr-posix.h
+./usr/include/g++/sparc64-unknown-openbsd5.2/bits/gthr-single.h
+./usr/include/g++/sparc64-unknown-openbsd5.2/bits/gthr-tpf.h
+./usr/include/g++/sparc64-unknown-openbsd5.2/bits/gthr.h
+./usr/include/g++/sparc64-unknown-openbsd5.2/bits/messages_members.h
+./usr/include/g++/sparc64-unknown-openbsd5.2/bits/os_defines.h
+./usr/include/g++/sparc64-unknown-openbsd5.2/bits/time_members.h
 ./usr/include/g++/streambuf
 ./usr/include/g++/tr1
 ./usr/include/g++/tr1/array
@@ -612,9 +612,9 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.1/4.2.1/cc1obj
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.1/4.2.1/cc1plus
-./usr/lib/gcc-lib/sparc64-unknown-openbsd5.1/4.2.1/libgcc.a
+./usr/lib/gcc-lib/sparc64-unknown-openbsd5.2/4.2.1/cc1obj
+./usr/lib/gcc-lib/sparc64-unknown-openbsd5.2/4.2.1/cc1plus
+./usr/lib/gcc-lib/sparc64-unknown-openbsd5.2/4.2.1/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.vax b/distrib/sets/lists/comp/md.vax
index 9d6e0d517e7..3383c3bb02d 100644
--- a/distrib/sets/lists/comp/md.vax
+++ b/distrib/sets/lists/comp/md.vax
@@ -170,17 +170,17 @@
 ./usr/include/vax/vaxfp.h
 ./usr/include/vax/vmparam.h
 ./usr/include/vax/vsbus.h
-./usr/lib/gcc-lib/vax-unknown-openbsd5.1/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/vax-unknown-openbsd5.1/2.95.3/cc1obj
-./usr/lib/gcc-lib/vax-unknown-openbsd5.1/2.95.3/cc1plus
-./usr/lib/gcc-lib/vax-unknown-openbsd5.1/2.95.3/include/README
-./usr/lib/gcc-lib/vax-unknown-openbsd5.1/2.95.3/include/exception
-./usr/lib/gcc-lib/vax-unknown-openbsd5.1/2.95.3/include/float.h
-./usr/lib/gcc-lib/vax-unknown-openbsd5.1/2.95.3/include/limits.h
-./usr/lib/gcc-lib/vax-unknown-openbsd5.1/2.95.3/include/new
-./usr/lib/gcc-lib/vax-unknown-openbsd5.1/2.95.3/include/new.h
-./usr/lib/gcc-lib/vax-unknown-openbsd5.1/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/vax-unknown-openbsd5.1/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/vax-unknown-openbsd5.1/2.95.3/libgcc.a
+./usr/lib/gcc-lib/vax-unknown-openbsd5.2/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/vax-unknown-openbsd5.2/2.95.3/cc1obj
+./usr/lib/gcc-lib/vax-unknown-openbsd5.2/2.95.3/cc1plus
+./usr/lib/gcc-lib/vax-unknown-openbsd5.2/2.95.3/include/README
+./usr/lib/gcc-lib/vax-unknown-openbsd5.2/2.95.3/include/exception
+./usr/lib/gcc-lib/vax-unknown-openbsd5.2/2.95.3/include/float.h
+./usr/lib/gcc-lib/vax-unknown-openbsd5.2/2.95.3/include/limits.h
+./usr/lib/gcc-lib/vax-unknown-openbsd5.2/2.95.3/include/new
+./usr/lib/gcc-lib/vax-unknown-openbsd5.2/2.95.3/include/new.h
+./usr/lib/gcc-lib/vax-unknown-openbsd5.2/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/vax-unknown-openbsd5.2/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/vax-unknown-openbsd5.2/2.95.3/libgcc.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/scrt0.o
diff --git a/distrib/sets/lists/comp/md.zaurus b/distrib/sets/lists/comp/md.zaurus
index 677a5267628..8c0a370c81e 100644
--- a/distrib/sets/lists/comp/md.zaurus
+++ b/distrib/sets/lists/comp/md.zaurus
@@ -53,29 +53,29 @@
 ./usr/include/arm/trap.h
 ./usr/include/arm/undefined.h
 ./usr/include/arm/vmparam.h
-./usr/include/g++/arm-unknown-openbsd5.1
-./usr/include/g++/arm-unknown-openbsd5.1/bits
-./usr/include/g++/arm-unknown-openbsd5.1/bits/atomic_word.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/basic_file.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/c++allocator.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/c++config.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/c++io.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/c++locale.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/c++locale_internal.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/compatibility.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/cpu_defines.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/ctype_base.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/ctype_inline.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/ctype_noninline.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/cxxabi_tweaks.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/gthr-default.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/gthr-posix.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/gthr-single.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/gthr-tpf.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/gthr.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/messages_members.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/os_defines.h
-./usr/include/g++/arm-unknown-openbsd5.1/bits/time_members.h
+./usr/include/g++/arm-unknown-openbsd5.2
+./usr/include/g++/arm-unknown-openbsd5.2/bits
+./usr/include/g++/arm-unknown-openbsd5.2/bits/atomic_word.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/basic_file.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/c++allocator.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/c++config.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/c++io.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/c++locale.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/c++locale_internal.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/compatibility.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/cpu_defines.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/ctype_base.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/ctype_inline.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/ctype_noninline.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/cxxabi_tweaks.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/gthr-default.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/gthr-posix.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/gthr-single.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/gthr-tpf.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/gthr.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/messages_members.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/os_defines.h
+./usr/include/g++/arm-unknown-openbsd5.2/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -649,9 +649,9 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/arm-unknown-openbsd5.1/4.2.1/cc1obj
-./usr/lib/gcc-lib/arm-unknown-openbsd5.1/4.2.1/cc1plus
-./usr/lib/gcc-lib/arm-unknown-openbsd5.1/4.2.1/libgcc.a
+./usr/lib/gcc-lib/arm-unknown-openbsd5.2/4.2.1/cc1obj
+./usr/lib/gcc-lib/arm-unknown-openbsd5.2/4.2.1/cc1plus
+./usr/lib/gcc-lib/arm-unknown-openbsd5.2/4.2.1/libgcc.a
 ./usr/lib/libarm.a
 ./usr/lib/libarm_p.a
 ./usr/lib/libasn1_pic.a