sync

16 files changed, 18 insertions, 0 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 32a5b4baac3..eb25ce0a09c 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -852,6 +852,7 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/ucomvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/uhcireg.ph
 ./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/usb.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/usb/usb_mem.ph
diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index 0a31e61fe45..a9b5eb591b1 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -887,6 +887,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/ucomvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/uhcireg.ph
 ./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/usb.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb_mem.ph
diff --git a/distrib/sets/lists/base/md.arc b/distrib/sets/lists/base/md.arc
index 9a714915c95..bcc8f925fe0 100644
--- a/distrib/sets/lists/base/md.arc
+++ b/distrib/sets/lists/base/md.arc
@@ -448,6 +448,7 @@
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/pci/pciide_opti_reg.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/pci/tgareg.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/pci/tgavar.ph
+./usr/libdata/perl5/site_perl/mips-openbsd/dev/usb/ukbdvar.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/usb/urio.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/g2c.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/ifaddrs.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 96f345454a9..bdb940f0431 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -847,6 +847,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/ucomvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/uhcireg.ph
 ./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/usb.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb_mem.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index f978c2c7de9..208476b876b 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -851,6 +851,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/ucomvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/uhcireg.ph
 ./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/usb.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/usb_mem.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 762fc7985d1..948c8f70dc3 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -843,6 +843,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/ucomvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/uhcireg.ph
 ./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/usb.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb_mem.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index e067f371255..ff1de969382 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -847,6 +847,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/ucomvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/uhcireg.ph
 ./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/usb.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb_mem.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 96397affa4d..e6fcf653855 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -391,6 +391,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/pciide_opti_reg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/tgareg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/tgavar.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/usb/ukbdvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/g2c.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/ifaddrs.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/keynote.ph
diff --git a/distrib/sets/lists/base/md.pmax b/distrib/sets/lists/base/md.pmax
index 06ad0b60b20..1481527b39c 100644
--- a/distrib/sets/lists/base/md.pmax
+++ b/distrib/sets/lists/base/md.pmax
@@ -828,6 +828,7 @@
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/usb/ucomvar.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/usb/uhcireg.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/usb/uhcivar.ph
+./usr/libdata/perl5/site_perl/mips-openbsd/dev/usb/ukbdvar.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/usb/urio.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/usb/usb.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/dev/usb/usb_mem.ph
diff --git a/distrib/sets/lists/base/md.powerpc b/distrib/sets/lists/base/md.powerpc
index 23173ead888..11913851a1e 100644
--- a/distrib/sets/lists/base/md.powerpc
+++ b/distrib/sets/lists/base/md.powerpc
@@ -796,6 +796,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/ucomvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/uhcireg.ph
 ./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/usb.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/usb/usb_mem.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 7a2f3a24eda..434897de214 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -514,6 +514,7 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/ucomvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/uhcireg.ph
 ./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/usb.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/usb/usb_mem.ph
diff --git a/distrib/sets/lists/base/md.sun3 b/distrib/sets/lists/base/md.sun3
index 1bf05a96c4a..6363313497d 100644
--- a/distrib/sets/lists/base/md.sun3
+++ b/distrib/sets/lists/base/md.sun3
@@ -847,6 +847,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/ucomvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/uhcireg.ph
 ./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/usb.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/usb/usb_mem.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 3f4dc1815cb..53a3bcd8861 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -29,6 +29,7 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/pciide_opti_reg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/tgareg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/tgavar.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/usb/ukbdvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/login_cap.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/tcfs
 ./usr/libdata/perl5/site_perl/vax-openbsd/miscfs/tcfs/tcfs.ph
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 5e363a01cf1..ff9dffb2e34 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -2071,8 +2071,10 @@
 ./usr/share/zoneinfo/America/Mazatlan
 ./usr/share/zoneinfo/America/Mendoza
 ./usr/share/zoneinfo/America/Menominee
+./usr/share/zoneinfo/America/Merida
 ./usr/share/zoneinfo/America/Mexico_City
 ./usr/share/zoneinfo/America/Miquelon
+./usr/share/zoneinfo/America/Monterrey
 ./usr/share/zoneinfo/America/Montevideo
 ./usr/share/zoneinfo/America/Montreal
 ./usr/share/zoneinfo/America/Montserrat
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 32b8140ba0f..22a44c4da59 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -468,6 +468,7 @@
 ./usr/include/dev/usb/ucomvar.h
 ./usr/include/dev/usb/uhcireg.h
 ./usr/include/dev/usb/uhcivar.h
+./usr/include/dev/usb/ukbdvar.h
 ./usr/include/dev/usb/urio.h
 ./usr/include/dev/usb/usb.h
 ./usr/include/dev/usb/usb_mem.h
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 94b6692c3df..9627be2930e 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1600,6 +1600,8 @@
 ./usr/share/man/cat8/portmap.0
 ./usr/share/man/cat8/powerpc
 ./usr/share/man/cat8/powerpc/fdisk.0
+./usr/share/man/cat8/powerpc/wsconscfg.0
+./usr/share/man/cat8/powerpc/wsconsctl.0
 ./usr/share/man/cat8/ppp.0
 ./usr/share/man/cat8/pppctl.0
 ./usr/share/man/cat8/pppd.0