Obey PKG_SYSCONFDIR

8 files changed, 27 insertions, 23 deletions

diff --git a/net/bind8/Makefile b/net/bind8/Makefile
index cfc6dee0e9b..ffbac162ab2 100644
--- a/net/bind8/Makefile
+++ b/net/bind8/Makefile
@@ -1,11 +1,12 @@
 #
-# $NetBSD: Makefile,v 1.18 2003/01/28 22:03:48 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2003/03/06 11:43:28 is Exp $
 #
 # FreeBSD Id: Makefile,v 1.12 1999/06/28 21:25:07 billf Exp
 #
 
 DISTNAME=	bind
 PKGNAME=	bind-${BIND_VERSION}
+PKGREVISION=	1
 WRKSRC=		${WRKDIR}/src
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.isc.org/isc/bind/src/${BIND_VERSION}/
@@ -48,5 +49,8 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bind8
 	(cd ${WRKDIR}/doc/html/; tar Bpcf - .) | (cd ${PREFIX}/share/doc/bind8; tar Bpxf -)
 	${INSTALL_SCRIPT} ${WRKDIR}/named.sh ${PREFIX}/etc/rc.d/named
+.if ${OPSYS} == "SunOS"
+	${INSTALL} -d -o root -g other -m 700 ${PKG_SYSCONFDIR}/ndc.d
+.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/bind8/distinfo b/net/bind8/distinfo
index 626fc7d4a2b..8fe517c3460 100644
--- a/net/bind8/distinfo
+++ b/net/bind8/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2002/12/07 21:35:11 cjep Exp $
+$NetBSD: distinfo,v 1.14 2003/03/06 11:43:28 is Exp $
 
 SHA1 (bind/8.3.4/bind-src.tar.gz) = 18f8a6af0ede72981f5a1e45462978450f4d9b74
 Size (bind/8.3.4/bind-src.tar.gz) = 1413654 bytes
@@ -7,10 +7,10 @@ Size (bind/8.3.4/bind-doc.tar.gz) = 1490246 bytes
 SHA1 (patch-aa) = f97a4c13a1ed957dab3012e6015f8070330f474d
 SHA1 (patch-ab) = 9bf580c08118b44b4f82810ea65cb82b55bb506c
 SHA1 (patch-ac) = 27fa07a5af995d296915825e0d2ef60498e58b0f
-SHA1 (patch-ad) = 029b0f8b535eb2dbc8dc054135b0802996e8dd67
+SHA1 (patch-ad) = 5c6cc311bc7bb066b89aba045493528bd140fe36
 SHA1 (patch-ae) = ed3b80dc19ff78e1caa8f9ac076e3370a10bfdd6
-SHA1 (patch-af) = 6b30cd30e8766b468ae1cc6027e83591d9d778a6
-SHA1 (patch-ag) = d2bd5d53c086261faf48671abf29d3a3a5e5c21c
-SHA1 (patch-ah) = b6bf7776cddd44eccbf4fd17de9dcd9b14197402
-SHA1 (patch-ai) = 0ced4c8938b1b491e345f2d8fec2170204bdd585
-SHA1 (patch-aj) = 94d1e884e32d7b52b50354d27af78dd6c5ff7669
+SHA1 (patch-af) = 1951d4cac373a8be939d2061b55aa8213bfc68a6
+SHA1 (patch-ag) = f07a8bb9c01c0108da4c4d5f573a1c989626f2f7
+SHA1 (patch-ah) = ad30cf5271b2cb34e617dc46d41c8e94e1b4d09d
+SHA1 (patch-ai) = dcae67de30521715c8e63bda7a67a480d40d9d8f
+SHA1 (patch-aj) = 6f250aea0666f80a2a6ab8a7e4023063322ac7e6
diff --git a/net/bind8/patches/patch-ad b/net/bind8/patches/patch-ad
index 563557353bb..f09b44b9b67 100644
--- a/net/bind8/patches/patch-ad
+++ b/net/bind8/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 2002/12/07 21:34:05 cjep Exp $
+$NetBSD: patch-ad,v 1.3 2003/03/06 11:43:28 is Exp $
 
 --- port/darwin/Makefile.set.orig	Mon Jun 24 00:32:44 2002
 +++ port/darwin/Makefile.set
@@ -18,7 +18,7 @@ $NetBSD: patch-ad,v 1.2 2002/12/07 21:34:05 cjep Exp $
 +'DESTEXEC=${PREFIX}/libexec'
 +'DESTMAN=${PREFIX}/man'
 +'DESTHELP=${PREFIX}/share/doc/bind8'
-+'DESTETC=${PREFIX}/etc'
++'DESTETC=${PKG_SYSCONFDIR}'
  'DESTRUN=/var/run'
  'LEX=lex -I'
  'YACC=yacc -d'
diff --git a/net/bind8/patches/patch-af b/net/bind8/patches/patch-af
index 5936c687c61..b7a73b842b2 100644
--- a/net/bind8/patches/patch-af
+++ b/net/bind8/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.2 2002/12/07 21:34:05 cjep Exp $
+$NetBSD: patch-af,v 1.3 2003/03/06 11:43:28 is Exp $
 
 --- port/linux/Makefile.set.orig	Mon Jun 24 00:32:57 2002
 +++ port/linux/Makefile.set
@@ -18,7 +18,7 @@ $NetBSD: patch-af,v 1.2 2002/12/07 21:34:05 cjep Exp $
 +'DESTEXEC=${PREFIX}/libexec'
 +'DESTMAN=${PREFIX}/share/man'
 +'DESTHELP=${PREFIX}/share/doc/bind8'
-+'DESTETC=${PREFIX}/etc'
++'DESTETC=${PKG_SYSCONFDIR}'
  'DESTRUN=/var/run'
  'LEX=flex -8 -I'
  'YACC=yacc -d'
diff --git a/net/bind8/patches/patch-ag b/net/bind8/patches/patch-ag
index 8750473528a..b851ccd4184 100644
--- a/net/bind8/patches/patch-ag
+++ b/net/bind8/patches/patch-ag
@@ -1,4 +1,4 @@
-$NetBSD: patch-ag,v 1.2 2002/12/07 21:34:05 cjep Exp $
+$NetBSD: patch-ag,v 1.3 2003/03/06 11:43:28 is Exp $
 
 --- port/netbsd/Makefile.set.orig	Mon Jun 24 00:33:02 2002
 +++ port/netbsd/Makefile.set
@@ -18,7 +18,7 @@ $NetBSD: patch-ag,v 1.2 2002/12/07 21:34:05 cjep Exp $
 +'DESTEXEC=${PREFIX}/libexec'
 +'DESTMAN=${PREFIX}/man'
 +'DESTHELP=${PREFIX}/share/doc/bind8'
-+'DESTETC=${PREFIX}/etc'
++'DESTETC=${PKG_SYSCONFDIR}'
  'DESTRUN=/var/run'
  'LEX=lex -I'
  'YACC=yacc -d'
diff --git a/net/bind8/patches/patch-ah b/net/bind8/patches/patch-ah
index e9ee3a70c74..9a9fc7175a7 100644
--- a/net/bind8/patches/patch-ah
+++ b/net/bind8/patches/patch-ah
@@ -1,4 +1,4 @@
-$NetBSD: patch-ah,v 1.1 2002/12/07 21:34:05 cjep Exp $
+$NetBSD: patch-ah,v 1.2 2003/03/06 11:43:28 is Exp $
 
 --- port/solaris/Makefile.set.gcc.orig	Tue Oct 19 00:45:13 1999
 +++ port/solaris/Makefile.set.gcc
@@ -17,10 +17,10 @@ $NetBSD: patch-ah,v 1.1 2002/12/07 21:34:05 cjep Exp $
 +'DESTEXEC=${PREFIX}/libexec'
 +'DESTMAN=${PREFIX}/man'
 +'DESTHELP=${PREFIX}/share/doc/bind8'
-+'DESTETC=${PREFIX}/etc'
++'DESTETC=${PKG_SYSCONFDIR}'
 +'DESTLIB=${PREFIX}/lib'
 +'DESTINC=${PREFIX}/include/bind'
-+'DESTRUN=${PREFIX}/etc'
++'DESTRUN=${PKG_SYSCONFDIR}'
  'LDS=:'
  'AR=/usr/ccs/bin/ar cru'
  'LEX=/usr/ccs/bin/lex'
diff --git a/net/bind8/patches/patch-ai b/net/bind8/patches/patch-ai
index 90ce147297d..4c27f2041fa 100644
--- a/net/bind8/patches/patch-ai
+++ b/net/bind8/patches/patch-ai
@@ -1,4 +1,4 @@
-$NetBSD: patch-ai,v 1.1 2002/12/07 21:34:06 cjep Exp $
+$NetBSD: patch-ai,v 1.2 2003/03/06 11:43:28 is Exp $
 
 --- port/solaris/Makefile.set.orig	Mon Jun 24 00:33:16 2002
 +++ port/solaris/Makefile.set
@@ -17,10 +17,10 @@ $NetBSD: patch-ai,v 1.1 2002/12/07 21:34:06 cjep Exp $
 +'DESTEXEC=${PREFIX}/libexec'
 +'DESTMAN=${PREFIX}/man'
 +'DESTHELP=${PREFIX}/share/doc/bind8'
-+'DESTETC=${PREFIX}/etc'
++'DESTETC=${PKG_SYSCONFDIR}'
 +'DESTLIB=${PREFIX}/lib'
 +'DESTINC=${PREFIX}/include/bind'
-+'DESTRUN=${PREFIX}/etc'
++'DESTRUN=${PKG_SYSCONFDIR}'
  'LDS=:'
  'AR=/usr/ccs/bin/ar cru'
  'LEX=/usr/ccs/bin/lex'
diff --git a/net/bind8/patches/patch-aj b/net/bind8/patches/patch-aj
index 94f0b40a523..2868acc5629 100644
--- a/net/bind8/patches/patch-aj
+++ b/net/bind8/patches/patch-aj
@@ -1,4 +1,4 @@
-$NetBSD: patch-aj,v 1.1 2002/12/07 21:34:06 cjep Exp $
+$NetBSD: patch-aj,v 1.2 2003/03/06 11:43:28 is Exp $
 
 --- port/solaris/Makefile.set.sun.orig	Tue Oct 19 00:45:13 1999
 +++ port/solaris/Makefile.set.sun
@@ -17,10 +17,10 @@ $NetBSD: patch-aj,v 1.1 2002/12/07 21:34:06 cjep Exp $
 +'DESTEXEC=${PREFIX}/libexec'
 +'DESTMAN=${PREFIX}/man'
 +'DESTHELP=${PREFIX}/share/doc/bind8'
-+'DESTETC=${PREFIX}/etc'
++'DESTETC=${PKG_SYSCONFDIR}'
 +'DESTLIB=${PREFIX}/lib'
 +'DESTINC=${PREFIX}/include/bind'
-+'DESTRUN=${PREFIX}/etc'
++'DESTRUN=${PKG_SYSCONFDIR}'
  'LDS=:'
  'AR=/usr/ccs/bin/ar cru'
  'LEX=/usr/ccs/bin/lex'