Update dns/bind99 to 9.9.7 and dns/bind910 to 9.10.2.

On 8 and 9, use the same configuration path than on 10+, ${PREFIX}/etc/namedb/.

Sponsored by:	Absolight

6 files changed, 34 insertions, 27 deletions

diff --git a/dns/bind910/Makefile b/dns/bind910/Makefile
index 90c7b3c3e82a..726e4056afec 100644
--- a/dns/bind910/Makefile
+++ b/dns/bind910/Makefile
@@ -20,7 +20,7 @@ COMMENT?=	BIND DNS suite with updated DNSSEC and DNS64
 LICENSE=	ISCL
 
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.10.1-P2
+ISCVERSION=	9.10.2
 
 MAKE_JOBS_UNSAFE=	yes
 
@@ -38,7 +38,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--localstatedir=/var --disable-linux-caps \
 		--disable-symtable \
 		--with-randomdev=/dev/random \
-		--with-libxml2=${LOCALBASE}
+		--with-libxml2=${LOCALBASE} \
+		--sysconfdir=${ETCDIR}
 ETCDIR=		${PREFIX}/etc/namedb
 
 CONFLICTS+=	bind9*-9.[456789].* bind9*-sdb-9.[456789].*
@@ -185,7 +186,6 @@ SUB_FILES+=	named.conf
 WITH_OPENSSL_PORT=yes
 .endif
 .else
-ETCDIR=		${PREFIX}/etc
 PLIST_SUB+=	NOBASE="@comment " BASE=""
 SUB_LIST+=	NOBASE="@comment " BASE=""
 .if ${PORT_OPTIONS:MSSL}
@@ -195,8 +195,6 @@ WITH_OPENSSL_PORT=	yes
 
 PKGDEINSTALL=	${PKGINSTALL}
 
-CONFIGURE_ARGS+=	--prefix=${PREFIX} \
-			--sysconfdir=${ETCDIR}
 
 PORTDOCS=	*
 
diff --git a/dns/bind910/distinfo b/dns/bind910/distinfo
index 0c9277a8ab9a..248fc3b0718d 100644
--- a/dns/bind910/distinfo
+++ b/dns/bind910/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bind-9.10.1-P2.tar.gz) = 42dced2300ba6147168fe1b7faa2e7740e47b75e481290cd5e4483bd8b8a7feb
-SIZE (bind-9.10.1-P2.tar.gz) = 8356565
+SHA256 (bind-9.10.2.tar.gz) = 6f9bb7908aa45c1edfa391e356fc0afc1ded175386cdefb6cf9e1289f7457a98
+SIZE (bind-9.10.2.tar.gz) = 8481111
diff --git a/dns/bind910/pkg-install b/dns/bind910/pkg-install
index df1fc8ad7639..12b2f98aaf25 100644
--- a/dns/bind910/pkg-install
+++ b/dns/bind910/pkg-install
@@ -1,15 +1,21 @@
 #!/bin/sh
+# ex:sw=8 sts=8
 
 if [ "$2" = 'POST-INSTALL' ]
 then
-	/bin/mkdir -p /var/named${PKG_PREFIX}/etc
+	/bin/mkdir -p /var/named${PKG_PREFIX}/etc/namedb
 fi
 
-for DIR in ${PKG_PREFIX}/etc /var/named${PKG_PREFIX}/etc; do
-	for FILE in named.conf rndc.key; do
+for DIR in ${PKG_PREFIX}/etc/namedb /var/named${PKG_PREFIX}/etc/namedb; do
+	for FILE in named.conf rndc.conf rndc.key; do
 		if [ "$2" = 'POST-INSTALL' ]
 		then
-			/bin/ln -sf /etc/namedb/${FILE} ${DIR}/${FILE}
+			if [ -e ${PKG_PREFIX}/etc/${FILE} ]
+			then
+				/bin/cp -a ${PKG_PREFIX}/etc/${FILE} ${DIR}/${FILE}
+			else
+				/bin/ln -sf /etc/namedb/${FILE} ${DIR}/${FILE}
+			fi
 		fi
 		if [ "$2" = 'POST-DEINSTALL' ]
 		then
@@ -20,7 +26,7 @@ done
 
 if [ "$2" = 'POST-DEINSTALL' ]
 then
-	cd /var/named && /bin/rmdir -p ./${PKG_PREFIX}/etc > /dev/null  2>&1 || :
+	cd /var/named && /bin/rmdir -p ./${PKG_PREFIX}/etc/namedb > /dev/null  2>&1 || :
 fi
 
 exit 0
diff --git a/dns/bind99/Makefile b/dns/bind99/Makefile
index 36a73c65f072..ce529681b084 100644
--- a/dns/bind99/Makefile
+++ b/dns/bind99/Makefile
@@ -14,7 +14,7 @@ COMMENT=	BIND DNS suite with updated DNSSEC and DNS64
 LICENSE=	ISCL
 
 # ISC releases things like 9.8.0-P1, which our versioning doesn't like
-ISCVERSION=	9.9.6-P2
+ISCVERSION=	9.9.7
 
 MAKE_JOBS_UNSAFE=	yes
 
@@ -32,7 +32,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 		--disable-symtable \
 		--with-randomdev=/dev/random \
-		--with-libxml2=${LOCALBASE}
+		--with-libxml2=${LOCALBASE} \
+		--sysconfdir=${ETCDIR}
 ETCDIR=		${PREFIX}/etc/namedb
 
 CONFLICTS=	bind9*-9.[45678].* bind9*-sdb-9.[45678].* bind-tools-9.*
@@ -166,7 +167,6 @@ SUB_FILES+=	named.conf
 WITH_OPENSSL_PORT=yes
 .endif
 .else
-ETCDIR=		${PREFIX}/etc
 PLIST_SUB+=	NOBASE="@comment " BASE=""
 SUB_LIST+=	NOBASE="@comment " BASE=""
 .if ${PORT_OPTIONS:MSSL}
@@ -176,9 +176,6 @@ WITH_OPENSSL_PORT=	yes
 
 PKGDEINSTALL=	${PKGINSTALL}
 
-CONFIGURE_ARGS+=	--prefix=${PREFIX} \
-			--sysconfdir=${ETCDIR}
-
 PORTDOCS=	*
 
 post-patch:
diff --git a/dns/bind99/distinfo b/dns/bind99/distinfo
index c8dca30964fa..4eb3bdee2967 100644
--- a/dns/bind99/distinfo
+++ b/dns/bind99/distinfo
@@ -1,4 +1,4 @@
-SHA256 (bind-9.9.6-P2.tar.gz) = 5e882f453a8c799a121272f68bdb90936ce97bb857f8c2b3af1c8ba3d1b749ed
-SIZE (bind-9.9.6-P2.tar.gz) = 7816640
-SHA256 (9.9.6-P2-rpz2+rl.14038.05.patch.xz) = b69825ddee742dbb342f2da4265ff2139256ad79bd0d029ba010b7bf98f2d1e5
-SIZE (9.9.6-P2-rpz2+rl.14038.05.patch.xz) = 38792
+SHA256 (bind-9.9.7.tar.gz) = 3f23e7fcb363a2594ed1f065868c2c1080a93636a4fcb4c47f9e164e2cd74c66
+SIZE (bind-9.9.7.tar.gz) = 7960032
+SHA256 (9.9.7-rpz2+rl.14038.05.patch.xz) = 24922363fa4ff1c6d90c57a681c3616701c14ace9ea5eb7589abb420d3745000
+SIZE (9.9.7-rpz2+rl.14038.05.patch.xz) = 39124
diff --git a/dns/bind99/pkg-install b/dns/bind99/pkg-install
index df1fc8ad7639..12b2f98aaf25 100644
--- a/dns/bind99/pkg-install
+++ b/dns/bind99/pkg-install
@@ -1,15 +1,21 @@
 #!/bin/sh
+# ex:sw=8 sts=8
 
 if [ "$2" = 'POST-INSTALL' ]
 then
-	/bin/mkdir -p /var/named${PKG_PREFIX}/etc
+	/bin/mkdir -p /var/named${PKG_PREFIX}/etc/namedb
 fi
 
-for DIR in ${PKG_PREFIX}/etc /var/named${PKG_PREFIX}/etc; do
-	for FILE in named.conf rndc.key; do
+for DIR in ${PKG_PREFIX}/etc/namedb /var/named${PKG_PREFIX}/etc/namedb; do
+	for FILE in named.conf rndc.conf rndc.key; do
 		if [ "$2" = 'POST-INSTALL' ]
 		then
-			/bin/ln -sf /etc/namedb/${FILE} ${DIR}/${FILE}
+			if [ -e ${PKG_PREFIX}/etc/${FILE} ]
+			then
+				/bin/cp -a ${PKG_PREFIX}/etc/${FILE} ${DIR}/${FILE}
+			else
+				/bin/ln -sf /etc/namedb/${FILE} ${DIR}/${FILE}
+			fi
 		fi
 		if [ "$2" = 'POST-DEINSTALL' ]
 		then
@@ -20,7 +26,7 @@ done
 
 if [ "$2" = 'POST-DEINSTALL' ]
 then
-	cd /var/named && /bin/rmdir -p ./${PKG_PREFIX}/etc > /dev/null  2>&1 || :
+	cd /var/named && /bin/rmdir -p ./${PKG_PREFIX}/etc/namedb > /dev/null  2>&1 || :
 fi
 
 exit 0