aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dns/maradns/Makefile27
-rw-r--r--dns/maradns/distinfo6
-rw-r--r--dns/maradns/files/patch-configure6
-rw-r--r--dns/maradns/files/patch-tools__Makefile6
4 files changed, 21 insertions, 24 deletions
diff --git a/dns/maradns/Makefile b/dns/maradns/Makefile
index a7d1e233b0c7..d0ce3f5a7372 100644
--- a/dns/maradns/Makefile
+++ b/dns/maradns/Makefile
@@ -2,43 +2,38 @@
# $FreeBSD$
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
-
-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
+HAS_CONFIGURE= yes
OPTIONS_DEFINE= IPV6 DOCS EXAMPLES CONV
OPTIONS_SUB= yes
CONV_DESC= Install bind2csv2 tool (needs python)
IPV6_CONFIGURE_ON= --ipv6
-CONV_USES= python:2.7,run
+CONV_USES= python:2.7,run shebangfix
PORTDOCS= *
PORTEXAMPLES= *
+REINPLACE_ARGS= -i ""
+DEADWOOD_VER= 3.2.11
post-patch:
- @${REINPLACE_CMD} -e 's|\<cc\>|${CC}|' ${WRKSRC}/build/Makefile.freebsd
+ @${REINPLACE_CMD} -e 's|make |\$$\{MAKE\} |' ${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'
@@ -52,7 +47,6 @@ do-install:
${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
@@ -63,6 +57,9 @@ do-install:
${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/bind2csv2
+
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC}/doc/en && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
diff --git a/dns/maradns/distinfo b/dns/maradns/distinfo
index fc6f5bc4d912..a036b8ee0b0c 100644
--- a/dns/maradns/distinfo
+++ b/dns/maradns/distinfo
@@ -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 --git a/dns/maradns/files/patch-configure b/dns/maradns/files/patch-configure
index 15a3fdbf9480..37113fdad10e 100644
--- a/dns/maradns/files/patch-configure
+++ b/dns/maradns/files/patch-configure
@@ -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 --git a/dns/maradns/files/patch-tools__Makefile b/dns/maradns/files/patch-tools__Makefile
index e9221ffd6210..e341de5f2c50 100644
--- a/dns/maradns/files/patch-tools__Makefile
+++ b/dns/maradns/files/patch-tools__Makefile
@@ -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)