sync

13 files changed, 143 insertions, 141 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index ea2b4d044ea..643fcaae6de 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -8,8 +8,8 @@
 ./usr/include/alpha
 ./usr/include/readline
 ./usr/lib/gcc-lib/alpha-unknown-openbsd2.5
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include
 ./usr/libdata/perl5/alpha-openbsd
 ./usr/libdata/perl5/alpha-openbsd/5.00503
 ./usr/libdata/perl5/alpha-openbsd/5.00503/.packlist
diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index 5c5a941a14c..8f909e9ee90 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -7,8 +7,8 @@
 ./usr/include/m68k
 ./usr/include/readline
 ./usr/lib/gcc-lib/m68k-unknown-openbsd2.5
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/include
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/include
 ./usr/lib/libacl.so.4.1
 ./usr/lib/libc.so.23.1
 ./usr/lib/libc_r.so.1.1
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 18e1236e444..fdc56eb79af 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -706,7 +706,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/net/if_sppp.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/pcap-int.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/sys/ataio.ph
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95/include
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95.1
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95.1/include
 ./usr/libdata/perl5/site_perl/i386-openbsd/sys/sched.ph
 ./sbin/wicontrol
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index c3eab8f4078..cf783d637bb 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -658,6 +658,6 @@
 ./usr/libdata/perl5/m68k-openbsd/5.00503/.packlist
 ./usr/local/libdata/perl5/site_perl/m68k-openbsd
 ./usr/libexec/ld.so
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/include
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/include
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/sched.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index bde2c6f0fd6..d191967333c 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -684,6 +684,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/machine/fgaio.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/machine/scfio.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/net/if_sppp.ph
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95/include
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95.1
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95.1/include
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sys/sched.ph
diff --git a/distrib/sets/lists/comp/md.alpha b/distrib/sets/lists/comp/md.alpha
index 2fc1412ca46..c3013b7b10d 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.5/2.95/SYSCALLS.c.X
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/cc1
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/cc1obj
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/cc1plus
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/collect2
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/cpp
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/f771
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/ieee
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/ieee/libgcc.a
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/README
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/exception
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/fixed
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/float.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/iso646.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/limits.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/new
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/new.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/proto.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/stdarg.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/stdbool.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/stddef.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/syslimits.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/typeinfo
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/va-alpha.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/va-arc.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/va-c4x.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/va-clipper.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/va-h8300.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/va-i860.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/va-i960.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/va-m32r.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/va-m88k.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/va-mips.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/va-mn10200.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/va-mn10300.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/va-pa.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/va-ppc.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/va-pyr.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/va-sh.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/va-sparc.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/va-spur.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/va-v850.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/include/varargs.h
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/libgcc.a
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95/specs
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/SYSCALLS.c.X
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/cc1
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/cc1obj
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/cc1plus
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/collect2
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/cpp
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/f771
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/ieee
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/ieee/libgcc.a
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/README
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/exception
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/fixed
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/float.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/iso646.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/limits.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/new
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/new.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/proto.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/stdarg.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/stdbool.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/stddef.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/syslimits.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/typeinfo
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/va-alpha.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/va-arc.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/va-c4x.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/va-clipper.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/va-h8300.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/va-i860.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/va-i960.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/va-m32r.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/va-m88k.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/va-mips.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/va-mn10200.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/va-mn10300.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/va-pa.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/va-ppc.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/va-pyr.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/va-sh.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/va-sparc.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/va-spur.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/va-v850.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include/varargs.h
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/libgcc.a
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/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 9fee18885c0..451f020793d 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.5/2.95/SYSCALLS.c.X
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/collect2
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/cc1
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/cc1obj
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/cpp
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/f771
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/include/README
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/include/exception
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/include/float.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/include/limits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/include/new
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/include/new.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/include/syslimits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/include/typeinfo
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/specs
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/SYSCALLS.c.X
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/collect2
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/cc1
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/cc1obj
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/cc1plus
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/cpp
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/f771
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/include/README
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/include/exception
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/include/float.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/include/limits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/include/new
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/include/new.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/include/syslimits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/include/typeinfo
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/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 0faefb55656..d2bb8dd4271 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.5/2.95/SYSCALLS.c.X
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/collect2
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/cc1
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/cc1obj
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/cpp
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/f771
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/include/README
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/include/exception
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/include/float.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/include/limits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/include/new
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/include/new.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/include/syslimits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/include/typeinfo
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/libgcc.a
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/specs
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/SYSCALLS.c.X
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/collect2
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/cc1
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/cc1obj
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/cc1plus
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/cpp
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/f771
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/include/README
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/include/exception
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/include/float.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/include/limits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/include/new
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/include/new.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/include/syslimits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/include/typeinfo
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/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 0b2b7def669..fd1f5cb455c 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.5/2.95/SYSCALLS.c.X
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95/cc1
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95/cc1obj
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95/cc1plus
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95/collect2
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95/cpp
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95/f771
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95/include/README
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95/include/exception
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95/include/float.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95/include/limits.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95/include/new
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95/include/new.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95/include/syslimits.h
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95/include/typeinfo
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95/libgcc.a
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95/specs
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95.1/SYSCALLS.c.X
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95.1/cc1
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95.1/cc1obj
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95.1/cc1plus
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95.1/collect2
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95.1/cpp
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95.1/f771
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95.1/include/README
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95.1/include/exception
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95.1/include/float.h
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95.1/include/limits.h
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95.1/include/new
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95.1/include/new.h
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95.1/include/syslimits.h
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95.1/include/typeinfo
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95.1/libgcc.a
+./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95.1/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 8dd0c71d9b9..a82e9a72802 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.5/2.95/cc1
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/cc1plus
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/f771
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/cc1obj
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/collect2
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/specs
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/SYSCALLS.c.X
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/cpp
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/include/syslimits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/include/typeinfo
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/include/exception
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/include/new
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/include/new.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/include/limits.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/include/float.h
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/include/README
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95/libgcc.a
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/cc1
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/cc1plus
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/f771
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/cc1obj
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/collect2
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/specs
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/SYSCALLS.c.X
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/cpp
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/include/syslimits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/include/typeinfo
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/include/exception
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/include/new
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/include/new.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/include/limits.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/include/float.h
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/include/README
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/libgcc.a
 ./usr/lib/libacl_pic.a
 ./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
diff --git a/distrib/sets/lists/comp/md.sparc b/distrib/sets/lists/comp/md.sparc
index 0d27abfb71f..f42aa690998 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.5/2.95/SYSCALLS.c.X
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95/cc1
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95/cc1obj
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95/cc1plus
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95/collect2
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95/cpp
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95/f771
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95/include/README
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95/include/exception
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95/include/float.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95/include/limits.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95/include/new
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95/include/new.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95/include/syslimits.h
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95/include/typeinfo
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95/libgcc.a
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95/specs
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95.1/SYSCALLS.c.X
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95.1/cc1
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95.1/cc1obj
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95.1/cc1plus
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95.1/collect2
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95.1/cpp
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95.1/f771
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95.1/include/README
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95.1/include/exception
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95.1/include/float.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95.1/include/limits.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95.1/include/new
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95.1/include/new.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95.1/include/syslimits.h
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95.1/include/typeinfo
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95.1/libgcc.a
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95.1/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 6079311c9bd..5d6f2f18baa 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -2833,7 +2833,6 @@
 ./usr/share/misc/gprof.callg
 ./usr/share/misc/gprof.flat
 ./usr/share/misc/operator
-./usr/share/misc/style
 ./usr/share/mk/bsd.README
 ./usr/share/mk/bsd.dep.mk
 ./usr/share/mk/bsd.doc.mk
@@ -2867,3 +2866,4 @@
 ./usr/include/sys/sched.h
 ./usr/include/dev/ic/i82596reg.h
 ./usr/include/dev/ic/i82596var.h
+./usr/include/dev/usb/usbcdc.h
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 076fc2f897f..f08fd9aac76 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1614,3 +1614,5 @@
 ./usr/share/man/cat8/wicontrol.0
 ./usr/share/man/cat3/isinff.0
 ./usr/share/man/cat3/isnanf.0
+./usr/share/man/cat4/cnw.0
+./usr/share/man/cat9/style.0