diff --git a/compat/build-makefiles b/compat/build-makefiles index 1f068b0fc3ad..c92ff2e05d78 100755 --- a/compat/build-makefiles +++ b/compat/build-makefiles @@ -7,7 +7,7 @@ srcdir=/usr/src rwsrcdir=/home/current/src MAKE=${MAKE-make} -CHECK_SUBDIRS="gnu/lib gnu/lib/libgcc4 lib lib/csu lib/i18n_module external/bsd/atf/lib external/bsd/openldap/lib lib/libpam/modules external/bsd/bind/lib external/bsd/iscsi crypto/external/bsd/openssl/lib crypto/external/bsd/netpgp crypto/external/bsd/openssh" +CHECK_SUBDIRS="gnu/lib gnu/lib/libgcc4 lib lib/csu lib/i18n_module external/bsd/atf/lib external/bsd/openldap/lib lib/libpam/modules external/bsd/bind/lib external/bsd/iscsi external/bsd/libevent crypto/external/bsd/openssl/lib crypto/external/bsd/netpgp crypto/external/bsd/openssh" # lib/csu is spsecial # lib/libm needs to be special -- i387 @@ -65,7 +65,7 @@ for _dir in ${CHECK_SUBDIRS}; do ( echo -n '# $Net' echo 'BSD$' - echo '# Generated from: $NetBSD: build-makefiles,v 1.8 2009/07/21 01:05:35 mrg Exp $' | sed -e 's/\$//g' + echo '# Generated from: $NetBSD: build-makefiles,v 1.9 2009/11/02 10:13:19 plunky Exp $' | sed -e 's/\$//g' cat <<'EOF' NOLINT= # defined diff --git a/compat/external/lib/Makefile b/compat/external/lib/Makefile index efa676e503d9..be177077cae1 100644 --- a/compat/external/lib/Makefile +++ b/compat/external/lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2009/10/26 21:37:36 christos Exp $ +# $NetBSD: Makefile,v 1.13 2009/11/02 10:13:19 plunky Exp $ # # This Makefile exists to provide a single point to build @@ -26,4 +26,6 @@ SUBDIR+= ../bsd/flex/lib SUBDIR+= ../gpl3/binutils/lib .endif +SUBDIR+= ../bsd/libevent/lib + .include diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64 index d1b575693771..0846596e4b2a 100644 --- a/distrib/sets/lists/base/md.amd64 +++ b/distrib/sets/lists/base/md.amd64 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.73 2009/10/25 04:38:05 christos Exp $ +# $NetBSD: md.amd64,v 1.74 2009/11/02 10:13:19 plunky Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete ./libexec/ld.elf_so-i386 base-sys-shlib compat,pic @@ -83,7 +83,7 @@ ./usr/lib/i386/libedit.so.3 base-compat-shlib compat,pic ./usr/lib/i386/libedit.so.3.0 base-compat-shlib compat,pic ./usr/lib/i386/libevent.so.3 base-compat-shlib compat,pic -./usr/lib/i386/libevent.so.3.1 base-compat-shlib compat,pic +./usr/lib/i386/libevent.so.3.2 base-compat-shlib compat,pic ./usr/lib/i386/libform.so.6 base-compat-shlib compat,pic ./usr/lib/i386/libform.so.6.0 base-compat-shlib compat,pic ./usr/lib/i386/libgcc_s.so.1 base-compat-shlib compat,pic diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64 index 8aeae9e07628..69376de4e2e8 100644 --- a/distrib/sets/lists/base/md.sparc64 +++ b/distrib/sets/lists/base/md.sparc64 @@ -1,4 +1,4 @@ -# $NetBSD: md.sparc64,v 1.66 2009/10/25 04:38:05 christos Exp $ +# $NetBSD: md.sparc64,v 1.67 2009/11/02 10:13:19 plunky Exp $ ./libexec/ld.elf_so-sparc base-sysutil-bin compat,pic ./sbin/edlabel base-sysutil-root ./usr/bin/fdformat base-util-bin @@ -81,7 +81,7 @@ ./usr/lib/sparc/libedit.so.3 base-compat-shlib compat,pic ./usr/lib/sparc/libedit.so.3.0 base-compat-shlib compat,pic ./usr/lib/sparc/libevent.so.3 base-compat-shlib compat,pic -./usr/lib/sparc/libevent.so.3.1 base-compat-shlib compat,pic +./usr/lib/sparc/libevent.so.3.2 base-compat-shlib compat,pic ./usr/lib/sparc/libform.so.6 base-compat-shlib compat,pic ./usr/lib/sparc/libform.so.6.0 base-compat-shlib compat,pic ./usr/lib/sparc/libgcc_s.so.1 base-compat-shlib compat,pic diff --git a/distrib/sets/lists/base/shl.mi b/distrib/sets/lists/base/shl.mi index 6e47f0b4f456..6e703d129fe7 100644 --- a/distrib/sets/lists/base/shl.mi +++ b/distrib/sets/lists/base/shl.mi @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.503 2009/10/25 04:38:05 christos Exp $ +# $NetBSD: shl.mi,v 1.504 2009/11/02 10:13:19 plunky Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -18,7 +18,7 @@ ./lib/libcrypto.so.6.0 base-crypto-shlib crypto,dynamicroot ./lib/libdevmapper.so.1.0 base-lvm-shlib lvm,dynamicroot ./lib/libedit.so.3.0 base-sys-shlib dynamicroot -./lib/libevent.so.3.1 base-sys-shlib dynamicroot +./lib/libevent.so.3.2 base-sys-shlib dynamicroot ./lib/libgcc_s.so.1.0 base-sys-shlib gcc ./lib/libipsec.so.3.0 base-net-shlib dynamicroot ./lib/libkvm.so.6.0 base-sys-shlib dynamicroot @@ -72,7 +72,7 @@ ./usr/lib/libdns.so.5.0 base-bind-shlib ./usr/lib/libdns_sd.so.0.0 base-mdns-shlib mdns ./usr/lib/libedit.so.3.0 base-sys-shlib -./usr/lib/libevent.so.3.1 base-sys-shlib +./usr/lib/libevent.so.3.2 base-sys-shlib ./usr/lib/libfetch.so.3.0 base-sys-shlib ./usr/lib/libform.so.6.0 base-sys-shlib ./usr/lib/libg2c.so.2.0 base-sys-shlib gcc=3 diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi index 97f8876b141c..c7bf1455d1de 100644 --- a/distrib/sets/lists/comp/mi +++ b/distrib/sets/lists/comp/mi @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1334 2009/10/25 15:11:00 njoly Exp $ +# $NetBSD: mi,v 1.1335 2009/11/02 10:13:19 plunky Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -3628,6 +3628,7 @@ ./usr/libdata/lint/llib-ldns.ln comp-bind-lintlib lint ./usr/libdata/lint/llib-ldns_sd.ln comp-mdns-lintlib lint,mdns ./usr/libdata/lint/llib-ledit.ln comp-c-lintlib lint +./usr/libdata/lint/llib-levent.ln comp-c-lintlib lint ./usr/libdata/lint/llib-lfetch.ln comp-c-lintlib lint ./usr/libdata/lint/llib-lform.ln comp-c-lintlib lint ./usr/libdata/lint/llib-lgnumalloc.ln comp-c-lintlib lint diff --git a/external/bsd/Makefile b/external/bsd/Makefile index cda59e8e3b7c..a17b924a67ab 100644 --- a/external/bsd/Makefile +++ b/external/bsd/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.18 2009/10/29 01:07:00 christos Exp $ +# $NetBSD: Makefile,v 1.19 2009/11/02 10:13:19 plunky Exp $ .include -SUBDIR+= am-utils bind dhcpcd fetch file flex libarchive mdocml pkg_install \ - top byacc +SUBDIR+= am-utils bind dhcpcd fetch file flex libarchive libevent \ + mdocml pkg_install top byacc + .if (${MKATF} != "no") SUBDIR+= atf .endif diff --git a/external/lib/Makefile b/external/lib/Makefile index 36deb6e37658..6f924fc8f97b 100644 --- a/external/lib/Makefile +++ b/external/lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2009/09/29 23:56:34 tsarna Exp $ +# $NetBSD: Makefile,v 1.13 2009/11/02 10:13:19 plunky Exp $ # # This Makefile exists to provide a single point to build @@ -30,6 +30,7 @@ SUBDIR+= ../bsd/iscsi/lib # depends on libpthread SUBDIR+= ../bsd/fetch/lib SUBDIR+= ../bsd/libarchive/lib +SUBDIR+= ../bsd/libevent/lib SUBDIR+= ../bsd/am-utils/lib SUBDIR+= ../bsd/bind/lib SUBDIR+= ../bsd/file/lib diff --git a/lib/Makefile b/lib/Makefile index 735235779927..04418a842371 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.146 2009/10/26 21:36:46 christos Exp $ +# $NetBSD: Makefile,v 1.147 2009/11/02 10:13:19 plunky Exp $ # from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91 .include @@ -6,7 +6,7 @@ SUBDIR= csu libc .WAIT libarch \ libbsdmalloc libbluetooth libbz2 \ libcompat libcrypt \ - libcurses libevent libintl libkvm libm \ + libcurses libintl libkvm libm \ libossaudio libpcap libpci libpmc libposix libprop libpthread \ libpthread_dbg libpuffs libresolv librmt librpcsvc librt \ libterm libusbhid libutil libwrap liby libz