sync

19 files changed, 10 insertions, 38 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index b6bc46c0e60..c9eba10effb 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -1937,12 +1937,10 @@
 ./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_cd.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/scsi/cdvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/scsi/scsi_all.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/scsi/scsi_cd.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/scsi/scsi_changer.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/scsi/scsi_debug.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/scsi/scsi_disk.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 15725d94191..7e1cf116162 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -1965,12 +1965,10 @@
 ./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_cd.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/scsi/cdvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/scsi/scsi_all.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/scsi/scsi_cd.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/scsi/scsi_changer.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/scsi/scsi_debug.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/scsi/scsi_disk.ph
diff --git a/distrib/sets/lists/base/md.cats b/distrib/sets/lists/base/md.cats
index 6f3d93dc69c..82d03b4184d 100644
--- a/distrib/sets/lists/base/md.cats
+++ b/distrib/sets/lists/base/md.cats
@@ -1998,12 +1998,10 @@
 ./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_cd.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/cdvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsi_all.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsi_cd.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsi_changer.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsi_debug.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsi_disk.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 8436f472312..559ff22dff8 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -1921,12 +1921,10 @@
 ./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_cd.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/cdvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_all.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_cd.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_changer.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_debug.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_disk.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 352b5f9e837..201e3d57b2b 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -1946,12 +1946,10 @@
 ./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_cd.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/scsi/cdvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/scsi/scsi_all.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/scsi/scsi_cd.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/scsi/scsi_changer.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/scsi/scsi_debug.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/scsi/scsi_disk.ph
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index 8506bcbf44d..66588f3adcb 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -1946,12 +1946,10 @@
 ./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_cd.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi/cdvar.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi/scsi_all.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi/scsi_cd.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi/scsi_changer.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi/scsi_debug.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi/scsi_disk.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 50c451b136e..047f5601f17 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -1979,12 +1979,10 @@
 ./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_cd.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/scsi/cdvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/scsi/scsi_all.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/scsi/scsi_cd.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/scsi/scsi_changer.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/scsi/scsi_debug.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/scsi/scsi_disk.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 021d102702e..cc951713ea5 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -1862,12 +1862,10 @@
 ./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_cd.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/cdvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsi_all.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsi_cd.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsi_changer.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsi_debug.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsi_disk.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 6a2ae4c76e2..a825d5159a7 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -1925,12 +1925,10 @@
 ./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_cd.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/cdvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_all.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_cd.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_changer.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_debug.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_disk.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 8c7629c4ea9..4d37e9fcb0f 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -1994,12 +1994,10 @@
 ./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_cd.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/cdvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsi_all.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsi_cd.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsi_changer.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsi_debug.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsi_disk.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 4dd1640d124..840ee88c766 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -1921,12 +1921,10 @@
 ./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_cd.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/cdvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_all.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_cd.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_changer.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_debug.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_disk.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 9819c9c16cb..d6c06518919 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -1871,12 +1871,10 @@
 ./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_cd.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/cdvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsi_all.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsi_cd.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsi_changer.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsi_debug.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsi_disk.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 04487ead289..de3ee74a4f4 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -1921,12 +1921,10 @@
 ./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_cd.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/cdvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsi_all.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsi_cd.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsi_changer.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsi_debug.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsi_disk.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 06cd11e7962..88694b526c3 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -1942,12 +1942,10 @@
 ./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_cd.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/scsi/cdvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/scsi/scsi_all.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/scsi/scsi_cd.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/scsi/scsi_changer.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/scsi/scsi_debug.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/scsi/scsi_disk.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 46c453cf04e..95e49a67ea1 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -1343,12 +1343,10 @@
 ./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_cd.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/scsi/cdvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/scsi/scsi_all.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/scsi/scsi_cd.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/scsi/scsi_changer.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/scsi/scsi_debug.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/scsi/scsi_disk.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 79aa5081330..43afae576db 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -1385,12 +1385,10 @@
 ./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_cd.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi/cdvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi/scsi_all.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi/scsi_cd.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi/scsi_changer.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi/scsi_debug.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi/scsi_disk.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index dccf3da18c6..66addd4311c 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -1279,12 +1279,10 @@
 ./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_cd.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/scsi/cdvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/scsi/scsi_all.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/scsi/scsi_cd.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/scsi/scsi_changer.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/scsi/scsi_debug.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/scsi/scsi_disk.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index 31a2428cacd..6ab1c706b8e 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -1939,12 +1939,10 @@
 ./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_cd.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/atapi_disk.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/cd.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/cdvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsi_all.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsi_cd.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsi_changer.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsi_debug.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsi_disk.ph
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 8041fe165a8..b4a9ee95072 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1256,12 +1256,10 @@
 ./usr/include/rpcsvc/yppasswd.x
 ./usr/include/sched.h
 ./usr/include/scsi
-./usr/include/scsi/atapi_cd.h
 ./usr/include/scsi/atapi_disk.h
 ./usr/include/scsi/cd.h
 ./usr/include/scsi/cdvar.h
 ./usr/include/scsi/scsi_all.h
-./usr/include/scsi/scsi_cd.h
 ./usr/include/scsi/scsi_changer.h
 ./usr/include/scsi/scsi_debug.h
 ./usr/include/scsi/scsi_disk.h
@@ -5549,8 +5547,18 @@
 ./usr/share/man/cat9/vgonel.0
 ./usr/share/man/cat9/vhold.0
 ./usr/share/man/cat9/vinvalbuf.0
+./usr/share/man/cat9/vn_close.0
+./usr/share/man/cat9/vn_default_error.0
+./usr/share/man/cat9/vn_isunder.0
 ./usr/share/man/cat9/vn_lock.0
+./usr/share/man/cat9/vn_marktext.0
+./usr/share/man/cat9/vn_open.0
+./usr/share/man/cat9/vn_rdrw.0
+./usr/share/man/cat9/vn_readdir.0
+./usr/share/man/cat9/vn_stat.0
+./usr/share/man/cat9/vn_writechk.0
 ./usr/share/man/cat9/vnode.0
+./usr/share/man/cat9/vnsubr.0
 ./usr/share/man/cat9/vprintf.0
 ./usr/share/man/cat9/vput.0
 ./usr/share/man/cat9/vrecycle.0