sync & pre-sync

13 files changed, 36 insertions, 10 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index ab6386d2127..330cf081228 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -57,7 +57,7 @@
 ./usr/lib/libpanel.so.2.0
 ./usr/lib/libpcap.so.2.0
 ./usr/lib/libperl.so.8.1
-./usr/lib/libpthread.so.2.1
+./usr/lib/libpthread.so.2.2
 ./usr/lib/libreadline.so.1.0
 ./usr/lib/libsectok.so.5.0
 ./usr/lib/libskey.so.4.0
@@ -758,9 +758,11 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/aic7xxx.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/aic7xxx_cam.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/aic7xxx_inline.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/aic7xxx_openbsd.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/aic7xxxreg.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/aic7xxxvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/am7930reg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/am7990reg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/am7990var.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 5eef81464b3..526e77ee230 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -51,7 +51,7 @@
 ./usr/lib/libpanel.so.2.0
 ./usr/lib/libpcap.so.2.0
 ./usr/lib/libperl.so.8.1
-./usr/lib/libpthread.so.2.1
+./usr/lib/libpthread.so.2.2
 ./usr/lib/libreadline.so.1.0
 ./usr/lib/libsectok.so.5.0
 ./usr/lib/libskey.so.4.0
@@ -695,9 +695,11 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/aic7xxx.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/aic7xxx_cam.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/aic7xxx_inline.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/aic7xxx_openbsd.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/aic7xxxreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/aic7xxxvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/am7930reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/am7990reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/am7990var.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 32509122815..8fbc84eeb53 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -628,9 +628,11 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/aic7xxx.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/aic7xxx_cam.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/aic7xxx_inline.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/aic7xxx_openbsd.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/aic7xxxreg.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/aic7xxxvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/am7930reg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/am7990reg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/am7990var.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 011cd34e1db..46c31d38d51 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -59,7 +59,7 @@
 ./usr/lib/libpanel.so.2.0
 ./usr/lib/libpcap.so.2.0
 ./usr/lib/libperl.so.8.1
-./usr/lib/libpthread.so.2.1
+./usr/lib/libpthread.so.2.2
 ./usr/lib/libreadline.so.1.0
 ./usr/lib/libsectok.so.5.0
 ./usr/lib/libskey.so.4.0
@@ -703,9 +703,11 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/aic7xxx.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/aic7xxx_cam.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/aic7xxx_inline.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/aic7xxx_openbsd.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/aic7xxxreg.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/aic7xxxvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/am7930reg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/am7990reg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/am7990var.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 0d138b4fbee..694511dd9d5 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -52,7 +52,7 @@
 ./usr/lib/libpanel.so.2.0
 ./usr/lib/libpcap.so.2.0
 ./usr/lib/libperl.so.8.1
-./usr/lib/libpthread.so.2.1
+./usr/lib/libpthread.so.2.2
 ./usr/lib/libreadline.so.1.0
 ./usr/lib/libsectok.so.5.0
 ./usr/lib/libskey.so.4.0
@@ -696,9 +696,11 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/aic7xxx.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/aic7xxx_cam.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/aic7xxx_inline.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/aic7xxx_openbsd.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/aic7xxxreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/aic7xxxvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/am7930reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/am7990reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/am7990var.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index b07d4d6a04d..4780e007fbd 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -60,7 +60,7 @@
 ./usr/lib/libpanel.so.2.0
 ./usr/lib/libpcap.so.2.0
 ./usr/lib/libperl.so.8.1
-./usr/lib/libpthread.so.2.1
+./usr/lib/libpthread.so.2.2
 ./usr/lib/libreadline.so.1.0
 ./usr/lib/libsectok.so.5.0
 ./usr/lib/libskey.so.4.0
@@ -704,9 +704,11 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/aic7xxx.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/aic7xxx_cam.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/aic7xxx_inline.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/aic7xxx_openbsd.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/aic7xxxreg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/aic7xxxvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/am7930reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/am7990reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/am7990var.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index d9344b66b02..b0fbabb532b 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -51,7 +51,7 @@
 ./usr/lib/libpanel.so.2.0
 ./usr/lib/libpcap.so.2.0
 ./usr/lib/libperl.so.8.1
-./usr/lib/libpthread.so.2.1
+./usr/lib/libpthread.so.2.2
 ./usr/lib/libreadline.so.1.0
 ./usr/lib/libsectok.so.5.0
 ./usr/lib/libskey.so.4.0
@@ -695,9 +695,11 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/aic7xxx.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/aic7xxx_cam.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/aic7xxx_inline.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/aic7xxx_openbsd.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/aic7xxxreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/aic7xxxvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/am7930reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/am7990reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/am7990var.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 6e5549c3376..63de75cf223 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -628,9 +628,11 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/aic7xxx.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/aic7xxx_cam.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/aic7xxx_inline.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/aic7xxx_openbsd.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/aic7xxxreg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/aic7xxxvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/am7930reg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/am7990reg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/am7990var.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index b6fc841fc8e..75e4103d203 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -56,7 +56,7 @@
 ./usr/lib/libpanel.so.2.0
 ./usr/lib/libpcap.so.2.0
 ./usr/lib/libperl.so.8.1
-./usr/lib/libpthread.so.2.1
+./usr/lib/libpthread.so.2.2
 ./usr/lib/libreadline.so.1.0
 ./usr/lib/libsectok.so.5.0
 ./usr/lib/libskey.so.4.0
@@ -703,9 +703,11 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/aic7xxx.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/aic7xxx_cam.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/aic7xxx_inline.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/aic7xxx_openbsd.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/aic7xxxreg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/aic7xxxvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/am7930reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/am7990reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/am7990var.ph
diff --git a/distrib/sets/lists/base/md.pegasos b/distrib/sets/lists/base/md.pegasos
index 88b0dce5c49..a905a45b71a 100644
--- a/distrib/sets/lists/base/md.pegasos
+++ b/distrib/sets/lists/base/md.pegasos
@@ -59,7 +59,7 @@
 ./usr/lib/libpanel.so.2.0
 ./usr/lib/libpcap.so.2.0
 ./usr/lib/libperl.so.8.1
-./usr/lib/libpthread.so.2.1
+./usr/lib/libpthread.so.2.2
 ./usr/lib/libreadline.so.1.0
 ./usr/lib/libsectok.so.5.0
 ./usr/lib/libskey.so.4.0
@@ -703,9 +703,11 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/aic7xxx.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/aic7xxx_cam.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/aic7xxx_inline.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/aic7xxx_openbsd.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/aic7xxxreg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/aic7xxxvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/am7930reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/am7990reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/am7990var.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index fa4ae0e593a..f35cd1decdc 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -54,7 +54,7 @@
 ./usr/lib/libpanel.so.2.0
 ./usr/lib/libpcap.so.2.0
 ./usr/lib/libperl.so.8.1
-./usr/lib/libpthread.so.2.1
+./usr/lib/libpthread.so.2.2
 ./usr/lib/libreadline.so.1.0
 ./usr/lib/libsectok.so.5.0
 ./usr/lib/libskey.so.4.0
@@ -191,9 +191,11 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/aic7xxx.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/aic7xxx_cam.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/aic7xxx_inline.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/aic7xxx_openbsd.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/aic7xxxreg.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/aic7xxxvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/am7930reg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/am7990reg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/am7990var.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 48bc282e7e1..b519521c5e3 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -54,7 +54,7 @@
 ./usr/lib/libpanel.so.2.0
 ./usr/lib/libpcap.so.2.0
 ./usr/lib/libperl.so.8.1
-./usr/lib/libpthread.so.2.1
+./usr/lib/libpthread.so.2.2
 ./usr/lib/libreadline.so.1.0
 ./usr/lib/libsectok.so.5.0
 ./usr/lib/libskey.so.4.0
@@ -191,9 +191,11 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/aic7xxx.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/aic7xxx_cam.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/aic7xxx_inline.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/aic7xxx_openbsd.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/aic7xxxreg.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/aic7xxxvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/am7930reg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/am7990reg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/am7990var.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 4bacca88c96..692915b94ea 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -133,9 +133,11 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/aic7xxx.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/aic7xxx_cam.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/aic7xxx_inline.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/aic7xxx_openbsd.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/aic7xxxreg.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/aic7xxxvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/am7930reg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/am7990reg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/am7990var.ph