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

10 files changed, 28 insertions, 10 deletions

diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 9064d3f2739d..82f092032269 100644
--- 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
diff --git a/www/crawl/Makefile b/www/crawl/Makefile
index 3673ac766752..ebd91fc86269 100644
--- 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
 
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index fc23fc1e4609..74e3e8a3e01f 100644
--- 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
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index 1d3ac58c2510..c1b58eb7b498 100644
--- 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 \
diff --git a/www/httpsqs/Makefile b/www/httpsqs/Makefile
index cc610afe7f13..d1417034b6bf 100644
--- 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
 
diff --git a/www/mohawk/Makefile b/www/mohawk/Makefile
index b2eb29f69f93..f49e1f1e1666 100644
--- 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
 
diff --git a/www/mohawk/files/patch-Makefile.inc b/www/mohawk/files/patch-Makefile.inc
new file mode 100644
index 000000000000..5edf7d50ba59
--- /dev/null
+++ 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
diff --git a/www/nghttp2/Makefile b/www/nghttp2/Makefile
index f58470d4380a..45334a0dba7b 100644
--- 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
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 443f86a9481b..6d1848b80757 100644
--- 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/
diff --git a/www/spdylay/Makefile b/www/spdylay/Makefile
index 8d5b3c7bfc4e..e8a2be1e0104 100644
--- 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