Index: head/devel/libevent2/Makefile
===================================================================
--- head/devel/libevent2/Makefile	(revision 376664)
+++ head/devel/libevent2/Makefile	(revision 376665)
@@ -1,36 +1,45 @@
 # Created by: Martin Matuska <mm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libevent2
-PORTVERSION=	2.0.21
-PORTREVISION=	3
+PORTVERSION=	2.0.22
 CATEGORIES=	devel
-MASTER_SITES=	http://cloud.github.com/downloads/libevent/libevent/
-DISTNAME=	${PORTNAME:S/2//}-${DISTVERSION}-stable
 
 MAINTAINER=	mm@FreeBSD.org
 COMMENT=	API for executing callback functions on events or timeouts
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	${GH_PROJECT}
+GH_PROJECT=	${PORTNAME:S/2$//}
+GH_TAGNAME=	release-${DISTVERSION}-stable
+GH_COMMIT=	d8ceae8
+
 GNU_CONFIGURE=	yes
-USES=		libtool pathfix
+USES=		autoreconf libtool pathfix
+PATHFIX_MAKEFILEIN=Makefile.am
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	OPENSSL THREADS
 OPTIONS_DEFAULT=	OPENSSL THREADS
 OPTIONS_SUB=	yes
 INSTALL_TARGET=	install-strip
 
 OPENSSL_USE=	openssl=yes
 OPENSSL_CPPFLAGS=	-I${OPENSSLINC}
 OPENSSL_LDFLAGS=	-L${OPENSSLLIB}
 OPENSSL_CONFIGURE_ENABLE=	openssl
 
 THREADS_CONFIGURE_ENABLE=	support
+
+post-patch:
+	${ECHO_CMD} 'AC_CONFIG_MACRO_DIR([m4])' >>${WRKSRC}/configure.in
+# error: using '$(top_srcdir)' in TESTS is currently broken
+	${REINPLACE_CMD} 's/^TESTS.*top_srcdir/#&/' ${WRKSRC}/test/Makefile.am
 
 regression-test: build
 	@(${SH} ${WRKSRC}/test/regress)
 
 .include <bsd.port.mk>
Index: head/devel/libevent2/distinfo
===================================================================
--- head/devel/libevent2/distinfo	(revision 376664)
+++ head/devel/libevent2/distinfo	(revision 376665)
@@ -1,2 +1,2 @@
-SHA256 (libevent-2.0.21-stable.tar.gz) = 22a530a8a5ba1cb9c080cba033206b17dacd21437762155c6d30ee6469f574f5
-SIZE (libevent-2.0.21-stable.tar.gz) = 850772
+SHA256 (libevent2-2.0.22.tar.gz) = 24d500180c62e05bc3188f1ca8aebadf2b85ea6f25333931437cbe3010c55d1a
+SIZE (libevent2-2.0.22.tar.gz) = 512585
Index: head/devel/libevent2/pkg-plist
===================================================================
--- head/devel/libevent2/pkg-plist	(revision 376664)
+++ head/devel/libevent2/pkg-plist	(revision 376665)
@@ -1,54 +1,54 @@
 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/event_compat.h
 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-2.0.so.5.1.10
 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-2.0.so.5.1.10
 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-2.0.so.5.1.10
 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-2.0.so.5.1.10
 %%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-2.0.so.5.1.10
 %%THREADS%%lib/libevent_pthreads.a
 %%THREADS%%lib/libevent_pthreads.so
 libdata/pkgconfig/libevent.pc
 %%OPENSSL%%libdata/pkgconfig/libevent_openssl.pc
 %%THREADS%%libdata/pkgconfig/libevent_pthreads.pc