sync

22 files changed, 116 insertions, 9 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index d8febecd66d..5d66cc94e28 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -745,6 +745,12 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/acpi/dsdt.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/adb
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/adb/adb.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/adb/akbdmap.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/adb/akbdvar.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/adb/amsvar.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/adb/keyboard.ph
 ./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
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index c53ada39e79..fbd746f5bc5 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -760,6 +760,12 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/acpi/dsdt.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/adb
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/adb/adb.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/adb/akbdmap.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/adb/akbdvar.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/adb/amsvar.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/adb/keyboard.ph
 ./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
diff --git a/distrib/sets/lists/base/md.cats b/distrib/sets/lists/base/md.cats
index d5d9a81961c..0fd3078596c 100644
--- a/distrib/sets/lists/base/md.cats
+++ b/distrib/sets/lists/base/md.cats
@@ -789,6 +789,12 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi/dsdt.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/adb
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/adb/adb.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/adb/akbdmap.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/adb/akbdvar.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/adb/amsvar.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/adb/keyboard.ph
 ./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
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index e296d5fef5f..ea86e874183 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -650,6 +650,12 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/dsdt.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/adb
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/adb/adb.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/adb/akbdmap.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/adb/akbdvar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/adb/amsvar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/adb/keyboard.ph
 ./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
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 173a3edc622..494c3d49597 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -690,6 +690,12 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/acpi/dsdt.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/adb
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/adb/adb.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/adb/akbdmap.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/adb/akbdvar.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/adb/amsvar.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/adb/keyboard.ph
 ./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
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index 3717e2768db..8315f435047 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -690,6 +690,12 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/acpi/dsdt.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/adb
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/adb/adb.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/adb/akbdmap.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/adb/akbdvar.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/adb/amsvar.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/adb/keyboard.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ata
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ata/atareg.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ata/atavar.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 3e46827caaa..83f3911edbc 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -699,6 +699,12 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/acpi/dsdt.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/adb
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/adb/adb.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/adb/akbdmap.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/adb/akbdvar.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/adb/amsvar.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/adb/keyboard.ph
 ./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
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 426f4aaad29..2f3fdbafa94 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -580,6 +580,12 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi/dsdt.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/adb
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/adb/adb.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/adb/akbdmap.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/adb/akbdvar.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/adb/amsvar.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/adb/keyboard.ph
 ./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
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index e4c505ac734..72c291f1a2f 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -649,6 +649,12 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/dsdt.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/adb
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/adb/adb.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/adb/akbdmap.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/adb/akbdvar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/adb/amsvar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/adb/keyboard.ph
 ./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
@@ -1570,7 +1576,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/vmparam.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mac68k
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mac68k/_types.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/mac68k/adbsys.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mac68k/asm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mac68k/autoconf.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/mac68k/bus.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index fb478a8200c..aa751799e26 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -696,6 +696,12 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi/dsdt.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/adb
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/adb/adb.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/adb/akbdmap.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/adb/akbdvar.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/adb/amsvar.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/adb/keyboard.ph
 ./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
@@ -1601,7 +1607,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/machine
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/_types.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/adbsys.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/apmvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/asm.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/macppc/autoconf.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index e416c73a566..5136c915c6e 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -648,6 +648,12 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/acpi/dsdt.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/adb
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/adb/adb.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/adb/akbdmap.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/adb/akbdvar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/adb/amsvar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/adb/keyboard.ph
 ./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
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 63fa0e6d77c..82a968f36db 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -579,6 +579,12 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/acpi/dsdt.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/adb
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/adb/adb.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/adb/akbdmap.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/adb/akbdvar.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/adb/amsvar.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/adb/keyboard.ph
 ./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
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index b7df5bc86dd..ad9e059eff0 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -684,6 +684,12 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/acpi/dsdt.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/adb
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/adb/adb.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/adb/akbdmap.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/adb/akbdvar.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/adb/amsvar.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/adb/keyboard.ph
 ./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
@@ -1827,7 +1833,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/poll.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/_types.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/adbsys.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/asm.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/autoconf.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/bat.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 31f6a12d99c..c4ec60cb9cc 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -695,6 +695,12 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/acpi/dsdt.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/adb
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/adb/adb.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/adb/akbdmap.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/adb/akbdvar.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/adb/amsvar.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/adb/keyboard.ph
 ./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
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 5022ff6c4a2..0d78e23d50f 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -149,6 +149,12 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/acpi/dsdt.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/adb
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/adb/adb.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/adb/akbdmap.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/adb/akbdvar.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/adb/amsvar.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/adb/keyboard.ph
 ./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
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index a26296a30e5..4380fe3e465 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -180,6 +180,12 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/acpi/dsdt.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/adb
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/adb/adb.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/adb/akbdmap.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/adb/akbdvar.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/adb/amsvar.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/adb/keyboard.ph
 ./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
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index c64ca59c88f..b978f5c22e8 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -84,6 +84,12 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/acpi/dsdt.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/adb
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/adb/adb.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/adb/akbdmap.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/adb/akbdvar.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/adb/amsvar.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/adb/keyboard.ph
 ./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
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index fe1bc7b32df..7fecd82be8b 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -728,6 +728,12 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi/acpivar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi/amltypes.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/acpi/dsdt.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/adb
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/adb/adb.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/adb/akbdmap.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/adb/akbdvar.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/adb/amsvar.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/adb/keyboard.ph
 ./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
diff --git a/distrib/sets/lists/comp/md.mac68k b/distrib/sets/lists/comp/md.mac68k
index 5187e05f1f3..ca987f2711f 100644
--- a/distrib/sets/lists/comp/md.mac68k
+++ b/distrib/sets/lists/comp/md.mac68k
@@ -144,7 +144,6 @@
 ./usr/include/m68k/vmparam.h
 ./usr/include/mac68k
 ./usr/include/mac68k/_types.h
-./usr/include/mac68k/adbsys.h
 ./usr/include/mac68k/asm.h
 ./usr/include/mac68k/autoconf.h
 ./usr/include/mac68k/bus.h
diff --git a/distrib/sets/lists/comp/md.macppc b/distrib/sets/lists/comp/md.macppc
index 290c7753c95..415b4cf0820 100644
--- a/distrib/sets/lists/comp/md.macppc
+++ b/distrib/sets/lists/comp/md.macppc
@@ -154,7 +154,6 @@
 ./usr/include/ieeefp.h
 ./usr/include/macppc
 ./usr/include/macppc/_types.h
-./usr/include/macppc/adbsys.h
 ./usr/include/macppc/apmvar.h
 ./usr/include/macppc/asm.h
 ./usr/include/macppc/autoconf.h
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index f3b90cca666..0adfef0f351 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -105,6 +105,12 @@
 ./usr/include/dev/acpi/acpivar.h
 ./usr/include/dev/acpi/amltypes.h
 ./usr/include/dev/acpi/dsdt.h
+./usr/include/dev/adb
+./usr/include/dev/adb/adb.h
+./usr/include/dev/adb/akbdmap.h
+./usr/include/dev/adb/akbdvar.h
+./usr/include/dev/adb/amsvar.h
+./usr/include/dev/adb/keyboard.h
 ./usr/include/dev/ata
 ./usr/include/dev/ata/atareg.h
 ./usr/include/dev/ata/atavar.h
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index d9dfff4fde2..720898d2981 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1087,6 +1087,7 @@
 ./usr/share/man/cat4/ahc.0
 ./usr/share/man/cat4/ahd.0
 ./usr/share/man/cat4/aic.0
+./usr/share/man/cat4/akbd.0
 ./usr/share/man/cat4/alipm.0
 ./usr/share/man/cat4/alpha
 ./usr/share/man/cat4/alpha/apecs.0
@@ -1113,6 +1114,7 @@
 ./usr/share/man/cat4/amdpm.0
 ./usr/share/man/cat4/ami.0
 ./usr/share/man/cat4/amphy.0
+./usr/share/man/cat4/ams.0
 ./usr/share/man/cat4/an.0
 ./usr/share/man/cat4/aps.0
 ./usr/share/man/cat4/arandom.0
@@ -1357,8 +1359,6 @@
 ./usr/share/man/cat4/mac68k
 ./usr/share/man/cat4/mac68k/adb.0
 ./usr/share/man/cat4/mac68k/ae.0
-./usr/share/man/cat4/mac68k/akbd.0
-./usr/share/man/cat4/mac68k/ams.0
 ./usr/share/man/cat4/mac68k/asc.0
 ./usr/share/man/cat4/mac68k/autoconf.0
 ./usr/share/man/cat4/mac68k/esp.0
@@ -1378,8 +1378,6 @@
 ./usr/share/man/cat4/macppc
 ./usr/share/man/cat4/macppc/abtn.0
 ./usr/share/man/cat4/macppc/adb.0
-./usr/share/man/cat4/macppc/akbd.0
-./usr/share/man/cat4/macppc/ams.0
 ./usr/share/man/cat4/macppc/aoa.0
 ./usr/share/man/cat4/macppc/apm.0
 ./usr/share/man/cat4/macppc/asms.0