Update maradns to 1.4.06.

   maradns-1.4.06:

   This is the stable branch of MaraDNS.

       * Fix for CVE-2011-0520
       * Deadwood updated to 3.0.02

     (2011.01.28)

   maradns-1.4.05:

   This is a stable branch of MaraDNS.

       * Deadwood updated to the stable 3.0.01 release.
       * MicroDNS now returns "not implemented" when given an EDNS packet
       * FAQ updated.

     (2010.09.25)

   maradns-1.4.04:

   This is the stable branch of MaraDNS.

       * Bugfix: NAPTR records now work when ~ is used to separate
         records
       * NAPTR records now documented
       * Bugfix: ANY queries now correctly work with NS referrals
       * Example IPv6 addresses now use RFC-4193 compliant IPs
       * Website updated to point out that Deadwood is now feature
         complete and ready for beta-testing
       * Some updates to the SQA regressions
       * Deadwood updated to Deadwood 2.9.02
       * Windows-only mkSecretTxt program added (*NIX users can
         just type in "dd if=/dev/urandom of=secret.txt bs=64
         count=1"; this gives Windows the same ability).

     (2010.07.31)

3 files changed, 15 insertions, 16 deletions

diff --git a/net/maradns/Makefile b/net/maradns/Makefile
index af918b65033..648b94f5afa 100644
--- a/net/maradns/Makefile
+++ b/net/maradns/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2010/06/25 21:40:32 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2011/05/06 11:36:23 obache Exp $
 
-DISTNAME=	maradns-1.4.03
-PKGREVISION=	1
+DISTNAME=	maradns-1.4.06
 CATEGORIES=	net
-MASTER_SITES=	http://www.maradns.org/download/1.4/${DISTNAME:S/maradns-//}/
+MASTER_SITES=	http://www.maradns.org/download/1.4/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -17,7 +16,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 HAS_CONFIGURE=		yes
 PTHREAD_OPTS+=		require
 PTHREAD_AUTO_VARS=	yes
-MAKE_ENV+=		LANGUAGE="en" PKGMANDIR=${PKGMANDIR:Q}
+MAKE_ENV+=		LANGUAGE="en"
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 \
 			${PKGMANDIR}/man8 sbin share/examples
@@ -25,10 +24,10 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 \
 .include "../../mk/pthread.buildlink3.mk"
 LDFLAGS+=	${PTHREAD_LIBS}
 
-post-patch:
-	@${SED} -e s,@@PKGSYSCONFDIR@@,${PKG_SYSCONFDIR},			\
-	    ${WRKSRC}/parse/ParseMaraRc.c > ${WRKSRC}/parse/ParseMaraRc.sed
-	@${MV} ${WRKSRC}/parse/ParseMaraRc.sed ${WRKSRC}/parse/ParseMaraRc.c
+SUBST_CLASSES+=		sysconf
+SUBST_STAGE.sysconf=	pre-configure
+SUBST_VARS.sysconf=	PKG_SYSCONFDIR
+SUBST_FILES.sysconf=	parse/ParseMaraRc.c
 
 post-install:
 	cd ${DESTDIR}${PREFIX}/share/doc/maradns && ${MV} examples ../../examples/maradns
diff --git a/net/maradns/distinfo b/net/maradns/distinfo
index 0e8e371a825..6cc8a9aeb50 100644
--- a/net/maradns/distinfo
+++ b/net/maradns/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.11 2010/05/23 17:30:31 schwarz Exp $
+$NetBSD: distinfo,v 1.12 2011/05/06 11:36:23 obache Exp $
 
-SHA1 (maradns-1.4.03.tar.bz2) = 3ffd296d6d6ee25206e44f08b6d9bd4845369d81
-RMD160 (maradns-1.4.03.tar.bz2) = 3c910e45b0d2ddcb8a879141ace51fffd7f95d50
-Size (maradns-1.4.03.tar.bz2) = 987147 bytes
+SHA1 (maradns-1.4.06.tar.bz2) = 7de7481512aec606b761c10f67d2da8fc808161b
+RMD160 (maradns-1.4.06.tar.bz2) = 160e0d3d64a29a5ae1c8262d6d80763a68ca7b2d
+Size (maradns-1.4.06.tar.bz2) = 1085986 bytes
 SHA1 (patch-aa) = 701ae5efa81273285fef83ec14b02476cb8ed36a
 SHA1 (patch-ab) = c3b5d86477f0d61434e7b6bed7859fa36741504e
 SHA1 (patch-ac) = 1031b4bb51f65a5cd8ca9a06ffced2ac3571873d
-SHA1 (patch-ad) = 1676c9d144fdca85163d40e3f27aebf8087e9e64
+SHA1 (patch-ad) = c67b25691d0c49553e9efcafaebd1caa6e957b90
 SHA1 (patch-ae) = a2494061247cc4919227622de3758d6c5c8cfd86
 SHA1 (patch-ai) = 7bf925bef4d0b9682af9ccea8779bab686987e2d
 SHA1 (patch-aj) = 1be1ad335a31d03d8def8d7bb74b7d45e814bd77
diff --git a/net/maradns/patches/patch-ad b/net/maradns/patches/patch-ad
index bfa2b4c63cb..9b01a4ecb65 100644
--- a/net/maradns/patches/patch-ad
+++ b/net/maradns/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.3 2010/05/23 17:30:31 schwarz Exp $
+$NetBSD: patch-ad,v 1.4 2011/05/06 11:36:24 obache Exp $
 
 --- parse/ParseMaraRc.c.orig	2010-05-23 17:51:12.000000000 +0200
 +++ parse/ParseMaraRc.c	2010-05-23 17:51:18.000000000 +0200
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.3 2010/05/23 17:30:31 schwarz Exp $
  
      /* Simple and secure: We look for it in /etc/mararc */
 -    return js_qstr2js(out,"/etc/mararc");
-+    return js_qstr2js(out,"@@PKGSYSCONFDIR@@/mararc");
++    return js_qstr2js(out,"@PKG_SYSCONFDIR@/mararc");
  
      }