sync

26 files changed, 417 insertions, 417 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index dcc1ca440fa..e0cff932c81 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -67,11 +67,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.4
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.4/4.2.1
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.4/4.2.1/collect2
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.4/4.2.1/libgcc.a
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.4/4.2.1/specs
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.5
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.5/4.2.1
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.5/4.2.1/collect2
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.5/4.2.1/libgcc.a
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.5/4.2.1/specs
 ./usr/lib/libstdc++.so.57.0
 ./usr/libdata/perl5/alpha-openbsd
 ./usr/libdata/perl5/alpha-openbsd/.packlist
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 48fbf2198c6..0bdc2f4a94d 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -76,11 +76,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.4
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.4/4.2.1
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.4/4.2.1/collect2
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.4/4.2.1/libgcc.a
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.4/4.2.1/specs
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.5
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.5/4.2.1
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.5/4.2.1/collect2
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.5/4.2.1/libgcc.a
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.5/4.2.1/specs
 ./usr/lib/libc++.so.2.1
 ./usr/lib/libc++abi.so.0.1
 ./usr/lib/libcompiler_rt.a
diff --git a/distrib/sets/lists/base/md.armv7 b/distrib/sets/lists/base/md.armv7
index d65d42d3946..a14775d946f 100644
--- a/distrib/sets/lists/base/md.armv7
+++ b/distrib/sets/lists/base/md.armv7
@@ -37,11 +37,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/arm-unknown-openbsd6.4
-./usr/lib/gcc-lib/arm-unknown-openbsd6.4/4.2.1
-./usr/lib/gcc-lib/arm-unknown-openbsd6.4/4.2.1/collect2
-./usr/lib/gcc-lib/arm-unknown-openbsd6.4/4.2.1/libgcc.a
-./usr/lib/gcc-lib/arm-unknown-openbsd6.4/4.2.1/specs
+./usr/lib/gcc-lib/arm-unknown-openbsd6.5
+./usr/lib/gcc-lib/arm-unknown-openbsd6.5/4.2.1
+./usr/lib/gcc-lib/arm-unknown-openbsd6.5/4.2.1/collect2
+./usr/lib/gcc-lib/arm-unknown-openbsd6.5/4.2.1/libgcc.a
+./usr/lib/gcc-lib/arm-unknown-openbsd6.5/4.2.1/specs
 ./usr/lib/libc++.so.2.1
 ./usr/lib/libc++abi.so.0.1
 ./usr/lib/libcompiler_rt.a
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 402c048b4cf..c3970ba0fdc 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -69,11 +69,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.4
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.4/4.2.1
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.4/4.2.1/collect2
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.4/4.2.1/libgcc.a
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.4/4.2.1/specs
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.5
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.5/4.2.1
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.5/4.2.1/collect2
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.5/4.2.1/libgcc.a
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.5/4.2.1/specs
 ./usr/lib/libstdc++.so.57.0
 ./usr/libdata/perl5/hppa-openbsd
 ./usr/libdata/perl5/hppa-openbsd/.packlist
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index b8e32c2eb6b..22ea45a3914 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -78,11 +78,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/i386-unknown-openbsd6.4
-./usr/lib/gcc-lib/i386-unknown-openbsd6.4/4.2.1
-./usr/lib/gcc-lib/i386-unknown-openbsd6.4/4.2.1/collect2
-./usr/lib/gcc-lib/i386-unknown-openbsd6.4/4.2.1/libgcc.a
-./usr/lib/gcc-lib/i386-unknown-openbsd6.4/4.2.1/specs
+./usr/lib/gcc-lib/i386-unknown-openbsd6.5
+./usr/lib/gcc-lib/i386-unknown-openbsd6.5/4.2.1
+./usr/lib/gcc-lib/i386-unknown-openbsd6.5/4.2.1/collect2
+./usr/lib/gcc-lib/i386-unknown-openbsd6.5/4.2.1/libgcc.a
+./usr/lib/gcc-lib/i386-unknown-openbsd6.5/4.2.1/specs
 ./usr/lib/libc++.so.2.1
 ./usr/lib/libc++abi.so.0.1
 ./usr/lib/libcompiler_rt.a
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index 074218bfb67..ce8196ff0af 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -34,11 +34,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sh-unknown-openbsd6.4
-./usr/lib/gcc-lib/sh-unknown-openbsd6.4/4.2.1
-./usr/lib/gcc-lib/sh-unknown-openbsd6.4/4.2.1/collect2
-./usr/lib/gcc-lib/sh-unknown-openbsd6.4/4.2.1/libgcc.a
-./usr/lib/gcc-lib/sh-unknown-openbsd6.4/4.2.1/specs
+./usr/lib/gcc-lib/sh-unknown-openbsd6.5
+./usr/lib/gcc-lib/sh-unknown-openbsd6.5/4.2.1
+./usr/lib/gcc-lib/sh-unknown-openbsd6.5/4.2.1/collect2
+./usr/lib/gcc-lib/sh-unknown-openbsd6.5/4.2.1/libgcc.a
+./usr/lib/gcc-lib/sh-unknown-openbsd6.5/4.2.1/specs
 ./usr/lib/libstdc++.so.57.0
 ./usr/libdata/perl5/sh-openbsd
 ./usr/libdata/perl5/sh-openbsd/.packlist
diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson
index 2d4d0060032..2adf100a029 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -43,11 +43,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.4
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.4/4.2.1
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.4/4.2.1/collect2
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.4/4.2.1/libgcc.a
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.4/4.2.1/specs
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.5
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.5/4.2.1
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.5/4.2.1/collect2
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.5/4.2.1/libgcc.a
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.5/4.2.1/specs
 ./usr/lib/libc++.so.2.1
 ./usr/lib/libc++abi.so.0.1
 ./usr/lib/libcompiler_rt.a
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index d3cff8e2521..ec8fb7e69b7 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -6,10 +6,10 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.4
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.4/3.3.6/fPIC/libgcc.a
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.4/3.3.6/fpic/libgcc.a
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.4/3.3.6/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.5
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.5/3.3.6/fPIC/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.5/3.3.6/fpic/libgcc.a
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.5/3.3.6/libgcc.a
 ./usr/lib/libstdc++.so.57.0
 ./usr/libdata/perl5/m88k-openbsd
 ./usr/libdata/perl5/m88k-openbsd/.packlist
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 765f6aa7b05..5a2d62d89e3 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -70,11 +70,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.4
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.4/4.2.1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.4/4.2.1/collect2
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.4/4.2.1/libgcc.a
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.4/4.2.1/specs
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.5
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.5/4.2.1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.5/4.2.1/collect2
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.5/4.2.1/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.5/4.2.1/specs
 ./usr/lib/libstdc++.so.57.0
 ./usr/libdata/perl5/powerpc-openbsd
 ./usr/libdata/perl5/powerpc-openbsd/.packlist
diff --git a/distrib/sets/lists/base/md.octeon b/distrib/sets/lists/base/md.octeon
index a226f464db9..4e7a292118f 100644
--- a/distrib/sets/lists/base/md.octeon
+++ b/distrib/sets/lists/base/md.octeon
@@ -41,11 +41,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.4
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.4/4.2.1
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.4/4.2.1/collect2
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.4/4.2.1/libgcc.a
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.4/4.2.1/specs
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.5
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.5/4.2.1
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.5/4.2.1/collect2
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.5/4.2.1/libgcc.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.5/4.2.1/specs
 ./usr/lib/libc++.so.2.1
 ./usr/lib/libc++abi.so.0.1
 ./usr/lib/libcompiler_rt.a
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 9f551bcf7ae..38e714ea192 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -72,11 +72,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.4
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.4/4.2.1
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.4/4.2.1/collect2
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.4/4.2.1/libgcc.a
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.4/4.2.1/specs
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.5
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.5/4.2.1
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.5/4.2.1/collect2
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.5/4.2.1/libgcc.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.5/4.2.1/specs
 ./usr/lib/libc++.so.2.1
 ./usr/lib/libc++abi.so.0.1
 ./usr/lib/libcompiler_rt.a
diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc
index bf3055d4fea..374a0688ad8 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -63,11 +63,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.4
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.4/4.2.1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.4/4.2.1/collect2
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.4/4.2.1/libgcc.a
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.4/4.2.1/specs
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.5
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.5/4.2.1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.5/4.2.1/collect2
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.5/4.2.1/libgcc.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.5/4.2.1/specs
 ./usr/lib/libstdc++.so.57.0
 ./usr/libdata/perl5/powerpc-openbsd
 ./usr/libdata/perl5/powerpc-openbsd/.packlist
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 76b0120adb6..c3f59bc9553 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -74,11 +74,11 @@
 ./usr/lib/crtbeginS.o
 ./usr/lib/crtend.o
 ./usr/lib/crtendS.o
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.4
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.4/4.2.1
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.4/4.2.1/collect2
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.4/4.2.1/libgcc.a
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.4/4.2.1/specs
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.5
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.5/4.2.1
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.5/4.2.1/collect2
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.5/4.2.1/libgcc.a
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.5/4.2.1/specs
 ./usr/lib/libc++.so.2.1
 ./usr/lib/libc++abi.so.0.1
 ./usr/lib/libcompiler_rt.a
diff --git a/distrib/sets/lists/comp/gcc.alpha b/distrib/sets/lists/comp/gcc.alpha
index 9b3349646a6..c5f48075d57 100644
--- a/distrib/sets/lists/comp/gcc.alpha
+++ b/distrib/sets/lists/comp/gcc.alpha
@@ -4,29 +4,29 @@
 ./usr/bin/ld.bfd
 ./usr/include/g++
 ./usr/include/g++/algorithm
-./usr/include/g++/alpha-unknown-openbsd6.4
-./usr/include/g++/alpha-unknown-openbsd6.4/bits
-./usr/include/g++/alpha-unknown-openbsd6.4/bits/atomic_word.h
-./usr/include/g++/alpha-unknown-openbsd6.4/bits/basic_file.h
-./usr/include/g++/alpha-unknown-openbsd6.4/bits/c++allocator.h
-./usr/include/g++/alpha-unknown-openbsd6.4/bits/c++config.h
-./usr/include/g++/alpha-unknown-openbsd6.4/bits/c++io.h
-./usr/include/g++/alpha-unknown-openbsd6.4/bits/c++locale.h
-./usr/include/g++/alpha-unknown-openbsd6.4/bits/c++locale_internal.h
-./usr/include/g++/alpha-unknown-openbsd6.4/bits/compatibility.h
-./usr/include/g++/alpha-unknown-openbsd6.4/bits/cpu_defines.h
-./usr/include/g++/alpha-unknown-openbsd6.4/bits/ctype_base.h
-./usr/include/g++/alpha-unknown-openbsd6.4/bits/ctype_inline.h
-./usr/include/g++/alpha-unknown-openbsd6.4/bits/ctype_noninline.h
-./usr/include/g++/alpha-unknown-openbsd6.4/bits/cxxabi_tweaks.h
-./usr/include/g++/alpha-unknown-openbsd6.4/bits/gthr-default.h
-./usr/include/g++/alpha-unknown-openbsd6.4/bits/gthr-posix.h
-./usr/include/g++/alpha-unknown-openbsd6.4/bits/gthr-single.h
-./usr/include/g++/alpha-unknown-openbsd6.4/bits/gthr-tpf.h
-./usr/include/g++/alpha-unknown-openbsd6.4/bits/gthr.h
-./usr/include/g++/alpha-unknown-openbsd6.4/bits/messages_members.h
-./usr/include/g++/alpha-unknown-openbsd6.4/bits/os_defines.h
-./usr/include/g++/alpha-unknown-openbsd6.4/bits/time_members.h
+./usr/include/g++/alpha-unknown-openbsd6.5
+./usr/include/g++/alpha-unknown-openbsd6.5/bits
+./usr/include/g++/alpha-unknown-openbsd6.5/bits/atomic_word.h
+./usr/include/g++/alpha-unknown-openbsd6.5/bits/basic_file.h
+./usr/include/g++/alpha-unknown-openbsd6.5/bits/c++allocator.h
+./usr/include/g++/alpha-unknown-openbsd6.5/bits/c++config.h
+./usr/include/g++/alpha-unknown-openbsd6.5/bits/c++io.h
+./usr/include/g++/alpha-unknown-openbsd6.5/bits/c++locale.h
+./usr/include/g++/alpha-unknown-openbsd6.5/bits/c++locale_internal.h
+./usr/include/g++/alpha-unknown-openbsd6.5/bits/compatibility.h
+./usr/include/g++/alpha-unknown-openbsd6.5/bits/cpu_defines.h
+./usr/include/g++/alpha-unknown-openbsd6.5/bits/ctype_base.h
+./usr/include/g++/alpha-unknown-openbsd6.5/bits/ctype_inline.h
+./usr/include/g++/alpha-unknown-openbsd6.5/bits/ctype_noninline.h
+./usr/include/g++/alpha-unknown-openbsd6.5/bits/cxxabi_tweaks.h
+./usr/include/g++/alpha-unknown-openbsd6.5/bits/gthr-default.h
+./usr/include/g++/alpha-unknown-openbsd6.5/bits/gthr-posix.h
+./usr/include/g++/alpha-unknown-openbsd6.5/bits/gthr-single.h
+./usr/include/g++/alpha-unknown-openbsd6.5/bits/gthr-tpf.h
+./usr/include/g++/alpha-unknown-openbsd6.5/bits/gthr.h
+./usr/include/g++/alpha-unknown-openbsd6.5/bits/messages_members.h
+./usr/include/g++/alpha-unknown-openbsd6.5/bits/os_defines.h
+./usr/include/g++/alpha-unknown-openbsd6.5/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -604,10 +604,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.4/4.2.1/cc1
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.4/4.2.1/cc1obj
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.4/4.2.1/cc1plus
-./usr/lib/gcc-lib/alpha-unknown-openbsd6.4/4.2.1/libgcov.a
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.5/4.2.1/cc1
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.5/4.2.1/cc1obj
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.5/4.2.1/cc1plus
+./usr/lib/gcc-lib/alpha-unknown-openbsd6.5/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
diff --git a/distrib/sets/lists/comp/gcc.amd64 b/distrib/sets/lists/comp/gcc.amd64
index b6be38b705b..97bb4432b44 100644
--- a/distrib/sets/lists/comp/gcc.amd64
+++ b/distrib/sets/lists/comp/gcc.amd64
@@ -4,29 +4,29 @@
 ./usr/bin/ld.bfd
 ./usr/include/g++
 ./usr/include/g++/algorithm
-./usr/include/g++/amd64-unknown-openbsd6.4
-./usr/include/g++/amd64-unknown-openbsd6.4/bits
-./usr/include/g++/amd64-unknown-openbsd6.4/bits/atomic_word.h
-./usr/include/g++/amd64-unknown-openbsd6.4/bits/basic_file.h
-./usr/include/g++/amd64-unknown-openbsd6.4/bits/c++allocator.h
-./usr/include/g++/amd64-unknown-openbsd6.4/bits/c++config.h
-./usr/include/g++/amd64-unknown-openbsd6.4/bits/c++io.h
-./usr/include/g++/amd64-unknown-openbsd6.4/bits/c++locale.h
-./usr/include/g++/amd64-unknown-openbsd6.4/bits/c++locale_internal.h
-./usr/include/g++/amd64-unknown-openbsd6.4/bits/compatibility.h
-./usr/include/g++/amd64-unknown-openbsd6.4/bits/cpu_defines.h
-./usr/include/g++/amd64-unknown-openbsd6.4/bits/ctype_base.h
-./usr/include/g++/amd64-unknown-openbsd6.4/bits/ctype_inline.h
-./usr/include/g++/amd64-unknown-openbsd6.4/bits/ctype_noninline.h
-./usr/include/g++/amd64-unknown-openbsd6.4/bits/cxxabi_tweaks.h
-./usr/include/g++/amd64-unknown-openbsd6.4/bits/gthr-default.h
-./usr/include/g++/amd64-unknown-openbsd6.4/bits/gthr-posix.h
-./usr/include/g++/amd64-unknown-openbsd6.4/bits/gthr-single.h
-./usr/include/g++/amd64-unknown-openbsd6.4/bits/gthr-tpf.h
-./usr/include/g++/amd64-unknown-openbsd6.4/bits/gthr.h
-./usr/include/g++/amd64-unknown-openbsd6.4/bits/messages_members.h
-./usr/include/g++/amd64-unknown-openbsd6.4/bits/os_defines.h
-./usr/include/g++/amd64-unknown-openbsd6.4/bits/time_members.h
+./usr/include/g++/amd64-unknown-openbsd6.5
+./usr/include/g++/amd64-unknown-openbsd6.5/bits
+./usr/include/g++/amd64-unknown-openbsd6.5/bits/atomic_word.h
+./usr/include/g++/amd64-unknown-openbsd6.5/bits/basic_file.h
+./usr/include/g++/amd64-unknown-openbsd6.5/bits/c++allocator.h
+./usr/include/g++/amd64-unknown-openbsd6.5/bits/c++config.h
+./usr/include/g++/amd64-unknown-openbsd6.5/bits/c++io.h
+./usr/include/g++/amd64-unknown-openbsd6.5/bits/c++locale.h
+./usr/include/g++/amd64-unknown-openbsd6.5/bits/c++locale_internal.h
+./usr/include/g++/amd64-unknown-openbsd6.5/bits/compatibility.h
+./usr/include/g++/amd64-unknown-openbsd6.5/bits/cpu_defines.h
+./usr/include/g++/amd64-unknown-openbsd6.5/bits/ctype_base.h
+./usr/include/g++/amd64-unknown-openbsd6.5/bits/ctype_inline.h
+./usr/include/g++/amd64-unknown-openbsd6.5/bits/ctype_noninline.h
+./usr/include/g++/amd64-unknown-openbsd6.5/bits/cxxabi_tweaks.h
+./usr/include/g++/amd64-unknown-openbsd6.5/bits/gthr-default.h
+./usr/include/g++/amd64-unknown-openbsd6.5/bits/gthr-posix.h
+./usr/include/g++/amd64-unknown-openbsd6.5/bits/gthr-single.h
+./usr/include/g++/amd64-unknown-openbsd6.5/bits/gthr-tpf.h
+./usr/include/g++/amd64-unknown-openbsd6.5/bits/gthr.h
+./usr/include/g++/amd64-unknown-openbsd6.5/bits/messages_members.h
+./usr/include/g++/amd64-unknown-openbsd6.5/bits/os_defines.h
+./usr/include/g++/amd64-unknown-openbsd6.5/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -604,10 +604,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.4/4.2.1/cc1
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.4/4.2.1/cc1obj
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.4/4.2.1/cc1plus
-./usr/lib/gcc-lib/amd64-unknown-openbsd6.4/4.2.1/libgcov.a
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.5/4.2.1/cc1
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.5/4.2.1/cc1obj
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.5/4.2.1/cc1plus
+./usr/lib/gcc-lib/amd64-unknown-openbsd6.5/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
diff --git a/distrib/sets/lists/comp/gcc.armv7 b/distrib/sets/lists/comp/gcc.armv7
index c5b86c23990..b74461de041 100644
--- a/distrib/sets/lists/comp/gcc.armv7
+++ b/distrib/sets/lists/comp/gcc.armv7
@@ -4,29 +4,29 @@
 ./usr/bin/ld.bfd
 ./usr/include/g++
 ./usr/include/g++/algorithm
-./usr/include/g++/arm-unknown-openbsd6.4
-./usr/include/g++/arm-unknown-openbsd6.4/bits
-./usr/include/g++/arm-unknown-openbsd6.4/bits/atomic_word.h
-./usr/include/g++/arm-unknown-openbsd6.4/bits/basic_file.h
-./usr/include/g++/arm-unknown-openbsd6.4/bits/c++allocator.h
-./usr/include/g++/arm-unknown-openbsd6.4/bits/c++config.h
-./usr/include/g++/arm-unknown-openbsd6.4/bits/c++io.h
-./usr/include/g++/arm-unknown-openbsd6.4/bits/c++locale.h
-./usr/include/g++/arm-unknown-openbsd6.4/bits/c++locale_internal.h
-./usr/include/g++/arm-unknown-openbsd6.4/bits/compatibility.h
-./usr/include/g++/arm-unknown-openbsd6.4/bits/cpu_defines.h
-./usr/include/g++/arm-unknown-openbsd6.4/bits/ctype_base.h
-./usr/include/g++/arm-unknown-openbsd6.4/bits/ctype_inline.h
-./usr/include/g++/arm-unknown-openbsd6.4/bits/ctype_noninline.h
-./usr/include/g++/arm-unknown-openbsd6.4/bits/cxxabi_tweaks.h
-./usr/include/g++/arm-unknown-openbsd6.4/bits/gthr-default.h
-./usr/include/g++/arm-unknown-openbsd6.4/bits/gthr-posix.h
-./usr/include/g++/arm-unknown-openbsd6.4/bits/gthr-single.h
-./usr/include/g++/arm-unknown-openbsd6.4/bits/gthr-tpf.h
-./usr/include/g++/arm-unknown-openbsd6.4/bits/gthr.h
-./usr/include/g++/arm-unknown-openbsd6.4/bits/messages_members.h
-./usr/include/g++/arm-unknown-openbsd6.4/bits/os_defines.h
-./usr/include/g++/arm-unknown-openbsd6.4/bits/time_members.h
+./usr/include/g++/arm-unknown-openbsd6.5
+./usr/include/g++/arm-unknown-openbsd6.5/bits
+./usr/include/g++/arm-unknown-openbsd6.5/bits/atomic_word.h
+./usr/include/g++/arm-unknown-openbsd6.5/bits/basic_file.h
+./usr/include/g++/arm-unknown-openbsd6.5/bits/c++allocator.h
+./usr/include/g++/arm-unknown-openbsd6.5/bits/c++config.h
+./usr/include/g++/arm-unknown-openbsd6.5/bits/c++io.h
+./usr/include/g++/arm-unknown-openbsd6.5/bits/c++locale.h
+./usr/include/g++/arm-unknown-openbsd6.5/bits/c++locale_internal.h
+./usr/include/g++/arm-unknown-openbsd6.5/bits/compatibility.h
+./usr/include/g++/arm-unknown-openbsd6.5/bits/cpu_defines.h
+./usr/include/g++/arm-unknown-openbsd6.5/bits/ctype_base.h
+./usr/include/g++/arm-unknown-openbsd6.5/bits/ctype_inline.h
+./usr/include/g++/arm-unknown-openbsd6.5/bits/ctype_noninline.h
+./usr/include/g++/arm-unknown-openbsd6.5/bits/cxxabi_tweaks.h
+./usr/include/g++/arm-unknown-openbsd6.5/bits/gthr-default.h
+./usr/include/g++/arm-unknown-openbsd6.5/bits/gthr-posix.h
+./usr/include/g++/arm-unknown-openbsd6.5/bits/gthr-single.h
+./usr/include/g++/arm-unknown-openbsd6.5/bits/gthr-tpf.h
+./usr/include/g++/arm-unknown-openbsd6.5/bits/gthr.h
+./usr/include/g++/arm-unknown-openbsd6.5/bits/messages_members.h
+./usr/include/g++/arm-unknown-openbsd6.5/bits/os_defines.h
+./usr/include/g++/arm-unknown-openbsd6.5/bits/time_members.h
 ./usr/include/g++/backward
 ./usr/include/g++/backward/algo.h
 ./usr/include/g++/backward/algobase.h
@@ -604,10 +604,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/arm-unknown-openbsd6.4/4.2.1/cc1
-./usr/lib/gcc-lib/arm-unknown-openbsd6.4/4.2.1/cc1obj
-./usr/lib/gcc-lib/arm-unknown-openbsd6.4/4.2.1/cc1plus
-./usr/lib/gcc-lib/arm-unknown-openbsd6.4/4.2.1/libgcov.a
+./usr/lib/gcc-lib/arm-unknown-openbsd6.5/4.2.1/cc1
+./usr/lib/gcc-lib/arm-unknown-openbsd6.5/4.2.1/cc1obj
+./usr/lib/gcc-lib/arm-unknown-openbsd6.5/4.2.1/cc1plus
+./usr/lib/gcc-lib/arm-unknown-openbsd6.5/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
diff --git a/distrib/sets/lists/comp/gcc.hppa b/distrib/sets/lists/comp/gcc.hppa
index 049b77c9b09..39cd4265adc 100644
--- a/distrib/sets/lists/comp/gcc.hppa
+++ b/distrib/sets/lists/comp/gcc.hppa
@@ -485,29 +485,29 @@
 ./usr/include/g++/ext/vstring_util.h
 ./usr/include/g++/fstream
 ./usr/include/g++/functional
-./usr/include/g++/hppa-unknown-openbsd6.4
-./usr/include/g++/hppa-unknown-openbsd6.4/bits
-./usr/include/g++/hppa-unknown-openbsd6.4/bits/atomic_word.h
-./usr/include/g++/hppa-unknown-openbsd6.4/bits/basic_file.h
-./usr/include/g++/hppa-unknown-openbsd6.4/bits/c++allocator.h
-./usr/include/g++/hppa-unknown-openbsd6.4/bits/c++config.h
-./usr/include/g++/hppa-unknown-openbsd6.4/bits/c++io.h
-./usr/include/g++/hppa-unknown-openbsd6.4/bits/c++locale.h
-./usr/include/g++/hppa-unknown-openbsd6.4/bits/c++locale_internal.h
-./usr/include/g++/hppa-unknown-openbsd6.4/bits/compatibility.h
-./usr/include/g++/hppa-unknown-openbsd6.4/bits/cpu_defines.h
-./usr/include/g++/hppa-unknown-openbsd6.4/bits/ctype_base.h
-./usr/include/g++/hppa-unknown-openbsd6.4/bits/ctype_inline.h
-./usr/include/g++/hppa-unknown-openbsd6.4/bits/ctype_noninline.h
-./usr/include/g++/hppa-unknown-openbsd6.4/bits/cxxabi_tweaks.h
-./usr/include/g++/hppa-unknown-openbsd6.4/bits/gthr-default.h
-./usr/include/g++/hppa-unknown-openbsd6.4/bits/gthr-posix.h
-./usr/include/g++/hppa-unknown-openbsd6.4/bits/gthr-single.h
-./usr/include/g++/hppa-unknown-openbsd6.4/bits/gthr-tpf.h
-./usr/include/g++/hppa-unknown-openbsd6.4/bits/gthr.h
-./usr/include/g++/hppa-unknown-openbsd6.4/bits/messages_members.h
-./usr/include/g++/hppa-unknown-openbsd6.4/bits/os_defines.h
-./usr/include/g++/hppa-unknown-openbsd6.4/bits/time_members.h
+./usr/include/g++/hppa-unknown-openbsd6.5
+./usr/include/g++/hppa-unknown-openbsd6.5/bits
+./usr/include/g++/hppa-unknown-openbsd6.5/bits/atomic_word.h
+./usr/include/g++/hppa-unknown-openbsd6.5/bits/basic_file.h
+./usr/include/g++/hppa-unknown-openbsd6.5/bits/c++allocator.h
+./usr/include/g++/hppa-unknown-openbsd6.5/bits/c++config.h
+./usr/include/g++/hppa-unknown-openbsd6.5/bits/c++io.h
+./usr/include/g++/hppa-unknown-openbsd6.5/bits/c++locale.h
+./usr/include/g++/hppa-unknown-openbsd6.5/bits/c++locale_internal.h
+./usr/include/g++/hppa-unknown-openbsd6.5/bits/compatibility.h
+./usr/include/g++/hppa-unknown-openbsd6.5/bits/cpu_defines.h
+./usr/include/g++/hppa-unknown-openbsd6.5/bits/ctype_base.h
+./usr/include/g++/hppa-unknown-openbsd6.5/bits/ctype_inline.h
+./usr/include/g++/hppa-unknown-openbsd6.5/bits/ctype_noninline.h
+./usr/include/g++/hppa-unknown-openbsd6.5/bits/cxxabi_tweaks.h
+./usr/include/g++/hppa-unknown-openbsd6.5/bits/gthr-default.h
+./usr/include/g++/hppa-unknown-openbsd6.5/bits/gthr-posix.h
+./usr/include/g++/hppa-unknown-openbsd6.5/bits/gthr-single.h
+./usr/include/g++/hppa-unknown-openbsd6.5/bits/gthr-tpf.h
+./usr/include/g++/hppa-unknown-openbsd6.5/bits/gthr.h
+./usr/include/g++/hppa-unknown-openbsd6.5/bits/messages_members.h
+./usr/include/g++/hppa-unknown-openbsd6.5/bits/os_defines.h
+./usr/include/g++/hppa-unknown-openbsd6.5/bits/time_members.h
 ./usr/include/g++/iomanip
 ./usr/include/g++/ios
 ./usr/include/g++/iosfwd
@@ -604,10 +604,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.4/4.2.1/cc1
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.4/4.2.1/cc1obj
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.4/4.2.1/cc1plus
-./usr/lib/gcc-lib/hppa-unknown-openbsd6.4/4.2.1/libgcov.a
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.5/4.2.1/cc1
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.5/4.2.1/cc1obj
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.5/4.2.1/cc1plus
+./usr/lib/gcc-lib/hppa-unknown-openbsd6.5/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
diff --git a/distrib/sets/lists/comp/gcc.i386 b/distrib/sets/lists/comp/gcc.i386
index 95dc9fbfe01..50bac839c60 100644
--- a/distrib/sets/lists/comp/gcc.i386
+++ b/distrib/sets/lists/comp/gcc.i386
@@ -485,29 +485,29 @@
 ./usr/include/g++/ext/vstring_util.h
 ./usr/include/g++/fstream
 ./usr/include/g++/functional
-./usr/include/g++/i386-unknown-openbsd6.4
-./usr/include/g++/i386-unknown-openbsd6.4/bits
-./usr/include/g++/i386-unknown-openbsd6.4/bits/atomic_word.h
-./usr/include/g++/i386-unknown-openbsd6.4/bits/basic_file.h
-./usr/include/g++/i386-unknown-openbsd6.4/bits/c++allocator.h
-./usr/include/g++/i386-unknown-openbsd6.4/bits/c++config.h
-./usr/include/g++/i386-unknown-openbsd6.4/bits/c++io.h
-./usr/include/g++/i386-unknown-openbsd6.4/bits/c++locale.h
-./usr/include/g++/i386-unknown-openbsd6.4/bits/c++locale_internal.h
-./usr/include/g++/i386-unknown-openbsd6.4/bits/compatibility.h
-./usr/include/g++/i386-unknown-openbsd6.4/bits/cpu_defines.h
-./usr/include/g++/i386-unknown-openbsd6.4/bits/ctype_base.h
-./usr/include/g++/i386-unknown-openbsd6.4/bits/ctype_inline.h
-./usr/include/g++/i386-unknown-openbsd6.4/bits/ctype_noninline.h
-./usr/include/g++/i386-unknown-openbsd6.4/bits/cxxabi_tweaks.h
-./usr/include/g++/i386-unknown-openbsd6.4/bits/gthr-default.h
-./usr/include/g++/i386-unknown-openbsd6.4/bits/gthr-posix.h
-./usr/include/g++/i386-unknown-openbsd6.4/bits/gthr-single.h
-./usr/include/g++/i386-unknown-openbsd6.4/bits/gthr-tpf.h
-./usr/include/g++/i386-unknown-openbsd6.4/bits/gthr.h
-./usr/include/g++/i386-unknown-openbsd6.4/bits/messages_members.h
-./usr/include/g++/i386-unknown-openbsd6.4/bits/os_defines.h
-./usr/include/g++/i386-unknown-openbsd6.4/bits/time_members.h
+./usr/include/g++/i386-unknown-openbsd6.5
+./usr/include/g++/i386-unknown-openbsd6.5/bits
+./usr/include/g++/i386-unknown-openbsd6.5/bits/atomic_word.h
+./usr/include/g++/i386-unknown-openbsd6.5/bits/basic_file.h
+./usr/include/g++/i386-unknown-openbsd6.5/bits/c++allocator.h
+./usr/include/g++/i386-unknown-openbsd6.5/bits/c++config.h
+./usr/include/g++/i386-unknown-openbsd6.5/bits/c++io.h
+./usr/include/g++/i386-unknown-openbsd6.5/bits/c++locale.h
+./usr/include/g++/i386-unknown-openbsd6.5/bits/c++locale_internal.h
+./usr/include/g++/i386-unknown-openbsd6.5/bits/compatibility.h
+./usr/include/g++/i386-unknown-openbsd6.5/bits/cpu_defines.h
+./usr/include/g++/i386-unknown-openbsd6.5/bits/ctype_base.h
+./usr/include/g++/i386-unknown-openbsd6.5/bits/ctype_inline.h
+./usr/include/g++/i386-unknown-openbsd6.5/bits/ctype_noninline.h
+./usr/include/g++/i386-unknown-openbsd6.5/bits/cxxabi_tweaks.h
+./usr/include/g++/i386-unknown-openbsd6.5/bits/gthr-default.h
+./usr/include/g++/i386-unknown-openbsd6.5/bits/gthr-posix.h
+./usr/include/g++/i386-unknown-openbsd6.5/bits/gthr-single.h
+./usr/include/g++/i386-unknown-openbsd6.5/bits/gthr-tpf.h
+./usr/include/g++/i386-unknown-openbsd6.5/bits/gthr.h
+./usr/include/g++/i386-unknown-openbsd6.5/bits/messages_members.h
+./usr/include/g++/i386-unknown-openbsd6.5/bits/os_defines.h
+./usr/include/g++/i386-unknown-openbsd6.5/bits/time_members.h
 ./usr/include/g++/iomanip
 ./usr/include/g++/ios
 ./usr/include/g++/iosfwd
@@ -604,10 +604,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/i386-unknown-openbsd6.4/4.2.1/cc1
-./usr/lib/gcc-lib/i386-unknown-openbsd6.4/4.2.1/cc1obj
-./usr/lib/gcc-lib/i386-unknown-openbsd6.4/4.2.1/cc1plus
-./usr/lib/gcc-lib/i386-unknown-openbsd6.4/4.2.1/libgcov.a
+./usr/lib/gcc-lib/i386-unknown-openbsd6.5/4.2.1/cc1
+./usr/lib/gcc-lib/i386-unknown-openbsd6.5/4.2.1/cc1obj
+./usr/lib/gcc-lib/i386-unknown-openbsd6.5/4.2.1/cc1plus
+./usr/lib/gcc-lib/i386-unknown-openbsd6.5/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
diff --git a/distrib/sets/lists/comp/gcc.landisk b/distrib/sets/lists/comp/gcc.landisk
index ab18e1196b6..58c4ace3163 100644
--- a/distrib/sets/lists/comp/gcc.landisk
+++ b/distrib/sets/lists/comp/gcc.landisk
@@ -501,29 +501,29 @@
 ./usr/include/g++/ostream
 ./usr/include/g++/queue
 ./usr/include/g++/set
-./usr/include/g++/sh-unknown-openbsd6.4
-./usr/include/g++/sh-unknown-openbsd6.4/bits
-./usr/include/g++/sh-unknown-openbsd6.4/bits/atomic_word.h
-./usr/include/g++/sh-unknown-openbsd6.4/bits/basic_file.h
-./usr/include/g++/sh-unknown-openbsd6.4/bits/c++allocator.h
-./usr/include/g++/sh-unknown-openbsd6.4/bits/c++config.h
-./usr/include/g++/sh-unknown-openbsd6.4/bits/c++io.h
-./usr/include/g++/sh-unknown-openbsd6.4/bits/c++locale.h
-./usr/include/g++/sh-unknown-openbsd6.4/bits/c++locale_internal.h
-./usr/include/g++/sh-unknown-openbsd6.4/bits/compatibility.h
-./usr/include/g++/sh-unknown-openbsd6.4/bits/cpu_defines.h
-./usr/include/g++/sh-unknown-openbsd6.4/bits/ctype_base.h
-./usr/include/g++/sh-unknown-openbsd6.4/bits/ctype_inline.h
-./usr/include/g++/sh-unknown-openbsd6.4/bits/ctype_noninline.h
-./usr/include/g++/sh-unknown-openbsd6.4/bits/cxxabi_tweaks.h
-./usr/include/g++/sh-unknown-openbsd6.4/bits/gthr-default.h
-./usr/include/g++/sh-unknown-openbsd6.4/bits/gthr-posix.h
-./usr/include/g++/sh-unknown-openbsd6.4/bits/gthr-single.h
-./usr/include/g++/sh-unknown-openbsd6.4/bits/gthr-tpf.h
-./usr/include/g++/sh-unknown-openbsd6.4/bits/gthr.h
-./usr/include/g++/sh-unknown-openbsd6.4/bits/messages_members.h
-./usr/include/g++/sh-unknown-openbsd6.4/bits/os_defines.h
-./usr/include/g++/sh-unknown-openbsd6.4/bits/time_members.h
+./usr/include/g++/sh-unknown-openbsd6.5
+./usr/include/g++/sh-unknown-openbsd6.5/bits
+./usr/include/g++/sh-unknown-openbsd6.5/bits/atomic_word.h
+./usr/include/g++/sh-unknown-openbsd6.5/bits/basic_file.h
+./usr/include/g++/sh-unknown-openbsd6.5/bits/c++allocator.h
+./usr/include/g++/sh-unknown-openbsd6.5/bits/c++config.h
+./usr/include/g++/sh-unknown-openbsd6.5/bits/c++io.h
+./usr/include/g++/sh-unknown-openbsd6.5/bits/c++locale.h
+./usr/include/g++/sh-unknown-openbsd6.5/bits/c++locale_internal.h
+./usr/include/g++/sh-unknown-openbsd6.5/bits/compatibility.h
+./usr/include/g++/sh-unknown-openbsd6.5/bits/cpu_defines.h
+./usr/include/g++/sh-unknown-openbsd6.5/bits/ctype_base.h
+./usr/include/g++/sh-unknown-openbsd6.5/bits/ctype_inline.h
+./usr/include/g++/sh-unknown-openbsd6.5/bits/ctype_noninline.h
+./usr/include/g++/sh-unknown-openbsd6.5/bits/cxxabi_tweaks.h
+./usr/include/g++/sh-unknown-openbsd6.5/bits/gthr-default.h
+./usr/include/g++/sh-unknown-openbsd6.5/bits/gthr-posix.h
+./usr/include/g++/sh-unknown-openbsd6.5/bits/gthr-single.h
+./usr/include/g++/sh-unknown-openbsd6.5/bits/gthr-tpf.h
+./usr/include/g++/sh-unknown-openbsd6.5/bits/gthr.h
+./usr/include/g++/sh-unknown-openbsd6.5/bits/messages_members.h
+./usr/include/g++/sh-unknown-openbsd6.5/bits/os_defines.h
+./usr/include/g++/sh-unknown-openbsd6.5/bits/time_members.h
 ./usr/include/g++/sstream
 ./usr/include/g++/stack
 ./usr/include/g++/stdexcept
@@ -604,10 +604,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/sh-unknown-openbsd6.4/4.2.1/cc1
-./usr/lib/gcc-lib/sh-unknown-openbsd6.4/4.2.1/cc1obj
-./usr/lib/gcc-lib/sh-unknown-openbsd6.4/4.2.1/cc1plus
-./usr/lib/gcc-lib/sh-unknown-openbsd6.4/4.2.1/libgcov.a
+./usr/lib/gcc-lib/sh-unknown-openbsd6.5/4.2.1/cc1
+./usr/lib/gcc-lib/sh-unknown-openbsd6.5/4.2.1/cc1obj
+./usr/lib/gcc-lib/sh-unknown-openbsd6.5/4.2.1/cc1plus
+./usr/lib/gcc-lib/sh-unknown-openbsd6.5/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
diff --git a/distrib/sets/lists/comp/gcc.loongson b/distrib/sets/lists/comp/gcc.loongson
index 120da5bbc73..4b9187db5d2 100644
--- a/distrib/sets/lists/comp/gcc.loongson
+++ b/distrib/sets/lists/comp/gcc.loongson
@@ -496,29 +496,29 @@
 ./usr/include/g++/locale
 ./usr/include/g++/map
 ./usr/include/g++/memory
-./usr/include/g++/mips64el-unknown-openbsd6.4
-./usr/include/g++/mips64el-unknown-openbsd6.4/bits
-./usr/include/g++/mips64el-unknown-openbsd6.4/bits/atomic_word.h
-./usr/include/g++/mips64el-unknown-openbsd6.4/bits/basic_file.h
-./usr/include/g++/mips64el-unknown-openbsd6.4/bits/c++allocator.h
-./usr/include/g++/mips64el-unknown-openbsd6.4/bits/c++config.h
-./usr/include/g++/mips64el-unknown-openbsd6.4/bits/c++io.h
-./usr/include/g++/mips64el-unknown-openbsd6.4/bits/c++locale.h
-./usr/include/g++/mips64el-unknown-openbsd6.4/bits/c++locale_internal.h
-./usr/include/g++/mips64el-unknown-openbsd6.4/bits/compatibility.h
-./usr/include/g++/mips64el-unknown-openbsd6.4/bits/cpu_defines.h
-./usr/include/g++/mips64el-unknown-openbsd6.4/bits/ctype_base.h
-./usr/include/g++/mips64el-unknown-openbsd6.4/bits/ctype_inline.h
-./usr/include/g++/mips64el-unknown-openbsd6.4/bits/ctype_noninline.h
-./usr/include/g++/mips64el-unknown-openbsd6.4/bits/cxxabi_tweaks.h
-./usr/include/g++/mips64el-unknown-openbsd6.4/bits/gthr-default.h
-./usr/include/g++/mips64el-unknown-openbsd6.4/bits/gthr-posix.h
-./usr/include/g++/mips64el-unknown-openbsd6.4/bits/gthr-single.h
-./usr/include/g++/mips64el-unknown-openbsd6.4/bits/gthr-tpf.h
-./usr/include/g++/mips64el-unknown-openbsd6.4/bits/gthr.h
-./usr/include/g++/mips64el-unknown-openbsd6.4/bits/messages_members.h
-./usr/include/g++/mips64el-unknown-openbsd6.4/bits/os_defines.h
-./usr/include/g++/mips64el-unknown-openbsd6.4/bits/time_members.h
+./usr/include/g++/mips64el-unknown-openbsd6.5
+./usr/include/g++/mips64el-unknown-openbsd6.5/bits
+./usr/include/g++/mips64el-unknown-openbsd6.5/bits/atomic_word.h
+./usr/include/g++/mips64el-unknown-openbsd6.5/bits/basic_file.h
+./usr/include/g++/mips64el-unknown-openbsd6.5/bits/c++allocator.h
+./usr/include/g++/mips64el-unknown-openbsd6.5/bits/c++config.h
+./usr/include/g++/mips64el-unknown-openbsd6.5/bits/c++io.h
+./usr/include/g++/mips64el-unknown-openbsd6.5/bits/c++locale.h
+./usr/include/g++/mips64el-unknown-openbsd6.5/bits/c++locale_internal.h
+./usr/include/g++/mips64el-unknown-openbsd6.5/bits/compatibility.h
+./usr/include/g++/mips64el-unknown-openbsd6.5/bits/cpu_defines.h
+./usr/include/g++/mips64el-unknown-openbsd6.5/bits/ctype_base.h
+./usr/include/g++/mips64el-unknown-openbsd6.5/bits/ctype_inline.h
+./usr/include/g++/mips64el-unknown-openbsd6.5/bits/ctype_noninline.h
+./usr/include/g++/mips64el-unknown-openbsd6.5/bits/cxxabi_tweaks.h
+./usr/include/g++/mips64el-unknown-openbsd6.5/bits/gthr-default.h
+./usr/include/g++/mips64el-unknown-openbsd6.5/bits/gthr-posix.h
+./usr/include/g++/mips64el-unknown-openbsd6.5/bits/gthr-single.h
+./usr/include/g++/mips64el-unknown-openbsd6.5/bits/gthr-tpf.h
+./usr/include/g++/mips64el-unknown-openbsd6.5/bits/gthr.h
+./usr/include/g++/mips64el-unknown-openbsd6.5/bits/messages_members.h
+./usr/include/g++/mips64el-unknown-openbsd6.5/bits/os_defines.h
+./usr/include/g++/mips64el-unknown-openbsd6.5/bits/time_members.h
 ./usr/include/g++/new
 ./usr/include/g++/numeric
 ./usr/include/g++/ostream
@@ -604,10 +604,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.4/4.2.1/cc1
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.4/4.2.1/cc1obj
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.4/4.2.1/cc1plus
-./usr/lib/gcc-lib/mips64el-unknown-openbsd6.4/4.2.1/libgcov.a
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.5/4.2.1/cc1
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.5/4.2.1/cc1obj
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.5/4.2.1/cc1plus
+./usr/lib/gcc-lib/mips64el-unknown-openbsd6.5/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
diff --git a/distrib/sets/lists/comp/gcc.luna88k b/distrib/sets/lists/comp/gcc.luna88k
index 408893c4084..50c23297cd2 100644
--- a/distrib/sets/lists/comp/gcc.luna88k
+++ b/distrib/sets/lists/comp/gcc.luna88k
@@ -161,24 +161,24 @@
 ./usr/include/g++/limits
 ./usr/include/g++/list
 ./usr/include/g++/locale
-./usr/include/g++/m88k-unknown-openbsd6.4
-./usr/include/g++/m88k-unknown-openbsd6.4/bits
-./usr/include/g++/m88k-unknown-openbsd6.4/bits/atomicity.h
-./usr/include/g++/m88k-unknown-openbsd6.4/bits/basic_file.h
-./usr/include/g++/m88k-unknown-openbsd6.4/bits/c++config.h
-./usr/include/g++/m88k-unknown-openbsd6.4/bits/c++io.h
-./usr/include/g++/m88k-unknown-openbsd6.4/bits/c++locale.h
-./usr/include/g++/m88k-unknown-openbsd6.4/bits/codecvt_specializations.h
-./usr/include/g++/m88k-unknown-openbsd6.4/bits/ctype_base.h
-./usr/include/g++/m88k-unknown-openbsd6.4/bits/ctype_inline.h
-./usr/include/g++/m88k-unknown-openbsd6.4/bits/ctype_noninline.h
-./usr/include/g++/m88k-unknown-openbsd6.4/bits/gthr-default.h
-./usr/include/g++/m88k-unknown-openbsd6.4/bits/gthr-posix.h
-./usr/include/g++/m88k-unknown-openbsd6.4/bits/gthr-single.h
-./usr/include/g++/m88k-unknown-openbsd6.4/bits/gthr.h
-./usr/include/g++/m88k-unknown-openbsd6.4/bits/messages_members.h
-./usr/include/g++/m88k-unknown-openbsd6.4/bits/os_defines.h
-./usr/include/g++/m88k-unknown-openbsd6.4/bits/time_members.h
+./usr/include/g++/m88k-unknown-openbsd6.5
+./usr/include/g++/m88k-unknown-openbsd6.5/bits
+./usr/include/g++/m88k-unknown-openbsd6.5/bits/atomicity.h
+./usr/include/g++/m88k-unknown-openbsd6.5/bits/basic_file.h
+./usr/include/g++/m88k-unknown-openbsd6.5/bits/c++config.h
+./usr/include/g++/m88k-unknown-openbsd6.5/bits/c++io.h
+./usr/include/g++/m88k-unknown-openbsd6.5/bits/c++locale.h
+./usr/include/g++/m88k-unknown-openbsd6.5/bits/codecvt_specializations.h
+./usr/include/g++/m88k-unknown-openbsd6.5/bits/ctype_base.h
+./usr/include/g++/m88k-unknown-openbsd6.5/bits/ctype_inline.h
+./usr/include/g++/m88k-unknown-openbsd6.5/bits/ctype_noninline.h
+./usr/include/g++/m88k-unknown-openbsd6.5/bits/gthr-default.h
+./usr/include/g++/m88k-unknown-openbsd6.5/bits/gthr-posix.h
+./usr/include/g++/m88k-unknown-openbsd6.5/bits/gthr-single.h
+./usr/include/g++/m88k-unknown-openbsd6.5/bits/gthr.h
+./usr/include/g++/m88k-unknown-openbsd6.5/bits/messages_members.h
+./usr/include/g++/m88k-unknown-openbsd6.5/bits/os_defines.h
+./usr/include/g++/m88k-unknown-openbsd6.5/bits/time_members.h
 ./usr/include/g++/map
 ./usr/include/g++/memory
 ./usr/include/g++/new
@@ -208,17 +208,17 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.4/3.3.6
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.4/3.3.6/SYSCALLS.c.X
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.4/3.3.6/cc1
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.4/3.3.6/cc1obj
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.4/3.3.6/cc1plus
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.4/3.3.6/collect2
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.4/3.3.6/fPIC
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.4/3.3.6/fpic
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.4/3.3.6/include
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.4/3.3.6/include/unwind.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd6.4/3.3.6/specs
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.5/3.3.6
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.5/3.3.6/SYSCALLS.c.X
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.5/3.3.6/cc1
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.5/3.3.6/cc1obj
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.5/3.3.6/cc1plus
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.5/3.3.6/collect2
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.5/3.3.6/fPIC
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.5/3.3.6/fpic
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.5/3.3.6/include
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.5/3.3.6/include/unwind.h
+./usr/lib/gcc-lib/m88k-unknown-openbsd6.5/3.3.6/specs
 ./usr/lib/libstdc++.a
 ./usr/lib/libsupc++.a
 ./usr/share/info/cpp.info
diff --git a/distrib/sets/lists/comp/gcc.macppc b/distrib/sets/lists/comp/gcc.macppc
index e6abea0f78c..7c87fbc7fc6 100644
--- a/distrib/sets/lists/comp/gcc.macppc
+++ b/distrib/sets/lists/comp/gcc.macppc
@@ -499,29 +499,29 @@
 ./usr/include/g++/new
 ./usr/include/g++/numeric
 ./usr/include/g++/ostream
-./usr/include/g++/powerpc-unknown-openbsd6.4
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/atomic_word.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/basic_file.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/c++allocator.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/c++config.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/c++io.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/c++locale.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/c++locale_internal.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/compatibility.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/cpu_defines.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/ctype_base.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/ctype_inline.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/ctype_noninline.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/cxxabi_tweaks.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/gthr-default.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/gthr-posix.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/gthr-single.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/gthr-tpf.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/gthr.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/messages_members.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/os_defines.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/time_members.h
+./usr/include/g++/powerpc-unknown-openbsd6.5
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/atomic_word.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/basic_file.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/c++allocator.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/c++config.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/c++io.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/c++locale.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/c++locale_internal.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/compatibility.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/cpu_defines.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/ctype_base.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/ctype_inline.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/ctype_noninline.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/cxxabi_tweaks.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/gthr-default.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/gthr-posix.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/gthr-single.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/gthr-tpf.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/gthr.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/messages_members.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/os_defines.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/time_members.h
 ./usr/include/g++/queue
 ./usr/include/g++/set
 ./usr/include/g++/sstream
@@ -604,10 +604,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.4/4.2.1/cc1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.4/4.2.1/cc1obj
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.4/4.2.1/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.4/4.2.1/libgcov.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.5/4.2.1/cc1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.5/4.2.1/cc1obj
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.5/4.2.1/cc1plus
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.5/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
diff --git a/distrib/sets/lists/comp/gcc.octeon b/distrib/sets/lists/comp/gcc.octeon
index 7c521f92453..2fcd914beb9 100644
--- a/distrib/sets/lists/comp/gcc.octeon
+++ b/distrib/sets/lists/comp/gcc.octeon
@@ -496,29 +496,29 @@
 ./usr/include/g++/locale
 ./usr/include/g++/map
 ./usr/include/g++/memory
-./usr/include/g++/mips64-unknown-openbsd6.4
-./usr/include/g++/mips64-unknown-openbsd6.4/bits
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/atomic_word.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/basic_file.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/c++allocator.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/c++config.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/c++io.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/c++locale.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/c++locale_internal.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/compatibility.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/cpu_defines.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/ctype_base.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/ctype_inline.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/ctype_noninline.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/cxxabi_tweaks.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/gthr-default.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/gthr-posix.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/gthr-single.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/gthr-tpf.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/gthr.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/messages_members.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/os_defines.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/time_members.h
+./usr/include/g++/mips64-unknown-openbsd6.5
+./usr/include/g++/mips64-unknown-openbsd6.5/bits
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/atomic_word.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/basic_file.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/c++allocator.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/c++config.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/c++io.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/c++locale.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/c++locale_internal.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/compatibility.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/cpu_defines.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/ctype_base.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/ctype_inline.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/ctype_noninline.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/cxxabi_tweaks.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/gthr-default.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/gthr-posix.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/gthr-single.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/gthr-tpf.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/gthr.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/messages_members.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/os_defines.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/time_members.h
 ./usr/include/g++/new
 ./usr/include/g++/numeric
 ./usr/include/g++/ostream
@@ -604,10 +604,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.4/4.2.1/cc1
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.4/4.2.1/cc1obj
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.4/4.2.1/cc1plus
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.4/4.2.1/libgcov.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.5/4.2.1/cc1
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.5/4.2.1/cc1obj
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.5/4.2.1/cc1plus
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.5/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
diff --git a/distrib/sets/lists/comp/gcc.sgi b/distrib/sets/lists/comp/gcc.sgi
index 7c521f92453..2fcd914beb9 100644
--- a/distrib/sets/lists/comp/gcc.sgi
+++ b/distrib/sets/lists/comp/gcc.sgi
@@ -496,29 +496,29 @@
 ./usr/include/g++/locale
 ./usr/include/g++/map
 ./usr/include/g++/memory
-./usr/include/g++/mips64-unknown-openbsd6.4
-./usr/include/g++/mips64-unknown-openbsd6.4/bits
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/atomic_word.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/basic_file.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/c++allocator.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/c++config.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/c++io.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/c++locale.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/c++locale_internal.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/compatibility.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/cpu_defines.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/ctype_base.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/ctype_inline.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/ctype_noninline.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/cxxabi_tweaks.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/gthr-default.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/gthr-posix.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/gthr-single.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/gthr-tpf.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/gthr.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/messages_members.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/os_defines.h
-./usr/include/g++/mips64-unknown-openbsd6.4/bits/time_members.h
+./usr/include/g++/mips64-unknown-openbsd6.5
+./usr/include/g++/mips64-unknown-openbsd6.5/bits
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/atomic_word.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/basic_file.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/c++allocator.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/c++config.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/c++io.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/c++locale.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/c++locale_internal.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/compatibility.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/cpu_defines.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/ctype_base.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/ctype_inline.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/ctype_noninline.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/cxxabi_tweaks.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/gthr-default.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/gthr-posix.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/gthr-single.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/gthr-tpf.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/gthr.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/messages_members.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/os_defines.h
+./usr/include/g++/mips64-unknown-openbsd6.5/bits/time_members.h
 ./usr/include/g++/new
 ./usr/include/g++/numeric
 ./usr/include/g++/ostream
@@ -604,10 +604,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.4/4.2.1/cc1
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.4/4.2.1/cc1obj
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.4/4.2.1/cc1plus
-./usr/lib/gcc-lib/mips64-unknown-openbsd6.4/4.2.1/libgcov.a
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.5/4.2.1/cc1
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.5/4.2.1/cc1obj
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.5/4.2.1/cc1plus
+./usr/lib/gcc-lib/mips64-unknown-openbsd6.5/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
diff --git a/distrib/sets/lists/comp/gcc.socppc b/distrib/sets/lists/comp/gcc.socppc
index e6abea0f78c..7c87fbc7fc6 100644
--- a/distrib/sets/lists/comp/gcc.socppc
+++ b/distrib/sets/lists/comp/gcc.socppc
@@ -499,29 +499,29 @@
 ./usr/include/g++/new
 ./usr/include/g++/numeric
 ./usr/include/g++/ostream
-./usr/include/g++/powerpc-unknown-openbsd6.4
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/atomic_word.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/basic_file.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/c++allocator.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/c++config.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/c++io.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/c++locale.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/c++locale_internal.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/compatibility.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/cpu_defines.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/ctype_base.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/ctype_inline.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/ctype_noninline.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/cxxabi_tweaks.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/gthr-default.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/gthr-posix.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/gthr-single.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/gthr-tpf.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/gthr.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/messages_members.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/os_defines.h
-./usr/include/g++/powerpc-unknown-openbsd6.4/bits/time_members.h
+./usr/include/g++/powerpc-unknown-openbsd6.5
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/atomic_word.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/basic_file.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/c++allocator.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/c++config.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/c++io.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/c++locale.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/c++locale_internal.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/compatibility.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/cpu_defines.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/ctype_base.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/ctype_inline.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/ctype_noninline.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/cxxabi_tweaks.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/gthr-default.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/gthr-posix.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/gthr-single.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/gthr-tpf.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/gthr.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/messages_members.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/os_defines.h
+./usr/include/g++/powerpc-unknown-openbsd6.5/bits/time_members.h
 ./usr/include/g++/queue
 ./usr/include/g++/set
 ./usr/include/g++/sstream
@@ -604,10 +604,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.4/4.2.1/cc1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.4/4.2.1/cc1obj
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.4/4.2.1/cc1plus
-./usr/lib/gcc-lib/powerpc-unknown-openbsd6.4/4.2.1/libgcov.a
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.5/4.2.1/cc1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.5/4.2.1/cc1obj
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.5/4.2.1/cc1plus
+./usr/lib/gcc-lib/powerpc-unknown-openbsd6.5/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a
diff --git a/distrib/sets/lists/comp/gcc.sparc64 b/distrib/sets/lists/comp/gcc.sparc64
index a7f373f5114..362cf3051f4 100644
--- a/distrib/sets/lists/comp/gcc.sparc64
+++ b/distrib/sets/lists/comp/gcc.sparc64
@@ -501,29 +501,29 @@
 ./usr/include/g++/ostream
 ./usr/include/g++/queue
 ./usr/include/g++/set
-./usr/include/g++/sparc64-unknown-openbsd6.4
-./usr/include/g++/sparc64-unknown-openbsd6.4/bits
-./usr/include/g++/sparc64-unknown-openbsd6.4/bits/atomic_word.h
-./usr/include/g++/sparc64-unknown-openbsd6.4/bits/basic_file.h
-./usr/include/g++/sparc64-unknown-openbsd6.4/bits/c++allocator.h
-./usr/include/g++/sparc64-unknown-openbsd6.4/bits/c++config.h
-./usr/include/g++/sparc64-unknown-openbsd6.4/bits/c++io.h
-./usr/include/g++/sparc64-unknown-openbsd6.4/bits/c++locale.h
-./usr/include/g++/sparc64-unknown-openbsd6.4/bits/c++locale_internal.h
-./usr/include/g++/sparc64-unknown-openbsd6.4/bits/compatibility.h
-./usr/include/g++/sparc64-unknown-openbsd6.4/bits/cpu_defines.h
-./usr/include/g++/sparc64-unknown-openbsd6.4/bits/ctype_base.h
-./usr/include/g++/sparc64-unknown-openbsd6.4/bits/ctype_inline.h
-./usr/include/g++/sparc64-unknown-openbsd6.4/bits/ctype_noninline.h
-./usr/include/g++/sparc64-unknown-openbsd6.4/bits/cxxabi_tweaks.h
-./usr/include/g++/sparc64-unknown-openbsd6.4/bits/gthr-default.h
-./usr/include/g++/sparc64-unknown-openbsd6.4/bits/gthr-posix.h
-./usr/include/g++/sparc64-unknown-openbsd6.4/bits/gthr-single.h
-./usr/include/g++/sparc64-unknown-openbsd6.4/bits/gthr-tpf.h
-./usr/include/g++/sparc64-unknown-openbsd6.4/bits/gthr.h
-./usr/include/g++/sparc64-unknown-openbsd6.4/bits/messages_members.h
-./usr/include/g++/sparc64-unknown-openbsd6.4/bits/os_defines.h
-./usr/include/g++/sparc64-unknown-openbsd6.4/bits/time_members.h
+./usr/include/g++/sparc64-unknown-openbsd6.5
+./usr/include/g++/sparc64-unknown-openbsd6.5/bits
+./usr/include/g++/sparc64-unknown-openbsd6.5/bits/atomic_word.h
+./usr/include/g++/sparc64-unknown-openbsd6.5/bits/basic_file.h
+./usr/include/g++/sparc64-unknown-openbsd6.5/bits/c++allocator.h
+./usr/include/g++/sparc64-unknown-openbsd6.5/bits/c++config.h
+./usr/include/g++/sparc64-unknown-openbsd6.5/bits/c++io.h
+./usr/include/g++/sparc64-unknown-openbsd6.5/bits/c++locale.h
+./usr/include/g++/sparc64-unknown-openbsd6.5/bits/c++locale_internal.h
+./usr/include/g++/sparc64-unknown-openbsd6.5/bits/compatibility.h
+./usr/include/g++/sparc64-unknown-openbsd6.5/bits/cpu_defines.h
+./usr/include/g++/sparc64-unknown-openbsd6.5/bits/ctype_base.h
+./usr/include/g++/sparc64-unknown-openbsd6.5/bits/ctype_inline.h
+./usr/include/g++/sparc64-unknown-openbsd6.5/bits/ctype_noninline.h
+./usr/include/g++/sparc64-unknown-openbsd6.5/bits/cxxabi_tweaks.h
+./usr/include/g++/sparc64-unknown-openbsd6.5/bits/gthr-default.h
+./usr/include/g++/sparc64-unknown-openbsd6.5/bits/gthr-posix.h
+./usr/include/g++/sparc64-unknown-openbsd6.5/bits/gthr-single.h
+./usr/include/g++/sparc64-unknown-openbsd6.5/bits/gthr-tpf.h
+./usr/include/g++/sparc64-unknown-openbsd6.5/bits/gthr.h
+./usr/include/g++/sparc64-unknown-openbsd6.5/bits/messages_members.h
+./usr/include/g++/sparc64-unknown-openbsd6.5/bits/os_defines.h
+./usr/include/g++/sparc64-unknown-openbsd6.5/bits/time_members.h
 ./usr/include/g++/sstream
 ./usr/include/g++/stack
 ./usr/include/g++/stdexcept
@@ -604,10 +604,10 @@
 ./usr/include/objc/thr.h
 ./usr/include/objc/typedstream.h
 ./usr/lib/gcc-lib
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.4/4.2.1/cc1
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.4/4.2.1/cc1obj
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.4/4.2.1/cc1plus
-./usr/lib/gcc-lib/sparc64-unknown-openbsd6.4/4.2.1/libgcov.a
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.5/4.2.1/cc1
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.5/4.2.1/cc1obj
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.5/4.2.1/cc1plus
+./usr/lib/gcc-lib/sparc64-unknown-openbsd6.5/4.2.1/libgcov.a
 ./usr/lib/libstdc++.a
 ./usr/lib/libstdc++_p.a
 ./usr/lib/libsupc++.a