7 files changed, 7 insertions, 126 deletions

diff --git a/devel/libevent/Makefile b/devel/libevent/Makefile
index df2e2b197816..e54eddc1d7f5 100644
--- a/devel/libevent/Makefile
+++ b/devel/libevent/Makefile
@@ -6,15 +6,14 @@
 #
 
 PORTNAME=	libevent
-PORTVERSION=	1.2a
+PORTVERSION=	1.3b
 CATEGORIES=	devel
 MASTER_SITES=	http://monkey.org/~provos/
 
 MAINTAINER=	mnag@FreeBSD.org
 COMMENT=	Provides an API to execute callback functions on certain events
 
-USE_AUTOTOOLS=	libtool:15
-USE_GETOPT_LONG=yes
+CONFIGURE_ARGS=	--mandir=${MANPREFIX}/man
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/devel/libevent/distinfo b/devel/libevent/distinfo
index 45055a692c84..90adc061aabc 100644
--- a/devel/libevent/distinfo
+++ b/devel/libevent/distinfo
@@ -1,3 +1,3 @@
-MD5 (libevent-1.2a.tar.gz) = bb0b731b0c1bfa7267b8cd6192982d68
-SHA256 (libevent-1.2a.tar.gz) = 348b91b60c98bfe7992537ef4858a79e777c4910518a486056de5da0c38431c5
-SIZE (libevent-1.2a.tar.gz) = 410346
+MD5 (libevent-1.3b.tar.gz) = 7fc864faee87dbe1ed5e34ab8787172c
+SHA256 (libevent-1.3b.tar.gz) = 200a229e1fcaf07772b454a087a7cdf4b2e8b90b8493883d4027fd70a3dbf0d1
+SIZE (libevent-1.3b.tar.gz) = 445461
diff --git a/devel/libevent/files/patch-buffer.c b/devel/libevent/files/patch-buffer.c
deleted file mode 100644
index 8607a10cda54..000000000000
--- a/devel/libevent/files/patch-buffer.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# 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-http.c b/devel/libevent/files/patch-http.c
deleted file mode 100644
index 698389f22e0e..000000000000
--- a/devel/libevent/files/patch-http.c
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# 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.c b/devel/libevent/files/patch-test-regress.c
deleted file mode 100644
index 5dd2bcd11544..000000000000
--- a/devel/libevent/files/patch-test-regress.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- test/regress.c.orig	Wed Jun 28 22:34:07 2006
-+++ test/regress.c	Wed Jun 28 22:34:15 2006
-@@ -480,9 +480,9 @@
- 
- void
- test_evbuffer(void) {
--	setup_test("Evbuffer: ");
--
- 	struct evbuffer *evb = evbuffer_new();
-+
-+	setup_test("Evbuffer: ");
- 
- 	evbuffer_add_printf(evb, "%s/%d", "hello", 1);
- 
diff --git a/devel/libevent/files/patch-test-regress_http.c b/devel/libevent/files/patch-test-regress_http.c
deleted file mode 100644
index 80c5138070a3..000000000000
--- a/devel/libevent/files/patch-test-regress_http.c
+++ /dev/null
@@ -1,67 +0,0 @@
---- 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)
- {
- 	const char *what = "This is funny";
-+	int done;
- 
-  	event_debug(("%s: %s\n", __func__, EVBUFFER_DATA(bev->input)));
- 	
- 	if (evbuffer_find(bev->input, what, strlen(what)) != NULL) {
- 		struct evhttp_request *req = evhttp_request_new(NULL, NULL);
- 		req->kind = EVHTTP_RESPONSE;
--		int done = evhttp_parse_lines(req, bev->input);
-+		done = evhttp_parse_lines(req, bev->input);
- 
- 		if (done == 1 &&
- 		    evhttp_find_header(req->input_headers,
-@@ -163,9 +164,11 @@
- void
- http_basic_cb(struct evhttp_request *req, void *arg)
- {
-+	struct evbuffer *evb;
-+
- 	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);
-@@ -380,6 +383,8 @@
- void
- http_post_cb(struct evhttp_request *req, void *arg)
- {
-+	struct evbuffer *evb;
-+
- 	event_debug(("%s: called\n", __func__));
- 
- 	/* Yes, we are expecting a post request */
-@@ -390,7 +395,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);
- 	}
- 
-@@ -402,7 +407,7 @@
- 		exit(1);
- 	}
- 	
--	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);
-@@ -428,7 +433,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 678f03ea3064..3b1435dc19cc 100644
--- a/devel/libevent/pkg-plist
+++ b/devel/libevent/pkg-plist
@@ -2,8 +2,8 @@ bin/event_rpcgen.py
 include/event.h
 include/evhttp.h
 include/evdns.h
-lib/libevent-1.2a.so
-lib/libevent-1.2a.so.1
+lib/libevent-1.3b.so
+lib/libevent-1.3b.so.1
 lib/libevent.a
 lib/libevent.la
 lib/libevent.so