* Added Fefe's IPv6 patch ( http://www.fefe.de/dns )

 * Included two small logfile formatters written in perl -
   dnscache-log.pl and tinydns-log.pl (from http://www.djbdns.org)

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

5 files changed, 44 insertions, 7 deletions

diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile
index c27258ed7d5..d554c6c0ab4 100644
--- a/net/djbdns/Makefile
+++ b/net/djbdns/Makefile
@@ -1,26 +1,44 @@
-# $NetBSD: Makefile,v 1.2 2000/12/27 23:29:57 hubertf Exp $
+# $NetBSD: Makefile,v 1.3 2000/12/28 14:37:18 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
 CATEGORIES=	net
 MASTER_SITES=	http://cr.yp.to/djbdns/ \
 		ftp://cr.yp.to/djbdns/ \
-		ftp://ftp.innominate.org/gpa/djb/
+		ftp://ftp.innominate.org/gpa/djb/ \
+		http://www.hungry.com/~fn/ \
+		http://tinydns.org/
 DISTFILES=	djbdns-1.02.tar.gz \
-		djbdns-1.02-man.tar.gz
+		djbdns-1.02-man.tar.gz \
+		dnscache-log.pl.txt \
+		tinydns-log.pl.txt
+
+PATCH_SITES=    http://www.fefe.de/dns/
+PATCHFILES=     djbdns-1.02-ipv6.diff
+PATCH_DIST_STRIP=       -p1
 
 MAINTAINER=	zuntum@eik.pl
 HOMEPAGE=	http://cr.yp.to/djbdns.html
 
+EXTRACT_ONLY=	djbdns-1.02.tar.gz \
+		djbdns-1.02-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
+
 post-patch:
 	@${ECHO} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
 	@${ECHO} "${CC} -s" > ${WRKSRC}/conf-ld
 	@${ECHO} "${PREFIX}" > ${WRKSRC}/conf-home
 
 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}/djbdns-1.02-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}/djbdns-1.02-man && ${INSTALL_MAN} qualification.5 ${PREFIX}/man/man5
diff --git a/net/djbdns/files/md5 b/net/djbdns/files/md5
index a2c5a6101ba..87f83555023 100644
--- a/net/djbdns/files/md5
+++ b/net/djbdns/files/md5
@@ -1,4 +1,7 @@
-$NetBSD: md5,v 1.2 2000/12/27 23:29:57 hubertf Exp $
+$NetBSD: md5,v 1.3 2000/12/28 14:37:19 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
diff --git a/net/djbdns/pkg/DESCR b/net/djbdns/pkg/DESCR
index 72a5888f3a6..022ddb42451 100644
--- a/net/djbdns/pkg/DESCR
+++ b/net/djbdns/pkg/DESCR
@@ -15,6 +15,9 @@ several components:
     names, MX records, etc. It supports asynchronous resolution.
   * The dnsfilter program is a parallel IP-address-to-host-name
     converter.
-  * The dnsip, dnsipq, dnsname, dnstxt, and dnsmx programs are simple
+  * The dnsip, dnsip6, dnsipq, dnsname, dnstxt, and dnsmx programs are simple
     command-line interfaces to DNS.
   * The dnsq and dnstrace programs are DNS debugging tools.
+
+This package includes IPv6 patches written by Fefe,
+see http://www.fefe.de/dns/ for more details.
diff --git a/net/djbdns/pkg/MESSAGE b/net/djbdns/pkg/MESSAGE
index b436cc0bf71..f394eb04841 100644
--- a/net/djbdns/pkg/MESSAGE
+++ b/net/djbdns/pkg/MESSAGE
@@ -1 +1,11 @@
-You will also need to install ucspi-tcp package (pkgsrc/net/ucspi-tcp) if you want to use axfrdns or axfr-get
+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
+
+(these are taken from http://tinydns.org)
+
+You can also use tai64nlocal from pkgsrc/sysutils/daemontools package to
+make output of these formatters more readable.
diff --git a/net/djbdns/pkg/PLIST b/net/djbdns/pkg/PLIST
index 3a744bd9d80..613a900b0a3 100644
--- a/net/djbdns/pkg/PLIST
+++ b/net/djbdns/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2000/12/27 23:30:04 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/12/28 14:37:20 hubertf Exp $
 bin/axfr-get
 bin/axfrdns
 bin/axfrdns-conf
@@ -6,6 +6,7 @@ bin/dnscache
 bin/dnscache-conf
 bin/dnsfilter
 bin/dnsip
+bin/dnsip6
 bin/dnsipq
 bin/dnsmx
 bin/dnsname
@@ -27,6 +28,8 @@ bin/tinydns-edit
 bin/tinydns-get
 bin/walldns
 bin/walldns-conf
+bin/tinydns-log.pl
+bin/dnscache-log.pl
 etc/dnsroots.global
 man/man1/dnsfilter.1
 man/man1/dnsip.1