Index: head/dns/gdnsd2/Makefile
===================================================================
--- head/dns/gdnsd2/Makefile	(revision 381707)
+++ head/dns/gdnsd2/Makefile	(revision 381708)
@@ -1,63 +1,63 @@
 # Created by: Allan Jude <allanjude@freebsd.org>
 # $FreeBSD$
 
 PORTNAME=	gdnsd
-PORTVERSION=	2.1.0
-PORTREVISION=	1
+PORTVERSION=	2.2.0
 CATEGORIES=	dns
 MASTER_SITES=	https://github.com/blblack/gdnsd/releases/download/v${PORTVERSION}/ \
 		http://mirrors.rit.edu/zi/ \
 		http://gdnsd.scaleengine.net/gdnsd/
 PKGNAMESUFFIX=	2
 
 MAINTAINER=	zi@FreeBSD.org
 COMMENT=	Authoritative-only GeoIP-aware DNS server
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	libev.so:${PORTSDIR}/devel/libev
+BUILD_DEPENDS=	ragel>0:${PORTSDIR}/devel/ragel
 
 FETCH_ARGS=	-Fpr
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var
 USE_LDCONFIG=	yes
-USES=		pkgconfig libtool tar:xz perl5
+USES=		pkgconfig libtool tar:xz perl5 gmake
 USE_PERL5=	build
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFLICTS_INSTALL=	gdnsd-1.[0-9]*
 
 USE_RC_SUBR=	gdnsd
 
 USERS?=		gdnsd
 GROUPS?=	gdnsd
 
 OPTIONS_DEFINE=	DOCS GEOIP URCU
 OPTIONS_DEFAULT=GEOIP
 
 GEOIP_DESC=		Enable GeoIP Support
 GEOIP_RUN_DEPENDS=	GeoIP>=0:${PORTSDIR}/net/GeoIP
 
 URCU_DESC=		Read-Copy-Update Support (Faster Zone Parsing)
 URCU_CONFIGURE_WITH=	urcu
 URCU_LIB_DEPENDS=	liburcu.so:${PORTSDIR}/sysutils/liburcu
 
 .include <bsd.port.pre.mk>
 
 .if (${OSVERSION} >= 900000 && ${OSVERSION} < 903000)
 IGNORE=		you must be running FreeBSD 9.3 or higher
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|$${localstatedir}/lib/$${PACKAGE_NAME}|/var/db/${PORTNAME}|g' \
 		${WRKSRC}/configure
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/libgdnsd.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/plugin_*.so
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/gdnsd/geoip \
 		${STAGEDIR}${PREFIX}/etc/gdnsd/zones \
 		${STAGEDIR}/var/run/gdnsd
 
 .include <bsd.port.post.mk>
Index: head/dns/gdnsd2/distinfo
===================================================================
--- head/dns/gdnsd2/distinfo	(revision 381707)
+++ head/dns/gdnsd2/distinfo	(revision 381708)
@@ -1,2 +1,2 @@
-SHA256 (gdnsd-2.1.0.tar.xz) = 0276cc851f8904b842fdc34839163dec22fce7e6fa26acd1f5115c880e61eae4
-SIZE (gdnsd-2.1.0.tar.xz) = 628316
+SHA256 (gdnsd-2.2.0.tar.xz) = 6f245be97351dbe0f437f1edb2324f2a331869f0f028918ffbd627f0ae911180
+SIZE (gdnsd-2.2.0.tar.xz) = 622520
Index: head/dns/gdnsd2/files/patch-Makefile.in
===================================================================
--- head/dns/gdnsd2/files/patch-Makefile.in	(revision 381707)
+++ head/dns/gdnsd2/files/patch-Makefile.in	(revision 381708)
@@ -1,15 +1,15 @@
---- Makefile.in.orig	2014-11-07 15:38:17 UTC
+--- Makefile.in.orig	2015-03-02 14:36:56 UTC
 +++ Makefile.in
-@@ -939,12 +939,6 @@
+@@ -2552,12 +2552,6 @@ install-exec-hook-top:
  	$(MKDIR_P) "$(DESTDIR)$(GDNSD_DEFPATH_CONFIG)/geoip";
  	$(MKDIR_P) "$(DESTDIR)$(GDNSD_DEFPATH_RUN)";
  	$(MKDIR_P) "$(DESTDIR)$(GDNSD_DEFPATH_STATE)";
 -	@id gdnsd >/dev/null 2>&1; if test $$? -ne 0; then \
 -		echo; \
 -		echo === READ ME ===; \
 -		echo The default user \"gdnsd\" \(for privdrop when executed as root\) does not seem to exist yet!; \
 -		echo; \
 -	fi
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
+ src/zscan_rfc1035.c: src/zscan_rfc1035.rl
+ 	$(AM_V_GEN)$(RAGEL) -G2 -o $@ $(srcdir)/src/zscan_rfc1035.rl
+ libgdnsd/bopts.h: Makefile
Index: head/dns/gdnsd2/pkg-plist
===================================================================
--- head/dns/gdnsd2/pkg-plist	(revision 381707)
+++ head/dns/gdnsd2/pkg-plist	(revision 381708)
@@ -1,58 +1,61 @@
 bin/gdnsd_geoip_test
 include/gdnsd/alloc.h
+include/gdnsd/bopts.h
 include/gdnsd/compiler.h
 include/gdnsd/dmn.h
 include/gdnsd/dname.h
+include/gdnsd/file.h
 include/gdnsd/log.h
 include/gdnsd/misc.h
 include/gdnsd/mon.h
 include/gdnsd/net.h
 include/gdnsd/paths.h
 include/gdnsd/plugapi.h
 include/gdnsd/plugin.h
+include/gdnsd/prcu.h
 include/gdnsd/stats.h
 include/gdnsd/vscf.h
 lib/gdnsd/libgdnsd.so
 lib/gdnsd/plugin_extfile.so
 lib/gdnsd/plugin_extmon.so
 lib/gdnsd/plugin_geoip.so
 lib/gdnsd/plugin_http_status.so
 lib/gdnsd/plugin_metafo.so
 lib/gdnsd/plugin_multifo.so
 lib/gdnsd/plugin_null.so
 lib/gdnsd/plugin_reflect.so
 lib/gdnsd/plugin_simplefo.so
 lib/gdnsd/plugin_static.so
 lib/gdnsd/plugin_tcp_connect.so
 lib/gdnsd/plugin_weighted.so
 libexec/gdnsd/gdnsd_extmon_helper
 man/man1/gdnsd_geoip_test.1.gz
 man/man3/gdnsd-plugin-api.3.gz
 man/man5/gdnsd.config.5.gz
 man/man5/gdnsd.djbdns.5.gz
 man/man5/gdnsd.zonefile.5.gz
 man/man8/gdnsd-plugin-extfile.8.gz
 man/man8/gdnsd-plugin-extmon.8.gz
 man/man8/gdnsd-plugin-geoip.8.gz
 man/man8/gdnsd-plugin-http_status.8.gz
 man/man8/gdnsd-plugin-metafo.8.gz
 man/man8/gdnsd-plugin-multifo.8.gz
 man/man8/gdnsd-plugin-null.8.gz
 man/man8/gdnsd-plugin-reflect.8.gz
 man/man8/gdnsd-plugin-simplefo.8.gz
 man/man8/gdnsd-plugin-static.8.gz
 man/man8/gdnsd-plugin-tcp_connect.8.gz
 man/man8/gdnsd-plugin-weighted.8.gz
 man/man8/gdnsd.8.gz
 sbin/gdnsd
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%DOCSDIR%%/gdnsd_manual.txt
 @dir %%ETCDIR%%/djbdns
 @dir %%ETCDIR%%/geoip
 @dir %%ETCDIR%%/zones
 @dir /var/db/gdnsd
 @dir /var/run/gdnsd