sync

12 files changed, 23 insertions, 22 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 8b82e138c52..58ef3b17586 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -1019,7 +1019,7 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/uhcivar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/ukbdvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/urio.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/usbhid.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/usb.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/usb_mem.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/usb_port.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/usb_quirks.ph
@@ -1029,7 +1029,7 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/usb.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/vndioctl.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/wscons
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/wscons/ascii.ph
diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index 7b79cf64de9..051731cd449 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -1021,7 +1021,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/uhcivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/ukbdvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/urio.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbhid.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb_mem.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb_port.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb_quirks.ph
@@ -1031,7 +1031,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/vndioctl.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons/ascii.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 7e66698abc1..e442a94c829 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -982,7 +982,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/uhcivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/ukbdvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/urio.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbhid.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb_mem.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb_port.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb_quirks.ph
@@ -992,7 +992,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/vndioctl.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons/ascii.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index bc671a0bd36..7af39dc9fb9 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -986,7 +986,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/uhcivar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/ukbdvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/urio.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/usbhid.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/usb.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/usb_mem.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/usb_port.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/usb_quirks.ph
@@ -996,7 +996,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/usb.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/vndioctl.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/wscons
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/wscons/ascii.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index ae53d57e5ba..278fb2b6bc9 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -977,7 +977,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/uhcivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/ukbdvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/urio.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbhid.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb_mem.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb_port.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb_quirks.ph
@@ -987,7 +987,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/vndioctl.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons/ascii.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 46d20591434..f38f7ee2987 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -970,7 +970,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/uhcivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/ukbdvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/urio.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbhid.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usb.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usb_mem.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usb_port.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usb_quirks.ph
@@ -980,7 +980,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usb.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/vndioctl.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/wscons
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/wscons/ascii.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 5f17212e7e0..3cbf8f633aa 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -981,7 +981,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/uhcivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/ukbdvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/urio.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbhid.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb_mem.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb_port.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb_quirks.ph
@@ -991,7 +991,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/vndioctl.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/wscons/ascii.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 0d18cc4ca6c..563c2c91c8b 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -963,7 +963,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/uhcivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/ukbdvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/urio.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbhid.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usb.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usb_mem.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usb_port.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usb_quirks.ph
@@ -973,7 +973,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usb.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/vndioctl.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/wscons
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/wscons/ascii.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 08922f0911d..fa60a78b7c4 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -641,7 +641,7 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/uhcivar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/ukbdvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/urio.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/usbhid.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/usb.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/usb_mem.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/usb_port.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/usb_quirks.ph
@@ -651,7 +651,7 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/usb.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/vndioctl.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/wscons
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/wscons/ascii.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 0da50ad7f60..850cc0943ff 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -619,7 +619,7 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/uhcivar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/ukbdvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/urio.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/usbhid.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/usb.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/usb_mem.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/usb_port.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/usb_quirks.ph
@@ -629,7 +629,7 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/usb.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/vndioctl.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/wscons
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/wscons/ascii.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 00d00ecb291..4707d7dd716 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -583,7 +583,7 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/uhcivar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/ukbdvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/urio.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/usbhid.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/usb.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/usb_mem.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/usb_port.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/usb_quirks.ph
@@ -593,7 +593,7 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/usbdi.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/usbdi_util.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/usbdivar.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/usb.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/usbhid.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/vndioctl.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/wscons
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/wscons/ascii.ph
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 8cd15c30fad..a908b85e6fa 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -1762,6 +1762,7 @@
 ./usr/share/mk/bsd.port.mk
 ./usr/share/mk/bsd.port.subdir.mk
 ./usr/share/mk/bsd.prog.mk
+./usr/share/mk/bsd.regress.mk
 ./usr/share/mk/bsd.subdir.mk
 ./usr/share/mk/bsd.sys.mk
 ./usr/share/mk/sys.mk