20 files changed, 2 insertions, 21 deletions
diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 5125c096f0a..2aceb70b1f4 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -1946,7 +1946,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/rpcsvc/yppasswd.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/sched.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/scsi
-./usr/libdata/perl5/site_perl/alpha-openbsd/scsi/atapi_all.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/scsi/atapi_cd.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/scsi/cd.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index a68aa382afb..ddd04632091 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -1974,7 +1974,6 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/rpcsvc/yppasswd.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/sched.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/scsi
-./usr/libdata/perl5/site_perl/amd64-openbsd/scsi/atapi_all.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/scsi/atapi_cd.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/scsi/cd.ph
diff --git a/distrib/sets/lists/base/md.cats b/distrib/sets/lists/base/md.cats
index 26a6be11c2c..d1c5e05c34e 100644
--- a/distrib/sets/lists/base/md.cats
+++ b/distrib/sets/lists/base/md.cats
@@ -2007,7 +2007,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/rpcsvc/yppasswd.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/sched.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi
-./usr/libdata/perl5/site_perl/arm-openbsd/scsi/atapi_all.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/atapi_cd.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/cd.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index c491edb1675..5b852a8c81d 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -1929,7 +1929,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/rpcsvc/yppasswd.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sched.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi
-./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/atapi_all.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/atapi_cd.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/cd.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index a5cad385424..e4e9efe2f75 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -1955,7 +1955,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/rpcsvc/yppasswd.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/sched.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/scsi
-./usr/libdata/perl5/site_perl/hppa-openbsd/scsi/atapi_all.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/scsi/atapi_cd.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/scsi/cd.ph
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index 41ba97b65fc..ace1812d3ce 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -1955,7 +1955,6 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/rpcsvc/yppasswd.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/sched.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi
-./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi/atapi_all.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi/atapi_cd.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi/cd.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index d937b9b69bb..ecd15f9eace 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -1989,7 +1989,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/rpcsvc/yppasswd.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/sched.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/scsi
-./usr/libdata/perl5/site_perl/i386-openbsd/scsi/atapi_all.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/scsi/atapi_cd.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/scsi/cd.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 3e0a43715bd..90c244e4cdf 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -1871,7 +1871,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/rpcsvc/yppasswd.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/sched.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi
-./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/atapi_all.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/atapi_cd.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/cd.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 7d41de43219..62bd4d1d364 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -1934,7 +1934,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/rpcsvc/yppasswd.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sched.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi
-./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/atapi_all.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/atapi_cd.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/cd.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index bbb873ead64..d0f12000fd3 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -2003,7 +2003,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/rpcsvc/yppasswd.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sched.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi
-./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/atapi_all.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/atapi_cd.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/cd.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 8f7a7148ef7..1cbfd48bc01 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -1930,7 +1930,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/rpcsvc/yppasswd.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sched.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi
-./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/atapi_all.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/atapi_cd.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/cd.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index de4c598fdec..44701840079 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -1880,7 +1880,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/rpcsvc/yppasswd.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/sched.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi
-./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/atapi_all.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/atapi_cd.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/cd.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 669008781f5..6fc3db07667 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -1930,7 +1930,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/rpcsvc/yppasswd.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sched.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi
-./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/atapi_all.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/atapi_cd.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/cd.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index b18e400b505..bb434a98572 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -1951,7 +1951,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/rpcsvc/yppasswd.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/sched.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/scsi
-./usr/libdata/perl5/site_perl/mips64-openbsd/scsi/atapi_all.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/scsi/atapi_cd.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/scsi/cd.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 8e6a158c9db..a8836724c1f 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -1352,7 +1352,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/rpcsvc/yppasswd.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sched.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/scsi
-./usr/libdata/perl5/site_perl/sparc-openbsd/scsi/atapi_all.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/scsi/atapi_cd.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/scsi/cd.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index f61c2e598e2..5aa8bace1af 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -1394,7 +1394,6 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/rpcsvc/yppasswd.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sched.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi
-./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi/atapi_all.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi/atapi_cd.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi/cd.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 802b0b7ea9a..0ec88c57c93 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -1288,7 +1288,6 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/rpcsvc/yppasswd.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/sched.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/scsi
-./usr/libdata/perl5/site_perl/vax-openbsd/scsi/atapi_all.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/scsi/atapi_cd.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/scsi/cd.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index b4c28f9e7ef..aba9edc505b 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -1948,7 +1948,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/rpcsvc/yppasswd.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/sched.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi
-./usr/libdata/perl5/site_perl/arm-openbsd/scsi/atapi_all.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/atapi_cd.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/cd.ph
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index db1063e6cdb..714b97ad94f 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1265,7 +1265,6 @@
 ./usr/include/rpcsvc/yppasswd.x
 ./usr/include/sched.h
 ./usr/include/scsi
-./usr/include/scsi/atapi_all.h
 ./usr/include/scsi/atapi_cd.h
 ./usr/include/scsi/atapi_disk.h
 ./usr/include/scsi/cd.h
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index df855008b8e..4071cf7d10f 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1264,8 +1264,6 @@
 ./usr/share/man/cat4/i386/pss.0
 ./usr/share/man/cat4/i386/sb.0
 ./usr/share/man/cat4/i386/sea.0
-./usr/share/man/cat4/i386/speaker.0
-./usr/share/man/cat4/i386/spkr.0
 ./usr/share/man/cat4/i386/uha.0
 ./usr/share/man/cat4/i386/wdt.0
 ./usr/share/man/cat4/i386/wss.0
@@ -1581,6 +1579,8 @@
 ./usr/share/man/cat4/sparc64/zskbd.0
 ./usr/share/man/cat4/sparc64/zstty.0
 ./usr/share/man/cat4/sparc64/zx.0
+./usr/share/man/cat4/speaker.0
+./usr/share/man/cat4/spkr.0
 ./usr/share/man/cat4/spp.0
 ./usr/share/man/cat4/sppp.0
 ./usr/share/man/cat4/sqphy.0