Update to 8.4.7-P1

- Fix ${MASTER_SITES}
- Fix permissions on installed html files

BIND changes:
1750.	[cleanup]	Add "End of Life" notices.
1749.	[security]	Use arc4 rather than LC NSID for QID RNG. [RT #17034]
1719.   [port]          HPUX-IA64 support.
1716.   [port]          solaris: poll() support.
1715.   [port]          solaris: uses Sun's md5 implementation.
1712.   [bug]           turning off non-blocking i/o was broken.
1700.   [port]          Use closefrom() if available.

See CHANGES for all the details.

3 files changed, 23 insertions, 15 deletions

diff --git a/net/bind8/Makefile b/net/bind8/Makefile
index cbb8fff5bea..65abc18d4a5 100644
--- a/net/bind8/Makefile
+++ b/net/bind8/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.37 2006/10/04 21:53:15 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2007/09/10 19:05:01 adrianp Exp $
 
 DISTNAME=	bind-${BIND_VERSION}
-PKGREVISION=	1
+PKGNAME=	${DISTNAME}pl1
 CATEGORIES=	net
-MASTER_SITES=	ftp://ftp.isc.org/isc/bind/src/${BIND_VERSION}/
+MASTER_SITES=	ftp://ftp.isc.org/isc/bind8/src/${BIND_VERSION}/
 DISTFILES=	bind-src.tar.gz bind-doc.tar.gz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -11,9 +11,13 @@ HOMEPAGE=	http://www.isc.org/sw/bind/
 COMMENT=	The Berkeley Internet Name Daemon, an implementation of DNS
 
 WRKSRC=		${WRKDIR}
-BIND_VERSION=	8.4.6
+BIND_VERSION=	8.4.7
 DIST_SUBDIR=	bind/${BIND_VERSION}
 
+PATCH_SITES=		${MASTER_SITES:S/8.4.7/8.4.7-P1/}
+PATCHFILES=		8.4.7-p1.patch
+PATCH_DIST_STRIP=	-p1
+
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 RCD_SCRIPTS=	named
@@ -38,5 +42,6 @@ post-extract:
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/bind8
 	cd ${WRKSRC}/doc/html && ${PAX} -rw * ${PREFIX}/share/doc/html/bind8
+	${CHMOD} ${DOCMODE} ${PREFIX}/share/doc/html/bind8/*.html
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/bind8/distinfo b/net/bind8/distinfo
index 80e612154f2..aecaa014a47 100644
--- a/net/bind8/distinfo
+++ b/net/bind8/distinfo
@@ -1,11 +1,14 @@
-$NetBSD: distinfo,v 1.20 2006/03/22 18:33:57 joerg Exp $
+$NetBSD: distinfo,v 1.21 2007/09/10 19:05:01 adrianp Exp $
 
-SHA1 (bind/8.4.6/bind-src.tar.gz) = 8ecf19aa013f548ecb79ff14ccdbc8ec530e4d8b
-RMD160 (bind/8.4.6/bind-src.tar.gz) = a91e3f6adbb57141e0764dd65651c0a8172a8c6d
-Size (bind/8.4.6/bind-src.tar.gz) = 1461022 bytes
-SHA1 (bind/8.4.6/bind-doc.tar.gz) = c8a030527d809dbefd7aa45f7836fb4eb2f51195
-RMD160 (bind/8.4.6/bind-doc.tar.gz) = 0269b0135767893d45649c2d63b542ff89adf4e4
-Size (bind/8.4.6/bind-doc.tar.gz) = 1492047 bytes
+SHA1 (bind/8.4.7/8.4.7-p1.patch) = 21ace372a55ff10166c3aaefb9ca25889b8e9c99
+RMD160 (bind/8.4.7/8.4.7-p1.patch) = 09787da6ebf107f680963ead6b9998f734244951
+Size (bind/8.4.7/8.4.7-p1.patch) = 47224 bytes
+SHA1 (bind/8.4.7/bind-doc.tar.gz) = 69baf042cbceaa81485db12f9d877f14a4e4d0f6
+RMD160 (bind/8.4.7/bind-doc.tar.gz) = 83a19daac958f41e5cac1dea3201d959658744a8
+Size (bind/8.4.7/bind-doc.tar.gz) = 1492480 bytes
+SHA1 (bind/8.4.7/bind-src.tar.gz) = a5f352ca020403bc0f70c6201809c9ba9e56932a
+RMD160 (bind/8.4.7/bind-src.tar.gz) = 87ea8fb441d100da49b2f46e1c32d12c9e2322a7
+Size (bind/8.4.7/bind-src.tar.gz) = 1484718 bytes
 SHA1 (patch-aa) = c94c78cb904e713be25da748d3ecfed51b2ed010
 SHA1 (patch-ab) = 41c03679a97d24302f4eb4bec67fda0b8d4cd9bf
 SHA1 (patch-ad) = 8b7071e89179af3de5c7645b88d175bb9143a9da
@@ -13,7 +16,7 @@ SHA1 (patch-ae) = e0bf370c94d412fbb3347dfa2fd74a164d7cd944
 SHA1 (patch-af) = f697c119f38a5e0f1aeeafe4a77e8c1436ec684a
 SHA1 (patch-ag) = 399938ee154d671232b87371d8cc7d3b2c419cd7
 SHA1 (patch-ah) = 154d3ab6a388a51dbfc1351a7d21e9436f5efa92
-SHA1 (patch-ai) = 85f20cf82cb109b73a5344d5e5d3ff1acce8507a
+SHA1 (patch-ai) = 44090a2cdada15245f5557af13d23061feba54d0
 SHA1 (patch-aj) = 6a812ee56aad252c44b7fd0eb839d9d382f1ef6a
 SHA1 (patch-ak) = db59ad1cda56adfffb75336781c4bd1ad1c79733
 SHA1 (patch-al) = f03b3b5480d9294673cdb86cf0f45f48ce9ea895
diff --git a/net/bind8/patches/patch-ai b/net/bind8/patches/patch-ai
index 4623f9eb193..2d4c8b0bf8f 100644
--- a/net/bind8/patches/patch-ai
+++ b/net/bind8/patches/patch-ai
@@ -1,10 +1,10 @@
-$NetBSD: patch-ai,v 1.3 2005/11/04 19:36:01 rillig Exp $
+$NetBSD: patch-ai,v 1.4 2007/09/10 19:05:01 adrianp Exp $
 
---- src/port/solaris/Makefile.set.orig	Mon Jun 24 00:33:16 2002
+--- src/port/solaris/Makefile.set.orig	2007-09-10 19:46:51.000000000 +0100
 +++ src/port/solaris/Makefile.set
 @@ -1,12 +1,14 @@
  'CC=gcc'
- 'CDEBUG=-g -O2'
+ 'CDEBUG=-g -O2 -W -Wall -Wmissing-prototypes -Wcast-qual -Wwrite-strings -Wformat'
 -'DESTBIN=/usr/local/bin'
 -'DESTSBIN=/usr/local/sbin'
 -'DESTEXEC=/usr/local/sbin'