Only use libevent2

Remove libevent as libevent2 is providing a good compatibility interface as well as providing better performances. Remove custom patches from libevent2 and install libevent2 the regular way Mark ports abusing private fields of the libevent1 API as broken Import a patch from fedora to have honeyd working with libevent2 Remove most of the patches necessary to find the custom installation we used to have for libevent2 With hat: portmgr
svn path=/head/; revision=362796
2024-11-21 00:25:50 +00:00 · 2014-07-24 13:32:58 +00:00 · 2014-07-24 13:32:58 +00:00 · b564653452 · 2021-03-31 03:12:20 +00:00
commit b564653452
parent afee9d5cd3
95 changed files with 537 additions and 570 deletions
--- a/1
+++ b/1
@ -6312,3 +6312,4 @@ print/dvipsk-tetex|print/tex-dvipsk|2014-07-23|Use TeXLive version
 print/dvipdfmx|print/tex-dvipdfmx|2014-07-23|Use TeXLive version
 print/jadetex|print/tex-jadetex|2014-07-23|Use TeXLive version
 japanese/teTeX|print/texlive-full|2014-07-23|Use TeXLive
+devel/libevent|devel/libevent2|2014-07-27|libevent2 replaced libevent
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@ -133,7 +133,7 @@ cairo_LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo
 cairo_MOZ_OPTIONS=	--enable-system-cairo
 cairo_EXTRACT_AFTER_ARGS=	--exclude mozilla*/gfx/cairo/cairo

-event_LIB_DEPENDS=	libevent-2.0.so:${PORTSDIR}/devel/libevent2
+event_LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
 event_MOZ_OPTIONS=	--with-system-libevent
 event_EXTRACT_AFTER_ARGS=	--exclude mozilla*/ipc/chromium/src/third_party/libevent

--- a/6
+++ b/6
@ -5,6 +5,12 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.

+20140723:
+  AFFECTS: users of devel/libevent
+
+  libevent1 as been replaced by libevent2 via the compatibility layer.
+  Make sure to remove libevent before upgrading the regular way.
+
 20140723:
  AFFECTS: users of security/scanlogd
  AUTHOR: tgyurci@gmail.com
--- a/databases/libmemcached/Makefile
+++ b/databases/libmemcached/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	libmemcached
 PORTVERSION=	1.0.7
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases
 MASTER_SITES=	http://launchpad.net/${PORTNAME}/1.0/${PORTVERSION}/+download/

@ -10,9 +10,9 @@ MAINTAINER=	m.tsatsenko@gmail.com
 COMMENT=	C and C++ client library to the memcached server

 LIB_DEPENDS?=	libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
-		libevent-1.4.so:${PORTSDIR}/devel/libevent
+		libevent.so:${PORTSDIR}/devel/libevent2

-USES=		gmake pathfix pkgconfig perl5 libtool:keepla
+USES=		gmake pathfix pkgconfig perl5 libtool
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
--- a/databases/libmemcached/pkg-plist
+++ b/databases/libmemcached/pkg-plist
@ -98,22 +98,18 @@ include/libmemcachedutil-1.0/pool.h
 include/libmemcachedutil-1.0/util.h
 include/libmemcachedutil-1.0/version.h
 lib/libhashkit.a
-lib/libhashkit.la
 lib/libhashkit.so
 lib/libhashkit.so.2
 lib/libhashkit.so.2.0.0
 lib/libmemcached.a
-lib/libmemcached.la
 lib/libmemcached.so
 lib/libmemcached.so.10
 lib/libmemcached.so.10.0.0
 lib/libmemcachedprotocol.a
-lib/libmemcachedprotocol.la
 lib/libmemcachedprotocol.so
 lib/libmemcachedprotocol.so.0
 lib/libmemcachedprotocol.so.0.0.0
 lib/libmemcachedutil.a
-lib/libmemcachedutil.la
 lib/libmemcachedutil.so
 lib/libmemcachedutil.so.2
 lib/libmemcachedutil.so.2.0.0
--- a/databases/mariadb-server/Makefile
+++ b/databases/mariadb-server/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	mariadb
 PORTVERSION=	5.3.12
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://ftp.osuosl.org/pub/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
 		http://mirrors.supportex.net/mariadb/${PORTNAME}-${PORTVERSION}/kvm-tarbake-jaunty-x86/ \
@ -48,7 +48,7 @@ OPENSSL_DESC=	Use OpenSSL instead of bundled yassl


 .if !defined(MARIADB_CLIENT_SLAVE)
-LIB_DEPENDS=	libevent-1.4.so:${PORTSDIR}/devel/libevent
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2

 MANS=	innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 \
 	myisamlog.1 myisampack.1 mysql.server.1 mysql_client_test_embedded.1 \
--- a/databases/memcached/Makefile
+++ b/databases/memcached/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	memcached
 PORTVERSION=	1.4.20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
 		${MASTER_SITE_GENTOO}
@ -15,7 +15,7 @@ COMMENT=	High-performance distributed memory object cache system
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING

-LIB_DEPENDS=	libevent-2.0.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2

 CONFLICTS=	memcached-1.2*

@ -34,11 +34,10 @@ SHEBANG_FILES=	scripts/memcached-tool

 USE_CSTD=	c99
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-libevent=${LOCALBASE}/lib/event2 --program-prefix= \
+CONFIGURE_ARGS=	--with-libevent=${LOCALBASE} --program-prefix= \
 		--disable-coverage

 CFLAGS+=	-fstack-protector \
-		-I${LOCALBASE}/include/event2/compat \
 		-I${LOCALBASE}/include

 DTRACE_CONFIGURE_ENABLE=	dtrace
@ -63,9 +62,6 @@ BROKEN=			DTRACE broken with gcc/clang - reported upstream
 BUILD_DEPENDS=	xml2rfc:${PORTSDIR}/textproc/xml2rfc
 .endif

-post-patch:
-	@${REINPLACE_CMD} -e "s,-levent,-levent-2.0,g" ${WRKSRC}/configure
-
 post-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/memcached-tool ${STAGEDIR}${PREFIX}/bin
 .if ${PORT_OPTIONS:MDOCS}
--- a/databases/memcachedb/Makefile
+++ b/databases/memcachedb/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	memcachedb
 PORTVERSION=	1.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}

@ -12,7 +12,7 @@ COMMENT=	Distributed storage system designed for persistence

 LICENSE=	BSD3CLAUSE

-LIB_DEPENDS=	libevent-1.4.so:${PORTSDIR}/devel/libevent
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2

 CFLAGS+=	-I"${BDB_INCLUDE_DIR}"
 CONFIGURE_ARGS=	--enable-threads --with-bdb="${LOCALBASE}" \
--- a/databases/memcacheq/Makefile
+++ b/databases/memcacheq/Makefile
@ -14,7 +14,7 @@ COMMENT=	Simple queue service over Memcache

 LICENSE=	BSD3CLAUSE

-LIB_DEPENDS=	libevent-1.4.so:${PORTSDIR}/devel/libevent
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2

 USE_CSTD=	gnu89
 CFLAGS+=	-I"${BDB_INCLUDE_DIR}"
--- a/databases/mysql-proxy/Makefile
+++ b/databases/mysql-proxy/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	mysql-proxy
 PORTVERSION=	0.8.4
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_MYSQL}
 MASTER_SITE_SUBDIR=	MySQL-Proxy
@ -12,7 +13,7 @@ COMMENT=	Monitor, analyze, or transform the communication of MySQL

 LICENSE=	GPLv2

-LIB_DEPENDS=	libevent-1.4.so:${PORTSDIR}/devel/libevent \
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2 \
 		libglib-2.0.so:${PORTSDIR}/devel/glib20

 CONFIGURE_ARGS+=	--with-lua=lua-${LUA_VER} --with-mysql=${LOCALBASE}/bin/mysql_config --docdir=${DATADIR} --enable-self-contained
--- a/databases/pgbouncer/Makefile
+++ b/databases/pgbouncer/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	pgbouncer
 PORTVERSION=	1.5.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases
 MASTER_SITES=	http://pgfoundry.org/frs/download.php/3393/

@ -12,7 +12,7 @@ COMMENT=	Lightweight connection pooler for PostgreSQL

 LICENSE=	BSD2CLAUSE

-LIB_DEPENDS=	libevent-2.0.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2

 OPTIONS_DEFINE=	DOCS

--- a/databases/pgbouncer/files/patch-configure
+++ b/databases/pgbouncer/files/patch-configure
@ -1,14 +0,0 @@
--- configure.orig	2012-11-28 17:11:13.000000000 +0400
-+++ configure	2013-09-25 23:54:23.465994180 +0400
-@@ -6332,8 +6332,8 @@
-       levent=yes
-     else
-       levent=yes
-      CPPFLAGS="$CPPFLAGS -I$withval/include"
-      LDFLAGS="$LDFLAGS -L$withval/lib"
-+      CPPFLAGS="$CPPFLAGS -I$withval/include -I$withval/include/event2/compat"
-+      LDFLAGS="$LDFLAGS -L$withval/lib/event2"
-     fi
- 
- fi
-
--- a/databases/sharedance/Makefile
+++ b/databases/sharedance/Makefile
@ -3,14 +3,14 @@

 PORTNAME=	sharedance
 PORTVERSION=	0.6
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	databases
 MASTER_SITES=	http://download.pureftpd.org/pub/sharedance/

 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Daemon to centralize keys and associated data

-LIB_DEPENDS=	libevent-2.0.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2

 CONFIGURE_ARGS=	--with-largefile
 GNU_CONFIGURE=	yes
@ -19,9 +19,6 @@ CFLAGS+=	-I${LOCALBASE}/include/event2/compat \
 		-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib/event2

-post-patch:
-	@${REINPLACE_CMD} -e "s/-levent/-levent-2.0/g" ${WRKSRC}/configure
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/php/*.php ${STAGEDIR}${DATADIR}
--- a/devel/Makefile
+++ b/devel/Makefile
@ -1000,7 +1000,6 @@
    SUBDIR += libesedb
    SUBDIR += libestr
    SUBDIR += libev
-    SUBDIR += libevent
    SUBDIR += libevent-hiphop
    SUBDIR += libevent2
    SUBDIR += libevt
--- a/devel/eventxx/Makefile
+++ b/devel/eventxx/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	eventxx
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://proj.llucax.com.ar/home/eventxx/releases/ \
 		LOCAL/glarkin
@ -12,7 +12,7 @@ MASTER_SITE_SUBDIR=	gahr
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ wrapper for libevent

-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2

 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}

--- a/devel/gearmand-devel/Makefile
+++ b/devel/gearmand-devel/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	gearmand
 PORTVERSION=	1.1.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://launchpad.net/gearmand/1.2/${PORTVERSION}/+download/

@ -13,7 +13,7 @@ COMMENT=	Gearman C Server and Library
 BUILD_DEPENDS=	boost-libs>=0:${PORTSDIR}/devel/boost-libs \
 		libexecinfo>=0:${PORTSDIR}/devel/libexecinfo \
 		${PYTHON_PKGNAMEPREFIX}sphinx>=0:${PORTSDIR}/textproc/py-sphinx
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent \
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2 \
 		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
 		libexecinfo.so:${PORTSDIR}/devel/libexecinfo

--- a/devel/gearmand/Makefile
+++ b/devel/gearmand/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	gearmand
 PORTVERSION=	1.0.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://launchpad.net/gearmand/1.0/${PORTVERSION}/+download/

@ -13,7 +13,7 @@ COMMENT=	Gearman C Server and Library
 BUILD_DEPENDS=	boost-libs>=0:${PORTSDIR}/devel/boost-libs \
 		libexecinfo>=0:${PORTSDIR}/devel/libexecinfo \
 		${PYTHON_PKGNAMEPREFIX}sphinx>=0:${PORTSDIR}/textproc/py-sphinx
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent \
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2 \
 		libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid \
 		libexecinfo.so:${PORTSDIR}/devel/libexecinfo

--- a/devel/libdnsres/Makefile
+++ b/devel/libdnsres/Makefile
@ -3,16 +3,16 @@

 PORTNAME=	libdnsres
 PORTVERSION=	0.1a
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	devel
 MASTER_SITES=	http://monkey.org/~provos/

 MAINTAINER=	oz@nixil.net
 COMMENT=	Provides a non-blocking thread-safe API for resolving DNS names

-BUILD_DEPENDS=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent
+BUILD_DEPENDS=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent2

-USES=		libtool:keepla
+USES=		libtool
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=--with-libevent=${LOCALBASE}
--- a/devel/libdnsres/pkg-plist
+++ b/devel/libdnsres/pkg-plist
@ -1,6 +1,5 @@
 include/dnsres.h
 lib/libdnsres.a
-lib/libdnsres.la
 lib/libdnsres.so
 lib/libdnsres.so.0
 lib/libdnsres.so.0.0.1
--- a/devel/libevent/Makefile
+++ b/devel/libevent/Makefile
@ -1,33 +0,0 @@
-# Created by: Pete Fritchman <petef@databits.net>
-# $FreeBSD$
-
-PORTNAME=	libevent
-PORTVERSION=	1.4.14b
-PORTREVISION?=	3
-CATEGORIES=	devel
-MASTER_SITES=	http://monkey.org/~provos/
-DISTNAME=	${PORTNAME}-${DISTVERSION}-stable
-
-MAINTAINER=	mm@FreeBSD.org
-COMMENT?=	Provides an API to execute callback functions on certain events
-
-LICENSE=	BSD3CLAUSE
-
-GNU_CONFIGURE=	yes
-.if !defined(_BUILDING_LIBEVENT_HIPHOP)
-USE_LDCONFIG=	yes
-.endif
-
-pre-configure:
-	@${MKDIR} ${WRKSRC}/m4
-
-post-patch:
-	@${REINPLACE_CMD} -e 's,CFLAGS =,CFLAGS +=,' ${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e '/LIBS/s/-lrt//g' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|<stdint.h>|<inttypes.h>|' \
-		${WRKSRC}/epoll.c ${WRKSRC}/epoll_sub.c ${WRKSRC}/evdns.c
-
-regression-test: build
-	@(${SH} ${WRKSRC}/test/regress)
-
-.include <bsd.port.mk>
--- a/devel/libevent/distinfo
+++ b/devel/libevent/distinfo
@ -1,2 +0,0 @@
-SHA256 (libevent-1.4.14b-stable.tar.gz) = afa61b476a222ba43fc7cca2d24849ab0bbd940124400cb699915d3c60e46301
-SIZE (libevent-1.4.14b-stable.tar.gz) = 474874
--- a/devel/libevent/files/patch-evdns.c
+++ b/devel/libevent/files/patch-evdns.c
@ -1,52 +0,0 @@
--- evdns.c.orig	2011-02-22 09:47:55.243428037 +0100
-+++ evdns.c	2011-02-22 09:48:00.454027469 +0100
-@@ -158,6 +158,15 @@
- 
- #define CLASS_INET     EVDNS_CLASS_INET
- 
-+#ifdef HAVE_SETFD
-+#define FD_CLOSEONEXEC(x) do { \
-+	if (fcntl(x, F_SETFD, 1) == -1) \
-+		event_warn("fcntl(%d, F_SETFD)", x); \
-+	} while (0)
-+#else
-+#define FD_CLOSEONEXEC(x) (void)0
-+#endif
-+
- struct request {
- 	u8 *request;  /* the dns packet data */
- 	unsigned int request_len;
-@@ -1099,20 +1108,12 @@
- static u16
- transaction_id_pick(void) {
- 	for (;;) {
-		const struct request *req = req_head, *started_at;
- 		u16 trans_id = trans_id_function();
- 
- 		if (trans_id == 0xffff) continue;
-		/* now check to see if that id is already inflight */
-		req = started_at = req_head;
-		if (req) {
-			do {
-				if (req->trans_id == trans_id) break;
-				req = req->next;
-			} while (req != started_at);
-		}
-		/* we didn't find it, so this is a good id */
-		if (req == started_at) return trans_id;
-+
-+		if (request_find_from_trans_id(trans_id) == NULL)
-+			return trans_id;
- 	}
- }
- 
-@@ -2132,7 +2133,8 @@
- 
- 	ns->socket = socket(PF_INET, SOCK_DGRAM, 0);
- 	if (ns->socket < 0) { err = 1; goto out1; }
-        evutil_make_socket_nonblocking(ns->socket);
-+	FD_CLOSEONEXEC(ns->socket);
-+	evutil_make_socket_nonblocking(ns->socket);
- 
- 	ns->address = address;
- 	ns->port = htons(port);
--- a/devel/libevent/files/patch-event.c
+++ b/devel/libevent/files/patch-event.c
@ -1,26 +0,0 @@
--- event.c.orig	2011-02-22 09:41:20.016483538 +0100
-+++ event.c	2011-02-22 09:41:56.252380281 +0100
-@@ -279,9 +279,14 @@
- 	int res = 0;
- 	struct event *ev;
- 
-+#if 0
-+	/* Right now, reinit always takes effect, since even if the
-+	   backend doesn't require it, the signal socketpair code does.
-+	 */
- 	/* check if this event mechanism requires reinit */
- 	if (!evsel->need_reinit)
- 		return (0);
-+#endif
- 
- 	/* prevent internal delete */
- 	if (base->sig.ev_signal_added) {
-@@ -294,7 +299,7 @@
- 			    EVLIST_ACTIVE);
- 		base->sig.ev_signal_added = 0;
- 	}
-	
-+
- 	if (base->evsel->dealloc != NULL)
- 		base->evsel->dealloc(base, base->evbase);
- 	evbase = base->evbase = evsel->init(base);
--- a/devel/libevent/files/patch-evutil.c
+++ b/devel/libevent/files/patch-evutil.c
@ -1,11 +0,0 @@
--- evutil.c.orig	2011-02-22 09:39:26.529403997 +0100
-+++ evutil.c	2011-02-22 09:41:40.352952848 +0100
-@@ -169,7 +169,7 @@
- 	}
- #else
- 	{
-		long flags;
-+		int flags;
- 		if ((flags = fcntl(fd, F_GETFL, NULL)) < 0) {
- 			event_warn("fcntl(%d, F_GETFL)", fd);
- 			return -1;
--- a/devel/libevent/files/patch-http.c
+++ b/devel/libevent/files/patch-http.c
@ -1,20 +0,0 @@
--- http.c.orig	2011-02-22 09:41:25.224559892 +0100
-+++ http.c	2011-02-22 09:42:00.208495705 +0100
-@@ -390,7 +398,7 @@
- 	/* Add the content length on a post request if missing */
- 	if (req->type == EVHTTP_REQ_POST &&
- 	    evhttp_find_header(req->output_headers, "Content-Length") == NULL){
-		char size[12];
-+		char size[22];
- 		evutil_snprintf(size, sizeof(size), "%ld",
- 		    (long)EVBUFFER_LENGTH(req->output_buffer));
- 		evhttp_add_header(req->output_headers, "Content-Length", size);
-@@ -447,7 +455,7 @@
- {
- 	if (evhttp_find_header(headers, "Transfer-Encoding") == NULL &&
- 	    evhttp_find_header(headers,	"Content-Length") == NULL) {
-		char len[12];
-+		char len[22];
- 		evutil_snprintf(len, sizeof(len), "%ld", content_length);
- 		evhttp_add_header(headers, "Content-Length", len);
- 	}
--- a/devel/libevent/files/patch-signal.c
+++ b/devel/libevent/files/patch-signal.c
@ -1,38 +0,0 @@
--- signal.c.orig	2011-02-22 09:41:14.711661986 +0100
-+++ signal.c	2011-02-22 09:41:52.113522401 +0100
-@@ -67,6 +67,13 @@
- 
- static void evsignal_handler(int sig);
- 
-+#ifdef WIN32
-+#define error_is_eagain(err)			\
-+	((err) == EAGAIN || (err) == WSAEWOULDBLOCK)
-+#else
-+#define error_is_eagain(err) ((err) == EAGAIN)
-+#endif
-+
- /* Callback for when the signal handler write a byte to our signaling socket */
- static void
- evsignal_cb(int fd, short what, void *arg)
-@@ -79,8 +86,11 @@
- #endif
- 
- 	n = recv(fd, signals, sizeof(signals), 0);
-	if (n == -1)
-		event_err(1, "%s: read", __func__);
-+	if (n == -1) {
-+		int err = EVUTIL_SOCKET_ERROR();
-+		if (! error_is_eagain(err))
-+			event_err(1, "%s: read", __func__);
-+	}
- }
- 
- #ifdef HAVE_SETFD
-@@ -125,6 +135,7 @@
- 		TAILQ_INIT(&base->sig.evsigevents[i]);
- 
-         evutil_make_socket_nonblocking(base->sig.ev_signal_pair[0]);
-+        evutil_make_socket_nonblocking(base->sig.ev_signal_pair[1]);
- 
- 	event_set(&base->sig.ev_signal, base->sig.ev_signal_pair[1],
- 		EV_READ | EV_PERSIST, evsignal_cb, &base->sig.ev_signal);
--- a/devel/libevent/pkg-descr
+++ b/devel/libevent/pkg-descr
@ -1,17 +0,0 @@
-The libevent API provides a mechanism to execute a callback function when
-a specific event occurs on a file descriptor or after a timeout has been
-reached.
-
-libevent is meant to replace the asynchronous event loop found in event
-driven network servers. An application just needs to call event_dispatch()
-and can then add or remove events dynamically without having to change the
-event loop.
-
-Currently, libevent supports kqueue(2), select(2), poll(2), and epoll(4).
-The internal event mechanism is completely independent of the exposed event
-API, and a simple update of libevent can provide new functionality without
-having to redesign the applications.  As a result, Libevent allows for
-portable application development and provides the most scalable event
-notification mechanism available on an operating system.
-
-WWW: http://libevent.org/
--- a/devel/libevent/pkg-plist
+++ b/devel/libevent/pkg-plist
@ -1,24 +0,0 @@
-bin/event_rpcgen.py
-include/event-config.h
-include/event.h
-include/evhttp.h
-include/evdns.h
-include/evrpc.h
-include/evutil.h
-lib/libevent-1.4.so
-lib/libevent-1.4.so.4
-lib/libevent_core-1.4.so
-lib/libevent_core-1.4.so.4
-lib/libevent_core.a
-lib/libevent_core.la
-lib/libevent_core.so
-lib/libevent_extra-1.4.so
-lib/libevent_extra-1.4.so.4
-lib/libevent_extra.a
-lib/libevent_extra.la
-lib/libevent_extra.so
-lib/libevent.a
-lib/libevent.la
-lib/libevent.so
-man/man3/event.3.gz
-man/man3/evdns.3.gz
--- a/devel/libevent2/Makefile
+++ b/devel/libevent2/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	libevent2
 PORTVERSION=	2.0.21
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://cloud.github.com/downloads/libevent/libevent/
 DISTNAME=	${PORTNAME:S/2//}-${DISTVERSION}-stable
@ -11,39 +11,24 @@ DISTNAME=	${PORTNAME:S/2//}-${DISTVERSION}-stable
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	API for executing callback functions on events or timeouts

-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE

 GNU_CONFIGURE=	yes
-USES=		libtool:oldver pathfix
-USE_LDCONFIG=	${PREFIX}/lib/event2
+USES=		libtool pathfix
+USE_LDCOFNIG=	yes

 OPTIONS_DEFINE=	OPENSSL THREADS
 OPTIONS_DEFAULT=	OPENSSL THREADS
+OPTIONS_SUB=	yes
+INSTALL_TARGET=	install-strip

-CONFIGURE_ARGS+=	--libdir=${PREFIX}/lib/event2
+OPENSSL_USE=	openssl=yes
+OPENSSL_CPPFLAGS=	-I${OPENSSLINC}
+OPENSLS_LDFLAGS=	-L${OPENSSLLIB}
+OPENSSL_CONFIGURE_ENABLE=	openssl

-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MOPENSSL}
-USE_OPENSSL=	yes
-CPPFLAGS+=	-I${OPENSSLINC}
-LDFLAGS+=	-L${OPENSSLLIB}
-PLIST_SUB+=		OPENSSL=""
-.else
-CONFIGURE_ARGS+=	--disable-openssl
-PLIST_SUB+=		OPENSSL="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MTHREADS}
-PLIST_SUB+=		THREADS=""
-.else
-CONFIGURE_ARGS+=	--disable-thread-support
-PLIST_SUB+=		THREADS="@comment "
-.endif
-
-post-install:
-	@${INSTALL_SCRIPT} ${WRKSRC}/event_rpcgen.py ${STAGEDIR}${PREFIX}/bin/event2_rpcgen.py
+THREADS_CONFIGURE_ENABLE=	support

 regression-test: build
 	@(${SH} ${WRKSRC}/test/regress)
--- a/devel/libevent2/files/patch-Makefile.in
+++ b/devel/libevent2/files/patch-Makefile.in
@ -1,20 +0,0 @@
--- Makefile.in.orig	2011-02-22 13:57:32.509779266 +0100
-+++ Makefile.in	2011-02-22 14:03:10.651310739 +0100
-@@ -338,7 +338,7 @@
- host_os = @host_os@
- host_vendor = @host_vendor@
- htmldir = @htmldir@
-includedir = @includedir@
-+includedir = @includedir@/event2/compat
- infodir = @infodir@
- install_sh = @install_sh@
- libdir = @libdir@
-@@ -1130,7 +1130,7 @@
- 
- install-dvi-am:
- 
-install-exec-am: install-dist_binSCRIPTS install-libLTLIBRARIES
-+install-exec-am: install-libLTLIBRARIES
- 
- install-html: install-html-recursive
- 
--- a/devel/libevent2/files/patch-libevent.pc.in
+++ b/devel/libevent2/files/patch-libevent.pc.in
@ -1,12 +0,0 @@
--- libevent.pc.in.orig	2010-08-15 15:21:18.000000000 +0200
-+++ libevent.pc.in	2011-03-06 21:15:00.816214067 +0100
-@@ -10,7 +10,7 @@
- Version: @VERSION@
- Requires:
- Conflicts:
-Libs: -L${libdir} -levent
-+Libs: -L${libdir} -levent-2.0
- Libs.private: @LIBS@
-Cflags: -I${includedir}
-+Cflags: -I${includedir}/event2/compat -I${includedir}
- 
--- a/devel/libevent2/files/patch-libevent_openssl.pc.in
+++ b/devel/libevent2/files/patch-libevent_openssl.pc.in
@ -1,12 +0,0 @@
--- libevent_openssl.pc.in.orig	2011-05-23 23:45:50.000000000 +0200
-+++ libevent_openssl.pc.in	2011-06-19 11:22:11.784914479 +0200
-@@ -10,7 +10,7 @@
- Version: @VERSION@
- Requires: libevent
- Conflicts:
-Libs: -L${libdir} -levent_openssl
-+Libs: -L${libdir} -levent_openssl-2.0
- Libs.private: @LIBS@ -lssl -lcrypto
-Cflags: -I${includedir}
-+Cflags: -I${includedir}/event2/compat -I${includedir}
- 
--- a/devel/libevent2/files/patch-libevent_pthreads.pc.in
+++ b/devel/libevent2/files/patch-libevent_pthreads.pc.in
@ -1,13 +0,0 @@
--- libevent_pthreads.pc.in.orig	2013-02-14 10:10:38.000000000 +0100
-+++ libevent_pthreads.pc.in	2013-02-14 10:11:05.000000000 +0100
-@@ -10,7 +10,7 @@
- Version: @VERSION@
- Requires: libevent
- Conflicts:
-Libs: -L${libdir} -levent_pthreads
-Libs.private: @LIBS@ @PTHREAD_LIBS@
-Cflags: -I${includedir} @PTHREAD_CFLAGS@
-+Libs: -L${libdir} -levent_pthreads-2.0
-+Libs.private: @LIBS@ -pthread
-+Cflags: -I${includedir}
- 
--- a/devel/libevent2/pkg-plist
+++ b/devel/libevent2/pkg-plist
@ -1,62 +1,55 @@
-bin/event2_rpcgen.py
-include/event2/compat/evdns.h
-include/event2/compat/event.h
-include/event2/compat/evhttp.h
-include/event2/compat/evrpc.h
-include/event2/compat/evutil.h
-include/event2/keyvalq_struct.h
-include/event2/util.h
+bin/event_rpcgen.py
+include/evdns.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/http_struct.h
-include/event2/dns_compat.h
-include/event2/thread.h
-include/event2/rpc_struct.h
-include/event2/tag_compat.h
-include/event2/bufferevent_compat.h
-include/event2/rpc.h
-include/event2/bufferevent.h
-include/event2/event_struct.h
-include/event2/tag.h
-include/event2/listener.h
-include/event2/bufferevent_ssl.h
-include/event2/http.h
-include/event2/buffer_compat.h
-include/event2/http_compat.h
-include/event2/dns.h
-include/event2/buffer.h
-include/event2/rpc_compat.h
-include/event2/dns_struct.h
 include/event2/event_compat.h
-include/event2/bufferevent_struct.h
-lib/event2/libevent-2.0.so
-lib/event2/libevent-2.0.so.6
-lib/event2/libevent_core-2.0.so
-lib/event2/libevent_core-2.0.so.6
-lib/event2/libevent_core.a
-lib/event2/libevent_core.la
-lib/event2/libevent_core.so
-lib/event2/libevent_extra-2.0.so
-lib/event2/libevent_extra-2.0.so.6
-lib/event2/libevent_extra.a
-lib/event2/libevent_extra.la
-lib/event2/libevent_extra.so
-%%THREADS%%lib/event2/libevent_pthreads-2.0.so
-%%THREADS%%lib/event2/libevent_pthreads-2.0.so.6
-%%THREADS%%lib/event2/libevent_pthreads.a
-%%THREADS%%lib/event2/libevent_pthreads.la
-%%THREADS%%lib/event2/libevent_pthreads.so
-%%OPENSSL%%lib/event2/libevent_openssl-2.0.so
-%%OPENSSL%%lib/event2/libevent_openssl-2.0.so.6
-%%OPENSSL%%lib/event2/libevent_openssl.a
-%%OPENSSL%%lib/event2/libevent_openssl.la
-%%OPENSSL%%lib/event2/libevent_openssl.so
-lib/event2/libevent.a
-lib/event2/libevent.la
-lib/event2/libevent.so
+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-2.0.so.5
+lib/libevent-2.0.so.5.1.9
+lib/libevent.a
+lib/libevent.so
+lib/libevent_core-2.0.so.5
+lib/libevent_core-2.0.so.5.1.9
+lib/libevent_core.a
+lib/libevent_core.so
+lib/libevent_extra-2.0.so.5
+lib/libevent_extra-2.0.so.5.1.9
+lib/libevent_extra.a
+lib/libevent_extra.so
+%%OPENSSL%%lib/libevent_openssl-2.0.so.5
+%%OPENSSL%%lib/libevent_openssl-2.0.so.5.1.9
+%%OPENSSL%%lib/libevent_openssl.a
+%%OPENSSL%%lib/libevent_openssl.so
+%%THREADS%%lib/libevent_pthreads-2.0.so.5
+%%THREADS%%lib/libevent_pthreads-2.0.so.5.1.9
+%%THREADS%%lib/libevent_pthreads.a
+%%THREADS%%lib/libevent_pthreads.so
 libdata/pkgconfig/libevent.pc
-%%THREADS%%libdata/pkgconfig/libevent_pthreads.pc
 %%OPENSSL%%libdata/pkgconfig/libevent_openssl.pc
-@dirrm lib/event2
-@dirrm include/event2/compat
+%%THREADS%%libdata/pkgconfig/libevent_pthreads.pc
@dirrm include/event2
--- a/devel/libmsocket/Makefile
+++ b/devel/libmsocket/Makefile
@ -10,7 +10,7 @@ MASTER_SITES=	SF/kageki/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	rodrigo@FreeBSD.org
 COMMENT=	Socket abstraction library for C programmers

-LIB_DEPENDS=	libevent-1.4.so:${PORTSDIR}/devel/libevent
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2

 OPTIONS_DEFINE=	DEBUG

--- a/devel/ocaml-event/Makefile
+++ b/devel/ocaml-event/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	event
 PORTVERSION=	0.6.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	http://www.xs4all.nl/~mmzeeman/ocaml/
 PKGNAMEPREFIX=	ocaml-
@ -13,7 +13,7 @@ MAINTAINER= ports@FreeBSD.org
 COMMENT=	Ocaml wrapper for the libevent API

 BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
-LIB_DEPENDS=	libevent-1.4.so:${PORTSDIR}/devel/libevent
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2

 ALL_TARGET=	all allopt
 USES=		gmake
--- a/devel/p5-Event-Lib/Makefile
+++ b/devel/p5-Event-Lib/Makefile
@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	fk@fabiankeil.de
 COMMENT=	Makes libevent(3) accessible with Perl

-LIB_DEPENDS=	libevent-1.4.so:${PORTSDIR}/devel/libevent
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2

 USES=		perl5
 USE_PERL5=	configure
--- a/devel/pecl-event/Makefile
+++ b/devel/pecl-event/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	event
 PORTVERSION=	1.9.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
@ -14,7 +15,7 @@ COMMENT=	Provides interface to libevent library

 LICENSE=	PHP301

-LIB_DEPENDS=	libevent-2.0.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2

 USE_OPENSSL=	yes
 CONFIGURE_ARGS=	--with-openssl-dir=${OPENSSLBASE}
--- a/devel/pecl-libevent/Makefile
+++ b/devel/pecl-libevent/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	libevent
 PORTVERSION=	0.0.5
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
@ -14,7 +15,7 @@ COMMENT=	Libevent extension for PHP

 LICENSE=	PHP301

-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2

 USE_PHP=	yes
 USE_PHP_BUILD=	yes
--- a/devel/pinba_engine/Makefile
+++ b/devel/pinba_engine/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	pinba_engine
 PORTVERSION=	2011.08.18
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/tony2001/pinba_engine/tarball/${GITVERSION}/
 DISTNAME=	tony2001-pinba_engine-${GITVERSION}
@ -12,7 +12,7 @@ MAINTAINER=	raven428@gmail.com
 COMMENT=	Mysql-engine part of statistics server for PHP

 BUILD_DEPENDS=	${LOCALBASE}/include/google/protobuf/descriptor.h:${PORTSDIR}/devel/protobuf \
- 		${LOCALBASE}/include/event.h:${PORTSDIR}/devel/libevent \
+ 		${LOCALBASE}/include/event.h:${PORTSDIR}/devel/libevent2 \
 		${LOCALBASE}/include/Judy.h:${PORTSDIR}/devel/judy \
 		${LOCALBASE}/lib/mysql/plugin:${PORTSDIR}/${_MYSQL_SERVER} \
 		${NONEXISTENT}:${PORTSDIR}/${_MYSQL_SERVER}:configure \
--- a/devel/pinba_engine/pkg-plist
+++ b/devel/pinba_engine/pkg-plist
@ -3,4 +3,5 @@ lib/mysql/plugin/libpinba_engine.so.0
 lib/mysql/plugin/libpinba_engine.la
 lib/mysql/plugin/libpinba_engine.a
 %%DATADIR%%/default_tables.sql
+@dirrmtry lib/mysql/plugin
@dirrm %%DATADIR%%
--- a/devel/py-event/Makefile
+++ b/devel/py-event/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	event
 PORTVERSION=	0.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	devel net python
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -12,7 +12,7 @@ DISTNAME=	py${PORTNAME}-${PORTVERSION}
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	Python bindings for libevent

-LIB_DEPENDS=	libevent-1.4.so:${PORTSDIR}/devel/libevent
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2

 PROJECTHOST=	pyevent
 USE_PYTHON=	yes
--- a/devel/thrift-cpp/Makefile
+++ b/devel/thrift-cpp/Makefile
@ -18,7 +18,7 @@ DISTNAME=		thrift-${PORTVERSION}
 DISTINFO_FILE=		${.CURDIR}/../thrift/distinfo

 LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
-		libevent-1.4.so:${PORTSDIR}/devel/libevent
+		libevent.so:${PORTSDIR}/devel/libevent2

 USE_AUTOTOOLS=	autoconf autoheader:env aclocal automake libtool
 ACLOCAL_ARGS=	-I${WRKSRC}/aclocal
--- a/devel/thrift/bsd.thrift.mk
+++ b/devel/thrift/bsd.thrift.mk
@ -6,6 +6,7 @@
 # PORTVERSION=	${THRIFT_PORTVERSION}
 # see $PORTSDIR/devel/thrift for examples 
 THRIFT_PORTVERSION=	0.9.1
+THRIFT_PORTREVISION=	1

 CONFIGURE_ARGS+=	\
 		--without-tests
--- a/dns/adsuck/Makefile
+++ b/dns/adsuck/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	adsuck
 PORTVERSION=	2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	dns
 MASTER_SITES=	http://opensource.conformal.com/snapshots/adsuck/ \
 		http://philpep.org/pub/
@ -14,12 +14,10 @@ COMMENT=	DNS relay for ad blocking

 LICENSE=	ISCL

-LIB_DEPENDS+=	libevent-2.0.so:${PORTSDIR}/devel/libevent2 \
+LIB_DEPENDS+=	libevent.so:${PORTSDIR}/devel/libevent2 \
 		libldns.so:${PORTSDIR}/dns/ldns

-CFLAGS+=	-I${LOCALBASE}/include/event2/compat \
-		-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib/event2
+CFLAGS+= 	-I${LOCALBASE}/include

 USE_RC_SUBR=	adsuck

@ -30,9 +28,6 @@ SUB_FILES+=	pkg-message

 OPTIONS_DEFINE=	EXAMPLES

-post-patch:
-	@${REINPLACE_CMD} -e "s/-levent/-levent-2.0/g" ${WRKSRC}/Makefile
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/adsuck ${STAGEDIR}${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8.gz ${STAGEDIR}${MANPREFIX}/man/man8
--- a/dns/dnsproxy/Makefile
+++ b/dns/dnsproxy/Makefile
@ -3,13 +3,14 @@

 PORTNAME=	dnsproxy
 PORTVERSION=	1.16
+PORTREVISION=	1
 CATEGORIES=	dns
 MASTER_SITES=	http://www.wolfermann.org/

 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	proxy for DNS queries

-BUILD_DEPENDS=	${LOCALBASE}/lib/libevent.so:${PORTSDIR}/devel/libevent
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2

 GNU_CONFIGURE=	yes

--- a/dns/getdns/Makefile
+++ b/dns/getdns/Makefile
@ -37,7 +37,7 @@ LIBEV_LIB_DEPENDS=	libev.so:${PORTSDIR}/devel/libev
 LIBEV_CONFIGURE_WITH=	libev
 LIBUV_LIB_DEPENDS=	libuv.so:${PORTSDIR}/devel/libuv
 LIBUV_CONFIGURE_WITH=	libuv
-LIBEVENT_LIB_DEPENDS=	libevent-1.4.so:${PORTSDIR}/devel/libevent
+LIBEVENT_LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent
 LIBEVENT_CONFIGURE_WITH=libevent

 .include <bsd.port.options.mk>
--- a/dns/nsd/Makefile
+++ b/dns/nsd/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	nsd
 PORTVERSION=	4.0.3
+PORTREVISION=	1
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://www.nlnetlabs.nl/downloads/nsd/	\
 		ftp://ftp.rhnet.is/pub/nsd/
@ -62,7 +63,7 @@ RRL_DESC=		Response Rate Limiting
 EUI_RRTYPES_DESC=	EUI48 and EUI64 RRtypes support
 RECVMMSG_DESC=		Enable use of recvmmsg and sendmmsg

-LIB_DEPENDS+=	libevent-1.4.so:${PORTSDIR}/devel/libevent
+LIB_DEPENDS+=	libevent.so:${PORTSDIR}/devel/libevent2

 ROOT_SERVER_CONFIGURE_ENABLE=	root-server
 LARGEFILE_CONFIGURE_ENABLE=	largefile
--- a/dns/unbound/Makefile
+++ b/dns/unbound/Makefile
@ -29,15 +29,11 @@ PORTDOCS=	CREDITS Changelog FEATURES LICENSE README README.svn \
 		ietf67-design-02.pdf requirements.txt
 PLIST_SUB+=	PYTHON=${PYTHON} MUNIN=${MUNIN}

-OPTIONS_DEFINE=	THREADS PYTHON GOST ECDSA MUNIN DOCS
+OPTIONS_DEFINE=	THREADS PYTHON GOST ECDSA MUNIN DOCS LIBEVENT
 OPTIONS_DEFAULT=THREADS ECDSA

-OPTIONS_RADIO=	LIBEVENT
-OPTIONS_RADIO_LIBEVENT=	LIBEVENT14 LIBEVENT20

-LIBEVENT_DESC=	Enable whenever using many (10000) outgoing ports
-LIBEVENT14_DESC=Build against libevent-1.4 (devel/libevent)
-LIBEVENT20_DESC=Build against libevent-2.0 (devel/libevent2)
+LIBEVENT_DESC=	Build against libevent (devel/libevent2)
 GOST_DESC=	Enable GOST support (requires OpenSSL >= 1.0)
 ECDSA_DESC=	Enable ECDSA (elliptic curve) support (OpenSSL >= 1.0)
 MUNIN_DESC=	Install Munin plugin
@ -83,14 +79,10 @@ MUNIN=
 MUNIN=		"@comment "
 .endif

-.if ${PORT_OPTIONS:MLIBEVENT14}
-LIB_DEPENDS+=	libevent-1.4.so:${PORTSDIR}/devel/libevent
-CONFIGURE_ARGS+=--with-libevent=${LOCALBASE}
-.elif ${PORT_OPTIONS:MLIBEVENT20}
-LIB_DEPENDS+=	libevent-2.0.so:${PORTSDIR}/devel/libevent2
+.if ${PORT_OPTIONS:MLIBEVENT}
+LIB_DEPENDS+=	libevent.so:${PORTSDIR}/devel/libevent2
 USES+=		pkgconfig
-CONFIGURE_ARGS+=--with-libevent=${NONEXISTENT}
-CONFIGURE_ENV+=	found_libevent=yes
+CONFIGURE_ARGS+=--with-libevent
 CPPFLAGS+=	$$(pkg-config libevent --cflags-only-I)
 LDFLAGS+=	$$(pkg-config libevent --libs-only-L)
 .else
--- a/lang/io/Makefile.addons
+++ b/lang/io/Makefile.addons
@ -243,7 +243,7 @@ LIB_DEPENDS+=	libsamplerate.so:${PORTSDIR}/audio/libsamplerate
 # Socket
 #
 .if ${PORT_OPTIONS:MSocket}
-LIB_DEPENDS+=	libevent.so:${PORTSDIR}/devel/libevent
+LIB_DEPENDS+=	libevent.so:${PORTSDIR}/devel/libevent2
 .endif

 #
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	dbmail
 PORTVERSION=	3.1.15
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://git.dbmail.eu/paul/dbmail/snapshot/

@ -15,7 +15,7 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	libgmime-2.6.so:${PORTSDIR}/mail/gmime26 \
 		libzdb.so:${PORTSDIR}/databases/libzdb \
 		libmhash.so:${PORTSDIR}/security/mhash \
-		libevent-2.0.so:${PORTSDIR}/devel/libevent2
+		libevent.so:${PORTSDIR}/devel/libevent2

 BUILD_DEPENDS=	asciidoc:${PORTSDIR}/textproc/asciidoc \
 		xmlto:${PORTSDIR}/textproc/xmlto \
--- a/mail/opensmtpd-devel/Makefile
+++ b/mail/opensmtpd-devel/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	opensmtpd
 PORTVERSION=	201405202105
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.opensmtpd.org/archives/ \
@ -17,7 +17,7 @@ COMMENT=	OpenSMTPD is a free MTA (development snapshot)
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE

-LIB_DEPENDS=	libevent-1.4.so:${PORTSDIR}/devel/libevent
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2

 OPENSMTPD_SNAPSHOT_VER=	p1

--- a/mail/opensmtpd/Makefile
+++ b/mail/opensmtpd/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	opensmtpd
 PORTVERSION=	5.4.2
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.opensmtpd.org/archives/ \
@ -15,7 +15,7 @@ COMMENT=	OpenSMTPD is a free MTA

 LICENSE=	ISCL

-LIB_DEPENDS=	libevent-1.4.so:${PORTSDIR}/devel/libevent
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2

 OPTIONS_DEFINE=	CA_BUNDLE PAM SQLITE MYSQL PGSQL LDAP REDIS

--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	rspamd
 PORTVERSION=	0.6.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://rspamd.com/downloads/

@ -13,7 +13,7 @@ LICENSE=	BSD2CLAUSE

 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
 		libgmime-2.4.so:${PORTSDIR}/mail/gmime24 \
-		libevent.so:${PORTSDIR}/devel/libevent
+		libevent.so:${PORTSDIR}/devel/libevent2

 OPTIONS_DEFINE=	GPERF REDIRECTOR
 GPERF_DESC=		google perf-tools profiling
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	thunderbird
 DISTVERSION=	24.6.0
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	mail news net-im ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source/
--- a/net-p2p/transmission-cli/Makefile
+++ b/net-p2p/transmission-cli/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	transmission
 PORTVERSION=	2.84
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	net-p2p
 #MASTER_SITES=	http://download.m0k.org/${PORTNAME}/files/
 MASTER_SITES=	http://transmission.cachefly.net/
@ -34,7 +34,7 @@ LIB_DEPENDS?=	${GEN_LIB_DEPENDS}

 # General dependencies
 GEN_LIB_DEPENDS=libcurl.so:${PORTSDIR}/ftp/curl \
-		libevent-2.0.so.6:${PORTSDIR}/devel/libevent2
+		libevent.so:${PORTSDIR}/devel/libevent2
 GEN_RUN_DEPENDS=${LOCALBASE}/share/transmission/web/index.html:${PORTSDIR}/www/transmission-web

 # This is master port of transmission-*, so don't override USES definition 
--- a/net-p2p/tribler/Makefile
+++ b/net-p2p/tribler/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	tribler
 PORTVERSION=	6.0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-p2p
 #MASTER_SITES=	http://dl.tribler.org/
 MASTER_SITES=	GENTOO/distfiles \
@ -20,7 +20,7 @@ LICENSE=	LGPL21 MIT
 LICENSE_COMB=	multi

 EXTRACT_DEPENDS=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
-LIB_DEPENDS=	libevent-2.0.so:${PORTSDIR}/devel/libevent2 \
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2 \
 		libvlc.so:${PORTSDIR}/multimedia/vlc
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}netifaces>0:${PORTSDIR}/net/py-netifaces \
@ -65,9 +65,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|-O2|| ; \
 		 s|CPPFLAGS|CXXFLAGS| ; \
 		 s|-g -I$${LIBEVENT_HOME}/include|-I$${LOCALBASE}/include| ; \
-		 s|-levent -lstdc++|-levent-2.0| ; \
+		 s|-lstdc++|| ; \
 		 s|g++|$${CXX}| ; \
-		 s|$${LIBEVENT_HOME}/lib|$${LOCALBASE}/lib/event2|g' \
+		 s|$${LIBEVENT_HOME}/lib|$${LOCALBASE}/lib|g' \
 		${WRKDIR}/usr/share/tribler/Tribler/SwiftEngine/Makefile
 	@${REINPLACE_CMD} 's|linux|freebsd|' \
 		${WRKDIR}/usr/share/tribler/Tribler/vlc.py
--- a/net-p2p/unworkable/Makefile
+++ b/net-p2p/unworkable/Makefile
@ -3,13 +3,14 @@

 PORTNAME=	unworkable
 PORTVERSION=	0.53
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	GOOGLE_CODE

 MAINTAINER=	wenheping@gmail.com
 COMMENT=	Free BitTorrent Implementation

-LIB_DEPENDS=	libevent-1.4.so:${PORTSDIR}/devel/libevent
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2

 USES=		scons
 USE_OPENSSL=	yes
--- a/net/aprsc/Makefile
+++ b/net/aprsc/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	aprsc
 PORTVERSION=	2.0.14
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONSUFFIX=	.g28c5a6a
 CATEGORIES=	net hamradio
 MASTER_SITES=	http://he.fi/aprsc/down/ \
@ -15,10 +15,10 @@ COMMENT=	Plain APRS-IS server
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE

-LIB_DEPENDS=	libevent-2.0.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2

 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib/event2
+LDFLAGS+=	-L${LOCALBASE}/lib
 MAKEFILE=	GNUmakefile

 WRKSRC=		${WRKDIR}/${DISTNAME}/src
--- a/net/honeyd/Makefile
+++ b/net/honeyd/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	honeyd
 PORTVERSION=	1.5c
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net
 MASTER_SITES=	http://www.honeyd.org/uploads/ \
 		http://www.citi.umich.edu/u/provos/honeyd/
@ -13,7 +13,7 @@ COMMENT=	Simulate virtual network hosts (honeypots)

 LICENSE=	GPLv2

-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent \
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2 \
 		libdnet.so:${PORTSDIR}/net/libdnet \
 		libpcre.so:${PORTSDIR}/devel/pcre

@ -23,6 +23,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libdnet=${LOCALBASE} \
 		--with-libevent=${LOCALBASE}

+EXTRA_PATCHES=	${FILESDIR}/honeyd-1.5c-libevent2.patch:-p1
+
 .if defined(WITH_PYTHON)
 USE_PYTHON=	yes
 CONFIGURE_ARGS+=	--with-python
--- a/net/honeyd/files/honeyd-1.5c-libevent2.patch
+++ b/net/honeyd/files/honeyd-1.5c-libevent2.patch
@ -0,0 +1,211 @@
+diff -up honeyd-1.5c/honeydstats.c.libevent2 honeyd-1.5c/honeydstats.c
+--- honeyd-1.5c/honeydstats.c.libevent2	2007-05-28 08:12:52.000000000 +0200
+++ honeyd-1.5c/honeydstats.c	2011-07-26 13:18:14.459666984 +0200
+@@ -330,30 +330,43 @@ signature_process(struct evbuffer *evbuf
+ static int
+ signature_length(struct evbuffer *evbuf)
+ {
+-	struct evbuffer tmp;
+	struct evbuffer *tmp;
+ 	uint32_t length, tlen;
+ 
+-	tmp = *evbuf;
+-
+	tmp = evbuffer_new();
+	tmp = evbuffer_add_reference(tmp, evbuffer_pullup(evbuf, -1),
+				     evbuffer_get_length(evbuf), NULL, NULL);
+ 	/* name */
+-	if (tag_peek_length(&tmp, &tlen) == -1 || EVBUFFER_LENGTH(&tmp) < tlen)
+	if (tag_peek_length(tmp, &tlen) == -1 || EVBUFFER_LENGTH(tmp) < tlen) {
+		evbuffer_free(tmp);
+ 		return (-1);
+	}
+
+	if (evbuffer_drain(tmp, tlen) == -1) {
+		evbuffer_free(tmp);
+		return (-1);
+	}
+ 		
+ 	length = tlen;
+-	tmp.buffer += tlen;
+-	tmp.off -= tlen;
+ 
+ 	/* signature */
+-	if (tag_peek_length(&tmp, &tlen) == -1 || EVBUFFER_LENGTH(&tmp) < tlen)
+	if (tag_peek_length(tmp, &tlen) == -1 || EVBUFFER_LENGTH(tmp) < tlen) {
+		evbuffer_free(tmp);
+ 		return (-1);
+	}
+ 		
+	if (evbuffer_drain(tmp, tlen) == -1) {
+		evbuffer_free(tmp);
+		return (-1);
+	}
+
+ 	length += tlen;
+-	tmp.buffer += tlen;
+-	tmp.off -= tlen;
+ 
+ 	/* data */
+-	if (tag_peek_length(&tmp, &tlen) == -1 || EVBUFFER_LENGTH(&tmp) < tlen)
+	if (tag_peek_length(tmp, &tlen) == -1 || EVBUFFER_LENGTH(tmp) < tlen) {
+		evbuffer_free(tmp);
+ 		return (-1);
+	}
+ 		
+ 	length += tlen;
+ 
+diff -up honeyd-1.5c/tagging.c.libevent2 honeyd-1.5c/tagging.c
+--- honeyd-1.5c/tagging.c.libevent2	2007-05-28 08:12:52.000000000 +0200
+++ honeyd-1.5c/tagging.c	2011-07-26 13:18:14.460666991 +0200
+@@ -73,7 +73,7 @@ tagging_init()
+  */
+ 
+ void
+-encode_int(struct evbuffer *evbuf, uint32_t number)
+encode__int(struct evbuffer *evbuf, uint32_t number)
+ {
+ 	int off = 1, nibbles = 0;
+ 	uint8_t data[5];
+@@ -108,7 +108,7 @@ void
+ tag_marshal(struct evbuffer *evbuf, uint8_t tag, void *data, uint16_t len)
+ {
+ 	evbuffer_add(evbuf, &tag, sizeof(tag));
+-	encode_int(evbuf, len);
+	encode__int(evbuf, len);
+ 	evbuffer_add(evbuf, data, len);
+ }
+ 
+@@ -117,10 +117,10 @@ void
+ tag_marshal_int(struct evbuffer *evbuf, uint8_t tag, uint32_t integer)
+ {
+ 	evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf));
+-	encode_int(_buf, integer);
+	encode__int(_buf, integer);
+ 
+ 	evbuffer_add(evbuf, &tag, sizeof(tag));
+-	encode_int(evbuf, EVBUFFER_LENGTH(_buf));
+	encode__int(evbuf, EVBUFFER_LENGTH(_buf));
+ 	evbuffer_add_buffer(evbuf, _buf);
+ }
+ 
+@@ -135,8 +135,8 @@ tag_marshal_timeval(struct evbuffer *evb
+ {
+ 	evbuffer_drain(_buf, EVBUFFER_LENGTH(_buf));
+ 
+-	encode_int(_buf, tv->tv_sec);
+-	encode_int(_buf, tv->tv_usec);
+	encode__int(_buf, tv->tv_sec);
+	encode__int(_buf, tv->tv_usec);
+ 
+ 	tag_marshal(evbuf, tag, EVBUFFER_DATA(_buf),
+ 	    EVBUFFER_LENGTH(_buf));
+diff -up honeyd-1.5c/tagging.h.libevent2 honeyd-1.5c/tagging.h
+--- honeyd-1.5c/tagging.h.libevent2	2007-05-28 08:12:52.000000000 +0200
+++ honeyd-1.5c/tagging.h	2011-07-26 13:18:14.461666999 +0200
+@@ -86,7 +86,7 @@ void addr_marshal(struct evbuffer *, str
+ void tag_marshal(struct evbuffer *evbuf, uint8_t tag, void *data,
+     uint16_t len);
+ 
+-void encode_int(struct evbuffer *evbuf, uint32_t number);
+void encode__int(struct evbuffer *evbuf, uint32_t number);
+ 
+ void tag_marshal_int(struct evbuffer *evbuf, uint8_t tag, uint32_t integer);
+ 
+diff -up honeyd-1.5c/ui.c.libevent2 honeyd-1.5c/ui.c
+--- honeyd-1.5c/ui.c.libevent2	2007-05-28 08:12:52.000000000 +0200
+++ honeyd-1.5c/ui.c	2011-07-26 13:18:14.459666984 +0200
+@@ -246,7 +246,8 @@ ui_writer(int fd, short what, void *arg)
+ 	struct evbuffer *buffer = client->outbuf;
+ 	int n;
+ 
+-	n = write(fd, buffer->buffer, buffer->off);
+	n = write(fd, evbuffer_pullup(buffer, -1),
+		  evbuffer_get_length(buffer));
+ 	if (n == -1) {
+ 		if (errno == EINTR || errno == EAGAIN)
+ 			goto schedule;
+@@ -260,7 +261,7 @@ ui_writer(int fd, short what, void *arg)
+ 	evbuffer_drain(buffer, n);
+ 
+  schedule:
+-	if (buffer->off)
+	if (evbuffer_get_length(buffer))
+ 		event_add(&client->ev_write, NULL);
+ }
+ 
+@@ -277,8 +278,8 @@ ui_handler(int fd, short what, void *arg
+ 		return;
+ 	}
+ 
+-	n = mybuf->off;
+-	p = mybuf->buffer;
+	n = evbuffer_get_length (mybuf);
+	p = evbuffer_pullup (mybuf, -1);
+ 	consumed = 0;
+ 	while (n--) {
+ 		consumed++;
+@@ -289,11 +290,12 @@ ui_handler(int fd, short what, void *arg
+ 		 */
+ 		if (*p == '\n') {
+ 			*p = '\0';
+-			ui_handle_command(client->outbuf, mybuf->buffer);
+			ui_handle_command(client->outbuf,
+					  evbuffer_pullup(mybuf, -1));
+ 
+ 			evbuffer_drain(mybuf, consumed);
+-			n = mybuf->off;
+-			p = mybuf->buffer;
+			n = evbuffer_get_length (mybuf);
+			p = evbuffer_pullup (mybuf, -1);
+ 			consumed = 0;
+ 			continue;
+ 		}
+diff -up honeyd-1.5c/untagging.c.libevent2 honeyd-1.5c/untagging.c
+--- honeyd-1.5c/untagging.c.libevent2	2007-05-28 08:12:52.000000000 +0200
+++ honeyd-1.5c/untagging.c	2011-07-26 13:18:14.461666999 +0200
+@@ -114,22 +114,29 @@ tag_peek(struct evbuffer *evbuf, uint8_t
+ int
+ tag_peek_length(struct evbuffer *evbuf, uint32_t *plength)
+ {
+-	struct evbuffer tmp;
+	struct evbuffer *tmp;
+ 	int res;
+ 
+ 	if (EVBUFFER_LENGTH(evbuf) < 2)
+ 		return (-1);
+ 
+-	tmp = *evbuf;
+-	tmp.buffer += 1;
+-	tmp.off -= 1;
+	tmp = evbuffer_new ();
+	evbuffer_add_reference (tmp, evbuffer_pullup(evbuf, -1),
+				evbuffer_get_length(evbuf), NULL, NULL);
+	if (evbuffer_drain(tmp, 1) == -1) {
+		evbuffer_free (tmp);
+		return (-1);
+	}
+ 
+-	res = decode_int_internal(plength, &tmp, 0);
+-	if (res == -1)
+	res = decode_int_internal(plength, tmp, 0);
+	if (res == -1) {
+		evbuffer_free (tmp);
+ 		return (-1);
+	}
+ 
+ 	*plength += res + 1;
+ 
+	evbuffer_free (tmp);
+ 	return (0);
+ }
+ 
+@@ -438,7 +445,7 @@ tagging_int_test(void)
+ 	for (i = 0; i < TEST_MAX_INT; i++) {
+ 		int oldlen, newlen;
+ 		oldlen = EVBUFFER_LENGTH(tmp);
+-		encode_int(tmp, integers[i]);
+		encode__int(tmp, integers[i]);
+ 		newlen = EVBUFFER_LENGTH(tmp);
+ 		fprintf(stderr, "\t\tencoded 0x%08x with %d bytes\n",
+ 		    integers[i], newlen - oldlen);
--- a/net/ifstated/Makefile
+++ b/net/ifstated/Makefile
@ -3,14 +3,14 @@

 PORTNAME=	ifstated
 PORTVERSION=	5.1
-PORTEPOCH=	1
+PORTEPOCH=	2
 CATEGORIES=	net
 MASTER_SITES=	http://christianserving.org/ports/net/ifstated/

 MAINTAINER=	ports@christianserving.org
 COMMENT=	Interface state daemon

-LIB_DEPENDS=	libevent-1.4.so:${PORTSDIR}/devel/libevent
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2

 PLIST_FILES=	etc/ifstated.conf-sample \
 		sbin/ifstated \
--- a/net/ladvd/Makefile
+++ b/net/ladvd/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	ladvd
 PORTVERSION=	1.0.4
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	GOOGLE_CODE \
 		http://blinkenlights.nl/software/ladvd/
@ -12,7 +13,7 @@ COMMENT=	Minimal LLDP/CDP daemon

 LICENSE=	BSD

-LIB_DEPENDS=	libevent-1.4.so:${PORTSDIR}/devel/libevent
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2

 USERS=		ladvd
 GROUPS=		${USERS}
--- a/net/netatalk3/Makefile
+++ b/net/netatalk3/Makefile
@ -15,7 +15,7 @@ COMMENT=	File server for Mac OS X
 LICENSE=	GPLv2

 LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
-    		libevent-2.0.so:${PORTSDIR}/devel/libevent2
+    		libevent.so:${PORTSDIR}/devel/libevent2

 USE_BDB=	5+
 USES=		iconv gmake pkgconfig perl5 libtool tar:bzip2
@ -30,8 +30,7 @@ CONFIGURE_ARGS+=	--with-pkgconfdir=${PREFIX}/etc \
 			${ICONV_CONFIGURE_BASE} \
 			--localstatedir=/var \
 			--disable-bundled-libevent \
-			--with-libevent-header=${LOCALBASE}/include \
-			--with-libevent-lib=${LOCALBASE}/lib/event2
+			--with-libevent-header=${LOCALBASE}/include

 OPTIONS_DEFINE=PAM KRB5 LDAP SENDFILE KERBEROS DTRACE DBUS MYSQL ACL TCPWRAP
 OPTIONS_DEFAULT=KERBEROS DBUS TCPWRAP
--- a/net/netatalk3/files/patch-etc_netatalk_Makefile.in
+++ b/net/netatalk3/files/patch-etc_netatalk_Makefile.in
@ -1,13 +0,0 @@
-$FreeBSD$
-
--- etc/netatalk/Makefile.in.orig	2012-09-28 05:17:54.000000000 -0400
-+++ etc/netatalk/Makefile.in	2012-09-29 01:00:04.000000000 -0400
-@@ -63,7 +63,7 @@ sbin_PROGRAMS = netatalk$(EXEEXT)
- @USE_BUILTIN_LIBEVENT_TRUE@	$(top_builddir)/libevent/libevent.la
- 
- @USE_BUILTIN_LIBEVENT_FALSE@am__append_3 = @LIBEVENT_CFLAGS@
-@USE_BUILTIN_LIBEVENT_FALSE@am__append_4 = @LIBEVENT_LDFLAGS@ -levent
-+@USE_BUILTIN_LIBEVENT_FALSE@am__append_4 = @LIBEVENT_LDFLAGS@ -levent-2.0
- subdir = etc/netatalk
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	ntop
 PORTVERSION=	5.0.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Stable

@ -13,7 +13,7 @@ COMMENT=	Network monitoring tool with command line and web interfaces
 LICENSE=	GPLv3

 LIB_DEPENDS=	libgdbm.so:${PORTSDIR}/databases/gdbm \
-		libevent-1.4.so:${PORTSDIR}/devel/libevent
+		libevent.so:${PORTSDIR}/devel/libevent2
 BUILD_DEPENDS=	rrdtool>=1.2:${PORTSDIR}/databases/rrdtool \
 		dot:${PORTSDIR}/graphics/graphviz \
 		geoiplookup:${PORTSDIR}/net/GeoIP
--- a/net/ntp-devel/Makefile
+++ b/net/ntp-devel/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	ntp
 PORTVERSION=	4.2.7p453
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-dev/ \
 		ftp://ftp.archive.de.uu.net/pub/unix/ntp/ntp4/ntp-dev/ \
@ -18,7 +19,7 @@ USE_AUTOTOOLS=	automake
 AUTOMAKE_ARGS=	--add-missing
 OPTIONS_SUB=	yes
 USES=		pathfix shebangfix libtool
-LIB_DEPENDS=	libevent-2.0.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2

 NTP_SHEBANG_FILES=	sbin/ntp-wait sbin/ntptrace

--- a/net/nylon/Makefile
+++ b/net/nylon/Makefile
@ -3,14 +3,14 @@

 PORTNAME=	nylon
 PORTVERSION=	1.21
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net
 MASTER_SITES=	http://monkey.org/~marius/nylon/

 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Unix SOCKS 4 and 5 proxy server

-LIB_DEPENDS=	libevent-2.0.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2

 USE_RC_SUBR=	nylon

@ -20,6 +20,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libevent=yes
 CONFIGURE_ENV=	EVENTLIB="`pkgconf --libs libevent`" EVENTINC="`pkgconf --cflags libevent`"

+
 PLIST_FILES=	bin/nylon etc/nylon.conf.sample man/man1/nylon.1.gz

 post-install:
--- a/net/openospfd/Makefile
+++ b/net/openospfd/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	openospfd
 PORTVERSION=	4.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	OPENBSD/OpenBGPD:openbsd \
 		LOCAL/flz/openospfd/:freebsd
@ -18,7 +18,7 @@ LICENSE=	ISCL

 CONFLICTS=	zebra-0* quagga-0*

-LIB_DEPENDS=	libevent-1.4.so:${PORTSDIR}/devel/libevent
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2

 MAKE_ENV=	BINDIR="${PREFIX}/sbin" \
 		MANDIR="${PREFIX}/man/man"
--- a/net/relayd/Makefile
+++ b/net/relayd/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	relayd
 PORTVERSION=	5.4.20131122
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net
 MASTER_SITES=	GH

@ -19,6 +19,8 @@ USES=		uidfix
 USE_GITHUB=	yes
 USE_RC_SUBR=	relayd

+BROKEN=		Abuse evbuffer API
+
 CFLAGS+=	-I${PREFIX}/include -Wall

 MAKE_ARGS+=	BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man/man
@ -32,10 +34,10 @@ LIBEVENT_STATIC_DESC=	Build with static libevent
 .include <bsd.port.pre.mk>

 .if ${PORT_OPTIONS:MLIBEVENT_STATIC}
-BUILD_DEPENDS=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent
+BUILD_DEPENDS=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent2
 MAKE_ARGS+=	LIBEVENT=${LOCALBASE}/lib/libevent.a
 .else
-LIB_DEPENDS=	libevent-1.4.so:${PORTSDIR}/devel/libevent
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
 MAKE_ARGS+=	LIBEVENT=-levent
 .endif

--- a/net/scribe/Makefile
+++ b/net/scribe/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	scribe
 DISTVERSION=	2.2.2013.04.15
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	https://github.com/facebook/scribe/tarball/${GITVERSION}/
 DISTNAME=	facebook-scribe-${GITVERSION}
@ -13,7 +14,7 @@ COMMENT=	Aggregating log data streamed in real time
 BUILD_DEPENDS=	fb303>0:${PORTSDIR}/devel/fb303 \
 		thrift:${PORTSDIR}/devel/thrift
 LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
-		libevent.so:${PORTSDIR}/devel/libevent \
+		libevent.so:${PORTSDIR}/devel/libevent2 \
 		libthrift.so:${PORTSDIR}/devel/thrift-cpp
 RUN_DEPENDS=	p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor \
 		p5-Thrift>0:${PORTSDIR}/devel/p5-Thrift \
--- a/net/spserver/Makefile
+++ b/net/spserver/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	spserver
 PORTVERSION=	0.9.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTNAME=	${PORTNAME}-${PORTVERSION}.src
@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	TCP server framework library written in C++ based on libevent

-LIB_DEPENDS=	libevent-1.4.so:${PORTSDIR}/devel/libevent
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2

 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_LDCONFIG=	yes
@ -19,6 +19,8 @@ USES=		gmake
 ALL_TARGET=	all build_openssl
 MAKE_JOBS_UNSAFE=	yes

+BROKEN=		Misuse libevent API
+
 OPTIONS_DEFINE=	GNUTLS
 #		MATRIXSSL	"Enable matrixssl support" off

--- a/net/trickle/Makefile
+++ b/net/trickle/Makefile
@ -3,14 +3,14 @@

 PORTNAME=	trickle
 PORTVERSION=	1.07
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	http://monkey.org/~marius/trickle/

 MAINTAINER=	gahr@FreeBSD.org
 COMMENT=	Lightweight, portable bandwidth shaper

-LIB_DEPENDS=	libevent-1.4.so:${PORTSDIR}/devel/libevent
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2

 OPTIONS_DEFINE=	DOCS

--- a/net/turnserver/Makefile
+++ b/net/turnserver/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	turnserver
 PORTVERSION=	3.2.2.5
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://turnserver.open-sys.org/downloads/v${PORTVERSION}/ \
 		http://turnserver.open-sys.org/downloads/extradocs/ \
@ -15,7 +16,7 @@ COMMENT=	STUN/TURN Server; IPv6, DTLS support; RFCs 5389, 5766, 6062, 6156

 LICENSE=	BSD3CLAUSE

-LIB_DEPENDS=	libevent-2.0.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2

 CONFLICTS=	libevent-1.*

@ -76,8 +77,7 @@ selfloadbalance/secure_relay.sh
 CONFIGURE_ENV+=	PTHREAD_LIBS=-pthread TURN_DISABLE_RPATH=1

 .if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=	yes
-LIB_DEPENDS+=	libpq.so:${PORTSDIR}/databases/postgresql90-client
+USES+=		pgsql
 .else
 CONFIGURE_ENV+=	TURN_NO_PQ=1
 .endif
--- a/security/fragroute/Makefile
+++ b/security/fragroute/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	fragroute
 PORTVERSION=	1.2
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	security net
 MASTER_SITES=	http://monkey.org/~dugsong/fragroute/ \
 		${MASTER_SITE_PACKETSTORM}
@ -15,7 +15,7 @@ COMMENT=	Tool for intercepting, modifying, and rewriting egress traffic
 LICENSE=	BSD3CLAUSE

 LIB_DEPENDS=	libdnet.so:${PORTSDIR}/net/libdnet \
-		libevent-1.4.so:${PORTSDIR}/devel/libevent
+		libevent.so:${PORTSDIR}/devel/libevent2

 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-libdnet=${LOCALBASE} \
--- a/security/fragroute/files/patch-fragroute.c
+++ b/security/fragroute/files/patch-fragroute.c
@ -0,0 +1,78 @@
+$NetBSD: patch-fragroute.c,v 1.1 2013/05/23 16:02:13 christos Exp $
+In the unix case, don't use the obsolete libevent signal interface
+
+--- fragroute.c.orig	2002-04-07 18:55:20.000000000 -0400
+++ fragroute.c	2013-05-23 11:59:52.000000000 -0400
+@@ -36,10 +36,6 @@
+ 
+ static struct fr_ctx 	 ctx;
+ 
+-/* XXX - these should be in event.h */
+-extern int		(*event_sigcb)(void);
+-extern int		 event_gotsig;
+-
+ static void
+ usage(void)
+ {
+@@ -136,6 +132,10 @@
+ }
+ 
+ #ifdef WIN32
+/* XXX - these should be in event.h */
+extern int		(*event_sigcb)(void);
+extern int		 event_gotsig;
+
+ static BOOL CALLBACK
+ fragroute_signal(DWORD sig)
+ {
+@@ -144,12 +144,25 @@
+ 	return (TRUE);
+ }
+ #else
+
+ static void
+-fragroute_signal(int sig)
+fragroute_signal(evutil_socket_t fd, short what, void *arg)
+ {
+	int sig;
+	recv(fd, &sig, sizeof(sig), 0);
+ 	warnx("exiting on signal %d", sig);
+-	event_gotsig++;
+	exit(sig);
+ }
+
+static void
+addsignal(int sig) {
+	struct event sig_ev;
+	int got;
+
+	evsignal_set(&sig_ev, sig, fragroute_signal, &got);
+	evsignal_add(&sig_ev, NULL);
+}
+
+ #endif
+ 
+ static void
+@@ -165,9 +178,6 @@
+ 		err(1, "couldn't initialize Winsock");
+ 
+ 	SetConsoleCtrlHandler(fragroute_signal, TRUE);
+-#else
+-	signal(SIGINT, fragroute_signal);
+-	signal(SIGTERM, fragroute_signal);
+ #endif
+ 	if (addr_aton(dst, &ctx.dst) < 0)
+ 		err(1, "destination address invalid");
+@@ -178,7 +188,12 @@
+ 	pkt_init(128);
+ 	
+ 	event_init();
+#ifdef WIN32
+ 	event_sigcb = fragroute_close;
+#else
+	addsignal(SIGINT);
+	addsignal(SIGTERM);
+#endif
+ 	
+ 	if ((ctx.arp = arp_open()) == NULL ||
+ 	    (ctx.intf = intf_open()) == NULL ||
--- a/security/scanssh/Makefile
+++ b/security/scanssh/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	scanssh
 PORTVERSION=	2.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	security net
 MASTER_SITES=	http://www.monkey.org/~provos/

@ -11,7 +11,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Scans networks for open proxies, SSH, web, and SMTP servers

 LIB_DEPENDS=	libdnet.so:${PORTSDIR}/net/libdnet \
-		libevent-1.so:${PORTSDIR}/devel/libevent
+		libevent.so:${PORTSDIR}/devel/libevent2

 GNU_CONFIGURE=	YES
 PLIST_FILES=	bin/scanssh man/man1/scanssh.1.gz
--- a/security/spybye/Makefile
+++ b/security/spybye/Makefile
@ -3,14 +3,14 @@

 PORTNAME=	spybye
 PORTVERSION=	0.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	security www
 MASTER_SITES=	http://www.monkey.org/~provos/

 MAINTAINER=	pauls@utdallas.edu
 COMMENT=	Web proxy to detect malware

-LIB_DEPENDS=	libevent-1.4.so:${PORTSDIR}/devel/libevent
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2

 OPTIONS_DEFINE=	CLAMAV
 CLAMAV_DESC=	Enable CLAMAV support
@ -18,11 +18,7 @@ CLAMAV_DESC=	Enable CLAMAV support
 USE_RC_SUBR=	spybye
 GNU_CONFIGURE=	yes

-.include <bsd.port.pre.mk>
+CLAMAV_LIB_DEPENDS=	libclamav.so:${PORTSDIR}/security/clamav
+CLAMAV_CONFIGURE_ON=	--with-libclamav=${PREFIX}/bin

-.if ${PORT_OPTIONS:MCLAMAV}
-LIB_DEPENDS+=	libclamav.so:${PORTSDIR}/security/clamav
-CONFIGURE_ARGS+=	--with-libclamav=${PREFIX}/bin
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/security/stegdetect/Makefile
+++ b/security/stegdetect/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	stegdetect
 PORTVERSION=	0.6
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	security
 MASTER_SITES=	http://www.outguess.org/ \
 		http://distfiles.master.finkmirrors.net/ \
@ -18,7 +18,7 @@ OPTIONS_DEFAULT=	X11
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MX11}
-LIB_DEPENDS=	libevent-1.4.so:${PORTSDIR}/devel/libevent
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
 USE_GNOME=	gtk12
 CONFIGURE_ENV+=	PATH_GTKCONFIG="${GTK_CONFIG}"
 PLIST_SUB+=	X11=""
--- a/security/tor-devel/Makefile
+++ b/security/tor-devel/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	tor
 DISTVERSION=	0.2.5.5-alpha
+PORTREVISION=	1
 CATEGORIES=	security net ipv6
 MASTER_SITES=	TOR
 PKGNAMESUFFIX=	-devel
@ -16,8 +17,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USES=		gmake
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-openssl-dir="${OPENSSLBASE}" --disable-asciidoc
-CONFIGURE_ENV=	TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include/event2 -I${LOCALBASE}/include" \
-		TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/event2" \
+CONFIGURE_ENV=	TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include" \
+		TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/" \
 		TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}"

 OPTIONS_DEFINE=	BUFFEREVENTS BUFFREELISTS INSTR_DOWNLOADS MEMPOOLS \
@ -80,19 +81,19 @@ CONFIGURE_ARGS+=	--disable-mempools
 .endif

 .if ${PORT_OPTIONS:MSTATIC_TOR}
-BUILD_DEPENDS +=	${LOCALBASE}/lib/event2/libevent.a:${PORTSDIR}/devel/libevent2
-CONFIGURE_ARGS+=	--enable-static-tor --with-libevent-dir=${LOCALBASE}/lib/event2 \
+BUILD_DEPENDS +=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent2
+CONFIGURE_ARGS+=	--enable-static-tor \
 			--with-zlib-dir=/usr/lib --disable-linker-hardening
-TOR_LIBEVENT_LIBS=	${LOCALBASE}/lib/event2/libevent.a
+TOR_LIBEVENT_LIBS=	${LOCALBASE}/lib/libevent.a
 .if ${PORT_OPTIONS:MBUFFEREVENTS}
-TOR_LIBEVENT_LIBS:=	${LOCALBASE}/lib/event2/libevent_openssl.a ${TOR_LIBEVENT_LIBS}
+TOR_LIBEVENT_LIBS:=	${LOCALBASE}/lib/libevent_openssl.a ${TOR_LIBEVENT_LIBS}
 .endif
 .else
 CONFIGURE_ARGS+=	--enable-linker-hardening
-LIB_DEPENDS+=		libevent-2.0.so:${PORTSDIR}/devel/libevent2
-TOR_LIBEVENT_LIBS=	-levent-2.0
+LIB_DEPENDS+=		libevent.so:${PORTSDIR}/devel/libevent2
+TOR_LIBEVENT_LIBS=	-levent
 .if ${PORT_OPTIONS:MBUFFEREVENTS}
-TOR_LIBEVENT_LIBS:=	-levent_openssl-2.0 ${TOR_LIBEVENT_LIBS}
+TOR_LIBEVENT_LIBS:=	-levent_openssl ${TOR_LIBEVENT_LIBS}
 .endif
 .endif

--- a/security/tor/Makefile
+++ b/security/tor/Makefile
@ -15,8 +15,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 USES=		gmake
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-openssl-dir="${OPENSSLBASE}" --disable-asciidoc
-CONFIGURE_ENV=	TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include/event2 -I${LOCALBASE}/include" \
-		TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/event2" \
+CONFIGURE_ENV=	TOR_CPPFLAGS_libevent="-I${LOCALBASE}/include" \
+		TOR_LDFLAGS_libevent="-L${LOCALBASE}/lib/" \
 		TOR_LIBEVENT_LIBS="${TOR_LIBEVENT_LIBS}"

 OPTIONS_DEFINE=	BUFFEREVENTS BUFFREELISTS INSTR_DOWNLOADS \
@ -71,19 +71,19 @@ CONFIGURE_ARGS+=	--disable-instrument-downloads
 .endif

 .if ${PORT_OPTIONS:MSTATIC_TOR}
-BUILD_DEPENDS +=	${LOCALBASE}/lib/event2/libevent.a:${PORTSDIR}/devel/libevent2
-CONFIGURE_ARGS+=	--enable-static-tor --with-libevent-dir=${LOCALBASE}/lib/event2 \
+BUILD_DEPENDS +=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent2
+CONFIGURE_ARGS+=	--enable-static-tor \
 			--with-zlib-dir=/usr/lib --disable-linker-hardening
-TOR_LIBEVENT_LIBS=	${LOCALBASE}/lib/event2/libevent.a
+TOR_LIBEVENT_LIBS=	${LOCALBASE}/lib/libevent.a
 .if ${PORT_OPTIONS:MBUFFEREVENTS}
-TOR_LIBEVENT_LIBS:=	${LOCALBASE}/lib/event2/libevent_openssl.a ${TOR_LIBEVENT_LIBS}
+TOR_LIBEVENT_LIBS:=	${LOCALBASE}/lib/libevent_openssl.a ${TOR_LIBEVENT_LIBS}
 .endif
 .else
 CONFIGURE_ARGS+=	--enable-linker-hardening
-LIB_DEPENDS+=		libevent-2.0.so:${PORTSDIR}/devel/libevent2
-TOR_LIBEVENT_LIBS=	-levent-2.0
+LIB_DEPENDS+=		libevent.so:${PORTSDIR}/devel/libevent2
+TOR_LIBEVENT_LIBS=	-levent
 .if ${PORT_OPTIONS:MBUFFEREVENTS}
-TOR_LIBEVENT_LIBS:=	-levent_openssl-2.0 ${TOR_LIBEVENT_LIBS}
+TOR_LIBEVENT_LIBS:=	-levent_openssl ${TOR_LIBEVENT_LIBS}
 .endif
 .endif

--- a/sysutils/grok/Makefile
+++ b/sysutils/grok/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	grok
 PORTVERSION=	1.20110708.1
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	GOOGLE_CODE
@ -14,7 +14,7 @@ OPTIONS_DEFINE=	DOCS

 BUILD_DEPENDS=	gperf>=3.0.3:${PORTSDIR}/devel/gperf
 LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre \
-		libevent-2.0.so:${PORTSDIR}/devel/libevent2 \
+		libevent.so:${PORTSDIR}/devel/libevent2 \
 		libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet
 RUN_DEPENDS:=	${BUILD_DEPENDS}

@ -24,8 +24,6 @@ MAKE_ENV+=	GPERF=${LOCALBASE}/bin/gperf \

 USES=		gmake pkgconfig
 USE_LDCONFIG=	yes
-LDFLAGS+=	`pkgconf --libs libevent`
-CFLAGS+=	`pkgconf --cflags libevent`

 SUB_FILES=	pkg-message

@ -33,7 +31,7 @@ PROJECTHOST=	semicomplete
 PORTDOCS=	CHANGELIST INSTALL

 post-patch:
-	@${REINPLACE_CMD} 's|PREFIX=|PREFIX?=|; s|-g root|-g wheel|; s|-levent||g' \
+	@${REINPLACE_CMD} 's|PREFIX=|PREFIX?=|; s|-g root|-g wheel|; ' \
 		${WRKSRC}/Makefile

 post-install:
--- a/sysutils/ori/Makefile
+++ b/sysutils/ori/Makefile
@ -3,14 +3,14 @@

 PORTNAME=	ori
 PORTVERSION=	0.8.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils net
 MASTER_SITES=	http://cdn.bitbucket.org/orifs/ori/downloads/

 MAINTAINER=	mashti@cs.stanford.edu
 COMMENT=	Ori Distributed File System

-LIB_DEPENDS=	libevent-2.0.so:${PORTSDIR}/devel/libevent2 \
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2 \
 		libboost_date_time.so:${PORTSDIR}/devel/boost-libs \
 		libexecinfo.so:${PORTSDIR}/devel/libexecinfo

--- a/sysutils/tmux/Makefile
+++ b/sysutils/tmux/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	tmux
 DISTVERSION=	1.9a
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}

@ -26,9 +26,8 @@ PLIST_DIRSTRY=	etc/bash_completion.d
 PORTDOCS=	CHANGES FAQ README TODO
 PORTEXAMPLES=	*

-OPTIONS_DEFINE=	DOCS EXAMPLES LIBEVENT2 LIBEVENT_STATIC BACKSPACE
+OPTIONS_DEFINE=	DOCS EXAMPLES LIBEVENT_STATIC BACKSPACE

-LIBEVENT2_DESC=	Use libevent version 2
 LIBEVENT_STATIC_DESC=	Build with static libevent
 BACKSPACE_DESC=	Build with tty/keys patch

@ -39,8 +38,9 @@ LIBEVENT2_CONFIGURE_ENV=	LIBEVENT_CFLAGS="-I${LOCALBASE}/include/event2/compat"
 				LIBEVENT_LIBS="-L${LOCALBASE}/lib/event2 -levent"
 LIBEVENT2_CONFIGURE_ENV_OFF=	LIBEVENT_CFLAGS="-I${LOCALBASE}/include" \
 				LIBEVENT_LIBS="-L${LOCALBASE}/lib -levent"
-LIBEVENT2_LIB_DEPENDS=		libevent-2.0.so:${PORTSDIR}/devel/libevent2
-LIBEVENT2_LIB_DEPENDS_OFF=	libevent-1.4.so:${PORTSDIR}/devel/libevent
+
+LIBEVENT_STATIC_LIB_DEPENDS_OFF=	libevent.so:${PORTSDIR}/devel/libevent2
+LIBEVENT_STATIC_BUILD_DEPENDS=	${LOCALBASE}/lib/libevent.a:${PORTSDIR}/devel/libevent2

 # 1.9a was released as an errata to 1.9
 # this port was never updated to 1.9
@ -52,11 +52,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/tmux.conf|${PREFIX}/etc/tmux.conf|g' ${WRKSRC}/CHANGES

 .if ${PORT_OPTIONS:MLIBEVENT_STATIC}
-.if ${PORT_OPTIONS:MLIBEVENT2}
-LESTATIC=	${LOCALBASE}/lib/event2/libevent.a
-.else
 LESTATIC=	${LOCALBASE}/lib/libevent.a
-.endif
 post-configure:
 	${REINPLACE_CMD} -e '/LIBS/s|-levent[^[:blank:]]*|${LESTATIC}|' \
 		${WRKSRC}/${MAKEFILE}
--- a/textproc/groonga/Makefile
+++ b/textproc/groonga/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	groonga
 PORTVERSION=	3.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://packages.groonga.org/source/groonga/

@ -55,7 +55,7 @@ PLIST_SUB+=	MECAB="@comment "
 CONFIGURE_ARGS+=	--with-libevent=${LOCALBASE} \
 			--with-message-pack=${LOCALBASE} \
 			--enable-zeromq
-LIB_DEPENDS+=	libevent-1.4.so:${PORTSDIR}/devel/libevent \
+LIB_DEPENDS+=	libevent.so:${PORTSDIR}/devel/libevent2 \
 		libmsgpack.so:${PORTSDIR}/devel/msgpack \
 		libzmq.so:${PORTSDIR}/net/libzmq2
 PLIST_SUB+=	SUGGEST=""
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@ -5,7 +5,7 @@

 PORTNAME=	chromium
 PORTVERSION=	35.0.1916.153
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://commondatastorage.googleapis.com/chromium-browser-official/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
@ -34,7 +34,7 @@ LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
 		libnss3.so:${PORTSDIR}/security/nss \
 		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring \
 		libcups.so:${PORTSDIR}/print/cups-client \
-		libevent-1.4.so:${PORTSDIR}/devel/libevent \
+		libevent.so:${PORTSDIR}/devel/libevent2 \
 		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
 		libpci.so:${PORTSDIR}/devel/libpci \
 		libdrm.so:${PORTSDIR}/graphics/libdrm
--- a/www/crawl/Makefile
+++ b/www/crawl/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	crawl
 PORTVERSION=	0.4
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	www
 MASTER_SITES=	http://www.monkey.org/~provos/

@ -12,7 +12,7 @@ COMMENT=	Small, efficient web crawler with advanced features

 OPTIONS_DEFINE=	EXAMPLES

-LIB_DEPENDS=	libevent-2.0.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2

 USES=		pkgconfig

--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	firefox
 DISTVERSION=	24.6.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	firefox
 DISTVERSION=	30.0
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
--- a/www/httpsqs/Makefile
+++ b/www/httpsqs/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	httpsqs
 PORTVERSION=	1.7
+PORTREVISION=	1
 CATEGORIES=	www devel
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}

@ -12,7 +13,7 @@ COMMENT=	Simple Queue Service based on HTTP GET/POST protocol
 LICENSE=	BSD

 LIB_DEPENDS+=	libtokyocabinet.so:${PORTSDIR}/databases/tokyocabinet \
-		libevent-2.0.so:${PORTSDIR}/devel/libevent2
+		libevent.so:${PORTSDIR}/devel/libevent2

 USES=		pkgconfig

--- a/www/mohawk/Makefile
+++ b/www/mohawk/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	mohawk
 PORTVERSION=	2.0.13
+PORTREVISION=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	http://fossil.bsdsx.fr/mohawk/tarball/ \
 		http://fossil.etoilebsd.net/mohawk/tarball/
@ -12,7 +13,7 @@ COMMENT=	Simple and lightweight HTTP daemon

 LICENSE=	BSD2CLAUSE

-LIB_DEPENDS=	libevent-2.0.so:${PORTSDIR}/devel/libevent2
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2

 PLIST_FILES+=	bin/mhtpasswd \
 		man/man5/mohawk.conf.5.gz \
@ -24,8 +25,8 @@ PLIST_FILES+=	bin/mhtpasswd \
 PORTEXAMPLES=	*
 USE_RC_SUBR=	mohawk

-CFLAGS+=	-I${LOCALBASE}/include/event2/compat -I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib/event2
+CFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib

 OPTIONS_DEFINE=	EXAMPLES

--- a/www/mohawk/files/patch-Makefile.inc
+++ b/www/mohawk/files/patch-Makefile.inc
@ -0,0 +1,13 @@
+--- Makefile.inc.orig	2014-07-24 14:39:15.798656512 +0200
+++ Makefile.inc	2014-07-24 14:39:25.056652385 +0200
+@@ -9,8 +9,8 @@
+ .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
+ PREFIX?=  /usr/local
+ CFLAGS+=  -I${PREFIX}/include
+-LDFLAGS+= -L${PREFIX}/lib/event2
+-LDADD+=   -lcrypt -levent-2.0
+LDFLAGS+= -L${PREFIX}/lib
+LDADD+=   -lcrypt -levent
+ MANDIR= ${PREFIX}/man/man
+ OSVERSION!= sysctl -n kern.osreldate
+ .if ${OPSYS} == "FreeBSD" && ${OSVERSION} >= 1000032
--- a/www/nghttp2/Makefile
+++ b/www/nghttp2/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	nghttp2
 PORTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	www net
 MASTER_SITES=	https://github.com/tatsuhiro-t/${PORTNAME}/releases/download/v${PORTVERSION}/ \
 		LOCAL/sunpoet
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	seamonkey
 DISTVERSION=	2.26.1
+PORTREVISION=	1
 CATEGORIES?=	www mail news editors irc ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		https://ftp.mozilla.org/pub/mozilla.org/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source/
--- a/www/spdylay/Makefile
+++ b/www/spdylay/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	spdylay
 PORTVERSION=	1.2.5
+PORTREVISION=	1
 CATEGORIES=	www net
 MASTER_SITES=	https://github.com/tatsuhiro-t/${PORTNAME}/releases/download/v${PORTVERSION}/ \
 		LOCAL/sunpoet