Update to libevent-2.0.10.

Supposedly API backwards-compatible with libevent 1.x.
Will need a recursive revbump for shlib name changes, though.

All regression tests pass except "thread_conditions_simple". Not sure
why yet, but it's new API so shouldn't break anything existing in pkgsrc
today.

Changes in libevent 2.0 include cleaner interfaces, buffered I/O improvements,
improved multithreading and openssl integration.

7 files changed, 45 insertions, 61 deletions

diff --git a/devel/libevent/Makefile b/devel/libevent/Makefile
index 8598dd5e504..a96b339b768 100644
--- a/devel/libevent/Makefile
+++ b/devel/libevent/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.35 2010/01/29 15:13:00 tnn Exp $
+# $NetBSD: Makefile,v 1.36 2011/02/11 21:13:47 tnn Exp $
 #
 
-DISTNAME=	libevent-1.4.12-stable
+DISTNAME=	libevent-2.0.10-stable
 PKGNAME=	${DISTNAME:S/-stable//}
-PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://monkey.org/~provos/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://monkey.org/~provos/libevent/
 COMMENT=	Asynchronous event notification library
+LICENSE=	modified-bsd
 
 CONFLICTS+=	libev<3.9nb1
 
@@ -20,6 +20,10 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 LIBS.SunOS+=	-lnsl -lresolv
 
+PKGCONFIG_OVERRIDE+=	libevent_openssl.pc.in
+PKGCONFIG_OVERRIDE+=	libevent_pthreads.pc.in
+PKGCONFIG_OVERRIDE+=	libevent.pc.in
+
 # XXX helps build, but needs more testing
 #CFLAGS.Interix+=	-Dsockaddr_storage=sockaddr_in -DNI_MAXSERV=32
 
@@ -30,4 +34,5 @@ CONFIGURE_ENV+=		ac_cv_func_strtoll=yes
 CPPFLAGS+=		-Dstrtoll=__strtoll
 .endif
 
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libevent/PLIST b/devel/libevent/PLIST
index f35a7230cae..2260d0d8d88 100644
--- a/devel/libevent/PLIST
+++ b/devel/libevent/PLIST
@@ -1,13 +1,40 @@
-@comment $NetBSD: PLIST,v 1.5 2008/04/22 17:16:54 tnn Exp $
+@comment $NetBSD: PLIST,v 1.6 2011/02/11 21:13:47 tnn Exp $
 bin/event_rpcgen.py
 include/evdns.h
-include/event-config.h
 include/event.h
+include/event2/buffer.h
+include/event2/buffer_compat.h
+include/event2/bufferevent.h
+include/event2/bufferevent_compat.h
+include/event2/bufferevent_ssl.h
+include/event2/bufferevent_struct.h
+include/event2/dns.h
+include/event2/dns_compat.h
+include/event2/dns_struct.h
+include/event2/event-config.h
+include/event2/event.h
+include/event2/event_compat.h
+include/event2/event_struct.h
+include/event2/http.h
+include/event2/http_compat.h
+include/event2/http_struct.h
+include/event2/keyvalq_struct.h
+include/event2/listener.h
+include/event2/rpc.h
+include/event2/rpc_compat.h
+include/event2/rpc_struct.h
+include/event2/tag.h
+include/event2/tag_compat.h
+include/event2/thread.h
+include/event2/util.h
 include/evhttp.h
 include/evrpc.h
 include/evutil.h
 lib/libevent.la
 lib/libevent_core.la
 lib/libevent_extra.la
-man/man3/evdns.3
-man/man3/event.3
+lib/libevent_openssl.la
+lib/libevent_pthreads.la
+lib/pkgconfig/libevent.pc
+lib/pkgconfig/libevent_openssl.pc
+lib/pkgconfig/libevent_pthreads.pc
diff --git a/devel/libevent/buildlink3.mk b/devel/libevent/buildlink3.mk
index 52636f3b060..897dba6ac5e 100644
--- a/devel/libevent/buildlink3.mk
+++ b/devel/libevent/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.18 2009/08/18 16:53:14 drochner Exp $
+# $NetBSD: buildlink3.mk,v 1.19 2011/02/11 21:13:47 tnn Exp $
 
 BUILDLINK_TREE+=	libevent
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	libevent
 LIBEVENT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libevent+=libevent>=0.6
-BUILDLINK_ABI_DEPENDS.libevent+=libevent>=1.4.3
+BUILDLINK_ABI_DEPENDS.libevent+=libevent>=2.0.10
 BUILDLINK_PKGSRCDIR.libevent?=	../../devel/libevent
 .endif # LIBEVENT_BUILDLINK3_MK
 
diff --git a/devel/libevent/distinfo b/devel/libevent/distinfo
index 390a9ad27d8..b8439364538 100644
--- a/devel/libevent/distinfo
+++ b/devel/libevent/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.24 2009/08/16 15:35:03 wiz Exp $
+$NetBSD: distinfo,v 1.25 2011/02/11 21:13:47 tnn Exp $
 
-SHA1 (libevent-1.4.12-stable.tar.gz) = ad5013cf5646e6fc6d0b832c0284b35086250c8b
-RMD160 (libevent-1.4.12-stable.tar.gz) = 142b188e44598d6f3892e5630130ace678ffa701
-Size (libevent-1.4.12-stable.tar.gz) = 499266 bytes
-SHA1 (patch-aa) = 6c8a07b3ff7bb6daa972409b0a8bd76dc551f0a6
-SHA1 (patch-ac) = 87ea2413896c83527bcb6334a397d001a4e7e6ce
-SHA1 (patch-ad) = c842811d0b8e3f843a2f363dd2d11ec784fb8264
+SHA1 (libevent-2.0.10-stable.tar.gz) = 21e26de201d55f47f9b340b014bd3b7a7d8b1f69
+RMD160 (libevent-2.0.10-stable.tar.gz) = 4a81ceda5fec37070b096c2a85f0e5ea22991a11
+Size (libevent-2.0.10-stable.tar.gz) = 793010 bytes
diff --git a/devel/libevent/patches/patch-aa b/devel/libevent/patches/patch-aa
deleted file mode 100644
index 6bcfb14724b..00000000000
--- a/devel/libevent/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2008/04/22 17:16:54 tnn Exp $
-
---- event_rpcgen.py.orig	2008-03-03 04:37:12.000000000 +0100
-+++ event_rpcgen.py
-@@ -1310,6 +1310,10 @@ def HeaderPreamble(name):
-         '#include <event-config.h>\n'
-         '#ifdef _EVENT_HAVE_STDINT_H\n'
-         '#include <stdint.h>\n'
-+	'#elif defined(_EVENT_HAVE_INTTYPES_H)\n'
-+	'#  include <inttypes.h>\n'
-+	'#else\n'
-+	'#  error No inttypes.h or stdint.h to give integer types\n'
-         '#endif\n' )
- 
-     for statement in headerdirect:
diff --git a/devel/libevent/patches/patch-ac b/devel/libevent/patches/patch-ac
deleted file mode 100644
index b8b4d0743b8..00000000000
--- a/devel/libevent/patches/patch-ac
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2009/08/16 15:35:04 wiz Exp $
-
---- test/regress.gen.h.orig	2009-07-25 02:17:41.000000000 +0000
-+++ test/regress.gen.h
-@@ -8,7 +8,13 @@
- #include <event-config.h>
- #ifdef _EVENT_HAVE_STDINT_H
- #include <stdint.h>
-+
-+#elif defined(_EVENT_HAVE_INTTYPES_H)
-+#  include <inttypes.h>
-+#else
-+#  error No inttypes.h or stdint.h to give integer types
- #endif
-+
- #define EVTAG_HAS(msg, member) ((msg)->member##_set == 1)
- #ifdef __GNUC__
- #define EVTAG_ASSIGN(msg, member, args...) (*(msg)->base->member##_assign)(msg, ## args)
diff --git a/devel/libevent/patches/patch-ad b/devel/libevent/patches/patch-ad
deleted file mode 100644
index 09d3cb09918..00000000000
--- a/devel/libevent/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2007/08/01 17:00:03 joerg Exp $
-
---- event.c.orig	2007-08-01 16:58:11.000000000 +0200
-+++ event.c
-@@ -44,6 +44,7 @@
- #include <sys/queue.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#include <time.h>
- #ifndef WIN32
- #include <unistd.h>
- #endif