Update to 0.9.09

PR:		34385
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

4 files changed, 101 insertions, 88 deletions

diff --git a/net/maradns/Makefile b/net/maradns/Makefile
index 05d461879586..277b6b6727cd 100644
--- a/net/maradns/Makefile
+++ b/net/maradns/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	maradns
-PORTVERSION=	0.9.01
+PORTVERSION=	0.9.09
 CATEGORIES=	net
 MASTER_SITES=	http://www.maradns.org/download/ \
 		ftp://ftp.nuug.no/pub/anders/distfiles/
@@ -17,18 +17,9 @@ USE_BZIP2=	yes
 MAKE_ENV=	FLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
 
 MAN1=	askmara.1 getzone.1
+MAN5=	mararc.5
 MAN8=	maradns.8 zoneserver.8
 
-DOCS=	../TODO.0.9.00 ../TODO.done ../TODO.first ../TODO.second \
-	../changelog.html ../old.changelog example_csv1 example_mararc \
-	faq.txt es/00Quickstart.es detailed/0QuickStart \
-	doc-fr/0QuickStart.fr doc-fr/faq-fr.txt
-DDOCS=	RFC1035.compliance cache.poison.protection csv1.format \
-	example_full_mararc faq.html firewall.configuration \
-	handling.compression how.to.support.sql mararc.format \
-	multiple.qdcount recursive-case-insensitive recursive.algorithm \
-	resolution.algorithm rtest.output www.monty.de
-
 post-patch:
 	@find ${WRKSRC} -type f | xargs ${PERL} -pi -e \
 		's|/etc/mara|${PREFIX}/etc/mara|g'
@@ -38,34 +29,47 @@ 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/example_mararc ${PREFIX}/etc/mararc.sample
-	${INSTALL_MAN} ${WRKSRC}/doc/man/askmara.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/man/getzone.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/man/maradns.8 ${PREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/doc/man/zoneserver.8 ${PREFIX}/man/man8
-.if !defined(NOPORTDOCS)
+	@${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_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/maradns.8 ${MANPREFIX}/man/man8
+	@${INSTALL_MAN} ${WRKSRC}/doc/en/man/zoneserver.8 ${MANPREFIX}/man/man8
+.ifndef(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
-.endfor
-	@${MKDIR} ${DOCSDIR}/detailed
-.for file in ${DDOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/detailed/${file} ${DOCSDIR}/detailed
-.endfor
-	@${MKDIR} ${DOCSDIR}/detailed/spammers
-	${INSTALL_DATA} ${WRKSRC}/doc/detailed/spammers/*.* \
-		${DOCSDIR}/detailed/spammers
-	@${MKDIR} ${DOCSDIR}/detailed/spammers/hiddenonline
-	${INSTALL_DATA} ${WRKSRC}/doc/detailed/spammers/hiddenonline/*.* \
-		${DOCSDIR}/detailed/spammers/hiddenonline
-	@${MKDIR} ${DOCSDIR}/examples
-	${INSTALL_DATA} ${WRKSRC}/doc/examples/*.* ${DOCSDIR}/examples
-	@${MKDIR} ${DOCSDIR}/tutorial
-	${INSTALL_DATA} ${WRKSRC}/doc/tutorial/*.* ${DOCSDIR}/tutorial
+	@${INSTALL_DATA} ${WRKSRC}/00README.FIRST ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/TODO.* ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/old.changelog ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}/en
+	@${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
+	@${MKDIR} ${DOCSDIR}/en/misc
+	@${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
+	@${MKDIR} ${DOCSDIR}/en/misc/spammers
+	@${INSTALL_DATA} ${WRKSRC}/doc/en/misc/spammers/*.* \
+		${DOCSDIR}/en/misc/spammers
+	@${MKDIR} ${DOCSDIR}/en/misc/spammers/hiddenonline
+	@${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
+	@${INSTALL_DATA} ${WRKSRC}/doc/fr/QuickStart ${DOCSDIR}/fr
+	@${INSTALL_DATA} ${WRKSRC}/doc/fr/faq.* ${DOCSDIR}/fr
+	@${MKDIR} ${DOCSDIR}/fr/tutorial
+	@${INSTALL_DATA} ${WRKSRC}/doc/fr/tutorial/*.* ${DOCSDIR}/fr/tutorial
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/maradns/distinfo b/net/maradns/distinfo
index 05c78642a327..cab01fad4435 100644
--- a/net/maradns/distinfo
+++ b/net/maradns/distinfo
@@ -1 +1 @@
-MD5 (maradns-0.9.01.tar.bz2) = b12783c5f70cf3051b7435b32a5c3443
+MD5 (maradns-0.9.09.tar.bz2) = dd8d3b942a80810bfaa1998f70b38c0c
diff --git a/net/maradns/files/patch-example_mararc b/net/maradns/files/patch-example_mararc
index c585b1401c3e..7b9ef043c3e1 100644
--- a/net/maradns/files/patch-example_mararc
+++ b/net/maradns/files/patch-example_mararc
@@ -1,5 +1,5 @@
---- doc/example_mararc.orig	Mon Nov 12 08:48:06 2001
-+++ doc/example_mararc	Tue Nov 27 23:29:36 2001
+--- 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 @@
  # The directory with all of the zone files
  chroot_dir = "/etc/maradns"
diff --git a/net/maradns/pkg-plist b/net/maradns/pkg-plist
index 91f86205d85b..774e56bed7b8 100644
--- a/net/maradns/pkg-plist
+++ b/net/maradns/pkg-plist
@@ -3,55 +3,64 @@ etc/mararc.sample
 sbin/getzone
 sbin/maradns
 sbin/zoneserver
-%%PORTDOCS%%share/doc/maradns/00Quickstart.es
-%%PORTDOCS%%share/doc/maradns/0QuickStart
-%%PORTDOCS%%share/doc/maradns/0QuickStart.fr
-%%PORTDOCS%%share/doc/maradns/TODO.0.9.00
+%%PORTDOCS%%share/doc/maradns/00README.FIRST
 %%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%%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/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/how.to.support.sql
-%%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/rtest.output
-%%PORTDOCS%%share/doc/maradns/detailed/spammers/azmalink.net
-%%PORTDOCS%%share/doc/maradns/detailed/spammers/hiddenonline/google.search
-%%PORTDOCS%%share/doc/maradns/detailed/spammers/hiddenonline/hiddenonline.spam
-%%PORTDOCS%%share/doc/maradns/detailed/spammers/hiddenonline/whois.dimeit.com
-%%PORTDOCS%%share/doc/maradns/detailed/spammers/hiddenonline/whois.hiddenonline.net
-%%PORTDOCS%%share/doc/maradns/detailed/www.monty.de
-%%PORTDOCS%%share/doc/maradns/example_csv1
-%%PORTDOCS%%share/doc/maradns/example_mararc
-%%PORTDOCS%%share/doc/maradns/examples/example_authoritative_mararc.txt
-%%PORTDOCS%%share/doc/maradns/examples/example_csv1.txt
-%%PORTDOCS%%share/doc/maradns/examples/example_recursive_mararc.txt
-%%PORTDOCS%%share/doc/maradns/faq.txt
-%%PORTDOCS%%share/doc/maradns/faq-fr.txt
+%%PORTDOCS%%share/doc/maradns/en/QuickStart
+%%PORTDOCS%%share/doc/maradns/en/README
+%%PORTDOCS%%share/doc/maradns/en/examples/example_authoritative_mararc.txt
+%%PORTDOCS%%share/doc/maradns/en/examples/example_csv1
+%%PORTDOCS%%share/doc/maradns/en/examples/example_csv1.txt
+%%PORTDOCS%%share/doc/maradns/en/examples/example_full_mararc
+%%PORTDOCS%%share/doc/maradns/en/examples/example_mararc
+%%PORTDOCS%%share/doc/maradns/en/examples/example_mararc.orig
+%%PORTDOCS%%share/doc/maradns/en/examples/example_recursive_mararc.txt
+%%PORTDOCS%%share/doc/maradns/en/faq.html
+%%PORTDOCS%%share/doc/maradns/en/faq.txt
+%%PORTDOCS%%share/doc/maradns/en/misc/0README
+%%PORTDOCS%%share/doc/maradns/en/misc/changelog.txt
+%%PORTDOCS%%share/doc/maradns/en/misc/credits.txt
+%%PORTDOCS%%share/doc/maradns/en/misc/faq.html
+%%PORTDOCS%%share/doc/maradns/en/misc/faq.txt
+%%PORTDOCS%%share/doc/maradns/en/misc/recursive-case-insensitive
+%%PORTDOCS%%share/doc/maradns/en/misc/spammers/azmalink.net
+%%PORTDOCS%%share/doc/maradns/en/misc/spammers/hiddenonline/google.search
+%%PORTDOCS%%share/doc/maradns/en/misc/spammers/hiddenonline/hiddenonline.spam
+%%PORTDOCS%%share/doc/maradns/en/misc/spammers/hiddenonline/whois.dimeit.com
+%%PORTDOCS%%share/doc/maradns/en/misc/spammers/hiddenonline/whois.hiddenonline.net
+%%PORTDOCS%%share/doc/maradns/en/tutorial/authoritative.html
+%%PORTDOCS%%share/doc/maradns/en/tutorial/compile.html
+%%PORTDOCS%%share/doc/maradns/en/tutorial/convert.html
+%%PORTDOCS%%share/doc/maradns/en/tutorial/glossary.html
+%%PORTDOCS%%share/doc/maradns/en/tutorial/man.csv1.html
+%%PORTDOCS%%share/doc/maradns/en/tutorial/man.maradns.html
+%%PORTDOCS%%share/doc/maradns/en/tutorial/man.mararc.html
+%%PORTDOCS%%share/doc/maradns/en/tutorial/recordtypes.html
+%%PORTDOCS%%share/doc/maradns/en/tutorial/recursive.html
+%%PORTDOCS%%share/doc/maradns/en/tutorial/tutorial.html
+%%PORTDOCS%%share/doc/maradns/fr/QuickStart
+%%PORTDOCS%%share/doc/maradns/fr/faq.html
+%%PORTDOCS%%share/doc/maradns/fr/faq.txt
+%%PORTDOCS%%share/doc/maradns/fr/tutorial/authoritative.html
+%%PORTDOCS%%share/doc/maradns/fr/tutorial/compile.html
+%%PORTDOCS%%share/doc/maradns/fr/tutorial/convert.html
+%%PORTDOCS%%share/doc/maradns/fr/tutorial/glossary.html
+%%PORTDOCS%%share/doc/maradns/fr/tutorial/man.askmara.html
+%%PORTDOCS%%share/doc/maradns/fr/tutorial/man.csv1.html
+%%PORTDOCS%%share/doc/maradns/fr/tutorial/man.getzone.html
+%%PORTDOCS%%share/doc/maradns/fr/tutorial/man.maradns.html
+%%PORTDOCS%%share/doc/maradns/fr/tutorial/man.mararc.html
+%%PORTDOCS%%share/doc/maradns/fr/tutorial/man.zoneserver.html
+%%PORTDOCS%%share/doc/maradns/fr/tutorial/recursive.html
+%%PORTDOCS%%share/doc/maradns/fr/tutorial/tutorial.html
 %%PORTDOCS%%share/doc/maradns/old.changelog
-%%PORTDOCS%%share/doc/maradns/tutorial/authoritative.html
-%%PORTDOCS%%share/doc/maradns/tutorial/compile.html
-%%PORTDOCS%%share/doc/maradns/tutorial/convert.html
-%%PORTDOCS%%share/doc/maradns/tutorial/glossary.html
-%%PORTDOCS%%share/doc/maradns/tutorial/man.csv1.html
-%%PORTDOCS%%share/doc/maradns/tutorial/man.maradns.html
-%%PORTDOCS%%share/doc/maradns/tutorial/man.mararc.html
-%%PORTDOCS%%share/doc/maradns/tutorial/recordtypes.html
-%%PORTDOCS%%share/doc/maradns/tutorial/recursive.html
-%%PORTDOCS%%share/doc/maradns/tutorial/tutorial.html
-%%PORTDOCS%%@dirrm share/doc/maradns/tutorial
-%%PORTDOCS%%@dirrm share/doc/maradns/examples
-%%PORTDOCS%%@dirrm share/doc/maradns/detailed/spammers/hiddenonline
-%%PORTDOCS%%@dirrm share/doc/maradns/detailed/spammers
-%%PORTDOCS%%@dirrm share/doc/maradns/detailed
+%%PORTDOCS%%@dirrm share/doc/maradns/fr/tutorial
+%%PORTDOCS%%@dirrm share/doc/maradns/fr
+%%PORTDOCS%%@dirrm share/doc/maradns/en/tutorial
+%%PORTDOCS%%@dirrm share/doc/maradns/en/misc/spammers/hiddenonline
+%%PORTDOCS%%@dirrm share/doc/maradns/en/misc/spammers
+%%PORTDOCS%%@dirrm share/doc/maradns/en/misc
+%%PORTDOCS%%@dirrm share/doc/maradns/en/examples
+%%PORTDOCS%%@dirrm share/doc/maradns/en
 %%PORTDOCS%%@dirrm share/doc/maradns