4 files changed, 62 insertions, 29 deletions

diff --git a/net/bind8/Makefile b/net/bind8/Makefile
index 0a885a653df4..a4fcdcd812bd 100644
--- a/net/bind8/Makefile
+++ b/net/bind8/Makefile
@@ -11,7 +11,7 @@
 # you can generally build it cleanly from the source. - Doug
 
 PORTNAME=	bind
-PORTVERSION=	8.2.5
+PORTVERSION=	8.3.0
 CATEGORIES?=	net
 MASTER_SITES=	ftp://ftp.isc.org/isc/bind/src/${PORTVERSION}/ \
 		ftp://ftp.epix.net/pub/isc/bind/src/${PORTVERSION}/ \
@@ -36,8 +36,15 @@ PATCH_ARGS=	-d ${WRKDIR}
 PATCH_DIST_ARGS=	-d ${WRKDIR}
 
 post-install:
-	@(cd ${WRKDIR}/doc/man && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} clean all ${INSTALL_TARGET})
-	${MKDIR} ${PREFIX}/share/doc/bind8
-	${INSTALL_DATA} ${WRKDIR}/doc/html/*.html ${PREFIX}/share/doc/bind8
+.if !defined(NOPORTDOCS)
+	@(cd ${WRKDIR}/doc/man && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
+		${MAKEFILE} clean all ${INSTALL_TARGET})
+	@${MKDIR} ${PREFIX}/share/doc/bind8/html
+	${INSTALL_DATA} ${WRKDIR}/doc/html/*.html ${PREFIX}/share/doc/bind8/html
+	${CP} -Rp ${WRKDIR}/src/conf ${PREFIX}/share/doc/bind8/
+.for file in CHANGES DNSSEC LICENSE LICENSE_RSA README SUPPORT TODO
+	${INSTALL_DATA} ${WRKDIR}/src/${file} ${PREFIX}/share/doc/bind8
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/net/bind8/distinfo b/net/bind8/distinfo
index af427444eeaf..6867b5172163 100644
--- a/net/bind8/distinfo
+++ b/net/bind8/distinfo
@@ -1,2 +1,2 @@
-MD5 (bind-src.tar.gz) = 91ccd5cb59f8fcfa7e2a804d6a65850c
-MD5 (bind-doc.tar.gz) = 53daa296c0ccc656dc371fb5ba8ce28e
+MD5 (bind-src.tar.gz) = bed3de4829ca7267368a4a61b72522e4
+MD5 (bind-doc.tar.gz) = dc275e489b89cccc52a2631f1f22c7ad
diff --git a/net/bind8/files/patch-aa b/net/bind8/files/patch-aa
index d59bc37faa83..d4af4cb15358 100644
--- a/net/bind8/files/patch-aa
+++ b/net/bind8/files/patch-aa
@@ -1,24 +1,24 @@
---- src/port/freebsd/Makefile.set.orig Mon Jun 16 23:30:35 1997
-+++ src/port/freebsd/Makefile.set      Tue Nov 25 18:51:41 1997
+--- src/port/freebsd/Makefile.set.orig	Thu Aug  9 19:41:08 2001
++++ src/port/freebsd/Makefile.set	Mon Jan 21 01:24:25 2002
 @@ -1,12 +1,14 @@
  'CC=cc'
--'CDEBUG=-O2 -g'
+-'CDEBUG=-O2 -g -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat'
 -'DESTBIN=/usr/bin'
 -'DESTSBIN=/usr/sbin'
 -'DESTEXEC=/usr/libexec'
 -'DESTMAN=/usr/share/man'
 -'DESTHELP=/usr/share/misc'
 -'DESTETC=/etc'
-+'CDEBUG=${CFLAGS}'
++'CDEBUG=${CFLAGS} -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat'
 +'DESTBIN=${PREFIX}/bin'
 +'DESTSBIN=${PREFIX}/sbin'
 +'DESTEXEC=${PREFIX}/libexec'
 +'DESTMAN=${PREFIX}/man'
 +'DESTHELP=${PREFIX}/share/misc'
++'DESTETC=${PREFIX}/etc'
+ 'DESTRUN=/var/run'
 +'DESTINC=${PREFIX}/include/bind'
 +'DESTLIB=${PREFIX}/lib'
- 'DESTRUN=/var/run'
-+'DESTETC=/etc'
  'LEX=lex -I'
  'YACC=yacc -d'
  'SYSLIBS=-ll -lutil'
diff --git a/net/bind8/pkg-plist b/net/bind8/pkg-plist
index 13f4e4796b12..632062c85af8 100644
--- a/net/bind8/pkg-plist
+++ b/net/bind8/pkg-plist
@@ -33,25 +33,51 @@ sbin/irpd
 sbin/named
 sbin/named-bootconf
 sbin/ndc
-share/doc/bind8/acl.html
-share/doc/bind8/address_list.html
-share/doc/bind8/comments.html
-share/doc/bind8/config.html
-share/doc/bind8/controls.html
-share/doc/bind8/docdef.html
-share/doc/bind8/example.html
-share/doc/bind8/include.html
-share/doc/bind8/index.html
-share/doc/bind8/key.html
-share/doc/bind8/logging.html
-share/doc/bind8/master.html
-share/doc/bind8/options.html
-share/doc/bind8/server.html
-share/doc/bind8/trusted-keys.html
-share/doc/bind8/zone.html
+%%PORTDOCS%%share/doc/bind8/CHANGES
+%%PORTDOCS%%share/doc/bind8/DNSSEC
+%%PORTDOCS%%share/doc/bind8/LICENSE
+%%PORTDOCS%%share/doc/bind8/LICENSE_RSA
+%%PORTDOCS%%share/doc/bind8/README
+%%PORTDOCS%%share/doc/bind8/SUPPORT
+%%PORTDOCS%%share/doc/bind8/TODO
+%%PORTDOCS%%share/doc/bind8/conf/README
+%%PORTDOCS%%share/doc/bind8/conf/recursive/keep-running
+%%PORTDOCS%%share/doc/bind8/conf/recursive/named-res1.conf
+%%PORTDOCS%%share/doc/bind8/conf/recursive/named.conf.rfc1918-stubs
+%%PORTDOCS%%share/doc/bind8/conf/recursive/pri/127.0.0
+%%PORTDOCS%%share/doc/bind8/conf/recursive/pri/localhost
+%%PORTDOCS%%share/doc/bind8/conf/recursive/root.cache
+%%PORTDOCS%%share/doc/bind8/conf/workstation/named.conf
+%%PORTDOCS%%share/doc/bind8/conf/workstation/pri/127.0.0
+%%PORTDOCS%%share/doc/bind8/conf/workstation/pri/localhost
+%%PORTDOCS%%share/doc/bind8/conf/workstation/root.cache
+%%PORTDOCS%%share/doc/bind8/conf/workstation/stub/README
+%%PORTDOCS%%share/doc/bind8/html/acl.html
+%%PORTDOCS%%share/doc/bind8/html/address_list.html
+%%PORTDOCS%%share/doc/bind8/html/comments.html
+%%PORTDOCS%%share/doc/bind8/html/config.html
+%%PORTDOCS%%share/doc/bind8/html/controls.html
+%%PORTDOCS%%share/doc/bind8/html/docdef.html
+%%PORTDOCS%%share/doc/bind8/html/example.html
+%%PORTDOCS%%share/doc/bind8/html/include.html
+%%PORTDOCS%%share/doc/bind8/html/index.html
+%%PORTDOCS%%share/doc/bind8/html/key.html
+%%PORTDOCS%%share/doc/bind8/html/logging.html
+%%PORTDOCS%%share/doc/bind8/html/master.html
+%%PORTDOCS%%share/doc/bind8/html/options.html
+%%PORTDOCS%%share/doc/bind8/html/server.html
+%%PORTDOCS%%share/doc/bind8/html/trusted-keys.html
+%%PORTDOCS%%share/doc/bind8/html/zone.html
 share/misc/nslookup.help
 @dirrm include/bind/arpa
 @dirrm include/bind/isc
 @dirrm include/bind/sys
 @dirrm include/bind
-@dirrm share/doc/bind8
+%%PORTDOCS%%@dirrm share/doc/bind8/conf/recursive/pri
+%%PORTDOCS%%@dirrm share/doc/bind8/conf/recursive
+%%PORTDOCS%%@dirrm share/doc/bind8/conf/workstation/pri
+%%PORTDOCS%%@dirrm share/doc/bind8/conf/workstation/stub
+%%PORTDOCS%%@dirrm share/doc/bind8/conf/workstation
+%%PORTDOCS%%@dirrm share/doc/bind8/conf
+%%PORTDOCS%%@dirrm share/doc/bind8/html
+%%PORTDOCS%%@dirrm share/doc/bind8/