19 files changed, 0 insertions, 19 deletions
diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 2957c033776..23b748a586a 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -1942,7 +1942,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/scsi
 ./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_changer.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/scsi/scsi_debug.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 96de8c9a2f9..3e955063ca4 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -1970,7 +1970,6 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/scsi
 ./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_changer.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/scsi/scsi_debug.ph
diff --git a/distrib/sets/lists/base/md.cats b/distrib/sets/lists/base/md.cats
index 2f2d4ef4f56..89d42969aca 100644
--- a/distrib/sets/lists/base/md.cats
+++ b/distrib/sets/lists/base/md.cats
@@ -2003,7 +2003,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi
 ./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_changer.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsi_debug.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 08cdeaeabf9..cb199f000c7 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -1926,7 +1926,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi
 ./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_changer.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_debug.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index cc57cac6a8d..a3466661956 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -1951,7 +1951,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/scsi
 ./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_changer.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/scsi/scsi_debug.ph
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index c4fa5fdf97d..8ff2d24777b 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -1951,7 +1951,6 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi
 ./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_changer.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/scsi/scsi_debug.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 8946211a521..437b6d35da2 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -1984,7 +1984,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/scsi
 ./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_changer.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/scsi/scsi_debug.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index d76fef77938..643c2af0dfc 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -1867,7 +1867,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi
 ./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_changer.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsi_debug.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 31fcb963456..92b5407c63b 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -1930,7 +1930,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi
 ./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_changer.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_debug.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index ef0308dfc06..a3148e3705d 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -1999,7 +1999,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi
 ./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_changer.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsi_debug.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 4cb7101dee7..14322adfe8e 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -1926,7 +1926,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi
 ./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_changer.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/scsi/scsi_debug.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 26599574013..d48d09eb449 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -1876,7 +1876,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi
 ./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_changer.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/scsi/scsi_debug.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 5540c268940..833e902275b 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -1926,7 +1926,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi
 ./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_changer.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/scsi/scsi_debug.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index e4f734577c5..c2d78e3e3f5 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -1947,7 +1947,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/scsi
 ./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_changer.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/scsi/scsi_debug.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index dcc7979ec70..af95c7fe806 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -1348,7 +1348,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/scsi
 ./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_changer.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/scsi/scsi_debug.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 78407084349..2c9955c2c99 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -1390,7 +1390,6 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi
 ./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_changer.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/scsi/scsi_debug.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 6b9327900bd..49a0d60a071 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -1284,7 +1284,6 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/scsi
 ./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_changer.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/scsi/scsi_debug.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index 9d70baa239a..b6686a0948f 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -1944,7 +1944,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi
 ./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_changer.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/scsi/scsi_debug.ph
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index b834e596a04..d7b38e688fa 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -117,7 +117,6 @@
 ./usr/include/dev/cardbus/cardbusvar.h
 ./usr/include/dev/cardbus/cardslotvar.h
 ./usr/include/dev/cardbus/rbus.h
-./usr/include/dev/ccdvar.h
 ./usr/include/dev/clock_subr.h
 ./usr/include/dev/cons.h
 ./usr/include/dev/dec