sync

27 files changed, 68 insertions, 22 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index de16ee9de77..06d60a11a0d 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -68,6 +68,7 @@
 ./usr/lib/libstdc++.so.30.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
+./usr/lib/libusbhid.so.0.0
 ./usr/lib/libutil.so.7.1
 ./usr/lib/libwrap.so.2.0
 ./usr/lib/libz.so.1.4
@@ -872,6 +873,9 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/i82365_pcivar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/if_bgereg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/if_devar.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/if_em.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/if_em_hw.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/if_em_osdep.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/if_gxreg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/if_gxvar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/pci/if_levar.ph
@@ -1952,4 +1956,3 @@
 ./usr/mdec/setnetbootinfo
 ./usr/sbin/wsconscfg
 ./usr/sbin/wsfontload
-./usr/lib/libusbhid.so.0.0
diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index a0f017ed46f..5bac5e1d4b1 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -63,6 +63,7 @@
 ./usr/lib/libstdc++.so.30.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
+./usr/lib/libusbhid.so.0.0
 ./usr/lib/libutil.so.7.1
 ./usr/lib/libwrap.so.2.0
 ./usr/lib/libz.so.1.4
@@ -849,6 +850,9 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/i82365_pcivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_bgereg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_devar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_em.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_em_hw.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_em_osdep.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_gxreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_gxvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_levar.ph
@@ -1969,4 +1973,3 @@
 ./usr/share/keymaps/amiga/fr.map
 ./usr/share/keymaps/amiga/sw.map
 ./usr/share/keymaps/amiga/us.map
-./usr/lib/libusbhid.so.0.0
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index e4529ca2a17..af6ce24e767 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -62,6 +62,7 @@
 ./usr/lib/libstdc++.so.30.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
+./usr/lib/libusbhid.so.0.0
 ./usr/lib/libutil.so.7.1
 ./usr/lib/libwrap.so.2.0
 ./usr/lib/libz.so.1.4
@@ -808,6 +809,9 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/i82365_pcivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_bgereg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_devar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_em.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_em_hw.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_em_osdep.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_gxreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_gxvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_levar.ph
@@ -1967,4 +1971,3 @@
 ./usr/mdec/uboot.lif
 ./usr/sbin/grfinfo
 ./usr/sbin/hilinfo
-./usr/lib/libusbhid.so.0.0
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 7811130f092..6905f84c0f4 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -726,6 +726,9 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/i82365_pcivar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_bgereg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_devar.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_em.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_em_hw.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_em_osdep.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_gxreg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_gxvar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/pci/if_levar.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 6b37b0bcd42..add3bb018d5 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -69,6 +69,7 @@
 ./usr/lib/libstdc++.so.30.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
+./usr/lib/libusbhid.so.0.0
 ./usr/lib/libutil.so.7.1
 ./usr/lib/libwrap.so.2.0
 ./usr/lib/libz.so.1.4
@@ -815,6 +816,9 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/i82365_pcivar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_bgereg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_devar.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_em.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_em_hw.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_em_osdep.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_gxreg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_gxvar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/pci/if_levar.ph
@@ -1979,4 +1983,3 @@
 ./usr/share/misc/pcvtfonts/vt220l.810
 ./usr/share/misc/pcvtfonts/vt220l.814
 ./usr/share/misc/pcvtfonts/vt220l.816
-./usr/lib/libusbhid.so.0.0
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index e17df3ba2a8..15c73bc2799 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -63,6 +63,7 @@
 ./usr/lib/libstdc++.so.30.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
+./usr/lib/libusbhid.so.0.0
 ./usr/lib/libutil.so.7.1
 ./usr/lib/libwrap.so.2.0
 ./usr/lib/libz.so.1.4
@@ -809,6 +810,9 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/i82365_pcivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_bgereg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_devar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_em.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_em_hw.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_em_osdep.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_gxreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_gxvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_levar.ph
@@ -1964,4 +1968,3 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/zlib.ph
 ./usr/libexec/ld.so
 ./usr/local/libdata/perl5/site_perl/m68k-openbsd
-./usr/lib/libusbhid.so.0.0
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 55571733e30..6674501948b 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -71,6 +71,7 @@
 ./usr/lib/libstdc++.so.30.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
+./usr/lib/libusbhid.so.0.0
 ./usr/lib/libutil.so.7.1
 ./usr/lib/libwrap.so.2.0
 ./usr/lib/libz.so.1.4
@@ -817,6 +818,9 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/i82365_pcivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_bgereg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_devar.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_em.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_em_hw.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_em_osdep.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_gxreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_gxvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_levar.ph
@@ -1994,4 +1998,3 @@
 ./usr/sbin/apmd
 ./usr/sbin/wsconscfg
 ./usr/sbin/zzz
-./usr/lib/libusbhid.so.0.0
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 3cc8c6a95ea..20bb6ed28ba 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -62,6 +62,7 @@
 ./usr/lib/libstdc++.so.30.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
+./usr/lib/libusbhid.so.0.0
 ./usr/lib/libutil.so.7.1
 ./usr/lib/libwrap.so.2.0
 ./usr/lib/libz.so.1.4
@@ -808,6 +809,9 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/i82365_pcivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_bgereg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_devar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_em.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_em_hw.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_em_osdep.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_gxreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_gxvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_levar.ph
@@ -1966,4 +1970,3 @@
 ./usr/mdec/rboot
 ./usr/mdec/sboot
 ./usr/mdec/stboot
-./usr/lib/libusbhid.so.0.0
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index b87b511d7df..0c1948141a4 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -472,6 +472,9 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/esavar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/fmsreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_bgereg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_em.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_em_hw.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_em_osdep.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_gxreg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_gxvar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/pci/if_lgereg.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 16d19ce1612..1bd56860acf 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -67,6 +67,7 @@
 ./usr/lib/libstdc++.so.30.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
+./usr/lib/libusbhid.so.0.0
 ./usr/lib/libutil.so.7.1
 ./usr/lib/libwrap.so.2.0
 ./usr/lib/libz.so.1.4
@@ -812,6 +813,9 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/i82365_pcivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_bgereg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_devar.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_em.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_em_hw.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_em_osdep.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_gxreg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_gxvar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/pci/if_levar.ph
@@ -1939,4 +1943,3 @@
 ./usr/mdec/installboot
 ./usr/mdec/mbr
 ./usr/sbin/wsconscfg
-./usr/lib/libusbhid.so.0.0
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 9a1c56f9787..17ff7d723fa 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -64,6 +64,7 @@
 ./usr/lib/libstdc++.so.30.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
+./usr/lib/libusbhid.so.0.0
 ./usr/lib/libutil.so.7.1
 ./usr/lib/libwrap.so.2.0
 ./usr/lib/libz.so.1.4
@@ -470,6 +471,9 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/i82365_pcivar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_bgereg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_devar.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_em.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_em_hw.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_em_osdep.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_gxreg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_gxvar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/pci/if_levar.ph
@@ -1944,4 +1948,3 @@
 ./usr/sbin/eeprom
 ./usr/sbin/fdformat
 ./usr/sbin/wsconscfg
-./usr/lib/libusbhid.so.0.0
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 94fa17e8164..03c0ec84d26 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -65,6 +65,7 @@
 ./usr/lib/libstdc++.so.30.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
+./usr/lib/libusbhid.so.0.0
 ./usr/lib/libutil.so.7.1
 ./usr/lib/libwrap.so.2.0
 ./usr/lib/libz.so.1.4
@@ -471,6 +472,9 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/i82365_pcivar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/if_bgereg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/if_devar.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/if_em.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/if_em_hw.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/if_em_osdep.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/if_gxreg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/if_gxvar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/pci/if_levar.ph
@@ -1946,4 +1950,3 @@
 ./usr/mdec/ofwboot.net
 ./usr/sbin/eeprom
 ./usr/sbin/wsconscfg
-./usr/lib/libusbhid.so.0.0
diff --git a/distrib/sets/lists/base/md.sun3 b/distrib/sets/lists/base/md.sun3
index b230ed7d013..490c5343db6 100644
--- a/distrib/sets/lists/base/md.sun3
+++ b/distrib/sets/lists/base/md.sun3
@@ -62,6 +62,7 @@
 ./usr/lib/libstdc++.so.30.0
 ./usr/lib/libtermcap.so.8.0
 ./usr/lib/libtermlib.so.8.0
+./usr/lib/libusbhid.so.0.0
 ./usr/lib/libutil.so.7.1
 ./usr/lib/libwrap.so.2.0
 ./usr/lib/libz.so.1.4
@@ -808,6 +809,9 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/i82365_pcivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_bgereg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_devar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_em.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_em_hw.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_em_osdep.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_gxreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_gxvar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/pci/if_levar.ph
@@ -1977,4 +1981,3 @@
 ./usr/mdec/ufsboot
 ./usr/sbin/eeprom
 ./usr/sbin/screenblank
-./usr/lib/libusbhid.so.0.0
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 52aba93d278..272dcdf826a 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -411,6 +411,9 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/i82365_pcivar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/if_bgereg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/if_devar.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/if_em.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/if_em_hw.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/if_em_osdep.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/if_gxreg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/if_gxvar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/pci/if_levar.ph
diff --git a/distrib/sets/lists/comp/md.alpha b/distrib/sets/lists/comp/md.alpha
index b024aea5ca4..5e14102bb59 100644
--- a/distrib/sets/lists/comp/md.alpha
+++ b/distrib/sets/lists/comp/md.alpha
@@ -160,6 +160,7 @@
 ./usr/lib/libtelnet_pic.a
 ./usr/lib/libtermcap_pic.a
 ./usr/lib/libtermlib_pic.a
+./usr/lib/libusbhid_pic.a
 ./usr/lib/libutil_pic.a
 ./usr/lib/libwrap_pic.a
 ./usr/lib/libz_pic.a
@@ -178,4 +179,3 @@
 ./usr/share/man/cat1/gdb.0
 ./usr/share/man/cat1/objcopy.0
 ./usr/share/man/cat1/objdump.0
-./usr/lib/libusbhid_pic.a
diff --git a/distrib/sets/lists/comp/md.amiga b/distrib/sets/lists/comp/md.amiga
index 9756e79c904..8a7c8eee1e4 100644
--- a/distrib/sets/lists/comp/md.amiga
+++ b/distrib/sets/lists/comp/md.amiga
@@ -144,6 +144,7 @@
 ./usr/lib/libtelnet_pic.a
 ./usr/lib/libtermcap_pic.a
 ./usr/lib/libtermlib_pic.a
+./usr/lib/libusbhid_pic.a
 ./usr/lib/libutil_pic.a
 ./usr/lib/libwrap_pic.a
 ./usr/lib/libz_pic.a
@@ -155,4 +156,3 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/hash.ph
 ./usr/share/man/cat1/gdb.0
 ./usr/share/man/cat1/objdump.0
-./usr/lib/libusbhid_pic.a
diff --git a/distrib/sets/lists/comp/md.hp300 b/distrib/sets/lists/comp/md.hp300
index 2e41548c9df..626de08414a 100644
--- a/distrib/sets/lists/comp/md.hp300
+++ b/distrib/sets/lists/comp/md.hp300
@@ -141,6 +141,7 @@
 ./usr/lib/libtelnet_pic.a
 ./usr/lib/libtermcap_pic.a
 ./usr/lib/libtermlib_pic.a
+./usr/lib/libusbhid_pic.a
 ./usr/lib/libutil_pic.a
 ./usr/lib/libwrap_pic.a
 ./usr/lib/libz_pic.a
@@ -152,4 +153,3 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/hash.ph
 ./usr/share/man/cat1/gdb.0
 ./usr/share/man/cat1/objdump.0
-./usr/lib/libusbhid_pic.a
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index 93ba77403ba..643c73a3c37 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -124,6 +124,7 @@
 ./usr/lib/libtelnet_pic.a
 ./usr/lib/libtermcap_pic.a
 ./usr/lib/libtermlib_pic.a
+./usr/lib/libusbhid_pic.a
 ./usr/lib/libutil_pic.a
 ./usr/lib/libwrap_pic.a
 ./usr/lib/libz_pic.a
@@ -135,4 +136,3 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/sys/hash.ph
 ./usr/share/man/cat1/gdb.0
 ./usr/share/man/cat1/objdump.0
-./usr/lib/libusbhid_pic.a
diff --git a/distrib/sets/lists/comp/md.mac68k b/distrib/sets/lists/comp/md.mac68k
index 1c046f82db8..5113a8a3d59 100644
--- a/distrib/sets/lists/comp/md.mac68k
+++ b/distrib/sets/lists/comp/md.mac68k
@@ -150,6 +150,7 @@
 ./usr/lib/libtelnet_pic.a
 ./usr/lib/libtermcap_pic.a
 ./usr/lib/libtermlib_pic.a
+./usr/lib/libusbhid_pic.a
 ./usr/lib/libutil_pic.a
 ./usr/lib/libwrap_pic.a
 ./usr/lib/libz_pic.a
@@ -161,4 +162,3 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/hash.ph
 ./usr/share/man/cat1/gdb.0
 ./usr/share/man/cat1/objdump.0
-./usr/lib/libusbhid_pic.a
diff --git a/distrib/sets/lists/comp/md.macppc b/distrib/sets/lists/comp/md.macppc
index 54d75054597..4cfc34e0b7d 100644
--- a/distrib/sets/lists/comp/md.macppc
+++ b/distrib/sets/lists/comp/md.macppc
@@ -167,6 +167,7 @@
 ./usr/lib/libtelnet_pic.a
 ./usr/lib/libtermcap_pic.a
 ./usr/lib/libtermlib_pic.a
+./usr/lib/libusbhid_pic.a
 ./usr/lib/libutil_pic.a
 ./usr/lib/libwrap_pic.a
 ./usr/lib/libz_pic.a
@@ -198,4 +199,3 @@
 ./usr/share/man/cat1/gdb.0
 ./usr/share/man/cat1/objcopy.0
 ./usr/share/man/cat1/objdump.0
-./usr/lib/libusbhid_pic.a
diff --git a/distrib/sets/lists/comp/md.mvme68k b/distrib/sets/lists/comp/md.mvme68k
index a6552c4d42c..e1a5b348cb5 100644
--- a/distrib/sets/lists/comp/md.mvme68k
+++ b/distrib/sets/lists/comp/md.mvme68k
@@ -145,6 +145,7 @@
 ./usr/lib/libtelnet_pic.a
 ./usr/lib/libtermcap_pic.a
 ./usr/lib/libtermlib_pic.a
+./usr/lib/libusbhid_pic.a
 ./usr/lib/libutil_pic.a
 ./usr/lib/libwrap_pic.a
 ./usr/lib/libz_pic.a
@@ -156,4 +157,3 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/hash.ph
 ./usr/share/man/cat1/gdb.0
 ./usr/share/man/cat1/objdump.0
-./usr/lib/libusbhid_pic.a
diff --git a/distrib/sets/lists/comp/md.mvmeppc b/distrib/sets/lists/comp/md.mvmeppc
index 3ff9ffcab45..b4ee461e9c4 100644
--- a/distrib/sets/lists/comp/md.mvmeppc
+++ b/distrib/sets/lists/comp/md.mvmeppc
@@ -117,6 +117,7 @@
 ./usr/lib/libtelnet_pic.a
 ./usr/lib/libtermcap_pic.a
 ./usr/lib/libtermlib_pic.a
+./usr/lib/libusbhid_pic.a
 ./usr/lib/libutil_pic.a
 ./usr/lib/libwrap_pic.a
 ./usr/lib/libz_pic.a
@@ -148,4 +149,3 @@
 ./usr/share/man/cat1/gdb.0
 ./usr/share/man/cat1/objcopy.0
 ./usr/share/man/cat1/objdump.0
-./usr/lib/libusbhid_pic.a
diff --git a/distrib/sets/lists/comp/md.sparc b/distrib/sets/lists/comp/md.sparc
index 8a26c147b4a..6bd7ba14134 100644
--- a/distrib/sets/lists/comp/md.sparc
+++ b/distrib/sets/lists/comp/md.sparc
@@ -130,6 +130,7 @@
 ./usr/lib/libtelnet_pic.a
 ./usr/lib/libtermcap_pic.a
 ./usr/lib/libtermlib_pic.a
+./usr/lib/libusbhid_pic.a
 ./usr/lib/libutil_pic.a
 ./usr/lib/libwrap_pic.a
 ./usr/lib/libz_pic.a
@@ -148,4 +149,3 @@
 ./usr/share/man/cat1/gdb.0
 ./usr/share/man/cat1/objcopy.0
 ./usr/share/man/cat1/objdump.0
-./usr/lib/libusbhid_pic.a
diff --git a/distrib/sets/lists/comp/md.sparc64 b/distrib/sets/lists/comp/md.sparc64
index bbe4f090c04..a221860a39e 100644
--- a/distrib/sets/lists/comp/md.sparc64
+++ b/distrib/sets/lists/comp/md.sparc64
@@ -128,6 +128,7 @@
 ./usr/lib/libtelnet_pic.a
 ./usr/lib/libtermcap_pic.a
 ./usr/lib/libtermlib_pic.a
+./usr/lib/libusbhid_pic.a
 ./usr/lib/libutil_pic.a
 ./usr/lib/libwrap_pic.a
 ./usr/lib/libz_pic.a
@@ -146,4 +147,3 @@
 ./usr/share/man/cat1/gdb.0
 ./usr/share/man/cat1/objcopy.0
 ./usr/share/man/cat1/objdump.0
-./usr/lib/libusbhid_pic.a
diff --git a/distrib/sets/lists/comp/md.sun3 b/distrib/sets/lists/comp/md.sun3
index 84a24958002..f4f7cdd6894 100644
--- a/distrib/sets/lists/comp/md.sun3
+++ b/distrib/sets/lists/comp/md.sun3
@@ -157,6 +157,7 @@
 ./usr/lib/libtelnet_pic.a
 ./usr/lib/libtermcap_pic.a
 ./usr/lib/libtermlib_pic.a
+./usr/lib/libusbhid_pic.a
 ./usr/lib/libutil_pic.a
 ./usr/lib/libwrap_pic.a
 ./usr/lib/libz_pic.a
@@ -168,4 +169,3 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/hash.ph
 ./usr/share/man/cat1/gdb.0
 ./usr/share/man/cat1/objdump.0
-./usr/lib/libusbhid_pic.a
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 952e94457f7..7d6744bed68 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -423,6 +423,9 @@
 ./usr/include/dev/pci/i82365_pcivar.h
 ./usr/include/dev/pci/if_bgereg.h
 ./usr/include/dev/pci/if_devar.h
+./usr/include/dev/pci/if_em.h
+./usr/include/dev/pci/if_em_hw.h
+./usr/include/dev/pci/if_em_osdep.h
 ./usr/include/dev/pci/if_gxreg.h
 ./usr/include/dev/pci/if_gxvar.h
 ./usr/include/dev/pci/if_levar.h
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index dc79361918c..69f0f101fc7 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -972,6 +972,7 @@
 ./usr/share/man/cat4/eg.0
 ./usr/share/man/cat4/eisa.0
 ./usr/share/man/cat4/el.0
+./usr/share/man/cat4/em.0
 ./usr/share/man/cat4/emu.0
 ./usr/share/man/cat4/enc.0
 ./usr/share/man/cat4/ep.0