Updated man pages to 20031023. From the changelog:

* merge changes from http://cr.yp.to/djbdns/doc.tar.gz into: axfr-get.8,
    tinydns-data.8.
* pickdns-conf.8, pickdns-data.8, pickdns.8: remove.
* dnscache-conf.8, rbldns-conf.8, tinydns-conf.8, walldns-conf.8: adapt.
* axfrdns-conf.8: new.

pkgsrc changes:
* Convert to bsd.options.mk. Available options: "ignoreip2 inet6".
* Set USE_BUILDLINK3=yes.
* Patch to honor PKG_SYSCONFDIR.
* As long as we're patching, patch the installer to avoid setting unusual
    permissions on ${PREFIX} and ${PREFIX}/bin.
* Work around the standard djbware errno problem on recent Linux glibc.
* Update to the latest pkgsrc djbware RESTRICTED clause.
* Remove the third-party logfile formatters (they can go elsewhere if needed).
* Take maintainership (suggested by zuntum).

Bump PKGREVISION.

11 files changed, 122 insertions, 187 deletions

diff --git a/net/djbdns/DESCR b/net/djbdns/DESCR
index 9c9b0640439..44d261f98e5 100644
--- a/net/djbdns/DESCR
+++ b/net/djbdns/DESCR
@@ -1,21 +1,24 @@
-DJBDNS is a collection of Domain Name System tools. It includes several
-components:
+djbdns is a collection of Domain Name System tools. It includes
+software for all the fundamental DNS operations:
 
-- dnscache: local DNS cache. It accepts recursive DNS queries from local
-  clients. It collects responses from remote DNS servers.
-- tinydns: fast, UDP-only DNS server. It makes local DNS information
-  available to the Internet.
-- pickdns: load-balancing DNS server. It points clients to a dynamic
-  selection of IP addresses.
-- walldns: reverse DNS wall. It provides matching reverse and forward
-  records while hiding local host information.
-- dns library: handles outgoing and incoming DNS packets. It can be
-  used by clients such as web browsers to look up host addresses, host
-  names, MX records, etc. It supports asynchronous resolution.
-- dnsfilter: parallel IP-address-to-host-name converter.
-- dnsip, dnsip6, dnsipq, dnsname, dnstxt, and dnsmx: simple command-line
-  interfaces to DNS.
-- dnsq and dnstrace: DNS debugging tools.
+* DNS cache: finding addresses of Internet hosts. When a browser
+  wants to contact www.hotwired.com, it first asks a DNS cache,
+  such as djbdns's dnscache, to find the IP address of www.hotwired.com.
+  Internet service providers run dnscache to find IP addresses
+  requested by their customers. If you're running a home computer
+  or a workstation, you can run your own dnscache to speed up your
+  web browsing.
 
-This package includes IPv6 patches written by Fefe, see
-http://www.fefe.de/dns/ for more details.
+* DNS server: publishing addresses of Internet hosts. The IP address
+  of www.hotwired.com is published by HotWired's DNS servers. djbdns
+  includes a general-purpose DNS server, tinydns; network administrators
+  run tinydns to publish the IP addresses of their computers. djbdns
+  also includes special-purpose servers for publishing DNS walls
+  and RBLs.
+
+* DNS client: talking to a DNS cache. djbdns includes a DNS client
+  C library and several command-line DNS client utilities. Programmers
+  use these tools to send requests to DNS caches.
+
+djbdns also includes several DNS debugging tools, notably dnstrace,
+which administrators use to diagnose misconfigured remote servers.
diff --git a/net/djbdns/MESSAGE b/net/djbdns/MESSAGE
index 53b2ae78032..3906a06699d 100644
--- a/net/djbdns/MESSAGE
+++ b/net/djbdns/MESSAGE
@@ -1,16 +1,7 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1 2001/10/31 22:55:14 zuntum Exp $
+$NetBSD: MESSAGE,v 1.2 2004/09/01 20:07:35 schmonz Exp $
 
-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
-and	dnscache logfile formatter, ${PREFIX}/bin/dnscache-log
-
-(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.
+If you plan to run dnscache, tinydns, or axfrdns services, consider
+installing the djbdns-run package.
 
 ===========================================================================
diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile
index 80861f33dc2..b4dcf6848f5 100644
--- a/net/djbdns/Makefile
+++ b/net/djbdns/Makefile
@@ -1,54 +1,50 @@
-# $NetBSD: Makefile,v 1.32 2004/04/10 20:28:52 zuntum Exp $
+# $NetBSD: Makefile,v 1.33 2004/09/01 20:07:35 schmonz Exp $
 # FreeBSD Id: ports/net/djbdns/Makefile,v 1.4 2000/09/28 18:18:41 nbm Exp
 #
 
 DISTNAME=	djbdns-1.05
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	net
-MASTER_SITES=	http://cr.yp.to/djbdns/					\
-		ftp://cr.yp.to/djbdns/					\
-		http://smarden.org/pape/djb/manpages/			\
-		http://www.hungry.com/~fn/				\
-		http://tinydns.org/
-DISTFILES=	${DISTNAME}.tar.gz					\
-		${DISTNAME}-man-${MANVERSION}.tar.gz			\
-		dnscache-log.pl.txt					\
-		tinydns-log.pl.txt
+MASTER_SITES=	http://cr.yp.to/djbdns/	ftp://cr.yp.to/djbdns/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${MANPAGES}
 
-PATCH_SITES=	http://www.fefe.de/dns/
-PATCHFILES=	${DISTNAME}-ipv6.diff.bz2
-PATCH_DIST_STRIP=       -p1
-
-MAINTAINER=	zuntum@NetBSD.org
+MAINTAINER=	schmonz@NetBSD.org
 HOMEPAGE=	http://cr.yp.to/djbdns.html
 COMMENT=	Collection of secure and reliable DNS tools by Dan Bernstein
 
+MANPAGES=	djbdns-1.05-man-20031023.tar.gz
+SITES_${MANPAGES}=	http://smarden.org/pape/djb/manpages/
+
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-RESTRICTED=	"Redistribution of modified package is forbidden"
+USE_BUILDLINK3=	yes
+
+RESTRICTED=	"modified source and binaries may not be distributed"
 NO_BIN_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_FTP=	${RESTRICTED}
 
-DIST_SUBDIR=	${PKGNAME}
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}				\
-		${DISTNAME}-man-${MANVERSION}.tar.gz
-
-REPLACE_PERL=	*.pl
-
 ALL_TARGET=	it
 INSTALL_TARGET=	setup check
 
-MANVERSION=	20021211
+EGDIR=		${PREFIX}/share/examples/djbdns
+CFLAGS+=	-DPKG_SYSCONFDIR=\"\\\"${PKG_SYSCONFDIR}\\\"\"
+USE_PKGINSTALL=	yes
+MAKE_DIRS+=	${PKG_SYSCONFDIR}
+SUPPORT_FILES+=	${EGDIR}/dnsroots.global ${PKG_SYSCONFDIR}/dnsroots.global
+PLIST_SRC=	${PKGDIR}/PLIST
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
 GCC_REQD+=	3.0
 .endif
 
-INSTALLATION_DIRS=	bin etc man/man1 man/man5 man/man8
+INSTALLATION_DIRS=	bin man man/man1 man/man5 man/man8 share/examples/djbdns
+
+.include "../../mk/compiler.mk"
+.if ${OPSYS} == "Linux" && !empty(CC_VERSION:Mgcc-*)
+CFLAGS+=		--include errno.h
+.endif
 
-post-extract:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/tinydns-log.pl.txt ${WRKSRC}/tinydns-log.pl
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/dnscache-log.pl.txt ${WRKSRC}/dnscache-log.pl
+.include "options.mk"
 
 do-configure:
 	${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
@@ -56,9 +52,6 @@ do-configure:
 	${ECHO} ${PREFIX} > ${WRKSRC}/conf-home
 
 post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/tinydns-log.pl ${PREFIX}/bin/tinydns-log
-	${INSTALL_SCRIPT} ${WRKSRC}/dnscache-log.pl ${PREFIX}/bin/dnscache-log
-	${INSTALL_DATA} ${WRKSRC}/dnsroots.global ${PREFIX}/etc/dnsroots.global
 	cd ${WRKDIR}/djbdns-man; for i in 1 5 8; do			 \
 	for j in *.$$i; do ${INSTALL_MAN} $$j ${PREFIX}/man/man$$i; done \
 	done
diff --git a/net/djbdns/PLIST b/net/djbdns/PLIST
index e819c546609..c7bd2c6e7a1 100644
--- a/net/djbdns/PLIST
+++ b/net/djbdns/PLIST
@@ -1,13 +1,11 @@
-@comment $NetBSD: PLIST,v 1.2 2002/12/14 02:51:00 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/09/01 20:07:35 schmonz Exp $
 bin/axfr-get
 bin/axfrdns
 bin/axfrdns-conf
 bin/dnscache
 bin/dnscache-conf
-bin/dnscache-log
 bin/dnsfilter
 bin/dnsip
-bin/dnsip6
 bin/dnsipq
 bin/dnsmx
 bin/dnsname
@@ -28,10 +26,8 @@ bin/tinydns-conf
 bin/tinydns-data
 bin/tinydns-edit
 bin/tinydns-get
-bin/tinydns-log
 bin/walldns
 bin/walldns-conf
-etc/dnsroots.global
 man/man1/dnsfilter.1
 man/man1/dnsip.1
 man/man1/dnsipq.1
@@ -48,9 +44,6 @@ man/man8/axfr-get.8
 man/man8/axfrdns.8
 man/man8/dnscache-conf.8
 man/man8/dnscache.8
-man/man8/pickdns-conf.8
-man/man8/pickdns-data.8
-man/man8/pickdns.8
 man/man8/rbldns-conf.8
 man/man8/rbldns-data.8
 man/man8/rbldns.8
@@ -60,3 +53,5 @@ man/man8/tinydns-edit.8
 man/man8/tinydns.8
 man/man8/walldns-conf.8
 man/man8/walldns.8
+share/examples/djbdns/dnsroots.global
+@dirrm share/examples/djbdns
diff --git a/net/djbdns/PLIST.inet6 b/net/djbdns/PLIST.inet6
new file mode 100644
index 00000000000..bc7d2a3b579
--- /dev/null
+++ b/net/djbdns/PLIST.inet6
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.inet6,v 1.1 2004/09/01 20:07:35 schmonz Exp $
+bin/dnsip6
diff --git a/net/djbdns/distinfo b/net/djbdns/distinfo
index 7bbbdb05838..f3f0277317b 100644
--- a/net/djbdns/distinfo
+++ b/net/djbdns/distinfo
@@ -1,16 +1,12 @@
-$NetBSD: distinfo,v 1.10 2004/03/30 17:12:28 taca Exp $
+$NetBSD: distinfo,v 1.11 2004/09/01 20:07:35 schmonz Exp $
 
-SHA1 (djbdns-1.05nb4/djbdns-1.05.tar.gz) = 2efdb3a039d0c548f40936aa9cb30829e0ce8c3d
-Size (djbdns-1.05nb4/djbdns-1.05.tar.gz) = 85648 bytes
-SHA1 (djbdns-1.05nb4/djbdns-1.05-man-20021211.tar.gz) = f85e2b9ed194c922b336fb21b0cfddb9ce788c95
-Size (djbdns-1.05nb4/djbdns-1.05-man-20021211.tar.gz) = 17306 bytes
-SHA1 (djbdns-1.05nb4/dnscache-log.pl.txt) = e34cb0b5efcf96502fdda40095aba05168944bed
-Size (djbdns-1.05nb4/dnscache-log.pl.txt) = 3038 bytes
-SHA1 (djbdns-1.05nb4/tinydns-log.pl.txt) = 9715a514f5aed0ef71eabd54182837c0caa1f622
-Size (djbdns-1.05nb4/tinydns-log.pl.txt) = 2043 bytes
-SHA1 (djbdns-1.05nb4/djbdns-1.05-ipv6.diff.bz2) = 225484ea34f8cdefa501e22640c67d093d2f5169
-Size (djbdns-1.05nb4/djbdns-1.05-ipv6.diff.bz2) = 7306 bytes
-SHA1 (patch-aa) = 9b16d6a7fc2aec2483ca4c90100dc4bae92392fc
-SHA1 (patch-ab) = bd709644fbf55d67d5ad56beb5c545729432b727
-SHA1 (patch-ac) = 412a921af1bd0011c2355af648bcadc2645f9dcb
-SHA1 (patch-ad) = 85bf15f630c8c285175d490d9fe2ba8859279852
+SHA1 (djbdns-1.05.tar.gz) = 2efdb3a039d0c548f40936aa9cb30829e0ce8c3d
+Size (djbdns-1.05.tar.gz) = 85648 bytes
+SHA1 (djbdns-1.05-man-20031023.tar.gz) = 3bac8a34a4bc681b9a0e603a77fa11492619e3ce
+Size (djbdns-1.05-man-20031023.tar.gz) = 17170 bytes
+SHA1 (djbdns-1.05-ipv6.diff.bz2) = 225484ea34f8cdefa501e22640c67d093d2f5169
+Size (djbdns-1.05-ipv6.diff.bz2) = 7306 bytes
+SHA1 (djbdns-1.05-ignoreip2.patch) = ec4281a6864bd044a84fbfcaaf42baa6b003976d
+Size (djbdns-1.05-ignoreip2.patch) = 3890 bytes
+SHA1 (patch-aa) = 8953486b88d57d003956c6fe2addea9bcd16e5aa
+SHA1 (patch-ab) = e14b7cba40d1dc7279c3ab04ede597277e2576d1
diff --git a/net/djbdns/options.mk b/net/djbdns/options.mk
new file mode 100644
index 00000000000..5372ceeecf5
--- /dev/null
+++ b/net/djbdns/options.mk
@@ -0,0 +1,23 @@
+PKG_OPTIONS_VAR=	PKG_OPTIONS.djbdns
+PKG_SUPPORTED_OPTIONS=	inet6 ignoreip2
+.include "../../mk/bsd.options.mk"
+
+###
+### Felix von Leitner's IPv6 patch
+###
+.if !empty(PKG_OPTIONS:Minet6)
+IPV6_PATCH=			djbdns-1.05-ipv6.diff.bz2
+PATCHFILES+=			${IPV6_PATCH}
+SITES_${IPV6_PATCH}=		http://www.fefe.de/dns/
+PATCH_DIST_STRIP.${IPV6_PATCH}=	-p1
+PLIST_SRC+=			${PKGDIR}/PLIST.inet6
+.endif
+
+###
+### Russ Nelson's patch to treat certain responses as NXDOMAIN
+###
+.if !empty(PKG_OPTIONS:Mignoreip2)
+IGNOREIP2_PATCH=		djbdns-1.05-ignoreip2.patch
+PATCHFILES+=			${IGNOREIP2_PATCH}
+SITES_${IGNOREIP2_PATCH}=	http://www.tinydns.org/
+.endif
diff --git a/net/djbdns/patches/patch-aa b/net/djbdns/patches/patch-aa
index a9c1982f40b..75621e240af 100644
--- a/net/djbdns/patches/patch-aa
+++ b/net/djbdns/patches/patch-aa
@@ -1,13 +1,22 @@
-$NetBSD: patch-aa,v 1.1 2000/12/29 16:42:55 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2004/09/01 20:07:35 schmonz Exp $
 
---- hier.c.orig	Thu Dec 28 16:35:18 2000
-+++ hier.c	Thu Dec 28 16:35:49 2000
-@@ -2,7 +2,7 @@
+--- dnscache-conf.c.orig	2001-02-11 16:11:45.000000000 -0500
++++ dnscache-conf.c
+@@ -89,13 +89,13 @@ int main(int argc,char **argv)
+   if (chdir(auto_home) == -1)
+     strerr_die4sys(111,FATAL,"unable to switch to ",auto_home,": ");
  
- void hier()
- {
--  c("/","etc","dnsroots.global",-1,-1,0644);
-+  c(auto_home,"etc","dnsroots.global",-1,-1,0644);
+-  fdrootservers = open_read("/etc/dnsroots.local");
++  fdrootservers = open_read(PKG_SYSCONFDIR"/dnsroots.local");
+   if (fdrootservers == -1) {
+     if (errno != error_noent)
+-      strerr_die2sys(111,FATAL,"unable to open /etc/dnsroots.local: ");
+-    fdrootservers = open_read("/etc/dnsroots.global");
++      strerr_die4sys(111,FATAL,"unable to open ",auto_home,PKG_SYSCONFDIR"/dnsroots.local: ");
++    fdrootservers = open_read(PKG_SYSCONFDIR"/dnsroots.global");
+     if (fdrootservers == -1)
+-      strerr_die2sys(111,FATAL,"unable to open /etc/dnsroots.global: ");
++      strerr_die4sys(111,FATAL,"unable to open ",auto_home,PKG_SYSCONFDIR"/dnsroots.global: ");
+   }
  
-   h(auto_home,-1,-1,02755);
-   d(auto_home,"bin",-1,-1,02755);
+   init(dir,FATAL);
diff --git a/net/djbdns/patches/patch-ab b/net/djbdns/patches/patch-ab
index 0e13e9742b1..3d3591c3e45 100644
--- a/net/djbdns/patches/patch-ab
+++ b/net/djbdns/patches/patch-ab
@@ -1,22 +1,18 @@
-$NetBSD: patch-ab,v 1.1 2000/12/29 16:42:55 hubertf Exp $
+$NetBSD: patch-ab,v 1.2 2004/09/01 20:07:35 schmonz 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,": ");
+--- hier.c.orig	2004-07-23 17:55:45.000000000 -0400
++++ hier.c
+@@ -2,10 +2,10 @@
  
--  fdrootservers = open_read("/etc/dnsroots.local");
-+  fdrootservers = open_read("etc/dnsroots.local");
-   if (fdrootservers == -1) {
-     if (errno != error_noent)
--      strerr_die2sys(111,FATAL,"unable to open /etc/dnsroots.local: ");
--    fdrootservers = open_read("/etc/dnsroots.global");
-+      strerr_die4sys(111,FATAL,"unable to open ",auto_home,"/etc/dnsroots.local: ");
-+    fdrootservers = open_read("etc/dnsroots.global");
-     if (fdrootservers == -1)
--      strerr_die2sys(111,FATAL,"unable to open /etc/dnsroots.global: ");
-+      strerr_die4sys(111,FATAL,"unable to open ",auto_home,"/etc/dnsroots.global: ");
-   }
+ void hier()
+ {
+-  c("/","etc","dnsroots.global",-1,-1,0644);
++  c(auto_home,"share/examples/djbdns","dnsroots.global",-1,-1,0644);
  
-   init(dir,FATAL);
+-  h(auto_home,-1,-1,02755);
+-  d(auto_home,"bin",-1,-1,02755);
++  h(auto_home,-1,-1,0755);
++  d(auto_home,"bin",-1,-1,0755);
+ 
+   c(auto_home,"bin","dnscache-conf",-1,-1,0755);
+   c(auto_home,"bin","tinydns-conf",-1,-1,0755);
diff --git a/net/djbdns/patches/patch-ac b/net/djbdns/patches/patch-ac
deleted file mode 100644
index 87a8cda5a03..00000000000
--- a/net/djbdns/patches/patch-ac
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2003/09/24 03:28:14 schmonz Exp $
-
---- dnscache.c.orig	Sun Feb 11 16:11:45 2001
-+++ dnscache.c
-@@ -23,6 +23,8 @@
- #include "okclient.h"
- #include "droproot.h"
- 
-+stralloc ignoreip = {0};
-+
- static int packetquery(char *buf,unsigned int len,char **q,char qtype[2],char qclass[2],char id[2])
- {
-   unsigned int pos;
-@@ -389,6 +391,7 @@ char seed[128];
- int main()
- {
-   char *x;
-+  unsigned int i, j, k;
-   unsigned long cachesize;
- 
-   x = env_get("IP");
-@@ -430,6 +433,20 @@ int main()
-   scan_ulong(x,&cachesize);
-   if (!cache_init(cachesize))
-     strerr_die3x(111,FATAL,"not enough memory for cache of size ",x);
-+
-+  if (openreadclose("ignoreip",&ignoreip,64) < 0) 
-+    strerr_die2x(111,FATAL,"trouble reading ignoreip");
-+  for(j = k = i = 0; i < ignoreip.len; i++)
-+    if (ignoreip.s[i] == '\n')  {
-+      ignoreip.s[i] = '\0';
-+      if (j + 4 > i)
-+        strerr_die3x(111,FATAL,"badly malformed ip4 address ",ignoreip.s+k);
-+      if (!ip4_scan(ignoreip.s+k,ignoreip.s+j))
-+        strerr_die3x(111,FATAL,"unable to parse address in ignoreip ",ignoreip.s+k);
-+      j += 4;
-+      k = i + 1;
-+    }
-+  ignoreip.len = j;
- 
-   if (env_get("HIDETTL"))
-     response_hidettl();
diff --git a/net/djbdns/patches/patch-ad b/net/djbdns/patches/patch-ad
deleted file mode 100644
index 8068b8d283b..00000000000
--- a/net/djbdns/patches/patch-ad
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2003/09/24 03:28:14 schmonz Exp $
-
---- query.c.orig	Wed Sep 17 11:42:42 2003
-+++ query.c
-@@ -13,6 +13,8 @@
- #include "response.h"
- #include "query.h"
- 
-+extern stralloc ignoreip;
-+
- static int flagforwardonly = 0;
- 
- void query_forwardonly(void)
-@@ -193,6 +195,7 @@ static int doit(struct query *z,int stat
-   int k;
-   int p;
-   int q;
-+  unsigned int ii;
- 
-   errno = error_io;
-   if (state == 1) goto HAVEPACKET;
-@@ -795,6 +798,9 @@ static int doit(struct query *z,int stat
-         pos = dns_packet_copy(buf,len,pos,header,10); if (!pos) goto DIE;
-         if (byte_equal(header + 8,2,"\0\4")) {
-           pos = dns_packet_copy(buf,len,pos,header,4); if (!pos) goto DIE;
-+          if (ignoreip.len)
-+	    for(ii = 0; ii < ignoreip.len; ii+= 4)
-+	      if (byte_equal(header,4,ignoreip.s+ii)) goto NXDOMAIN;
-           save_data(header,4);
-           log_rr(whichserver,t1,DNS_T_A,header,4,ttl);
-         }