sync

22 files changed, 19 insertions, 149 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index a1e9eac2dfc..a5d72a6e6e8 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -110,7 +110,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
-./usr/lib/libsndio.so.3.0
+./usr/lib/libsndio.so.3.1
 ./usr/lib/libssl.so.12.0
 ./usr/lib/libstdc++.so.45.1
 ./usr/lib/libtermcap.so.10.0
@@ -1230,12 +1230,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/sis_drv.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/sis_ds.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/tdfx_drv.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/via_3d_reg.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/via_drm.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/via_drv.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/via_ds.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/via_mm.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/drm/via_verifier.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 852cabe8cff..19757dbe205 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -112,7 +112,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
-./usr/lib/libsndio.so.3.0
+./usr/lib/libsndio.so.3.1
 ./usr/lib/libssl.so.12.0
 ./usr/lib/libstdc++.so.45.1
 ./usr/lib/libtermcap.so.10.0
@@ -1252,12 +1252,6 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/sis_drv.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/sis_ds.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/tdfx_drv.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/via_3d_reg.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/via_drm.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/via_drv.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/via_ds.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/via_mm.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/drm/via_verifier.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish
index 2f234baf086..dd4b590dea4 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -91,7 +91,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
-./usr/lib/libsndio.so.3.0
+./usr/lib/libsndio.so.3.1
 ./usr/lib/libssl.so.12.0
 ./usr/lib/libstdc++.so.45.1
 ./usr/lib/libtermcap.so.10.0
@@ -1252,12 +1252,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/sis_drv.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/sis_ds.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/tdfx_drv.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/via_3d_reg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/via_drm.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/via_drv.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/via_ds.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/via_mm.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/via_verifier.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.aviion b/distrib/sets/lists/base/md.aviion
index bd9c91ff06f..200760c2c29 100644
--- a/distrib/sets/lists/base/md.aviion
+++ b/distrib/sets/lists/base/md.aviion
@@ -1040,12 +1040,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/sis_drv.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/sis_ds.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/tdfx_drv.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/via_3d_reg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/via_drm.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/via_drv.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/via_ds.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/via_mm.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/via_verifier.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index dbfc4fd6b07..d6a872b2834 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -59,7 +59,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
-./usr/lib/libsndio.so.3.0
+./usr/lib/libsndio.so.3.1
 ./usr/lib/libssl.so.12.0
 ./usr/lib/libstdc++.so.43.0
 ./usr/lib/libtermcap.so.10.0
@@ -1061,12 +1061,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/sis_drv.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/sis_ds.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/tdfx_drv.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/via_3d_reg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/via_drm.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/via_drv.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/via_ds.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/via_mm.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/via_verifier.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 4fa0f131905..433c1fb858d 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -110,7 +110,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
-./usr/lib/libsndio.so.3.0
+./usr/lib/libsndio.so.3.1
 ./usr/lib/libssl.so.12.0
 ./usr/lib/libstdc++.so.45.1
 ./usr/lib/libtermcap.so.10.0
@@ -1177,12 +1177,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/sis_drv.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/sis_ds.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/tdfx_drv.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/via_3d_reg.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/via_drm.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/via_drv.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/via_ds.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/via_mm.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/drm/via_verifier.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index dc9d5995a7f..7068c4649c7 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -110,7 +110,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
-./usr/lib/libsndio.so.3.0
+./usr/lib/libsndio.so.3.1
 ./usr/lib/libssl.so.12.0
 ./usr/lib/libstdc++.so.45.1
 ./usr/lib/libtermcap.so.10.0
@@ -1177,12 +1177,6 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/sis_drv.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/sis_ds.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/tdfx_drv.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/via_3d_reg.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/via_drm.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/via_drv.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/via_ds.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/via_mm.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/drm/via_verifier.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 0e7eaa889f4..46915cab31c 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -118,7 +118,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
-./usr/lib/libsndio.so.3.0
+./usr/lib/libsndio.so.3.1
 ./usr/lib/libssl.so.12.0
 ./usr/lib/libstdc++.so.45.1
 ./usr/lib/libtermcap.so.10.0
@@ -1185,12 +1185,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/sis_drv.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/sis_ds.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/tdfx_drv.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/via_3d_reg.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/via_drm.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/via_drv.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/via_ds.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/via_mm.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/drm/via_verifier.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index b811c0a9a2d..e2463473e77 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -78,7 +78,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
-./usr/lib/libsndio.so.3.0
+./usr/lib/libsndio.so.3.1
 ./usr/lib/libssl.so.12.0
 ./usr/lib/libstdc++.so.45.1
 ./usr/lib/libtermcap.so.10.0
@@ -1145,12 +1145,6 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/sis_drv.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/sis_ds.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/tdfx_drv.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/via_3d_reg.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/via_drm.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/via_drv.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/via_ds.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/via_mm.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/drm/via_verifier.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 530a11a891a..a4b57804113 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -989,12 +989,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/sis_drv.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/sis_ds.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/tdfx_drv.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/via_3d_reg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/via_drm.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/via_drv.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/via_ds.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/via_mm.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/via_verifier.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index fac3b5cc67a..ed1f5ebcb7b 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -60,7 +60,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
-./usr/lib/libsndio.so.3.0
+./usr/lib/libsndio.so.3.1
 ./usr/lib/libssl.so.12.0
 ./usr/lib/libstdc++.so.43.0
 ./usr/lib/libtermcap.so.10.0
@@ -1127,12 +1127,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/sis_drv.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/sis_ds.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/tdfx_drv.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/via_3d_reg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/via_drm.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/via_drv.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/via_ds.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/via_mm.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/via_verifier.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 840651733b1..73080d80633 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -113,7 +113,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
-./usr/lib/libsndio.so.3.0
+./usr/lib/libsndio.so.3.1
 ./usr/lib/libssl.so.12.0
 ./usr/lib/libstdc++.so.45.1
 ./usr/lib/libtermcap.so.10.0
@@ -1181,12 +1181,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/sis_drv.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/sis_ds.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/tdfx_drv.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/via_3d_reg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/via_drm.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/via_drv.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/via_ds.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/via_mm.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/via_verifier.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index a86ca66d89a..6752a449e03 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -57,7 +57,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
-./usr/lib/libsndio.so.3.0
+./usr/lib/libsndio.so.3.1
 ./usr/lib/libssl.so.12.0
 ./usr/lib/libstdc++.so.43.0
 ./usr/lib/libtermcap.so.10.0
@@ -1124,12 +1124,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/sis_drv.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/sis_ds.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/tdfx_drv.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/via_3d_reg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/via_drm.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/via_drv.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/via_ds.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/via_mm.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/drm/via_verifier.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index c3bb5931a90..f842baa942f 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -988,12 +988,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/sis_drv.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/sis_ds.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/tdfx_drv.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/via_3d_reg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/via_drm.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/via_drv.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/via_ds.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/via_mm.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/drm/via_verifier.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index a74fd0da290..edd2213e76f 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -91,7 +91,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
-./usr/lib/libsndio.so.3.0
+./usr/lib/libsndio.so.3.1
 ./usr/lib/libssl.so.12.0
 ./usr/lib/libstdc++.so.43.0
 ./usr/lib/libtermcap.so.10.0
@@ -1095,12 +1095,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/sis_drv.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/sis_ds.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/tdfx_drv.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/via_3d_reg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/via_drm.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/via_drv.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/via_ds.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/via_mm.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/via_verifier.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 6811168f7cc..a8be82c5924 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -113,7 +113,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
-./usr/lib/libsndio.so.3.0
+./usr/lib/libsndio.so.3.1
 ./usr/lib/libssl.so.12.0
 ./usr/lib/libstdc++.so.45.1
 ./usr/lib/libtermcap.so.10.0
@@ -1181,12 +1181,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/sis_drv.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/sis_ds.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/tdfx_drv.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/via_3d_reg.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/via_drm.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/via_drv.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/via_ds.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/via_mm.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/drm/via_verifier.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc
index 403374c3ee0..4614e91d3fc 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -106,7 +106,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
-./usr/lib/libsndio.so.3.0
+./usr/lib/libsndio.so.3.1
 ./usr/lib/libssl.so.12.0
 ./usr/lib/libstdc++.so.45.1
 ./usr/lib/libtermcap.so.10.0
@@ -1174,12 +1174,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/sis_drv.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/sis_ds.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/tdfx_drv.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/via_3d_reg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/via_drm.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/via_drv.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/via_ds.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/via_mm.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/drm/via_verifier.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index bcc896af41b..a405aed24c2 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -62,7 +62,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
-./usr/lib/libsndio.so.3.0
+./usr/lib/libsndio.so.3.1
 ./usr/lib/libssl.so.12.0
 ./usr/lib/libstdc++.so.43.0
 ./usr/lib/libtermcap.so.10.0
@@ -577,12 +577,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/sis_drv.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/sis_ds.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/tdfx_drv.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/via_3d_reg.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/via_drm.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/via_drv.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/via_ds.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/via_mm.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/drm/via_verifier.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index ac630d23c8e..cf50287f5d4 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -107,7 +107,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
-./usr/lib/libsndio.so.3.0
+./usr/lib/libsndio.so.3.1
 ./usr/lib/libssl.so.12.0
 ./usr/lib/libstdc++.so.45.1
 ./usr/lib/libtermcap.so.10.0
@@ -622,12 +622,6 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/sis_drv.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/sis_ds.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/tdfx_drv.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/via_3d_reg.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/via_drm.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/via_drv.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/via_ds.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/via_mm.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/drm/via_verifier.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 335dde69a6f..35427143851 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -514,12 +514,6 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/sis_drv.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/sis_ds.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/tdfx_drv.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/via_3d_reg.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/via_drm.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/via_drv.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/via_ds.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/via_mm.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/drm/via_verifier.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index f1c86fa3e97..f84ddaf584d 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -90,7 +90,7 @@
 ./usr/lib/librpcsvc.so.1.2
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
-./usr/lib/libsndio.so.3.0
+./usr/lib/libsndio.so.3.1
 ./usr/lib/libssl.so.12.0
 ./usr/lib/libstdc++.so.45.1
 ./usr/lib/libtermcap.so.10.0
@@ -1208,12 +1208,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/sis_drv.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/sis_ds.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/tdfx_drv.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/via_3d_reg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/via_drm.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/via_drv.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/via_ds.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/via_mm.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/drm/via_verifier.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/eapreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/emuxkireg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/pci/emuxkivar.ph
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 9d3432695be..37c5c7f443d 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -533,12 +533,6 @@
 ./usr/include/dev/pci/drm/sis_drv.h
 ./usr/include/dev/pci/drm/sis_ds.h
 ./usr/include/dev/pci/drm/tdfx_drv.h
-./usr/include/dev/pci/drm/via_3d_reg.h
-./usr/include/dev/pci/drm/via_drm.h
-./usr/include/dev/pci/drm/via_drv.h
-./usr/include/dev/pci/drm/via_ds.h
-./usr/include/dev/pci/drm/via_mm.h
-./usr/include/dev/pci/drm/via_verifier.h
 ./usr/include/dev/pci/eapreg.h
 ./usr/include/dev/pci/emuxkireg.h
 ./usr/include/dev/pci/emuxkivar.h
@@ -5311,11 +5305,13 @@
 ./usr/share/man/cat3/sio_initpar.0
 ./usr/share/man/cat3/sio_nfds.0
 ./usr/share/man/cat3/sio_onmove.0
+./usr/share/man/cat3/sio_onvol.0
 ./usr/share/man/cat3/sio_open.0
 ./usr/share/man/cat3/sio_pollfd.0
 ./usr/share/man/cat3/sio_read.0
 ./usr/share/man/cat3/sio_revents.0
 ./usr/share/man/cat3/sio_setpar.0
+./usr/share/man/cat3/sio_setvol.0
 ./usr/share/man/cat3/sio_start.0
 ./usr/share/man/cat3/sio_stop.0
 ./usr/share/man/cat3/sio_write.0