16 files changed, 60 insertions, 11 deletions
diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index c3aa25d9c9d..f491e2910b2 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -50,7 +50,7 @@
 ./usr/lib/libstdc++.so.30.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
-./usr/lib/libutil.so.7.0
+./usr/lib/libutil.so.7.1
 ./usr/lib/libwrap.so.1.2
 ./usr/lib/libz.so.1.3
 ./usr/libdata/perl5/alpha-openbsd
@@ -847,6 +847,7 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/pciide_cmd_reg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/pciide_cy693_reg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/pciide_hpt_reg.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/pciide_natsemi_reg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/pciide_opti_reg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/pciide_pdc202xx_reg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/pciide_piix_reg.ph
@@ -971,6 +972,8 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/rndvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/sbus
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/sbus/bereg.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/sbus/cs4231reg.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/sbus/cs4231var.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/sbus/lebuffervar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/sbus/qecreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/sbus/qecvar.ph
diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index 6ef35f7b162..4b7c72051c8 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -66,7 +66,7 @@
 ./usr/lib/libstdc++.so.30.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
-./usr/lib/libutil.so.7.0
+./usr/lib/libutil.so.7.1
 ./usr/lib/libwrap.so.1.2
 ./usr/lib/libz.so.1.3
 ./usr/libdata/perl5/m68k-openbsd
@@ -849,6 +849,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_cmd_reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_cy693_reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_hpt_reg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_natsemi_reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_opti_reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_pdc202xx_reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_piix_reg.ph
@@ -973,6 +974,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/rndvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus/bereg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus/cs4231reg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus/cs4231var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus/lebuffervar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus/qecreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus/qecvar.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 45e346f05d9..690eb1b4094 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -66,7 +66,7 @@
 ./usr/lib/libstdc++.so.30.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
-./usr/lib/libutil.so.7.0
+./usr/lib/libutil.so.7.1
 ./usr/lib/libwrap.so.1.2
 ./usr/lib/libz.so.1.3
 ./usr/libdata/perl5/m68k-openbsd
@@ -810,6 +810,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_cmd_reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_cy693_reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_hpt_reg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_natsemi_reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_opti_reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_pdc202xx_reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_piix_reg.ph
@@ -934,6 +935,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/rndvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus/bereg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus/cs4231reg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus/cs4231var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus/lebuffervar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus/qecreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus/qecvar.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 6d2d2487c60..ea79e8bbc69 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -70,7 +70,7 @@
 ./usr/lib/libstdc++.so.30.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
-./usr/lib/libutil.so.7.0
+./usr/lib/libutil.so.7.1
 ./usr/lib/libwrap.so.1.2
 ./usr/lib/libz.so.1.3
 ./usr/libdata/perl5/i386-openbsd
@@ -814,6 +814,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/pciide_cmd_reg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/pciide_cy693_reg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/pciide_hpt_reg.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/pciide_natsemi_reg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/pciide_opti_reg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/pciide_pdc202xx_reg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/pciide_piix_reg.ph
@@ -938,6 +939,8 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/rndvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/sbus
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/sbus/bereg.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/sbus/cs4231reg.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/sbus/cs4231var.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/sbus/lebuffervar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/sbus/qecreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/sbus/qecvar.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index f475aae373e..81eafceb8c5 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -65,7 +65,7 @@
 ./usr/lib/libstdc++.so.30.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
-./usr/lib/libutil.so.7.0
+./usr/lib/libutil.so.7.1
 ./usr/lib/libwrap.so.1.2
 ./usr/lib/libz.so.1.3
 ./usr/libdata/perl5/m68k-openbsd
@@ -807,6 +807,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_cmd_reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_cy693_reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_hpt_reg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_natsemi_reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_opti_reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_pdc202xx_reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_piix_reg.ph
@@ -929,6 +930,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/rndvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus/bereg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus/cs4231reg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus/cs4231var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus/lebuffervar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus/qecreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus/qecvar.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index b4e3559ac9f..4cc3f02a960 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -56,7 +56,7 @@
 ./usr/lib/libstdc++.so.30.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
-./usr/lib/libutil.so.7.0
+./usr/lib/libutil.so.7.1
 ./usr/lib/libwrap.so.1.2
 ./usr/lib/libz.so.1.3
 ./usr/libdata/perl5/powerpc-openbsd
@@ -800,6 +800,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/pciide_cmd_reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/pciide_cy693_reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/pciide_hpt_reg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/pciide_natsemi_reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/pciide_opti_reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/pciide_pdc202xx_reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/pciide_piix_reg.ph
@@ -924,6 +925,8 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/rndvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/sbus
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/sbus/bereg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/sbus/cs4231reg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/sbus/cs4231var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/sbus/lebuffervar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/sbus/qecreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/sbus/qecvar.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 2532ef4b833..fcf696362df 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -65,7 +65,7 @@
 ./usr/lib/libstdc++.so.30.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
-./usr/lib/libutil.so.7.0
+./usr/lib/libutil.so.7.1
 ./usr/lib/libwrap.so.1.2
 ./usr/lib/libz.so.1.3
 ./usr/libdata/perl5/m68k-openbsd
@@ -809,6 +809,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_cmd_reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_cy693_reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_hpt_reg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_natsemi_reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_opti_reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_pdc202xx_reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_piix_reg.ph
@@ -933,6 +934,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/rndvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus/bereg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus/cs4231reg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus/cs4231var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus/lebuffervar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus/qecreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus/qecvar.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index ebe4509c11e..b63b54dcdd6 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -453,6 +453,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/lofnreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/lofnvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/maestro_reg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/pciide_natsemi_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
@@ -466,6 +467,8 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/rasops/rasops_masks.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/sbus
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/sbus/bereg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/sbus/cs4231reg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/sbus/cs4231var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/sbus/lebuffervar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/sbus/qecreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/sbus/qecvar.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 163113ec64b..2f29452460b 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -52,7 +52,7 @@
 ./usr/lib/libstdc++.so.30.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
-./usr/lib/libutil.so.7.0
+./usr/lib/libutil.so.7.1
 ./usr/lib/libwrap.so.1.2
 ./usr/lib/libz.so.1.3
 ./usr/libdata/perl5/powerpc-openbsd
@@ -795,6 +795,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/pciide_cmd_reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/pciide_cy693_reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/pciide_hpt_reg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/pciide_natsemi_reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/pciide_opti_reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/pciide_pdc202xx_reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/pciide_piix_reg.ph
@@ -917,6 +918,8 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/rndvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/sbus
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/sbus/bereg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/sbus/cs4231reg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/sbus/cs4231var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/sbus/lebuffervar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/sbus/qecreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/sbus/qecvar.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 065bbd43539..0cb1a1a3acf 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -65,7 +65,7 @@
 ./usr/lib/libstdc++.so.30.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
-./usr/lib/libutil.so.7.0
+./usr/lib/libutil.so.7.1
 ./usr/lib/libwrap.so.1.2
 ./usr/lib/libz.so.1.3
 ./usr/libdata/perl5/site_perl/sparc-openbsd
@@ -469,6 +469,7 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/pciide_cmd_reg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/pciide_cy693_reg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/pciide_hpt_reg.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/pciide_natsemi_reg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/pciide_opti_reg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/pciide_pdc202xx_reg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/pciide_piix_reg.ph
@@ -593,6 +594,8 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/rndvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/sbus
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/sbus/bereg.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/sbus/cs4231reg.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/sbus/cs4231var.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/sbus/lebuffervar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/sbus/qecreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/sbus/qecvar.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index b0b7a3b8780..a706177aada 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -45,7 +45,7 @@
 ./usr/lib/libstdc++.so.30.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
-./usr/lib/libutil.so.7.0
+./usr/lib/libutil.so.7.1
 ./usr/lib/libwrap.so.1.2
 ./usr/lib/libz.so.1.3
 ./usr/libdata/perl5/site_perl/sparc64-openbsd
@@ -449,6 +449,7 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/pciide_cmd_reg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/pciide_cy693_reg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/pciide_hpt_reg.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/pciide_natsemi_reg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/pciide_opti_reg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/pciide_pdc202xx_reg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/pciide_piix_reg.ph
@@ -573,6 +574,8 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/rndvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/sbus
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/sbus/bereg.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/sbus/cs4231reg.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/sbus/cs4231var.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/sbus/lebuffervar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/sbus/qecreg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/sbus/qecvar.ph
diff --git a/distrib/sets/lists/base/md.sun3 b/distrib/sets/lists/base/md.sun3
index 834354040d1..48d854e4346 100644
--- a/distrib/sets/lists/base/md.sun3
+++ b/distrib/sets/lists/base/md.sun3
@@ -65,7 +65,7 @@
 ./usr/lib/libstdc++.so.30.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
-./usr/lib/libutil.so.7.0
+./usr/lib/libutil.so.7.1
 ./usr/lib/libwrap.so.1.2
 ./usr/lib/libz.so.1.3
 ./usr/libdata/perl5/m68k-openbsd
@@ -808,6 +808,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_cmd_reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_cy693_reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_hpt_reg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_natsemi_reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_opti_reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_pdc202xx_reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/pciide_piix_reg.ph
@@ -932,6 +933,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/rndvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus/bereg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus/cs4231reg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus/cs4231var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus/lebuffervar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus/qecreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sbus/qecvar.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 83dfe2f2376..58630f14394 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -411,6 +411,7 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/pciide_cmd_reg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/pciide_cy693_reg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/pciide_hpt_reg.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/pciide_natsemi_reg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/pciide_opti_reg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/pciide_pdc202xx_reg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/pciide_piix_reg.ph
@@ -535,6 +536,8 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/rndvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/sbus
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/sbus/bereg.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/sbus/cs4231reg.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/sbus/cs4231var.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/sbus/lebuffervar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/sbus/qecreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/sbus/qecvar.ph
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index bf359879768..dc30782ec82 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -505,6 +505,10 @@
 ./usr/lib/apache/modules
 ./usr/lib/gcc-lib
 ./usr/libdata
+./usr/libdata/cvs
+./usr/libdata/cvs/contrib
+./usr/libdata/cvs/contrib/README
+./usr/libdata/cvs/contrib/intro.doc
 ./usr/libdata/lint
 ./usr/libdata/perl5
 ./usr/libdata/perl5/AnyDBM_File.pm
@@ -1134,6 +1138,7 @@
 ./usr/libexec/cvs/contrib/cvs2vendor
 ./usr/libexec/cvs/contrib/cvs_acls
 ./usr/libexec/cvs/contrib/cvscheck
+./usr/libexec/cvs/contrib/debug_check_log
 ./usr/libexec/cvs/contrib/log
 ./usr/libexec/cvs/contrib/log_accum
 ./usr/libexec/cvs/contrib/mfpipe
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index c9e77a81fff..8c6a88e3ff1 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -419,6 +419,7 @@
 ./usr/include/dev/pci/pciide_cmd_reg.h
 ./usr/include/dev/pci/pciide_cy693_reg.h
 ./usr/include/dev/pci/pciide_hpt_reg.h
+./usr/include/dev/pci/pciide_natsemi_reg.h
 ./usr/include/dev/pci/pciide_opti_reg.h
 ./usr/include/dev/pci/pciide_pdc202xx_reg.h
 ./usr/include/dev/pci/pciide_piix_reg.h
@@ -543,6 +544,8 @@
 ./usr/include/dev/rndvar.h
 ./usr/include/dev/sbus
 ./usr/include/dev/sbus/bereg.h
+./usr/include/dev/sbus/cs4231reg.h
+./usr/include/dev/sbus/cs4231var.h
 ./usr/include/dev/sbus/lebuffervar.h
 ./usr/include/dev/sbus/qecreg.h
 ./usr/include/dev/sbus/qecvar.h
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index f51776b5112..c34701605ef 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -670,6 +670,7 @@
 ./usr/share/man/cat3/mvme68k
 ./usr/share/man/cat3/mvme88k
 ./usr/share/man/cat3/mvmeppc
+./usr/share/man/cat3/pidfile.0
 ./usr/share/man/cat3/sparc
 ./usr/share/man/cat3/sparc64
 ./usr/share/man/cat3/sun3
@@ -1082,6 +1083,7 @@
 ./usr/share/man/cat4/macppc/bm.0
 ./usr/share/man/cat4/macppc/gm.0
 ./usr/share/man/cat4/macppc/intro.0
+./usr/share/man/cat4/macppc/mem.0
 ./usr/share/man/cat4/maestro.0
 ./usr/share/man/cat4/midi.0
 ./usr/share/man/cat4/mii.0