sync

9 files changed, 164 insertions, 165 deletions

diff --git a/distrib/sets/lists/comp/md.alpha b/distrib/sets/lists/comp/md.alpha
index 6f071df2b83..19aac997b98 100644
--- a/distrib/sets/lists/comp/md.alpha
+++ b/distrib/sets/lists/comp/md.alpha
@@ -79,51 +79,51 @@
 ./usr/include/readline/readline.h
 ./usr/lib/crtbegin.o
 ./usr/lib/crtend.o
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/SYSCALLS.c.X
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/cc1
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/cc1obj
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/cc1plus
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/collect2
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/cpp
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/f771
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/ieee
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/ieee/libgcc.a
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/README
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/exception
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/fixed
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/float.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/iso646.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/limits.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/new
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/new.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/proto.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/stdarg.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/stdbool.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/stddef.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/syslimits.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/typeinfo
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/va-alpha.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/va-arc.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/va-c4x.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/va-clipper.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/va-h8300.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/va-i860.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/va-i960.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/va-m32r.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/va-m88k.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/va-mips.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/va-mn10200.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/va-mn10300.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/va-pa.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/va-ppc.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/va-pyr.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/va-sh.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/va-sparc.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/va-spur.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/va-v850.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include/varargs.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/libgcc.a
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/specs
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/SYSCALLS.c.X
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/cc1
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/cc1obj
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/cc1plus
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/collect2
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/cpp
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/f771
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/ieee
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/ieee/libgcc.a
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/README
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/exception
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/fixed
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/float.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/iso646.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/limits.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/new
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/new.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/proto.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/stdarg.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/stdbool.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/stddef.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/syslimits.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/typeinfo
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/va-alpha.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/va-arc.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/va-c4x.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/va-clipper.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/va-h8300.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/va-i860.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/va-i960.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/va-m32r.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/va-m88k.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/va-mips.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/va-mn10200.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/va-mn10300.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/va-pa.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/va-ppc.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/va-pyr.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/va-sh.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/va-sparc.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/va-spur.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/va-v850.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/include/varargs.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/libgcc.a
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.2/specs
 ./usr/lib/libbfd.a
 ./usr/lib/libmmalloc.a
 ./usr/lib/libopcodes.a
diff --git a/distrib/sets/lists/comp/md.amiga b/distrib/sets/lists/comp/md.amiga
index 650cff86ad4..43a9336ee83 100644
--- a/distrib/sets/lists/comp/md.amiga
+++ b/distrib/sets/lists/comp/md.amiga
@@ -78,23 +78,23 @@
 ./usr/include/readline/chardefs.h
 ./usr/include/readline/keymaps.h
 ./usr/include/readline/readline.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/SYSCALLS.c.X
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/collect2
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/cc1
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/cc1obj
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/cpp
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/f771
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/README
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/exception
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/float.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/limits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/new
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/new.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/syslimits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/typeinfo
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/specs
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/SYSCALLS.c.X
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/collect2
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/cc1
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/cc1obj
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/cc1plus
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/cpp
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/f771
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/README
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/exception
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/float.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/limits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/new
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/new.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/syslimits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/typeinfo
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/specs
 ./usr/lib/libacl_pic.a
 ./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
diff --git a/distrib/sets/lists/comp/md.hp300 b/distrib/sets/lists/comp/md.hp300
index 2f2c0e7b02f..d1abd58a8b0 100644
--- a/distrib/sets/lists/comp/md.hp300
+++ b/distrib/sets/lists/comp/md.hp300
@@ -73,23 +73,23 @@
 ./usr/include/readline/chardefs.h
 ./usr/include/readline/keymaps.h
 ./usr/include/readline/readline.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/SYSCALLS.c.X
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/collect2
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/cc1
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/cc1obj
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/cpp
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/f771
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/README
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/exception
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/float.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/limits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/new
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/new.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/syslimits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/typeinfo
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/specs
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/SYSCALLS.c.X
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/collect2
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/cc1
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/cc1obj
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/cc1plus
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/cpp
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/f771
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/README
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/exception
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/float.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/limits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/new
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/new.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/syslimits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/typeinfo
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/specs
 ./usr/lib/libacl_pic.a
 ./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index b4f61a0ebd8..e6215e83714 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -65,23 +65,23 @@
 ./usr/include/readline/chardefs.h
 ./usr/include/readline/keymaps.h
 ./usr/include/readline/readline.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.1/SYSCALLS.c.X
-./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.1/cc1
-./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.1/cc1obj
-./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.1/cc1plus
-./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.1/collect2
-./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.1/cpp
-./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.1/f771
-./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.1/include/README
-./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.1/include/exception
-./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.1/include/float.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.1/include/limits.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.1/include/new
-./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.1/include/new.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.1/include/syslimits.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.1/include/typeinfo
-./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.1/libgcc.a
-./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.1/specs
+./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.2/SYSCALLS.c.X
+./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.2/cc1
+./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.2/cc1obj
+./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.2/cc1plus
+./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.2/collect2
+./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.2/cpp
+./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.2/f771
+./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.2/include/README
+./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.2/include/exception
+./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.2/include/float.h
+./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.2/include/limits.h
+./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.2/include/new
+./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.2/include/new.h
+./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.2/include/syslimits.h
+./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.2/include/typeinfo
+./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.2/libgcc.a
+./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.2/specs
 ./usr/lib/libacl_pic.a
 ./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
diff --git a/distrib/sets/lists/comp/md.mac68k b/distrib/sets/lists/comp/md.mac68k
index 24db7886bdf..3b669023e21 100644
--- a/distrib/sets/lists/comp/md.mac68k
+++ b/distrib/sets/lists/comp/md.mac68k
@@ -83,23 +83,23 @@
 ./usr/include/readline/chardefs.h
 ./usr/include/readline/keymaps.h
 ./usr/include/readline/readline.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/cc1
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/f771
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/cc1obj
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/collect2
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/specs
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/SYSCALLS.c.X
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/cpp
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/syslimits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/typeinfo
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/exception
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/new
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/new.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/limits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/float.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/README
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/cc1
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/cc1plus
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/f771
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/cc1obj
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/collect2
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/specs
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/SYSCALLS.c.X
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/cpp
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/syslimits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/typeinfo
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/exception
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/new
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/new.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/limits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/float.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/README
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/libgcc.a
 ./usr/lib/libacl_pic.a
 ./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
diff --git a/distrib/sets/lists/comp/md.mvme68k b/distrib/sets/lists/comp/md.mvme68k
index 9b9d6fbd76f..9178838dc6c 100644
--- a/distrib/sets/lists/comp/md.mvme68k
+++ b/distrib/sets/lists/comp/md.mvme68k
@@ -75,23 +75,23 @@
 ./usr/include/readline/chardefs.h
 ./usr/include/readline/keymaps.h
 ./usr/include/readline/readline.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/cc1
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/f771
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/cc1obj
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/collect2
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/specs
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/SYSCALLS.c.X
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/cpp
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/syslimits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/typeinfo
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/exception
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/new
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/new.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/limits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/float.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include/README
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/cc1
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/cc1plus
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/f771
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/cc1obj
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/collect2
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/specs
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/SYSCALLS.c.X
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/cpp
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/syslimits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/typeinfo
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/exception
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/new
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/new.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/limits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/float.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/include/README
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.2/libgcc.a
 ./usr/lib/libacl_pic.a
 ./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
diff --git a/distrib/sets/lists/comp/md.pmax b/distrib/sets/lists/comp/md.pmax
index ce3d18a5bfd..cc361adcb6d 100644
--- a/distrib/sets/lists/comp/md.pmax
+++ b/distrib/sets/lists/comp/md.pmax
@@ -111,23 +111,23 @@
 ./usr/include/readline/keymaps.h
 ./usr/include/readline/readline.h
 ./usr/lib/crtn.o
-./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.1/SYSCALLS.c.X
-./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.1/cc1
-./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.1/cc1obj
-./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.1/cc1plus
-./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.1/collect2
-./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.1/cpp
-./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.1/f771
-./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.1/include/README
-./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.1/include/exception
-./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.1/include/float.h
-./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.1/include/limits.h
-./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.1/include/new
-./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.1/include/new.h
-./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.1/include/syslimits.h
-./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.1/include/typeinfo
-./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.1/libgcc.a
-./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.1/specs
+./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.2/SYSCALLS.c.X
+./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.2/cc1
+./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.2/cc1obj
+./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.2/cc1plus
+./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.2/collect2
+./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.2/cpp
+./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.2/f771
+./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.2/include/README
+./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.2/include/exception
+./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.2/include/float.h
+./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.2/include/limits.h
+./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.2/include/new
+./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.2/include/new.h
+./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.2/include/syslimits.h
+./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.2/include/typeinfo
+./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.2/libgcc.a
+./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.95.2/specs
 ./usr/lib/libbfd.a
 ./usr/lib/libmmalloc.a
 ./usr/lib/libopcodes.a
diff --git a/distrib/sets/lists/comp/md.sparc b/distrib/sets/lists/comp/md.sparc
index 59bea49ce47..7fba4d5565e 100644
--- a/distrib/sets/lists/comp/md.sparc
+++ b/distrib/sets/lists/comp/md.sparc
@@ -61,23 +61,23 @@
 ./usr/include/sparc/varargs.h
 ./usr/include/sparc/vmparam.h
 ./usr/include/sparc/vuid_event.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.1/SYSCALLS.c.X
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.1/cc1
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.1/cc1obj
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.1/cc1plus
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.1/collect2
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.1/cpp
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.1/f771
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.1/include/README
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.1/include/exception
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.1/include/float.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.1/include/limits.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.1/include/new
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.1/include/new.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.1/include/syslimits.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.1/include/typeinfo
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.1/libgcc.a
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.1/specs
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.2/SYSCALLS.c.X
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.2/cc1
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.2/cc1obj
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.2/cc1plus
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.2/collect2
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.2/cpp
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.2/f771
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.2/include/README
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.2/include/exception
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.2/include/float.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.2/include/limits.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.2/include/new
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.2/include/new.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.2/include/syslimits.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.2/include/typeinfo
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.2/libgcc.a
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.2/specs
 ./usr/lib/libacl_pic.a
 ./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 4f76538b3df..80e384062c4 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -776,7 +776,6 @@
 ./usr/include/netinet6/in6.h
 ./usr/include/netinet6/in6_gif.h
 ./usr/include/netinet6/in6_ifattach.h
-./usr/include/netinet6/in6_pcb.h
 ./usr/include/netinet6/in6_prefix.h
 ./usr/include/netinet6/in6_var.h
 ./usr/include/netinet6/ip6.h