Fixed wrong use of WRKSRC. Cleaned up the Makefile. Added an override

for INSTALL_LIB. As the libraries are installed with the correct
ownership now (LIBOWN and LIBGRP), bumped the PKGREVISION.

11 files changed, 46 insertions, 50 deletions

diff --git a/net/bind8/Makefile b/net/bind8/Makefile
index 3398615f058..3eedd822032 100644
--- a/net/bind8/Makefile
+++ b/net/bind8/Makefile
@@ -1,28 +1,25 @@
-# $NetBSD: Makefile,v 1.31 2005/04/11 21:46:44 tv Exp $
+# $NetBSD: Makefile,v 1.32 2005/11/04 19:36:01 rillig Exp $
 
-DISTNAME=	bind
-PKGNAME=	bind-${BIND_VERSION}
+DISTNAME=	bind-${BIND_VERSION}
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.isc.org/isc/bind/src/${BIND_VERSION}/
-DISTFILES=	${DISTNAME}-src.tar.gz ${DISTNAME}-doc.tar.gz
+DISTFILES=	bind-src.tar.gz bind-doc.tar.gz
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.isc.org/products/BIND/
 COMMENT=	The Berkeley Internet Name Daemon, an implementation of DNS
 
-Y2K=		http://www.isc.org/ISC/y2k.html
-
-WRKSRC=		${WRKDIR}/src
+WRKSRC=		${WRKDIR}
 BIND_VERSION=	8.4.6
 DIST_SUBDIR=	bind/${BIND_VERSION}
-EXTRACT_ONLY=	${DISTNAME}-src.tar.gz ${DISTNAME}-doc.tar.gz
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_PKGINSTALL=	yes
 RCD_SCRIPTS=	named
 
-BUILD_DIRS=	${WRKSRC} ${WRKDIR}/doc/man
+BUILD_DIRS=	src doc/man
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -33,14 +30,13 @@ OWN_DIRS_PERMS=	${PKG_SYSCONFDIR}/ndc.d root other 700
 .endif
 
 MAKEFLAGS+=	PREFIX=${PREFIX:Q}
+MAKE_FLAGS+=	INSTALL_LIB=-o\ ${LIBOWN}\ -g\ ${LIBGRP}
 
 post-extract:
-	cd ${WRKDIR}/doc/man &&						\
-		${RM} -f *.lst* *~ *.BAK *.CKP *.orig
+	cd ${WRKSRC}/doc/man && ${RM} -f *.lst* *~ *.BAK *.CKP *.orig
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/bind8
-	cd ${WRKDIR}/doc/html && 					\
-		${PAX} -rw * ${PREFIX}/share/doc/html/bind8
+	cd ${WRKSRC}/doc/html && ${PAX} -rw * ${PREFIX}/share/doc/html/bind8
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/bind8/distinfo b/net/bind8/distinfo
index 8f81b0cef1d..ce9d674c550 100644
--- a/net/bind8/distinfo
+++ b/net/bind8/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2005/02/24 12:13:42 agc Exp $
+$NetBSD: distinfo,v 1.19 2005/11/04 19:36:01 rillig Exp $
 
 SHA1 (bind/8.4.6/bind-src.tar.gz) = 8ecf19aa013f548ecb79ff14ccdbc8ec530e4d8b
 RMD160 (bind/8.4.6/bind-src.tar.gz) = a91e3f6adbb57141e0764dd65651c0a8172a8c6d
@@ -6,12 +6,12 @@ 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 (patch-aa) = f97a4c13a1ed957dab3012e6015f8070330f474d
-SHA1 (patch-ab) = 9bf580c08118b44b4f82810ea65cb82b55bb506c
-SHA1 (patch-ad) = 5c6cc311bc7bb066b89aba045493528bd140fe36
-SHA1 (patch-ae) = ed3b80dc19ff78e1caa8f9ac076e3370a10bfdd6
-SHA1 (patch-af) = 1951d4cac373a8be939d2061b55aa8213bfc68a6
-SHA1 (patch-ag) = f07a8bb9c01c0108da4c4d5f573a1c989626f2f7
-SHA1 (patch-ah) = ad30cf5271b2cb34e617dc46d41c8e94e1b4d09d
-SHA1 (patch-ai) = dcae67de30521715c8e63bda7a67a480d40d9d8f
-SHA1 (patch-aj) = 6f250aea0666f80a2a6ab8a7e4023063322ac7e6
+SHA1 (patch-aa) = c94c78cb904e713be25da748d3ecfed51b2ed010
+SHA1 (patch-ab) = 41c03679a97d24302f4eb4bec67fda0b8d4cd9bf
+SHA1 (patch-ad) = 8b7071e89179af3de5c7645b88d175bb9143a9da
+SHA1 (patch-ae) = e0bf370c94d412fbb3347dfa2fd74a164d7cd944
+SHA1 (patch-af) = f697c119f38a5e0f1aeeafe4a77e8c1436ec684a
+SHA1 (patch-ag) = 399938ee154d671232b87371d8cc7d3b2c419cd7
+SHA1 (patch-ah) = 154d3ab6a388a51dbfc1351a7d21e9436f5efa92
+SHA1 (patch-ai) = 85f20cf82cb109b73a5344d5e5d3ff1acce8507a
+SHA1 (patch-aj) = 6a812ee56aad252c44b7fd0eb839d9d382f1ef6a
diff --git a/net/bind8/patches/patch-aa b/net/bind8/patches/patch-aa
index 4b6b0d7e59f..29182569da8 100644
--- a/net/bind8/patches/patch-aa
+++ b/net/bind8/patches/patch-aa
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.4 2002/12/07 21:34:04 cjep Exp $
+$NetBSD: patch-aa,v 1.5 2005/11/04 19:36:01 rillig Exp $
 
---- ../doc/man/Makefile.orig	Mon Nov 29 19:22:07 1999
-+++ ../doc/man/Makefile
+--- doc/man/Makefile.orig	Mon Nov 29 19:22:07 1999
++++ doc/man/Makefile
 @@ -52,12 +52,12 @@
  # Target directory for the manual directory tree. Eg., may be used to 
  # specify the path of an NFS-mounted directory for common files.
diff --git a/net/bind8/patches/patch-ab b/net/bind8/patches/patch-ab
index 54c5a878e06..810a580297f 100644
--- a/net/bind8/patches/patch-ab
+++ b/net/bind8/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.5 2002/12/07 21:34:04 cjep Exp $
+$NetBSD: patch-ab,v 1.6 2005/11/04 19:36:01 rillig Exp $
 
---- lib/cylink/sha.c.orig	Tue May 29 05:47:21 2001
-+++ lib/cylink/sha.c
+--- src/lib/cylink/sha.c.orig	Tue May 29 05:47:21 2001
++++ src/lib/cylink/sha.c
 @@ -150,6 +150,129 @@ int SHA( uchar   *message,
  *  PRIVATE FUNCTIONS DEFINITIONS
  ****************************************************************************/
diff --git a/net/bind8/patches/patch-ad b/net/bind8/patches/patch-ad
index f09b44b9b67..fc6d7a9f7e8 100644
--- a/net/bind8/patches/patch-ad
+++ b/net/bind8/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.3 2003/03/06 11:43:28 is Exp $
+$NetBSD: patch-ad,v 1.4 2005/11/04 19:36:01 rillig Exp $
 
---- port/darwin/Makefile.set.orig	Mon Jun 24 00:32:44 2002
-+++ port/darwin/Makefile.set
+--- src/port/darwin/Makefile.set.orig	Mon Jun 24 00:32:44 2002
++++ src/port/darwin/Makefile.set
 @@ -1,11 +1,13 @@
  'CC=cc'
  'CDEBUG=-O2 -g'
diff --git a/net/bind8/patches/patch-ae b/net/bind8/patches/patch-ae
index 649603e1257..6f572e66a5b 100644
--- a/net/bind8/patches/patch-ae
+++ b/net/bind8/patches/patch-ae
@@ -1,7 +1,7 @@
-$NetBSD: patch-ae,v 1.2 2002/12/07 21:34:05 cjep Exp $
+$NetBSD: patch-ae,v 1.3 2005/11/04 19:36:01 rillig Exp $
 
---- port/darwin/include/port_before.h.orig	Thu Nov  1 07:29:20 2001
-+++ port/darwin/include/port_before.h
+--- src/port/darwin/include/port_before.h.orig	Thu Nov  1 07:29:20 2001
++++ src/port/darwin/include/port_before.h
 @@ -13,3 +13,6 @@
  #else
  #define ISC_FORMAT_PRINTF(fmt, args)
diff --git a/net/bind8/patches/patch-af b/net/bind8/patches/patch-af
index b7a73b842b2..fcf8afec406 100644
--- a/net/bind8/patches/patch-af
+++ b/net/bind8/patches/patch-af
@@ -1,7 +1,7 @@
-$NetBSD: patch-af,v 1.3 2003/03/06 11:43:28 is Exp $
+$NetBSD: patch-af,v 1.4 2005/11/04 19:36:01 rillig Exp $
 
---- port/linux/Makefile.set.orig	Mon Jun 24 00:32:57 2002
-+++ port/linux/Makefile.set
+--- src/port/linux/Makefile.set.orig	Mon Jun 24 00:32:57 2002
++++ src/port/linux/Makefile.set
 @@ -1,11 +1,13 @@
  'CC=gcc -D_GNU_SOURCE'
  'CDEBUG=-O -g'
diff --git a/net/bind8/patches/patch-ag b/net/bind8/patches/patch-ag
index b851ccd4184..4e4cd8e5a22 100644
--- a/net/bind8/patches/patch-ag
+++ b/net/bind8/patches/patch-ag
@@ -1,7 +1,7 @@
-$NetBSD: patch-ag,v 1.3 2003/03/06 11:43:28 is Exp $
+$NetBSD: patch-ag,v 1.4 2005/11/04 19:36:01 rillig Exp $
 
---- port/netbsd/Makefile.set.orig	Mon Jun 24 00:33:02 2002
-+++ port/netbsd/Makefile.set
+--- src/port/netbsd/Makefile.set.orig	Mon Jun 24 00:33:02 2002
++++ src/port/netbsd/Makefile.set
 @@ -1,11 +1,13 @@
  'CC=cc'
  'CDEBUG=-O2 -g'
diff --git a/net/bind8/patches/patch-ah b/net/bind8/patches/patch-ah
index 9a9fc7175a7..3d46ac58f51 100644
--- a/net/bind8/patches/patch-ah
+++ b/net/bind8/patches/patch-ah
@@ -1,7 +1,7 @@
-$NetBSD: patch-ah,v 1.2 2003/03/06 11:43:28 is Exp $
+$NetBSD: patch-ah,v 1.3 2005/11/04 19:36:01 rillig Exp $
 
---- port/solaris/Makefile.set.gcc.orig	Tue Oct 19 00:45:13 1999
-+++ port/solaris/Makefile.set.gcc
+--- src/port/solaris/Makefile.set.gcc.orig	Tue Oct 19 00:45:13 1999
++++ src/port/solaris/Makefile.set.gcc
 @@ -1,12 +1,14 @@
  'CC=gcc'
  'CDEBUG=-g -O2'
diff --git a/net/bind8/patches/patch-ai b/net/bind8/patches/patch-ai
index 4c27f2041fa..4623f9eb193 100644
--- a/net/bind8/patches/patch-ai
+++ b/net/bind8/patches/patch-ai
@@ -1,7 +1,7 @@
-$NetBSD: patch-ai,v 1.2 2003/03/06 11:43:28 is Exp $
+$NetBSD: patch-ai,v 1.3 2005/11/04 19:36:01 rillig Exp $
 
---- port/solaris/Makefile.set.orig	Mon Jun 24 00:33:16 2002
-+++ port/solaris/Makefile.set
+--- src/port/solaris/Makefile.set.orig	Mon Jun 24 00:33:16 2002
++++ src/port/solaris/Makefile.set
 @@ -1,12 +1,14 @@
  'CC=gcc'
  'CDEBUG=-g -O2'
diff --git a/net/bind8/patches/patch-aj b/net/bind8/patches/patch-aj
index 2868acc5629..94b100ff773 100644
--- a/net/bind8/patches/patch-aj
+++ b/net/bind8/patches/patch-aj
@@ -1,7 +1,7 @@
-$NetBSD: patch-aj,v 1.2 2003/03/06 11:43:28 is Exp $
+$NetBSD: patch-aj,v 1.3 2005/11/04 19:36:01 rillig Exp $
 
---- port/solaris/Makefile.set.sun.orig	Tue Oct 19 00:45:13 1999
-+++ port/solaris/Makefile.set.sun
+--- src/port/solaris/Makefile.set.sun.orig	Tue Oct 19 00:45:13 1999
++++ src/port/solaris/Makefile.set.sun
 @@ -1,12 +1,14 @@
  'CC=cc'
  'CDEBUG=-g -O'