Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 3 May 2018 14:05:55 +0000 (UTC)
From:      Mathieu Arnold <mat@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r468929 - in head/dns/maradns: . files
Message-ID:  <201805031405.w43E5teP097276@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mat
Date: Thu May  3 14:05:55 2018
New Revision: 468929
URL: https://svnweb.freebsd.org/changeset/ports/468929

Log:
  Update to 2.0.15.
  
  PR:		227802
  Submitted by:	new maintainer
  Sponsored by:	Absolight

Modified:
  head/dns/maradns/Makefile   (contents, props changed)
  head/dns/maradns/distinfo   (contents, props changed)
  head/dns/maradns/files/patch-configure   (contents, props changed)
  head/dns/maradns/files/patch-tools__Makefile   (contents, props changed)

Modified: head/dns/maradns/Makefile
==============================================================================
--- head/dns/maradns/Makefile	Thu May  3 13:42:33 2018	(r468928)
+++ head/dns/maradns/Makefile	Thu May  3 14:05:55 2018	(r468929)
@@ -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
@@ -62,6 +56,9 @@ do-install:
 	${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/bind2csv2
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}

Modified: head/dns/maradns/distinfo
==============================================================================
--- head/dns/maradns/distinfo	Thu May  3 13:42:33 2018	(r468928)
+++ head/dns/maradns/distinfo	Thu May  3 14:05:55 2018	(r468929)
@@ -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

Modified: head/dns/maradns/files/patch-configure
==============================================================================
--- head/dns/maradns/files/patch-configure	Thu May  3 13:42:33 2018	(r468928)
+++ head/dns/maradns/files/patch-configure	Thu May  3 14:05:55 2018	(r468929)
@@ -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

Modified: head/dns/maradns/files/patch-tools__Makefile
==============================================================================
--- head/dns/maradns/files/patch-tools__Makefile	Thu May  3 13:42:33 2018	(r468928)
+++ head/dns/maradns/files/patch-tools__Makefile	Thu May  3 14:05:55 2018	(r468929)
@@ -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)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805031405.w43E5teP097276>