5 files changed, 27 insertions, 33 deletions

diff --git a/dns/maradns/Makefile b/dns/maradns/Makefile
index d1d769e17d00..33cb3093e412 100644
--- a/dns/maradns/Makefile
+++ b/dns/maradns/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	maradns
-PORTVERSION=	0.7.13
+PORTVERSION=	0.7.22
 CATEGORIES=	net
 MASTER_SITES=	http://www.maradns.org/download/ \
 		ftp://ftp.nuug.no/pub/anders/distfiles/
@@ -15,23 +15,14 @@ MAINTAINER=	anders@fix.no
 
 USE_BZIP2=	yes
 
-MAN3=	js_alloc.3 js_append.3 js_atoi.3 js_buf_eof.3 js_buf_getline.3 \
-	js_buf_read.3 js_close.3 js_copy.3 js_create.3 js_dealloc.3 \
-	js_destroy.3 js_destroy_force.3 js_fgrep.3 js_fgrep_offset.3 \
-	js_get_encode.3 js_getline_stdin.3 js_has_sanity.3 js_insert.3 \
-	js_issame.3 js_js2str.3 js_length.3 js_lock.3 js_match.3 \
-	js_match_offset.3 js_newline_chars.3 js_nonmatch.3 \
-	js_nonmatch_offset.3 js_octets.3 js_open.3 js_open_append.3 \
-	js_open_read.3 js_open_write.3 js_qstr2js.3 js_read.3 js_set_chsize.3 \
-	js_set_encode.3 js_show_stdout.3 js_space_chars.3 js_str2js.3 \
-	js_substr.3 js_tolower.3 js_unlock.3 js_val.3 js_write.3
-MAN8=	maradns.8
+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.algorithm \
-	resolution.algorithm rfc2044.txt rtest.output www.monty.de \
-	../00QuickStart ../CHANGELOG.html ../ROADMAP ../CREDITS
+	mararc.format multiple.qdcount recursive-case-insensitive \
+	recursive.algorithm resolution.algorithm rfc2044.txt rtest.output \
+	www.monty.de ../00QuickStart ../CHANGELOG.html ../ROADMAP ../CREDITS
 
 FIXPREFIX=	00QuickStart CHANGELOG.html doc/man/maradns.8 doc/faq.txt \
 		parse/ParseMaraRc.c doc/example_mararc
@@ -48,8 +39,10 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/tuzona/getzone ${PREFIX}/sbin/
 	${INSTALL_PROGRAM} ${WRKSRC}/tools/askmara ${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKSRC}/doc/example_mararc ${PREFIX}/etc/mararc.sample
-	${INSTALL_DATA} ${WRKSRC}/doc/man/js/* ${PREFIX}/man/man3/
-	${INSTALL_DATA} ${WRKSRC}/doc/man/maradns.8 ${PREFIX}/man/man8/
+	${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
 .if !defined(NOPORTDOCS)
 	${INSTALL} -d -o root -g wheel -m 0755 ${PREFIX}/share/doc/maradns
 .for f in ${DOCS}
diff --git a/dns/maradns/distinfo b/dns/maradns/distinfo
index 284809057737..2e67e49396e4 100644
--- a/dns/maradns/distinfo
+++ b/dns/maradns/distinfo
@@ -1 +1 @@
-MD5 (maradns-0.7.13.tar.bz2) = c37060cb2c80c0d16e0abdd6c563d6be
+MD5 (maradns-0.7.22.tar.bz2) = e58798a33fd99bfc9560ef94aebaa754
diff --git a/dns/maradns/files/patch-parse-Makefile b/dns/maradns/files/patch-parse-Makefile
index bd8809642a3d..f3ae49178c1e 100644
--- a/dns/maradns/files/patch-parse-Makefile
+++ b/dns/maradns/files/patch-parse-Makefile
@@ -1,14 +1,14 @@
---- parse/Makefile.old	Mon Jun 25 00:46:40 2001
-+++ parse/Makefile	Mon Jun 25 00:47:50 2001
-@@ -5,7 +5,7 @@
- OBJECTS=$(JOBJS) $(MJOBJS) $(POBJECTS) $(DOBJECTS)
+--- parse/Makefile.orig	Sun Jul  8 15:41:39 2001
++++ parse/Makefile	Sun Jul  8 15:42:39 2001
+@@ -6,7 +6,7 @@
  EXECS=parsetest parsetest2
  
--FLAGS = -O2
-+FLAGS = $(CFLAGS)
- #FLAGS = -g
+ #FLAGS = -O2
+-FLAGS = -g
++FLAGS = -g $(CFLAGS)
  
  all: $(EXECS)
+ 
 @@ -17,17 +17,17 @@
  	cd libs ; make
  
diff --git a/dns/maradns/files/patch-server-Makefile b/dns/maradns/files/patch-server-Makefile
index 90112c5051f9..6e117fb16fca 100644
--- a/dns/maradns/files/patch-server-Makefile
+++ b/dns/maradns/files/patch-server-Makefile
@@ -1,15 +1,15 @@
---- server/Makefile.orig	Sun Jun 24 11:32:48 2001
-+++ server/Makefile	Mon Jun 25 00:53:57 2001
-@@ -9,7 +9,7 @@
- VERSION=0.7.13
+--- 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
--FLAGS = -g -DDEBUG -DNOTHREAD
-+FLAGS = -g -DDEBUG -DNOTHREAD $(CFLAGS)
+ #FLAGS = -g -DDEBUG -DCALL_LOCKS
+-FLAGS = -g -DDEBUG 
++FLAGS = -g -DDEBUG $(CFLAGS)
+ #FLAGS = -g -DDEBUG -DNOTHREAD
  #FLAGS = -g
  
- all: $(EXECS)
-@@ -21,11 +21,11 @@
+@@ -23,11 +23,11 @@
  	cd libs ; make
  
  MaraBigHash.o: MaraBigHash.c ../libs/JessStr.h ../libs/MaraHash.h ../MaraDns.h
diff --git a/dns/maradns/pkg-plist b/dns/maradns/pkg-plist
index e9d097a35cd0..889d59ff4d11 100644
--- a/dns/maradns/pkg-plist
+++ b/dns/maradns/pkg-plist
@@ -12,6 +12,7 @@ etc/mararc.sample
 %%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