Update djbdns to 1.04. Changes:

  * tinydns now automatically returns a random set of 8 addresses from
  a cluster of any size. It also supports client differentiation. There's no
  longer any reason to use pickdns. dnstracesort prints glue information that
  reveals all sorts of interesting inconsistencies.

  * minor pkg's Makefile improvements

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

4 files changed, 45 insertions, 32 deletions

diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile
index b164be25996..98e89b02863 100644
--- a/net/djbdns/Makefile
+++ b/net/djbdns/Makefile
@@ -1,52 +1,64 @@
-# $NetBSD: Makefile,v 1.5 2001/01/10 03:23:49 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 2001/01/26 01:33:21 hubertf Exp $
 # FreeBSD Id: ports/net/djbdns/Makefile,v 1.4 2000/09/28 18:18:41 nbm Exp
 
-DISTNAME=	djbdns-1.03
+DISTNAME=	djbdns-1.04
 CATEGORIES=	net
 MASTER_SITES=	http://cr.yp.to/djbdns/ \
 		ftp://cr.yp.to/djbdns/ \
 		ftp://ftp.innominate.org/gpa/djb/ \
 		http://www.hungry.com/~fn/ \
 		http://tinydns.org/
-DISTFILES=	djbdns-1.03.tar.gz \
-		djbdns-1.03-man.tar.gz \
+DISTFILES=	djbdns-1.04.tar.gz \
+		djbdns-1.04-man.tar.gz \
 		dnscache-log.pl.txt \
 		tinydns-log.pl.txt
 
 PATCH_SITES=    http://www.fefe.de/dns/
-PATCHFILES=     djbdns-1.03-ipv6.diff.bz2
+PATCHFILES=     djbdns-1.04-ipv6.diff.bz2
 PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=	zuntum@eik.pl
 HOMEPAGE=	http://cr.yp.to/djbdns.html
 
-EXTRACT_ONLY=	djbdns-1.03.tar.gz \
-		djbdns-1.03-man.tar.gz
+MESSAGE_FILE=	${WRKDIR}/.MESSAGE
+
+EXTRACT_ONLY=	djbdns-1.04.tar.gz \
+		djbdns-1.04-man.tar.gz
 
 ALL_TARGET=	it
 INSTALL_TARGET=	setup check
 
 post-extract:
-	@${SED} 's|/usr/bin/perl|${LOCALBASE}/bin/perl|' <  ${DISTDIR}/tinydns-log.pl.txt > ${WRKDIR}/tinydns-log.pl
-	@${SED} 's|/usr/bin/perl|${LOCALBASE}/bin/perl|' <  ${DISTDIR}/dnscache-log.pl.txt > ${WRKDIR}/dnscache-log.pl
+	${SED} "s|/usr/bin/perl|${LOCALBASE}/bin/perl|" \
+		${DISTDIR}/tinydns-log.pl.txt > ${WRKDIR}/tinydns-log.pl
+	${SED} "s|/usr/bin/perl|${LOCALBASE}/bin/perl|" \
+		${DISTDIR}/dnscache-log.pl.txt > ${WRKDIR}/dnscache-log.pl
+	${SED} "s|@PREFIX@|${PREFIX}|g" ${PKGDIR}/MESSAGE \
+		> ${MESSAGE_FILE}
 
 post-patch:
-	@${ECHO} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
-	@${ECHO} "${CC} -s" > ${WRKSRC}/conf-ld
-	@${ECHO} "${PREFIX}" > ${WRKSRC}/conf-home
-
-.for i in dnscache-conf axfrdns-conf pickdns-conf rbldns-conf tinydns-conf walldns-conf
-	${SED} 's|usage: $i acct logacct /$i|usage: $i acct logacct ${PREFIX}/etc/$i|' \
-		 < ${WRKSRC}/$i.c > ${WRKSRC}/$i.c.done
-	${MV} ${WRKSRC}/$i.c.done ${WRKSRC}/$i.c
+	${ECHO} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
+	${ECHO} "${CC} -s" > ${WRKSRC}/conf-ld
+	${ECHO} "${PREFIX}" > ${WRKSRC}/conf-home
+
+.for i in dnscache axfrdns pickdns rbldns tinydns walldns
+	${SED} "s|usage: $i-conf acct logacct /$i|usage: $i-conf acct logacct ${PREFIX}/etc/$i|g" \
+		${WRKSRC}/$i-conf.c > ${WRKSRC}/$i-conf.c.done
+	${MV} ${WRKSRC}/$i-conf.c.done ${WRKSRC}/$i-conf.c
 .endfor
 
 post-install:
-	@${INSTALL} ${WRKDIR}/tinydns-log.pl ${PREFIX}/bin/tinydns-log.pl
-	@${INSTALL} ${WRKDIR}/dnscache-log.pl ${PREFIX}/bin/dnscache-log.pl
-	@${INSTALL_DATA} ${WRKSRC}/dnsroots.global ${PREFIX}/etc/dnsroots.global
-	@cd ${WRKDIR}/${DISTNAME}-man && ${INSTALL_MAN} dnsfilter.1 dnsip.1 dnsipq.1 dnsmx.1 dnsname.1 dnsq.1 dnsqr.1 dnstrace.1 dnstxt.1 ${PREFIX}/man/man1
-	@cd ${WRKDIR}/${DISTNAME}-man && ${INSTALL_MAN} qualification.5 ${PREFIX}/man/man5
-	@cd ${WRKDIR}/${DISTNAME}-man && ${INSTALL_MAN} axfr-get.8 axfrdns.8 dnscache-conf.8 dnscache.8 pickdns-conf.8 pickdns-data.8 pickdns.8 rbldns-conf.8 rbldns-data.8 rbldns.8 tinydns-conf.8 tinydns-data.8 tinydns.8 walldns-conf.8 walldns.8 ${PREFIX}/man/man8
+	${INSTALL} ${WRKDIR}/tinydns-log.pl ${PREFIX}/bin/tinydns-log.pl
+	${INSTALL} ${WRKDIR}/dnscache-log.pl ${PREFIX}/bin/dnscache-log.pl
+	${INSTALL_DATA} ${WRKSRC}/dnsroots.global ${PREFIX}/etc/dnsroots.global
+	cd ${WRKDIR}/${DISTNAME}-man && ${INSTALL_MAN} dnsfilter.1 dnsip.1 \
+	dnsipq.1 dnsmx.1 dnsname.1 dnsq.1 dnsqr.1 dnstrace.1 dnstxt.1 \
+		${PREFIX}/man/man1
+	cd ${WRKDIR}/${DISTNAME}-man && ${INSTALL_MAN} qualification.5 \
+		${PREFIX}/man/man5
+	cd ${WRKDIR}/${DISTNAME}-man && ${INSTALL_MAN} axfr-get.8 axfrdns.8 \
+	dnscache-conf.8 dnscache.8 pickdns-conf.8 pickdns-data.8 pickdns.8 \
+	rbldns-conf.8 rbldns-data.8 rbldns.8 tinydns-conf.8 tinydns-data.8 \
+	tinydns.8 walldns-conf.8 walldns.8 ${PREFIX}/man/man8
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/djbdns/files/md5 b/net/djbdns/files/md5
index 5dab8831e0d..d7cce7b7011 100644
--- a/net/djbdns/files/md5
+++ b/net/djbdns/files/md5
@@ -1,7 +1,7 @@
-$NetBSD: md5,v 1.5 2001/01/10 03:23:49 hubertf Exp $
+$NetBSD: md5,v 1.6 2001/01/26 01:33:21 hubertf Exp $
 
-MD5 (djbdns-1.03.tar.gz) = d756ecca7aa5a0384860eee074f8c3fa
-MD5 (djbdns-1.03-man.tar.gz) = cf8675c8d193fb9129aaec9b1ec03779
+MD5 (djbdns-1.04.tar.gz) = 31ae12bd7f4fb213f830f1b5d302a82a
+MD5 (djbdns-1.04-man.tar.gz) = d92fbf1eb64808ea4208a3499b0a8559
 MD5 (dnscache-log.pl.txt) = ae3b02d588e943e7a0d49e1cfa27ddb5
 MD5 (tinydns-log.pl.txt) = 277b2ecbd2788a5940746faa185fdaef
-MD5 (djbdns-1.03-ipv6.diff.bz2) = d5a2fe93a677734d4f2e692844249081
+MD5 (djbdns-1.04-ipv6.diff.bz2) = 4c3a221f4950d940fa7b753d51e5dc46
diff --git a/net/djbdns/pkg/MESSAGE b/net/djbdns/pkg/MESSAGE
index f394eb04841..4cbc72b51ce 100644
--- a/net/djbdns/pkg/MESSAGE
+++ b/net/djbdns/pkg/MESSAGE
@@ -2,8 +2,8 @@ You will also need to install ucspi-tcp package (pkgsrc/net/ucspi-tcp) if
 you want to use axfrdns or axfr-get.
 
 Please install perl if you want to use contrib tools for djbdns:
-	tinydns logfile formatter, ${PREFIX}/bin/tinydns-log.pl
-and	dnscache logfile formatter, ${PREFIX}/bin/dnscache-log.pl
+	tinydns logfile formatter, @PREFIX@/bin/tinydns-log.pl
+and	dnscache logfile formatter, @PREFIX@/bin/dnscache-log.pl
 
 (these are taken from http://tinydns.org)
 
diff --git a/net/djbdns/pkg/PLIST b/net/djbdns/pkg/PLIST
index 613a900b0a3..9d283fcd711 100644
--- a/net/djbdns/pkg/PLIST
+++ b/net/djbdns/pkg/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2000/12/28 14:37:20 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/01/26 01:33:21 hubertf Exp $
 bin/axfr-get
 bin/axfrdns
 bin/axfrdns-conf
 bin/dnscache
 bin/dnscache-conf
+bin/dnscache-log.pl
 bin/dnsfilter
 bin/dnsip
 bin/dnsip6
@@ -13,6 +14,7 @@ bin/dnsname
 bin/dnsq
 bin/dnsqr
 bin/dnstrace
+bin/dnstracesort
 bin/dnstxt
 bin/pickdns
 bin/pickdns-conf
@@ -26,10 +28,9 @@ bin/tinydns-conf
 bin/tinydns-data
 bin/tinydns-edit
 bin/tinydns-get
+bin/tinydns-log.pl
 bin/walldns
 bin/walldns-conf
-bin/tinydns-log.pl
-bin/dnscache-log.pl
 etc/dnsroots.global
 man/man1/dnsfilter.1
 man/man1/dnsip.1