diff -udprN /usr/ports/dns/maradns/Makefile ./Makefile
--- /usr/ports/dns/maradns/Makefile	2018-03-26 13:49:19.000000000 +0000
+++ ./Makefile	2018-04-27 07:20:08.894012000 +0000
@@ -2,76 +2,85 @@
 # $FreeBSD: head/dns/maradns/Makefile 465596 2018-03-26 13:49:19Z mat $
 
 PORTNAME=	maradns
-PORTVERSION=	2.0.14
-PORTREVISION=	1
+PORTVERSION=	2.0.15
 CATEGORIES=	dns
-MASTER_SITES=	http://maradns.samiam.org/download/2.0/${PORTVERSION}/\
-		SF/${PORTNAME}/MaraDNS/${PORTVERSION}/
+MASTER_SITES=	http://maradns.samiam.org/download/2.0/${PORTVERSION}/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	je3kmz@freebsd.org
 COMMENT=	DNS server with focus on security and simplicity
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-DEADWOOD_VER=	3.2.10
+DEADWOOD_VER=	3.2.11
 
 REINPLACE_ARGS=	-i ""
-MAKE_ENV=	FLAGS="${CFLAGS}"
 
 HAS_CONFIGURE=	yes
+USES=		tar:bz2
 USE_RC_SUBR=	${PORTNAME} zoneserver Deadwood
-USES=		tar:bz2 python:2.7,run shebangfix
 USERS=		bind
 GROUPS=		bind
 INSTALL_TARGET=	install PREFIX=${STAGEDIR}${PREFIX}
 SHEBANG_FILES=	tools/bind2csv2.py
 
-OPTIONS_DEFINE=	IPV6 DOCS EXAMPLES CONV
+OPTIONS_DEFINE=	CONV DOCS EXAMPLES IPV6
 OPTIONS_SUB=	yes
-CONV_DESC=	Install bind2csv2 tool (needs python)
 
+CONV_DESC=	Install bind2csv2 tool (needs python)
+CONV_USES=	python:2.7,run shebangfix
 IPV6_CONFIGURE_ON=	--ipv6
-CONV_USES=	python:2.7,run
 
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|\<cc\>|${CC}|' ${WRKSRC}/build/Makefile.freebsd
-	@${FIND} ${WRKSRC} -type f ! -name "*.orig" | ${XARGS} ${REINPLACE_CMD} -e \
+	${REINPLACE_CMD} -e 's|make |\$$\{MAKE\} |g'\
+		${WRKSRC}/build/Makefile.freebsd
+	${FIND} ${WRKSRC} -type f ! -name "*.orig" |\
+		${XARGS} ${REINPLACE_CMD} -e\
 		's|/etc/maradns|${ETCDIR}|g; s|/etc/mararc|${ETCDIR}|g; \
-		 s|/etc/deadwood|${ETCDIR}|g; s| = 99| = 53|g'
+		s|/etc/deadwood|${ETCDIR}|g; s| = 99| = 53|g; \
+		s|${PREFIX}/${ETCDIR}/|${ETCDIR}/|g'
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/deadwood-${DEADWOOD_VER}/src/Deadwood ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/server/maradns ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/tcp/fetchzone ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/tcp/getzone ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/tcp/zoneserver ${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_PROGRAM} ${WRKSRC}/tools/askmara ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/tools/duende ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/tools/misc/mqhash ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/bind2csv2.py ${STAGEDIR}${PREFIX}/bin/bind2csv2
-
-	${INSTALL_MAN} ${WRKSRC}/doc/en/man/*.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/en/man/*.8 ${STAGEDIR}${MANPREFIX}/man/man8
-	${INSTALL_MAN} ${WRKSRC}/doc/en/man/*.5 ${STAGEDIR}${MANPREFIX}/man/man5
-
+.for i in deadwood-${DEADWOOD_VER}/src/Deadwood server/maradns tcp/zoneserver
+	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/sbin
+.endfor
+.for i in tcp/getzone tcp/fetchzone tools/askmara tools/duende tools/misc/mqhash
+	${INSTALL_PROGRAM} ${WRKSRC}/${i} ${STAGEDIR}${PREFIX}/bin
+.endfor
+.for i in askmara.1 bind2csv2.1 getzone.1 fetchzone.1 mqhash.1\
+	maradns.8 zoneserver.8 duende.8\
+	mararc.5 csv1.5 csv2.5 csv2_txt.5 Deadwood.1
+	${INSTALL_MAN} ${WRKSRC}/doc/en/man/${i}\
+		${STAGEDIR}${MANPREFIX}/man/${i:C|.*\.|man|}/${i:C|\.*||}
+.endfor
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_full_mararc ${STAGEDIR}${ETCDIR}/mararc.sample
-	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_csv2 ${STAGEDIR}${ETCDIR}/csv2.sample
-	${INSTALL_DATA} ${WRKSRC}/deadwood-${DEADWOOD_VER}/doc/dwood3rc ${STAGEDIR}${ETCDIR}/dwood3rc.sample
+	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_full_mararc\
+		${STAGEDIR}${ETCDIR}/mararc.sample
+	${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_csv2\
+		${STAGEDIR}${ETCDIR}/csv2.sample
+	${INSTALL_DATA} ${WRKSRC}/deadwood-${DEADWOOD_VER}/doc/dwood3rc\
+		${STAGEDIR}${ETCDIR}/dwood3rc.sample
+
+do-install-CONV-on:
+	${INSTALL_SCRIPT} ${WRKSRC}/tools/bind2csv2.py ${STAGEDIR}${PREFIX}/bin
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC}/doc/en && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
-	@${RM} -r ${STAGEDIR}${DOCSDIR}/man \
-		${STAGEDIR}${DOCSDIR}/source \
-		${STAGEDIR}${DOCSDIR}/pdf
-	@${FIND} ${STAGEDIR}${DOCSDIR} -name Makefile -delete
+.for i in QuickStart README changelog.txt credits.txt faq.html faq.txt files.txt
+	${INSTALL_DATA} ${WRKSRC}/doc/en/${i} ${STAGEDIR}${DOCSDIR}
+.endfor
+.for i in misc text tutorial webpage
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}/${i}
+	cd ${WRKSRC}/doc/en/${i} && ${COPYTREE_SHARE} .\
+		${STAGEDIR}${DOCSDIR}/${i}
+.endfor
 
 post-install-EXAMPLES-on:
-	${MV} ${STAGEDIR}${DOCSDIR}/examples ${STAGEDIR}${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	cd ${WRKSRC}/doc/en/examples && ${COPYTREE_SHARE} .\
+		${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff -udprN /usr/ports/dns/maradns/distinfo ./distinfo
--- /usr/ports/dns/maradns/distinfo	2017-11-20 14:55:31.000000000 +0000
+++ ./distinfo	2018-04-27 02:40:13.486695000 +0000
@@ -1,3 +1,3 @@
-TIMESTAMP = 1511188457
-SHA256 (maradns-2.0.14.tar.bz2) = 1a529c818df9cbd431fa09e3a413dfbbb410f7be3542a766028a36bc5ef94e29
-SIZE (maradns-2.0.14.tar.bz2) = 1156272
+TIMESTAMP = 1524796813
+SHA256 (maradns-2.0.15.tar.bz2) = 2c20588dc9a79492aca94a477864c59ac28ec7ae4715046022311e9cefe332b2
+SIZE (maradns-2.0.15.tar.bz2) = 1166133
diff -udprN /usr/ports/dns/maradns/files/patch-MaraDns.h ./files/patch-MaraDns.h
--- /usr/ports/dns/maradns/files/patch-MaraDns.h	2015-10-16 14:19:00.000000000 +0000
+++ ./files/patch-MaraDns.h	2018-04-27 07:27:48.364386000 +0000
@@ -1,4 +1,4 @@
---- MaraDns.h.orig	2015-09-26 05:35:18 UTC
+--- MaraDns.h.orig	2018-02-05 21:13:38 UTC
 +++ MaraDns.h
 @@ -71,21 +71,21 @@
       line to point to Bash
diff -udprN /usr/ports/dns/maradns/files/patch-configure ./files/patch-configure
--- /usr/ports/dns/maradns/files/patch-configure	2014-02-20 15:44:56.000000000 +0000
+++ ./files/patch-configure	2015-10-16 01:03:46.000000000 +0000
@@ -1,6 +1,6 @@
---- ./configure.orig	2014-01-14 21:46:25.000000000 +0000
-+++ ./configure	2014-02-20 15:33:18.000000000 +0000
-@@ -93,6 +93,9 @@
+--- configure.orig	2015-08-19 04:44:49 UTC
++++ configure
+@@ -93,6 +93,9 @@ elif echo $UNAME | grep -i cygwin > /dev
  	echo It looks like you are using Cygwin\; this should compile fine
  	echo by typing in \'make\'.
  	EXITCODE=0
diff -udprN /usr/ports/dns/maradns/files/patch-tools__Makefile ./files/patch-tools__Makefile
--- /usr/ports/dns/maradns/files/patch-tools__Makefile	2014-02-20 15:44:56.000000000 +0000
+++ ./files/patch-tools__Makefile	2015-08-04 00:58:21.000000000 +0000
@@ -1,6 +1,6 @@
---- ./tools/Makefile.orig	2010-09-09 20:21:09.000000000 +0000
-+++ ./tools/Makefile	2014-02-20 15:23:49.000000000 +0000
-@@ -18,7 +18,7 @@
+--- tools/Makefile.orig	2010-09-09 20:21:09 UTC
++++ tools/Makefile
+@@ -18,7 +18,7 @@ clean:
  	rm -f core $(EXECS) *.exe
  
  askmara: askmara.c askmara_labels_en.h $(OBJECTS) $(Q) $(OUTOBJ)
diff -udprN /usr/ports/dns/maradns/pkg-plist ./pkg-plist
--- /usr/ports/dns/maradns/pkg-plist	2015-10-16 14:19:00.000000000 +0000
+++ ./pkg-plist	2018-04-27 02:57:48.306593000 +0000
@@ -1,5 +1,5 @@
 bin/askmara
-%%CONV%%bin/bind2csv2
+%%CONV%%bin/bind2csv2.py
 bin/duende
 bin/fetchzone
 bin/getzone