sync

29 files changed, 61 insertions, 19 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 38e6724a8e1..84cd9041c27 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -1,6 +1,7 @@
 ./sbin/ancontrol
 ./sbin/fdisk
 ./sbin/iopctl
+./sbin/kbd
 ./sbin/ldconfig
 ./sbin/wicontrol
 ./sbin/wsconsctl
@@ -58,7 +59,7 @@
 ./usr/lib/libmenu.so.1.1
 ./usr/lib/libobjc.so.0.0
 ./usr/lib/libocurses.so.3.0
-./usr/lib/libossaudio.so.0.0
+./usr/lib/libossaudio.so.1.0
 ./usr/lib/libotermcap.so.3.0
 ./usr/lib/libpanel.so.1.2
 ./usr/lib/libpcap.so.1.2
@@ -441,6 +442,7 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/alpha/frame.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/alpha/ieee.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/alpha/ieeefp.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/alpha/internal_types.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/alpha/intr.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/alpha/intrcnt.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/alpha/ioctl_fd.ph
@@ -1721,6 +1723,7 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/sys/kgdb.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/sys/kthread.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/sys/ktrace.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/sys/limits.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/sys/lkm.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/sys/localedef.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/sys/lock.ph
@@ -1899,4 +1902,3 @@
 ./usr/mdec/setnetbootinfo
 ./usr/sbin/wsconscfg
 ./usr/sbin/wsfontload
-./sbin/kbd
diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index aea54caab8c..757e6513789 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -55,7 +55,7 @@
 ./usr/lib/libmenu.so.1.1
 ./usr/lib/libobjc.so.0.0
 ./usr/lib/libocurses.so.3.0
-./usr/lib/libossaudio.so.0.0
+./usr/lib/libossaudio.so.1.0
 ./usr/lib/libotermcap.so.3.0
 ./usr/lib/libpanel.so.1.2
 ./usr/lib/libpcap.so.1.2
@@ -1280,6 +1280,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/frame.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/ieee.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/ieeefp.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/internal_types.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/kcore.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/limits.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/param.ph
@@ -1738,6 +1739,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/kgdb.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/kthread.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/ktrace.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/sys/limits.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/lkm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/localedef.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/lock.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 2b6fe7d385d..662af08774b 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -54,7 +54,7 @@
 ./usr/lib/libmenu.so.1.1
 ./usr/lib/libobjc.so.0.0
 ./usr/lib/libocurses.so.3.0
-./usr/lib/libossaudio.so.0.0
+./usr/lib/libossaudio.so.1.0
 ./usr/lib/libotermcap.so.3.0
 ./usr/lib/libpanel.so.1.2
 ./usr/lib/libpcap.so.1.2
@@ -1276,6 +1276,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/frame.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/ieee.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/ieeefp.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/internal_types.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/kcore.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/limits.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/param.ph
@@ -1734,6 +1735,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/kgdb.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/kthread.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/ktrace.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/sys/limits.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/lkm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/localedef.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/lock.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 8ebd5642a7c..a88a29943a3 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -1,4 +1,5 @@
 ./sbin/iopctl
+./sbin/kbd
 ./sbin/wsconsctl
 ./usr/bin/c++filt
 ./usr/include/hppa
@@ -1111,6 +1112,7 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/hppa/hppa_cpu.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/hppa/ieee.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/hppa/ieeefp.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/hppa/internal_types.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/hppa/intr.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/hppa/intrcnt.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/hppa/ioctl_fd.ph
@@ -1635,6 +1637,7 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/sys/kgdb.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/sys/kthread.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/sys/ktrace.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/sys/limits.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/sys/lkm.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/sys/localedef.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/sys/lock.ph
@@ -1814,4 +1817,3 @@
 ./usr/mdec/setnetbootinfo
 ./usr/sbin/wsconscfg
 ./usr/sbin/wsfontload
-./sbin/kbd
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index dfd7613302c..2a730681889 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -1,6 +1,7 @@
 ./sbin/ancontrol
 ./sbin/fdisk
 ./sbin/iopctl
+./sbin/kbd
 ./sbin/ldconfig
 ./sbin/wicontrol
 ./sbin/wsconsctl
@@ -58,7 +59,7 @@
 ./usr/lib/libmenu.so.1.1
 ./usr/lib/libobjc.so.0.0
 ./usr/lib/libocurses.so.3.0
-./usr/lib/libossaudio.so.0.0
+./usr/lib/libossaudio.so.1.0
 ./usr/lib/libotermcap.so.3.0
 ./usr/lib/libpanel.so.1.2
 ./usr/lib/libpcap.so.1.2
@@ -1193,6 +1194,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/gdt.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/ieee.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/ieeefp.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/i386/internal_types.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/intr.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/ioctl_fd.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/joystick.ph
@@ -1723,6 +1725,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/sys/kgdb.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/sys/kthread.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/sys/ktrace.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/sys/limits.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/sys/lkm.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/sys/localedef.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/sys/lock.ph
@@ -1928,4 +1931,3 @@
 ./usr/share/misc/pcvtfonts/vt220l.810
 ./usr/share/misc/pcvtfonts/vt220l.814
 ./usr/share/misc/pcvtfonts/vt220l.816
-./sbin/kbd
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 1fe8a85039d..6fd26cdcf1b 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -1,3 +1,4 @@
+./sbin/kbd
 ./sbin/ldconfig
 ./usr/bin/c++filt
 ./usr/bin/ldd
@@ -53,7 +54,7 @@
 ./usr/lib/libmenu.so.1.1
 ./usr/lib/libobjc.so.0.0
 ./usr/lib/libocurses.so.3.0
-./usr/lib/libossaudio.so.0.0
+./usr/lib/libossaudio.so.1.0
 ./usr/lib/libotermcap.so.3.0
 ./usr/lib/libpanel.so.1.2
 ./usr/lib/libpcap.so.1.2
@@ -1239,6 +1240,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/frame.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/ieee.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/ieeefp.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/internal_types.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/kcore.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/limits.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/param.ph
@@ -1742,6 +1744,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/kgdb.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/kthread.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/ktrace.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/sys/limits.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/lkm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/localedef.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/lock.ph
@@ -1913,4 +1916,3 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/zlib.ph
 ./usr/libexec/ld.so
 ./usr/local/libdata/perl5/site_perl/m68k-openbsd
-./sbin/kbd
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 4b7a0b2710a..f6ccb44a42a 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -1,6 +1,7 @@
 ./sbin/ancontrol
 ./sbin/fdisk
 ./sbin/iopctl
+./sbin/kbd
 ./sbin/ldconfig
 ./sbin/pdisk
 ./sbin/wicontrol
@@ -63,7 +64,7 @@
 ./usr/lib/libmenu.so.1.1
 ./usr/lib/libobjc.so.0.0
 ./usr/lib/libocurses.so.3.0
-./usr/lib/libossaudio.so.0.0
+./usr/lib/libossaudio.so.1.0
 ./usr/lib/libotermcap.so.3.0
 ./usr/lib/libpanel.so.1.2
 ./usr/lib/libpcap.so.1.2
@@ -1538,6 +1539,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/frame.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/ieee.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/ieeefp.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/internal_types.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/intr.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/ipkdb.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/kcore.ph
@@ -1766,6 +1768,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/kgdb.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/kthread.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/ktrace.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/limits.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/lkm.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/localedef.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/lock.ph
@@ -1946,4 +1949,3 @@
 ./usr/sbin/apmd
 ./usr/sbin/wsconscfg
 ./usr/sbin/zzz
-./sbin/kbd
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 56489971eb9..072dc81c239 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -53,7 +53,7 @@
 ./usr/lib/libmenu.so.1.1
 ./usr/lib/libobjc.so.0.0
 ./usr/lib/libocurses.so.3.0
-./usr/lib/libossaudio.so.0.0
+./usr/lib/libossaudio.so.1.0
 ./usr/lib/libotermcap.so.3.0
 ./usr/lib/libpanel.so.1.2
 ./usr/lib/libpcap.so.1.2
@@ -1239,6 +1239,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/frame.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/ieee.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/ieeefp.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/internal_types.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/kcore.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/limits.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/param.ph
@@ -1735,6 +1736,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/kgdb.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/kthread.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/ktrace.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/sys/limits.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/lkm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/localedef.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/lock.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index b21c6ec1bfa..d30056e77b5 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -545,6 +545,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/keynote.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/login_cap.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/m88k/ieee.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/m88k/internal_types.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/machine
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/tcfs
 ./usr/libdata/perl5/site_perl/m88k-openbsd/miscfs/tcfs/tcfs.ph
@@ -587,6 +588,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/sys/ataio.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/sys/extattr.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/sys/kgdb.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/sys/limits.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/sys/memrange.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/sys/pciio.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/sys/radioio.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index a4b60e2bc86..7077739d191 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -59,7 +59,7 @@
 ./usr/lib/libmenu.so.1.1
 ./usr/lib/libobjc.so.0.0
 ./usr/lib/libocurses.so.3.0
-./usr/lib/libossaudio.so.0.0
+./usr/lib/libossaudio.so.1.0
 ./usr/lib/libotermcap.so.3.0
 ./usr/lib/libpanel.so.1.2
 ./usr/lib/libpcap.so.1.2
@@ -1483,6 +1483,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/frame.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/ieee.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/ieeefp.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/internal_types.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/intr.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/ipkdb.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/powerpc/kbio.ph
@@ -1714,6 +1715,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/kgdb.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/kthread.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/ktrace.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/limits.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/lkm.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/localedef.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/lock.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index fec60e9ac6a..125c1dcb166 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -1,3 +1,4 @@
+./sbin/kbd
 ./sbin/ldconfig
 ./usr/bin/c++filt
 ./usr/bin/ldd
@@ -53,7 +54,7 @@
 ./usr/lib/libmenu.so.1.1
 ./usr/lib/libobjc.so.0.0
 ./usr/lib/libocurses.so.3.0
-./usr/lib/libossaudio.so.0.0
+./usr/lib/libossaudio.so.1.0
 ./usr/lib/libotermcap.so.3.0
 ./usr/lib/libpanel.so.1.2
 ./usr/lib/libpcap.so.1.2
@@ -1233,6 +1234,7 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/ieee.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/ieeefp.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/instr.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/internal_types.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/ioctl_fd.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/kbd.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sparc/kbio.ph
@@ -1378,6 +1380,7 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sys/kgdb.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sys/kthread.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sys/ktrace.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/sys/limits.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sys/lkm.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sys/localedef.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sys/lock.ph
@@ -1896,4 +1899,3 @@
 ./usr/sbin/eeprom
 ./usr/sbin/fdformat
 ./usr/sbin/screenblank
-./sbin/kbd
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 214c90d2664..a486ab8ca2f 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -1,3 +1,4 @@
+./sbin/kbd
 ./sbin/ldconfig
 ./sbin/wsconsctl
 ./usr/bin/c++filt
@@ -53,7 +54,7 @@
 ./usr/lib/libmenu.so.1.1
 ./usr/lib/libobjc.so.0.0
 ./usr/lib/libocurses.so.3.0
-./usr/lib/libossaudio.so.0.0
+./usr/lib/libossaudio.so.1.0
 ./usr/lib/libotermcap.so.3.0
 ./usr/lib/libpanel.so.1.2
 ./usr/lib/libpcap.so.1.2
@@ -1234,6 +1235,7 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sparc64/ieeefp.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sparc64/instr.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sparc64/int_types.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/sparc64/internal_types.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sparc64/intr.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sparc64/kcore.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sparc64/limits.ph
@@ -1379,6 +1381,7 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sys/kgdb.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sys/kthread.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sys/ktrace.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/sys/limits.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sys/lkm.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sys/localedef.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/sys/lock.ph
@@ -1896,4 +1899,3 @@
 ./usr/mdec/ofwboot.net
 ./usr/sbin/eeprom
 ./usr/sbin/wsconscfg
-./sbin/kbd
diff --git a/distrib/sets/lists/base/md.sun3 b/distrib/sets/lists/base/md.sun3
index 60a436b80d5..306a7bfad3f 100644
--- a/distrib/sets/lists/base/md.sun3
+++ b/distrib/sets/lists/base/md.sun3
@@ -53,7 +53,7 @@
 ./usr/lib/libmenu.so.1.1
 ./usr/lib/libobjc.so.0.0
 ./usr/lib/libocurses.so.3.0
-./usr/lib/libossaudio.so.0.0
+./usr/lib/libossaudio.so.1.0
 ./usr/lib/libotermcap.so.3.0
 ./usr/lib/libpanel.so.1.2
 ./usr/lib/libpcap.so.1.2
@@ -1238,6 +1238,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/frame.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/ieee.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/ieeefp.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/internal_types.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/kcore.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/limits.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/m68k/param.ph
@@ -1749,6 +1750,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/kgdb.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/kthread.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/ktrace.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/sys/limits.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/lkm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/localedef.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/lock.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 730e0a75e26..42034db52c2 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -1262,6 +1262,7 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/sys/kgdb.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/sys/kthread.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/sys/ktrace.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/sys/limits.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/sys/lkm.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/sys/localedef.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/sys/lock.ph
@@ -1421,6 +1422,7 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/vax/exec.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/vax/float.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/vax/frame.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/vax/internal_types.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/vax/intr.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/vax/ioa.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/vax/ka410.ph
diff --git a/distrib/sets/lists/comp/md.alpha b/distrib/sets/lists/comp/md.alpha
index 3bbf78b1d1f..23f875304f6 100644
--- a/distrib/sets/lists/comp/md.alpha
+++ b/distrib/sets/lists/comp/md.alpha
@@ -28,6 +28,7 @@
 ./usr/include/alpha/frame.h
 ./usr/include/alpha/ieee.h
 ./usr/include/alpha/ieeefp.h
+./usr/include/alpha/internal_types.h
 ./usr/include/alpha/intr.h
 ./usr/include/alpha/intrcnt.h
 ./usr/include/alpha/ioctl_fd.h
diff --git a/distrib/sets/lists/comp/md.amiga b/distrib/sets/lists/comp/md.amiga
index 00be662843a..ac69827dfbf 100644
--- a/distrib/sets/lists/comp/md.amiga
+++ b/distrib/sets/lists/comp/md.amiga
@@ -61,6 +61,7 @@
 ./usr/include/m68k/frame.h
 ./usr/include/m68k/ieee.h
 ./usr/include/m68k/ieeefp.h
+./usr/include/m68k/internal_types.h
 ./usr/include/m68k/kcore.h
 ./usr/include/m68k/limits.h
 ./usr/include/m68k/param.h
diff --git a/distrib/sets/lists/comp/md.hp300 b/distrib/sets/lists/comp/md.hp300
index 4e175f5aefc..1ce125b63e7 100644
--- a/distrib/sets/lists/comp/md.hp300
+++ b/distrib/sets/lists/comp/md.hp300
@@ -58,6 +58,7 @@
 ./usr/include/m68k/frame.h
 ./usr/include/m68k/ieee.h
 ./usr/include/m68k/ieeefp.h
+./usr/include/m68k/internal_types.h
 ./usr/include/m68k/kcore.h
 ./usr/include/m68k/limits.h
 ./usr/include/m68k/param.h
diff --git a/distrib/sets/lists/comp/md.hppa b/distrib/sets/lists/comp/md.hppa
index 6fce0f5294e..514bf8308fc 100644
--- a/distrib/sets/lists/comp/md.hppa
+++ b/distrib/sets/lists/comp/md.hppa
@@ -32,6 +32,7 @@
 ./usr/include/hppa/hppa_cpu.h
 ./usr/include/hppa/ieee.h
 ./usr/include/hppa/ieeefp.h
+./usr/include/hppa/internal_types.h
 ./usr/include/hppa/intr.h
 ./usr/include/hppa/intrcnt.h
 ./usr/include/hppa/ioctl_fd.h
diff --git a/distrib/sets/lists/comp/md.i386 b/distrib/sets/lists/comp/md.i386
index 8a8f6896d80..94715c32eb5 100644
--- a/distrib/sets/lists/comp/md.i386
+++ b/distrib/sets/lists/comp/md.i386
@@ -24,6 +24,7 @@
 ./usr/include/i386/gdt.h
 ./usr/include/i386/ieee.h
 ./usr/include/i386/ieeefp.h
+./usr/include/i386/internal_types.h
 ./usr/include/i386/intr.h
 ./usr/include/i386/ioctl_fd.h
 ./usr/include/i386/joystick.h
diff --git a/distrib/sets/lists/comp/md.mac68k b/distrib/sets/lists/comp/md.mac68k
index 1a689403ba3..0194c12949e 100644
--- a/distrib/sets/lists/comp/md.mac68k
+++ b/distrib/sets/lists/comp/md.mac68k
@@ -23,6 +23,7 @@
 ./usr/include/m68k/frame.h
 ./usr/include/m68k/ieee.h
 ./usr/include/m68k/ieeefp.h
+./usr/include/m68k/internal_types.h
 ./usr/include/m68k/kcore.h
 ./usr/include/m68k/limits.h
 ./usr/include/m68k/param.h
diff --git a/distrib/sets/lists/comp/md.macppc b/distrib/sets/lists/comp/md.macppc
index 605b4c35326..c08f67b7c8b 100644
--- a/distrib/sets/lists/comp/md.macppc
+++ b/distrib/sets/lists/comp/md.macppc
@@ -75,6 +75,7 @@
 ./usr/include/powerpc/frame.h
 ./usr/include/powerpc/ieee.h
 ./usr/include/powerpc/ieeefp.h
+./usr/include/powerpc/internal_types.h
 ./usr/include/powerpc/intr.h
 ./usr/include/powerpc/ipkdb.h
 ./usr/include/powerpc/kcore.h
diff --git a/distrib/sets/lists/comp/md.mvme68k b/distrib/sets/lists/comp/md.mvme68k
index a215fb52d97..dc869c55d1b 100644
--- a/distrib/sets/lists/comp/md.mvme68k
+++ b/distrib/sets/lists/comp/md.mvme68k
@@ -23,6 +23,7 @@
 ./usr/include/m68k/frame.h
 ./usr/include/m68k/ieee.h
 ./usr/include/m68k/ieeefp.h
+./usr/include/m68k/internal_types.h
 ./usr/include/m68k/kcore.h
 ./usr/include/m68k/limits.h
 ./usr/include/m68k/param.h
diff --git a/distrib/sets/lists/comp/md.mvme88k b/distrib/sets/lists/comp/md.mvme88k
index 24358a5ad47..ff6ca76a035 100644
--- a/distrib/sets/lists/comp/md.mvme88k
+++ b/distrib/sets/lists/comp/md.mvme88k
@@ -6,6 +6,7 @@
 ./usr/include/dlfcn.h
 ./usr/include/ieeefp.h
 ./usr/include/link.h
+./usr/include/m88k/internal_types.h
 ./usr/include/machine/ansi.h
 ./usr/include/machine/asm.h
 ./usr/include/machine/asm_macro.h
diff --git a/distrib/sets/lists/comp/md.mvmeppc b/distrib/sets/lists/comp/md.mvmeppc
index 0a9d1a83ed7..b505fc8d3c8 100644
--- a/distrib/sets/lists/comp/md.mvmeppc
+++ b/distrib/sets/lists/comp/md.mvmeppc
@@ -56,6 +56,7 @@
 ./usr/include/mvmeppc/vmparam.h
 ./usr/include/mvmeppc/vuid_event.h
 ./usr/include/mvmeppc/wsconsio.h
+./usr/include/powerpc/internal_types.h
 ./usr/include/readline/chardefs.h
 ./usr/include/readline/keymaps.h
 ./usr/include/readline/readline.h
diff --git a/distrib/sets/lists/comp/md.sparc b/distrib/sets/lists/comp/md.sparc
index cc425fc3de8..ea76920b867 100644
--- a/distrib/sets/lists/comp/md.sparc
+++ b/distrib/sets/lists/comp/md.sparc
@@ -34,6 +34,7 @@
 ./usr/include/sparc/ieee.h
 ./usr/include/sparc/ieeefp.h
 ./usr/include/sparc/instr.h
+./usr/include/sparc/internal_types.h
 ./usr/include/sparc/ioctl_fd.h
 ./usr/include/sparc/kbd.h
 ./usr/include/sparc/kbio.h
diff --git a/distrib/sets/lists/comp/md.sparc64 b/distrib/sets/lists/comp/md.sparc64
index fcc3de4d097..0bbc3d4f223 100644
--- a/distrib/sets/lists/comp/md.sparc64
+++ b/distrib/sets/lists/comp/md.sparc64
@@ -40,6 +40,7 @@
 ./usr/include/sparc64/ieeefp.h
 ./usr/include/sparc64/instr.h
 ./usr/include/sparc64/int_types.h
+./usr/include/sparc64/internal_types.h
 ./usr/include/sparc64/intr.h
 ./usr/include/sparc64/kcore.h
 ./usr/include/sparc64/limits.h
diff --git a/distrib/sets/lists/comp/md.sun3 b/distrib/sets/lists/comp/md.sun3
index 1b400d7bad0..c4a50814bee 100644
--- a/distrib/sets/lists/comp/md.sun3
+++ b/distrib/sets/lists/comp/md.sun3
@@ -23,6 +23,7 @@
 ./usr/include/m68k/frame.h
 ./usr/include/m68k/ieee.h
 ./usr/include/m68k/ieeefp.h
+./usr/include/m68k/internal_types.h
 ./usr/include/m68k/kcore.h
 ./usr/include/m68k/limits.h
 ./usr/include/m68k/param.h
diff --git a/distrib/sets/lists/comp/md.vax b/distrib/sets/lists/comp/md.vax
index 0e380b73409..c047b176118 100644
--- a/distrib/sets/lists/comp/md.vax
+++ b/distrib/sets/lists/comp/md.vax
@@ -22,6 +22,7 @@
 ./usr/include/vax/exec.h
 ./usr/include/vax/float.h
 ./usr/include/vax/frame.h
+./usr/include/vax/internal_types.h
 ./usr/include/vax/intr.h
 ./usr/include/vax/ioa.h
 ./usr/include/vax/ka410.h
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index fc82cbc7fa6..1ecd5fc91b0 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -710,7 +710,6 @@
 ./usr/include/g++/fstream.h
 ./usr/include/g++/function.h
 ./usr/include/g++/functional
-./usr/include/g++/gen
 ./usr/include/g++/hash_map
 ./usr/include/g++/hash_map.h
 ./usr/include/g++/hash_set
@@ -1334,6 +1333,7 @@
 ./usr/include/sys/kgdb.h
 ./usr/include/sys/kthread.h
 ./usr/include/sys/ktrace.h
+./usr/include/sys/limits.h
 ./usr/include/sys/lkm.h
 ./usr/include/sys/localedef.h
 ./usr/include/sys/lock.h