- Update to 1.2.01

PR:		ports/91994
Submitted by:	Alex Kapranoff <kappa@rambler-co.ru> (maintainer)

6 files changed, 220 insertions, 122 deletions

diff --git a/dns/maradns/Makefile b/dns/maradns/Makefile
index 904086682ef0..8dafac2e9197 100644
--- a/dns/maradns/Makefile
+++ b/dns/maradns/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	maradns
-PORTVERSION=	1.0.30
+PORTVERSION=	1.2.01
 CATEGORIES=	dns
-MASTER_SITES=	http://www.maradns.org/download/ \
-		http://maradns.3va.net/download/ \
+MASTER_SITES=	http://www.maradns.org/download/1.2/${PORTVERSION}/ \
 		http://kapranoff.ru/~kappa/files/
 
 MAINTAINER=	alex@kapranoff.ru
@@ -24,9 +23,10 @@ USE_RC_SUBR=	yes
 RC_SCRIPTS_SUB=	PREFIX=${PREFIX} \
 		RC_SUBR=${RC_SUBR}
 
-MAN1=	askmara.1 getzone.1
-MAN5=	mararc.5
-MAN8=	maradns.8 zoneserver.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
+#MANLANG=	"" fr.ISO8859-1
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \
@@ -37,52 +37,68 @@ post-patch:
 		 s|-lpthread|${PTHREAD_LIBS}|g'
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/tools/askmara ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/server/maradns ${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/tuzona/getzone ${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/tuzona/zoneserver ${PREFIX}/sbin
-	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_mararc \
-		${PREFIX}/etc/mararc.sample
+	${INSTALL_PROGRAM} ${WRKSRC}/tcp/getzone ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/tcp/fetchzone ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/tcp/zoneserver ${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/tools/askmara ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/tools/duende ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/en/man/askmara.1 ${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/en/man/getzone.1 ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/en/man/mararc.5 ${MANPREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/doc/en/man/fetchzone.1 ${MANPREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/en/man/maradns.8 ${MANPREFIX}/man/man8
 	${INSTALL_MAN} ${WRKSRC}/doc/en/man/zoneserver.8 ${MANPREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/doc/en/man/duende.8 ${MANPREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/doc/en/man/mararc.5 ${MANPREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/doc/en/man/csv1.5 ${MANPREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/doc/en/man/csv2.5 ${MANPREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/doc/en/man/csv2_txt.5 ${MANPREFIX}/man/man5
+#	@${MKDIR} ${MANPREFIX}/man/fr.ISO8859-1/man1
+#	@${MKDIR} ${MANPREFIX}/man/fr.ISO8859-1/man5
+#	@${MKDIR} ${MANPREFIX}/man/fr.ISO8859-1/man8
+#	${INSTALL_MAN} ${WRKSRC}/doc/fr/man/askmara.1 ${MANPREFIX}/man/fr.ISO8859-1/man1
+#	${INSTALL_MAN} ${WRKSRC}/doc/fr/man/getzone.1 ${MANPREFIX}/man/fr.ISO8859-1/man1
+#	${INSTALL_MAN} ${WRKSRC}/doc/fr/man/csv1.5 ${MANPREFIX}/man/fr.ISO8859-1/man5
+#	${INSTALL_MAN} ${WRKSRC}/doc/fr/man/mararc.5 ${MANPREFIX}/man/fr.ISO8859-1/man5
+#	${INSTALL_MAN} ${WRKSRC}/doc/fr/man/maradns.8 ${MANPREFIX}/man/fr.ISO8859-1/man8
+#	${INSTALL_MAN} ${WRKSRC}/doc/fr/man/zoneserver.8 ${MANPREFIX}/man/fr.ISO8859-1/man8
+	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_full_mararc \
+ 		${PREFIX}/etc/mararc.sample
 	${MKDIR} ${PREFIX}/etc/maradns
-	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_csv1 \
-		${PREFIX}/etc/maradns/example_csv1
+	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_csv2 \
+ 		${PREFIX}/etc/maradns/example_csv2
 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		'-e s!%%SERVICE%%!maradns!g' \
-		${FILESDIR}/rc_d.sh > ${PREFIX}/etc/rc.d/maradns.sh
+ 		'-e s!%%SERVICE%%!maradns!g' \
+ 		${FILESDIR}/rc_d.sh > ${PREFIX}/etc/rc.d/maradns.sh
 	@${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \
-		'-e s!%%SERVICE%%!zoneserver!g' \
-		${FILESDIR}/rc_d.sh > ${PREFIX}/etc/rc.d/zoneserver.sh
+ 		'-e s!%%SERVICE%%!zoneserver!g' \
+ 		${FILESDIR}/rc_d.sh > ${PREFIX}/etc/rc.d/zoneserver.sh
 	@${CHMOD} 755 ${PREFIX}/etc/rc.d/maradns.sh
 	@${CHMOD} 755 ${PREFIX}/etc/rc.d/zoneserver.sh
-
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/* \
+ 		${EXAMPLESDIR}
+	@${MKDIR} ${EXAMPLESDIR}/fr
+	${INSTALL_DATA} ${WRKSRC}/doc/fr/examples/* \
+ 		${EXAMPLESDIR}/fr
 .ifndef(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}/en/misc/spammers/hiddenonline
-	${INSTALL_DATA} ${WRKSRC}/00README.FIRST ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/en/QuickStart ${DOCSDIR}/en
-	${INSTALL_DATA} ${WRKSRC}/doc/en/README ${DOCSDIR}/en
-	${INSTALL_DATA} ${WRKSRC}/doc/en/faq.* ${DOCSDIR}/en
-	@${MKDIR} ${DOCSDIR}/en/examples
-	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_* \
-		${DOCSDIR}/en/examples
-	${INSTALL_DATA} ${WRKSRC}/doc/en/misc/0README ${DOCSDIR}/en/misc
-	${INSTALL_DATA} ${WRKSRC}/doc/en/misc/recursive-case-insensitive \
-		${DOCSDIR}/en/misc
-	${INSTALL_DATA} ${WRKSRC}/doc/en/*.* ${DOCSDIR}/en/misc
-	${INSTALL_DATA} ${WRKSRC}/doc/en/misc/spammers/*.* \
-		${DOCSDIR}/en/misc/spammers
-	${INSTALL_DATA} ${WRKSRC}/doc/en/misc/spammers/hiddenonline/*.* \
-		${DOCSDIR}/en/misc/spammers/hiddenonline
-	@${MKDIR} ${DOCSDIR}/en/tutorial
-	${INSTALL_DATA} ${WRKSRC}/doc/en/tutorial/*.* ${DOCSDIR}/en/tutorial
-	@${MKDIR} ${DOCSDIR}/fr/tutorial
-	${INSTALL_DATA} ${WRKSRC}/doc/fr/QuickStart ${DOCSDIR}/fr
-	${INSTALL_DATA} ${WRKSRC}/doc/fr/faq.* ${DOCSDIR}/fr
-	${INSTALL_DATA} ${WRKSRC}/doc/fr/tutorial/*.* ${DOCSDIR}/fr/tutorial
+	@${MKDIR} ${DOCSDIR}/en
+	${INSTALL_DATA} ${WRKSRC}/doc/en/*.* \
+ 		${DOCSDIR}/en
+	${INSTALL_DATA} ${WRKSRC}/doc/en/QuickStart \
+ 		${DOCSDIR}/en
+	${INSTALL_DATA} ${WRKSRC}/doc/en/README \
+ 		${DOCSDIR}/en
+	${CP} -R ${WRKSRC}/doc/en/misc ${DOCSDIR}/en
+	${CP} -R ${WRKSRC}/doc/en/pdf ${DOCSDIR}/en
+	${CP} -R ${WRKSRC}/doc/en/tutorial ${DOCSDIR}/en
+	${CP} -R ${WRKSRC}/doc/en/text ${DOCSDIR}/en
+	@${MKDIR} ${DOCSDIR}/fr
+	${INSTALL_DATA} ${WRKSRC}/doc/fr/*.* \
+ 		${DOCSDIR}/fr
+	${INSTALL_DATA} ${WRKSRC}/doc/fr/QuickStart \
+ 		${DOCSDIR}/fr
+	${CP} -R ${WRKSRC}/doc/fr/tutorial ${DOCSDIR}/fr
 .endif
 
 .include <bsd.port.mk>
diff --git a/dns/maradns/distinfo b/dns/maradns/distinfo
index a60cdca0fddc..262133bff743 100644
--- a/dns/maradns/distinfo
+++ b/dns/maradns/distinfo
@@ -1,2 +1,3 @@
-MD5 (maradns-1.0.30.tar.bz2) = b80820f54a73595a3ce37391af59f5ce
-SIZE (maradns-1.0.30.tar.bz2) = 469297
+MD5 (maradns-1.2.01.tar.bz2) = d87bf0879218de4cbfb6cdfebd8eec2d
+SHA256 (maradns-1.2.01.tar.bz2) = 7c0cb17acb52033f67afeda01e4f3f0823e7f87ab208ddf1dc4b7439332f2749
+SIZE (maradns-1.2.01.tar.bz2) = 741261
diff --git a/dns/maradns/files/patch-configure b/dns/maradns/files/patch-configure
deleted file mode 100644
index 99aac62ddeb3..000000000000
--- a/dns/maradns/files/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
-Unneeded confusion for users.
-
---- configure.orig	Wed Jun  5 19:14:27 2002
-+++ configure	Wed Jun  5 19:15:32 2002
-@@ -61,9 +61,7 @@
- elif echo $UNAME | grep -i freebsd > /dev/null ; then
- 	cat $BUILDDIR/Makefile.linux >> Makefile
- 	echo It looks like you are using FreeBSD\; this should compile
--	echo fine by typing in \'make\'.  There is an official port here:
--	echo
--	echo	http://www.freebsd.org/cgi/query-pr.cgi?pr=28389
-+	echo fine by typing in \'make\'.
- elif echo $UNAME | grep -i openbsd > /dev/null ; then
- 	cat $BUILDDIR/Makefile.linux >> Makefile
- 	echo It looks like you are using OpenBSD\; please read doc/faq.txt
diff --git a/dns/maradns/files/patch-example_mararc b/dns/maradns/files/patch-example_full_mararc
index 7b9ef043c3e1..9b09fb0ad786 100644
--- a/dns/maradns/files/patch-example_mararc
+++ b/dns/maradns/files/patch-example_full_mararc
@@ -1,12 +1,13 @@
---- doc/en/examples/example_mararc.orig	Wed Jan 16 14:53:53 2002
-+++ doc/en/examples/example_mararc	Mon Jan 28 20:16:41 2002
-@@ -29,7 +29,9 @@
+--- doc/en/examples/example_full_mararc.orig	Thu Dec 22 16:10:23 2005
++++ doc/en/examples/example_full_mararc	Thu Dec 22 16:10:40 2005
+@@ -16,9 +16,9 @@
  # The directory with all of the zone files
  chroot_dir = "/etc/maradns"
  # The numeric UID MaraDNS will run as
 -maradns_uid = 99
 +maradns_uid = 53
-+# The (optional) numeric GID MaraDNS will run as
+ # The (optional) numeric GID MaraDNS will run as
+-# maradns_gid = 99
 +maradns_gid = 53
  # The maximum number of threads (or processes, with the zone server)
  # MaraDNS is allowed to run
diff --git a/dns/maradns/files/patch-parse::Makefile b/dns/maradns/files/patch-parse::Makefile
deleted file mode 100644
index 5d34803d0f09..000000000000
--- a/dns/maradns/files/patch-parse::Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
---- parse/Makefile.orig	Tue Nov 11 14:58:11 2003
-+++ parse/Makefile	Tue Nov 11 15:00:26 2003
-@@ -1,7 +1,7 @@
- JOBJS=../libs/JsStr.o ../libs/JsStrOS.o ../libs/JsStrCP.o 
- MJOBJS=../libs/MaraHash.o
- POBJECTS=ParseMaraRc.o ParseCsv1.o ParseIpAcl.o
--DOBJECTS=../dns/Queries.o ../dns/Compress.o ../dns/bobbit.o ../dns/Decompress.o ../server/timestamp.o
-+DOBJECTS=../dns/Queries.o ../dns/Compress.o ../dns/bobbit.o ../dns/Decompress.o
- OBJECTS=$(JOBJS) $(MJOBJS) $(POBJECTS) $(DOBJECTS)
- EXECS=parsetest parsetest2
- 
-@@ -25,9 +25,9 @@
- ParseIpAcl.o: ParseIpAcl.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
- 	$(CC) -c $(FLAGS) -o ParseIpAcl.o ParseIpAcl.c
- 
--parsetest: parsetest.c $(OBJECTS) 
--	$(CC) $(FLAGS) -o parsetest parsetest.c $(OBJECTS) 
-+parsetest: parsetest.c $(OBJECTS) ../server/timestamp.o
-+	$(CC) $(FLAGS) -o parsetest parsetest.c $(OBJECTS) timestamp.o 
- 
--parsetest2: parsetest2.c $(OBJECTS) 
--	$(CC) $(FLAGS) -o parsetest2 parsetest2.c $(OBJECTS) 
-+parsetest2: parsetest2.c $(OBJECTS) ../server/timestamp.o
-+	$(CC) $(FLAGS) -o parsetest2 parsetest2.c $(OBJECTS) timestamp.o
- 
diff --git a/dns/maradns/pkg-plist b/dns/maradns/pkg-plist
index b32ffdc925cd..73586f7d7ada 100644
--- a/dns/maradns/pkg-plist
+++ b/dns/maradns/pkg-plist
@@ -1,56 +1,158 @@
 @comment $FreeBSD$
 bin/askmara
+bin/duende
+bin/getzone
+bin/fetchzone
 etc/mararc.sample
 etc/rc.d/maradns.sh
 etc/rc.d/zoneserver.sh
-etc/maradns/example_csv1
+etc/maradns/example_csv2
 @unexec rmdir %D/etc/maradns 2>/dev/null || true
-sbin/getzone
 sbin/maradns
 sbin/zoneserver
-%%PORTDOCS%%%%DOCSDIR%%/00README.FIRST
-%%PORTDOCS%%%%DOCSDIR%%/en/QuickStart
-%%PORTDOCS%%%%DOCSDIR%%/en/README
-%%PORTDOCS%%%%DOCSDIR%%/en/examples/example_authoritative_mararc.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/examples/example_csv1
-%%PORTDOCS%%%%DOCSDIR%%/en/examples/example_csv1.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/examples/example_full_mararc
-%%PORTDOCS%%%%DOCSDIR%%/en/examples/example_mararc
-%%PORTDOCS%%%%DOCSDIR%%/en/examples/example_mararc.orig
-%%PORTDOCS%%%%DOCSDIR%%/en/examples/example_recursive_mararc.txt
+%%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/misc/0README
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/changelog.html
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/changelog.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/credits.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/faq.txt
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/files.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/files.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/QuickStart
+%%PORTDOCS%%%%DOCSDIR%%/en/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/man_macros/README
+%%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/js-manpages/README
+%%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_copy.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_create.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_getline_stdin.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_get_encode.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_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_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_unlock.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_val.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_write.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_alloc.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/rfc/rfc1035.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/how.to.support.sql
+%%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/spammers/azmalink.net
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/spammers/hiddenonline/google.search
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/spammers/hiddenonline/hiddenonline.spam
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/spammers/hiddenonline/whois.dimeit.com
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/spammers/hiddenonline/whois.hiddenonline.net
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/recursive.algorithm
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/resolution.algorithm
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/rfc1034.notes.abw
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/RFC1035.compliance
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/setup.bind.djbdns.axfr.test
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/vim.cheatsheet
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/0README
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/year_2038_statement.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/cache.poison.protection
+%%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/pdf/Makefile
+%%PORTDOCS%%%%DOCSDIR%%/en/pdf/manpage_reference.pdf
+%%PORTDOCS%%%%DOCSDIR%%/en/pdf/README
+%%PORTDOCS%%%%DOCSDIR%%/en/pdf/tmac.an.patch
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/dnsintro.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.csv2.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.mararc.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.maradns.html
 %%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/recursive.html
 %%PORTDOCS%%%%DOCSDIR%%/en/tutorial/glossary.html
-%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.csv1.html
-%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.maradns.html
-%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.mararc.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/make.index
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/Makefile
 %%PORTDOCS%%%%DOCSDIR%%/en/tutorial/recordtypes.html
-%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/recursive.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/dangling.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/default_zonefile.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/dnstcp.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.duende.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/dnsmaster.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.csv2_txt.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/update.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/dnsslave.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/quick_start.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.askmara.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.fetchzone.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.zoneserver.html
 %%PORTDOCS%%%%DOCSDIR%%/en/tutorial/tutorial.html
-%%PORTDOCS%%%%DOCSDIR%%/fr/QuickStart
+%%PORTDOCS%%%%DOCSDIR%%/en/text/dnsintro.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/compile.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/Makefile
+%%PORTDOCS%%%%DOCSDIR%%/en/text/authoritative.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/convert.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/recursive.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/glossary.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/recordtypes.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/dangling.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/default_zonefile.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/dnstcp.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/man.duende.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/dnsmaster.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/man.csv2_txt.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/man.csv2.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/dnsslave.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/update.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/man.askmara.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/man.fetchzone.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/man.zoneserver.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/man.maradns.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/man.mararc.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/quick_start.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/tutorial.txt
 %%PORTDOCS%%%%DOCSDIR%%/fr/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/fr/faq.txt
-%%PORTDOCS%%%%DOCSDIR%%/fr/tutorial/authoritative.html
+%%PORTDOCS%%%%DOCSDIR%%/fr/QuickStart
+%%PORTDOCS%%%%DOCSDIR%%/fr/tutorial/tutorial.html
 %%PORTDOCS%%%%DOCSDIR%%/fr/tutorial/compile.html
 %%PORTDOCS%%%%DOCSDIR%%/fr/tutorial/convert.html
 %%PORTDOCS%%%%DOCSDIR%%/fr/tutorial/glossary.html
+%%PORTDOCS%%%%DOCSDIR%%/fr/tutorial/Makefile
 %%PORTDOCS%%%%DOCSDIR%%/fr/tutorial/man.askmara.html
 %%PORTDOCS%%%%DOCSDIR%%/fr/tutorial/man.csv1.html
 %%PORTDOCS%%%%DOCSDIR%%/fr/tutorial/man.getzone.html
@@ -58,13 +160,31 @@ sbin/zoneserver
 %%PORTDOCS%%%%DOCSDIR%%/fr/tutorial/man.mararc.html
 %%PORTDOCS%%%%DOCSDIR%%/fr/tutorial/man.zoneserver.html
 %%PORTDOCS%%%%DOCSDIR%%/fr/tutorial/recursive.html
-%%PORTDOCS%%%%DOCSDIR%%/fr/tutorial/tutorial.html
+%%PORTDOCS%%%%DOCSDIR%%/fr/tutorial/authoritative.html
+%%EXAMPLESDIR%%/Makefile
+%%EXAMPLESDIR%%/example_authoritative_mararc.txt
+%%EXAMPLESDIR%%/example_csv1
+%%EXAMPLESDIR%%/example_csv1.txt
+%%EXAMPLESDIR%%/example_csv2
+%%EXAMPLESDIR%%/example_full_mararc
+%%EXAMPLESDIR%%/example_full_mararc.orig
+%%EXAMPLESDIR%%/example_mararc
+%%EXAMPLESDIR%%/example_recursive_mararc.txt
+%%EXAMPLESDIR%%/fr/Makefile
+%%EXAMPLESDIR%%/fr/example_csv1
+%%EXAMPLESDIR%%/fr/example_mararc
+@dirrm %%EXAMPLESDIR%%/fr
+@dirrm %%EXAMPLESDIR%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/fr/tutorial
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/fr
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/text
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/pdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/en/tutorial
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/misc/spammers/hiddenonline
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/misc/spammers
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/misc/rfc
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/misc/man_macros
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/misc/js-manpages
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/misc/csv2-1.4-ideas
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/misc/compression
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/en/misc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/examples
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/en
 %%PORTDOCS%%@dirrm %%DOCSDIR%%