Update to libevent-1.4.3.

1.4.3-stable:
1.4.2-rc:
* make Solaris event subsystems more reliable; from W.C.A. Wijngaards
* event_base_get_method(); from Springande Ulv
* fix HTTP/1.1 chunk formatting; from "propanbutan"
* allow 64-bit content lengths; from Scott Lamb
* and more...
1.4.1-beta:
* fixed some memory leaks and other misc cleanup; from Christopher Layne,
  Scott Lamb and Charles Kerr
* introduced event_reinit to deal with fork()
* improved efficiency of generated RPC structure
* performance improvements to Win32 backend
* and many more...
1.4.0-beta:
* a new RPC subsytem for writing distributed clients and servers
* almost everything is documented via Doxygen now
* many fixes and improvements to evdns and evhttp
* libevent now builds two additional libraries: libevent_core (containing only
  the event core) and libevent_extras (contained evdns, evhttp and evrpc)
* performance improvements due to using a heap instead of red-black trees for
  timeouts
* Solaris' event ports are better supported
1.3e:
* Fix compilation on Solaris; from Magne Mahre
* Add a "Date" header to HTTP responses when it's missing, as required by
  HTTP 1.1. Original Patch from Ralph Moritz.
* Fix a memory leak in which failed HTTP connections whould not free the
  request object.
* Fix a memory leak in the DNS server.
* Handle NULL timeouts correctly on Solaris; from Trond Norbye
* Recalculate pending events properly when reallocating event array on
  Solaris; from Trond Norbye

8 files changed, 44 insertions, 81 deletions

diff --git a/devel/libevent/Makefile b/devel/libevent/Makefile
index e2c3564bd4f..e748a240bf3 100644
--- a/devel/libevent/Makefile
+++ b/devel/libevent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2007/10/04 12:28:13 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.27 2008/04/22 17:16:54 tnn Exp $
 #
 # WARNING: updating this package (as of the 1.1/1.2 releases) means
 # updating BUILDLINK_ABI_DEPENDS in buildlink3.mk and a PKGREVISION
@@ -7,8 +7,8 @@
 # from being ABI compatible across releases until this is fixed.
 # [tvierling 20070210]
 
-DISTNAME=	libevent-1.3d
-PKGREVISION=	2
+DISTNAME=	libevent-1.4.3-stable
+PKGNAME=	${DISTNAME:S/-stable//}
 CATEGORIES=	devel
 MASTER_SITES=	http://monkey.org/~provos/
 
@@ -26,21 +26,4 @@ LIBS.SunOS+=	-lnsl -lresolv
 # XXX helps build, but needs more testing
 #CFLAGS.Interix+=	-Dsockaddr_storage=sockaddr_in -DNI_MAXSERV=32
 
-.include "../../mk/bsd.prefs.mk"
-
-# Solaris and HPUX don't have u_intX_t types in <inttypes.h>.
-.if ${OPSYS} == "SunOS" || ${OPSYS} == "HPUX"
-CFLAGS+=	-Du_int8_t=uint8_t
-CFLAGS+=	-Du_int16_t=uint16_t
-CFLAGS+=	-Du_int32_t=uint32_t
-
-SUBST_CLASSES+=		inttypes
-SUBST_STAGE.inttypes=	post-patch
-SUBST_FILES.inttypes=	event.h
-SUBST_SED.inttypes=	-e "s,<stdint\.h>,<inttypes.h>,g"
-SUBST_SED.inttypes+=	-e "s,u_int8_t,uint8_t,g"
-SUBST_SED.inttypes+=	-e "s,u_int16_t,uint16_t,g"
-SUBST_SED.inttypes+=	-e "s,u_int32_t,uint32_t,g"
-.endif
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libevent/PLIST b/devel/libevent/PLIST
index 6117a3ca90f..f35a7230cae 100644
--- a/devel/libevent/PLIST
+++ b/devel/libevent/PLIST
@@ -1,8 +1,13 @@
-@comment $NetBSD: PLIST,v 1.4 2007/02/11 05:34:33 tv Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/04/22 17:16:54 tnn Exp $
 bin/event_rpcgen.py
-include/event.h
 include/evdns.h
+include/event-config.h
+include/event.h
 include/evhttp.h
+include/evrpc.h
+include/evutil.h
 lib/libevent.la
-man/man3/event.3
+lib/libevent_core.la
+lib/libevent_extra.la
 man/man3/evdns.3
+man/man3/event.3
diff --git a/devel/libevent/buildlink3.mk b/devel/libevent/buildlink3.mk
index 62b95072ece..bfc65003cbe 100644
--- a/devel/libevent/buildlink3.mk
+++ b/devel/libevent/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2007/08/16 08:59:45 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2008/04/22 17:16:54 tnn Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBEVENT_BUILDLINK3_MK:=	${LIBEVENT_BUILDLINK3_MK}+
@@ -13,8 +13,8 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}libevent
 
 .if !empty(LIBEVENT_BUILDLINK3_MK:M+)
 BUILDLINK_API_DEPENDS.libevent+=libevent>=0.6
-BUILDLINK_ABI_DEPENDS.libevent+=libevent-1.3d* # exact match -- see Makefile
-BUILDLINK_PKGSRCDIR.libevent?=	../../devel/libevent
+BUILDLINK_ABI_DEPENDS.libevent+=libevent-1.4.3* # exact match -- see Makefile
+BUILDLINK_PKGSRCDIR.libevent?=	../../wip/libevent
 .endif	# LIBEVENT_BUILDLINK3_MK
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libevent/builtin.mk b/devel/libevent/builtin.mk
index 6c3929b58ac..1e0e1e66d88 100644
--- a/devel/libevent/builtin.mk
+++ b/devel/libevent/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.6 2007/07/29 06:23:04 obache Exp $
+# $NetBSD: builtin.mk,v 1.7 2008/04/22 17:16:54 tnn Exp $
 
 BUILTIN_PKG:=	libevent
 
diff --git a/devel/libevent/distinfo b/devel/libevent/distinfo
index 94e2d1d27f5..fa45244dd5c 100644
--- a/devel/libevent/distinfo
+++ b/devel/libevent/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.19 2007/10/04 12:28:13 dmcmahill Exp $
+$NetBSD: distinfo,v 1.20 2008/04/22 17:16:54 tnn Exp $
 
-SHA1 (libevent-1.3d.tar.gz) = 591b3c43652e1b88511d1022b296cf214b37644b
-RMD160 (libevent-1.3d.tar.gz) = 1eae8acefba6d09b4f7f5c99f9469c881dc5426a
-Size (libevent-1.3d.tar.gz) = 441883 bytes
-SHA1 (patch-aa) = 08a7dd87194730b0d3294deee7feb196e22c1b77
-SHA1 (patch-ac) = 47bbbd25fbd58c15d8dc5fbd824da610f19d8ca4
+SHA1 (libevent-1.4.3-stable.tar.gz) = 222812fc8993823895567ea5de1dc16880b0fac6
+RMD160 (libevent-1.4.3-stable.tar.gz) = dd2930dfc25b1946e2a2fc2afa1d170281c95e3c
+Size (libevent-1.4.3-stable.tar.gz) = 479756 bytes
+SHA1 (patch-aa) = 6c8a07b3ff7bb6daa972409b0a8bd76dc551f0a6
+SHA1 (patch-ac) = cf4ac4f8e6c72bb11cf714b3b5e569e2a8c1ce34
 SHA1 (patch-ad) = c842811d0b8e3f843a2f363dd2d11ec784fb8264
-SHA1 (patch-ae) = 1175c8fbd19623cb8b2fb9fd9ba2220fb3db90e4
diff --git a/devel/libevent/patches/patch-aa b/devel/libevent/patches/patch-aa
index fa0e19614c4..6bcfb14724b 100644
--- a/devel/libevent/patches/patch-aa
+++ b/devel/libevent/patches/patch-aa
@@ -1,14 +1,15 @@
-$NetBSD: patch-aa,v 1.3 2007/08/01 17:00:03 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2008/04/22 17:16:54 tnn Exp $
 
---- select.c.orig	2007-08-01 18:53:42.000000000 +0200
-+++ select.c
-@@ -47,6 +47,9 @@
- #ifdef CHECK_INVARIANTS
- #include <assert.h>
- #endif
-+#ifdef _AIX
-+#include <sys/select.h>
-+#endif
+--- 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' )
  
- #include "event.h"
- #include "event-internal.h"
+     for statement in headerdirect:
diff --git a/devel/libevent/patches/patch-ac b/devel/libevent/patches/patch-ac
index 96bf315ebac..b570e7a0d00 100644
--- a/devel/libevent/patches/patch-ac
+++ b/devel/libevent/patches/patch-ac
@@ -1,22 +1,18 @@
-$NetBSD: patch-ac,v 1.3 2007/10/04 06:06:19 dmcmahill Exp $
+$NetBSD: patch-ac,v 1.4 2008/04/22 17:16:54 tnn Exp $
 
---- test/regress.gen.h.orig	2007-08-16 00:51:57.000000000 -0400
+--- test/regress.gen.h.orig	2008-03-03 04:37:13.000000000 +0100
 +++ test/regress.gen.h
-@@ -5,7 +5,16 @@
- #ifndef _REGRESS_RPC_
- #define _REGRESS_RPC_
- 
--#include <stdint.h>
-+#include "config.h"
+@@ -8,7 +8,13 @@
+ #include <event-config.h>
+ #ifdef _EVENT_HAVE_STDINT_H
+ #include <stdint.h>
 +
-+#ifdef HAVE_STDINT_H
-+#  include <stdint.h>
-+#elif defined(HAVE_INTTYPES_H)
++#elif defined(_EVENT_HAVE_INTTYPES_H)
 +#  include <inttypes.h>
 +#else
 +#  error No inttypes.h or stdint.h to give integer types
-+#endif
+ #endif
 +
  #define EVTAG_HAS(msg, member) ((msg)->member##_set == 1)
- #define EVTAG_ASSIGN(msg, member, args...) (*(msg)->member##_assign)(msg, ## args)
- #define EVTAG_GET(msg, member, args...) (*(msg)->member##_get)(msg, ## args)
+ #define EVTAG_ASSIGN(msg, member, args...) (*(msg)->base->member##_assign)(msg, ## args)
+ #define EVTAG_GET(msg, member, args...) (*(msg)->base->member##_get)(msg, ## args)
diff --git a/devel/libevent/patches/patch-ae b/devel/libevent/patches/patch-ae
deleted file mode 100644
index 0d49620ac25..00000000000
--- a/devel/libevent/patches/patch-ae
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2007/10/04 06:06:20 dmcmahill Exp $
-
---- event_rpcgen.py.orig	2007-08-02 11:23:05.000000000 -0400
-+++ event_rpcgen.py
-@@ -1295,8 +1295,14 @@ def HeaderPreamble(name):
-         '#define %s\n\n' ) % (
-         name, guard, guard)
- 
--    # insert stdint.h - let's hope everyone has it
--    pre += '#include <stdint.h>\n'
-+    pre += ('#include "config.h"\n'
-+            '#ifdef HAVE_STDINT_H\n'
-+            '#  include <stdint.h>\n'
-+            '#elif defined(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:
-         pre += '%s\n' % statement