5 files changed, 140 insertions, 158 deletions

diff --git a/dns/maradns/Makefile b/dns/maradns/Makefile
index 94fe9bf70f98..621f131170f3 100644
--- a/dns/maradns/Makefile
+++ b/dns/maradns/Makefile
@@ -6,23 +6,22 @@
 #
 
 PORTNAME=	maradns
-PORTVERSION=	1.2.12.10
+PORTVERSION=	1.3.07.09
 CATEGORIES=	dns
-MASTER_SITES=	http://www.maradns.org/download/1.2/${PORTVERSION}/ \
+MASTER_SITES=	http://www.maradns.org/download/1.3/${PORTVERSION}/ \
 		http://gd.tuwien.ac.at/opsys/linux/gentoo/distfiles/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	DNS server with focus on security and simplicity
 
 REINPLACE_ARGS=	-i ""
-USE_BZIP2=	yes
 MAKE_ENV=	FLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
 
 USE_RC_SUBR=	${PORTNAME} zoneserver
 
-MAN1=	askmara.1 getzone.1 fetchzone.1
-MAN5=	mararc.5 csv1.5 csv2.5 csv2_txt.5
-MAN8=	maradns.8 zoneserver.8 duende.8
+MAN1=		askmara.1 getzone.1 fetchzone.1
+MAN5=		mararc.5 csv1.5 csv2.5 csv2_txt.5
+MAN8=		maradns.8 zoneserver.8 duende.8
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e 's|/etc/mara|${ETCDIR}|g'
diff --git a/dns/maradns/distinfo b/dns/maradns/distinfo
index 9b22e9ea0c36..2d7d188f83b2 100644
--- a/dns/maradns/distinfo
+++ b/dns/maradns/distinfo
@@ -1,3 +1,3 @@
-MD5 (maradns-1.2.12.10.tar.bz2) = a19cd5f52522af40bbf3882f64cb22db
-SHA256 (maradns-1.2.12.10.tar.bz2) = 20024f3b7ba77ca6673a9e7e8adaa05cb935ccc870ada97bb0f5e3974e886f72
-SIZE (maradns-1.2.12.10.tar.bz2) = 1062168
+MD5 (maradns-1.3.07.09.tar.gz) = 61a7c575e8491d825d8b85621becc34e
+SHA256 (maradns-1.3.07.09.tar.gz) = 226a4ed0a9696f5230c5eda80142afc6fa756111dac8ae484bb9a82bc1bcf373
+SIZE (maradns-1.3.07.09.tar.gz) = 1386748
diff --git a/dns/maradns/files/patch-tools_duende.c b/dns/maradns/files/patch-tools_duende.c
index 17b4fc5c1b65..8f6d02bd6193 100644
--- a/dns/maradns/files/patch-tools_duende.c
+++ b/dns/maradns/files/patch-tools_duende.c
@@ -1,5 +1,5 @@
---- tools/duende.c.orig	Sat Jun  2 13:40:35 2007
-+++ tools/duende.c	Sat Jun  2 13:41:01 2007
+--- tools/duende.c.orig	2008-08-03 20:10:49.000000000 +0200
++++ tools/duende.c	2009-09-23 01:57:16.000000000 +0200
 @@ -35,10 +35,13 @@
  #include <signal.h>
  #include <stdio.h>
@@ -14,23 +14,21 @@
  #include <unistd.h>
  #include "../MaraDns.h"
  
-@@ -139,6 +142,9 @@
+@@ -139,6 +142,10 @@
      int exit_status;
      pid_t pid, log_pid;
      int stream1[2]; /* Used for piping */
 +    struct pidfh *pfh;
 +    char *name;
 +    char *pidfile;
++
      if(argv[0] == NULL || argv[1] == NULL) {
          printf("Usage: duende [program] [arguments]\n");
- 	exit(1);
-@@ -202,7 +208,24 @@
- 	    log_helper(argv[1],stream1[0]);
+         exit(1);
+@@ -203,6 +210,23 @@
              syslog(LOG_ALERT,"log_helper finished, terminating\n");
- 	    exit(1);
--	    } 
-+	    }
-+        
+             exit(1);
+             }
 +        name = strrchr(argv[1], '/');
 +        if (name && *name != '\0') {
 +          pidfile = malloc(strlen("/var/run/") + strlen(name) + strlen(".pid") + 1);
@@ -47,6 +45,7 @@
 +            free(pidfile);
 +          }
 +        }
++
          for(;;) {
- 	    /* If we got a HUP signal, send it to the child */
- 	    if(got_hup_signal == 1) {
+             /* If we got a HUP signal, send it to the child */
+             if(got_hup_signal == 1) {
diff --git a/dns/maradns/pkg-descr b/dns/maradns/pkg-descr
index 1f7b2c2dbb91..a7604496fb97 100644
--- a/dns/maradns/pkg-descr
+++ b/dns/maradns/pkg-descr
@@ -1,19 +1,27 @@
-MaraDNS is a DNS server with the following features:
+MaraDNS is a package that implements the Domain Name Service (DNS), an
+essential internet service. MaraDNS has the following advantages: 
 
-* Security-aware programming. A DNS server needs to be secure. There is a
-number of security features in the code, including:
+o Secure. MaraDNS has a security history as good as or better than any other DNS
+  server. For example, MaraDNS has always randomized, using a secure random
+  number generator, the Query ID and source port of DNS queries; and was never
+  vulnerable to the "new" cache poisoning attack. 
 
-	1. The code uses a special string library which is resistant to buffer
-	overflows.
-	2. The code, if started as root, mandates running as an unprivileged
-	user in a chroot() jail.
+o Supported. MaraDNS has a long history of being maintained and updated.
+  Actively developed since 2001, MaraDNS continues to be fully supported: The
+  most recent release was done on August 4, 2009. Deadwood, the code that will
+  become part of MaraDNS 2.0, is frequently updated. 
 
-* Open-Source. This DNS server is public-domain code. There are no restrictions
-attached to this code.
+o Easy to use. A basic recursive configuration needs only a single three-line
+  configuration file. A basic authoritative configuration needs only a four-line
+  configuration file and a one-line zone file. MaraDNS is fully documented, with
+  both easy-to-follow tutorials and a complete and up-to-date reference manual. 
 
-* Simplicity. This DNS server has the minimum number of features needed to
-correctly act as an authoritative name server for a domain.
+o Small. MaraDNS is well suited for embedded applications and other environments
+  where the server must use the absolute minimum number of resources possible.
+  MaraDNS' binary is smaller than that of any other currently maintained
+  recursive DNS server. 
 
-WWW: http://www.maradns.org/
+o Open Source. MaraDNS is fully open-source, The license is a two-clause BSD
+  license that is almost identical to the FreeBSD license.
 
-- Anders Nordby <anders@fix.no>
+WWW: http://www.maradns.org/
diff --git a/dns/maradns/pkg-plist b/dns/maradns/pkg-plist
index 4502876e84ee..21594eacf05c 100644
--- a/dns/maradns/pkg-plist
+++ b/dns/maradns/pkg-plist
@@ -1,156 +1,134 @@
-@comment $FreeBSD$
-bin/askmara
-bin/duende
 bin/getzone
 bin/fetchzone
+bin/askmara
+bin/duende
 etc/mararc.sample
 %%ETCDIR%%/example_csv2
-@exec mkdir -p %D/%%ETCDIR%%/logger
-@dirrmtry %%ETCDIR%%/logger
-@dirrmtry %%ETCDIR%%
 sbin/maradns
 sbin/zoneserver
-%%PORTDOCS%%%%DOCSDIR%%/en/QuickStart
-%%PORTDOCS%%%%DOCSDIR%%/en/README
-%%PORTDOCS%%%%DOCSDIR%%/en/changelog.html
 %%PORTDOCS%%%%DOCSDIR%%/en/changelog.txt
 %%PORTDOCS%%%%DOCSDIR%%/en/credits.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/download.html
 %%PORTDOCS%%%%DOCSDIR%%/en/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/en/faq.txt
 %%PORTDOCS%%%%DOCSDIR%%/en/files.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/0README
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/RFC1035.compliance
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/advocacy/active.other
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/advocacy/bind9
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/advocacy/djbdns
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/advocacy/inactive
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/bind2csv2.design
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/cache.poison.protection
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/compression/decompress_api.abw
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/compression/decompress_api.html
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/compression/describing_dns_rrs.html
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/compression/handling.compression
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/csv2-1.4-ideas/csv2.brace.processing
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/csv2.regexmatch.functionlist
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/dns-record-types.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/how.maradns.stores.rrs
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/how.to.support.sql
+%%PORTDOCS%%%%DOCSDIR%%/en/QuickStart
+%%PORTDOCS%%%%DOCSDIR%%/en/README
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_getline_stdin.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_destroy.3
 %%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/README
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_alloc.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_append.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_atoi.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_buf_eof.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_buf_getline.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_buf_read.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_close.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_insert.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_val.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_octets.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_tolower.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_qstr2js.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_substr.3
 %%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_copy.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_create.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_write.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_open.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_open_write.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_nonmatch.3
 %%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_dealloc.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_destroy.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_destroy_force.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_fgrep.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_fgrep_offset.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_get_encode.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_getline_stdin.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_set_chsize.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_alloc.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_buf_eof.3
 %%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_has_sanity.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_insert.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_issame.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_read.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_buf_read.3
 %%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_js2str.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_length.3
 %%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_lock.3
 %%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_match.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_match_offset.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_newline_chars.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_nonmatch.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_nonmatch_offset.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_octets.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_open.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_open_append.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_open_read.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_open_write.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_qstr2js.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_read.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_set_chsize.3
 %%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_set_encode.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_show_stdout.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_issame.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_atoi.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_fgrep.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_fgrep_offset.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_append.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_destroy_force.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_close.3
 %%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_space_chars.3
 %%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_str2js.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_substr.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_tolower.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_show_stdout.3
 %%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_unlock.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_val.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_write.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/man_macros/README
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/man_macros/example_manpage.1
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/man_macros/man.macros
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/man_macros/man.macros.7
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/multiple.qdcount
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/private_rrs.abw
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/private_rrs.html
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/propagation.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/recursive-case-insensitive
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_match_offset.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_newline_chars.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_length.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_create.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_open_read.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_buf_getline.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_get_encode.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_open_append.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_nonmatch_offset.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/csv2.regexmatch.functionlist
 %%PORTDOCS%%%%DOCSDIR%%/en/misc/recursive.algorithm
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/resolution.algorithm
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/rfc1034.notes.abw
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/setup.bind.djbdns.axfr.test
 %%PORTDOCS%%%%DOCSDIR%%/en/misc/vim.cheatsheet
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/dns-record-types.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/setup.bind.djbdns.axfr.test
 %%PORTDOCS%%%%DOCSDIR%%/en/misc/year_2038_statement.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/pdf/Makefile
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/propagation.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/multiple.qdcount
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/0README
 %%PORTDOCS%%%%DOCSDIR%%/en/pdf/README
-%%PORTDOCS%%%%DOCSDIR%%/en/pdf/manpage_reference.pdf
+%%PORTDOCS%%%%DOCSDIR%%/en/pdf/Makefile
 %%PORTDOCS%%%%DOCSDIR%%/en/pdf/tmac.an.patch
-%%PORTDOCS%%%%DOCSDIR%%/en/text/Makefile
-%%PORTDOCS%%%%DOCSDIR%%/en/text/authoritative.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/text/compile.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/text/convert.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/text/dangling.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/text/default_zonefile.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/text/dnsintro.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/text/dnsmaster.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/text/dnsslave.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/text/dnstcp.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/text/glossary.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/text/man.askmara.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/text/man.csv2.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/text/man.csv2_txt.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/text/man.duende.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/text/man.fetchzone.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/text/man.maradns.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/text/man.mararc.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/text/man.zoneserver.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/text/quick_start.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/text/recordtypes.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/text/recursive.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/text/tutorial.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/text/update.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/text/win_service.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/00index.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/make.index
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/recordtypes.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.fetchzone.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.csv2.html
 %%PORTDOCS%%%%DOCSDIR%%/en/tutorial/Makefile
-%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/authoritative.html
-%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/compile.html
-%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/convert.html
-%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/dangling.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/tutorial.html
 %%PORTDOCS%%%%DOCSDIR%%/en/tutorial/default_zonefile.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/dnsslave.html
 %%PORTDOCS%%%%DOCSDIR%%/en/tutorial/dnsintro.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/coding_style.html
 %%PORTDOCS%%%%DOCSDIR%%/en/tutorial/dnsmaster.html
-%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/dnsslave.html
-%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/dnstcp.html
-%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/glossary.html
-%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/make.index
 %%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.askmara.html
-%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.csv2.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/bind2csv2.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/update.html
 %%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.csv2_txt.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/compile.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/glossary.html
 %%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.duende.html
-%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.fetchzone.html
-%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.maradns.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/authoritative.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/index.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/troubleshoot.html
 %%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.mararc.html
-%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.zoneserver.html
 %%PORTDOCS%%%%DOCSDIR%%/en/tutorial/quick_start.html
-%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/recordtypes.html
-%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/recursive.html
-%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/tutorial.html
-%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/update.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.zoneserver.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/convert.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/dangling.html
 %%PORTDOCS%%%%DOCSDIR%%/en/tutorial/win_service.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/dnstcp.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/recursive.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.maradns.html
+%%PORTDOCS%%%%DOCSDIR%%/en/text/recursive.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/authoritative.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/win_service.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/bind2csv2.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/compile.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/default_zonefile.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/man.csv2.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/Makefile
+%%PORTDOCS%%%%DOCSDIR%%/en/text/man.csv2_txt.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/dangling.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/quick_start.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/man.maradns.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/dnsslave.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/dnsmaster.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/man.mararc.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/man.fetchzone.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/dnsintro.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/convert.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/coding_style.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/update.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/man.askmara.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/troubleshoot.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/recordtypes.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/glossary.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/man.duende.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/tutorial.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/man.zoneserver.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/dnstcp.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_authoritative_mararc.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_csv1
@@ -159,16 +137,14 @@ sbin/zoneserver
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_full_mararc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_full_mararc.orig
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_mararc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_recursive_mararc.txt
+@exec mkdir -p %D/%%ETCDIR%%/logger
+@dirrmtry %%ETCDIR%%/logger
+@dirrmtry %%ETCDIR%%
 %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/misc/advocacy
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/misc/compression
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/misc/csv2-1.4-ideas
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/misc/js-manpages
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/misc/man_macros
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/misc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/pdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/en/text
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/en/tutorial
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/pdf
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/misc/js-manpages
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/misc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/en
 %%PORTDOCS%%@dirrm %%DOCSDIR%%