sync

16 files changed, 32 insertions, 32 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 6cbb713dc3a..21cc4a10523 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -708,6 +708,7 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ata/atavar.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ata/satareg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ata/wdvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/auconv.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/audio_if.ph
@@ -715,8 +716,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/biovar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/cardbus
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/cardbus/cardbus_exrom.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/cardbus/cardbusdevs.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/cardbus/cardbusdevs_data.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/cardbus/rbus.ph
@@ -1298,6 +1297,7 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/if_cdcereg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/if_cuereg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/if_kuereg.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/if_udavreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/if_urlreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/if_wi_usb.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/ohcireg.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index a4b60fb59b8..41728c5d3f2 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -720,6 +720,7 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ata/atavar.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ata/satareg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ata/wdvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/auconv.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/audio_if.ph
@@ -727,8 +728,6 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/biovar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/cardbus
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/cardbus/cardbus_exrom.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/cardbus/cardbusdevs.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/cardbus/cardbusdevs_data.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/cardbus/rbus.ph
@@ -1310,6 +1309,7 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/usb/if_cdcereg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/usb/if_cuereg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/usb/if_kuereg.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/usb/if_udavreg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/usb/if_urlreg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/usb/if_wi_usb.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/usb/ohcireg.ph
diff --git a/distrib/sets/lists/base/md.cats b/distrib/sets/lists/base/md.cats
index 6d6ce6c9da1..89fa31a050a 100644
--- a/distrib/sets/lists/base/md.cats
+++ b/distrib/sets/lists/base/md.cats
@@ -753,6 +753,7 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ata/atavar.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/ata/satareg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ata/wdvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/auconv.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/audio_if.ph
@@ -760,8 +761,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/biovar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/cardbus
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/cardbus/cardbus_exrom.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/cardbus/cardbusdevs.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/cardbus/cardbusdevs_data.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/cardbus/rbus.ph
@@ -1343,6 +1342,7 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/if_cdcereg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/if_cuereg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/if_kuereg.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/if_udavreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/if_urlreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/if_wi_usb.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/ohcireg.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 4a69ce79b23..2d24a36bbe2 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -644,6 +644,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata/atavar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata/satareg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata/wdvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/auconv.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/audio_if.ph
@@ -651,8 +652,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/biovar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/cardbus_exrom.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/cardbusdevs.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/cardbusdevs_data.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/rbus.ph
@@ -1234,6 +1233,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/if_cdcereg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/if_cuereg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/if_kuereg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/if_udavreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/if_urlreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/if_wi_usb.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/ohcireg.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 946e70eb73c..cc1bceaa27d 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -649,6 +649,7 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ata/atavar.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ata/satareg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ata/wdvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/auconv.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/audio_if.ph
@@ -656,8 +657,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/biovar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/cardbus
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/cardbus/cardbus_exrom.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/cardbus/cardbusdevs.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/cardbus/cardbusdevs_data.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/cardbus/rbus.ph
@@ -1239,6 +1238,7 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/usb/if_cdcereg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/usb/if_cuereg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/usb/if_kuereg.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/usb/if_udavreg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/usb/if_urlreg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/usb/if_wi_usb.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/usb/ohcireg.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 7031ec3986e..f6681906195 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -654,6 +654,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ata/atavar.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/ata/satareg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ata/wdvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/auconv.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/audio_if.ph
@@ -661,8 +662,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/biovar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/cardbus
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/cardbus/cardbus_exrom.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/cardbus/cardbusdevs.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/cardbus/cardbusdevs_data.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/cardbus/rbus.ph
@@ -1244,6 +1243,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/if_cdcereg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/if_cuereg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/if_kuereg.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/if_udavreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/if_urlreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/if_wi_usb.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/ohcireg.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index cbb010aad0d..9602ee62054 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -578,6 +578,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ata/atavar.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ata/satareg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ata/wdvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/auconv.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/audio_if.ph
@@ -585,8 +586,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/biovar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cardbus
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cardbus/cardbus_exrom.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cardbus/cardbusdevs.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cardbus/cardbusdevs_data.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cardbus/rbus.ph
@@ -1168,6 +1167,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/if_cdcereg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/if_cuereg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/if_kuereg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/if_udavreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/if_urlreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/if_wi_usb.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/ohcireg.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index c2870486258..5b4f2b8bcfa 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -645,6 +645,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata/atavar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata/satareg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata/wdvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/auconv.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/audio_if.ph
@@ -652,8 +653,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/biovar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/cardbus_exrom.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/cardbusdevs.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/cardbusdevs_data.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/rbus.ph
@@ -1235,6 +1234,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/if_cdcereg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/if_cuereg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/if_kuereg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/if_udavreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/if_urlreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/if_wi_usb.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/ohcireg.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 053cd401d00..ef8711c5bbd 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -654,6 +654,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ata/atavar.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ata/satareg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ata/wdvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/auconv.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/audio_if.ph
@@ -661,8 +662,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/biovar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cardbus
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cardbus/cardbus_exrom.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cardbus/cardbusdevs.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cardbus/cardbusdevs_data.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cardbus/rbus.ph
@@ -1244,6 +1243,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/if_cdcereg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/if_cuereg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/if_kuereg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/if_udavreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/if_urlreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/if_wi_usb.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/ohcireg.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 71305fe2a10..fbf71c82fb2 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -644,6 +644,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata/atavar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata/satareg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ata/wdvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/auconv.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/audio_if.ph
@@ -651,8 +652,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/biovar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/cardbus_exrom.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/cardbusdevs.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/cardbusdevs_data.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/cardbus/rbus.ph
@@ -1234,6 +1233,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/if_cdcereg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/if_cuereg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/if_kuereg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/if_udavreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/if_urlreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/if_wi_usb.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/ohcireg.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 9c990068aea..3b211da1775 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -577,6 +577,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ata/atavar.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ata/satareg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ata/wdvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/auconv.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/audio_if.ph
@@ -584,8 +585,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/biovar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cardbus
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cardbus/cardbus_exrom.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cardbus/cardbusdevs.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cardbus/cardbusdevs_data.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/cardbus/rbus.ph
@@ -1167,6 +1166,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/if_cdcereg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/if_cuereg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/if_kuereg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/if_udavreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/if_urlreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/if_wi_usb.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/ohcireg.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 8fa2abb3b41..6d06da873fe 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -653,6 +653,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ata/atavar.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ata/satareg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ata/wdvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/auconv.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/audio_if.ph
@@ -660,8 +661,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/biovar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cardbus
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cardbus/cardbus_exrom.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cardbus/cardbusdevs.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cardbus/cardbusdevs_data.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/cardbus/rbus.ph
@@ -1240,6 +1239,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/if_cdcereg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/if_cuereg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/if_kuereg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/if_udavreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/if_urlreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/if_wi_usb.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/ohcireg.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 93cfd17dbba..1b4b01d8cd7 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -652,6 +652,7 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ata/atavar.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ata/satareg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ata/wdvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/auconv.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/audio_if.ph
@@ -659,8 +660,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/biovar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/cardbus
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/cardbus/cardbus_exrom.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/cardbus/cardbusdevs.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/cardbus/cardbusdevs_data.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/cardbus/rbus.ph
@@ -1243,6 +1242,7 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/if_cdcereg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/if_cuereg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/if_kuereg.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/if_udavreg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/if_urlreg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/if_wi_usb.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/ohcireg.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index bf94d85604e..5d6b5b9f2fc 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -142,6 +142,7 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ata/atavar.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ata/satareg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ata/wdvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/auconv.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/audio_if.ph
@@ -149,8 +150,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/biovar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/cardbus
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/cardbus/cardbus_exrom.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/cardbus/cardbusdevs.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/cardbus/cardbusdevs_data.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/cardbus/rbus.ph
@@ -732,6 +731,7 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/if_cdcereg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/if_cuereg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/if_kuereg.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/if_udavreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/if_urlreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/if_wi_usb.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/ohcireg.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index c18f8bb6305..2be52c19c26 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -138,6 +138,7 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ata/atavar.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ata/satareg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ata/wdvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/auconv.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/audio_if.ph
@@ -145,8 +146,6 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/biovar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/cardbus
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/cardbus/cardbus_exrom.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/cardbus/cardbusdevs.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/cardbus/cardbusdevs_data.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/cardbus/rbus.ph
@@ -728,6 +727,7 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/if_cdcereg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/if_cuereg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/if_kuereg.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/if_udavreg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/if_urlreg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/if_wi_usb.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/ohcireg.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 7a0987e57ce..8fcf69df335 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -82,6 +82,7 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ata/atavar.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/ata/satareg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ata/wdvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/auconv.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/audio_if.ph
@@ -89,8 +90,6 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/biovar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/cardbus
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/cardbus/cardbus_exrom.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/cardbus/cardbusdevs.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/cardbus/cardbusdevs_data.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/cardbus/cardbusvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/cardbus/cardslotvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/cardbus/rbus.ph
@@ -672,6 +671,7 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/if_cdcereg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/if_cuereg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/if_kuereg.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/if_udavreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/if_urlreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/if_wi_usb.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/ohcireg.ph