Merge branch 'master' into mesa-nextHEADmesa-next

23 files changed, 80 insertions, 185 deletions

diff --git a/dns/bind-tools/Makefile b/dns/bind-tools/Makefile
index bb307ec3433..8ec2002a9ce 100644
--- a/dns/bind-tools/Makefile
+++ b/dns/bind-tools/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 # Define PORTREVISION in ${MASTERDIR}
-MASTERDIR=	${.CURDIR}/../../dns/bind910
+MASTERDIR=	${.CURDIR}/../../dns/bind911
 
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
diff --git a/dns/bind-tools/pkg-plist b/dns/bind-tools/pkg-plist
index b199437b4cb..107fc006208 100644
--- a/dns/bind-tools/pkg-plist
+++ b/dns/bind-tools/pkg-plist
@@ -1,11 +1,17 @@
+bin/arpaname
 bin/delv
 bin/dig
 bin/host
+bin/mdig
+bin/named-rrchecker
 bin/nslookup
 bin/nsupdate
+man/man1/arpaname.1.gz
 man/man1/delv.1.gz
 man/man1/dig.1.gz
 man/man1/host.1.gz
+man/man1/mdig.1.gz
+man/man1/named-rrchecker.1.gz
 man/man1/nslookup.1.gz
 man/man1/nsupdate.1.gz
 %%PYTHON%%man/man8/dnssec-checkds.8.gz
@@ -14,17 +20,27 @@ man/man8/dnssec-dsfromkey.8.gz
 man/man8/dnssec-importkey.8.gz
 man/man8/dnssec-keyfromlabel.8.gz
 man/man8/dnssec-keygen.8.gz
+%%PYTHON%%man/man8/dnssec-keymgr.8.gz
 man/man8/dnssec-revoke.8.gz
 man/man8/dnssec-settime.8.gz
 man/man8/dnssec-signzone.8.gz
 man/man8/dnssec-verify.8.gz
+man/man8/genrandom.8.gz
+man/man8/isc-hmac-fixup.8.gz
+man/man8/named-journalprint.8.gz
+man/man8/nsec3hash.8.gz
 %%PYTHON%%sbin/dnssec-checkds
 %%PYTHON%%sbin/dnssec-coverage
 sbin/dnssec-dsfromkey
 sbin/dnssec-importkey
 sbin/dnssec-keyfromlabel
 sbin/dnssec-keygen
+%%PYTHON%%sbin/dnssec-keymgr
 sbin/dnssec-revoke
 sbin/dnssec-settime
 sbin/dnssec-signzone
 sbin/dnssec-verify
+sbin/genrandom
+sbin/isc-hmac-fixup
+sbin/named-journalprint
+sbin/nsec3hash
diff --git a/dns/bind9-devel/Makefile b/dns/bind9-devel/Makefile
index 62cdc0ef763..b2ea0ae52be 100644
--- a/dns/bind9-devel/Makefile
+++ b/dns/bind9-devel/Makefile
@@ -5,10 +5,10 @@ PORTNAME=	bind
 PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
 .if defined(BIND_TOOLS_SLAVE)
 # dns/bind-tools here
-PORTREVISION=	0
+PORTREVISION=	1
 .else
 # dns/bind9xx here
-PORTREVISION=	0
+PORTREVISION=	1
 .endif
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	LOCAL/mat/bind
@@ -48,23 +48,22 @@ CONFIGURE_ARGS+=	--localstatedir=/var --disable-linux-caps \
 		--disable-symtable \
 		--with-randomdev=/dev/random \
 		--with-libxml2=${LOCALBASE} \
-		--with-readline=-ledit \
+		--with-readline="-L${LOCALBASE}/lib -ledit" \
 		--with-dlopen=yes \
 		--sysconfdir=${ETCDIR}
 .if defined(BIND_TOOLS_SLAVE)
 CONFIGURE_ARGS+=	--disable-shared
 .endif
 ETCDIR=		${PREFIX}/etc/namedb
-LDFLAGS+=	-L${LOCALBASE}/lib	# for ports-based libedit
 
-CONFLICTS+=	bind9*-9.[456789].* bind910-* bind911-*  bind9*-sdb-9.[456789].*
+CONFLICTS+=	bind99 bind910 bind911
 
 .if !defined(BIND_TOOLS_SLAVE)
 SUB_FILES=	pkg-message
 .endif
 
-OPTIONS_DEFAULT=	SSL THREADS SIGCHASE IDN GSSAPI_NONE
-OPTIONS_DEFINE=		IDN LARGE_FILE PYTHON \
+OPTIONS_DEFAULT=	SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON
+OPTIONS_DEFINE=		IDN LARGE_FILE PYTHON JSON \
 			FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA
 OPTIONS_RADIO=	CRYPTO GOSTDEF
 OPTIONS_RADIO_CRYPTO=	SSL NATIVE_PKCS11
@@ -119,9 +118,9 @@ GSSAPI_MIT_DESC=	Using security/krb5
 GSSAPI_NONE_DESC=	Disable
 
 .if defined(BIND_TOOLS_SLAVE)
-CONFLICTS+=		bind910-9.10.*
+CONFLICTS+=		bind9-devel
 .else
-CONFLICTS+=		bind-tools-9.*
+CONFLICTS+=		bind-tools
 .endif	# BIND_TOOLS_SLAVE
 
 SSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
@@ -149,6 +148,9 @@ NATIVE_PKCS11_CONFIGURE_ENABLE=	native-pkcs11
 GEOIP_CONFIGURE_WITH=	geoip
 GEOIP_LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
+JSON_LIB_DEPENDS=	libjson-c.so:devel/json-c
+JSON_CONFIGURE_WITH=	libjson
+
 GOST_CONFIGURE_ON=	--with-gost
 GOST_ASN1_CONFIGURE_ON=	--with-gost=asn1
 
diff --git a/dns/bind910/Makefile b/dns/bind910/Makefile
index 78c96672dc0..2a4b39aa068 100644
--- a/dns/bind910/Makefile
+++ b/dns/bind910/Makefile
@@ -3,28 +3,14 @@
 
 PORTNAME=	bind
 PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
-.if defined(BIND_TOOLS_SLAVE)
-# dns/bind-tools here
-PORTREVISION=	0
-.else
-# dns/bind9xx here
-PORTREVISION=	0
-.endif
+PORTREVISION=	1
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
-.if defined(BIND_TOOLS_SLAVE)
-PKGNAMESUFFIX=	-tools
-.else
 PKGNAMESUFFIX=	910
-.endif
 DISTNAME=	${PORTNAME}-${ISCVERSION}
 
 MAINTAINER=	mat@FreeBSD.org
-.if defined(BIND_TOOLS_SLAVE)
-COMMENT=	Command line tools from BIND: delv, dig, host, nslookup...
-.else
 COMMENT=	BIND DNS suite with updated DNSSEC and DNS64
-.endif
 
 LICENSE=	ISCL
 
@@ -46,36 +32,29 @@ CONFIGURE_ARGS+=	--localstatedir=/var --disable-linux-caps \
 		--disable-symtable \
 		--with-randomdev=/dev/random \
 		--with-libxml2=${LOCALBASE} \
-		--with-readline=-ledit \
+		--with-readline="-L${LOCALBASE}/lib -ledit" \
 		--with-dlopen=yes \
 		--sysconfdir=${ETCDIR}
-.if defined(BIND_TOOLS_SLAVE)
-CONFIGURE_ARGS+=	--disable-shared
-.endif
 ETCDIR=		${PREFIX}/etc/namedb
 
-CONFLICTS+=	bind9*-9.[456789].* bind911-* bind9*-sdb-9.[456789].*
+CONFLICTS+=	bind-tools bind99 bind911 bind9-devel
 
-.if !defined(BIND_TOOLS_SLAVE)
 SUB_FILES=	pkg-message
-.endif
 
-OPTIONS_DEFAULT=	SSL THREADS SIGCHASE IDN GSSAPI_NONE
-OPTIONS_DEFINE=		IDN LARGE_FILE PYTHON \
-			FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA
+OPTIONS_DEFAULT=	SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON \
+			DLZ_FILESYSTEM RPZ_NSIP RPZ_NSDNAME
+OPTIONS_DEFINE=		IDN LARGE_FILE PYTHON JSON \
+			FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA \
+			LINKS RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \
+			MINCACHE PORTREVISION FETCHLIMIT QUERYTRACE \
+			START_LATE
 OPTIONS_RADIO=	CRYPTO GOSTDEF
 OPTIONS_RADIO_CRYPTO=	SSL NATIVE_PKCS11
 OPTIONS_RADIO_GOSTDEF=	GOST GOST_ASN1
 
-.if !defined(BIND_TOOLS_SLAVE)
-OPTIONS_DEFAULT+=	DLZ_FILESYSTEM RPZ_NSIP RPZ_NSDNAME 
-OPTIONS_DEFINE+=	LINKS RPZ_NSIP RPZ_NSDNAME DOCS GEOIP \
-			MINCACHE PORTREVISION FETCHLIMIT QUERYTRACE \
-			START_LATE
 OPTIONS_GROUP=		DLZ
 OPTIONS_GROUP_DLZ=	DLZ_POSTGRESQL DLZ_MYSQL DLZ_BDB \
 			DLZ_LDAP DLZ_FILESYSTEM DLZ_STUB
-.endif	# BIND_TOOLS_SLAVE
 OPTIONS_SINGLE=		GSSAPI
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE
 
@@ -117,12 +96,6 @@ MINCACHE_EXTRA_PATCHES=	${FILESDIR}/extrapatch-bind-min-override-ttl
 FETCHLIMIT_CONFIGURE_ENABLE=	fetchlimit
 QUERYTRACE_CONFIGURE_ENABLE=	querytrace
 
-.if defined(BIND_TOOLS_SLAVE)
-CONFLICTS+=		bind910-9.10.*
-.else
-CONFLICTS+=		bind-tools-9.*
-.endif	# BIND_TOOLS_SLAVE
-
 SSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
 SSL_USES=		ssl
 SSL_CONFIGURE_OFF=	--disable-openssl-version-check --without-openssl
@@ -145,6 +118,9 @@ NATIVE_PKCS11_CONFIGURE_ENABLE=	native-pkcs11
 GEOIP_CONFIGURE_WITH=	geoip
 GEOIP_LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
+JSON_LIB_DEPENDS=	libjson-c.so:devel/json-c
+JSON_CONFIGURE_WITH=	libjson
+
 GOST_CONFIGURE_ON=	--with-gost
 GOST_ASN1_CONFIGURE_ON=	--with-gost=asn1
 
@@ -209,10 +185,8 @@ CONFIGURE_ARGS+=	--disable-threads
 PKGINSTALL=	${NONEXISTENT}
 PLIST_SUB+=	NOBASE="" BASE="@comment "
 SUB_LIST+=	NOBASE="" BASE="@comment "
-.if !defined(BIND_TOOLS_SLAVE)
 USE_RC_SUBR+=	named
 SUB_FILES+=	named.conf
-.endif # !defined(BIND_TOOLS_SLAVE)
 .else
 PLIST_SUB+=	NOBASE="@comment " BASE=""
 SUB_LIST+=	NOBASE="@comment " BASE=""
@@ -236,26 +210,14 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|readline/readline.h|editline/readline.h|; \
 		s|readline/history.h|histedit.h|' \
 		${WRKSRC}/bin/dig/nslookup.c ${WRKSRC}/bin/nsupdate/nsupdate.c
-.if defined(BIND_TOOLS_SLAVE)
-	@${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = lib bin#' \
-		-e 's#isc-config.sh installdirs#installdirs#' \
-		-e 's#.*INSTALL.*isc-config.*##' \
-		-e 's#.*INSTALL.*bind.keys.*##' \
-		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = delv dig dnssec nsupdate \\#' \
-		-e 's#^	.*check confgen ##' \
-		${WRKSRC}/bin/Makefile.in
-.else
-.  for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \
+.for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \
 	rndc/rndc.8
 	@${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \
 		-e 's#/etc/rndc.conf#${ETCDIR}/rndc.conf#g' \
 		-e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \
 		${WRKSRC}/bin/${FILE}
-.  endfor
-.endif
+.endfor
 
-.if !defined(BIND_TOOLS_SLAVE)
 .if ${PORTREVISION:N0}
 post-patch-PORTREVISION-on:
 	@${REINPLACE_CMD} -e '/EXTENSIONS/s#=$$#=_${PORTREVISION}#' \
@@ -288,6 +250,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \
 		${STAGEDIR}${ETCDIR}/rndc.conf.sample
 
-.endif	# BIND_TOOLS_SLAVE
-
 .include <bsd.port.post.mk>
diff --git a/dns/bind911/Makefile b/dns/bind911/Makefile
index c71d3426503..6472439d3e4 100644
--- a/dns/bind911/Makefile
+++ b/dns/bind911/Makefile
@@ -5,10 +5,10 @@ PORTNAME=	bind
 PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
 .if defined(BIND_TOOLS_SLAVE)
 # dns/bind-tools here
-PORTREVISION=	0
+PORTREVISION=	1
 .else
 # dns/bind9xx here
-PORTREVISION=	0
+PORTREVISION=	1
 .endif
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
@@ -46,7 +46,7 @@ CONFIGURE_ARGS+=	--localstatedir=/var --disable-linux-caps \
 		--disable-symtable \
 		--with-randomdev=/dev/random \
 		--with-libxml2=${LOCALBASE} \
-		--with-readline=-ledit \
+		--with-readline="-L${LOCALBASE}/lib -ledit" \
 		--with-dlopen=yes \
 		--sysconfdir=${ETCDIR}
 .if defined(BIND_TOOLS_SLAVE)
@@ -54,14 +54,14 @@ CONFIGURE_ARGS+=	--disable-shared
 .endif
 ETCDIR=		${PREFIX}/etc/namedb
 
-CONFLICTS+=	bind9*-9.[456789].* bind910-* bind9*-sdb-9.[456789].*
+CONFLICTS+=	bind99 bind910 bind9-devel
 
 .if !defined(BIND_TOOLS_SLAVE)
 SUB_FILES=	pkg-message
 .endif
 
-OPTIONS_DEFAULT=	SSL THREADS SIGCHASE IDN GSSAPI_NONE
-OPTIONS_DEFINE=		IDN LARGE_FILE PYTHON \
+OPTIONS_DEFAULT=	SSL THREADS SIGCHASE IDN GSSAPI_NONE JSON
+OPTIONS_DEFINE=		IDN LARGE_FILE PYTHON JSON \
 			FIXED_RRSET SIGCHASE IPV6 THREADS FILTER_AAAA
 OPTIONS_RADIO=	CRYPTO GOSTDEF
 OPTIONS_RADIO_CRYPTO=	SSL NATIVE_PKCS11
@@ -116,9 +116,9 @@ GSSAPI_MIT_DESC=	Using security/krb5
 GSSAPI_NONE_DESC=	Disable
 
 .if defined(BIND_TOOLS_SLAVE)
-CONFLICTS+=		bind910-9.10.*
+CONFLICTS+=		bind911
 .else
-CONFLICTS+=		bind-tools-9.*
+CONFLICTS+=		bind-tools
 .endif	# BIND_TOOLS_SLAVE
 
 SSL_CONFIGURE_ON=	--with-openssl=${OPENSSLBASE}
@@ -146,6 +146,9 @@ NATIVE_PKCS11_CONFIGURE_ENABLE=	native-pkcs11
 GEOIP_CONFIGURE_WITH=	geoip
 GEOIP_LIB_DEPENDS=	libGeoIP.so:net/GeoIP
 
+JSON_LIB_DEPENDS=	libjson-c.so:devel/json-c
+JSON_CONFIGURE_WITH=	libjson
+
 GOST_CONFIGURE_ON=	--with-gost
 GOST_ASN1_CONFIGURE_ON=	--with-gost=asn1
 
@@ -253,7 +256,7 @@ post-patch:
 		-e 's#.*INSTALL.*isc-config.*##' \
 		-e 's#.*INSTALL.*bind.keys.*##' \
 		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = delv dig dnssec nsupdate \\#' \
+	@${REINPLACE_CMD} -e 's#^SUBDIRS.*#SUBDIRS = dig delv dnssec tools nsupdate \\#' \
 		-e 's#^	.*check confgen ##' \
 		${WRKSRC}/bin/Makefile.in
 .else
@@ -298,10 +301,10 @@ post-install:
 .endif
 	${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \
 		${STAGEDIR}${ETCDIR}/rndc.conf.sample
+.endif	# BIND_TOOLS_SLAVE
 
 # Can't use USE_PYTHON=autoplist
 post-install-PYTHON-on:
 	@${FIND} ${STAGEDIR}${PYTHON_SITELIBDIR} -type f | ${SED} -e 's|${STAGEDIR}||' >> ${TMPPLIST}
-.endif	# BIND_TOOLS_SLAVE
 
 .include <bsd.port.post.mk>
diff --git a/dns/bind99/Makefile b/dns/bind99/Makefile
index 4258964c5bf..da3f9f61403 100644
--- a/dns/bind99/Makefile
+++ b/dns/bind99/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	bind
 PORTVERSION=	${ISCVERSION:S/-P/P/:S/b/.b/:S/a/.a/:S/rc/.rc/}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
 PKGNAMESUFFIX=	99
@@ -32,12 +32,12 @@ CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 		--disable-symtable \
 		--with-randomdev=/dev/random \
 		--with-libxml2=${LOCALBASE} \
-		--with-readline=-ledit \
+		--with-readline="-L${LOCALBASE}/lib -ledit" \
 		--with-dlopen=yes \
 		--sysconfdir=${ETCDIR}
 ETCDIR=		${PREFIX}/etc/namedb
 
-CONFLICTS=	bind9*-9.[45678].* bind9*-sdb-9.[45678].* bind910-* bind911-* bind-tools-9.*
+CONFLICTS=	bind-tools bind9-devel bind910 bind911
 
 SUB_FILES=	pkg-message
 
diff --git a/dns/dnshistory/Makefile b/dns/dnshistory/Makefile
index 33767f686a4..59e91f7e9ae 100644
--- a/dns/dnshistory/Makefile
+++ b/dns/dnshistory/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dnshistory
 PORTVERSION=	1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns
 MASTER_SITES=	http://www.stedee.id.au/files/ \
 		http://launchpad.net/${PORTNAME}/${PORTVERSION}/${PORTVERSION}/+download/
diff --git a/dns/dnsperf/Makefile b/dns/dnsperf/Makefile
index 16f6def39ca..827322b3930 100644
--- a/dns/dnsperf/Makefile
+++ b/dns/dnsperf/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dnsperf
 PORTVERSION=	2.0.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	dns benchmarks net
 MASTER_SITES=	ftp://ftp.nominum.com/pub/nominum/${PORTNAME}/${PORTVERSION}/
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}-1
diff --git a/dns/dnsutl/Makefile b/dns/dnsutl/Makefile
index 31add42537f..630d399fb95 100644
--- a/dns/dnsutl/Makefile
+++ b/dns/dnsutl/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	dnsutl
 PORTVERSION=	1.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
 
diff --git a/dns/idnkit/Makefile b/dns/idnkit/Makefile
index 0e074abafcb..77d8e2b67c5 100644
--- a/dns/idnkit/Makefile
+++ b/dns/idnkit/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	idnkit
 PORTVERSION=	1.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	dns
 MASTER_SITES=	http://www.nic.ad.jp/ja/idn/idnkit/download/sources/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
diff --git a/dns/idnkit2/Makefile b/dns/idnkit2/Makefile
index 141f4a9d116..8b53a4f208a 100644
--- a/dns/idnkit2/Makefile
+++ b/dns/idnkit2/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	idnkit
 PORTVERSION=	2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	dns
 MASTER_SITES=	http://jprs.co.jp/idn/
 PKGNAMESUFFIX=	2
diff --git a/dns/knot2/Makefile b/dns/knot2/Makefile
index d8639b7b16e..f1f5022d274 100644
--- a/dns/knot2/Makefile
+++ b/dns/knot2/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	knot
-PORTVERSION=	2.3.2
+PORTVERSION=	2.3.3
 CATEGORIES=	dns ipv6
 MASTER_SITES=	https://secure.nic.cz/files/knot-dns/ \
 		http://dns-lab.com/downloads/knot-dns/
diff --git a/dns/knot2/distinfo b/dns/knot2/distinfo
index 7a8f7daea67..92936eb60bc 100644
--- a/dns/knot2/distinfo
+++ b/dns/knot2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479994675
-SHA256 (knot-2.3.2.tar.xz) = ba298157693d2b3264ff53afd397d8bb240336b36c18064515890733254700df
-SIZE (knot-2.3.2.tar.xz) = 1069500
+TIMESTAMP = 1481221203
+SHA256 (knot-2.3.3.tar.xz) = a929bce3b957a81776b1db7b43b0e4473339bf16be8dbba5abb4b0593bf43c94
+SIZE (knot-2.3.3.tar.xz) = 1071160
diff --git a/dns/knot2/pkg-plist b/dns/knot2/pkg-plist
index 3034c4b4479..1bb1a6ed99a 100644
--- a/dns/knot2/pkg-plist
+++ b/dns/knot2/pkg-plist
@@ -1,5 +1,6 @@
 bin/kdig
 bin/khost
+bin/kjournalprint
 bin/knsec3hash
 bin/knsupdate
 bin/kzonecheck
@@ -85,6 +86,7 @@ libdata/pkgconfig/libzscanner.pc
 libexec/knot1to2
 man/man1/kdig.1.gz
 man/man1/khost.1.gz
+man/man1/kjournalprint.1.gz
 man/man1/knot1to2.1.gz
 man/man1/knsec3hash.1.gz
 man/man1/knsupdate.1.gz
diff --git a/dns/mydns-ng/Makefile b/dns/mydns-ng/Makefile
index 1bcd568e408..3816dc17f8d 100644
--- a/dns/mydns-ng/Makefile
+++ b/dns/mydns-ng/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mydns-ng
 PORTVERSION=	1.2.8.31
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	dns databases
 MASTER_SITES=	SF/${PORTNAME}/mydns/${PORTVERSION}
 DISTNAME=	mydns-${PORTVERSION}
diff --git a/dns/mydns/Makefile b/dns/mydns/Makefile
index da9a1ac15bd..9bb7cd86616 100644
--- a/dns/mydns/Makefile
+++ b/dns/mydns/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mydns
 PORTVERSION=	1.1.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	dns databases
 MASTER_SITES=	http://mydns.bboy.net/download/
 
diff --git a/dns/nsd/Makefile b/dns/nsd/Makefile
index 2b81cf81561..a8fc024e14f 100644
--- a/dns/nsd/Makefile
+++ b/dns/nsd/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nsd
-PORTVERSION=	4.1.13
+PORTVERSION=	4.1.14
 CATEGORIES=	dns ipv6
 MASTER_SITES=	http://www.nlnetlabs.nl/downloads/nsd/	\
 		ftp://ftp.rhnet.is/pub/nsd/
diff --git a/dns/nsd/distinfo b/dns/nsd/distinfo
index 35c5ef9c9a4..5e1fc7405e7 100644
--- a/dns/nsd/distinfo
+++ b/dns/nsd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1474969514
-SHA256 (nsd-4.1.13.tar.gz) = c45cd4ba2101a027e133b2be44db9378e27602e05f09a5ef25019e1ae45291af
-SIZE (nsd-4.1.13.tar.gz) = 1085701
+TIMESTAMP = 1481216207
+SHA256 (nsd-4.1.14.tar.gz) = bdfc61c5f3bf11febd8f4776eef1d4f2d95ed70f12f11d4eeee943c186ffd802
+SIZE (nsd-4.1.14.tar.gz) = 1086818
diff --git a/dns/openmdns/Makefile b/dns/openmdns/Makefile
index 71c7541caa3..7b4bd651fa9 100644
--- a/dns/openmdns/Makefile
+++ b/dns/openmdns/Makefile
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	openmdns
-DISTVERSION=	0.6-11
-DISTVERSIONSUFFIX=	-g2008828
-PORTREVISION=	2
+DISTVERSION=	0.6-15
+DISTVERSIONSUFFIX=	-gd76ce05
 CATEGORIES=	dns
 
 MAINTAINER=	jbeich@FreeBSD.org
diff --git a/dns/openmdns/distinfo b/dns/openmdns/distinfo
index 3b9a4962a9b..189f81e57be 100644
--- a/dns/openmdns/distinfo
+++ b/dns/openmdns/distinfo
@@ -1,3 +1,3 @@
 TIMESTAMP = 1477685972
-SHA256 (haesbaert-mdnsd-0.6-11-g2008828_GH0.tar.gz) = 0b78ad9fc975df9b3a1258359b9ee6f81c2e0f4a47a25ac87d9a69a296cdebdc
-SIZE (haesbaert-mdnsd-0.6-11-g2008828_GH0.tar.gz) = 2935593
+SHA256 (haesbaert-mdnsd-0.6-15-gd76ce05_GH0.tar.gz) = bf307fbe392284b80be922ce24ad78104ecb5eabd173ced9fd12344dcce57889
+SIZE (haesbaert-mdnsd-0.6-15-gd76ce05_GH0.tar.gz) = 2935582
diff --git a/dns/openmdns/files/patch-mdnsd_kiface.c b/dns/openmdns/files/patch-mdnsd_kiface.c
deleted file mode 100644
index 9545f842336..00000000000
--- a/dns/openmdns/files/patch-mdnsd_kiface.c
+++ /dev/null
@@ -1,18 +0,0 @@
-In file included from kiface.c:25:0:
-kiface.c:67:1: error: expected ';', identifier or '(' before 'void'
- RB_GENERATE(kif_tree, kif_node, entry, kif_compare)
- ^
-
---- mdnsd/kiface.c.orig	2015-05-29 14:18:11 UTC
-+++ mdnsd/kiface.c
-@@ -63,8 +63,8 @@ struct {
- 
- 
- RB_HEAD(kif_tree, kif_node) kit;
--RB_PROTOTYPE(kif_tree, kif_node, entry, kif_compare)
--RB_GENERATE(kif_tree, kif_node, entry, kif_compare)
-+RB_PROTOTYPE(kif_tree, kif_node, entry, kif_compare);
-+RB_GENERATE(kif_tree, kif_node, entry, kif_compare);
- 
- int
- kif_init(void)
diff --git a/dns/openmdns/files/patch-mdnsd_mdnsd.h b/dns/openmdns/files/patch-mdnsd_mdnsd.h
deleted file mode 100644
index ce4e88c0b8b..00000000000
--- a/dns/openmdns/files/patch-mdnsd_mdnsd.h
+++ /dev/null
@@ -1,25 +0,0 @@
-In file included from log.c:33:
-In file included from mdnsd/log.h:24:
-In file included from mdnsd/mdnsd.h:30:
-/usr/local/include/imsg.h:31:2: error: type name requires a specifier or qualifier
-        TAILQ_ENTRY(ibuf)        entry;
-        ^
-/usr/local/include/imsg.h:31:14: error: a parameter list without types is only allowed in a function
-      definition
-        TAILQ_ENTRY(ibuf)        entry;
-                    ^
-/usr/local/include/imsg.h:31:19: error: expected ';' at end of declaration list
-        TAILQ_ENTRY(ibuf)        entry;
-                         ^
-[...]
-
---- mdnsd/mdnsd.h.orig	2015-05-29 14:18:11 UTC
-+++ mdnsd/mdnsd.h
-@@ -18,6 +18,7 @@
- #define	_MDNSD_H_
- 
- #include <sys/param.h>
-+#include <sys/queue.h>
- #include <sys/socket.h>
- #include <sys/tree.h>
- #include <sys/types.h>
diff --git a/dns/openmdns/files/patch-mdnsd_packet.c b/dns/openmdns/files/patch-mdnsd_packet.c
deleted file mode 100644
index f39f05b0560..00000000000
--- a/dns/openmdns/files/patch-mdnsd_packet.c
+++ /dev/null
@@ -1,44 +0,0 @@
-packet.c:919:22: error: passing 'u_char [64]' to parameter of type 'const char *' converts between
-      pointers to integer types with different sign [-Werror=pointer-sign]
-                if (strlcat(dname, label, MAXHOSTNAMELEN) >= MAXHOSTNAMELEN)  {
-                                   ^~~~~
-/usr/include/string.h:92:59: note: passing argument to parameter here
-size_t   strlcat(char * __restrict, const char * __restrict, size_t);
-                                                           ^
-packet.c:986:7: error: assigning to 'char *' from 'u_int8_t *' (aka 'unsigned char *') converts
-      between pointers to integer types with different sign [-Werror=pointer-sign]
-                buf = *pbuf;
-                    ^ ~~~~~
-packet.c:1025:7: error: assigning to 'char *' from 'u_int8_t *' (aka 'unsigned char *') converts
-      between pointers to integer types with different sign [-Werror=pointer-sign]
-                buf = *pbuf;
-                    ^ ~~~~~
-packet.c:1033:22: error: passing 'char *' to parameter of type 'u_int8_t *' (aka 'unsigned char *')
-      converts between pointers to integer types with different sign [-Werror=pointer-sign]
-                if (rr_parse_dname(buf, tmplen, rr->rdata.SRV.target) == -1)
-                                   ^~~
-packet.c:71:32: note: passing argument to parameter here
-int              rr_parse_dname(u_int8_t *, u_int16_t, char [MAXHOSTNAMELEN]);
-                                          ^
-4 errors generated.
-
---- mdnsd/packet.c.orig	2015-05-29 14:18:11 UTC
-+++ mdnsd/packet.c
-@@ -853,7 +853,7 @@ pkt_parse_dname(u_int8_t *buf, u_int16_t
- 	int jumped = 0;
- 	u_int16_t oldlen = len;
- 	size_t slen;
--	u_char label[MAXLABELLEN];
-+	char label[MAXLABELLEN];
- 
- 	/* be extra safe */
- 	bzero(dname, MAXHOSTNAMELEN);
-@@ -948,7 +948,7 @@ pkt_parse_rr(u_int8_t **pbuf, u_int16_t 
- 	u_int16_t us, rdlen, tmplen;
- 	u_int32_t ul;
- 	ssize_t n;
--	char *buf;
-+	u_char *buf;
- 
- 	n = pkt_parse_dname(*pbuf, *len, rr->rrs.dname);
- 	if (n == -1)