16 files changed, 69 insertions, 28 deletions
diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 9df17f7443f..5624b34da2f 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -582,6 +582,8 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/awivar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/ax88190reg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/ax88190var.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/bhareg.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/bhavar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/bt463reg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/bt463var.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/bt485reg.ph
@@ -712,7 +714,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/isa/ad1848var.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/isa/ahareg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/isa/ariareg.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/isa/btreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/isa/cs4231var.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/isa/egavar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/isa/elink.ph
@@ -996,9 +997,10 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/sun
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/sun/disklabel.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/sun/event_var.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/sun/kbd_ms_ttyvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/sun/kbd_tables.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/sun/kbd_xlate.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/sun/sunkbdreg.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/sun/sunkbdvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/tc
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/tc/if_levar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/tc/ioasicvar.ph
diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index 55233ba8f98..f4a2424548a 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -585,6 +585,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/awivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/ax88190reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/ax88190var.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/bhareg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/bhavar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/bt463reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/bt463var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/bt485reg.ph
@@ -714,7 +716,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/ad1848var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/ahareg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/ariareg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/btreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/cs4231var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/egavar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/elink.ph
@@ -998,9 +999,10 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/disklabel.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/event_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/kbd_ms_ttyvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/kbd_tables.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/kbd_xlate.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/sunkbdreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/sunkbdvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/tc
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/tc/if_levar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/tc/ioasicvar.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 940a06d5775..7dc51cdc7d3 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -545,6 +545,10 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/awivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/ax88190reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/ax88190var.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/bhareg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/bhavar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/bt463reg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/bt463reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/bt463reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/bt463var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/bt485reg.ph
@@ -675,7 +679,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/ad1848var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/ahareg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/ariareg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/btreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/cs4231var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/egavar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/elink.ph
@@ -959,9 +962,10 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/disklabel.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/event_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/kbd_ms_ttyvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/kbd_tables.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/kbd_xlate.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/sunkbdreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/sunkbdvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/tc
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/tc/if_levar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/tc/ioasicvar.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index bcd835b45a4..91e5662e4de 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -549,6 +549,8 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/awivar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/ax88190reg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/ax88190var.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/bhareg.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/bhavar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/bt463reg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/bt463var.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/bt485reg.ph
@@ -679,7 +681,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/isa/ad1848var.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/isa/ahareg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/isa/ariareg.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/isa/btreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/isa/cs4231var.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/isa/egavar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/isa/elink.ph
@@ -963,9 +964,10 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/sun
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/sun/disklabel.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/sun/event_var.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/sun/kbd_ms_ttyvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/sun/kbd_tables.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/sun/kbd_xlate.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/sun/sunkbdreg.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/sun/sunkbdvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/tc
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/tc/if_levar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/tc/ioasicvar.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 0d00b9252ed..ff6186ef237 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -544,6 +544,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/awivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/ax88190reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/ax88190var.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/bhareg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/bhavar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/bt463reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/bt463var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/bt485reg.ph
@@ -672,7 +674,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/ad1848var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/ahareg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/ariareg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/btreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/cs4231var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/egavar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/elink.ph
@@ -954,9 +955,10 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/disklabel.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/event_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/kbd_ms_ttyvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/kbd_tables.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/kbd_xlate.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/sunkbdreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/sunkbdvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/tc
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/tc/if_levar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/tc/ioasicvar.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 6761cd289cd..3b79f7ecf20 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -533,6 +533,8 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/awivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/ax88190reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/ax88190var.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/bhareg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/bhavar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/bt463reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/bt463var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/bt485reg.ph
@@ -663,7 +665,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/ad1848var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/ahareg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/ariareg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/btreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/cs4231var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/egavar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/elink.ph
@@ -947,9 +948,10 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/sun
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/sun/disklabel.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/sun/event_var.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/sun/kbd_ms_ttyvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/sun/kbd_tables.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/sun/kbd_xlate.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/sun/sunkbdreg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/sun/sunkbdvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/tc
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/tc/if_levar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/tc/ioasicvar.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index cdd490bb08d..fe4a3652bc9 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -544,6 +544,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/awivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/ax88190reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/ax88190var.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/bhareg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/bhavar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/bt463reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/bt463var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/bt485reg.ph
@@ -674,7 +676,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/ad1848var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/ahareg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/ariareg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/btreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/cs4231var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/egavar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/elink.ph
@@ -958,9 +959,10 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/disklabel.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/event_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/kbd_ms_ttyvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/kbd_tables.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/kbd_xlate.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/sunkbdreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/sunkbdvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/tc
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/tc/if_levar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/tc/ioasicvar.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 7a012e6f999..94ea5c1ee10 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -409,6 +409,8 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/apcdmareg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/ax88190reg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/ax88190var.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/bhareg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/bhavar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/cacreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/cacvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/gemreg.ph
@@ -484,8 +486,13 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/sbus/sbusvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/sbus/spifreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/sbus/spifvar.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/sun
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/sun/disklabel.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/sun/kbd_ms_ttyvar.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/sun/event_var.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/sun/kbd_tables.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/sun/kbd_xlate.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/sun/sunkbdreg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/sun/sunkbdvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/ezload.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/uftdireg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/ugraphire_rdesc.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 20d6966f9ef..1e47a9963eb 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -529,6 +529,8 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/awivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/ax88190reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/ax88190var.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/bhareg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/bhavar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/bt463reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/bt463var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/bt485reg.ph
@@ -659,7 +661,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/ad1848var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/ahareg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/ariareg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/btreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/cs4231var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/egavar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/elink.ph
@@ -940,9 +941,10 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/sun
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/sun/disklabel.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/sun/event_var.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/sun/kbd_ms_ttyvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/sun/kbd_tables.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/sun/kbd_xlate.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/sun/sunkbdreg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/sun/sunkbdvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/tc
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/tc/if_levar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/tc/ioasicvar.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 0ab5d5bdbb0..d2f222769fc 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -204,6 +204,8 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/awivar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/ax88190reg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/ax88190var.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/bhareg.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/bhavar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/bt463reg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/bt463var.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/bt485reg.ph
@@ -334,7 +336,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/isa/ad1848var.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/isa/ahareg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/isa/ariareg.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/isa/btreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/isa/cs4231var.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/isa/egavar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/isa/elink.ph
@@ -618,9 +619,10 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/sun
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/sun/disklabel.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/sun/event_var.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/sun/kbd_ms_ttyvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/sun/kbd_tables.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/sun/kbd_xlate.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/sun/sunkbdreg.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/sun/sunkbdvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/tc
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/tc/if_levar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/tc/ioasicvar.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 3bd4f221233..21dc9457e96 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -182,6 +182,8 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/awivar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/ax88190reg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/ax88190var.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/bhareg.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/bhavar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/bt463reg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/bt463var.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/bt485reg.ph
@@ -312,7 +314,6 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/isa/ad1848var.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/isa/ahareg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/isa/ariareg.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/isa/btreg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/isa/cs4231var.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/isa/egavar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/isa/elink.ph
@@ -596,9 +597,10 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/sun
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/sun/disklabel.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/sun/event_var.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/sun/kbd_ms_ttyvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/sun/kbd_tables.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/sun/kbd_xlate.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/sun/sunkbdreg.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/sun/sunkbdvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/tc
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/tc/if_levar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/tc/ioasicvar.ph
diff --git a/distrib/sets/lists/base/md.sun3 b/distrib/sets/lists/base/md.sun3
index c5bcbb3dc88..01a0f29d659 100644
--- a/distrib/sets/lists/base/md.sun3
+++ b/distrib/sets/lists/base/md.sun3
@@ -544,6 +544,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/awivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/ax88190reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/ax88190var.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/bhareg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/bhavar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/bt463reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/bt463var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/bt485reg.ph
@@ -674,7 +676,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/ad1848var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/ahareg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/ariareg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/btreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/cs4231var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/egavar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/elink.ph
@@ -957,9 +958,10 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/disklabel.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/event_var.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/kbd_ms_ttyvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/kbd_tables.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/kbd_xlate.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/sunkbdreg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/sun/sunkbdvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/tc
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/tc/if_levar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/tc/ioasicvar.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 90fbbe5c091..fdf6c9e80bd 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -146,6 +146,8 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/awivar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/ax88190reg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/ax88190var.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/bhareg.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/bhavar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/bt463reg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/bt463var.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/bt485reg.ph
@@ -276,7 +278,6 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/isa/ad1848var.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/isa/ahareg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/isa/ariareg.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/isa/btreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/isa/cs4231var.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/isa/egavar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/isa/elink.ph
@@ -560,9 +561,10 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/sun
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/sun/disklabel.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/sun/event_var.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/sun/kbd_ms_ttyvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/sun/kbd_tables.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/sun/kbd_xlate.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/sun/sunkbdreg.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/sun/sunkbdvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/tc
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/tc/if_levar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/tc/ioasicvar.ph
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 73398f8c907..c65c13a27e1 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -154,6 +154,8 @@
 ./usr/include/dev/ic/awivar.h
 ./usr/include/dev/ic/ax88190reg.h
 ./usr/include/dev/ic/ax88190var.h
+./usr/include/dev/ic/bhareg.h
+./usr/include/dev/ic/bhavar.h
 ./usr/include/dev/ic/bt463reg.h
 ./usr/include/dev/ic/bt463var.h
 ./usr/include/dev/ic/bt485reg.h
@@ -284,7 +286,6 @@
 ./usr/include/dev/isa/ad1848var.h
 ./usr/include/dev/isa/ahareg.h
 ./usr/include/dev/isa/ariareg.h
-./usr/include/dev/isa/btreg.h
 ./usr/include/dev/isa/cs4231var.h
 ./usr/include/dev/isa/egavar.h
 ./usr/include/dev/isa/elink.h
@@ -568,9 +569,10 @@
 ./usr/include/dev/sun
 ./usr/include/dev/sun/disklabel.h
 ./usr/include/dev/sun/event_var.h
-./usr/include/dev/sun/kbd_ms_ttyvar.h
 ./usr/include/dev/sun/kbd_tables.h
 ./usr/include/dev/sun/kbd_xlate.h
+./usr/include/dev/sun/sunkbdreg.h
+./usr/include/dev/sun/sunkbdvar.h
 ./usr/include/dev/tc
 ./usr/include/dev/tc/if_levar.h
 ./usr/include/dev/tc/ioasicvar.h
diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi
index 5f617c4b7ba..e006496f8ee 100644
--- a/distrib/sets/lists/etc/mi
+++ b/distrib/sets/lists/etc/mi
@@ -144,6 +144,8 @@
 ./var/msgs/bounds
 ./var/named/named.boot
 ./var/named/namedb/localhost.rev
+./var/named/namedb/localhost.v6.rev
+./var/named/namedb/localhost.zone
 ./var/named/namedb/root.cache
 ./var/run/utmp
 ./var/www/cgi-bin/printenv
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 323ad41ef46..5bfea66e928 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -931,11 +931,11 @@
 ./usr/share/man/cat4/awi.0
 ./usr/share/man/cat4/az.0
 ./usr/share/man/cat4/bge.0
+./usr/share/man/cat4/bha.0
 ./usr/share/man/cat4/bmtphy.0
 ./usr/share/man/cat4/bpf.0
 ./usr/share/man/cat4/brgphy.0
 ./usr/share/man/cat4/bridge.0
-./usr/share/man/cat4/bt.0
 ./usr/share/man/cat4/cac.0
 ./usr/share/man/cat4/cardbus.0
 ./usr/share/man/cat4/cbb.0
@@ -964,6 +964,7 @@
 ./usr/share/man/cat4/eephy.0
 ./usr/share/man/cat4/ef.0
 ./usr/share/man/cat4/eg.0
+./usr/share/man/cat4/eisa.0
 ./usr/share/man/cat4/el.0
 ./usr/share/man/cat4/emu.0
 ./usr/share/man/cat4/enc.0
@@ -1216,6 +1217,7 @@
 ./usr/share/man/cat4/sparc64/be.0
 ./usr/share/man/cat4/sparc64/cgsix.0
 ./usr/share/man/cat4/sparc64/cgthree.0
+./usr/share/man/cat4/sparc64/comkbd.0
 ./usr/share/man/cat4/sparc64/esp.0
 ./usr/share/man/cat4/sparc64/gem.0
 ./usr/share/man/cat4/sparc64/hme.0
@@ -1232,6 +1234,8 @@
 ./usr/share/man/cat4/sparc64/sabtty.0
 ./usr/share/man/cat4/sparc64/spif.0
 ./usr/share/man/cat4/sparc64/zs.0
+./usr/share/man/cat4/sparc64/zskbd.0
+./usr/share/man/cat4/sparc64/zstty.0
 ./usr/share/man/cat4/spp.0
 ./usr/share/man/cat4/sppp.0
 ./usr/share/man/cat4/sqphy.0