From owner-svn-ports-all@freebsd.org Fri Oct 16 14:19:02 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5A5AFA16C3C; Fri, 16 Oct 2015 14:19:02 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 28BD01DC6; Fri, 16 Oct 2015 14:19:02 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9GEJ1u9049618; Fri, 16 Oct 2015 14:19:01 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9GEJ0Lt049613; Fri, 16 Oct 2015 14:19:00 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201510161419.t9GEJ0Lt049613@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Fri, 16 Oct 2015 14:19:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r399477 - in head/dns/maradns: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 16 Oct 2015 14:19:02 -0000 Author: mat Date: Fri Oct 16 14:19:00 2015 New Revision: 399477 URL: https://svnweb.freebsd.org/changeset/ports/399477 Log: Update to 2.0.13. PR: 203810 Sponsored by: Absolight Added: head/dns/maradns/files/patch-build_Makefile.freebsd (contents, props changed) Modified: head/dns/maradns/Makefile head/dns/maradns/distinfo head/dns/maradns/files/patch-MaraDns.h head/dns/maradns/pkg-plist Modified: head/dns/maradns/Makefile ============================================================================== --- head/dns/maradns/Makefile Fri Oct 16 14:00:31 2015 (r399476) +++ head/dns/maradns/Makefile Fri Oct 16 14:19:00 2015 (r399477) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= maradns -PORTVERSION= 2.0.12 +PORTVERSION= 2.0.13 CATEGORIES= dns MASTER_SITES= http://maradns.samiam.org/download/2.0/${PORTVERSION}/\ SF/${PORTNAME}/MaraDNS/${PORTVERSION}/ @@ -13,7 +13,7 @@ COMMENT= DNS server with focus on securi LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -DEADWOOD_VER= 3.2.08 +DEADWOOD_VER= 3.2.09 REINPLACE_ARGS= -i "" MAKE_ENV= FLAGS="${CFLAGS}" @@ -21,57 +21,57 @@ CONFIGURE_ENV= LANG= HAS_CONFIGURE= yes USE_RC_SUBR= ${PORTNAME} zoneserver Deadwood -USES= tar:bz2 +USES= tar:bz2 shebangfix USERS= bind GROUPS= bind INSTALL_TARGET= install PREFIX=${STAGEDIR}${PREFIX} +SHEBANG_FILES= ${WRKSRC}/tools/bind2csv2.py -OPTIONS_DEFINE= IPV6 DOCS EXAMPLES +OPTIONS_DEFINE= IPV6 DOCS EXAMPLES CONV +OPTIONS_SUB= yes +CONV_DESC= Install bind2csv2 tool (needs python) IPV6_CONFIGURE_ON= --ipv6 +CONV_USES= python:run PORTDOCS= * PORTEXAMPLES= * post-patch: - @${REINPLACE_CMD} -e 's|cc|${CC}|' ${WRKSRC}/build/Makefile.freebsd + @${REINPLACE_CMD} -e 's|\|${CC}|' ${WRKSRC}/build/Makefile.freebsd @${FIND} ${WRKSRC} -type f ! -name "*.orig" | ${XARGS} ${REINPLACE_CMD} -e \ - 's|/etc/maradns|${ETCDIR}|g; s|/etc/mararc|${ETCDIR}|g' -e\ - 's|/etc/deadwood|${ETCDIR}|g' -e\ - 's| = 99| = 53|g' + 's|/etc/maradns|${ETCDIR}|g; s|/etc/mararc|${ETCDIR}|g; \ + s|/etc/deadwood|${ETCDIR}|g; s| = 99| = 53|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/getzone ${STAGEDIR}${PREFIX}/bin ${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/askmara.1 ${STAGEDIR}${MANPREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/en/man/getzone.1 ${STAGEDIR}${MANPREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/en/man/fetchzone.1 ${STAGEDIR}${MANPREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/doc/en/man/maradns.8 ${STAGEDIR}${MANPREFIX}/man/man8 - ${INSTALL_MAN} ${WRKSRC}/doc/en/man/zoneserver.8 ${STAGEDIR}${MANPREFIX}/man/man8 - ${INSTALL_MAN} ${WRKSRC}/doc/en/man/duende.8 ${STAGEDIR}${MANPREFIX}/man/man8 - ${INSTALL_MAN} ${WRKSRC}/doc/en/man/mararc.5 ${STAGEDIR}${MANPREFIX}/man/man5 - ${INSTALL_MAN} ${WRKSRC}/doc/en/man/csv1.5 ${STAGEDIR}${MANPREFIX}/man/man5 - ${INSTALL_MAN} ${WRKSRC}/doc/en/man/csv2.5 ${STAGEDIR}${MANPREFIX}/man/man5 - ${INSTALL_MAN} ${WRKSRC}/doc/en/man/csv2_txt.5 ${STAGEDIR}${MANPREFIX}/man/man5 - ${INSTALL_MAN} ${WRKSRC}/doc/en/man/Deadwood.1 ${STAGEDIR}${MANPREFIX}/man/man1 + ${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 @${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 +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc/en && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} @${RM} -rf ${STAGEDIR}${DOCSDIR}/man \ ${STAGEDIR}${DOCSDIR}/source \ ${STAGEDIR}${DOCSDIR}/pdf @${FIND} ${STAGEDIR}${DOCSDIR} -name Makefile -delete + +post-install-EXAMPLES-on: ${MV} ${STAGEDIR}${DOCSDIR}/examples ${STAGEDIR}${EXAMPLESDIR} .include Modified: head/dns/maradns/distinfo ============================================================================== --- head/dns/maradns/distinfo Fri Oct 16 14:00:31 2015 (r399476) +++ head/dns/maradns/distinfo Fri Oct 16 14:19:00 2015 (r399477) @@ -1,2 +1,2 @@ -SHA256 (maradns-2.0.12.tar.bz2) = a7683749d312f469e7f42d0f9b74588eb207bfa69391a9f2364b67af83d32ebc -SIZE (maradns-2.0.12.tar.bz2) = 1159457 +SHA256 (maradns-2.0.13.tar.bz2) = 661ea06fb18df6d2469b2bf824ffd93545a091af185362cbc738d1aa408210c3 +SIZE (maradns-2.0.13.tar.bz2) = 1148494 Modified: head/dns/maradns/files/patch-MaraDns.h ============================================================================== --- head/dns/maradns/files/patch-MaraDns.h Fri Oct 16 14:00:31 2015 (r399476) +++ head/dns/maradns/files/patch-MaraDns.h Fri Oct 16 14:19:00 2015 (r399477) @@ -1,6 +1,6 @@ ---- ./MaraDns.h.orig 2014-02-12 08:17:18.000000000 +0000 -+++ ./MaraDns.h 2014-02-20 15:23:22.000000000 +0000 -@@ -77,21 +77,21 @@ +--- MaraDns.h.orig 2015-09-26 05:35:18 UTC ++++ MaraDns.h +@@ -71,21 +71,21 @@ line to point to Bash */ Added: head/dns/maradns/files/patch-build_Makefile.freebsd ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/maradns/files/patch-build_Makefile.freebsd Fri Oct 16 14:19:00 2015 (r399477) @@ -0,0 +1,12 @@ +--- build/Makefile.freebsd.orig 2012-02-12 06:04:11 UTC ++++ build/Makefile.freebsd +@@ -47,7 +47,8 @@ all: + cd ../qual ; make $(M) ; cd ../server ; \ + make $(M) $(Q) COMPILED=\"$(COMPILED)\" $(V) ; \ + cd ../tools ; make $(M) ; \ +- cd ../deadwood-*/src/ ; make FLAGS="-O2"; \ ++ cd misc ; make $(M) ; \ ++ cd ../../deadwood-*/src/ ; make FLAGS="-O2"; \ + cd ../../tcp ; make $(M) $(V) ; cat ../00README.FIRST + + debug: Modified: head/dns/maradns/pkg-plist ============================================================================== --- head/dns/maradns/pkg-plist Fri Oct 16 14:00:31 2015 (r399476) +++ head/dns/maradns/pkg-plist Fri Oct 16 14:19:00 2015 (r399477) @@ -1,14 +1,18 @@ bin/askmara +%%CONV%%bin/bind2csv2 bin/duende bin/fetchzone bin/getzone +bin/mqhash @sample %%ETCDIR%%/csv2.sample @sample %%ETCDIR%%/dwood3rc.sample @sample %%ETCDIR%%/mararc.sample man/man1/Deadwood.1.gz man/man1/askmara.1.gz +man/man1/bind2csv2.1.gz man/man1/fetchzone.1.gz man/man1/getzone.1.gz +man/man1/mqhash.1.gz man/man5/csv1.5.gz man/man5/csv2.5.gz man/man5/csv2_txt.5.gz