sync

17 files changed, 37 insertions, 2 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 37dea2beb95..6e98525a65a 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -1126,6 +1126,7 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/err.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/errno.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/eti.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/event.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/f2c.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/fcntl.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/float.ph
diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index 4db0d713e22..d8b70300ba0 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -1103,6 +1103,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/err.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/errno.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/eti.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/event.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/f2c.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/fcntl.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/float.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 841cca49727..57f18d50502 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -1062,6 +1062,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/err.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/errno.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/eti.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/event.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/f2c.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/fcntl.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/float.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 44d11fe1a62..84fc84b44b1 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -982,6 +982,7 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/err.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/errno.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/eti.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/event.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/f2c.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/fcntl.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/float.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index e6b978262b9..e52ecf78b32 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -1069,6 +1069,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/err.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/errno.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/eti.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/event.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/f2c.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/fcntl.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/float.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 6c85cb5a756..04930a92e01 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -1064,6 +1064,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/err.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/errno.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/eti.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/event.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/f2c.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/fcntl.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/float.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index c9961d7ca94..d3216a26a17 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -1071,6 +1071,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/err.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/errno.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/eti.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/event.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/f2c.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/fcntl.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/float.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index effd8ca9ee9..e9ebfdf2d12 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -1062,6 +1062,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/err.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/errno.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/eti.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/event.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/f2c.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/fcntl.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/float.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 513dc14aa15..94197bb8470 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -533,6 +533,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/wsfont/vt220l8x10.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/wsfont/vt220l8x8.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/wsfont/wsfont.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/event.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/kerberosV
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 4ce73e7bc97..1bd95d270f3 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -1064,6 +1064,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/err.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/errno.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/eti.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/event.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/f2c.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/fcntl.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/float.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 1e26ef4d299..563b95f66e3 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -1580,6 +1580,7 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/xfs/xfs_vopdefs.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/zconf.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/zlib.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/event.ph
 ./usr/libdata/perl5/sparc-openbsd
 ./usr/libdata/perl5/sparc-openbsd/5.6.1
 ./usr/libdata/perl5/sparc-openbsd/5.6.1/.packlist
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index f9f2153c81f..b90c886504f 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -724,6 +724,7 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/err.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/errno.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/eti.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/event.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/f2c.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/fcntl.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/float.ph
diff --git a/distrib/sets/lists/base/md.sun3 b/distrib/sets/lists/base/md.sun3
index b7e37433f71..2390669a9a7 100644
--- a/distrib/sets/lists/base/md.sun3
+++ b/distrib/sets/lists/base/md.sun3
@@ -1061,6 +1061,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/err.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/errno.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/eti.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/event.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/f2c.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/fcntl.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/float.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 4d7c06a7e4d..79ba9720599 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -665,6 +665,7 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/err.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/errno.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/eti.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/event.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/f2c.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/fcntl.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/float.ph
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 25903e8c4f5..3d54bb0706e 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -678,6 +678,7 @@
 ./usr/include/err.h
 ./usr/include/errno.h
 ./usr/include/eti.h
+./usr/include/event.h
 ./usr/include/f2c.h
 ./usr/include/fcntl.h
 ./usr/include/float.h
@@ -1621,6 +1622,8 @@
 ./usr/lib/libdes_p.a
 ./usr/lib/libedit.a
 ./usr/lib/libedit_p.a
+./usr/lib/libevent.a
+./usr/lib/libevent_p.a
 ./usr/lib/libfl.a
 ./usr/lib/libfl_p.a
 ./usr/lib/libform.a
@@ -3068,6 +3071,15 @@
 ./usr/share/man/cat3/ether_ntohost.0
 ./usr/share/man/cat3/ethers.0
 ./usr/share/man/cat3/etob.0
+./usr/share/man/cat3/event.0
+./usr/share/man/cat3/event_add.0
+./usr/share/man/cat3/event_del.0
+./usr/share/man/cat3/event_dispatch.0
+./usr/share/man/cat3/event_init.0
+./usr/share/man/cat3/event_initialized.0
+./usr/share/man/cat3/event_loop.0
+./usr/share/man/cat3/event_pending.0
+./usr/share/man/cat3/event_set.0
 ./usr/share/man/cat3/exec.0
 ./usr/share/man/cat3/execl.0
 ./usr/share/man/cat3/execle.0
@@ -4267,6 +4279,11 @@
 ./usr/share/man/cat3/siglongjmp.0
 ./usr/share/man/cat3/sigmask.0
 ./usr/share/man/cat3/signal.0
+./usr/share/man/cat3/signal_add.0
+./usr/share/man/cat3/signal_del.0
+./usr/share/man/cat3/signal_initalized.0
+./usr/share/man/cat3/signal_pending.0
+./usr/share/man/cat3/signal_set.0
 ./usr/share/man/cat3/significand.0
 ./usr/share/man/cat3/significandf.0
 ./usr/share/man/cat3/sigpause.0
@@ -4445,6 +4462,11 @@
 ./usr/share/man/cat3/timegm.0
 ./usr/share/man/cat3/timelocal.0
 ./usr/share/man/cat3/timeout.0
+./usr/share/man/cat3/timeout_add.0
+./usr/share/man/cat3/timeout_del.0
+./usr/share/man/cat3/timeout_initialized.0
+./usr/share/man/cat3/timeout_pending.0
+./usr/share/man/cat3/timeout_set.0
 ./usr/share/man/cat3/timeradd.0
 ./usr/share/man/cat3/timerclear.0
 ./usr/share/man/cat3/timercmp.0
diff --git a/distrib/sets/lists/etc/mi b/distrib/sets/lists/etc/mi
index 54f96c87196..432cb260d89 100644
--- a/distrib/sets/lists/etc/mi
+++ b/distrib/sets/lists/etc/mi
@@ -62,7 +62,6 @@
 ./etc/mtree/BSD.x11.dist
 ./etc/mtree/special
 ./etc/myname
-./etc/nat.conf
 ./etc/netstart
 ./etc/networks
 ./etc/newsyslog.conf
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index 0c3f17ebea7..8bde355155b 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -991,6 +991,7 @@
 ./usr/share/man/cat4/gdt.0
 ./usr/share/man/cat4/gem.0
 ./usr/share/man/cat4/gif.0
+./usr/share/man/cat4/gpr.0
 ./usr/share/man/cat4/gre.0
 ./usr/share/man/cat4/gtp.0
 ./usr/share/man/cat4/gx.0
@@ -1488,7 +1489,6 @@
 ./usr/share/man/cat5/mvme68k
 ./usr/share/man/cat5/mvme88k
 ./usr/share/man/cat5/mvmeppc
-./usr/share/man/cat5/nat.conf.0
 ./usr/share/man/cat5/netgroup.0
 ./usr/share/man/cat5/netid.0
 ./usr/share/man/cat5/networks.0