sync

19 files changed, 95 insertions, 76 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index ad1649e3a49..3875db557d5 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -656,6 +656,11 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/flashvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/gpio
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/gpio/gpiovar.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/hid
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/hid/hid.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/hid/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/hid/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/hid/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/hil/hildevs_data.ph
@@ -1238,10 +1243,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/dwc2/dwc2var.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/ehcireg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/ehcivar.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_athn_usb.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
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index ffff86f519a..c0710be56f4 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -686,6 +686,11 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/flashvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/gpio
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/gpio/gpiovar.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/hid
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/hid/hid.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/hid/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/hid/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/hid/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/hil/hildevs_data.ph
@@ -1268,10 +1273,6 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/usb/dwc2/dwc2var.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/usb/ehcireg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/usb/ehcivar.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_athn_usb.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
diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish
index a827e5cddd9..820408e03ba 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -670,6 +670,11 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/flashvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/gpio
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/gpio/gpiovar.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/hid
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/hid/hid.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/hid/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/hid/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/hid/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/hil/hildevs_data.ph
@@ -1252,10 +1257,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/dwc2/dwc2var.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/ehcireg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/ehcivar.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_athn_usb.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
diff --git a/distrib/sets/lists/base/md.armv7 b/distrib/sets/lists/base/md.armv7
index b5a693a9292..c7c6b76b925 100644
--- a/distrib/sets/lists/base/md.armv7
+++ b/distrib/sets/lists/base/md.armv7
@@ -668,6 +668,11 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/flashvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/gpio
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/gpio/gpiovar.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/hid
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/hid/hid.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/hid/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/hid/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/hid/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/hil/hildevs_data.ph
@@ -1250,10 +1255,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/dwc2/dwc2var.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/ehcireg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/ehcivar.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_athn_usb.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
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 241dabf6622..8ec37bc478c 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -604,6 +604,11 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/flashvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/gpio
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/gpio/gpiovar.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/hid
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/hid/hid.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/hid/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/hid/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/hid/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/hil/hildevs_data.ph
@@ -1186,10 +1191,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/usb/dwc2/dwc2var.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/usb/ehcireg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/usb/ehcivar.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_athn_usb.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
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index 4a3e5370fbf..874432c1ab5 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -604,6 +604,11 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/flashvar.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/gpio
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/gpio/gpiovar.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/hid
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/hid/hid.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/hid/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/hid/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/hid/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/hil/hildevs_data.ph
@@ -1186,10 +1191,6 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/usb/dwc2/dwc2var.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/usb/ehcireg.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/usb/ehcivar.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_athn_usb.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
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index de71d9bfc07..05c3edadd5c 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -611,6 +611,11 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/flashvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/gpio
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/gpio/gpiovar.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/hid
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/hid/hid.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/hid/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/hid/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/hid/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/hil/hildevs_data.ph
@@ -1193,10 +1198,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/dwc2/dwc2var.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/ehcireg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/ehcivar.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_athn_usb.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
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index 86540f5929d..4b491987061 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -570,6 +570,11 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/flashvar.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/gpio
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/gpio/gpiovar.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/dev/hid
+./usr/libdata/perl5/site_perl/sh-openbsd/dev/hid/hid.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/dev/hid/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/dev/hid/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/dev/hid/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/hil/hildevs_data.ph
@@ -1152,10 +1157,6 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/usb/dwc2/dwc2var.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/usb/ehcireg.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/usb/ehcivar.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_athn_usb.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
diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson
index 459da7af494..55209e815b0 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -575,6 +575,11 @@
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/flashvar.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/gpio
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/gpio/gpiovar.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/hid
+./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/hid/hid.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/hid/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/hid/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/hid/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/hil/hildevs_data.ph
@@ -1157,10 +1162,6 @@
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/usb/dwc2/dwc2var.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/usb/ehcireg.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/usb/ehcivar.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_athn_usb.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
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 673fbc5b4b8..ed7b7c376a4 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -542,6 +542,11 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/flashvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/gpio
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/gpio/gpiovar.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/hid
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/hid/hid.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/hid/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/hid/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/hid/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/hil/hildevs_data.ph
@@ -1124,10 +1129,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/dwc2/dwc2var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/ehcireg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/ehcivar.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_athn_usb.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
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 693dbb59b26..092cfd85e9f 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -606,6 +606,11 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/flashvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/gpio
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/gpio/gpiovar.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/hid
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/hid/hid.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/hid/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/hid/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/hid/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/hil/hildevs_data.ph
@@ -1188,10 +1193,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/dwc2/dwc2var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/ehcireg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/ehcivar.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_athn_usb.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
diff --git a/distrib/sets/lists/base/md.octeon b/distrib/sets/lists/base/md.octeon
index 9148f91a72b..60418c55035 100644
--- a/distrib/sets/lists/base/md.octeon
+++ b/distrib/sets/lists/base/md.octeon
@@ -540,6 +540,11 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/flashvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/gpio
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/gpio/gpiovar.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/hid
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/hid/hid.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/hid/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/hid/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/hid/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/hil/hildevs_data.ph
@@ -1122,10 +1127,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/dwc2/dwc2var.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/ehcireg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/ehcivar.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_athn_usb.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
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 557e78061d3..d11c9aad02c 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -604,6 +604,11 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/flashvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/gpio
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/gpio/gpiovar.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/hid
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/hid/hid.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/hid/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/hid/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/hid/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/hil/hildevs_data.ph
@@ -1186,10 +1191,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/dwc2/dwc2var.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/ehcireg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/usb/ehcivar.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_athn_usb.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
diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc
index 416e3240bd1..085d4fdb028 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -599,6 +599,11 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/flashvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/gpio
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/gpio/gpiovar.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/hid
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/hid/hid.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/hid/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/hid/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/hid/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/hil/hildevs_data.ph
@@ -1181,10 +1186,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/dwc2/dwc2var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/ehcireg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/ehcivar.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_athn_usb.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
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 9113af0e677..44ef796ec97 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -147,6 +147,11 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/flashvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/gpio
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/gpio/gpiovar.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/hid
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/hid/hid.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/hid/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/hid/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/hid/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/hil/hildevs_data.ph
@@ -729,10 +734,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/dwc2/dwc2var.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/ehcireg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/ehcivar.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_athn_usb.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
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 7a5e7c17496..13fee1e6cb0 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -205,6 +205,11 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/flashvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/gpio
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/gpio/gpiovar.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/hid
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/hid/hid.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/hid/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/hid/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/hid/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/hil/hildevs_data.ph
@@ -787,10 +792,6 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/dwc2/dwc2var.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/ehcireg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/ehcivar.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_athn_usb.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
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 6d0f07c12d2..20dcde1e59f 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -104,6 +104,11 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/flashvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/gpio
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/gpio/gpiovar.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/hid
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/hid/hid.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/hid/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/hid/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/hid/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/hil/hildevs_data.ph
@@ -686,10 +691,6 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/dwc2/dwc2var.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/ehcireg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/ehcivar.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_athn_usb.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
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index b39f2016217..c1ae847999a 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -624,6 +624,11 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/flashvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/gpio
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/gpio/gpiovar.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/hid
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/hid/hid.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/hid/hidkbdsc.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/hid/hidkbdvar.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/hid/hidmsvar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/hil
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/hil/hildevs.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/hil/hildevs_data.ph
@@ -1206,10 +1211,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/dwc2/dwc2var.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/ehcireg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/usb/ehcivar.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_athn_usb.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
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index c1a1215f39c..6c78b568a09 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -122,6 +122,11 @@
 ./usr/include/dev/flashvar.h
 ./usr/include/dev/gpio
 ./usr/include/dev/gpio/gpiovar.h
+./usr/include/dev/hid
+./usr/include/dev/hid/hid.h
+./usr/include/dev/hid/hidkbdsc.h
+./usr/include/dev/hid/hidkbdvar.h
+./usr/include/dev/hid/hidmsvar.h
 ./usr/include/dev/hil
 ./usr/include/dev/hil/hildevs.h
 ./usr/include/dev/hil/hildevs_data.h
@@ -704,10 +709,6 @@
 ./usr/include/dev/usb/dwc2/dwc2var.h
 ./usr/include/dev/usb/ehcireg.h
 ./usr/include/dev/usb/ehcivar.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_athn_usb.h
 ./usr/include/dev/usb/if_atureg.h
 ./usr/include/dev/usb/if_auereg.h