sync

23 files changed, 467 insertions, 467 deletions

diff --git a/distrib/sets/lists/comp/md.alpha b/distrib/sets/lists/comp/md.alpha
index f891ebf5231..a4c1063f713 100644
--- a/distrib/sets/lists/comp/md.alpha
+++ b/distrib/sets/lists/comp/md.alpha
@@ -56,24 +56,24 @@
 ./usr/include/alpha/tc_machdep.h
 ./usr/include/alpha/varargs.h
 ./usr/include/alpha/vmparam.h
-./usr/include/g++/alpha-unknown-openbsd4.7
-./usr/include/g++/alpha-unknown-openbsd4.7/bits
-./usr/include/g++/alpha-unknown-openbsd4.7/bits/atomicity.h
-./usr/include/g++/alpha-unknown-openbsd4.7/bits/basic_file.h
-./usr/include/g++/alpha-unknown-openbsd4.7/bits/c++config.h
-./usr/include/g++/alpha-unknown-openbsd4.7/bits/c++io.h
-./usr/include/g++/alpha-unknown-openbsd4.7/bits/c++locale.h
-./usr/include/g++/alpha-unknown-openbsd4.7/bits/codecvt_specializations.h
-./usr/include/g++/alpha-unknown-openbsd4.7/bits/ctype_base.h
-./usr/include/g++/alpha-unknown-openbsd4.7/bits/ctype_inline.h
-./usr/include/g++/alpha-unknown-openbsd4.7/bits/ctype_noninline.h
-./usr/include/g++/alpha-unknown-openbsd4.7/bits/gthr-default.h
-./usr/include/g++/alpha-unknown-openbsd4.7/bits/gthr-posix.h
-./usr/include/g++/alpha-unknown-openbsd4.7/bits/gthr-single.h
-./usr/include/g++/alpha-unknown-openbsd4.7/bits/gthr.h
-./usr/include/g++/alpha-unknown-openbsd4.7/bits/messages_members.h
-./usr/include/g++/alpha-unknown-openbsd4.7/bits/os_defines.h
-./usr/include/g++/alpha-unknown-openbsd4.7/bits/time_members.h
+./usr/include/g++/alpha-unknown-openbsd4.8
+./usr/include/g++/alpha-unknown-openbsd4.8/bits
+./usr/include/g++/alpha-unknown-openbsd4.8/bits/atomicity.h
+./usr/include/g++/alpha-unknown-openbsd4.8/bits/basic_file.h
+./usr/include/g++/alpha-unknown-openbsd4.8/bits/c++config.h
+./usr/include/g++/alpha-unknown-openbsd4.8/bits/c++io.h
+./usr/include/g++/alpha-unknown-openbsd4.8/bits/c++locale.h
+./usr/include/g++/alpha-unknown-openbsd4.8/bits/codecvt_specializations.h
+./usr/include/g++/alpha-unknown-openbsd4.8/bits/ctype_base.h
+./usr/include/g++/alpha-unknown-openbsd4.8/bits/ctype_inline.h
+./usr/include/g++/alpha-unknown-openbsd4.8/bits/ctype_noninline.h
+./usr/include/g++/alpha-unknown-openbsd4.8/bits/gthr-default.h
+./usr/include/g++/alpha-unknown-openbsd4.8/bits/gthr-posix.h
+./usr/include/g++/alpha-unknown-openbsd4.8/bits/gthr-single.h
+./usr/include/g++/alpha-unknown-openbsd4.8/bits/gthr.h
+./usr/include/g++/alpha-unknown-openbsd4.8/bits/messages_members.h
+./usr/include/g++/alpha-unknown-openbsd4.8/bits/os_defines.h
+./usr/include/g++/alpha-unknown-openbsd4.8/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -209,11 +209,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.7/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.7/3.3.5/cc1obj
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.7/3.3.5/cc1plus
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.7/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd4.7/3.3.5/libgcc.a
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.8/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.8/3.3.5/cc1obj
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.8/3.3.5/cc1plus
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.8/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd4.8/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 1953755003a..e68aa5861fe 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-openbsd4.7
-./usr/include/g++/amd64-unknown-openbsd4.7/bits
-./usr/include/g++/amd64-unknown-openbsd4.7/bits/atomic_word.h
-./usr/include/g++/amd64-unknown-openbsd4.7/bits/basic_file.h
-./usr/include/g++/amd64-unknown-openbsd4.7/bits/c++allocator.h
-./usr/include/g++/amd64-unknown-openbsd4.7/bits/c++config.h
-./usr/include/g++/amd64-unknown-openbsd4.7/bits/c++io.h
-./usr/include/g++/amd64-unknown-openbsd4.7/bits/c++locale.h
-./usr/include/g++/amd64-unknown-openbsd4.7/bits/c++locale_internal.h
-./usr/include/g++/amd64-unknown-openbsd4.7/bits/compatibility.h
-./usr/include/g++/amd64-unknown-openbsd4.7/bits/cpu_defines.h
-./usr/include/g++/amd64-unknown-openbsd4.7/bits/ctype_base.h
-./usr/include/g++/amd64-unknown-openbsd4.7/bits/ctype_inline.h
-./usr/include/g++/amd64-unknown-openbsd4.7/bits/ctype_noninline.h
-./usr/include/g++/amd64-unknown-openbsd4.7/bits/cxxabi_tweaks.h
-./usr/include/g++/amd64-unknown-openbsd4.7/bits/gthr-default.h
-./usr/include/g++/amd64-unknown-openbsd4.7/bits/gthr-posix.h
-./usr/include/g++/amd64-unknown-openbsd4.7/bits/gthr-single.h
-./usr/include/g++/amd64-unknown-openbsd4.7/bits/gthr-tpf.h
-./usr/include/g++/amd64-unknown-openbsd4.7/bits/gthr.h
-./usr/include/g++/amd64-unknown-openbsd4.7/bits/messages_members.h
-./usr/include/g++/amd64-unknown-openbsd4.7/bits/os_defines.h
-./usr/include/g++/amd64-unknown-openbsd4.7/bits/time_members.h
+./usr/include/g++/amd64-unknown-openbsd4.8
+./usr/include/g++/amd64-unknown-openbsd4.8/bits
+./usr/include/g++/amd64-unknown-openbsd4.8/bits/atomic_word.h
+./usr/include/g++/amd64-unknown-openbsd4.8/bits/basic_file.h
+./usr/include/g++/amd64-unknown-openbsd4.8/bits/c++allocator.h
+./usr/include/g++/amd64-unknown-openbsd4.8/bits/c++config.h
+./usr/include/g++/amd64-unknown-openbsd4.8/bits/c++io.h
+./usr/include/g++/amd64-unknown-openbsd4.8/bits/c++locale.h
+./usr/include/g++/amd64-unknown-openbsd4.8/bits/c++locale_internal.h
+./usr/include/g++/amd64-unknown-openbsd4.8/bits/compatibility.h
+./usr/include/g++/amd64-unknown-openbsd4.8/bits/cpu_defines.h
+./usr/include/g++/amd64-unknown-openbsd4.8/bits/ctype_base.h
+./usr/include/g++/amd64-unknown-openbsd4.8/bits/ctype_inline.h
+./usr/include/g++/amd64-unknown-openbsd4.8/bits/ctype_noninline.h
+./usr/include/g++/amd64-unknown-openbsd4.8/bits/cxxabi_tweaks.h
+./usr/include/g++/amd64-unknown-openbsd4.8/bits/gthr-default.h
+./usr/include/g++/amd64-unknown-openbsd4.8/bits/gthr-posix.h
+./usr/include/g++/amd64-unknown-openbsd4.8/bits/gthr-single.h
+./usr/include/g++/amd64-unknown-openbsd4.8/bits/gthr-tpf.h
+./usr/include/g++/amd64-unknown-openbsd4.8/bits/gthr.h
+./usr/include/g++/amd64-unknown-openbsd4.8/bits/messages_members.h
+./usr/include/g++/amd64-unknown-openbsd4.8/bits/os_defines.h
+./usr/include/g++/amd64-unknown-openbsd4.8/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-openbsd4.7/4.2.1/cc1obj
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/4.2.1/cc1plus
-./usr/lib/gcc-lib/amd64-unknown-openbsd4.7/4.2.1/libgcc.a
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.8/4.2.1/cc1obj
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.8/4.2.1/cc1plus
+./usr/lib/gcc-lib/amd64-unknown-openbsd4.8/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 4cb27adaab1..6926c26416a 100644
--- a/distrib/sets/lists/comp/md.armish
+++ b/distrib/sets/lists/comp/md.armish
@@ -98,24 +98,24 @@
 ./usr/include/armish/sysarch.h
 ./usr/include/armish/trap.h
 ./usr/include/armish/vmparam.h
-./usr/include/g++/arm-unknown-openbsd4.7
-./usr/include/g++/arm-unknown-openbsd4.7/bits
-./usr/include/g++/arm-unknown-openbsd4.7/bits/atomicity.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/basic_file.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/c++config.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/c++io.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/c++locale.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/codecvt_specializations.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/ctype_base.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/ctype_inline.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/ctype_noninline.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/gthr-default.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/gthr-posix.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/gthr-single.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/gthr.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/messages_members.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/os_defines.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/time_members.h
+./usr/include/g++/arm-unknown-openbsd4.8
+./usr/include/g++/arm-unknown-openbsd4.8/bits
+./usr/include/g++/arm-unknown-openbsd4.8/bits/atomicity.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/basic_file.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/c++config.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/c++io.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/c++locale.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/codecvt_specializations.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/ctype_base.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/ctype_inline.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/ctype_noninline.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/gthr-default.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/gthr-posix.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/gthr-single.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/gthr.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/messages_members.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/os_defines.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -251,9 +251,9 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/include
-./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/libgcc.a
+./usr/lib/gcc-lib/arm-unknown-openbsd4.8/3.3.5/include
+./usr/lib/gcc-lib/arm-unknown-openbsd4.8/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/arm-unknown-openbsd4.8/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 a122aa70494..848f2a0ae1f 100644
--- a/distrib/sets/lists/comp/md.aviion
+++ b/distrib/sets/lists/comp/md.aviion
@@ -207,18 +207,18 @@
 ./usr/include/m88k/va-m88k.h
 ./usr/include/m88k/varargs.h
 ./usr/include/m88k/vmparam.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/cc1obj
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/cc1plus
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/README
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/exception
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/float.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/new
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/new.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/cc1obj
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/cc1plus
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/include/README
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/include/exception
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/include/float.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/include/new
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/include/new.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/libgcc.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/scrt0.o
 ./usr/share/man/cat1/protoize.0
diff --git a/distrib/sets/lists/comp/md.hp300 b/distrib/sets/lists/comp/md.hp300
index 6907bd1f8b9..a049d4410a0 100644
--- a/distrib/sets/lists/comp/md.hp300
+++ b/distrib/sets/lists/comp/md.hp300
@@ -188,22 +188,22 @@
 ./usr/include/m68k/trap.h
 ./usr/include/m68k/varargs.h
 ./usr/include/m68k/vmparam.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/cc1obj
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/fPIC
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/fPIC/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/fpic
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/fpic/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/README
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/exception
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/float.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/new
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/new.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/cc1obj
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/cc1plus
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/fPIC
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/fPIC/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/fpic
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/fpic/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/include/README
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/include/exception
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/include/float.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/include/new
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/include/new.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/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 2988a1c29aa..cf8b425537a 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-openbsd4.7
-./usr/include/g++/hppa-unknown-openbsd4.7/bits
-./usr/include/g++/hppa-unknown-openbsd4.7/bits/atomic_word.h
-./usr/include/g++/hppa-unknown-openbsd4.7/bits/basic_file.h
-./usr/include/g++/hppa-unknown-openbsd4.7/bits/c++allocator.h
-./usr/include/g++/hppa-unknown-openbsd4.7/bits/c++config.h
-./usr/include/g++/hppa-unknown-openbsd4.7/bits/c++io.h
-./usr/include/g++/hppa-unknown-openbsd4.7/bits/c++locale.h
-./usr/include/g++/hppa-unknown-openbsd4.7/bits/c++locale_internal.h
-./usr/include/g++/hppa-unknown-openbsd4.7/bits/compatibility.h
-./usr/include/g++/hppa-unknown-openbsd4.7/bits/cpu_defines.h
-./usr/include/g++/hppa-unknown-openbsd4.7/bits/ctype_base.h
-./usr/include/g++/hppa-unknown-openbsd4.7/bits/ctype_inline.h
-./usr/include/g++/hppa-unknown-openbsd4.7/bits/ctype_noninline.h
-./usr/include/g++/hppa-unknown-openbsd4.7/bits/cxxabi_tweaks.h
-./usr/include/g++/hppa-unknown-openbsd4.7/bits/gthr-default.h
-./usr/include/g++/hppa-unknown-openbsd4.7/bits/gthr-posix.h
-./usr/include/g++/hppa-unknown-openbsd4.7/bits/gthr-single.h
-./usr/include/g++/hppa-unknown-openbsd4.7/bits/gthr-tpf.h
-./usr/include/g++/hppa-unknown-openbsd4.7/bits/gthr.h
-./usr/include/g++/hppa-unknown-openbsd4.7/bits/messages_members.h
-./usr/include/g++/hppa-unknown-openbsd4.7/bits/os_defines.h
-./usr/include/g++/hppa-unknown-openbsd4.7/bits/time_members.h
+./usr/include/g++/hppa-unknown-openbsd4.8
+./usr/include/g++/hppa-unknown-openbsd4.8/bits
+./usr/include/g++/hppa-unknown-openbsd4.8/bits/atomic_word.h
+./usr/include/g++/hppa-unknown-openbsd4.8/bits/basic_file.h
+./usr/include/g++/hppa-unknown-openbsd4.8/bits/c++allocator.h
+./usr/include/g++/hppa-unknown-openbsd4.8/bits/c++config.h
+./usr/include/g++/hppa-unknown-openbsd4.8/bits/c++io.h
+./usr/include/g++/hppa-unknown-openbsd4.8/bits/c++locale.h
+./usr/include/g++/hppa-unknown-openbsd4.8/bits/c++locale_internal.h
+./usr/include/g++/hppa-unknown-openbsd4.8/bits/compatibility.h
+./usr/include/g++/hppa-unknown-openbsd4.8/bits/cpu_defines.h
+./usr/include/g++/hppa-unknown-openbsd4.8/bits/ctype_base.h
+./usr/include/g++/hppa-unknown-openbsd4.8/bits/ctype_inline.h
+./usr/include/g++/hppa-unknown-openbsd4.8/bits/ctype_noninline.h
+./usr/include/g++/hppa-unknown-openbsd4.8/bits/cxxabi_tweaks.h
+./usr/include/g++/hppa-unknown-openbsd4.8/bits/gthr-default.h
+./usr/include/g++/hppa-unknown-openbsd4.8/bits/gthr-posix.h
+./usr/include/g++/hppa-unknown-openbsd4.8/bits/gthr-single.h
+./usr/include/g++/hppa-unknown-openbsd4.8/bits/gthr-tpf.h
+./usr/include/g++/hppa-unknown-openbsd4.8/bits/gthr.h
+./usr/include/g++/hppa-unknown-openbsd4.8/bits/messages_members.h
+./usr/include/g++/hppa-unknown-openbsd4.8/bits/os_defines.h
+./usr/include/g++/hppa-unknown-openbsd4.8/bits/time_members.h
 ./usr/include/g++/ios
 ./usr/include/g++/istream
 ./usr/include/g++/limits
@@ -604,9 +604,9 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.7/4.2.1/cc1obj
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.7/4.2.1/cc1plus
-./usr/lib/gcc-lib/hppa-unknown-openbsd4.7/4.2.1/libgcc.a
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.8/4.2.1/cc1obj
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.8/4.2.1/cc1plus
+./usr/lib/gcc-lib/hppa-unknown-openbsd4.8/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 8714247b060..fd85edb82f4 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-openbsd4.7
-./usr/include/g++/hppa64-unknown-openbsd4.7/bits
-./usr/include/g++/hppa64-unknown-openbsd4.7/bits/atomicity.h
-./usr/include/g++/hppa64-unknown-openbsd4.7/bits/basic_file.h
-./usr/include/g++/hppa64-unknown-openbsd4.7/bits/c++config.h
-./usr/include/g++/hppa64-unknown-openbsd4.7/bits/c++io.h
-./usr/include/g++/hppa64-unknown-openbsd4.7/bits/c++locale.h
-./usr/include/g++/hppa64-unknown-openbsd4.7/bits/codecvt_specializations.h
-./usr/include/g++/hppa64-unknown-openbsd4.7/bits/ctype_base.h
-./usr/include/g++/hppa64-unknown-openbsd4.7/bits/ctype_inline.h
-./usr/include/g++/hppa64-unknown-openbsd4.7/bits/ctype_noninline.h
-./usr/include/g++/hppa64-unknown-openbsd4.7/bits/gthr-default.h
-./usr/include/g++/hppa64-unknown-openbsd4.7/bits/gthr-posix.h
-./usr/include/g++/hppa64-unknown-openbsd4.7/bits/gthr-single.h
-./usr/include/g++/hppa64-unknown-openbsd4.7/bits/gthr.h
-./usr/include/g++/hppa64-unknown-openbsd4.7/bits/messages_members.h
-./usr/include/g++/hppa64-unknown-openbsd4.7/bits/os_defines.h
-./usr/include/g++/hppa64-unknown-openbsd4.7/bits/time_members.h
+./usr/include/g++/hppa64-unknown-openbsd4.8
+./usr/include/g++/hppa64-unknown-openbsd4.8/bits
+./usr/include/g++/hppa64-unknown-openbsd4.8/bits/atomicity.h
+./usr/include/g++/hppa64-unknown-openbsd4.8/bits/basic_file.h
+./usr/include/g++/hppa64-unknown-openbsd4.8/bits/c++config.h
+./usr/include/g++/hppa64-unknown-openbsd4.8/bits/c++io.h
+./usr/include/g++/hppa64-unknown-openbsd4.8/bits/c++locale.h
+./usr/include/g++/hppa64-unknown-openbsd4.8/bits/codecvt_specializations.h
+./usr/include/g++/hppa64-unknown-openbsd4.8/bits/ctype_base.h
+./usr/include/g++/hppa64-unknown-openbsd4.8/bits/ctype_inline.h
+./usr/include/g++/hppa64-unknown-openbsd4.8/bits/ctype_noninline.h
+./usr/include/g++/hppa64-unknown-openbsd4.8/bits/gthr-default.h
+./usr/include/g++/hppa64-unknown-openbsd4.8/bits/gthr-posix.h
+./usr/include/g++/hppa64-unknown-openbsd4.8/bits/gthr-single.h
+./usr/include/g++/hppa64-unknown-openbsd4.8/bits/gthr.h
+./usr/include/g++/hppa64-unknown-openbsd4.8/bits/messages_members.h
+./usr/include/g++/hppa64-unknown-openbsd4.8/bits/os_defines.h
+./usr/include/g++/hppa64-unknown-openbsd4.8/bits/time_members.h
 ./usr/include/g++/ios
 ./usr/include/g++/istream
 ./usr/include/g++/limits
@@ -206,12 +206,12 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.7/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.7/3.3.5/cc1obj
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.7/3.3.5/cc1plus
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.7/3.3.5/include
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.7/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/hppa64-unknown-openbsd4.7/3.3.5/libgcc.a
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.8/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.8/3.3.5/cc1obj
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.8/3.3.5/cc1plus
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.8/3.3.5/include
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.8/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/hppa64-unknown-openbsd4.8/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 aeaf1edcd24..a1a5c49f71b 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-openbsd4.7
-./usr/include/g++/i386-unknown-openbsd4.7/bits
-./usr/include/g++/i386-unknown-openbsd4.7/bits/atomic_word.h
-./usr/include/g++/i386-unknown-openbsd4.7/bits/basic_file.h
-./usr/include/g++/i386-unknown-openbsd4.7/bits/c++allocator.h
-./usr/include/g++/i386-unknown-openbsd4.7/bits/c++config.h
-./usr/include/g++/i386-unknown-openbsd4.7/bits/c++io.h
-./usr/include/g++/i386-unknown-openbsd4.7/bits/c++locale.h
-./usr/include/g++/i386-unknown-openbsd4.7/bits/c++locale_internal.h
-./usr/include/g++/i386-unknown-openbsd4.7/bits/compatibility.h
-./usr/include/g++/i386-unknown-openbsd4.7/bits/cpu_defines.h
-./usr/include/g++/i386-unknown-openbsd4.7/bits/ctype_base.h
-./usr/include/g++/i386-unknown-openbsd4.7/bits/ctype_inline.h
-./usr/include/g++/i386-unknown-openbsd4.7/bits/ctype_noninline.h
-./usr/include/g++/i386-unknown-openbsd4.7/bits/cxxabi_tweaks.h
-./usr/include/g++/i386-unknown-openbsd4.7/bits/gthr-default.h
-./usr/include/g++/i386-unknown-openbsd4.7/bits/gthr-posix.h
-./usr/include/g++/i386-unknown-openbsd4.7/bits/gthr-single.h
-./usr/include/g++/i386-unknown-openbsd4.7/bits/gthr-tpf.h
-./usr/include/g++/i386-unknown-openbsd4.7/bits/gthr.h
-./usr/include/g++/i386-unknown-openbsd4.7/bits/messages_members.h
-./usr/include/g++/i386-unknown-openbsd4.7/bits/os_defines.h
-./usr/include/g++/i386-unknown-openbsd4.7/bits/time_members.h
+./usr/include/g++/i386-unknown-openbsd4.8
+./usr/include/g++/i386-unknown-openbsd4.8/bits
+./usr/include/g++/i386-unknown-openbsd4.8/bits/atomic_word.h
+./usr/include/g++/i386-unknown-openbsd4.8/bits/basic_file.h
+./usr/include/g++/i386-unknown-openbsd4.8/bits/c++allocator.h
+./usr/include/g++/i386-unknown-openbsd4.8/bits/c++config.h
+./usr/include/g++/i386-unknown-openbsd4.8/bits/c++io.h
+./usr/include/g++/i386-unknown-openbsd4.8/bits/c++locale.h
+./usr/include/g++/i386-unknown-openbsd4.8/bits/c++locale_internal.h
+./usr/include/g++/i386-unknown-openbsd4.8/bits/compatibility.h
+./usr/include/g++/i386-unknown-openbsd4.8/bits/cpu_defines.h
+./usr/include/g++/i386-unknown-openbsd4.8/bits/ctype_base.h
+./usr/include/g++/i386-unknown-openbsd4.8/bits/ctype_inline.h
+./usr/include/g++/i386-unknown-openbsd4.8/bits/ctype_noninline.h
+./usr/include/g++/i386-unknown-openbsd4.8/bits/cxxabi_tweaks.h
+./usr/include/g++/i386-unknown-openbsd4.8/bits/gthr-default.h
+./usr/include/g++/i386-unknown-openbsd4.8/bits/gthr-posix.h
+./usr/include/g++/i386-unknown-openbsd4.8/bits/gthr-single.h
+./usr/include/g++/i386-unknown-openbsd4.8/bits/gthr-tpf.h
+./usr/include/g++/i386-unknown-openbsd4.8/bits/gthr.h
+./usr/include/g++/i386-unknown-openbsd4.8/bits/messages_members.h
+./usr/include/g++/i386-unknown-openbsd4.8/bits/os_defines.h
+./usr/include/g++/i386-unknown-openbsd4.8/bits/time_members.h
 ./usr/include/g++/ios
 ./usr/include/g++/istream
 ./usr/include/g++/limits
@@ -632,9 +632,9 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/i386-unknown-openbsd4.7/4.2.1/cc1obj
-./usr/lib/gcc-lib/i386-unknown-openbsd4.7/4.2.1/cc1plus
-./usr/lib/gcc-lib/i386-unknown-openbsd4.7/4.2.1/libgcc.a
+./usr/lib/gcc-lib/i386-unknown-openbsd4.8/4.2.1/cc1obj
+./usr/lib/gcc-lib/i386-unknown-openbsd4.8/4.2.1/cc1plus
+./usr/lib/gcc-lib/i386-unknown-openbsd4.8/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 a10c6e1537d..7c5aff3c2e9 100644
--- a/distrib/sets/lists/comp/md.landisk
+++ b/distrib/sets/lists/comp/md.landisk
@@ -132,24 +132,24 @@
 ./usr/include/g++/limits
 ./usr/include/g++/locale
 ./usr/include/g++/ostream
-./usr/include/g++/sh-unknown-openbsd4.7
-./usr/include/g++/sh-unknown-openbsd4.7/bits
-./usr/include/g++/sh-unknown-openbsd4.7/bits/atomicity.h
-./usr/include/g++/sh-unknown-openbsd4.7/bits/basic_file.h
-./usr/include/g++/sh-unknown-openbsd4.7/bits/c++config.h
-./usr/include/g++/sh-unknown-openbsd4.7/bits/c++io.h
-./usr/include/g++/sh-unknown-openbsd4.7/bits/c++locale.h
-./usr/include/g++/sh-unknown-openbsd4.7/bits/codecvt_specializations.h
-./usr/include/g++/sh-unknown-openbsd4.7/bits/ctype_base.h
-./usr/include/g++/sh-unknown-openbsd4.7/bits/ctype_inline.h
-./usr/include/g++/sh-unknown-openbsd4.7/bits/ctype_noninline.h
-./usr/include/g++/sh-unknown-openbsd4.7/bits/gthr-default.h
-./usr/include/g++/sh-unknown-openbsd4.7/bits/gthr-posix.h
-./usr/include/g++/sh-unknown-openbsd4.7/bits/gthr-single.h
-./usr/include/g++/sh-unknown-openbsd4.7/bits/gthr.h
-./usr/include/g++/sh-unknown-openbsd4.7/bits/messages_members.h
-./usr/include/g++/sh-unknown-openbsd4.7/bits/os_defines.h
-./usr/include/g++/sh-unknown-openbsd4.7/bits/time_members.h
+./usr/include/g++/sh-unknown-openbsd4.8
+./usr/include/g++/sh-unknown-openbsd4.8/bits
+./usr/include/g++/sh-unknown-openbsd4.8/bits/atomicity.h
+./usr/include/g++/sh-unknown-openbsd4.8/bits/basic_file.h
+./usr/include/g++/sh-unknown-openbsd4.8/bits/c++config.h
+./usr/include/g++/sh-unknown-openbsd4.8/bits/c++io.h
+./usr/include/g++/sh-unknown-openbsd4.8/bits/c++locale.h
+./usr/include/g++/sh-unknown-openbsd4.8/bits/codecvt_specializations.h
+./usr/include/g++/sh-unknown-openbsd4.8/bits/ctype_base.h
+./usr/include/g++/sh-unknown-openbsd4.8/bits/ctype_inline.h
+./usr/include/g++/sh-unknown-openbsd4.8/bits/ctype_noninline.h
+./usr/include/g++/sh-unknown-openbsd4.8/bits/gthr-default.h
+./usr/include/g++/sh-unknown-openbsd4.8/bits/gthr-posix.h
+./usr/include/g++/sh-unknown-openbsd4.8/bits/gthr-single.h
+./usr/include/g++/sh-unknown-openbsd4.8/bits/gthr.h
+./usr/include/g++/sh-unknown-openbsd4.8/bits/messages_members.h
+./usr/include/g++/sh-unknown-openbsd4.8/bits/os_defines.h
+./usr/include/g++/sh-unknown-openbsd4.8/bits/time_members.h
 ./usr/include/g++/streambuf
 ./usr/include/ieeefp.h
 ./usr/include/landisk
@@ -257,17 +257,17 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sh-unknown-openbsd4.7
-./usr/lib/gcc-lib/sh-unknown-openbsd4.7/3.3.5
-./usr/lib/gcc-lib/sh-unknown-openbsd4.7/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/sh-unknown-openbsd4.7/3.3.5/cc1
-./usr/lib/gcc-lib/sh-unknown-openbsd4.7/3.3.5/cc1obj
-./usr/lib/gcc-lib/sh-unknown-openbsd4.7/3.3.5/cc1plus
-./usr/lib/gcc-lib/sh-unknown-openbsd4.7/3.3.5/collect2
-./usr/lib/gcc-lib/sh-unknown-openbsd4.7/3.3.5/include
-./usr/lib/gcc-lib/sh-unknown-openbsd4.7/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/sh-unknown-openbsd4.7/3.3.5/libgcc.a
-./usr/lib/gcc-lib/sh-unknown-openbsd4.7/3.3.5/specs
+./usr/lib/gcc-lib/sh-unknown-openbsd4.8
+./usr/lib/gcc-lib/sh-unknown-openbsd4.8/3.3.5
+./usr/lib/gcc-lib/sh-unknown-openbsd4.8/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/sh-unknown-openbsd4.8/3.3.5/cc1
+./usr/lib/gcc-lib/sh-unknown-openbsd4.8/3.3.5/cc1obj
+./usr/lib/gcc-lib/sh-unknown-openbsd4.8/3.3.5/cc1plus
+./usr/lib/gcc-lib/sh-unknown-openbsd4.8/3.3.5/collect2
+./usr/lib/gcc-lib/sh-unknown-openbsd4.8/3.3.5/include
+./usr/lib/gcc-lib/sh-unknown-openbsd4.8/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/sh-unknown-openbsd4.8/3.3.5/libgcc.a
+./usr/lib/gcc-lib/sh-unknown-openbsd4.8/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.loongson b/distrib/sets/lists/comp/md.loongson
index 96c52f8e138..64b0fa76668 100644
--- a/distrib/sets/lists/comp/md.loongson
+++ b/distrib/sets/lists/comp/md.loongson
@@ -130,24 +130,24 @@
 ./usr/include/g++/istream
 ./usr/include/g++/limits
 ./usr/include/g++/locale
-./usr/include/g++/mips64el-unknown-openbsd4.7
-./usr/include/g++/mips64el-unknown-openbsd4.7/bits
-./usr/include/g++/mips64el-unknown-openbsd4.7/bits/atomicity.h
-./usr/include/g++/mips64el-unknown-openbsd4.7/bits/basic_file.h
-./usr/include/g++/mips64el-unknown-openbsd4.7/bits/c++config.h
-./usr/include/g++/mips64el-unknown-openbsd4.7/bits/c++io.h
-./usr/include/g++/mips64el-unknown-openbsd4.7/bits/c++locale.h
-./usr/include/g++/mips64el-unknown-openbsd4.7/bits/codecvt_specializations.h
-./usr/include/g++/mips64el-unknown-openbsd4.7/bits/ctype_base.h
-./usr/include/g++/mips64el-unknown-openbsd4.7/bits/ctype_inline.h
-./usr/include/g++/mips64el-unknown-openbsd4.7/bits/ctype_noninline.h
-./usr/include/g++/mips64el-unknown-openbsd4.7/bits/gthr-default.h
-./usr/include/g++/mips64el-unknown-openbsd4.7/bits/gthr-posix.h
-./usr/include/g++/mips64el-unknown-openbsd4.7/bits/gthr-single.h
-./usr/include/g++/mips64el-unknown-openbsd4.7/bits/gthr.h
-./usr/include/g++/mips64el-unknown-openbsd4.7/bits/messages_members.h
-./usr/include/g++/mips64el-unknown-openbsd4.7/bits/os_defines.h
-./usr/include/g++/mips64el-unknown-openbsd4.7/bits/time_members.h
+./usr/include/g++/mips64el-unknown-openbsd4.8
+./usr/include/g++/mips64el-unknown-openbsd4.8/bits
+./usr/include/g++/mips64el-unknown-openbsd4.8/bits/atomicity.h
+./usr/include/g++/mips64el-unknown-openbsd4.8/bits/basic_file.h
+./usr/include/g++/mips64el-unknown-openbsd4.8/bits/c++config.h
+./usr/include/g++/mips64el-unknown-openbsd4.8/bits/c++io.h
+./usr/include/g++/mips64el-unknown-openbsd4.8/bits/c++locale.h
+./usr/include/g++/mips64el-unknown-openbsd4.8/bits/codecvt_specializations.h
+./usr/include/g++/mips64el-unknown-openbsd4.8/bits/ctype_base.h
+./usr/include/g++/mips64el-unknown-openbsd4.8/bits/ctype_inline.h
+./usr/include/g++/mips64el-unknown-openbsd4.8/bits/ctype_noninline.h
+./usr/include/g++/mips64el-unknown-openbsd4.8/bits/gthr-default.h
+./usr/include/g++/mips64el-unknown-openbsd4.8/bits/gthr-posix.h
+./usr/include/g++/mips64el-unknown-openbsd4.8/bits/gthr-single.h
+./usr/include/g++/mips64el-unknown-openbsd4.8/bits/gthr.h
+./usr/include/g++/mips64el-unknown-openbsd4.8/bits/messages_members.h
+./usr/include/g++/mips64el-unknown-openbsd4.8/bits/os_defines.h
+./usr/include/g++/mips64el-unknown-openbsd4.8/bits/time_members.h
 ./usr/include/g++/ostream
 ./usr/include/g++/streambuf
 ./usr/include/ieeefp.h
@@ -249,11 +249,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64el-unknown-openbsd4.7/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/mips64el-unknown-openbsd4.7/3.3.5/cc1obj
-./usr/lib/gcc-lib/mips64el-unknown-openbsd4.7/3.3.5/cc1plus
-./usr/lib/gcc-lib/mips64el-unknown-openbsd4.7/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/mips64el-unknown-openbsd4.7/3.3.5/libgcc.a
+./usr/lib/gcc-lib/mips64el-unknown-openbsd4.8/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/mips64el-unknown-openbsd4.8/3.3.5/cc1obj
+./usr/lib/gcc-lib/mips64el-unknown-openbsd4.8/3.3.5/cc1plus
+./usr/lib/gcc-lib/mips64el-unknown-openbsd4.8/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/mips64el-unknown-openbsd4.8/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.luna88k b/distrib/sets/lists/comp/md.luna88k
index 52e4017b29a..ee7f4f458d6 100644
--- a/distrib/sets/lists/comp/md.luna88k
+++ b/distrib/sets/lists/comp/md.luna88k
@@ -200,18 +200,18 @@
 ./usr/include/m88k/va-m88k.h
 ./usr/include/m88k/varargs.h
 ./usr/include/m88k/vmparam.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/cc1obj
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/cc1plus
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/README
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/exception
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/float.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/new
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/new.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/cc1obj
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/cc1plus
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/include/README
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/include/exception
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/include/float.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/include/new
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/include/new.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/libgcc.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/scrt0.o
 ./usr/share/man/cat1/protoize.0
diff --git a/distrib/sets/lists/comp/md.mac68k b/distrib/sets/lists/comp/md.mac68k
index efee4531f49..92cce02f859 100644
--- a/distrib/sets/lists/comp/md.mac68k
+++ b/distrib/sets/lists/comp/md.mac68k
@@ -192,22 +192,22 @@
 ./usr/include/mac68k/viareg.h
 ./usr/include/mac68k/vmparam.h
 ./usr/include/mac68k/z8530var.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/cc1obj
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/fPIC
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/fPIC/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/fpic
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/fpic/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/README
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/exception
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/float.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/new
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/new.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/cc1obj
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/cc1plus
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/fPIC
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/fPIC/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/fpic
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/fpic/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/include/README
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/include/exception
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/include/float.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/include/new
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/include/new.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/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 5a71eea85a1..e47d0b7a54a 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-openbsd4.7
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/atomic_word.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/basic_file.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/c++allocator.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/c++config.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/c++io.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/c++locale.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/c++locale_internal.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/compatibility.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/cpu_defines.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/ctype_base.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/ctype_inline.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/ctype_noninline.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/cxxabi_tweaks.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/gthr-default.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/gthr-posix.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/gthr-single.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/gthr-tpf.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/gthr.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/messages_members.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/os_defines.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/time_members.h
+./usr/include/g++/powerpc-unknown-openbsd4.8
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/atomic_word.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/basic_file.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/c++allocator.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/c++config.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/c++io.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/c++locale.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/c++locale_internal.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/compatibility.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/cpu_defines.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/ctype_base.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/ctype_inline.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/ctype_noninline.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/cxxabi_tweaks.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/gthr-default.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/gthr-posix.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/gthr-single.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/gthr-tpf.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/gthr.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/messages_members.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/os_defines.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/time_members.h
 ./usr/include/g++/streambuf
 ./usr/include/g++/tr1
 ./usr/include/g++/tr1/array
@@ -645,9 +645,9 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/4.2.1/cc1obj
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/4.2.1/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/4.2.1/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.8/4.2.1/cc1obj
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.8/4.2.1/cc1plus
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.8/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 fcbdda81c88..3165d666c02 100644
--- a/distrib/sets/lists/comp/md.mvme68k
+++ b/distrib/sets/lists/comp/md.mvme68k
@@ -190,22 +190,22 @@
 ./usr/include/mvme68k/trap.h
 ./usr/include/mvme68k/varargs.h
 ./usr/include/mvme68k/vmparam.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/cc1obj
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/fPIC
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/fPIC/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/fpic
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/fpic/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/README
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/exception
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/float.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/new
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/new.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m68k-unknown-openbsd4.7/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/cc1obj
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/cc1plus
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/fPIC
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/fPIC/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/fpic
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/fpic/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/include/README
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/include/exception
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/include/float.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/include/new
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/include/new.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m68k-unknown-openbsd4.8/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 5a2a3daf508..489faeb0104 100644
--- a/distrib/sets/lists/comp/md.mvme88k
+++ b/distrib/sets/lists/comp/md.mvme88k
@@ -211,18 +211,18 @@
 ./usr/include/mvme88k/va-m88k.h
 ./usr/include/mvme88k/varargs.h
 ./usr/include/mvme88k/vmparam.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/cc1obj
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/cc1plus
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/README
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/exception
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/float.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/limits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/new
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/new.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/m88k-unknown-openbsd4.7/2.95.3/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/cc1obj
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/cc1plus
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/include/README
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/include/exception
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/include/float.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/include/limits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/include/new
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/include/new.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/m88k-unknown-openbsd4.8/2.95.3/libgcc.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/scrt0.o
 ./usr/share/man/cat1/protoize.0
diff --git a/distrib/sets/lists/comp/md.mvmeppc b/distrib/sets/lists/comp/md.mvmeppc
index 26ec3bca4dd..b151938dd64 100644
--- a/distrib/sets/lists/comp/md.mvmeppc
+++ b/distrib/sets/lists/comp/md.mvmeppc
@@ -161,20 +161,20 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/cc1obj
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/include/README
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/include/exception
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/include/float.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/include/limits.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/include/new
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/include/new.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/libgcc.a
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/soft-float
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/2.95.3/soft-float/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.8/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.8/2.95.3/cc1obj
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.8/2.95.3/cc1plus
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.8/2.95.3/include/README
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.8/2.95.3/include/exception
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.8/2.95.3/include/float.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.8/2.95.3/include/limits.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.8/2.95.3/include/new
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.8/2.95.3/include/new.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.8/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.8/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.8/2.95.3/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.8/2.95.3/soft-float
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.8/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.palm b/distrib/sets/lists/comp/md.palm
index f111d2d292e..cb0437b7a37 100644
--- a/distrib/sets/lists/comp/md.palm
+++ b/distrib/sets/lists/comp/md.palm
@@ -55,24 +55,24 @@
 ./usr/include/arm/trap.h
 ./usr/include/arm/undefined.h
 ./usr/include/arm/vmparam.h
-./usr/include/g++/arm-unknown-openbsd4.7
-./usr/include/g++/arm-unknown-openbsd4.7/bits
-./usr/include/g++/arm-unknown-openbsd4.7/bits/atomicity.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/basic_file.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/c++config.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/c++io.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/c++locale.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/codecvt_specializations.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/ctype_base.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/ctype_inline.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/ctype_noninline.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/gthr-default.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/gthr-posix.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/gthr-single.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/gthr.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/messages_members.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/os_defines.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/time_members.h
+./usr/include/g++/arm-unknown-openbsd4.8
+./usr/include/g++/arm-unknown-openbsd4.8/bits
+./usr/include/g++/arm-unknown-openbsd4.8/bits/atomicity.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/basic_file.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/c++config.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/c++io.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/c++locale.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/codecvt_specializations.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/ctype_base.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/ctype_inline.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/ctype_noninline.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/gthr-default.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/gthr-posix.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/gthr-single.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/gthr.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/messages_members.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/os_defines.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -252,9 +252,9 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/include
-./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/libgcc.a
+./usr/lib/gcc-lib/arm-unknown-openbsd4.8/3.3.5/include
+./usr/lib/gcc-lib/arm-unknown-openbsd4.8/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/arm-unknown-openbsd4.8/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.sgi b/distrib/sets/lists/comp/md.sgi
index 2e482dca676..1d6ef98f328 100644
--- a/distrib/sets/lists/comp/md.sgi
+++ b/distrib/sets/lists/comp/md.sgi
@@ -130,24 +130,24 @@
 ./usr/include/g++/istream
 ./usr/include/g++/limits
 ./usr/include/g++/locale
-./usr/include/g++/mips64-unknown-openbsd4.7
-./usr/include/g++/mips64-unknown-openbsd4.7/bits
-./usr/include/g++/mips64-unknown-openbsd4.7/bits/atomicity.h
-./usr/include/g++/mips64-unknown-openbsd4.7/bits/basic_file.h
-./usr/include/g++/mips64-unknown-openbsd4.7/bits/c++config.h
-./usr/include/g++/mips64-unknown-openbsd4.7/bits/c++io.h
-./usr/include/g++/mips64-unknown-openbsd4.7/bits/c++locale.h
-./usr/include/g++/mips64-unknown-openbsd4.7/bits/codecvt_specializations.h
-./usr/include/g++/mips64-unknown-openbsd4.7/bits/ctype_base.h
-./usr/include/g++/mips64-unknown-openbsd4.7/bits/ctype_inline.h
-./usr/include/g++/mips64-unknown-openbsd4.7/bits/ctype_noninline.h
-./usr/include/g++/mips64-unknown-openbsd4.7/bits/gthr-default.h
-./usr/include/g++/mips64-unknown-openbsd4.7/bits/gthr-posix.h
-./usr/include/g++/mips64-unknown-openbsd4.7/bits/gthr-single.h
-./usr/include/g++/mips64-unknown-openbsd4.7/bits/gthr.h
-./usr/include/g++/mips64-unknown-openbsd4.7/bits/messages_members.h
-./usr/include/g++/mips64-unknown-openbsd4.7/bits/os_defines.h
-./usr/include/g++/mips64-unknown-openbsd4.7/bits/time_members.h
+./usr/include/g++/mips64-unknown-openbsd4.8
+./usr/include/g++/mips64-unknown-openbsd4.8/bits
+./usr/include/g++/mips64-unknown-openbsd4.8/bits/atomicity.h
+./usr/include/g++/mips64-unknown-openbsd4.8/bits/basic_file.h
+./usr/include/g++/mips64-unknown-openbsd4.8/bits/c++config.h
+./usr/include/g++/mips64-unknown-openbsd4.8/bits/c++io.h
+./usr/include/g++/mips64-unknown-openbsd4.8/bits/c++locale.h
+./usr/include/g++/mips64-unknown-openbsd4.8/bits/codecvt_specializations.h
+./usr/include/g++/mips64-unknown-openbsd4.8/bits/ctype_base.h
+./usr/include/g++/mips64-unknown-openbsd4.8/bits/ctype_inline.h
+./usr/include/g++/mips64-unknown-openbsd4.8/bits/ctype_noninline.h
+./usr/include/g++/mips64-unknown-openbsd4.8/bits/gthr-default.h
+./usr/include/g++/mips64-unknown-openbsd4.8/bits/gthr-posix.h
+./usr/include/g++/mips64-unknown-openbsd4.8/bits/gthr-single.h
+./usr/include/g++/mips64-unknown-openbsd4.8/bits/gthr.h
+./usr/include/g++/mips64-unknown-openbsd4.8/bits/messages_members.h
+./usr/include/g++/mips64-unknown-openbsd4.8/bits/os_defines.h
+./usr/include/g++/mips64-unknown-openbsd4.8/bits/time_members.h
 ./usr/include/g++/ostream
 ./usr/include/g++/streambuf
 ./usr/include/ieeefp.h
@@ -248,11 +248,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.7/3.3.5/SYSCALLS.c.X
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.7/3.3.5/cc1obj
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.7/3.3.5/cc1plus
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.7/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/mips64-unknown-openbsd4.7/3.3.5/libgcc.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.8/3.3.5/SYSCALLS.c.X
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.8/3.3.5/cc1obj
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.8/3.3.5/cc1plus
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.8/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/mips64-unknown-openbsd4.8/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 43855802cc9..b97117fdce2 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-openbsd4.7
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/atomic_word.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/basic_file.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/c++allocator.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/c++config.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/c++io.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/c++locale.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/c++locale_internal.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/compatibility.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/cpu_defines.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/ctype_base.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/ctype_inline.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/ctype_noninline.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/cxxabi_tweaks.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/gthr-default.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/gthr-posix.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/gthr-single.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/gthr-tpf.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/gthr.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/messages_members.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/os_defines.h
-./usr/include/g++/powerpc-unknown-openbsd4.7/bits/time_members.h
+./usr/include/g++/powerpc-unknown-openbsd4.8
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/atomic_word.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/basic_file.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/c++allocator.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/c++config.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/c++io.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/c++locale.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/c++locale_internal.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/compatibility.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/cpu_defines.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/ctype_base.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/ctype_inline.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/ctype_noninline.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/cxxabi_tweaks.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/gthr-default.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/gthr-posix.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/gthr-single.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/gthr-tpf.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/gthr.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/messages_members.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/os_defines.h
+./usr/include/g++/powerpc-unknown-openbsd4.8/bits/time_members.h
 ./usr/include/g++/streambuf
 ./usr/include/g++/tr1
 ./usr/include/g++/tr1/array
@@ -639,9 +639,9 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/4.2.1/cc1obj
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/4.2.1/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd4.7/4.2.1/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.8/4.2.1/cc1obj
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.8/4.2.1/cc1plus
+./usr/lib/gcc-lib/powerpc-unknown-openbsd4.8/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 b2c9518da6b..b473face5da 100644
--- a/distrib/sets/lists/comp/md.sparc
+++ b/distrib/sets/lists/comp/md.sparc
@@ -176,22 +176,22 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/cc1obj
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/cc1plus
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/fPIC
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/fPIC/libgcc.a
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/fpic
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/fpic/libgcc.a
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/include/README
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/include/exception
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/include/float.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/include/limits.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/include/new
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/include/new.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/sparc-unknown-openbsd4.7/2.95.3/libgcc.a
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.8/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.8/2.95.3/cc1obj
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.8/2.95.3/cc1plus
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.8/2.95.3/fPIC
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.8/2.95.3/fPIC/libgcc.a
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.8/2.95.3/fpic
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.8/2.95.3/fpic/libgcc.a
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.8/2.95.3/include/README
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.8/2.95.3/include/exception
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.8/2.95.3/include/float.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.8/2.95.3/include/limits.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.8/2.95.3/include/new
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.8/2.95.3/include/new.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.8/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.8/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/sparc-unknown-openbsd4.8/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 04c7af71dc9..bc9cfbaeb92 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-openbsd4.7
-./usr/include/g++/sparc64-unknown-openbsd4.7/bits
-./usr/include/g++/sparc64-unknown-openbsd4.7/bits/atomic_word.h
-./usr/include/g++/sparc64-unknown-openbsd4.7/bits/basic_file.h
-./usr/include/g++/sparc64-unknown-openbsd4.7/bits/c++allocator.h
-./usr/include/g++/sparc64-unknown-openbsd4.7/bits/c++config.h
-./usr/include/g++/sparc64-unknown-openbsd4.7/bits/c++io.h
-./usr/include/g++/sparc64-unknown-openbsd4.7/bits/c++locale.h
-./usr/include/g++/sparc64-unknown-openbsd4.7/bits/c++locale_internal.h
-./usr/include/g++/sparc64-unknown-openbsd4.7/bits/compatibility.h
-./usr/include/g++/sparc64-unknown-openbsd4.7/bits/cpu_defines.h
-./usr/include/g++/sparc64-unknown-openbsd4.7/bits/ctype_base.h
-./usr/include/g++/sparc64-unknown-openbsd4.7/bits/ctype_inline.h
-./usr/include/g++/sparc64-unknown-openbsd4.7/bits/ctype_noninline.h
-./usr/include/g++/sparc64-unknown-openbsd4.7/bits/cxxabi_tweaks.h
-./usr/include/g++/sparc64-unknown-openbsd4.7/bits/gthr-default.h
-./usr/include/g++/sparc64-unknown-openbsd4.7/bits/gthr-posix.h
-./usr/include/g++/sparc64-unknown-openbsd4.7/bits/gthr-single.h
-./usr/include/g++/sparc64-unknown-openbsd4.7/bits/gthr-tpf.h
-./usr/include/g++/sparc64-unknown-openbsd4.7/bits/gthr.h
-./usr/include/g++/sparc64-unknown-openbsd4.7/bits/messages_members.h
-./usr/include/g++/sparc64-unknown-openbsd4.7/bits/os_defines.h
-./usr/include/g++/sparc64-unknown-openbsd4.7/bits/time_members.h
+./usr/include/g++/sparc64-unknown-openbsd4.8
+./usr/include/g++/sparc64-unknown-openbsd4.8/bits
+./usr/include/g++/sparc64-unknown-openbsd4.8/bits/atomic_word.h
+./usr/include/g++/sparc64-unknown-openbsd4.8/bits/basic_file.h
+./usr/include/g++/sparc64-unknown-openbsd4.8/bits/c++allocator.h
+./usr/include/g++/sparc64-unknown-openbsd4.8/bits/c++config.h
+./usr/include/g++/sparc64-unknown-openbsd4.8/bits/c++io.h
+./usr/include/g++/sparc64-unknown-openbsd4.8/bits/c++locale.h
+./usr/include/g++/sparc64-unknown-openbsd4.8/bits/c++locale_internal.h
+./usr/include/g++/sparc64-unknown-openbsd4.8/bits/compatibility.h
+./usr/include/g++/sparc64-unknown-openbsd4.8/bits/cpu_defines.h
+./usr/include/g++/sparc64-unknown-openbsd4.8/bits/ctype_base.h
+./usr/include/g++/sparc64-unknown-openbsd4.8/bits/ctype_inline.h
+./usr/include/g++/sparc64-unknown-openbsd4.8/bits/ctype_noninline.h
+./usr/include/g++/sparc64-unknown-openbsd4.8/bits/cxxabi_tweaks.h
+./usr/include/g++/sparc64-unknown-openbsd4.8/bits/gthr-default.h
+./usr/include/g++/sparc64-unknown-openbsd4.8/bits/gthr-posix.h
+./usr/include/g++/sparc64-unknown-openbsd4.8/bits/gthr-single.h
+./usr/include/g++/sparc64-unknown-openbsd4.8/bits/gthr-tpf.h
+./usr/include/g++/sparc64-unknown-openbsd4.8/bits/gthr.h
+./usr/include/g++/sparc64-unknown-openbsd4.8/bits/messages_members.h
+./usr/include/g++/sparc64-unknown-openbsd4.8/bits/os_defines.h
+./usr/include/g++/sparc64-unknown-openbsd4.8/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/sparc64-unknown-openbsd4.7/4.2.1/cc1obj
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.7/4.2.1/cc1plus
-./usr/lib/gcc-lib/sparc64-unknown-openbsd4.7/4.2.1/libgcc.a
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.8/4.2.1/cc1obj
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.8/4.2.1/cc1plus
+./usr/lib/gcc-lib/sparc64-unknown-openbsd4.8/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 19c1d2d0dec..748a83c1373 100644
--- a/distrib/sets/lists/comp/md.vax
+++ b/distrib/sets/lists/comp/md.vax
@@ -173,18 +173,18 @@
 ./usr/include/vax/vaxfp.h
 ./usr/include/vax/vmparam.h
 ./usr/include/vax/vsbus.h
-./usr/lib/gcc-lib/vax-unknown-openbsd4.7/2.95.3/SYSCALLS.c.X
-./usr/lib/gcc-lib/vax-unknown-openbsd4.7/2.95.3/cc1obj
-./usr/lib/gcc-lib/vax-unknown-openbsd4.7/2.95.3/cc1plus
-./usr/lib/gcc-lib/vax-unknown-openbsd4.7/2.95.3/include/README
-./usr/lib/gcc-lib/vax-unknown-openbsd4.7/2.95.3/include/exception
-./usr/lib/gcc-lib/vax-unknown-openbsd4.7/2.95.3/include/float.h
-./usr/lib/gcc-lib/vax-unknown-openbsd4.7/2.95.3/include/limits.h
-./usr/lib/gcc-lib/vax-unknown-openbsd4.7/2.95.3/include/new
-./usr/lib/gcc-lib/vax-unknown-openbsd4.7/2.95.3/include/new.h
-./usr/lib/gcc-lib/vax-unknown-openbsd4.7/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/vax-unknown-openbsd4.7/2.95.3/include/typeinfo
-./usr/lib/gcc-lib/vax-unknown-openbsd4.7/2.95.3/libgcc.a
+./usr/lib/gcc-lib/vax-unknown-openbsd4.8/2.95.3/SYSCALLS.c.X
+./usr/lib/gcc-lib/vax-unknown-openbsd4.8/2.95.3/cc1obj
+./usr/lib/gcc-lib/vax-unknown-openbsd4.8/2.95.3/cc1plus
+./usr/lib/gcc-lib/vax-unknown-openbsd4.8/2.95.3/include/README
+./usr/lib/gcc-lib/vax-unknown-openbsd4.8/2.95.3/include/exception
+./usr/lib/gcc-lib/vax-unknown-openbsd4.8/2.95.3/include/float.h
+./usr/lib/gcc-lib/vax-unknown-openbsd4.8/2.95.3/include/limits.h
+./usr/lib/gcc-lib/vax-unknown-openbsd4.8/2.95.3/include/new
+./usr/lib/gcc-lib/vax-unknown-openbsd4.8/2.95.3/include/new.h
+./usr/lib/gcc-lib/vax-unknown-openbsd4.8/2.95.3/include/syslimits.h
+./usr/lib/gcc-lib/vax-unknown-openbsd4.8/2.95.3/include/typeinfo
+./usr/lib/gcc-lib/vax-unknown-openbsd4.8/2.95.3/libgcc.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/scrt0.o
 ./usr/share/man/cat1/protoize.0
diff --git a/distrib/sets/lists/comp/md.zaurus b/distrib/sets/lists/comp/md.zaurus
index 6b81eba753b..072176183bd 100644
--- a/distrib/sets/lists/comp/md.zaurus
+++ b/distrib/sets/lists/comp/md.zaurus
@@ -55,24 +55,24 @@
 ./usr/include/arm/trap.h
 ./usr/include/arm/undefined.h
 ./usr/include/arm/vmparam.h
-./usr/include/g++/arm-unknown-openbsd4.7
-./usr/include/g++/arm-unknown-openbsd4.7/bits
-./usr/include/g++/arm-unknown-openbsd4.7/bits/atomicity.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/basic_file.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/c++config.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/c++io.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/c++locale.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/codecvt_specializations.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/ctype_base.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/ctype_inline.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/ctype_noninline.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/gthr-default.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/gthr-posix.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/gthr-single.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/gthr.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/messages_members.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/os_defines.h
-./usr/include/g++/arm-unknown-openbsd4.7/bits/time_members.h
+./usr/include/g++/arm-unknown-openbsd4.8
+./usr/include/g++/arm-unknown-openbsd4.8/bits
+./usr/include/g++/arm-unknown-openbsd4.8/bits/atomicity.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/basic_file.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/c++config.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/c++io.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/c++locale.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/codecvt_specializations.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/ctype_base.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/ctype_inline.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/ctype_noninline.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/gthr-default.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/gthr-posix.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/gthr-single.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/gthr.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/messages_members.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/os_defines.h
+./usr/include/g++/arm-unknown-openbsd4.8/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -252,9 +252,9 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/include
-./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/include/unwind.h
-./usr/lib/gcc-lib/arm-unknown-openbsd4.7/3.3.5/libgcc.a
+./usr/lib/gcc-lib/arm-unknown-openbsd4.8/3.3.5/include
+./usr/lib/gcc-lib/arm-unknown-openbsd4.8/3.3.5/include/unwind.h
+./usr/lib/gcc-lib/arm-unknown-openbsd4.8/3.3.5/libgcc.a
 ./usr/lib/libarm.a
 ./usr/lib/libarm_p.a
 ./usr/lib/libasn1_pic.a