5 files changed, 19 insertions, 22 deletions

diff --git a/dns/bind9/Makefile b/dns/bind9/Makefile
index cc0d4139a71c..f3dea95bc384 100644
--- a/dns/bind9/Makefile
+++ b/dns/bind9/Makefile
@@ -12,7 +12,7 @@
 # release you can generally build it cleanly from the source - Doug
 
 PORTNAME=	bind9
-PORTVERSION=	9.3.4.1
+PORTVERSION=	9.3.5
 CATEGORIES=	dns net ipv6
 MASTER_SITES=	${MASTER_SITE_ISC} \
 		http://dougbarton.us/Downloads/%SUBDIR%/
@@ -25,7 +25,7 @@ MAINTAINER=	DougB@FreeBSD.org
 COMMENT=	Completely new version of the BIND DNS suite with updated DNSSEC
 
 # ISC releases things like 9.3.0rc1, which our versioning doesn't like
-ISCVERSION=	9.3.4-P1
+ISCVERSION=	9.3.5
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
@@ -33,7 +33,7 @@ CONFIGURE_ARGS=	--localstatedir=/var --disable-linux-caps \
 
 USE_OPENSSL=	yes
 
-CONFLICTS=	bind9-9.4.* bind9-dlz-* bind9-sdb-mysql-* host-*
+CONFLICTS=	bind9-9.4.* bind9-9.5.* bind9-dlz-[0-9]* bind9-sdb-mysql-[0-9]* host-[0-9]*
 
 OPTIONS=	REPLACE_BASE "Replace base BIND with this version" off \
 		THREADS	"Compile with thread support (NOT RECOMMENDED!)" off
diff --git a/dns/bind9/distinfo b/dns/bind9/distinfo
index c0a896368249..4c7044326ca3 100644
--- a/dns/bind9/distinfo
+++ b/dns/bind9/distinfo
@@ -1,6 +1,6 @@
-MD5 (bind-9.3.4-P1.tar.gz) = 51007c8f185cd5a9b2e57f70073bf25b
-SHA256 (bind-9.3.4-P1.tar.gz) = f5cf38954e9b973cda204ff13cfd6d433ac307a8e5c4e7f6d978483becda842c
-SIZE (bind-9.3.4-P1.tar.gz) = 5411370
-MD5 (bind-9.3.4-P1.tar.gz.asc) = 70498463dd86541efab8bcf6349c7f4c
-SHA256 (bind-9.3.4-P1.tar.gz.asc) = aca659a7d70486617a8a74d64a96b259368075133a5788671b435fd69aa2df28
-SIZE (bind-9.3.4-P1.tar.gz.asc) = 478
+MD5 (bind-9.3.5.tar.gz) = e5b82f5284679c68b761ac41b6d6066c
+SHA256 (bind-9.3.5.tar.gz) = 5e9e1cc50fe3924e747dd15257ce73d06dc2c889ef26a5d60da837f424916f61
+SIZE (bind-9.3.5.tar.gz) = 5730181
+MD5 (bind-9.3.5.tar.gz.asc) = 671bb7d690dfe4e37a727eb9f6d77de9
+SHA256 (bind-9.3.5.tar.gz.asc) = 0bf3399253e8008ee0018ba8459e3d5f0041acdf6944b0bfb5567b4d37562afa
+SIZE (bind-9.3.5.tar.gz.asc) = 486
diff --git a/dns/bind9/pkg-descr b/dns/bind9/pkg-descr
index 4f63a1ebef03..c686831240a8 100644
--- a/dns/bind9/pkg-descr
+++ b/dns/bind9/pkg-descr
@@ -18,7 +18,7 @@ Views
 Multiprocessor Support
 Improved Portability Architecture
 
-WWW: http://www.isc.org/index.pl?/sw/bind/bind9.3.php
+WWW: http://www.isc.org/index.pl?/sw/bind/index.php
 
 - Doug Barton
 DougB@FreeBSD.org
diff --git a/dns/bind9/pkg-message b/dns/bind9/pkg-message
index 8dd5f7e54f92..bb713abdd1d3 100644
--- a/dns/bind9/pkg-message
+++ b/dns/bind9/pkg-message
@@ -5,18 +5,14 @@
 *	 / ___ \| |   | | | |___| |\  | | |  | | |_| | |\  |		*
 *	/_/   \_\_|   |_| |_____|_| \_| |_| |___\___/|_| \_|		*
 *									*
-*	BIND 9 requires a good source of randomness to operate.		*
-*	It also requires configuration of rndc, including a		*
-*	"secret" key.  If you are using FreeBSD 4.x, visit		*
-*	http://people.freebsd.org/~dougb/randomness.html for		*
-*	information on how to set up entropy gathering. Users		*
-*	of FreeBSD 5.x or later do not need to do this step. If		*
-*	you are running BIND 9 in a chroot environment, make		*
-*	sure that there is a /dev/random device in the chroot.		*
+*	If you are running BIND 9 in a chroot environment, make		*
+*	sure that there is a /dev/random device	in the chroot.		*
 *									*
-*	The easiest, and most secure way to configure rndc is		*
-*	to run 'rndc-confgen -a' which will generate the proper		*
-*	conf file, with a new random key, and appropriate file		*
-*	permissions.							*
+*	BIND 9 also requires configuration of rndc, including a		*
+*	"secret" key.  The easiest, and most secure way to configure	*
+*	rndc is to run 'rndc-confgen -a' to generate the proper	conf	*
+*	file, with a new random key, and appropriate file permissions.	*
+*									*
+*	The /etc/rc.d/named script in the base will do both for you.    *
 *									*
 *************************************************************************
diff --git a/dns/bind9/pkg-plist b/dns/bind9/pkg-plist
index 3bafa4d5e1a1..b01032a9950b 100644
--- a/dns/bind9/pkg-plist
+++ b/dns/bind9/pkg-plist
@@ -214,6 +214,7 @@ sbin/rndc-confgen
 %%PORTDOCS%%%%DOCSDIR%%/misc/rfc-compliance
 %%PORTDOCS%%%%DOCSDIR%%/misc/roadmap
 %%PORTDOCS%%%%DOCSDIR%%/misc/sdb
+%%PORTDOCS%%%%DOCSDIR%%/misc/sort-options.pl
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/arm
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/misc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%