- Convert to staging.

- Take maintainership.

2 files changed, 138 insertions, 134 deletions

diff --git a/dns/maradns/Makefile b/dns/maradns/Makefile
index 540b4e92b5bd..0f69fe245f18 100644
--- a/dns/maradns/Makefile
+++ b/dns/maradns/Makefile
@@ -6,7 +6,7 @@ PORTVERSION=	1.4.12
 CATEGORIES=	dns
 MASTER_SITES=	http://www.maradns.org/download/1.4/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	mat@FreeBSD.org
 COMMENT=	DNS server with focus on security and simplicity
 
 LICENSE=	BSD
@@ -21,11 +21,6 @@ USE_RC_SUBR=	${PORTNAME} zoneserver
 USERS=		bind
 GROUPS=		bind
 
-MAN1=		askmara.1 getzone.1 fetchzone.1
-MAN5=		mararc.5 csv1.5 csv2.5 csv2_txt.5
-MAN8=		maradns.8 zoneserver.8 duende.8
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-patch:
@@ -36,43 +31,43 @@ post-patch:
 		 s|^FLAGS =|#FLAGS =|g'
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/server/maradns ${PREFIX}/sbin
-	${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_PROGRAM} ${WRKSRC}/server/maradns ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/tcp/getzone ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/tcp/fetchzone ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/tcp/zoneserver ${STAGEDIR}${PREFIX}/sbin
+	${INSTALL_PROGRAM} ${WRKSRC}/tools/askmara ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/tools/duende ${STAGEDIR}${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/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
+	${INSTALL_MAN} ${WRKSRC}/doc/en/man/askmara.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/en/man/getzone.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/en/man/fetchzone.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/en/man/maradns.8 ${STAGEDIR}${MANPREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/doc/en/man/zoneserver.8 ${STAGEDIR}${MANPREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/doc/en/man/duende.8 ${STAGEDIR}${MANPREFIX}/man/man8
+	${INSTALL_MAN} ${WRKSRC}/doc/en/man/mararc.5 ${STAGEDIR}${MANPREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/doc/en/man/csv1.5 ${STAGEDIR}${MANPREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/doc/en/man/csv2.5 ${STAGEDIR}${MANPREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/doc/en/man/csv2_txt.5 ${STAGEDIR}${MANPREFIX}/man/man5
 
-	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_full_mararc ${PREFIX}/etc/mararc.sample
+	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_full_mararc ${STAGEDIR}${PREFIX}/etc/mararc.sample
 
-	${MKDIR} ${ETCDIR}/
-	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_csv2 ${ETCDIR}/example_csv2
-	${MKDIR} ${ETCDIR}/logger
+	${MKDIR} ${STAGEDIR}${ETCDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_csv2 ${STAGEDIR}${ETCDIR}/example_csv2
+	${MKDIR} ${STAGEDIR}${ETCDIR}/logger
 
 .if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}/
-	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/* ${EXAMPLESDIR}/
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	(cd ${WRKSRC}/doc/en/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 .endif
 .if ${PORT_OPTIONS:MDOCS}
-	@${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} ${STAGEDIR}${DOCSDIR}/en
+	${INSTALL_DATA} ${WRKSRC}/doc/en/*.* ${STAGEDIR}${DOCSDIR}/en
+	${INSTALL_DATA} ${WRKSRC}/doc/en/QuickStart ${STAGEDIR}${DOCSDIR}/en
+	${INSTALL_DATA} ${WRKSRC}/doc/en/README ${STAGEDIR}${DOCSDIR}/en
+	(cd ${WRKSRC}/doc/en && ${COPYTREE_SHARE} misc ${STAGEDIR}${DOCSDIR}/en)
+	(cd ${WRKSRC}/doc/en && ${COPYTREE_SHARE} pdf ${STAGEDIR}${DOCSDIR}/en)
+	(cd ${WRKSRC}/doc/en && ${COPYTREE_SHARE} tutorial ${STAGEDIR}${DOCSDIR}/en)
+	(cd ${WRKSRC}/doc/en && ${COPYTREE_SHARE} text ${STAGEDIR}${DOCSDIR}/en)
 .endif
 
 .include <bsd.port.mk>
diff --git a/dns/maradns/pkg-plist b/dns/maradns/pkg-plist
index bc5216cdb470..59c8563727eb 100644
--- a/dns/maradns/pkg-plist
+++ b/dns/maradns/pkg-plist
@@ -1,134 +1,144 @@
-bin/getzone
-bin/fetchzone
 bin/askmara
 bin/duende
-etc/mararc.sample
+bin/fetchzone
+bin/getzone
 %%ETCDIR%%/example_csv2
+etc/mararc.sample
+man/man1/askmara.1.gz
+man/man1/fetchzone.1.gz
+man/man1/getzone.1.gz
+man/man5/csv1.5.gz
+man/man5/csv2.5.gz
+man/man5/csv2_txt.5.gz
+man/man5/mararc.5.gz
+man/man8/duende.8.gz
+man/man8/maradns.8.gz
+man/man8/zoneserver.8.gz
 sbin/maradns
 sbin/zoneserver
+%%PORTDOCS%%%%DOCSDIR%%/en/QuickStart
+%%PORTDOCS%%%%DOCSDIR%%/en/README
 %%PORTDOCS%%%%DOCSDIR%%/en/changelog.txt
 %%PORTDOCS%%%%DOCSDIR%%/en/credits.txt
 %%PORTDOCS%%%%DOCSDIR%%/en/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/en/faq.txt
 %%PORTDOCS%%%%DOCSDIR%%/en/files.txt
-%%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/0README
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/csv2.regexmatch.functionlist
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/dns-record-types.txt
 %%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/README
-%%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_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_set_chsize.3
 %%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_has_sanity.3
-%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_read.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_get_encode.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_getline_stdin.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_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_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_show_stdout.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_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/js-manpages/js_val.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_write.3
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/multiple.qdcount
+%%PORTDOCS%%%%DOCSDIR%%/en/misc/propagation.txt
 %%PORTDOCS%%%%DOCSDIR%%/en/misc/recursive.algorithm
-%%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/vim.cheatsheet
 %%PORTDOCS%%%%DOCSDIR%%/en/misc/year_2038_statement.txt
-%%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/Makefile
+%%PORTDOCS%%%%DOCSDIR%%/en/pdf/README
 %%PORTDOCS%%%%DOCSDIR%%/en/pdf/tmac.an.patch
+%%PORTDOCS%%%%DOCSDIR%%/en/text/Makefile
+%%PORTDOCS%%%%DOCSDIR%%/en/text/authoritative.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/bind2csv2.txt
+%%PORTDOCS%%%%DOCSDIR%%/en/text/coding_style.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/troubleshoot.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/tutorial.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/authoritative.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/bind2csv2.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/coding_style.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/compile.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/convert.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/dangling.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/index.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/make.index
 %%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.askmara.html
-%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/bind2csv2.html
-%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/update.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.csv2.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/authoritative.html
-%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/index.html
-%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/troubleshoot.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.fetchzone.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.maradns.html
 %%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.mararc.html
-%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/quick_start.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/quick_start.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/recordtypes.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
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/troubleshoot.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/tutorial.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/update.html
+%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/win_service.html
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_authoritative_mararc.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_csv1
@@ -138,14 +148,13 @@ sbin/zoneserver
 %%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/text
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/en/tutorial
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/text
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/en/pdf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/en/misc/js-manpages
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/en/misc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/en
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry etc/maradns/logger
+@dirrmtry etc/maradns