Index: lib/Makefile =================================================================== RCS file: /cvsroot/src/lib/Makefile,v retrieving revision 1.143 diff -u -r1.143 Makefile --- lib/Makefile 3 Sep 2009 15:35:58 -0000 1.143 +++ lib/Makefile 1 Nov 2009 13:55:25 -0000 @@ -6,7 +6,7 @@ SUBDIR= csu libc .WAIT libarch \ libbsdmalloc libbluetooth libbz2 \ libcompat libcrypt \ - libcurses libevent libintl libkvm libl libm \ + libcurses libintl libkvm libl libm \ libossaudio libpcap libpci libpmc libposix libprop libpthread \ libpthread_dbg libpuffs libresolv librmt librpcsvc librt \ libterm libusbhid libutil libwrap liby libz Index: external/lib/Makefile =================================================================== RCS file: /cvsroot/src/external/lib/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- external/lib/Makefile 29 Sep 2009 23:56:34 -0000 1.12 +++ external/lib/Makefile 1 Nov 2009 13:55:25 -0000 @@ -30,6 +30,7 @@ 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 Index: external/bsd/Makefile =================================================================== RCS file: /cvsroot/src/external/bsd/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- external/bsd/Makefile 25 Jun 2009 13:59:02 -0000 1.12 +++ external/bsd/Makefile 1 Nov 2009 13:55:25 -0000 @@ -2,7 +2,7 @@ .include -SUBDIR+= am-utils bind dhcpcd fetch file libarchive pkg_install top +SUBDIR+= am-utils bind dhcpcd fetch file libarchive libevent pkg_install top .if (${MKATF} != "no") SUBDIR+= atf .endif Index: external/bsd/libevent/Makefile =================================================================== RCS file: external/bsd/libevent/Makefile diff -N external/bsd/libevent/Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ external/bsd/libevent/Makefile 1 Nov 2009 13:55:25 -0000 @@ -0,0 +1,5 @@ +# $NetBSD: Makefile$ + +SUBDIR= include lib + +.include Index: external/bsd/libevent/Makefile.inc =================================================================== RCS file: external/bsd/libevent/Makefile.inc diff -N external/bsd/libevent/Makefile.inc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ external/bsd/libevent/Makefile.inc 1 Nov 2009 13:55:25 -0000 @@ -0,0 +1,8 @@ +# $NetBSD: Makefile.inc$ + +LIBEVENT_DIR= ${NETBSDSRCDIR}/external/bsd/libevent + +CPPFLAGS+= -DHAVE_CONFIG_H +CPPFLAGS+= -I${LIBEVENT_DIR}/dist -I${LIBEVENT_DIR}/include + +WARNS?= 4 Index: external/bsd/libevent/prepare-import.sh =================================================================== RCS file: external/bsd/libevent/prepare-import.sh diff -N external/bsd/libevent/prepare-import.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ external/bsd/libevent/prepare-import.sh 1 Nov 2009 13:55:25 -0000 @@ -0,0 +1,61 @@ +#!/bin/sh +# $NetBSD: prepare-import.sh$ + +# Extract the new tarball and rename the libevent-X.Y.Z directory +# to dist. Run this script and check for additional files and +# directories to prune, only relevant content is included. +# +# lib/ is built as SUBDIR from external/lib/Makefile, and +# the regression tests are used from tests/lib/libevent +# +# Use the following template to import +# cvs import src/external/bsd/file/dist $user LIBEVENT-X-Y-Z-STABLE +# +# don't forget to bump the lib/shlib_version and commit the include/ files +# + +set -e + +mkdir -p tmp +cd tmp +../dist/configure +make event-config.h +mv config.h ../include # not needed for 2.* +mv event-config.h ../include +cd .. +rm -Rf tmp + +echo "Removing unwanted distfiles .." +cd dist +rm -Rf Doxyfile Makefile.am Makefile.in WIN32-Code WIN32-Prj \ + aclocal.m4 autogen.sh compat config.guess config.h.in config.sub \ + configure configure.in devpoll.c epoll.c epoll_sub.c event_rpcgen.py \ + evport.c install-sh ltmain.sh missing mkinstalldirs sample \ + strlcpy.c test/Makefile.am test/Makefile.in test/bench.c \ + test/regress.rpc test/test-eof.c test/test-init.c test/test-time.c \ + test/test-weof.c test/test.sh +cd .. + +echo "Adding RCS tags .." +for f in $(grep -RL '$NetBSD.*$' . | grep -v CVS); do + case $f in + *.[ch]) + cat - ${f} > ${f}_tmp <<- EOF + /* \$NetBSD\$ */ + EOF + mv ${f}_tmp ${f} + ;; + *.[0-9]) + cat - ${f} > ${f}_tmp <<- EOF + .\" \$NetBSD\$ + .\" + EOF + mv ${f}_tmp ${f} + ;; + *) + echo "No RCS tag added to ${f}" + ;; + esac +done + +echo "prepare-import done" Index: external/bsd/libevent/include/Makefile =================================================================== RCS file: external/bsd/libevent/include/Makefile diff -N external/bsd/libevent/include/Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ external/bsd/libevent/include/Makefile 1 Nov 2009 13:55:25 -0000 @@ -0,0 +1,10 @@ +# $NetBSD: Makefile$ + +.include + +.PATH: ${LIBEVENT_DIR}/dist + +INCS= evdns.h event.h evhttp.h evrpc.h evutil.h event-config.h +INCSDIR= /usr/include + +.include Index: external/bsd/libevent/include/config.h =================================================================== RCS file: external/bsd/libevent/include/config.h diff -N external/bsd/libevent/include/config.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ external/bsd/libevent/include/config.h 1 Nov 2009 13:55:25 -0000 @@ -0,0 +1,256 @@ +/* $NetBSD$ */ + +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.in by autoheader. */ + +/* Define if clock_gettime is available in libc */ +#define DNS_USE_CPU_CLOCK_FOR_ID 1 + +/* Define is no secure id variant is available */ +/* #undef DNS_USE_GETTIMEOFDAY_FOR_ID */ + +/* Define to 1 if you have the `clock_gettime' function. */ +#define HAVE_CLOCK_GETTIME 1 + +/* Define if /dev/poll is available */ +/* #undef HAVE_DEVPOLL */ + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define if your system supports the epoll system calls */ +/* #undef HAVE_EPOLL */ + +/* Define to 1 if you have the `epoll_ctl' function. */ +/* #undef HAVE_EPOLL_CTL */ + +/* Define if your system supports event ports */ +/* #undef HAVE_EVENT_PORTS */ + +/* Define to 1 if you have the `fcntl' function. */ +#define HAVE_FCNTL 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the `getaddrinfo' function. */ +#define HAVE_GETADDRINFO 1 + +/* Define to 1 if you have the `getnameinfo' function. */ +#define HAVE_GETNAMEINFO 1 + +/* Define to 1 if you have the `gettimeofday' function. */ +#define HAVE_GETTIMEOFDAY 1 + +/* Define to 1 if you have the `inet_ntop' function. */ +#define HAVE_INET_NTOP 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `kqueue' function. */ +#define HAVE_KQUEUE 1 + +/* Define to 1 if you have the `nsl' library (-lnsl). */ +/* #undef HAVE_LIBNSL */ + +/* Define to 1 if you have the `resolv' library (-lresolv). */ +#define HAVE_LIBRESOLV 1 + +/* Define to 1 if you have the `rt' library (-lrt). */ +#define HAVE_LIBRT 1 + +/* Define to 1 if you have the `socket' library (-lsocket). */ +/* #undef HAVE_LIBSOCKET */ + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_NETINET_IN6_H */ + +/* Define to 1 if you have the `poll' function. */ +#define HAVE_POLL 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_POLL_H 1 + +/* Define to 1 if you have the `port_create' function. */ +/* #undef HAVE_PORT_CREATE */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_PORT_H */ + +/* Define to 1 if you have the `select' function. */ +#define HAVE_SELECT 1 + +/* Define if F_SETFD is defined in */ +#define HAVE_SETFD 1 + +/* Define to 1 if you have the `sigaction' function. */ +#define HAVE_SIGACTION 1 + +/* Define to 1 if you have the `signal' function. */ +#define HAVE_SIGNAL 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SIGNAL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDARG_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* Define to 1 if you have the `strsep' function. */ +#define HAVE_STRSEP 1 + +/* Define to 1 if you have the `strtok_r' function. */ +#define HAVE_STRTOK_R 1 + +/* Define to 1 if you have the `strtoll' function. */ +#define HAVE_STRTOLL 1 + +/* Define to 1 if the system has the type `struct in6_addr'. */ +#define HAVE_STRUCT_IN6_ADDR 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_DEVPOLL_H */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_EPOLL_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_EVENT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_QUEUE_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SELECT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_SOCKET_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define if TAILQ_FOREACH is defined in */ +#define HAVE_TAILQFOREACH 1 + +/* Define if timeradd is defined in */ +#define HAVE_TIMERADD 1 + +/* Define if timerclear is defined in */ +#define HAVE_TIMERCLEAR 1 + +/* Define if timercmp is defined in */ +#define HAVE_TIMERCMP 1 + +/* Define if timerisset is defined in */ +#define HAVE_TIMERISSET 1 + +/* Define to 1 if the system has the type `uint16_t'. */ +#define HAVE_UINT16_T 1 + +/* Define to 1 if the system has the type `uint32_t'. */ +#define HAVE_UINT32_T 1 + +/* Define to 1 if the system has the type `uint64_t'. */ +#define HAVE_UINT64_T 1 + +/* Define to 1 if the system has the type `uint8_t'. */ +#define HAVE_UINT8_T 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_UNISTD_H 1 + +/* Define to 1 if you have the `vasprintf' function. */ +#define HAVE_VASPRINTF 1 + +/* Define if kqueue works correctly with pipes */ +#define HAVE_WORKING_KQUEUE 1 + +/* Name of package */ +#define PACKAGE "libevent" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "" + +/* The size of `int', as computed by sizeof. */ +#define SIZEOF_INT 4 + +/* The size of `long', as computed by sizeof. */ +#define SIZEOF_LONG 4 + +/* The size of `long long', as computed by sizeof. */ +#define SIZEOF_LONG_LONG 8 + +/* The size of `short', as computed by sizeof. */ +#define SIZEOF_SHORT 2 + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define to 1 if you can safely include both and . */ +#define TIME_WITH_SYS_TIME 1 + +/* Version number of package */ +#define VERSION "1.4.12-stable" + +/* Define to appropriate substitue if compiler doesnt have __func__ */ +/* #undef __func__ */ + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* #undef inline */ +#endif + +/* Define to `int' if does not define. */ +/* #undef pid_t */ + +/* Define to `unsigned int' if does not define. */ +/* #undef size_t */ + +/* Define to unsigned int if you dont have it */ +/* #undef socklen_t */ Index: external/bsd/libevent/include/event-config.h =================================================================== RCS file: external/bsd/libevent/include/event-config.h diff -N external/bsd/libevent/include/event-config.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ external/bsd/libevent/include/event-config.h 1 Nov 2009 13:55:25 -0000 @@ -0,0 +1,264 @@ +/* $NetBSD$ */ + +/* event-config.h + * Generated by autoconf; post-processed by libevent. + * Do not edit this file. + * Do not rely on macros in this file existing in later versions. + */ +#ifndef _EVENT_CONFIG_H_ +#define _EVENT_CONFIG_H_ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.in by autoheader. */ + +/* Define if clock_gettime is available in libc */ +#define _EVENT_DNS_USE_CPU_CLOCK_FOR_ID 1 + +/* Define is no secure id variant is available */ +/* #undef _EVENT_DNS_USE_GETTIMEOFDAY_FOR_ID */ + +/* Define to 1 if you have the `clock_gettime' function. */ +#define _EVENT_HAVE_CLOCK_GETTIME 1 + +/* Define if /dev/poll is available */ +/* #undef _EVENT_HAVE_DEVPOLL */ + +/* Define to 1 if you have the header file. */ +#define _EVENT_HAVE_DLFCN_H 1 + +/* Define if your system supports the epoll system calls */ +/* #undef _EVENT_HAVE_EPOLL */ + +/* Define to 1 if you have the `epoll_ctl' function. */ +/* #undef _EVENT_HAVE_EPOLL_CTL */ + +/* Define if your system supports event ports */ +/* #undef _EVENT_HAVE_EVENT_PORTS */ + +/* Define to 1 if you have the `fcntl' function. */ +#define _EVENT_HAVE_FCNTL 1 + +/* Define to 1 if you have the header file. */ +#define _EVENT_HAVE_FCNTL_H 1 + +/* Define to 1 if you have the `getaddrinfo' function. */ +#define _EVENT_HAVE_GETADDRINFO 1 + +/* Define to 1 if you have the `getnameinfo' function. */ +#define _EVENT_HAVE_GETNAMEINFO 1 + +/* Define to 1 if you have the `gettimeofday' function. */ +#define _EVENT_HAVE_GETTIMEOFDAY 1 + +/* Define to 1 if you have the `inet_ntop' function. */ +#define _EVENT_HAVE_INET_NTOP 1 + +/* Define to 1 if you have the header file. */ +#define _EVENT_HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `kqueue' function. */ +#define _EVENT_HAVE_KQUEUE 1 + +/* Define to 1 if you have the `nsl' library (-lnsl). */ +/* #undef _EVENT_HAVE_LIBNSL */ + +/* Define to 1 if you have the `resolv' library (-lresolv). */ +#define _EVENT_HAVE_LIBRESOLV 1 + +/* Define to 1 if you have the `rt' library (-lrt). */ +#define _EVENT_HAVE_LIBRT 1 + +/* Define to 1 if you have the `socket' library (-lsocket). */ +/* #undef _EVENT_HAVE_LIBSOCKET */ + +/* Define to 1 if you have the header file. */ +#define _EVENT_HAVE_MEMORY_H 1 + +/* Define to 1 if you have the header file. */ +/* #undef _EVENT_HAVE_NETINET_IN6_H */ + +/* Define to 1 if you have the `poll' function. */ +#define _EVENT_HAVE_POLL 1 + +/* Define to 1 if you have the header file. */ +#define _EVENT_HAVE_POLL_H 1 + +/* Define to 1 if you have the `port_create' function. */ +/* #undef _EVENT_HAVE_PORT_CREATE */ + +/* Define to 1 if you have the header file. */ +/* #undef _EVENT_HAVE_PORT_H */ + +/* Define to 1 if you have the `select' function. */ +#define _EVENT_HAVE_SELECT 1 + +/* Define if F_SETFD is defined in */ +#define _EVENT_HAVE_SETFD 1 + +/* Define to 1 if you have the `sigaction' function. */ +#define _EVENT_HAVE_SIGACTION 1 + +/* Define to 1 if you have the `signal' function. */ +#define _EVENT_HAVE_SIGNAL 1 + +/* Define to 1 if you have the header file. */ +#define _EVENT_HAVE_SIGNAL_H 1 + +/* Define to 1 if you have the header file. */ +#define _EVENT_HAVE_STDARG_H 1 + +/* Define to 1 if you have the header file. */ +#define _EVENT_HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define _EVENT_HAVE_STDLIB_H 1 + +/* Define to 1 if you have the header file. */ +#define _EVENT_HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define _EVENT_HAVE_STRING_H 1 + +/* Define to 1 if you have the `strlcpy' function. */ +#define _EVENT_HAVE_STRLCPY 1 + +/* Define to 1 if you have the `strsep' function. */ +#define _EVENT_HAVE_STRSEP 1 + +/* Define to 1 if you have the `strtok_r' function. */ +#define _EVENT_HAVE_STRTOK_R 1 + +/* Define to 1 if you have the `strtoll' function. */ +#define _EVENT_HAVE_STRTOLL 1 + +/* Define to 1 if the system has the type `struct in6_addr'. */ +#define _EVENT_HAVE_STRUCT_IN6_ADDR 1 + +/* Define to 1 if you have the header file. */ +/* #undef _EVENT_HAVE_SYS_DEVPOLL_H */ + +/* Define to 1 if you have the header file. */ +/* #undef _EVENT_HAVE_SYS_EPOLL_H */ + +/* Define to 1 if you have the header file. */ +#define _EVENT_HAVE_SYS_EVENT_H 1 + +/* Define to 1 if you have the header file. */ +#define _EVENT_HAVE_SYS_IOCTL_H 1 + +/* Define to 1 if you have the header file. */ +#define _EVENT_HAVE_SYS_PARAM_H 1 + +/* Define to 1 if you have the header file. */ +#define _EVENT_HAVE_SYS_QUEUE_H 1 + +/* Define to 1 if you have the header file. */ +#define _EVENT_HAVE_SYS_SELECT_H 1 + +/* Define to 1 if you have the header file. */ +#define _EVENT_HAVE_SYS_SOCKET_H 1 + +/* Define to 1 if you have the header file. */ +#define _EVENT_HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define _EVENT_HAVE_SYS_TIME_H 1 + +/* Define to 1 if you have the header file. */ +#define _EVENT_HAVE_SYS_TYPES_H 1 + +/* Define if TAILQ_FOREACH is defined in */ +#define _EVENT_HAVE_TAILQFOREACH 1 + +/* Define if timeradd is defined in */ +#define _EVENT_HAVE_TIMERADD 1 + +/* Define if timerclear is defined in */ +#define _EVENT_HAVE_TIMERCLEAR 1 + +/* Define if timercmp is defined in */ +#define _EVENT_HAVE_TIMERCMP 1 + +/* Define if timerisset is defined in */ +#define _EVENT_HAVE_TIMERISSET 1 + +/* Define to 1 if the system has the type `uint16_t'. */ +#define _EVENT_HAVE_UINT16_T 1 + +/* Define to 1 if the system has the type `uint32_t'. */ +#define _EVENT_HAVE_UINT32_T 1 + +/* Define to 1 if the system has the type `uint64_t'. */ +#define _EVENT_HAVE_UINT64_T 1 + +/* Define to 1 if the system has the type `uint8_t'. */ +#define _EVENT_HAVE_UINT8_T 1 + +/* Define to 1 if you have the header file. */ +#define _EVENT_HAVE_UNISTD_H 1 + +/* Define to 1 if you have the `vasprintf' function. */ +#define _EVENT_HAVE_VASPRINTF 1 + +/* Define if kqueue works correctly with pipes */ +#define _EVENT_HAVE_WORKING_KQUEUE 1 + +/* Name of package */ +#define _EVENT_PACKAGE "libevent" + +/* Define to the address where bug reports for this package should be sent. */ +#define _EVENT_PACKAGE_BUGREPORT "" + +/* Define to the full name of this package. */ +#define _EVENT_PACKAGE_NAME "" + +/* Define to the full name and version of this package. */ +#define _EVENT_PACKAGE_STRING "" + +/* Define to the one symbol short name of this package. */ +#define _EVENT_PACKAGE_TARNAME "" + +/* Define to the version of this package. */ +#define _EVENT_PACKAGE_VERSION "" + +/* The size of `int', as computed by sizeof. */ +#define _EVENT_SIZEOF_INT 4 + +/* The size of `long', as computed by sizeof. */ +#define _EVENT_SIZEOF_LONG 4 + +/* The size of `long long', as computed by sizeof. */ +#define _EVENT_SIZEOF_LONG_LONG 8 + +/* The size of `short', as computed by sizeof. */ +#define _EVENT_SIZEOF_SHORT 2 + +/* Define to 1 if you have the ANSI C header files. */ +#define _EVENT_STDC_HEADERS 1 + +/* Define to 1 if you can safely include both and . */ +#define _EVENT_TIME_WITH_SYS_TIME 1 + +/* Version number of package */ +#define _EVENT_VERSION "1.4.12-stable" + +/* Define to appropriate substitue if compiler doesnt have __func__ */ +/* #undef _EVENT___func__ */ + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef _EVENT_const */ + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef _EVENT___cplusplus +/* #undef _EVENT_inline */ +#endif + +/* Define to `int' if does not define. */ +/* #undef _EVENT_pid_t */ + +/* Define to `unsigned int' if does not define. */ +/* #undef _EVENT_size_t */ + +/* Define to unsigned int if you dont have it */ +/* #undef _EVENT_socklen_t */ +#endif Index: external/bsd/libevent/lib/Makefile =================================================================== RCS file: external/bsd/libevent/lib/Makefile diff -N external/bsd/libevent/lib/Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ external/bsd/libevent/lib/Makefile 1 Nov 2009 13:55:25 -0000 @@ -0,0 +1,101 @@ +# $NetBSD: Makefile$ + +USE_SHLIBDIR= yes + +.include + +.PATH: ${LIBEVENT_DIR}/dist + +LIB= event + +SRCS= buffer.c evbuffer.c evdns.c event.c event_tagging.c \ + evrpc.c evutil.c http.c kqueue.c log.c poll.c select.c \ + signal.c + +CPPFLAGS+= -fno-strict-aliasing + +CPPFLAGS.evdns.c+= -Wno-shadow -Wno-cast-qual +CPPFLAGS.event_tagging.c+= -Wno-cast-qual +CPPFLAGS.evrpc.c+= -Wno-cast-qual +CPPFLAGS.http.c+= -Wno-cast-qual -Wno-sign-compare +CPPFLAGS.kqueue.c+= -Wno-sign-compare +CPPFLAGS.select.c+= -Wno-sign-compare + +LINTFLAGS+= -X 27 # http.c "redeclaration of %s" + +MAN= evdns.3 event.3 + +MLINKS+= event.3 event_init.3 +MLINKS+= event.3 event_dispatch.3 +MLINKS+= event.3 event_loop.3 +MLINKS+= event.3 event_loopexit.3 +MLINKS+= event.3 event_loopbreak.3 +MLINKS+= event.3 event_base_dispatch.3 +MLINKS+= event.3 event_base_free.3 +MLINKS+= event.3 event_base_loop.3 +MLINKS+= event.3 event_base_loopexit.3 +MLINKS+= event.3 event_base_loopbreak.3 +MLINKS+= event.3 event_base_set.3 +MLINKS+= event.3 event_set.3 +MLINKS+= event.3 event_add.3 +MLINKS+= event.3 event_del.3 +MLINKS+= event.3 event_once.3 +MLINKS+= event.3 event_base_once.3 +MLINKS+= event.3 event_pending.3 +MLINKS+= event.3 event_initialized.3 + +MLINKS+= event.3 evtimer_set.3 +MLINKS+= event.3 evtimer_add.3 +MLINKS+= event.3 evtimer_del.3 +MLINKS+= event.3 evtimer_pending.3 +MLINKS+= event.3 evtimer_initialized.3 + +MLINKS+= event.3 signal_set.3 +MLINKS+= event.3 signal_add.3 +MLINKS+= event.3 signal_del.3 +MLINKS+= event.3 signal_pending.3 +MLINKS+= event.3 signal_initialized.3 + +MLINKS+= event.3 bufferevent_new.3 +MLINKS+= event.3 bufferevent_free.3 +MLINKS+= event.3 bufferevent_write.3 +MLINKS+= event.3 bufferevent_write_buffer.3 +MLINKS+= event.3 bufferevent_read.3 +MLINKS+= event.3 bufferevent_enable.3 +MLINKS+= event.3 bufferevent_disable.3 +MLINKS+= event.3 bufferevent_settimeout.3 +MLINKS+= event.3 bufferevent_base_set.3 + +MLINKS+= event.3 evbuffer_new.3 +MLINKS+= event.3 evbuffer_free.3 +MLINKS+= event.3 evbuffer_add.3 +MLINKS+= event.3 evbuffer_add_buffer.3 +MLINKS+= event.3 evbuffer_add_printf.3 +MLINKS+= event.3 evbuffer_add_vprintf.3 +MLINKS+= event.3 evbuffer_drain.3 +MLINKS+= event.3 evbuffer_write.3 +MLINKS+= event.3 evbuffer_read.3 +MLINKS+= event.3 evbuffer_find.3 +MLINKS+= event.3 evbuffer_readline.3 + +MLINKS+= event.3 evhttp_new.3 +MLINKS+= event.3 evhttp_bind_socket.3 +MLINKS+= event.3 evhttp_free.3 + +MLINKS+= evdns.3 evdns_init.3 +MLINKS+= evdns.3 evdns_shutdown.3 +MLINKS+= evdns.3 evdns_err_to_string.3 +MLINKS+= evdns.3 evdns_nameserver_add.3 +MLINKS+= evdns.3 evdns_count_nameservers.3 +MLINKS+= evdns.3 evdns_clear_nameservers_and_suspend.3 +MLINKS+= evdns.3 evdns_resume.3 +MLINKS+= evdns.3 evdns_nameserver_ip_add.3 +MLINKS+= evdns.3 evdns_resolve_ipv4.3 +MLINKS+= evdns.3 evdns_resolve_reverse.3 +MLINKS+= evdns.3 evdns_resolv_conf_parse.3 +MLINKS+= evdns.3 evdns_search_clear.3 +MLINKS+= evdns.3 evdns_search_add.3 +MLINKS+= evdns.3 evdns_search_ndots_set.3 +MLINKS+= evdns.3 evdns_set_log_fn.3 + +.include Index: external/bsd/libevent/lib/shlib_version =================================================================== RCS file: external/bsd/libevent/lib/shlib_version diff -N external/bsd/libevent/lib/shlib_version --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ external/bsd/libevent/lib/shlib_version 1 Nov 2009 13:55:25 -0000 @@ -0,0 +1,6 @@ +# $NetBSD: shlib_version$ +# Remember to update distrib/sets/lists/base/shl.* when changing +# + +major=3 +minor=2 Index: compat/build-makefiles =================================================================== RCS file: /cvsroot/src/compat/build-makefiles,v retrieving revision 1.8 diff -u -r1.8 build-makefiles --- compat/build-makefiles 21 Jul 2009 01:05:35 -0000 1.8 +++ compat/build-makefiles 1 Nov 2009 13:55:25 -0000 @@ -7,7 +7,7 @@ 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 Index: compat/external/lib/Makefile =================================================================== RCS file: /cvsroot/src/compat/external/lib/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- compat/external/lib/Makefile 11 Sep 2009 16:01:59 -0000 1.9 +++ compat/external/lib/Makefile 1 Nov 2009 13:55:25 -0000 @@ -25,4 +25,6 @@ SUBDIR+= ../gpl3/binutils/lib .endif +SUBDIR+= ../bsd/libevent/lib + .include Index: compat/external/bsd/libevent/Makefile =================================================================== RCS file: compat/external/bsd/libevent/Makefile diff -N compat/external/bsd/libevent/Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ compat/external/bsd/libevent/Makefile 1 Nov 2009 13:55:25 -0000 @@ -0,0 +1,11 @@ +# $NetBSD$ + +.include + +_CURDIR:= ${.CURDIR} + +.CURDIR:=${NETBSDSRCDIR}/external/bsd/libevent + +.include "${.CURDIR}/Makefile" + +.CURDIR:= ${_CURDIR} Index: compat/external/bsd/libevent/Makefile.inc =================================================================== RCS file: compat/external/bsd/libevent/Makefile.inc diff -N compat/external/bsd/libevent/Makefile.inc --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ compat/external/bsd/libevent/Makefile.inc 1 Nov 2009 13:55:25 -0000 @@ -0,0 +1,9 @@ +# $NetBSD$ + +.include + +_CURDIR:= ${.CURDIR} + +.include "${NETBSDSRCDIR}/external/bsd/libevent/Makefile.inc" + +.CURDIR:= ${_CURDIR} Index: compat/external/bsd/libevent/include/Makefile =================================================================== RCS file: compat/external/bsd/libevent/include/Makefile diff -N compat/external/bsd/libevent/include/Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ compat/external/bsd/libevent/include/Makefile 1 Nov 2009 13:55:25 -0000 @@ -0,0 +1,37 @@ +# $NetBSD$ +# Generated from: NetBSD: build-makefiles,v 1.8 2009/07/21 01:05:35 mrg Exp + +NOLINT= # defined +NOMAN= # defined +NONLS= # defined +NOINFO= # defined +NOSHARE= # defined + +NOCHECKVER= # defined + +.include + +# Resolve pathnames in variables. +_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD LIBDPLIBS LIB_ROOT_DIR +.for var in ${_RESOLVE_VARS} +${var}:= ${${var}} +.endfor + +.include + +_CURDIR:= ${.CURDIR} + +.PATH: ${NETBSDSRCDIR}/external/bsd/libevent/include +.CURDIR:=${NETBSDSRCDIR}/external/bsd/libevent/include + +.include "${NETBSDSRCDIR}/compat/Makefile.compat" +.include "${.CURDIR}/Makefile" + +# Resolve pathnames from "real" Makefile, and switch .CURDIR back. +_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD ARCHDIR COMPATDIR COMPATARCHDIR LIBCDIR RPC_INCS RPC_XDIR LIBEDITDIR MODOBJDIR RUMPTOP +.for var in ${_RESOLVE_VARS} +${var}:= ${${var}} +.endfor + +.CURDIR:= ${_CURDIR} +.undef _CURDIR Index: compat/external/bsd/libevent/lib/Makefile =================================================================== RCS file: compat/external/bsd/libevent/lib/Makefile diff -N compat/external/bsd/libevent/lib/Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ compat/external/bsd/libevent/lib/Makefile 1 Nov 2009 13:55:25 -0000 @@ -0,0 +1,37 @@ +# $NetBSD$ +# Generated from: NetBSD: build-makefiles,v 1.8 2009/07/21 01:05:35 mrg Exp + +NOLINT= # defined +NOMAN= # defined +NONLS= # defined +NOINFO= # defined +NOSHARE= # defined + +NOCHECKVER= # defined + +.include + +# Resolve pathnames in variables. +_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD LIBDPLIBS LIB_ROOT_DIR +.for var in ${_RESOLVE_VARS} +${var}:= ${${var}} +.endfor + +.include + +_CURDIR:= ${.CURDIR} + +.PATH: ${NETBSDSRCDIR}/external/bsd/libevent/lib +.CURDIR:=${NETBSDSRCDIR}/external/bsd/libevent/lib + +.include "${NETBSDSRCDIR}/compat/Makefile.compat" +.include "${.CURDIR}/Makefile" + +# Resolve pathnames from "real" Makefile, and switch .CURDIR back. +_RESOLVE_VARS= CFLAGS CPPFLAGS DPADD LDADD ARCHDIR COMPATDIR COMPATARCHDIR LIBCDIR RPC_INCS RPC_XDIR LIBEDITDIR MODOBJDIR RUMPTOP +.for var in ${_RESOLVE_VARS} +${var}:= ${${var}} +.endfor + +.CURDIR:= ${_CURDIR} +.undef _CURDIR Index: regress/lib/Makefile =================================================================== RCS file: /cvsroot/src/regress/lib/Makefile,v retrieving revision 1.21 diff -u -r1.21 Makefile --- regress/lib/Makefile 14 Feb 2009 00:26:14 -0000 1.21 +++ regress/lib/Makefile 1 Nov 2009 13:55:26 -0000 @@ -2,7 +2,7 @@ .include -SUBDIR+= csu libc libevent libm libposix libpthread librt libutil +SUBDIR+= csu libc libm libposix libpthread librt libutil .if (${MACHINE_CPU} != "alpha" && \ ${MACHINE_CPU} != "mips" && \ Index: tests/lib/Makefile =================================================================== RCS file: /cvsroot/src/tests/lib/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- tests/lib/Makefile 20 Jul 2009 17:03:38 -0000 1.1 +++ tests/lib/Makefile 1 Nov 2009 13:55:26 -0000 @@ -2,7 +2,7 @@ .include -SUBDIR= libc +SUBDIR= libc libevent TESTSDIR= ${TESTSBASE}/lib Index: tests/lib/libevent/Atffile =================================================================== RCS file: tests/lib/libevent/Atffile diff -N tests/lib/libevent/Atffile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tests/lib/libevent/Atffile 1 Nov 2009 13:55:26 -0000 @@ -0,0 +1,6 @@ +Content-Type: application/X-atf-atffile; version="1" +X-NetBSD-Id: "$NetBSD: Atffile$" + +prop: test-suite = "NetBSD" + +tp: t_event Index: tests/lib/libevent/Makefile =================================================================== RCS file: tests/lib/libevent/Makefile diff -N tests/lib/libevent/Makefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tests/lib/libevent/Makefile 1 Nov 2009 13:55:26 -0000 @@ -0,0 +1,26 @@ +# $NetBSD: Makefile$ + +TESTSDIR= ${TESTSBASE}/lib/libevent + +TESTS_SH= t_event + +.include +.include <../../../external/bsd/libevent/Makefile.inc> + +.PATH: ${LIBEVENT_DIR}/dist/test + +BINDIR= ${TESTSDIR} + +PROG= h_event +MAN= # defined +SRCS= regress.c regress.gen.c regress_dns.c regress_http.c \ + regress_rpc.c + +DPADD+= ${LIBEVENT} +LDADD+= -levent + +CPPFLAGS.regress.c+= -Wno-cast-qual -Wno-sign-compare -Wno-shadow +CPPFLAGS.regress_http.c+= -Wno-cast-qual -Wno-sign-compare -Wno-shadow +CPPFLAGS.regress_rpc.c+= -Wno-cast-qual -Wno-shadow + +.include Index: tests/lib/libevent/t_event.sh =================================================================== RCS file: tests/lib/libevent/t_event.sh diff -N tests/lib/libevent/t_event.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ tests/lib/libevent/t_event.sh 1 Nov 2009 13:55:26 -0000 @@ -0,0 +1,67 @@ +# $NetBSD: t_event.sh$ +# +# Copyright (c) 2009 The NetBSD Foundation, Inc. +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS +# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS +# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# + +# +# This is not great but rather than reimplementing the libevent +# provided regression tests, we use an ATF wrapper around the test +# program which carries out all the tests and prints an extensive +# report. +# + +atf_test_case kqueue +kqueue_head() { + atf_set "descr" "Test libevent with kqueue backend" +} +kqueue_body() { + EVENT_NOPOLL=1 EVENT_NOSELECT=1 \ + $(atf_get_srcdir)/h_event 2>&1 || atf_fail "check report" +} + +atf_test_case poll +poll_head() { + atf_set "descr" "Test libevent with poll backend" +} +poll_body() { + EVENT_NOKQUEUE=1 EVENT_NOSELECT=1 \ + $(atf_get_srcdir)/h_event 2>&1 || atf_fail "check report" +} + +atf_test_case select +select_head() { + atf_set "descr" "Test libevent with select backend" +} +select_body() { + EVENT_NOKQUEUE=1 EVENT_NOPOLL=1 \ + $(atf_get_srcdir)/h_event 2>&1 || atf_fail "check report" +} + +atf_init_test_cases() +{ + atf_add_test_case kqueue + atf_add_test_case poll + atf_add_test_case select +} Index: distrib/sets/lists/base/md.amd64 =================================================================== RCS file: /cvsroot/src/distrib/sets/lists/base/md.amd64,v retrieving revision 1.71 diff -u -r1.71 md.amd64 --- distrib/sets/lists/base/md.amd64 11 Oct 2009 08:19:57 -0000 1.71 +++ distrib/sets/lists/base/md.amd64 1 Nov 2009 13:55:26 -0000 @@ -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 Index: distrib/sets/lists/base/md.sparc64 =================================================================== RCS file: /cvsroot/src/distrib/sets/lists/base/md.sparc64,v retrieving revision 1.64 diff -u -r1.64 md.sparc64 --- distrib/sets/lists/base/md.sparc64 11 Oct 2009 08:19:57 -0000 1.64 +++ distrib/sets/lists/base/md.sparc64 1 Nov 2009 13:55:26 -0000 @@ -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 Index: distrib/sets/lists/base/shl.mi =================================================================== RCS file: /cvsroot/src/distrib/sets/lists/base/shl.mi,v retrieving revision 1.500 diff -u -r1.500 shl.mi --- distrib/sets/lists/base/shl.mi 11 Oct 2009 11:26:40 -0000 1.500 +++ distrib/sets/lists/base/shl.mi 1 Nov 2009 13:55:26 -0000 @@ -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.4.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 Index: distrib/sets/lists/comp/mi =================================================================== RCS file: /cvsroot/src/distrib/sets/lists/comp/mi,v retrieving revision 1.1329 diff -u -r1.1329 mi --- distrib/sets/lists/comp/mi 14 Oct 2009 17:30:50 -0000 1.1329 +++ distrib/sets/lists/comp/mi 1 Nov 2009 13:55:54 -0000 @@ -3625,6 +3625,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 Index: distrib/sets/lists/tests/mi =================================================================== RCS file: /cvsroot/src/distrib/sets/lists/tests/mi,v retrieving revision 1.52 diff -u -r1.52 mi --- distrib/sets/lists/tests/mi 25 Sep 2009 11:58:08 -0000 1.52 +++ distrib/sets/lists/tests/mi 1 Nov 2009 13:55:55 -0000 @@ -139,6 +139,9 @@ ./usr/libdata/debug/usr/tests/lib/libc/stdlib/t_mi_vector_hash.debug tests-lib-debug debug ./usr/libdata/debug/usr/tests/lib/libc/string tests-lib-debug ./usr/libdata/debug/usr/tests/lib/libc/string/t_popcount.debug tests-lib-debug debug +./usr/libdata/debug/usr/tests/lib/libevent tests-lib-debug +./usr/libdata/debug/usr/tests/lib/libevent/h_event.debug tests-lib-debug debug +./usr/libdata/debug/usr/tests/lib/libevent/t_event.debug tests-lib-debug debug ./usr/libdata/debug/usr/tests/libexec tests-lib-debug ./usr/libdata/debug/usr/tests/libexec/ld.elf_so tests-libexec-debug ./usr/libdata/debug/usr/tests/libexec/ld.elf_so/t_dlinfo.debug tests-libexec-debug debug @@ -858,6 +861,10 @@ ./usr/tests/lib/libc/string tests-lib-tests ./usr/tests/lib/libc/string/Atffile tests-lib-tests ./usr/tests/lib/libc/string/t_popcount tests-lib-tests +./usr/tests/lib/libevent tests-lib-tests +./usr/tests/lib/libevent/Atffile tests-lib-tests +./usr/tests/lib/libevent/h_event tests-lib-tests +./usr/tests/lib/libevent/t_event tests-lib-tests ./usr/tests/libexec tests-lib-tests ./usr/tests/libexec/Atffile tests-lib-tests ./usr/tests/libexec/ld.elf_so tests-libexec-tests Index: etc/mtree/NetBSD.dist.base =================================================================== RCS file: /cvsroot/src/etc/mtree/NetBSD.dist.base,v retrieving revision 1.4 diff -u -r1.4 NetBSD.dist.base --- etc/mtree/NetBSD.dist.base 12 Oct 2009 08:54:19 -0000 1.4 +++ etc/mtree/NetBSD.dist.base 1 Nov 2009 13:55:56 -0000 @@ -209,6 +209,7 @@ ./usr/libdata/debug/usr/tests/lib/libc ./usr/libdata/debug/usr/tests/lib/libc/stdlib ./usr/libdata/debug/usr/tests/lib/libc/string +./usr/libdata/debug/usr/tests/lib/libevent ./usr/libdata/debug/usr/tests/libexec ./usr/libdata/debug/usr/tests/libexec/ld.elf_so ./usr/libdata/debug/usr/tests/modules @@ -1096,6 +1097,7 @@ ./usr/tests/lib/libc ./usr/tests/lib/libc/stdlib ./usr/tests/lib/libc/string +./usr/tests/lib/libevent ./usr/tests/libexec ./usr/tests/libexec/ld.elf_so ./usr/tests/modules