upgrade to 0.8.35

PR:		32627
Submitted by:	Ports Fury

12 files changed, 73 insertions, 141 deletions

diff --git a/dns/maradns/Makefile b/dns/maradns/Makefile
index 2c3ad8679d36..faec709f01f6 100644
--- a/dns/maradns/Makefile
+++ b/dns/maradns/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	maradns
-PORTVERSION=	0.8.16
+PORTVERSION=	0.8.35
 CATEGORIES=	net
 MASTER_SITES=	http://www.maradns.org/download/ \
 		ftp://ftp.nuug.no/pub/anders/distfiles/
@@ -14,49 +14,57 @@ MASTER_SITES=	http://www.maradns.org/download/ \
 MAINTAINER=	ports@FreeBSD.org
 
 USE_BZIP2=	yes
+MAKE_ENV=	FLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
 
 MAN1=	askmara.1 getzone.1
 MAN8=	maradns.8 zoneserver.8
 
-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 \
+DOCS=	../TODO.done ../TODO.first ../TODO.problem.hostnames ../TODO.second \
+	../changelog.html ../old.changelog 00Quickstart.es example_csv1 \
+	example_mararc faq.txt
+DDOCS=	0QuickStart 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 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
+	resolution.algorithm rtest.output www.monty.de
 
 post-patch:
-.for f in ${FIXPREFIX}
-	${PERL} -pi -e "s@/etc/maradns@${PREFIX}/etc/maradns@g; \
-		s@/etc/mararc@${PREFIX}/etc/mararc@g" ${WRKSRC}/${f}
-.endfor
+	@find ${WRKSRC} -type f | xargs ${PERL} -pi -e \
+		's|/etc/mara|${PREFIX}/etc/mara|g'
+	@find ${WRKSRC} -name '*Makefile*' | xargs ${PERL} -pi -e \
+		's|make|\$$\{MAKE\}|g ; \
+		 s|^FLAGS =|#FLAGS =|g ; \
+		 s|-lpthread|${PTHREAD_LIBS}|g'
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/server/maradns ${PREFIX}/sbin/
-	${INSTALL_PROGRAM} ${WRKSRC}/tuzona/zoneserver ${PREFIX}/sbin/
-	${INSTALL_PROGRAM} ${WRKSRC}/tuzona/getzone ${PREFIX}/sbin/
-	${INSTALL_PROGRAM} ${WRKSRC}/tools/askmara ${PREFIX}/bin/
+	${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/maradns.8 ${PREFIX}/man/man8/
-	${INSTALL_MAN} ${WRKSRC}/doc/man/zoneserver.8 ${PREFIX}/man/man8/
 	${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} -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
+	@${MKDIR} ${DOCSDIR}
+.for file in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
 .endfor
-.for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${PREFIX}/share/doc/maradns
+	@${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
 .endif
 
 .include <bsd.port.mk>
diff --git a/dns/maradns/distinfo b/dns/maradns/distinfo
index c2c3d53b566a..60f36393fbeb 100644
--- a/dns/maradns/distinfo
+++ b/dns/maradns/distinfo
@@ -1 +1 @@
-MD5 (maradns-0.8.16.tar.bz2) = e48afe22554e4830c76868cd95a16683
+MD5 (maradns-0.8.35.tar.bz2) = a2a47a31bcd71d48e7b1bbe26123ba03
diff --git a/dns/maradns/files/patch-dns-Makefile b/dns/maradns/files/patch-dns-Makefile
deleted file mode 100644
index 7ecb07c3745e..000000000000
--- a/dns/maradns/files/patch-dns-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- dns/Makefile.orig	Sun Jul 22 21:27:54 2001
-+++ dns/Makefile	Sun Jul 22 21:28:03 2001
-@@ -4,7 +4,7 @@
- OBJECTS=$(DOBJECTS) $(JOBJS) $(MJOBJS)
- 
- #FLAGS = -O2 -Wall
--FLAGS = -g
-+FLAGS = -g $(CFLAGS)
- 
- all: Queries.o Compress.o bobbit.o
- 
diff --git a/dns/maradns/files/patch-example_mararc b/dns/maradns/files/patch-example_mararc
index 4cd7bb091fee..c585b1401c3e 100644
--- a/dns/maradns/files/patch-example_mararc
+++ b/dns/maradns/files/patch-example_mararc
@@ -1,8 +1,8 @@
---- 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 @@
+--- doc/example_mararc.orig	Mon Nov 12 08:48:06 2001
++++ doc/example_mararc	Tue Nov 27 23:29:36 2001
+@@ -29,7 +29,9 @@
  # The directory with all of the zone files
- chroot_dir = "/usr/local/etc/maradns"
+ chroot_dir = "/etc/maradns"
  # The numeric UID MaraDNS will run as
 -maradns_uid = 99
 +maradns_uid = 53
diff --git a/dns/maradns/files/patch-libs-Makefile b/dns/maradns/files/patch-libs-Makefile
deleted file mode 100644
index 8fb4fb93afb9..000000000000
--- a/dns/maradns/files/patch-libs-Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- libs/Makefile.orig	Sun Jul 22 21:21:11 2001
-+++ libs/Makefile	Sun Jul 22 21:21:38 2001
-@@ -1,6 +1,6 @@
- OBJECTS = JessStr.o JessStrOS.o JessStrCP.o MaraHash.o
- #FLAGS = -O2 -Wall
--FLAGS = -g
-+FLAGS = -g $(CFLAGS)
- 
- all: tests mtest
- 
diff --git a/dns/maradns/files/patch-parse-Makefile b/dns/maradns/files/patch-parse-Makefile
deleted file mode 100644
index dd8e62e9fbcd..000000000000
--- a/dns/maradns/files/patch-parse-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- parse/Makefile.orig	Sun Jul 22 21:22:02 2001
-+++ parse/Makefile	Sun Jul 22 21:22:17 2001
-@@ -6,7 +6,7 @@
- EXECS=parsetest parsetest2
- 
- #FLAGS = -O2
--FLAGS = -g
-+FLAGS = -g $(CFLAGS)
- 
- all: $(EXECS)
- 
diff --git a/dns/maradns/files/patch-server-Makefile b/dns/maradns/files/patch-server-Makefile
deleted file mode 100644
index 8613411ce7ba..000000000000
--- a/dns/maradns/files/patch-server-Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
---- server/Makefile.orig	Sun Jul 22 21:22:38 2001
-+++ server/Makefile	Sun Jul 22 21:23:17 2001
-@@ -12,7 +12,7 @@
- #FLAGS = -g -DDEBUG -DCALL_LOCKS
- #FLAGS = -g -DDEBUG 
- #FLAGS = -g -DDEBUG -DNOTHREAD
--FLAGS = -g
-+FLAGS = -g $(CFLAGS)
- 
- all: $(EXECS)
- 
-@@ -29,5 +29,5 @@
- 	$(CC) -c $(FLAGS) -o recursive.o recursive.c 
- 
- maradns: MaraDNS.c $(OBJECTS) 
--	$(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -o maradns MaraDNS.c $(OBJECTS) -lpthread
-+	$(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -o maradns MaraDNS.c $(OBJECTS) -pthread
- 
diff --git a/dns/maradns/files/patch-test-Makefile b/dns/maradns/files/patch-test-Makefile
deleted file mode 100644
index 626dcaff9cc2..000000000000
--- a/dns/maradns/files/patch-test-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- test/Makefile.orig	Sun Jul 22 21:23:40 2001
-+++ test/Makefile	Sun Jul 22 21:23:47 2001
-@@ -6,7 +6,7 @@
- EXECS=rtest csv1test compress.test show.charnum ipacltest
- 
- #FLAGS = -O2
--FLAGS = -g
-+FLAGS = -g $(CFLAGS)
- 
- all: $(EXECS)
- 
diff --git a/dns/maradns/files/patch-tools-Makefile b/dns/maradns/files/patch-tools-Makefile
deleted file mode 100644
index 27dd38f4d99b..000000000000
--- a/dns/maradns/files/patch-tools-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/Makefile.orig	Sun Jul 22 21:24:18 2001
-+++ tools/Makefile	Sun Jul 22 21:24:30 2001
-@@ -5,7 +5,7 @@
- EXECS=askmara strip.control benchmark
- 
- #FLAGS = -O2
--FLAGS = -g
-+FLAGS = -g $(CFLAGS)
- 
- all: $(EXECS)
- 
diff --git a/dns/maradns/files/patch-tuzona-Makefile b/dns/maradns/files/patch-tuzona-Makefile
deleted file mode 100644
index 5c5186a8029b..000000000000
--- a/dns/maradns/files/patch-tuzona-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- tuzona/Makefile.orig	Sun Jul 22 21:25:11 2001
-+++ tuzona/Makefile	Sun Jul 22 21:25:18 2001
-@@ -5,7 +5,7 @@
- OBJECTS=$(JOBJS) $(MJOBJS) $(DOBJECTS) $(POBJECTS)
- EXECS=getzone zoneserver
- 
--FLAGS = -O2
-+FLAGS = -O2 $(CFLAGS)
- #FLAGS = -g
- 
- all: $(EXECS)
diff --git a/dns/maradns/files/patch-utf8-Makefile b/dns/maradns/files/patch-utf8-Makefile
deleted file mode 100644
index 208b5b47e28c..000000000000
--- a/dns/maradns/files/patch-utf8-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- utf8/Makefile.orig	Sun Jul 22 21:25:44 2001
-+++ utf8/Makefile	Sun Jul 22 21:25:51 2001
-@@ -5,7 +5,7 @@
- EXECS=utf8test
- 
- #FLAGS = -O2
--FLAGS = -g
-+FLAGS = -g $(CFLAGS)
- 
- all: $(EXECS)
- 
diff --git a/dns/maradns/pkg-plist b/dns/maradns/pkg-plist
index ce162e7ffbc5..48b85a220bab 100644
--- a/dns/maradns/pkg-plist
+++ b/dns/maradns/pkg-plist
@@ -1,35 +1,53 @@
-sbin/maradns
-sbin/zoneserver
-sbin/getzone
 bin/askmara
 etc/mararc.sample
-%%PORTDOCS%%share/doc/maradns/detailed/spammers/azmalink.net
+sbin/getzone
+sbin/maradns
+sbin/zoneserver
+%%PORTDOCS%%share/doc/maradns/TODO.done
+%%PORTDOCS%%share/doc/maradns/TODO.first
+%%PORTDOCS%%share/doc/maradns/TODO.problem.hostnames
+%%PORTDOCS%%share/doc/maradns/TODO.second
+%%PORTDOCS%%share/doc/maradns/00Quickstart.es
+%%PORTDOCS%%share/doc/maradns/changelog.html
+%%PORTDOCS%%share/doc/maradns/detailed/0QuickStart
 %%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/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/rfc2044.txt
 %%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/0QuickStart
-%%PORTDOCS%%share/doc/maradns/CREDITS
-%%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%%share/doc/maradns/old.changelog
+%%PORTDOCS%%share/doc/maradns/tutorial/authoritative.html
+%%PORTDOCS%%share/doc/maradns/tutorial/compile.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/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