Update bind910 to 9.10.4pl2 (BIND 9.10.4-P2).

Changes from 9.10.3-P4 to 9.10.4 are too many to write here, please refer
CHANGES file.

	--- 9.10.4-P2 released ---

4406.	[bug]		getrrsetbyname with a non absolute name could
			trigger an infinite recursion bug in lwresd
			and named with lwres configured if when combined
			with a search list entry the resulting name is
			too long. (CVE-2016-2775) [RT #42694]

4405.	[bug]		Change 4342 introduced a regression where you could
			not remove a delegation in a NSEC3 signed zone using
			OPTOUT via nsupdate. [RT #42702]

4387.	[bug]		Change 4336 was not complete leading to SERVFAIL
			being return as NS records expired. [RT #42683]

	--- 9.10.4-P1 released ---

4368.	[bug]		Fix a crash when calling "rndc stats" on some
			Windows builds because some Visual Studio compilers
			generated crashing code for the "%z" printf()
			format specifier. [RT #42380]

4366.	[bug]		Address race condition when updating rbtnode bit
			fields. [RT #42379]

4363.	[port]		win32: Disable explicit triggering UAC when running
			BINDInstall.

	--- 9.10.4 released ---

4 files changed, 17 insertions, 16 deletions

diff --git a/net/bind910/Makefile b/net/bind910/Makefile
index 2ab94d2be31..4d4996192e5 100644
--- a/net/bind910/Makefile
+++ b/net/bind910/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2016/07/09 06:38:40 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2016/07/19 01:08:05 taca Exp $
 
 DISTNAME=	bind-${BIND_VERSION}
 PKGNAME=	${DISTNAME:S/-P/pl/}
-PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.isc.org/isc/bind9/${BIND_VERSION}/
 
@@ -14,7 +13,7 @@ CONFLICTS+=	host-[0-9]*
 
 MAKE_JOBS_SAFE=	no
 
-BIND_VERSION=	9.10.3-P4
+BIND_VERSION=	9.10.4-P2
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/bind910/PLIST b/net/bind910/PLIST
index 16e82aaf6df..58bbe764ac5 100644
--- a/net/bind910/PLIST
+++ b/net/bind910/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2016/05/11 11:26:30 taca Exp $
+@comment $NetBSD: PLIST,v 1.7 2016/07/19 01:08:05 taca Exp $
 bin/bind9-config
 bin/delv
 bin/dig
@@ -440,10 +440,12 @@ share/doc/bind9/arm/man.dnssec-verify.html
 share/doc/bind9/arm/man.genrandom.html
 share/doc/bind9/arm/man.host.html
 share/doc/bind9/arm/man.isc-hmac-fixup.html
+share/doc/bind9/arm/man.lwresd.html
 share/doc/bind9/arm/man.named-checkconf.html
 share/doc/bind9/arm/man.named-checkzone.html
 share/doc/bind9/arm/man.named-journalprint.html
 share/doc/bind9/arm/man.named-rrchecker.html
+share/doc/bind9/arm/man.named.conf.html
 share/doc/bind9/arm/man.named.html
 share/doc/bind9/arm/man.nsec3hash.html
 share/doc/bind9/arm/man.nsupdate.html
diff --git a/net/bind910/distinfo b/net/bind910/distinfo
index 07301d6dcaf..34bfc5be941 100644
--- a/net/bind910/distinfo
+++ b/net/bind910/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.17 2016/05/11 11:26:30 taca Exp $
+$NetBSD: distinfo,v 1.18 2016/07/19 01:08:05 taca Exp $
 
-SHA1 (bind-9.10.3-P4.tar.gz) = c3f87804b2b950a0be8122c41ebbc253d0624786
-RMD160 (bind-9.10.3-P4.tar.gz) = 75af2755febcd4b5a6f1b15c14d76ed4b1b11ba8
-SHA512 (bind-9.10.3-P4.tar.gz) = 9c7b710054cd1230e7e470541a13850def56b2247c404a1800e0d0dad6aba20b3c3c09b1a17cd6017435525e84fa2f7cde40ae13feeeb7747efb26c66961aadd
-Size (bind-9.10.3-P4.tar.gz) = 8529535 bytes
+SHA1 (bind-9.10.4-P2.tar.gz) = b9b944251eeeae6c25b12472c2bac7369501c12c
+RMD160 (bind-9.10.4-P2.tar.gz) = 3a34b4d62e5d21873bd9bdcc59f83e16e36e13f8
+SHA512 (bind-9.10.4-P2.tar.gz) = e540d5b69f8859d9a78ec0da1662b7ae5a87ef30ded127c84c198b974c06638ab78e82bab484dc614b313e16076e242645d09f4453f830ded37beecbe13d769e
+Size (bind-9.10.4-P2.tar.gz) = 9298010 bytes
 SHA1 (patch-bin_dig_dighost.c) = 983e23a30d519982cbe88ed2277fcffc9cad616e
 SHA1 (patch-bin_tests_system_Makefile.in) = aeb2de1b6c6cfdbae7ffbf38aeebf52e94af9e2f
 SHA1 (patch-config.threads.in) = 227b83efe9cb3e301aaac9b97cf42f1fb8ad06b2
 SHA1 (patch-configure) = 754a510493ae8fae669a9ff79940ccb04bc1e57e
 SHA1 (patch-contrib_dlz_config.dlz.in) = f18bec63fbfce7cb2cd72929058ce3770fce458f
-SHA1 (patch-lib_dns_rbt.c) = 510dfc72bc7764e548a46e9c48b58b2543490d7a
+SHA1 (patch-lib_dns_rbt.c) = 7e37f411d084e5363c6a5023e1915d224321c3e3
 SHA1 (patch-lib_lwres_getaddrinfo.c) = 69e9c8049fedcb93bd219c6053163f21ce3b2535
 SHA1 (patch-lib_lwres_getnameinfo.c) = 418ad349cf52925c9e8051b5c71d9d51ea8d2fb1
diff --git a/net/bind910/patches/patch-lib_dns_rbt.c b/net/bind910/patches/patch-lib_dns_rbt.c
index 5deea03741f..f9252286497 100644
--- a/net/bind910/patches/patch-lib_dns_rbt.c
+++ b/net/bind910/patches/patch-lib_dns_rbt.c
@@ -1,10 +1,10 @@
-$NetBSD: patch-lib_dns_rbt.c,v 1.4 2016/05/11 11:26:30 taca Exp $
+$NetBSD: patch-lib_dns_rbt.c,v 1.5 2016/07/19 01:08:05 taca Exp $
 
 * Disable inline on powerpc.
 
---- lib/dns/rbt.c.orig	2014-09-16 19:27:15.000000000 +0000
+--- lib/dns/rbt.c.orig	2016-07-13 23:58:03.000000000 +0000
 +++ lib/dns/rbt.c
-@@ -345,6 +345,10 @@ hexdump(const char *desc, unsigned char 
+@@ -348,6 +348,10 @@ hexdump(const char *desc, unsigned char 
  }
  #endif /* DEBUG */
  
@@ -12,6 +12,6 @@ $NetBSD: patch-lib_dns_rbt.c,v 1.4 2016/05/11 11:26:30 taca Exp $
 +#define        inline  /**/
 +#endif
 +
- /* The passed node must not be NULL. */
- static inline dns_rbtnode_t *
- get_subtree_root(dns_rbtnode_t *node) {
+ #ifdef DNS_RBT_USEHASH
+ 
+ /*