- Update to 1.2a

7 files changed, 49 insertions, 58 deletions

diff --git a/devel/libevent/Makefile b/devel/libevent/Makefile
index 77305a2ddf6d..d6180653e45c 100644
--- a/devel/libevent/Makefile
+++ b/devel/libevent/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libevent
-PORTVERSION=	1.2
-PORTREVISION=	1
+PORTVERSION=	1.2a
 CATEGORIES=	devel
 MASTER_SITES=	http://monkey.org/~provos/
 
diff --git a/devel/libevent/distinfo b/devel/libevent/distinfo
index 83efca965187..45055a692c84 100644
--- a/devel/libevent/distinfo
+++ b/devel/libevent/distinfo
@@ -1,3 +1,3 @@
-MD5 (libevent-1.2.tar.gz) = 3b7de04a7fa0ac2d96f714f720161c3f
-SHA256 (libevent-1.2.tar.gz) = 2a6a840c00d5f8061d6c1b9811671d89c01a34f69214828bf745dbc6937caea4
-SIZE (libevent-1.2.tar.gz) = 413811
+MD5 (libevent-1.2a.tar.gz) = bb0b731b0c1bfa7267b8cd6192982d68
+SHA256 (libevent-1.2a.tar.gz) = 348b91b60c98bfe7992537ef4858a79e777c4910518a486056de5da0c38431c5
+SIZE (libevent-1.2a.tar.gz) = 410346
diff --git a/devel/libevent/files/patch-buffer.c b/devel/libevent/files/patch-buffer.c
new file mode 100644
index 000000000000..8607a10cda54
--- /dev/null
+++ b/devel/libevent/files/patch-buffer.c
@@ -0,0 +1,15 @@
+#
+# Define va_copy if not exists. 4.x for exemple.
+#
+--- buffer.c.orig	Mon Dec  4 11:34:31 2006
++++ buffer.c	Mon Dec  4 11:35:44 2006
+@@ -138,6 +138,9 @@
+ 		buffer = (char *)buf->buffer + buf->off;
+ 		space = buf->totallen - buf->misalign - buf->off;
+ 
++#ifndef va_copy
++#define	va_copy(dest,src)	memcpy(&dest, &src, sizeof (va_list))
++#endif
+ 		va_copy(aq, ap);
+ 
+ #ifdef WIN32
diff --git a/devel/libevent/files/patch-evdns.c b/devel/libevent/files/patch-evdns.c
deleted file mode 100644
index d41d574b6cb1..000000000000
--- a/devel/libevent/files/patch-evdns.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Use CLOCK_REALTIME when CLOCK_MONOTONIC does not exists.
-#
---- evdns.c.orig	Wed Nov 29 15:37:46 2006
-+++ evdns.c	Wed Nov 29 15:39:14 2006
-@@ -793,7 +793,11 @@
- #ifdef DNS_USE_CPU_CLOCK_FOR_ID
- 		struct timespec ts;
- 		const u16 trans_id = ts.tv_nsec & 0xffff;
-+#ifdef CLOCK_MONOTONIC
- 		if (clock_gettime(CLOCK_MONOTONIC, &ts))
-+#else
-+		if (clock_gettime(CLOCK_REALTIME, &ts))
-+#endif
- 			event_err(1, "clock_gettime");
- #endif
- 
diff --git a/devel/libevent/files/patch-event.c b/devel/libevent/files/patch-event.c
deleted file mode 100644
index aa126519dbda..000000000000
--- a/devel/libevent/files/patch-event.c
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Use CLOCK_REALTIME when CLOCK_MONOTONIC does not exists.
-#
---- event.c.orig	Wed Nov 29 15:37:37 2006
-+++ event.c	Wed Nov 29 15:38:39 2006
-@@ -150,7 +150,11 @@
- #ifdef HAVE_CLOCK_GETTIME
- 	struct timespec	ts;
- 	
-+#ifdef CLOCK_MONOTONIC
- 	if (clock_gettime(CLOCK_MONOTONIC, &ts) == -1)
-+#else
-+	if (clock_gettime(CLOCK_REALTIME, &ts) == -1)
-+#endif
- 		return (-1);
- 	tp->tv_sec = ts.tv_sec;
- 	tp->tv_usec = ts.tv_nsec / 1000;
diff --git a/devel/libevent/files/patch-http.c b/devel/libevent/files/patch-http.c
index 034843b20388..698389f22e0e 100644
--- a/devel/libevent/files/patch-http.c
+++ b/devel/libevent/files/patch-http.c
@@ -1,11 +1,22 @@
---- 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);
- 	}
- }
+#
+# Fix build with old gcc
+#
+--- http.c.orig	Sat Dec  2 19:30:04 2006
++++ http.c	Mon Dec  4 11:17:38 2006
+@@ -518,6 +518,7 @@
+ evhttp_connection_done(struct evhttp_connection *evcon)
+ {
+ 	struct evhttp_request *req = TAILQ_FIRST(&evcon->requests);
++	int need_close;
+ 
+ 	/*
+ 	 * if this is an incoming connection, we need to leave the request
+@@ -527,7 +528,7 @@
+ 		TAILQ_REMOVE(&evcon->requests, req, next);
+ 		req->evcon = NULL;
+ 
+-		int need_close = 
++		need_close = 
+ 		    evhttp_is_connection_close(req->input_headers) ||
+ 		    evhttp_is_connection_close(req->output_headers);
+ 
diff --git a/devel/libevent/files/patch-test-regress_http.c b/devel/libevent/files/patch-test-regress_http.c
index 3d49d6fe6d6e..80c5138070a3 100644
--- a/devel/libevent/files/patch-test-regress_http.c
+++ b/devel/libevent/files/patch-test-regress_http.c
@@ -1,5 +1,5 @@
---- test/regress_http.c.orig	Sun Oct 15 18:51:59 2006
-+++ test/regress_http.c	Wed Nov 29 15:00:35 2006
+--- test/regress_http.c.orig	Wed Nov 29 00:22:10 2006
++++ test/regress_http.c	Mon Dec  4 11:04:42 2006
 @@ -125,13 +125,14 @@
  http_readcb(struct bufferevent *bev, void *arg)
  {
@@ -22,23 +22,23 @@
  {
 +	struct evbuffer *evb;
 +
- 	event_debug((stderr, "%s: called\n", __func__));
+ 	event_debug(("%s: called\n", __func__));
  
 -	struct evbuffer *evb = evbuffer_new();
 +	evb = evbuffer_new();
  	evbuffer_add_printf(evb, "This is funny");
  
  	evhttp_send_reply(req, HTTP_OK, "Everything is fine", evb);
-@@ -355,6 +358,8 @@
+@@ -380,6 +383,8 @@
  void
  http_post_cb(struct evhttp_request *req, void *arg)
  {
 +	struct evbuffer *evb;
 +
- 	event_debug((stderr, "%s: called\n", __func__));
+ 	event_debug(("%s: called\n", __func__));
  
  	/* Yes, we are expecting a post request */
-@@ -365,7 +370,7 @@
+@@ -390,7 +395,7 @@
  
  	if (EVBUFFER_LENGTH(req->input_buffer) != strlen(POST_DATA)) {
  		fprintf(stdout, "FAILED (length: %ld vs %ld)\n",
@@ -47,7 +47,7 @@
  		exit(1);
  	}
  
-@@ -377,7 +382,7 @@
+@@ -402,7 +407,7 @@
  		exit(1);
  	}
  	
@@ -56,7 +56,7 @@
  	evbuffer_add_printf(evb, "This is funny");
  
  	evhttp_send_reply(req, HTTP_OK, "Everything is fine", evb);
-@@ -403,7 +408,7 @@
+@@ -428,7 +433,7 @@
  
  	if (EVBUFFER_LENGTH(req->input_buffer) != strlen(what)) {
  		fprintf(stderr, "FAILED (length %ld vs %ld)\n",