sync

15 files changed, 71 insertions, 32 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index b8d9a59e714..d755fcc0b03 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -15,7 +15,7 @@
 ./usr/lib/libacl.so.5.0
 ./usr/lib/libc.so.27.1
 ./usr/lib/libc_r.so.5.1
-./usr/lib/libcrypto.so.4.1
+./usr/lib/libcrypto.so.5.0
 ./usr/lib/libcurses++.so.1.1
 ./usr/lib/libcurses.so.8.0
 ./usr/lib/libdes.so.6.0
@@ -40,8 +40,8 @@
 ./usr/lib/libperl.so.6.1
 ./usr/lib/libreadline.so.0.0
 ./usr/lib/libsectok.so.1.0
-./usr/lib/libskey.so.1.0
-./usr/lib/libssl.so.4.1
+./usr/lib/libskey.so.2.0
+./usr/lib/libssl.so.5.0
 ./usr/lib/libstdc++.so.30.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
@@ -758,6 +758,7 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/cs4281reg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/cy82c693reg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/cy82c693var.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/czreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/esoreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/esovar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/fmsvar.ph
@@ -806,6 +807,8 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/pcireg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/pcivar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/pcscpreg.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/plx9060reg.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/plx9060var.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/ppbreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/pucvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/siop_pci_common.ph
diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index 18f89e35c43..4b57f80b09e 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -35,7 +35,7 @@
 ./usr/lib/libacl.so.5.0
 ./usr/lib/libc.so.27.1
 ./usr/lib/libc_r.so.5.1
-./usr/lib/libcrypto.so.4.1
+./usr/lib/libcrypto.so.5.0
 ./usr/lib/libcurses++.so.1.1
 ./usr/lib/libcurses.so.8.0
 ./usr/lib/libdes.so.6.0
@@ -59,8 +59,8 @@
 ./usr/lib/libperl.so.6.1
 ./usr/lib/libreadline.so.0.0
 ./usr/lib/libsectok.so.1.0
-./usr/lib/libskey.so.1.0
-./usr/lib/libssl.so.4.1
+./usr/lib/libskey.so.2.0
+./usr/lib/libssl.so.5.0
 ./usr/lib/libstdc++.so.30.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
@@ -762,6 +762,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/cs4281reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/cy82c693reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/cy82c693var.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/czreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/esoreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/esovar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/fmsvar.ph
@@ -810,6 +811,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pcireg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pcivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pcscpreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/plx9060reg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/plx9060var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/ppbreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pucvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/siop_pci_common.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index d4222ce9941..78e4b1148d8 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -33,7 +33,7 @@
 ./usr/lib/libacl.so.5.0
 ./usr/lib/libc.so.27.1
 ./usr/lib/libc_r.so.5.1
-./usr/lib/libcrypto.so.4.1
+./usr/lib/libcrypto.so.5.0
 ./usr/lib/libcurses++.so.1.1
 ./usr/lib/libcurses.so.8.0
 ./usr/lib/libdes.so.6.0
@@ -57,8 +57,8 @@
 ./usr/lib/libperl.so.6.1
 ./usr/lib/libreadline.so.0.0
 ./usr/lib/libsectok.so.1.0
-./usr/lib/libskey.so.1.0
-./usr/lib/libssl.so.4.1
+./usr/lib/libskey.so.2.0
+./usr/lib/libssl.so.5.0
 ./usr/lib/libstdc++.so.30.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
@@ -722,6 +722,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/cs4281reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/cy82c693reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/cy82c693var.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/czreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/esoreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/esovar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/fmsvar.ph
@@ -770,6 +771,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pcireg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pcivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pcscpreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/plx9060reg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/plx9060var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/ppbreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pucvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/siop_pci_common.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 32959f7977f..02f3e4d6853 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -42,7 +42,7 @@
 ./usr/lib/libacl.so.5.0
 ./usr/lib/libc.so.27.1
 ./usr/lib/libc_r.so.5.1
-./usr/lib/libcrypto.so.4.1
+./usr/lib/libcrypto.so.5.0
 ./usr/lib/libcurses++.so.1.1
 ./usr/lib/libcurses.so.8.0
 ./usr/lib/libdes.so.6.0
@@ -66,8 +66,8 @@
 ./usr/lib/libperl.so.6.1
 ./usr/lib/libreadline.so.0.0
 ./usr/lib/libsectok.so.1.0
-./usr/lib/libskey.so.1.0
-./usr/lib/libssl.so.4.1
+./usr/lib/libskey.so.2.0
+./usr/lib/libssl.so.5.0
 ./usr/lib/libstdc++.so.30.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
@@ -731,6 +731,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/cs4281reg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/cy82c693reg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/cy82c693var.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/czreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/esoreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/esovar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/fmsvar.ph
@@ -779,6 +780,8 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/pcireg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/pcivar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/pcscpreg.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/plx9060reg.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/plx9060var.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/ppbreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/pucvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/siop_pci_common.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 6727e8710ed..5826dbcf7a0 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -33,7 +33,7 @@
 ./usr/lib/libacl.so.5.0
 ./usr/lib/libc.so.27.1
 ./usr/lib/libc_r.so.5.1
-./usr/lib/libcrypto.so.4.1
+./usr/lib/libcrypto.so.5.0
 ./usr/lib/libcurses++.so.1.1
 ./usr/lib/libcurses.so.8.0
 ./usr/lib/libdes.so.6.0
@@ -57,8 +57,8 @@
 ./usr/lib/libperl.so.6.1
 ./usr/lib/libreadline.so.0.0
 ./usr/lib/libsectok.so.1.0
-./usr/lib/libskey.so.1.0
-./usr/lib/libssl.so.4.1
+./usr/lib/libskey.so.2.0
+./usr/lib/libssl.so.5.0
 ./usr/lib/libstdc++.so.30.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
@@ -720,6 +720,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/cs4281reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/cy82c693reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/cy82c693var.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/czreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/esoreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/esovar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/fmsvar.ph
@@ -768,6 +769,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pcireg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pcivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pcscpreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/plx9060reg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/plx9060var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/ppbreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pucvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/siop_pci_common.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 058398ea9fb..2431c3a19fe 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -33,7 +33,7 @@
 ./usr/lib/libacl.so.5.0
 ./usr/lib/libc.so.27.1
 ./usr/lib/libc_r.so.5.1
-./usr/lib/libcrypto.so.4.1
+./usr/lib/libcrypto.so.5.0
 ./usr/lib/libcurses++.so.1.1
 ./usr/lib/libcurses.so.8.0
 ./usr/lib/libdes.so.6.0
@@ -57,8 +57,8 @@
 ./usr/lib/libperl.so.6.1
 ./usr/lib/libreadline.so.0.0
 ./usr/lib/libsectok.so.1.0
-./usr/lib/libskey.so.1.0
-./usr/lib/libssl.so.4.1
+./usr/lib/libskey.so.2.0
+./usr/lib/libssl.so.5.0
 ./usr/lib/libstdc++.so.30.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
@@ -722,6 +722,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/cs4281reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/cy82c693reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/cy82c693var.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/czreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/esoreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/esovar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/fmsvar.ph
@@ -770,6 +771,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pcireg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pcivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pcscpreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/plx9060reg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/plx9060var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/ppbreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pucvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/siop_pci_common.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 2cbff45b5b1..6f5a67fc5ed 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -407,11 +407,14 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/cs4281reg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/cy82c693reg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/cy82c693var.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/czreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_ngereg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_txpreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/maestro_reg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/pciide_opti_reg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/pcscpreg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/plx9060reg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/plx9060var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/siop_pci_common.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/tgareg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/tgavar.ph
diff --git a/distrib/sets/lists/base/md.pmax b/distrib/sets/lists/base/md.pmax
index 9c3671ec3b1..48a6d8be8a6 100644
--- a/distrib/sets/lists/base/md.pmax
+++ b/distrib/sets/lists/base/md.pmax
@@ -14,7 +14,7 @@
 ./usr/lib/libacl.so.5.0
 ./usr/lib/libc.so.27.1
 ./usr/lib/libc_r.so.5.1
-./usr/lib/libcrypto.so.4.1
+./usr/lib/libcrypto.so.5.0
 ./usr/lib/libcurses++.so.1.1
 ./usr/lib/libcurses.so.8.0
 ./usr/lib/libdes.so.6.0
@@ -38,8 +38,8 @@
 ./usr/lib/libperl.so.6.1
 ./usr/lib/libreadline.so.0.0
 ./usr/lib/libsectok.so.1.0
-./usr/lib/libskey.so.1.0
-./usr/lib/libssl.so.4.1
+./usr/lib/libskey.so.2.0
+./usr/lib/libssl.so.5.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
 ./usr/lib/libutil.so.6.0
@@ -684,6 +684,7 @@
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/pci/cs4281reg.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/pci/cy82c693reg.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/pci/cy82c693var.ph
+./usr/libdata/perl5/site_perl/mips-openbsd/dev/pci/czreg.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/pci/esoreg.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/pci/esovar.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/pci/fmsvar.ph
@@ -731,6 +732,8 @@
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/pci/pcireg.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/pci/pcivar.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/pci/pcscpreg.ph
+./usr/libdata/perl5/site_perl/mips-openbsd/dev/pci/plx9060reg.ph
+./usr/libdata/perl5/site_perl/mips-openbsd/dev/pci/plx9060var.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/pci/ppbreg.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/pci/pucvar.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/pci/siop_pci_common.ph
diff --git a/distrib/sets/lists/base/md.powerpc b/distrib/sets/lists/base/md.powerpc
index d806496a5b6..b7f773b57c6 100644
--- a/distrib/sets/lists/base/md.powerpc
+++ b/distrib/sets/lists/base/md.powerpc
@@ -19,7 +19,7 @@
 ./usr/lib/libacl.so.5.0
 ./usr/lib/libc.so.27.1
 ./usr/lib/libc_r.so.5.1
-./usr/lib/libcrypto.so.4.1
+./usr/lib/libcrypto.so.5.0
 ./usr/lib/libcurses++.so.1.1
 ./usr/lib/libcurses.so.8.0
 ./usr/lib/libdes.so.6.0
@@ -45,8 +45,8 @@
 ./usr/lib/libperl.so.6.1
 ./usr/lib/libreadline.so.0.0
 ./usr/lib/libsectok.so.1.0
-./usr/lib/libskey.so.1.0
-./usr/lib/libssl.so.4.1
+./usr/lib/libskey.so.2.0
+./usr/lib/libssl.so.5.0
 ./usr/lib/libstdc++.so.30.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
@@ -710,6 +710,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/cs4281reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/cy82c693reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/cy82c693var.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/czreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/esoreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/esovar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/fmsvar.ph
@@ -758,6 +759,8 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/pcireg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/pcivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/pcscpreg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/plx9060reg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/plx9060var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/ppbreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/pucvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/siop_pci_common.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 0eb41281c48..585750aa432 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -39,7 +39,7 @@
 ./usr/lib/libacl.so.5.0
 ./usr/lib/libc.so.27.1
 ./usr/lib/libc_r.so.5.1
-./usr/lib/libcrypto.so.4.1
+./usr/lib/libcrypto.so.5.0
 ./usr/lib/libcurses++.so.1.1
 ./usr/lib/libcurses.so.8.0
 ./usr/lib/libdes.so.6.0
@@ -63,8 +63,8 @@
 ./usr/lib/libperl.so.6.1
 ./usr/lib/libreadline.so.0.0
 ./usr/lib/libsectok.so.1.0
-./usr/lib/libskey.so.1.0
-./usr/lib/libssl.so.4.1
+./usr/lib/libskey.so.2.0
+./usr/lib/libssl.so.5.0
 ./usr/lib/libstdc++.so.30.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
@@ -388,6 +388,7 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/cs4281reg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/cy82c693reg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/cy82c693var.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/czreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/esoreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/esovar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/fmsvar.ph
@@ -436,6 +437,8 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/pcireg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/pcivar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/pcscpreg.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/plx9060reg.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/plx9060var.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/ppbreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/pucvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/siop_pci_common.ph
diff --git a/distrib/sets/lists/base/md.sun3 b/distrib/sets/lists/base/md.sun3
index 1ca7e9bd56d..4b9a2c87830 100644
--- a/distrib/sets/lists/base/md.sun3
+++ b/distrib/sets/lists/base/md.sun3
@@ -38,7 +38,7 @@
 ./usr/lib/libacl.so.5.0
 ./usr/lib/libc.so.27.1
 ./usr/lib/libc_r.so.5.1
-./usr/lib/libcrypto.so.4.1
+./usr/lib/libcrypto.so.5.0
 ./usr/lib/libcurses++.so.1.1
 ./usr/lib/libcurses.so.8.0
 ./usr/lib/libdes.so.6.0
@@ -62,8 +62,8 @@
 ./usr/lib/libperl.so.6.1
 ./usr/lib/libreadline.so.0.0
 ./usr/lib/libsectok.so.1.0
-./usr/lib/libskey.so.1.0
-./usr/lib/libssl.so.4.1
+./usr/lib/libskey.so.2.0
+./usr/lib/libssl.so.5.0
 ./usr/lib/libstdc++.so.30.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
@@ -727,6 +727,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/cs4281reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/cy82c693reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/cy82c693var.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/czreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/esoreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/esovar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/fmsvar.ph
@@ -774,6 +775,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pcireg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pcivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pcscpreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/plx9060reg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/plx9060var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/ppbreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pucvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/siop_pci_common.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 1fd8d197856..84c3b441216 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -328,6 +328,7 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/cs4281reg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/cy82c693reg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/cy82c693var.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/czreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/esoreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/esovar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/fmsvar.ph
@@ -376,6 +377,8 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/pcireg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/pcivar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/pcscpreg.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/plx9060reg.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/plx9060var.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/ppbreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/pucvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/siop_pci_common.ph
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 691dab76faa..4aab51a1407 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -335,6 +335,7 @@
 ./usr/include/dev/pci/cs4281reg.h
 ./usr/include/dev/pci/cy82c693reg.h
 ./usr/include/dev/pci/cy82c693var.h
+./usr/include/dev/pci/czreg.h
 ./usr/include/dev/pci/esoreg.h
 ./usr/include/dev/pci/esovar.h
 ./usr/include/dev/pci/fmsvar.h
@@ -383,6 +384,8 @@
 ./usr/include/dev/pci/pcireg.h
 ./usr/include/dev/pci/pcivar.h
 ./usr/include/dev/pci/pcscpreg.h
+./usr/include/dev/pci/plx9060reg.h
+./usr/include/dev/pci/plx9060var.h
 ./usr/include/dev/pci/ppbreg.h
 ./usr/include/dev/pci/pucvar.h
 ./usr/include/dev/pci/siop_pci_common.h
diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi
index 5942d17aaba..730a3c91655 100644
--- a/distrib/sets/lists/etc/mi
+++ b/distrib/sets/lists/etc/mi
@@ -49,6 +49,7 @@
 ./etc/mailer.conf
 ./etc/man.conf
 ./etc/master.passwd
+./etc/moduli
 ./etc/monthly
 ./etc/motd
 ./etc/mrouted.conf
@@ -77,7 +78,6 @@
 ./etc/ppp/ppp.linkdown.sample
 ./etc/ppp/ppp.linkup.sample
 ./etc/ppp/ppp.secret.sample
-./etc/primes
 ./etc/printcap
 ./etc/protocols
 ./etc/pwd.db
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 6602ef08924..a6389e62cdb 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1387,6 +1387,7 @@
 ./usr/share/man/cat5/man.conf.0
 ./usr/share/man/cat5/map3270.0
 ./usr/share/man/cat5/master.passwd.0
+./usr/share/man/cat5/moduli.0
 ./usr/share/man/cat5/motd.0
 ./usr/share/man/cat5/mvme68k
 ./usr/share/man/cat5/mvme88k
@@ -1398,7 +1399,6 @@
 ./usr/share/man/cat5/phones.0
 ./usr/share/man/cat5/pmax
 ./usr/share/man/cat5/powerpc
-./usr/share/man/cat5/primes.0
 ./usr/share/man/cat5/printcap.0
 ./usr/share/man/cat5/protocols.0
 ./usr/share/man/cat5/rcsfile.0