4 files changed, 49 insertions, 31 deletions

diff --git a/dns/maradns/Makefile b/dns/maradns/Makefile
index f62014874838..1bcc9bd49343 100644
--- a/dns/maradns/Makefile
+++ b/dns/maradns/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	maradns
-PORTVERSION=	0.8.06
+PORTVERSION=	0.8.16
 CATEGORIES=	net
 MASTER_SITES=	http://www.maradns.org/download/ \
 		ftp://ftp.nuug.no/pub/anders/distfiles/
@@ -18,11 +18,13 @@ USE_BZIP2=	yes
 MAN1=	askmara.1 getzone.1
 MAN8=	maradns.8 zoneserver.8
 
-DOCS=	RFC1035.compliance csv1.format draft-skwan-utf8-dns-05.txt \
-	example_csv1 example_mararc faq.txt handling.compression \
-	mararc.format multiple.qdcount recursive-case-insensitive \
-	recursive.algorithm resolution.algorithm rfc2044.txt rtest.output \
-	www.monty.de ../0QuickStart ../CHANGELOG.html ../ROADMAP ../CREDITS
+DDOCS=	RFC1035.compliance cache.poison.protection csv1.format \
+	draft-skwan-utf8-dns-05.txt example_full_mararc faq.html \
+	firewall.configuration handling.compression mararc.format \
+	multiple.qdcount recursive-case-insensitive recursive.algorithm \
+	resolution.algorithm rfc2044.txt rtest.output www.monty.de
+DOCS=	example_csv1 example_mararc faq.txt ../0QuickStart ../CHANGELOG.html \
+	../TODO.done ../TODO.first ../TODO.second ../changelog.html ../CREDITS
 
 FIXPREFIX=	00QuickStart CHANGELOG.html doc/man/maradns.8 doc/faq.txt \
 		doc/man/zoneserver.8 parse/ParseMaraRc.c doc/example_mararc
@@ -44,7 +46,14 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/man/askmara.1 ${PREFIX}/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/man/getzone.1 ${PREFIX}/man/man1
 .if !defined(NOPORTDOCS)
-	${INSTALL} -d -o root -g wheel -m 0755 ${PREFIX}/share/doc/maradns
+	${INSTALL} -d -o root -g wheel -m 0755 \
+		${PREFIX}/share/doc/maradns/detailed/spammers
+	${INSTALL_DATA} ${WRKSRC}/doc/detailed/spammers/azmalink.net \
+		${PREFIX}/share/doc/maradns/detailed/spammers
+.for f in ${DDOCS}
+	${INSTALL_DATA} ${WRKSRC}/doc/detailed/${f} \
+		${PREFIX}/share/doc/maradns/detailed
+.endfor
 .for f in ${DOCS}
 	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${PREFIX}/share/doc/maradns
 .endfor
diff --git a/dns/maradns/distinfo b/dns/maradns/distinfo
index 5370159e8d5e..c2c3d53b566a 100644
--- a/dns/maradns/distinfo
+++ b/dns/maradns/distinfo
@@ -1 +1 @@
-MD5 (maradns-0.8.06.tar.bz2) = e43b74eadc29e756ca1365a1c79586e5
+MD5 (maradns-0.8.16.tar.bz2) = e48afe22554e4830c76868cd95a16683
diff --git a/dns/maradns/files/patch-example_mararc b/dns/maradns/files/patch-example_mararc
index 7a2d721e623a..4cd7bb091fee 100644
--- a/dns/maradns/files/patch-example_mararc
+++ b/dns/maradns/files/patch-example_mararc
@@ -1,14 +1,13 @@
---- doc/example_mararc.orig	Sun Jul 22 21:20:30 2001
-+++ doc/example_mararc	Sun Jul 22 21:20:44 2001
-@@ -15,9 +15,9 @@
+--- doc/example_mararc.orig	Mon Aug 20 23:10:09 2001
++++ doc/example_mararc	Mon Aug 20 23:10:53 2001
+@@ -19,7 +19,9 @@
  # The directory with all of the zone files
- chroot_dir = "/etc/maradns"
+ chroot_dir = "/usr/local/etc/maradns"
  # The numeric UID MaraDNS will run as
 -maradns_uid = 99
 +maradns_uid = 53
- # The (optional) numeric GID MaraDNS will run as
--# maradns_gid = 99
++# The (optional) numeric GID MaraDNS will run as
 +maradns_gid = 53
- # The maximum number of processes MaraDNS is allowed to use
- maxprocs = 64
- 
+ # The maximum number of threads (or processes, with the zone server)
+ # MaraDNS is allowed to run
+ maxprocs = 96
diff --git a/dns/maradns/pkg-plist b/dns/maradns/pkg-plist
index f61e0616c9b6..ce162e7ffbc5 100644
--- a/dns/maradns/pkg-plist
+++ b/dns/maradns/pkg-plist
@@ -3,23 +3,33 @@ sbin/zoneserver
 sbin/getzone
 bin/askmara
 etc/mararc.sample
-%%PORTDOCS%%share/doc/maradns/RFC1035.compliance
-%%PORTDOCS%%share/doc/maradns/csv1.format
-%%PORTDOCS%%share/doc/maradns/draft-skwan-utf8-dns-05.txt
+%%PORTDOCS%%share/doc/maradns/detailed/spammers/azmalink.net
+%%PORTDOCS%%share/doc/maradns/detailed/RFC1035.compliance
+%%PORTDOCS%%share/doc/maradns/detailed/cache.poison.protection
+%%PORTDOCS%%share/doc/maradns/detailed/csv1.format
+%%PORTDOCS%%share/doc/maradns/detailed/draft-skwan-utf8-dns-05.txt
+%%PORTDOCS%%share/doc/maradns/detailed/example_full_mararc
+%%PORTDOCS%%share/doc/maradns/detailed/faq.html
+%%PORTDOCS%%share/doc/maradns/detailed/firewall.configuration
+%%PORTDOCS%%share/doc/maradns/detailed/handling.compression
+%%PORTDOCS%%share/doc/maradns/detailed/mararc.format
+%%PORTDOCS%%share/doc/maradns/detailed/multiple.qdcount
+%%PORTDOCS%%share/doc/maradns/detailed/recursive-case-insensitive
+%%PORTDOCS%%share/doc/maradns/detailed/recursive.algorithm
+%%PORTDOCS%%share/doc/maradns/detailed/resolution.algorithm
+%%PORTDOCS%%share/doc/maradns/detailed/rfc2044.txt
+%%PORTDOCS%%share/doc/maradns/detailed/rtest.output
+%%PORTDOCS%%share/doc/maradns/detailed/www.monty.de
 %%PORTDOCS%%share/doc/maradns/example_csv1
 %%PORTDOCS%%share/doc/maradns/example_mararc
 %%PORTDOCS%%share/doc/maradns/faq.txt
-%%PORTDOCS%%share/doc/maradns/handling.compression
-%%PORTDOCS%%share/doc/maradns/mararc.format
-%%PORTDOCS%%share/doc/maradns/multiple.qdcount
-%%PORTDOCS%%share/doc/maradns/recursive-case-insensitive
-%%PORTDOCS%%share/doc/maradns/recursive.algorithm
-%%PORTDOCS%%share/doc/maradns/resolution.algorithm
-%%PORTDOCS%%share/doc/maradns/rfc2044.txt
-%%PORTDOCS%%share/doc/maradns/rtest.output
-%%PORTDOCS%%share/doc/maradns/www.monty.de
 %%PORTDOCS%%share/doc/maradns/0QuickStart
-%%PORTDOCS%%share/doc/maradns/CHANGELOG.html
 %%PORTDOCS%%share/doc/maradns/CREDITS
-%%PORTDOCS%%share/doc/maradns/ROADMAP
+%%PORTDOCS%%share/doc/maradns/CHANGELOG.html
+%%PORTDOCS%%share/doc/maradns/TODO.done
+%%PORTDOCS%%share/doc/maradns/TODO.first
+%%PORTDOCS%%share/doc/maradns/TODO.second
+%%PORTDOCS%%share/doc/maradns/changelog.html
+%%PORTDOCS%%@dirrm share/doc/maradns/detailed/spammers
+%%PORTDOCS%%@dirrm share/doc/maradns/detailed
 %%PORTDOCS%%@dirrm share/doc/maradns