Update to djbdns-1.02nb2. Changes:

 * Remove accidentelly left files/patch-*
 * Use bzipped ipv6.diff instead of uncompressed one.
 * Put ${PREFIX} in {dnscache,axfrdns,pickdns,rbldns,tinydns,walldns}
   usage
   (example spoke of /${progname} directory)
 * Tell dnscache to look for dnsroots.global in ${PREFIX}/etc instead
   of /etc

Sent in by Tomasz Luchowski <zuntum@eik.pl> in private mail.

4 files changed, 30 insertions, 9 deletions

diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile
index d554c6c0ab4..26056750c6f 100644
--- a/net/djbdns/Makefile
+++ b/net/djbdns/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2000/12/28 14:37:18 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2000/12/29 16:42:54 hubertf Exp $
 # FreeBSD Id: ports/net/djbdns/Makefile,v 1.4 2000/09/28 18:18:41 nbm Exp
 
 DISTNAME=	djbdns-1.02
-PKGNAME=	djbdns-1.02nb1
+PKGNAME=	djbdns-1.02nb2
 CATEGORIES=	net
 MASTER_SITES=	http://cr.yp.to/djbdns/ \
 		ftp://cr.yp.to/djbdns/ \
@@ -15,7 +15,7 @@ DISTFILES=	djbdns-1.02.tar.gz \
 		tinydns-log.pl.txt
 
 PATCH_SITES=    http://www.fefe.de/dns/
-PATCHFILES=     djbdns-1.02-ipv6.diff
+PATCHFILES=     djbdns-1.02-ipv6.diff.bz2
 PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=	zuntum@eik.pl
@@ -35,6 +35,23 @@ post-patch:
 	@${ECHO} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
 	@${ECHO} "${CC} -s" > ${WRKSRC}/conf-ld
 	@${ECHO} "${PREFIX}" > ${WRKSRC}/conf-home
+	@${SED} 's|usage: dnscache-conf acct logacct /dnscache|usage: dnscache-conf acct logacct ${PREFIX}/etc/dnscache|' \
+		< ${WRKSRC}/dnscache-conf.c > ${WRKSRC}/dnscache-conf.c.done; \
+		${MV} ${WRKSRC}/dnscache-conf.c.done ${WRKSRC}/dnscache-conf.c
+	@${SED} 's|usage: axfrdns-conf acct logacct /axfrdns /tinydns|usage: axfrdns-conf acct logacct ${PREFIX}/etc/axfrdns ${PREFIX}/etc/tinydns|' < ${WRKSRC}/axfrdns-conf.c > ${WRKSRC}/axfrdns-conf.c.done; \
+		${MV} ${WRKSRC}/axfrdns-conf.c.done ${WRKSRC}/axfrdns-conf.c
+	@${SED} 's|usage: pickdns-conf acct logacct /pickdns|usage: pickdns-conf acct logacct ${PREFIX}/etc/pickdns|' \
+		< ${WRKSRC}/pickdns-conf.c > ${WRKSRC}/pickdns-conf.c.done; \
+		${MV} ${WRKSRC}/pickdns-conf.c.done ${WRKSRC}/pickdns-conf.c
+	@${SED} 's|usage: rbldns-conf acct logacct /rbldns|usage: rbldns-conf acct logacct ${PREFIX}/etc/rbldns|' \
+		< ${WRKSRC}/rbldns-conf.c > ${WRKSRC}/rbldns-conf.c.done; \
+		${MV} ${WRKSRC}/rbldns-conf.c.done ${WRKSRC}/rbldns-conf.c
+	@${SED} 's|usage: tinydns-conf acct logacct /tinydns|usage: tinydns-conf acct logacct ${PREFIX}/etc/tinydns|' \
+		< ${WRKSRC}/tinydns-conf.c > ${WRKSRC}/tinydns-conf.c.done; \
+		${MV} ${WRKSRC}/tinydns-conf.c.done ${WRKSRC}/tinydns-conf.c
+	@${SED} 's|usage: walldns-conf acct logacct /walldns|usage: walldns-conf acct logacct ${PREFIX}/etc/walldns|' \
+		< ${WRKSRC}/walldns-conf.c > ${WRKSRC}/walldns-conf.c.done; \
+		${MV} ${WRKSRC}/walldns-conf.c.done ${WRKSRC}/walldns-conf.c
 
 post-install:
 	@${INSTALL} ${WRKDIR}/tinydns-log.pl ${PREFIX}/bin/tinydns-log.pl
diff --git a/net/djbdns/files/md5 b/net/djbdns/files/md5
index 87f83555023..76c39e3f565 100644
--- a/net/djbdns/files/md5
+++ b/net/djbdns/files/md5
@@ -1,7 +1,7 @@
-$NetBSD: md5,v 1.3 2000/12/28 14:37:19 hubertf Exp $
+$NetBSD: md5,v 1.4 2000/12/29 16:42:54 hubertf Exp $
 
 MD5 (djbdns-1.02.tar.gz) = c27b7ffd4af1c93db96f40f6d5f793b6
 MD5 (djbdns-1.02-man.tar.gz) = 8795b414c01389aafbee2849915bd6bb
 MD5 (dnscache-log.pl.txt) = ae3b02d588e943e7a0d49e1cfa27ddb5
 MD5 (tinydns-log.pl.txt) = 277b2ecbd2788a5940746faa185fdaef
-MD5 (djbdns-1.02-ipv6.diff) = a68c1bf17dbd7ee11f27dd90a556bf48
+MD5 (djbdns-1.02-ipv6.diff.bz2) = 3f65b1eeb00ca4cc02ed1ed2a814ee9e
diff --git a/net/djbdns/files/patch-ab b/net/djbdns/patches/patch-aa
index e608a047589..a9c1982f40b 100644
--- a/net/djbdns/files/patch-ab
+++ b/net/djbdns/patches/patch-aa
@@ -1,5 +1,7 @@
---- hier.c.orig	Sat Sep 23 17:37:08 2000
-+++ hier.c	Sat Sep 23 17:37:52 2000
+$NetBSD: patch-aa,v 1.1 2000/12/29 16:42:55 hubertf Exp $
+
+--- hier.c.orig	Thu Dec 28 16:35:18 2000
++++ hier.c	Thu Dec 28 16:35:49 2000
 @@ -2,7 +2,7 @@
  
  void hier()
diff --git a/net/djbdns/files/patch-aa b/net/djbdns/patches/patch-ab
index 4fb1e2a7abb..0e13e9742b1 100644
--- a/net/djbdns/files/patch-aa
+++ b/net/djbdns/patches/patch-ab
@@ -1,5 +1,7 @@
---- dnscache-conf.orig	Sat Sep 23 17:39:21 2000
-+++ dnscache-conf.c	Sat Sep 23 17:42:43 2000
+$NetBSD: patch-ab,v 1.1 2000/12/29 16:42:55 hubertf Exp $
+
+--- dnscache-conf.c.orig	Thu Dec 28 16:36:17 2000
++++ dnscache-conf.c	Thu Dec 28 16:38:03 2000
 @@ -89,13 +89,13 @@
    if (chdir(auto_home) == -1)
      strerr_die4sys(111,FATAL,"unable to switch to ",auto_home,": ");