2 files changed, 11 insertions, 24 deletions

diff --git a/dns/bind94/Makefile b/dns/bind94/Makefile
index e2b108a90100..264654d023de 100644
--- a/dns/bind94/Makefile
+++ b/dns/bind94/Makefile
@@ -12,7 +12,7 @@
 # release you can generally build it cleanly from the source - Doug
 
 PORTNAME=	bind94
-PORTVERSION=	9.4.4.ESV.3
+PORTVERSION=	9.4.4.ESV.4
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC} \
 		http://dougbarton.us/Downloads/%SUBDIR%/
@@ -22,10 +22,10 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	dougb@FreeBSD.org
-COMMENT=	The BIND DNS suite version 9.4-ESV-R1 with updated DNSSEC and threads
+COMMENT=	The BIND DNS suite with updated DNSSEC and threads
 
 # ISC releases things like 9.4.0b3, which our versioning doesn't like
-ISCVERSION=	9.4-ESV-R3
+ISCVERSION=	9.4-ESV-R4
 
 MAKE_JOBS_UNSAFE=	yes
 
@@ -33,7 +33,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 		--with-randomdev=/dev/random
 
-CONFLICTS=	bind9*-9.[3567].* bind9-sdb-* host-*
+CONFLICTS=	bind9*-9.[567].* bind9-sdb-* host-* bind-tools-9.*
 
 OPTIONS=	SSL "Building without OpenSSL removes DNSSEC" on \
 		LINKS "Create conf file symlinks in ${PREFIX}" on \
@@ -41,6 +41,7 @@ OPTIONS=	SSL "Building without OpenSSL removes DNSSEC" on \
 		LARGE_FILE "64-bit file support" off \
 		SIGCHASE "dig/host/nslookup will do DNSSEC validation" off \
 		IPV6 "IPv6 Support (autodetected by default)" off \
+		THREADS "Compile with thread support" on \
 		DLZ_POSTGRESQL "DLZ Postgres driver" off \
 		DLZ_MYSQL "DLZ MySQL driver (single-threaded BIND)" off \
 		DLZ_BDB "DLZ BDB driver" off \
@@ -53,13 +54,6 @@ USE_OPENSSL=	yes
 
 .include <bsd.port.pre.mk>
 
-# We are ok by default from 7.0-RELEASE on
-.if ${OSVERSION} >= 700055
-OPTIONS+=	THREADS "Compile with thread support" on
-.else
-OPTIONS+=	THREADS "Compile w/threads (Not Recommended <FreeBSD-7)" off
-.endif
-
 .if !defined(WITHOUT_SSL)
 CONFIGURE_ARGS+=	--with-openssl=${OPENSSLBASE}
 .else
@@ -211,6 +205,7 @@ post-patch:
 		${WRKSRC}/bin/${FILE}.Dist > ${WRKSRC}/bin/${FILE}
 .endfor
 
+PKGINSTALL=	${.CURDIR}/../bind97/pkg-install
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/bin/rndc/rndc.conf \
 		${BIND_DESTETC}/rndc.conf.sample
@@ -223,12 +218,7 @@ post-install:
 		${WRKSRC}/README ${DOCSDIR}/
 .endif
 .if !defined(WITHOUT_LINKS) && !defined(WITH_REPLACE_BASE)
-	${MKDIR} /var/named${PREFIX}/etc
-.for DIR in ${PREFIX}/etc /var/named${PREFIX}/etc
-.for FILE in named.conf rndc.key
-	${LN} -sf /etc/namedb/${FILE} ${DIR}/${FILE}
-.endfor
-.endfor
+	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
 
 	@${CAT} ${PKGMESSAGE}
diff --git a/dns/bind94/distinfo b/dns/bind94/distinfo
index f8693f1eed63..d26053463ae3 100644
--- a/dns/bind94/distinfo
+++ b/dns/bind94/distinfo
@@ -1,9 +1,6 @@
-MD5 (bind-9.4-ESV-R3.tar.gz) = 2fb4d50c5872114e556aac478fc69b49
-SHA256 (bind-9.4-ESV-R3.tar.gz) = 824f81b361faa4252e62662f7c83f81eb0027cc34cea15f8ff5b6feff3103812
-SIZE (bind-9.4-ESV-R3.tar.gz) = 6707499
-MD5 (bind-9.4-ESV-R3.tar.gz.asc) = aa4ec1bf3679b9540034231feace183a
-SHA256 (bind-9.4-ESV-R3.tar.gz.asc) = 7a2da50360f3e40f4307065af9db8161af8a10823630cfc970cc1b755a971458
-SIZE (bind-9.4-ESV-R3.tar.gz.asc) = 480
-MD5 (bind-9.4.1-geodns-patch.tar.gz) = d3d515bdef525f9a31787b36a105e690
+SHA256 (bind-9.4-ESV-R4.tar.gz) = 2b25d013b34dfed5b70dff5d75825a4338eaa724f68a554afdad4adcd5be10d5
+SIZE (bind-9.4-ESV-R4.tar.gz) = 6753355
+SHA256 (bind-9.4-ESV-R4.tar.gz.asc) = 80b6bc6c204393ce0d2cc763a54cd396667ce1355013f97f2b5f92cc3120fc8f
+SIZE (bind-9.4-ESV-R4.tar.gz.asc) = 481
 SHA256 (bind-9.4.1-geodns-patch.tar.gz) = 352413037e4779519c0a5b70aef801c8f84bcf15d1d485b16096d75f83644a65
 SIZE (bind-9.4.1-geodns-patch.tar.gz) = 2057