5 files changed, 103 insertions, 19 deletions

diff --git a/devel/libevent/Makefile b/devel/libevent/Makefile
index 7cc9da5cf19a..6d996a386c95 100644
--- a/devel/libevent/Makefile
+++ b/devel/libevent/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	libevent
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://monkey.org/~provos/
 
@@ -18,22 +19,72 @@ USE_LDCONFIG=	yes
 
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
-MAN3=	event.3
-MLINKS=	event.3 event_init.3 event.3 event_dispatch.3 event.3 event_loop.3 \
-	event.3 event_loopexit.3 event.3 event_set.3 event.3 event_add.3 \
-	event.3 event_del.3 event.3 event_once.3 event.3 event_pending.3 \
-	event.3 event_initialized.3 event.3 event_priority_init.3 \
-	event.3 event_priority_set.3 event.3 evtimer_set.3 event.3 evtimer_add.3 \
-	event.3 evtimer_del.3 event.3 evtimer_pending.3 event.3 evtimer_initialized.3 \
-	event.3 signal_set.3 event.3 signal_add.3 event.3 signal_del.3 \
-	event.3 signal_pending.3 event.3 signal_initialized.3 event.3 bufferevent_new.3 \
-	event.3 bufferevent_free.3 event.3 bufferevent_write.3 \
-	event.3 bufferevent_write_buffer.3 event.3 bufferevent_read.3 \
-	event.3 bufferevent_enable.3 event.3 bufferevent_disable.3 \
-	event.3 bufferevent_settimeout.3 event.3 evbuffer_new.3 \
-	event.3 evbuffer_free.3 event.3 evbuffer_add.3 event.3 evbuffer_add_buffer.3 \
-	event.3 evbuffer_add_printf.3 event.3 evbuffer_drain.3 \
-	event.3 evbuffer_write.3 event.3 evbuffer_read.3 event.3 evbuffer_find.3
+MAN3=	event.3 \
+	evdns.3
+MLINKS=	event.3 event_init.3 \
+	- event_dispatch.3 \
+	- event_loop.3 \
+	- event_loopexit.3 \
+	- event_set.3 \
+	- event_base_dispatch.3 \
+	- event_base_loop.3 \
+	- event_base_loopexit.3 \
+	- event_base_set.3 \
+	- event_add.3 \
+	- event_del.3 \
+	- event_once.3 \
+	- event_pending.3 \
+	- event_initialized.3 \
+	- event_priority_init.3 \
+	- event_priority_set.3 \
+	- evtimer_set.3 \
+	- evtimer_add.3 \
+	- evtimer_del.3 \
+	- evtimer_pending.3 \
+	- evtimer_initialized.3 \
+	- signal_set.3 \
+	- signal_add.3 \
+	- signal_del.3 \
+	- signal_pending.3 \
+	- signal_initialized.3 \
+	- bufferevent_new.3 \
+	- bufferevent_free.3 \
+	- bufferevent_write.3 \
+	- bufferevent_write_buffer.3 \
+	- bufferevent_read.3 \
+	- bufferevent_enable.3 \
+	- bufferevent_disable.3 \
+	- bufferevent_settimeout.3 \
+	- bufferevent_base_set.3 \
+	- evbuffer_new.3 \
+	- evbuffer_free.3 \
+	- evbuffer_add.3 \
+	- evbuffer_add_buffer.3 \
+	- evbuffer_add_printf.3 \
+	- evbuffer_add_vprintf.3 \
+	- evbuffer_drain.3 \
+	- evbuffer_write.3 \
+	- evbuffer_read.3 \
+	- evbuffer_find.3 \
+	- evbuffer_readline.3 \
+	- evhttp_start.3 \
+	- evhttp_free.3 \
+	evdns.3 evdns_init.3 \
+	- evdns_shutdown.3 \
+	- evdns_err_to_string.3 \
+	- evdns_nameserver_add.3 \
+	- evdns_count_nameservers.3 \
+	- evdns_clear_nameservers_and_suspend.3 \
+	- evdns_resume.3 \
+	- evdns_nameserver_ip_add.3 \
+	- evdns_resolve_ipv4.3 \
+	- evdns_resolve_reverse.3 \
+	- evdns_resolv_conf_parse.3 \
+	- evdns_search_clear.3 \
+	- evdns_search_add.3 \
+	- evdns_search_ndots_set.3 \
+	- evdns_set_log_fn.3 \
+	- evdns_config_windows_nameservers.3
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,CFLAGS =,CFLAGS +=,' ${WRKSRC}/Makefile.in
diff --git a/devel/libevent/distinfo b/devel/libevent/distinfo
index 7caca40853c6..83efca965187 100644
--- a/devel/libevent/distinfo
+++ b/devel/libevent/distinfo
@@ -1,3 +1,3 @@
-MD5 (libevent-1.2.tar.gz) = d907af94851d0528e627192bd8a822cb
-SHA256 (libevent-1.2.tar.gz) = 3046935f826d9070b019addfdfeff6579fa6061227be3d59fa8014b594ff6d51
-SIZE (libevent-1.2.tar.gz) = 367338
+MD5 (libevent-1.2.tar.gz) = 3b7de04a7fa0ac2d96f714f720161c3f
+SHA256 (libevent-1.2.tar.gz) = 2a6a840c00d5f8061d6c1b9811671d89c01a34f69214828bf745dbc6937caea4
+SIZE (libevent-1.2.tar.gz) = 413811
diff --git a/devel/libevent/files/patch-http.c b/devel/libevent/files/patch-http.c
new file mode 100644
index 000000000000..034843b20388
--- /dev/null
+++ b/devel/libevent/files/patch-http.c
@@ -0,0 +1,11 @@
+--- http.c.orig	Sat Aug 12 11:41:36 2006
++++ http.c	Tue Oct 31 04:12:27 2006
+@@ -207,7 +207,7 @@
+ 	    evhttp_find_header(req->output_headers, "Content-Length") == NULL){
+ 		char size[12];
+ 		snprintf(size, sizeof(size), "%ld",
+-		    EVBUFFER_LENGTH(req->output_buffer));
++		    (long int)EVBUFFER_LENGTH(req->output_buffer));
+ 		evhttp_add_header(req->output_headers, "Content-Length", size);
+ 	}
+ }
diff --git a/devel/libevent/files/patch-test-regress_http.c b/devel/libevent/files/patch-test-regress_http.c
new file mode 100644
index 000000000000..8ffc604d0d91
--- /dev/null
+++ b/devel/libevent/files/patch-test-regress_http.c
@@ -0,0 +1,20 @@
+--- test/regress_http.c.orig	Sun Oct 15 15:51:59 2006
++++ test/regress_http.c	Tue Oct 31 04:13:45 2006
+@@ -365,7 +365,7 @@
+ 
+ 	if (EVBUFFER_LENGTH(req->input_buffer) != strlen(POST_DATA)) {
+ 		fprintf(stdout, "FAILED (length: %ld vs %ld)\n",
+-		    EVBUFFER_LENGTH(req->input_buffer), strlen(POST_DATA));
++		    (long int)EVBUFFER_LENGTH(req->input_buffer), (long int)strlen(POST_DATA));
+ 		exit(1);
+ 	}
+ 
+@@ -403,7 +403,7 @@
+ 
+ 	if (EVBUFFER_LENGTH(req->input_buffer) != strlen(what)) {
+ 		fprintf(stderr, "FAILED (length %ld vs %ld)\n",
+-		    EVBUFFER_LENGTH(req->input_buffer), strlen(what));
++		    (long int)EVBUFFER_LENGTH(req->input_buffer), (long int)strlen(what));
+ 		exit(1);
+ 	}
+ 	
diff --git a/devel/libevent/pkg-plist b/devel/libevent/pkg-plist
index a9ecf3633395..c75ef5b9bfb7 100644
--- a/devel/libevent/pkg-plist
+++ b/devel/libevent/pkg-plist
@@ -1,5 +1,7 @@
 bin/event_rpcgen.py
 include/event.h
+include/evhttp.h
+include/evdns.h
 lib/libevent-%%PORTVERSION%%.so
 lib/libevent-%%PORTVERSION%%.so.1
 lib/libevent.a