sync

25 files changed, 75 insertions, 97 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 7562bbe952b..9bdecdbccba 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -1055,9 +1055,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/ns16550reg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/oosiopreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/oosiopvar.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/opl3sa3reg.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/oplreg.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/oplvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/osiopreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/osiopvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/p9000.ph
@@ -1178,7 +1175,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/isa/wssvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/midi_if.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/mii
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/mii/acphyreg.ph
@@ -1545,6 +1541,9 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/ehcivar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/ezload.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/hid.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/if_atureg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/if_auereg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/if_axereg.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index b820f407760..b0aaf44c28a 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -1080,9 +1080,6 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/ns16550reg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/oosiopreg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/oosiopvar.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/opl3sa3reg.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/oplreg.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/oplvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/osiopreg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/osiopvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/p9000.ph
@@ -1203,7 +1200,6 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/isa/wssvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/midi_if.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/mii
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/mii/acphyreg.ph
@@ -1570,6 +1566,9 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/usb/ehcivar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/usb/ezload.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/usb/hid.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/usb/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/usb/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/usb/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/usb/if_atureg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/usb/if_auereg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/usb/if_axereg.ph
diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish
index 16950a7c87d..959d01b6b12 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -1072,9 +1072,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/ns16550reg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/oosiopreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/oosiopvar.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/opl3sa3reg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/oplreg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/oplvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/osiopreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/osiopvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/p9000.ph
@@ -1195,7 +1192,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/isa/wssvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/midi_if.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/mii
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/mii/acphyreg.ph
@@ -1562,6 +1558,9 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/ehcivar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/ezload.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/hid.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/if_atureg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/if_auereg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/if_axereg.ph
diff --git a/distrib/sets/lists/base/md.aviion b/distrib/sets/lists/base/md.aviion
index cad5d0daba2..9f1c8174db0 100644
--- a/distrib/sets/lists/base/md.aviion
+++ b/distrib/sets/lists/base/md.aviion
@@ -985,9 +985,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/ns16550reg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/oosiopreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/oosiopvar.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/opl3sa3reg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/oplreg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/oplvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/osiopreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/osiopvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/p9000.ph
@@ -1108,7 +1105,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/isa/wssvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/midi_if.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/mii
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/mii/acphyreg.ph
@@ -1475,6 +1471,9 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/ehcivar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/ezload.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/hid.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/if_atureg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/if_auereg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/if_axereg.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 34951ef51e6..be02d1d0356 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -942,9 +942,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/ns16550reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/oosiopreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/oosiopvar.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/opl3sa3reg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/oplreg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/oplvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/osiopreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/osiopvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/p9000.ph
@@ -1065,7 +1062,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/wssvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/midi_if.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/acphyreg.ph
@@ -1432,6 +1428,9 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/ehcivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/ezload.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/hid.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/if_atureg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/if_auereg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/if_axereg.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index ded56e90691..a960b39c72b 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -1004,9 +1004,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/ns16550reg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/oosiopreg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/oosiopvar.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/opl3sa3reg.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/oplreg.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/oplvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/osiopreg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/osiopvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/p9000.ph
@@ -1127,7 +1124,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/isa/wssvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/midi_if.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/mii
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/mii/acphyreg.ph
@@ -1494,6 +1490,9 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/usb/ehcivar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/usb/ezload.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/usb/hid.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/usb/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/usb/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/usb/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/usb/if_atureg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/usb/if_auereg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/usb/if_axereg.ph
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index a7428004068..88cdc70ce9f 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -1002,9 +1002,6 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/ns16550reg.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/oosiopreg.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/oosiopvar.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/opl3sa3reg.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/oplreg.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/oplvar.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/osiopreg.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/osiopvar.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/p9000.ph
@@ -1125,7 +1122,6 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/isa/wssvar.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/midi_if.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/mii
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/mii/acphyreg.ph
@@ -1492,6 +1488,9 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/usb/ehcivar.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/usb/ezload.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/usb/hid.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/usb/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/usb/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/usb/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/usb/if_atureg.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/usb/if_auereg.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/usb/if_axereg.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 053e42127f4..4e17b5dd57c 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -1008,9 +1008,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/ns16550reg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/oosiopreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/oosiopvar.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/opl3sa3reg.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/oplreg.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/oplvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/osiopreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/osiopvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/p9000.ph
@@ -1131,7 +1128,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/isa/wssvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/midi_if.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/mii
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/mii/acphyreg.ph
@@ -1498,6 +1494,9 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/ehcivar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/ezload.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/hid.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/if_atureg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/if_auereg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/if_axereg.ph
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index df3af5c2b03..32f685d5610 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -965,9 +965,6 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/ns16550reg.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/oosiopreg.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/oosiopvar.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/opl3sa3reg.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/oplreg.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/oplvar.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/osiopreg.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/osiopvar.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/p9000.ph
@@ -1088,7 +1085,6 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/isa/wssvar.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/midi_if.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/mii
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/mii/acphyreg.ph
@@ -1455,6 +1451,9 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/usb/ehcivar.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/usb/ezload.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/usb/hid.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/dev/usb/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/dev/usb/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/dev/usb/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/usb/if_atureg.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/usb/if_auereg.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/usb/if_axereg.ph
diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson
index c84d5443a07..d019dab061d 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -978,9 +978,6 @@
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/ic/ns16550reg.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/ic/oosiopreg.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/ic/oosiopvar.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/ic/opl3sa3reg.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/ic/oplreg.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/ic/oplvar.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/ic/osiopreg.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/ic/osiopvar.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/ic/p9000.ph
@@ -1101,7 +1098,6 @@
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/isa/wssvar.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/midi_if.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/mii
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/mii/acphyreg.ph
@@ -1468,6 +1464,9 @@
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/usb/ehcivar.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/usb/ezload.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/usb/hid.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/usb/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/usb/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/usb/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/usb/if_atureg.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/usb/if_auereg.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/usb/if_axereg.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 1392867a632..c7de7eceb90 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -794,9 +794,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/ns16550reg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/oosiopreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/oosiopvar.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/opl3sa3reg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/oplreg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/oplvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/osiopreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/osiopvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/p9000.ph
@@ -917,7 +914,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/isa/wssvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/midi_if.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/mii
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/mii/acphyreg.ph
@@ -1284,6 +1280,9 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/ehcivar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/ezload.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/hid.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/if_atureg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/if_auereg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/if_axereg.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index e04fc1fd6f3..2bc0c2425f2 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -943,9 +943,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/ns16550reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/oosiopreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/oosiopvar.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/opl3sa3reg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/oplreg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/oplvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/osiopreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/osiopvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/p9000.ph
@@ -1066,7 +1063,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/wssvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/midi_if.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/acphyreg.ph
@@ -1433,6 +1429,9 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/ehcivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/ezload.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/hid.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/if_atureg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/if_auereg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/if_axereg.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index b1cf389dd0c..d649adac287 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -1007,9 +1007,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/ns16550reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/oosiopreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/oosiopvar.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/opl3sa3reg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/oplreg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/oplvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/osiopreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/osiopvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/p9000.ph
@@ -1130,7 +1127,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/wssvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/midi_if.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/mii
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/mii/acphyreg.ph
@@ -1497,6 +1493,9 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/ehcivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/ezload.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/hid.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/if_atureg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/if_auereg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/if_axereg.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 5e1457e348f..5482372a077 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -940,9 +940,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/ns16550reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/oosiopreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/oosiopvar.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/opl3sa3reg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/oplreg.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/oplvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/osiopreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/osiopvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/p9000.ph
@@ -1063,7 +1060,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/wssvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/midi_if.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/mii/acphyreg.ph
@@ -1430,6 +1426,9 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/ehcivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/ezload.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/hid.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/if_atureg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/if_auereg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/if_axereg.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 5af2c680eae..db596b8b965 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -932,9 +932,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/ns16550reg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/oosiopreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/oosiopvar.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/opl3sa3reg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/oplreg.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/oplvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/osiopreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/osiopvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/p9000.ph
@@ -1055,7 +1052,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/isa/wssvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/midi_if.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/mii
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/mii/acphyreg.ph
@@ -1422,6 +1418,9 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/ehcivar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/ezload.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/hid.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/if_atureg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/if_auereg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/if_axereg.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 13888208c53..197eb6c7de7 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -892,9 +892,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/ns16550reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/oosiopreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/oosiopvar.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/opl3sa3reg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/oplreg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/oplvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/osiopreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/osiopvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/p9000.ph
@@ -1015,7 +1012,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/wssvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/midi_if.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/mii
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/mii/acphyreg.ph
@@ -1378,6 +1374,9 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/ehcivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/ezload.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/hid.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/if_atureg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/if_auereg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/if_axereg.ph
diff --git a/distrib/sets/lists/base/md.palm b/distrib/sets/lists/base/md.palm
index fdad5623c8b..2104498f5bc 100644
--- a/distrib/sets/lists/base/md.palm
+++ b/distrib/sets/lists/base/md.palm
@@ -1026,9 +1026,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/ns16550reg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/oosiopreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/oosiopvar.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/opl3sa3reg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/oplreg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/oplvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/osiopreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/osiopvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/p9000.ph
@@ -1149,7 +1146,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/isa/wssvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/midi_if.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/mii
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/mii/acphyreg.ph
@@ -1516,6 +1512,9 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/ehcivar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/ezload.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/hid.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/if_atureg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/if_auereg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/if_axereg.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 5c97cfd0cdc..39d13667444 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -1005,9 +1005,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/ns16550reg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/oosiopreg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/oosiopvar.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/opl3sa3reg.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/oplreg.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/oplvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/osiopreg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/osiopvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/p9000.ph
@@ -1128,7 +1125,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/isa/wssvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/midi_if.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/mii
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/mii/acphyreg.ph
@@ -1495,6 +1491,9 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/ehcivar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/ezload.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/hid.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/if_atureg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/if_auereg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/if_axereg.ph
diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc
index 59ffd0ff74f..a2d854063d1 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -999,9 +999,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/ns16550reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/oosiopreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/oosiopvar.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/opl3sa3reg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/oplreg.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/oplvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/osiopreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/osiopvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/p9000.ph
@@ -1122,7 +1119,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/wssvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/midi_if.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/mii
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/mii/acphyreg.ph
@@ -1489,6 +1485,9 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/ehcivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/ezload.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/hid.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/if_atureg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/if_auereg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/if_axereg.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 2cd808e84a3..2717cc79d95 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -377,9 +377,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/ns16550reg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/oosiopreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/oosiopvar.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/opl3sa3reg.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/oplreg.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/oplvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/osiopreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/osiopvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/p9000.ph
@@ -500,7 +497,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/isa/wssvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/midi_if.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/mii
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/mii/acphyreg.ph
@@ -867,6 +863,9 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/ehcivar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/ezload.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/hid.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/if_atureg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/if_auereg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/if_axereg.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 19715dae4a7..82af84d651a 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -432,9 +432,6 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/ns16550reg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/oosiopreg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/oosiopvar.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/opl3sa3reg.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/oplreg.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/oplvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/osiopreg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/osiopvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/p9000.ph
@@ -555,7 +552,6 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/isa/wssvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/midi_if.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/mii
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/mii/acphyreg.ph
@@ -922,6 +918,9 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/ehcivar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/ezload.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/hid.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/if_atureg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/if_auereg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/if_axereg.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 83d34be88e5..11889ecca4f 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -312,9 +312,6 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/ns16550reg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/oosiopreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/oosiopvar.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/opl3sa3reg.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/oplreg.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/oplvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/osiopreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/osiopvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/p9000.ph
@@ -435,7 +432,6 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/isa/wssvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/midi_if.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/mii
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/mii/acphyreg.ph
@@ -802,6 +798,9 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/ehcivar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/ezload.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/hid.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/if_atureg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/if_auereg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/if_axereg.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index c6477466258..b18766a83b6 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -1027,9 +1027,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/ns16550reg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/oosiopreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/oosiopvar.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/opl3sa3reg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/oplreg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/oplvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/osiopreg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/osiopvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/p9000.ph
@@ -1150,7 +1147,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/isa/wssvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/isa/ymvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/midi_if.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/dev/midisynvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/midivar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/mii
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/mii/acphyreg.ph
@@ -1517,6 +1513,9 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/ehcivar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/ezload.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/hid.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/if_atureg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/if_auereg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/if_axereg.ph
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 3998194c4c0..53a4d28d166 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -327,9 +327,6 @@
 ./usr/include/dev/ic/ns16550reg.h
 ./usr/include/dev/ic/oosiopreg.h
 ./usr/include/dev/ic/oosiopvar.h
-./usr/include/dev/ic/opl3sa3reg.h
-./usr/include/dev/ic/oplreg.h
-./usr/include/dev/ic/oplvar.h
 ./usr/include/dev/ic/osiopreg.h
 ./usr/include/dev/ic/osiopvar.h
 ./usr/include/dev/ic/p9000.h
@@ -450,7 +447,6 @@
 ./usr/include/dev/isa/wssvar.h
 ./usr/include/dev/isa/ymvar.h
 ./usr/include/dev/midi_if.h
-./usr/include/dev/midisynvar.h
 ./usr/include/dev/midivar.h
 ./usr/include/dev/mii
 ./usr/include/dev/mii/acphyreg.h
@@ -817,6 +813,9 @@
 ./usr/include/dev/usb/ehcivar.h
 ./usr/include/dev/usb/ezload.h
 ./usr/include/dev/usb/hid.h
+./usr/include/dev/usb/hidkbdsc.h
+./usr/include/dev/usb/hidkbdvar.h
+./usr/include/dev/usb/hidmsvar.h
 ./usr/include/dev/usb/if_atureg.h
 ./usr/include/dev/usb/if_auereg.h
 ./usr/include/dev/usb/if_axereg.h
@@ -6563,6 +6562,9 @@
 ./usr/share/man/cat9/resettodr.0
 ./usr/share/man/cat9/rssadapt.0
 ./usr/share/man/cat9/runtime.0
+./usr/share/man/cat9/rw_assert_rdlock.0
+./usr/share/man/cat9/rw_assert_unlocked.0
+./usr/share/man/cat9/rw_assert_wrlock.0
 ./usr/share/man/cat9/rw_enter.0
 ./usr/share/man/cat9/rw_enter_read.0
 ./usr/share/man/cat9/rw_enter_write.0
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 8633caa7c8f..025aaa40f46 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1970,7 +1970,6 @@
 ./usr/share/man/cat4/ohci.0
 ./usr/share/man/cat4/onewire.0
 ./usr/share/man/cat4/oosiop.0
-./usr/share/man/cat4/opl.0
 ./usr/share/man/cat4/options.0
 ./usr/share/man/cat4/osiop.0
 ./usr/share/man/cat4/otus.0