5 files changed, 19 insertions, 54 deletions

diff --git a/dns/bind910/Makefile b/dns/bind910/Makefile
index 6aa598edb9cf..946b2ce03ba5 100644
--- a/dns/bind910/Makefile
+++ b/dns/bind910/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	bind
 PORTVERSION=	${ISCVERSION:S/-P/P/}
-PORTREVISION=	5
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	ISC/bind9/${ISCVERSION}
 PKGNAMESUFFIX?=	910
@@ -14,7 +13,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.0-P2
+ISCVERSION=	9.10.1
 
 MAKE_JOBS_UNSAFE=	yes
 
@@ -35,7 +34,7 @@ CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 		--with-libxml2=${LOCALBASE}
 ETCDIR=		${PREFIX}/etc/namedb
 
-CONFLICTS=	bind9*-9.[456789].* bind9*-sdb-9.[456789].*
+CONFLICTS+=	bind9*-9.[456789].* bind9*-sdb-9.[456789].*
 
 SUB_FILES=	pkg-message
 
@@ -117,8 +116,7 @@ GEOIP_LIB_DEPENDS=	libGeoIP.so:${PORTSDIR}/net/GeoIP
 GOST_CONFIGURE_WITH=	gost
 
 PYTHON_CONFIGURE_WITH=	python
-PYTHON_USE=	PYTHON=yes
-PYTHON_USES=	gmake
+PYTHON_USES=	python gmake
 
 DLZ_POSTGRESQL_CONFIGURE_ON=	--with-dlz-postgres=yes
 DLZ_POSTGRESQL_USE=		pgsql=yes
@@ -190,6 +188,8 @@ PKGDEINSTALL=	${PKGINSTALL}
 CONFIGURE_ARGS+=	--prefix=${PREFIX} \
 			--sysconfdir=${ETCDIR}
 
+PORTDOCS=	*
+
 .if !defined(BIND_TOOLS_SLAVE)
 post-patch:
 .for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \
@@ -208,15 +208,11 @@ post-patch:
 		${WRKSRC}/bin/named/Makefile.in.Dist > \
 		${WRKSRC}/bin/named/Makefile.in
 
-.if ${PORT_OPTIONS:MDOCS}
-PORTDOCS=	*
-.endif
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${STAGEDIR}${DOCSDIR}/arm ${STAGEDIR}${DOCSDIR}/misc
+	${MKDIR} ${STAGEDIR}${DOCSDIR}/arm
 	${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${STAGEDIR}${DOCSDIR}/arm
 	${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/misc/[a-z]* ${STAGEDIR}${DOCSDIR}/misc
 	${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ \
 		${WRKSRC}/HISTORY ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 .endif
diff --git a/dns/bind910/distinfo b/dns/bind910/distinfo
index c750b9b458c9..d2a10442d332 100644
--- a/dns/bind910/distinfo
+++ b/dns/bind910/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bind-9.10.0-P2.tar.gz) = 335722ed66ae2cc9ffb2249f47f5cf39c86ebddd0a8ae86ac8282fec17df1e2b
-SIZE (bind-9.10.0-P2.tar.gz) = 8335644
+SHA256 (bind-9.10.1.tar.gz) = 5361eca2b8b6bc0b13904b0f964336a478dfbc165711547f6cc3f8752ac60181
+SIZE (bind-9.10.1.tar.gz) = 8353313
diff --git a/dns/bind910/files/named.conf.in b/dns/bind910/files/named.conf.in
index 0215342d4cc4..a7ab7d7b7ced 100644
--- a/dns/bind910/files/named.conf.in
+++ b/dns/bind910/files/named.conf.in
@@ -1,7 +1,7 @@
 // $FreeBSD$
 //
 // Refer to the named.conf(5) and named(8) man pages, and the documentation
-// in /usr/share/doc/bind9 for more details.
+// in /usr/local/share/doc/bind for more details.
 //
 // If you are going to set up an authoritative server, make sure you
 // understand the hairy details of how DNS works.  Even with
@@ -52,7 +52,7 @@ options {
 // the entries in /etc/resolv.conf, uncomment the following line and
 // set named_auto_forward=yes in /etc/rc.conf.  You can also enable
 // named_auto_forward_only (the effect of which is described above).
-//	include "/etc/namedb/auto_forward.conf";
+//	include "%%ETCDIR%%/auto_forward.conf";
 
 	/*
 	   Modern versions of BIND use a random UDP port for each outgoing
@@ -100,7 +100,7 @@ zone "." { type hint; file "%%ETCDIR%%/named.root"; };
 /*
 zone "." {
 	type slave;
-	file "/etc/namedb/slave/root.slave";
+	file "%%ETCDIR%%/slave/root.slave";
 	masters {
 		192.5.5.241;	// F.ROOT-SERVERS.NET.
 	};
@@ -108,7 +108,7 @@ zone "." {
 };
 zone "arpa" {
 	type slave;
-	file "/etc/namedb/slave/arpa.slave";
+	file "%%ETCDIR%%/slave/arpa.slave";
 	masters {
 		192.5.5.241;	// F.ROOT-SERVERS.NET.
 	};
@@ -345,14 +345,14 @@ zone "example.org" {
 	allow-update {
 		key "exampleorgkey";
 	};
-	file "/etc/namedb/dynamic/example.org";
+	file "%%ETCDIR%%/dynamic/example.org";
 };
 */
 
 /* Example of a slave reverse zone
 zone "1.168.192.in-addr.arpa" {
 	type slave;
-	file "/etc/namedb/slave/1.168.192.in-addr.arpa";
+	file "%%ETCDIR%%/slave/1.168.192.in-addr.arpa";
 	masters {
 		192.168.1.1;
 	};
diff --git a/dns/bind910/files/patch-bin__python__Makefile.in b/dns/bind910/files/patch-bin__python__Makefile.in
deleted file mode 100644
index e53306aec09c..000000000000
--- a/dns/bind910/files/patch-bin__python__Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./bin/python/Makefile.in.orig	2014-05-27 06:45:53.000000000 +0200
-+++ ./bin/python/Makefile.in	2014-06-24 14:32:28.000000000 +0200
-@@ -41,8 +41,8 @@
- 	$(SHELL) ${top_srcdir}/mkinstalldirs ${DESTDIR}${mandir}/man8
- 
- install:: ${TARGETS} installdirs
--	${INSTALL_PROGRAM} dnssec-checkds@EXEEXT@ ${DESTDIR}${sbindir}
--	${INSTALL_PROGRAM} dnssec-coverage@EXEEXT@ ${DESTDIR}${sbindir}
-+	${INSTALL_SCRIPT} dnssec-checkds@EXEEXT@ ${DESTDIR}${sbindir}
-+	${INSTALL_SCRIPT} dnssec-coverage@EXEEXT@ ${DESTDIR}${sbindir}
- 	${INSTALL_DATA} ${srcdir}/dnssec-checkds.8 ${DESTDIR}${mandir}/man8
- 	${INSTALL_DATA} ${srcdir}/dnssec-coverage.8 ${DESTDIR}${mandir}/man8
- 
diff --git a/dns/bind910/pkg-plist b/dns/bind910/pkg-plist
index 0462324c1e77..76ccc9e05ab8 100644
--- a/dns/bind910/pkg-plist
+++ b/dns/bind910/pkg-plist
@@ -238,6 +238,7 @@ include/lwres/netdb.h
 include/lwres/platform.h
 include/lwres/result.h
 include/lwres/stdlib.h
+include/lwres/string.h
 include/lwres/version.h
 include/pk11/constants.h
 include/pk11/internal.h
@@ -412,26 +413,7 @@ sbin/tsig-keygen
 %%NOBASE%%%%ETCDIR%%/master/empty.db
 %%NOBASE%%%%ETCDIR%%/master/localhost-forward.db
 %%NOBASE%%%%ETCDIR%%/master/localhost-reverse.db
-%%NOBASE%%@exec mkdir -p %D/%%ETCDIR%%/dynamic
-%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/dynamic
-%%NOBASE%%@dirrmtry %%ETCDIR%%/dynamic
-%%NOBASE%%@exec mkdir -p %D/%%ETCDIR%%/master
-%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/master
-%%NOBASE%%@dirrmtry %%ETCDIR%%/master
-%%NOBASE%%@exec mkdir -p %D/%%ETCDIR%%/slave
-%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/slave
-%%NOBASE%%@dirrmtry %%ETCDIR%%/slave
-%%NOBASE%%@exec mkdir -p %D/%%ETCDIR%%/working
-%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/working
-%%NOBASE%%@dirrmtry %%ETCDIR%%/working
-%%NOBASE%%@dirrmtry %%ETCDIR%%
-@dirrm include/pkcs11
-@dirrm include/pk11
-@dirrm include/lwres
-@dirrm include/isccfg
-@dirrm include/isccc
-@dirrmtry include/isc
-@dirrm include/irs
-@dirrm include/dst
-@dirrm include/dns
-@dirrm include/bind9
+%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/dynamic
+%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/master
+%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/slave
+%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/working