Update to version 0.8.06

PR: 29149
Submitted by: MAINTAINER

24 files changed, 72 insertions, 340 deletions

diff --git a/dns/maradns/Makefile b/dns/maradns/Makefile
index 33cb309..f620148 100644
--- a/dns/maradns/Makefile
+++ b/dns/maradns/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	maradns
-PORTVERSION=	0.7.22
+PORTVERSION=	0.8.06
 CATEGORIES=	net
 MASTER_SITES=	http://www.maradns.org/download/ \
 		ftp://ftp.nuug.no/pub/anders/distfiles/
@@ -22,10 +22,10 @@ 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 ../00QuickStart ../CHANGELOG.html ../ROADMAP ../CREDITS
+	www.monty.de ../0QuickStart ../CHANGELOG.html ../ROADMAP ../CREDITS
 
 FIXPREFIX=	00QuickStart CHANGELOG.html doc/man/maradns.8 doc/faq.txt \
-		parse/ParseMaraRc.c doc/example_mararc
+		doc/man/zoneserver.8 parse/ParseMaraRc.c doc/example_mararc
 
 post-patch:
 .for f in ${FIXPREFIX}
diff --git a/dns/maradns/distinfo b/dns/maradns/distinfo
index 2e67e49..5370159 100644
--- a/dns/maradns/distinfo
+++ b/dns/maradns/distinfo
@@ -1 +1 @@
-MD5 (maradns-0.7.22.tar.bz2) = e58798a33fd99bfc9560ef94aebaa754
+MD5 (maradns-0.8.06.tar.bz2) = e43b74eadc29e756ca1365a1c79586e5
diff --git a/dns/maradns/files/patch-dns-Makefile b/dns/maradns/files/patch-dns-Makefile
index 32a8701..7ecb07c 100644
--- a/dns/maradns/files/patch-dns-Makefile
+++ b/dns/maradns/files/patch-dns-Makefile
@@ -1,5 +1,5 @@
---- dns/Makefile.orig	Wed Jun 20 19:30:47 2001
-+++ dns/Makefile	Mon Jun 25 00:42:32 2001
+--- 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)
  
@@ -9,18 +9,3 @@
  
  all: Queries.o Compress.o bobbit.o
  
-@@ -12,11 +12,11 @@
- 	rm -f Queries.o Compress.o bobbit.o
- 
- Queries.o: Queries.c ../libs/JessStr.h ../libs/MaraHash.h ../MaraDns.h
--	gcc -c $(FLAGS) -o Queries.o Queries.c 
-+	$(CC) -c $(FLAGS) -o Queries.o Queries.c 
- 
- Compress.o: Compress.c ../libs/JessStr.h ../libs/MaraHash.h ../MaraDns.h
--	gcc -c $(FLAGS) -o Compress.o Compress.c 
-+	$(CC) -c $(FLAGS) -o Compress.o Compress.c 
- 
- bobbit.o: bobbit.c ../libs/JessStr.h ../libs/MaraHash.h ../MaraDns.h
--	gcc -c $(FLAGS) -o bobbit.o bobbit.c 
-+	$(CC) -c $(FLAGS) -o bobbit.o bobbit.c 
- 
diff --git a/dns/maradns/files/patch-example_mararc b/dns/maradns/files/patch-example_mararc
index 066b04e..7a2d721 100644
--- a/dns/maradns/files/patch-example_mararc
+++ b/dns/maradns/files/patch-example_mararc
@@ -1,11 +1,14 @@
---- doc/example_mararc.orig	Tue Apr 24 06:32:35 2001
-+++ doc/example_mararc	Sat May 26 20:20:04 2001
-@@ -11,7 +11,7 @@
+--- 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 @@
  # 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
+-# maradns_gid = 99
++maradns_gid = 53
  # The maximum number of processes MaraDNS is allowed to use
  maxprocs = 64
  
diff --git a/dns/maradns/files/patch-libs-Makefile b/dns/maradns/files/patch-libs-Makefile
index beb698f..8fb4fb93 100644
--- a/dns/maradns/files/patch-libs-Makefile
+++ b/dns/maradns/files/patch-libs-Makefile
@@ -1,5 +1,5 @@
---- libs/Makefile.orig	Sat Jun 23 08:20:57 2001
-+++ libs/Makefile	Mon Jun 25 00:44:00 2001
+--- 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
@@ -8,34 +8,3 @@
  
  all: tests mtest
  
-@@ -8,23 +8,23 @@
- 	rm -f core $(OBJECTS) tests mtest
- 
- MaraHash.o: JessStr.h MaraHash.c
--	gcc -c $(FLAGS) -o MaraHash.o MaraHash.c
-+	$(CC) -c $(FLAGS) -o MaraHash.o MaraHash.c
- 
- JessStr.o: JessStr.h JessStr.c
--	gcc -c $(FLAGS) -o JessStr.o JessStr.c 
-+	$(CC) -c $(FLAGS) -o JessStr.o JessStr.c 
- 
- JessStrOS.o: JessStr.h JessStrOS.c
--	gcc -c $(FLAGS) -o JessStrOS.o JessStrOS.c 
-+	$(CC) -c $(FLAGS) -o JessStrOS.o JessStrOS.c 
- 
- JessStrCP.o: JessStr.h JessStrCP.c
--	gcc -c $(FLAGS) -o JessStrCP.o JessStrCP.c 
-+	$(CC) -c $(FLAGS) -o JessStrCP.o JessStrCP.c 
- 
- mtest: mtest.c $(OBJECTS)
--	gcc $(FLAGS) -o mtest mtest.c $(OBJECTS)
-+	$(CC) $(FLAGS) -o mtest mtest.c $(OBJECTS)
- 
- tests: tests.c $(OBJECTS)
--	gcc $(FLAGS) -o tests tests.c $(OBJECTS)
-+	$(CC) $(FLAGS) -o tests tests.c $(OBJECTS)
- 
- #onetime: $(OBJECTS) kiwi.h config.h onetime.c do_scramble.o cryptdate.o
--#	gcc $(FLAGS) -o onetime onetime.c do_scramble.o cryptdate.o
-+#	$(CC) $(FLAGS) -o onetime onetime.c do_scramble.o cryptdate.o
- 
diff --git a/dns/maradns/files/patch-parse-Makefile b/dns/maradns/files/patch-parse-Makefile
index f3ae491..dd8e62e 100644
--- a/dns/maradns/files/patch-parse-Makefile
+++ b/dns/maradns/files/patch-parse-Makefile
@@ -1,5 +1,5 @@
---- parse/Makefile.orig	Sun Jul  8 15:41:39 2001
-+++ parse/Makefile	Sun Jul  8 15:42:39 2001
+--- 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
  
@@ -9,26 +9,3 @@
  
  all: $(EXECS)
  
-@@ -17,17 +17,17 @@
- 	cd libs ; make
- 
- ParseMaraRc.o: ParseMaraRc.c ../libs/JessStr.h ../libs/MaraHash.h ../MaraDns.h
--	gcc -c $(FLAGS) -o ParseMaraRc.o ParseMaraRc.c 
-+	$(CC) -c $(FLAGS) -o ParseMaraRc.o ParseMaraRc.c 
- 
- ParseCsv1.o: ParseCsv1.c ../libs/JessStr.h ../libs/MaraHash.h ../MaraDns.h
--	gcc -c $(FLAGS) -o ParseCsv1.o ParseCsv1.c 
-+	$(CC) -c $(FLAGS) -o ParseCsv1.o ParseCsv1.c 
- 
- ParseIpAcl.o: ParseIpAcl.c ../libs/JessStr.h ../libs/MaraHash.h ../MaraDns.h
--	gcc -c $(FLAGS) -o ParseIpAcl.o ParseIpAcl.c
-+	$(CC) -c $(FLAGS) -o ParseIpAcl.o ParseIpAcl.c
- 
- parsetest: parsetest.c $(OBJECTS) 
--	gcc $(FLAGS) -o parsetest parsetest.c $(OBJECTS) 
-+	$(CC) $(FLAGS) -o parsetest parsetest.c $(OBJECTS) 
- 
- parsetest2: parsetest2.c $(OBJECTS) 
--	gcc $(FLAGS) -o parsetest2 parsetest2.c $(OBJECTS) 
-+	$(CC) $(FLAGS) -o parsetest2 parsetest2.c $(OBJECTS) 
- 
diff --git a/dns/maradns/files/patch-server-Makefile b/dns/maradns/files/patch-server-Makefile
index 6e117fb..8613411 100644
--- a/dns/maradns/files/patch-server-Makefile
+++ b/dns/maradns/files/patch-server-Makefile
@@ -1,26 +1,18 @@
---- server/Makefile.orig	Wed Jul  4 12:09:16 2001
-+++ server/Makefile	Sun Jul  8 15:45:17 2001
-@@ -10,7 +10,7 @@
- 
- #FLAGS = -O2 -Wall
+--- 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 $(CFLAGS)
+ #FLAGS = -g -DDEBUG 
  #FLAGS = -g -DDEBUG -DNOTHREAD
- #FLAGS = -g
- 
-@@ -23,11 +23,11 @@
- 	cd libs ; make
+-FLAGS = -g
++FLAGS = -g $(CFLAGS)
  
- MaraBigHash.o: MaraBigHash.c ../libs/JessStr.h ../libs/MaraHash.h ../MaraDns.h
--	gcc -c $(FLAGS) -o MaraBigHash.o MaraBigHash.c 
-+	$(CC) -c $(FLAGS) -o MaraBigHash.o MaraBigHash.c 
+ all: $(EXECS)
  
- recursive.o: recursive.c ../libs/JessStr.h ../libs/MaraHash.h ../MaraDns.h
--	gcc -c $(FLAGS) -o recursive.o recursive.c 
-+	$(CC) -c $(FLAGS) -o recursive.o recursive.c 
+@@ -29,5 +29,5 @@
+ 	$(CC) -c $(FLAGS) -o recursive.o recursive.c 
  
  maradns: MaraDNS.c $(OBJECTS) 
--	gcc $(FLAGS) -DVERSION=\"$(VERSION)\" -o maradns MaraDNS.c $(OBJECTS) -lpthread
+-	$(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
index 14b1285..626dcaf 100644
--- a/dns/maradns/files/patch-test-Makefile
+++ b/dns/maradns/files/patch-test-Makefile
@@ -1,5 +1,5 @@
---- test/Makefile.orig	Wed Jun 20 19:33:02 2001
-+++ test/Makefile	Mon Jun 25 00:44:46 2001
+--- 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
  
@@ -9,26 +9,3 @@
  
  all: $(EXECS)
  
-@@ -17,17 +17,17 @@
- 	cd libs ; make
- 
- rtest: rtest.c $(OBJECTS)
--	gcc $(FLAGS) -o rtest rtest.c $(OBJECTS)
-+	$(CC) $(FLAGS) -o rtest rtest.c $(OBJECTS)
- 
- csv1test: csv1test.c $(OBJECTS) 
--	gcc $(FLAGS) -o csv1test csv1test.c $(OBJECTS)
-+	$(CC) $(FLAGS) -o csv1test csv1test.c $(OBJECTS)
- 
- compress.test: compress.test.c $(OBJECTS)
--	gcc $(FLAGS) -o compress.test compress.test.c $(OBJECTS)
-+	$(CC) $(FLAGS) -o compress.test compress.test.c $(OBJECTS)
- 
- show.charnum: show.charnum.c 
--	gcc $(FLAGS) -o show.charnum show.charnum.c 
-+	$(CC) $(FLAGS) -o show.charnum show.charnum.c 
- 
- ipacltest: ipacltest.c $(OBJECTS)
--	gcc $(FLAGS) -o ipacltest ipacltest.c $(OBJECTS)
-+	$(CC) $(FLAGS) -o ipacltest ipacltest.c $(OBJECTS)
- 
diff --git a/dns/maradns/files/patch-tools-Makefile b/dns/maradns/files/patch-tools-Makefile
index 776b9a2..27dd38f 100644
--- a/dns/maradns/files/patch-tools-Makefile
+++ b/dns/maradns/files/patch-tools-Makefile
@@ -1,5 +1,5 @@
---- tools/Makefile.orig	Wed Jun 20 19:33:25 2001
-+++ tools/Makefile	Mon Jun 25 00:45:15 2001
+--- 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
  
@@ -9,18 +9,3 @@
  
  all: $(EXECS)
  
-@@ -13,11 +13,11 @@
- 	rm -f $(OBJECTS) core $(EXECS)
- 
- askmara: askmara.c askmara_labels_en.h $(OBJECTS) 
--	gcc $(FLAGS) -o askmara askmara.c $(OBJECTS)
-+	$(CC) $(FLAGS) -o askmara askmara.c $(OBJECTS)
- 
- benchmark: benchmark.c askmara_labels_en.h $(OBJECTS) 
--	gcc $(FLAGS) -o benchmark benchmark.c $(OBJECTS)
-+	$(CC) $(FLAGS) -o benchmark benchmark.c $(OBJECTS)
- 
- strip.control: strip.control.c
--	gcc $(FLAGS) -o strip.control strip.control.c
-+	$(CC) $(FLAGS) -o strip.control strip.control.c
- 
diff --git a/dns/maradns/files/patch-tuzona-Makefile b/dns/maradns/files/patch-tuzona-Makefile
index 67150c3..5c5186a 100644
--- a/dns/maradns/files/patch-tuzona-Makefile
+++ b/dns/maradns/files/patch-tuzona-Makefile
@@ -1,22 +1,11 @@
---- tuzona/Makefile.old	Mon Jun 25 00:51:03 2001
-+++ tuzona/Makefile	Mon Jun 25 00:51:22 2001
+--- 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 = $(CFLAGS)
++FLAGS = -O2 $(CFLAGS)
  #FLAGS = -g
  
  all: $(EXECS)
-@@ -14,8 +14,8 @@
- 	rm -f $(OBJECTS) core $(EXECS)
- 
- getzone: getzone.c $(OBJECTS) 
--	gcc $(FLAGS) -o getzone getzone.c $(OBJECTS)
-+	$(CC) $(FLAGS) -o getzone getzone.c $(OBJECTS)
- 
- zoneserver: zoneserver.c $(OBJECTS)
--	gcc $(FLAGS) -o zoneserver zoneserver.c $(OBJECTS)
-+	$(CC) $(FLAGS) -o zoneserver zoneserver.c $(OBJECTS)
- 
diff --git a/dns/maradns/files/patch-utf8-Makefile b/dns/maradns/files/patch-utf8-Makefile
index eceeaba..208b5b4 100644
--- a/dns/maradns/files/patch-utf8-Makefile
+++ b/dns/maradns/files/patch-utf8-Makefile
@@ -1,5 +1,5 @@
---- utf8/Makefile.orig	Wed Jun 20 19:33:48 2001
-+++ utf8/Makefile	Mon Jun 25 00:46:08 2001
+--- 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
  
@@ -9,14 +9,3 @@
  
  all: $(EXECS)
  
-@@ -13,8 +13,8 @@
- 	rm -f $(OBJECTS) core $(EXECS)
- 
- Utf8.o: Utf8.c ../libs/JessStr.h ../libs/MaraHash.h ../MaraDns.h
--	gcc -c $(FLAGS) -o Utf8.o Utf8.c 
-+	$(CC) -c $(FLAGS) -o Utf8.o Utf8.c 
- 
- utf8test: utf8test.c $(OBJECTS) 
--	gcc $(FLAGS) -o utf8test utf8test.c $(OBJECTS) 
-+	$(CC) $(FLAGS) -o utf8test utf8test.c $(OBJECTS) 
- 
diff --git a/dns/maradns/pkg-plist b/dns/maradns/pkg-plist
index 889d59f..f61e061 100644
--- a/dns/maradns/pkg-plist
+++ b/dns/maradns/pkg-plist
@@ -18,7 +18,7 @@ etc/mararc.sample
 %%PORTDOCS%%share/doc/maradns/rfc2044.txt
 %%PORTDOCS%%share/doc/maradns/rtest.output
 %%PORTDOCS%%share/doc/maradns/www.monty.de
-%%PORTDOCS%%share/doc/maradns/00QuickStart
+%%PORTDOCS%%share/doc/maradns/0QuickStart
 %%PORTDOCS%%share/doc/maradns/CHANGELOG.html
 %%PORTDOCS%%share/doc/maradns/CREDITS
 %%PORTDOCS%%share/doc/maradns/ROADMAP
diff --git a/net/maradns/Makefile b/net/maradns/Makefile
index 33cb309..f620148 100644
--- a/net/maradns/Makefile
+++ b/net/maradns/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	maradns
-PORTVERSION=	0.7.22
+PORTVERSION=	0.8.06
 CATEGORIES=	net
 MASTER_SITES=	http://www.maradns.org/download/ \
 		ftp://ftp.nuug.no/pub/anders/distfiles/
@@ -22,10 +22,10 @@ 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 ../00QuickStart ../CHANGELOG.html ../ROADMAP ../CREDITS
+	www.monty.de ../0QuickStart ../CHANGELOG.html ../ROADMAP ../CREDITS
 
 FIXPREFIX=	00QuickStart CHANGELOG.html doc/man/maradns.8 doc/faq.txt \
-		parse/ParseMaraRc.c doc/example_mararc
+		doc/man/zoneserver.8 parse/ParseMaraRc.c doc/example_mararc
 
 post-patch:
 .for f in ${FIXPREFIX}
diff --git a/net/maradns/distinfo b/net/maradns/distinfo
index 2e67e49..5370159 100644
--- a/net/maradns/distinfo
+++ b/net/maradns/distinfo
@@ -1 +1 @@
-MD5 (maradns-0.7.22.tar.bz2) = e58798a33fd99bfc9560ef94aebaa754
+MD5 (maradns-0.8.06.tar.bz2) = e43b74eadc29e756ca1365a1c79586e5
diff --git a/net/maradns/files/patch-dns-Makefile b/net/maradns/files/patch-dns-Makefile
index 32a8701..7ecb07c 100644
--- a/net/maradns/files/patch-dns-Makefile
+++ b/net/maradns/files/patch-dns-Makefile
@@ -1,5 +1,5 @@
---- dns/Makefile.orig	Wed Jun 20 19:30:47 2001
-+++ dns/Makefile	Mon Jun 25 00:42:32 2001
+--- 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)
  
@@ -9,18 +9,3 @@
  
  all: Queries.o Compress.o bobbit.o
  
-@@ -12,11 +12,11 @@
- 	rm -f Queries.o Compress.o bobbit.o
- 
- Queries.o: Queries.c ../libs/JessStr.h ../libs/MaraHash.h ../MaraDns.h
--	gcc -c $(FLAGS) -o Queries.o Queries.c 
-+	$(CC) -c $(FLAGS) -o Queries.o Queries.c 
- 
- Compress.o: Compress.c ../libs/JessStr.h ../libs/MaraHash.h ../MaraDns.h
--	gcc -c $(FLAGS) -o Compress.o Compress.c 
-+	$(CC) -c $(FLAGS) -o Compress.o Compress.c 
- 
- bobbit.o: bobbit.c ../libs/JessStr.h ../libs/MaraHash.h ../MaraDns.h
--	gcc -c $(FLAGS) -o bobbit.o bobbit.c 
-+	$(CC) -c $(FLAGS) -o bobbit.o bobbit.c 
- 
diff --git a/net/maradns/files/patch-example_mararc b/net/maradns/files/patch-example_mararc
index 066b04e..7a2d721 100644
--- a/net/maradns/files/patch-example_mararc
+++ b/net/maradns/files/patch-example_mararc
@@ -1,11 +1,14 @@
---- doc/example_mararc.orig	Tue Apr 24 06:32:35 2001
-+++ doc/example_mararc	Sat May 26 20:20:04 2001
-@@ -11,7 +11,7 @@
+--- 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 @@
  # 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
+-# maradns_gid = 99
++maradns_gid = 53
  # The maximum number of processes MaraDNS is allowed to use
  maxprocs = 64
  
diff --git a/net/maradns/files/patch-libs-Makefile b/net/maradns/files/patch-libs-Makefile
index beb698f..8fb4fb93 100644
--- a/net/maradns/files/patch-libs-Makefile
+++ b/net/maradns/files/patch-libs-Makefile
@@ -1,5 +1,5 @@
---- libs/Makefile.orig	Sat Jun 23 08:20:57 2001
-+++ libs/Makefile	Mon Jun 25 00:44:00 2001
+--- 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
@@ -8,34 +8,3 @@
  
  all: tests mtest
  
-@@ -8,23 +8,23 @@
- 	rm -f core $(OBJECTS) tests mtest
- 
- MaraHash.o: JessStr.h MaraHash.c
--	gcc -c $(FLAGS) -o MaraHash.o MaraHash.c
-+	$(CC) -c $(FLAGS) -o MaraHash.o MaraHash.c
- 
- JessStr.o: JessStr.h JessStr.c
--	gcc -c $(FLAGS) -o JessStr.o JessStr.c 
-+	$(CC) -c $(FLAGS) -o JessStr.o JessStr.c 
- 
- JessStrOS.o: JessStr.h JessStrOS.c
--	gcc -c $(FLAGS) -o JessStrOS.o JessStrOS.c 
-+	$(CC) -c $(FLAGS) -o JessStrOS.o JessStrOS.c 
- 
- JessStrCP.o: JessStr.h JessStrCP.c
--	gcc -c $(FLAGS) -o JessStrCP.o JessStrCP.c 
-+	$(CC) -c $(FLAGS) -o JessStrCP.o JessStrCP.c 
- 
- mtest: mtest.c $(OBJECTS)
--	gcc $(FLAGS) -o mtest mtest.c $(OBJECTS)
-+	$(CC) $(FLAGS) -o mtest mtest.c $(OBJECTS)
- 
- tests: tests.c $(OBJECTS)
--	gcc $(FLAGS) -o tests tests.c $(OBJECTS)
-+	$(CC) $(FLAGS) -o tests tests.c $(OBJECTS)
- 
- #onetime: $(OBJECTS) kiwi.h config.h onetime.c do_scramble.o cryptdate.o
--#	gcc $(FLAGS) -o onetime onetime.c do_scramble.o cryptdate.o
-+#	$(CC) $(FLAGS) -o onetime onetime.c do_scramble.o cryptdate.o
- 
diff --git a/net/maradns/files/patch-parse-Makefile b/net/maradns/files/patch-parse-Makefile
index f3ae491..dd8e62e 100644
--- a/net/maradns/files/patch-parse-Makefile
+++ b/net/maradns/files/patch-parse-Makefile
@@ -1,5 +1,5 @@
---- parse/Makefile.orig	Sun Jul  8 15:41:39 2001
-+++ parse/Makefile	Sun Jul  8 15:42:39 2001
+--- 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
  
@@ -9,26 +9,3 @@
  
  all: $(EXECS)
  
-@@ -17,17 +17,17 @@
- 	cd libs ; make
- 
- ParseMaraRc.o: ParseMaraRc.c ../libs/JessStr.h ../libs/MaraHash.h ../MaraDns.h
--	gcc -c $(FLAGS) -o ParseMaraRc.o ParseMaraRc.c 
-+	$(CC) -c $(FLAGS) -o ParseMaraRc.o ParseMaraRc.c 
- 
- ParseCsv1.o: ParseCsv1.c ../libs/JessStr.h ../libs/MaraHash.h ../MaraDns.h
--	gcc -c $(FLAGS) -o ParseCsv1.o ParseCsv1.c 
-+	$(CC) -c $(FLAGS) -o ParseCsv1.o ParseCsv1.c 
- 
- ParseIpAcl.o: ParseIpAcl.c ../libs/JessStr.h ../libs/MaraHash.h ../MaraDns.h
--	gcc -c $(FLAGS) -o ParseIpAcl.o ParseIpAcl.c
-+	$(CC) -c $(FLAGS) -o ParseIpAcl.o ParseIpAcl.c
- 
- parsetest: parsetest.c $(OBJECTS) 
--	gcc $(FLAGS) -o parsetest parsetest.c $(OBJECTS) 
-+	$(CC) $(FLAGS) -o parsetest parsetest.c $(OBJECTS) 
- 
- parsetest2: parsetest2.c $(OBJECTS) 
--	gcc $(FLAGS) -o parsetest2 parsetest2.c $(OBJECTS) 
-+	$(CC) $(FLAGS) -o parsetest2 parsetest2.c $(OBJECTS) 
- 
diff --git a/net/maradns/files/patch-server-Makefile b/net/maradns/files/patch-server-Makefile
index 6e117fb..8613411 100644
--- a/net/maradns/files/patch-server-Makefile
+++ b/net/maradns/files/patch-server-Makefile
@@ -1,26 +1,18 @@
---- server/Makefile.orig	Wed Jul  4 12:09:16 2001
-+++ server/Makefile	Sun Jul  8 15:45:17 2001
-@@ -10,7 +10,7 @@
- 
- #FLAGS = -O2 -Wall
+--- 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 $(CFLAGS)
+ #FLAGS = -g -DDEBUG 
  #FLAGS = -g -DDEBUG -DNOTHREAD
- #FLAGS = -g
- 
-@@ -23,11 +23,11 @@
- 	cd libs ; make
+-FLAGS = -g
++FLAGS = -g $(CFLAGS)
  
- MaraBigHash.o: MaraBigHash.c ../libs/JessStr.h ../libs/MaraHash.h ../MaraDns.h
--	gcc -c $(FLAGS) -o MaraBigHash.o MaraBigHash.c 
-+	$(CC) -c $(FLAGS) -o MaraBigHash.o MaraBigHash.c 
+ all: $(EXECS)
  
- recursive.o: recursive.c ../libs/JessStr.h ../libs/MaraHash.h ../MaraDns.h
--	gcc -c $(FLAGS) -o recursive.o recursive.c 
-+	$(CC) -c $(FLAGS) -o recursive.o recursive.c 
+@@ -29,5 +29,5 @@
+ 	$(CC) -c $(FLAGS) -o recursive.o recursive.c 
  
  maradns: MaraDNS.c $(OBJECTS) 
--	gcc $(FLAGS) -DVERSION=\"$(VERSION)\" -o maradns MaraDNS.c $(OBJECTS) -lpthread
+-	$(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -o maradns MaraDNS.c $(OBJECTS) -lpthread
 +	$(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -o maradns MaraDNS.c $(OBJECTS) -pthread
  
diff --git a/net/maradns/files/patch-test-Makefile b/net/maradns/files/patch-test-Makefile
index 14b1285..626dcaf 100644
--- a/net/maradns/files/patch-test-Makefile
+++ b/net/maradns/files/patch-test-Makefile
@@ -1,5 +1,5 @@
---- test/Makefile.orig	Wed Jun 20 19:33:02 2001
-+++ test/Makefile	Mon Jun 25 00:44:46 2001
+--- 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
  
@@ -9,26 +9,3 @@
  
  all: $(EXECS)
  
-@@ -17,17 +17,17 @@
- 	cd libs ; make
- 
- rtest: rtest.c $(OBJECTS)
--	gcc $(FLAGS) -o rtest rtest.c $(OBJECTS)
-+	$(CC) $(FLAGS) -o rtest rtest.c $(OBJECTS)
- 
- csv1test: csv1test.c $(OBJECTS) 
--	gcc $(FLAGS) -o csv1test csv1test.c $(OBJECTS)
-+	$(CC) $(FLAGS) -o csv1test csv1test.c $(OBJECTS)
- 
- compress.test: compress.test.c $(OBJECTS)
--	gcc $(FLAGS) -o compress.test compress.test.c $(OBJECTS)
-+	$(CC) $(FLAGS) -o compress.test compress.test.c $(OBJECTS)
- 
- show.charnum: show.charnum.c 
--	gcc $(FLAGS) -o show.charnum show.charnum.c 
-+	$(CC) $(FLAGS) -o show.charnum show.charnum.c 
- 
- ipacltest: ipacltest.c $(OBJECTS)
--	gcc $(FLAGS) -o ipacltest ipacltest.c $(OBJECTS)
-+	$(CC) $(FLAGS) -o ipacltest ipacltest.c $(OBJECTS)
- 
diff --git a/net/maradns/files/patch-tools-Makefile b/net/maradns/files/patch-tools-Makefile
index 776b9a2..27dd38f 100644
--- a/net/maradns/files/patch-tools-Makefile
+++ b/net/maradns/files/patch-tools-Makefile
@@ -1,5 +1,5 @@
---- tools/Makefile.orig	Wed Jun 20 19:33:25 2001
-+++ tools/Makefile	Mon Jun 25 00:45:15 2001
+--- 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
  
@@ -9,18 +9,3 @@
  
  all: $(EXECS)
  
-@@ -13,11 +13,11 @@
- 	rm -f $(OBJECTS) core $(EXECS)
- 
- askmara: askmara.c askmara_labels_en.h $(OBJECTS) 
--	gcc $(FLAGS) -o askmara askmara.c $(OBJECTS)
-+	$(CC) $(FLAGS) -o askmara askmara.c $(OBJECTS)
- 
- benchmark: benchmark.c askmara_labels_en.h $(OBJECTS) 
--	gcc $(FLAGS) -o benchmark benchmark.c $(OBJECTS)
-+	$(CC) $(FLAGS) -o benchmark benchmark.c $(OBJECTS)
- 
- strip.control: strip.control.c
--	gcc $(FLAGS) -o strip.control strip.control.c
-+	$(CC) $(FLAGS) -o strip.control strip.control.c
- 
diff --git a/net/maradns/files/patch-tuzona-Makefile b/net/maradns/files/patch-tuzona-Makefile
index 67150c3..5c5186a 100644
--- a/net/maradns/files/patch-tuzona-Makefile
+++ b/net/maradns/files/patch-tuzona-Makefile
@@ -1,22 +1,11 @@
---- tuzona/Makefile.old	Mon Jun 25 00:51:03 2001
-+++ tuzona/Makefile	Mon Jun 25 00:51:22 2001
+--- 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 = $(CFLAGS)
++FLAGS = -O2 $(CFLAGS)
  #FLAGS = -g
  
  all: $(EXECS)
-@@ -14,8 +14,8 @@
- 	rm -f $(OBJECTS) core $(EXECS)
- 
- getzone: getzone.c $(OBJECTS) 
--	gcc $(FLAGS) -o getzone getzone.c $(OBJECTS)
-+	$(CC) $(FLAGS) -o getzone getzone.c $(OBJECTS)
- 
- zoneserver: zoneserver.c $(OBJECTS)
--	gcc $(FLAGS) -o zoneserver zoneserver.c $(OBJECTS)
-+	$(CC) $(FLAGS) -o zoneserver zoneserver.c $(OBJECTS)
- 
diff --git a/net/maradns/files/patch-utf8-Makefile b/net/maradns/files/patch-utf8-Makefile
index eceeaba..208b5b4 100644
--- a/net/maradns/files/patch-utf8-Makefile
+++ b/net/maradns/files/patch-utf8-Makefile
@@ -1,5 +1,5 @@
---- utf8/Makefile.orig	Wed Jun 20 19:33:48 2001
-+++ utf8/Makefile	Mon Jun 25 00:46:08 2001
+--- 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
  
@@ -9,14 +9,3 @@
  
  all: $(EXECS)
  
-@@ -13,8 +13,8 @@
- 	rm -f $(OBJECTS) core $(EXECS)
- 
- Utf8.o: Utf8.c ../libs/JessStr.h ../libs/MaraHash.h ../MaraDns.h
--	gcc -c $(FLAGS) -o Utf8.o Utf8.c 
-+	$(CC) -c $(FLAGS) -o Utf8.o Utf8.c 
- 
- utf8test: utf8test.c $(OBJECTS) 
--	gcc $(FLAGS) -o utf8test utf8test.c $(OBJECTS) 
-+	$(CC) $(FLAGS) -o utf8test utf8test.c $(OBJECTS) 
- 
diff --git a/net/maradns/pkg-plist b/net/maradns/pkg-plist
index 889d59f..f61e061 100644
--- a/net/maradns/pkg-plist
+++ b/net/maradns/pkg-plist
@@ -18,7 +18,7 @@ etc/mararc.sample
 %%PORTDOCS%%share/doc/maradns/rfc2044.txt
 %%PORTDOCS%%share/doc/maradns/rtest.output
 %%PORTDOCS%%share/doc/maradns/www.monty.de
-%%PORTDOCS%%share/doc/maradns/00QuickStart
+%%PORTDOCS%%share/doc/maradns/0QuickStart
 %%PORTDOCS%%share/doc/maradns/CHANGELOG.html
 %%PORTDOCS%%share/doc/maradns/CREDITS
 %%PORTDOCS%%share/doc/maradns/ROADMAP