sync

13 files changed, 28 insertions, 12 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 0293d112a75..f79dd32b6a5 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -496,7 +496,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/sys/acct.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/sys/audioio.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/sys/buf.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/sys/callout.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/sys/cdefs.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/sys/cdio.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/sys/chio.ph
@@ -665,3 +664,5 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/skipjack.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/net/if_gif.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/net/net_osdep.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/net/if_ieee80211.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/sys/timeout.ph
diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index b05715c0f41..3dcdc0d8309 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -515,7 +515,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/acct.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/audioio.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/buf.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/sys/callout.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/cdefs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/cdio.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/chio.ph
@@ -691,3 +690,5 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_gre.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ifaddrs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/skipjack.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_ieee80211.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/sys/timeout.ph
diff --git a/distrib/sets/lists/base/md.arc b/distrib/sets/lists/base/md.arc
index 8ab3eee6b76..03528f503f9 100644
--- a/distrib/sets/lists/base/md.arc
+++ b/distrib/sets/lists/base/md.arc
@@ -276,7 +276,6 @@
 ./usr/lib/perl5/site_perl/mips-openbsd/sys/acct.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/sys/audioio.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/sys/buf.ph
-./usr/lib/perl5/site_perl/mips-openbsd/sys/callout.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/sys/cdefs.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/sys/cdio.ph
 ./usr/lib/perl5/site_perl/mips-openbsd/sys/chio.ph
@@ -446,3 +445,5 @@
 ./usr/libdata/perl5/site_perl/mips-openbsd/net/if_token.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/net/if_gre.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/ifaddrs.ph
+./usr/libdata/perl5/site_perl/mips-openbsd/net/if_ieee80211.ph
+./usr/libdata/perl5/site_perl/mips-openbsd/sys/timeout.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index db092ca94d9..4ecc8e81ef8 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -538,7 +538,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/ataio.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/audioio.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/buf.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/sys/callout.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/cdefs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/cdio.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/chio.ph
@@ -691,3 +690,5 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_gre.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ifaddrs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/skipjack.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_ieee80211.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/sys/timeout.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index ea7f12d7f14..b445cab4bc4 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -560,7 +560,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/sys/ataio.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/sys/audioio.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/sys/buf.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/sys/callout.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/sys/cdefs.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/sys/cdio.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/sys/chio.ph
@@ -737,3 +736,5 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/net/if_gre.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/ifaddrs.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/skipjack.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/net/if_ieee80211.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/sys/timeout.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 0d39066a3b6..1ba0821161e 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -244,7 +244,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/ataio.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/audioio.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/buf.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/sys/callout.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/cdefs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/cdio.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/chio.ph
@@ -685,3 +684,5 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_gre.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ifaddrs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/skipjack.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_ieee80211.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/sys/timeout.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index e95600f60f4..67cfb3b7dce 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -238,7 +238,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/ataio.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/audioio.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/buf.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/sys/callout.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/cdefs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/cdio.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/sys/chio.ph
@@ -689,3 +688,5 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/net/net_osdep.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ifaddrs.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/skipjack.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/net/if_ieee80211.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/sys/timeout.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 8f76afde199..882417cc11c 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -247,7 +247,6 @@
 ./usr/lib/perl5/site_perl/m88k-openbsd/sys/acct.ph
 ./usr/lib/perl5/site_perl/m88k-openbsd/sys/audioio.ph
 ./usr/lib/perl5/site_perl/m88k-openbsd/sys/buf.ph
-./usr/lib/perl5/site_perl/m88k-openbsd/sys/callout.ph
 ./usr/lib/perl5/site_perl/m88k-openbsd/sys/cdefs.ph
 ./usr/lib/perl5/site_perl/m88k-openbsd/sys/cdio.ph
 ./usr/lib/perl5/site_perl/m88k-openbsd/sys/chio.ph
@@ -401,3 +400,5 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/net/if_gre.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/ifaddrs.ph
 ./usr/lib/perl5/site_perl/m88k-openbsd/skipjack.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/net/if_ieee80211.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/sys/timeout.ph
diff --git a/distrib/sets/lists/base/md.pmax b/distrib/sets/lists/base/md.pmax
index 00761f5aa95..83f0073cccb 100644
--- a/distrib/sets/lists/base/md.pmax
+++ b/distrib/sets/lists/base/md.pmax
@@ -535,7 +535,6 @@
 ./usr/libdata/perl5/site_perl/mips-openbsd/sys/ataio.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/sys/audioio.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/sys/buf.ph
-./usr/libdata/perl5/site_perl/mips-openbsd/sys/callout.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/sys/cdefs.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/sys/cdio.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/sys/chio.ph
@@ -699,3 +698,5 @@
 ./usr/libdata/perl5/site_perl/mips-openbsd/net/if_token.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/net/if_gre.ph
 ./usr/libdata/perl5/site_perl/mips-openbsd/ifaddrs.ph
+./usr/libdata/perl5/site_perl/mips-openbsd/net/if_ieee80211.ph
+./usr/libdata/perl5/site_perl/mips-openbsd/sys/timeout.ph
diff --git a/distrib/sets/lists/base/md.powerpc b/distrib/sets/lists/base/md.powerpc
index 57f9c609a40..93a5d606be9 100644
--- a/distrib/sets/lists/base/md.powerpc
+++ b/distrib/sets/lists/base/md.powerpc
@@ -233,7 +233,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/acct.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/audioio.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/buf.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/callout.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/cdefs.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/cdio.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/chio.ph
@@ -692,3 +691,5 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/net/if_gre.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/ifaddrs.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/skipjack.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/net/if_ieee80211.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/timeout.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 19ad059b3a2..ade79fbdac7 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -238,7 +238,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sys/acct.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sys/audioio.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sys/buf.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/sys/callout.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sys/cdefs.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sys/cdio.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/sys/chio.ph
@@ -713,3 +712,5 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/net/if_gre.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/ifaddrs.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/skipjack.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/net/if_ieee80211.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/sys/timeout.ph
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 4092306b5c7..0508929cae7 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1035,7 +1035,6 @@
 ./usr/include/sys/ataio.h
 ./usr/include/sys/audioio.h
 ./usr/include/sys/buf.h
-./usr/include/sys/callout.h
 ./usr/include/sys/cdefs.h
 ./usr/include/sys/cdio.h
 ./usr/include/sys/chio.h
@@ -3344,3 +3343,5 @@
 ./usr/share/mk/bsd.subdir.mk
 ./usr/share/mk/bsd.sys.mk
 ./var/db/libc.tags
+./usr/include/net/if_ieee80211.h
+./usr/include/sys/timeout.h
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 1f4eb0a40bd..f5c3ac3282f 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -1648,3 +1648,7 @@
 ./usr/share/man/cat8/crash.0
 ./usr/share/man/cat4/hifn.0
 ./usr/share/man/cat9/ratecheck.0
+./usr/share/man/cat9/timeout_add.0
+./usr/share/man/cat9/timeout_del.0
+./usr/share/man/cat9/timeout_set.0
+./usr/share/man/cat4/ray.0