From owner-svn-ports-head@FreeBSD.ORG Thu Feb 20 15:44:59 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 61DC18F7; Thu, 20 Feb 2014 15:44:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4C6CF1FC9; Thu, 20 Feb 2014 15:44:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1KFixX7022796; Thu, 20 Feb 2014 15:44:59 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1KFiu58022783; Thu, 20 Feb 2014 15:44:56 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201402201544.s1KFiu58022783@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 20 Feb 2014 15:44:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345251 - in head/dns: . maradns maradns/files maradns1 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 20 Feb 2014 15:44:59 -0000 Author: mat Date: Thu Feb 20 15:44:56 2014 New Revision: 345251 URL: http://svnweb.freebsd.org/changeset/ports/345251 QAT: https://qat.redports.org/buildarchive/r345251/ Log: Update dns/maradns to 2.0.09. Copy maradns 1.4.14 to dns/maradns1. Sponsored by: Absolight Added: head/dns/maradns/files/Deadwood.in (contents, props changed) head/dns/maradns/files/patch-configure (contents, props changed) head/dns/maradns/files/patch-tools__Makefile (contents, props changed) head/dns/maradns1/ - copied from r345218, head/dns/maradns/ Deleted: head/dns/maradns/files/patch-build_Makefile.freebsd head/dns/maradns/files/patch-example_full_mararc head/dns/maradns/files/patch-tools_Makefile.recursive head/dns/maradns/files/patch-tools_duende.c Modified: head/dns/Makefile head/dns/maradns/Makefile head/dns/maradns/distinfo head/dns/maradns/files/maradns.in head/dns/maradns/files/patch-MaraDns.h head/dns/maradns/files/zoneserver.in head/dns/maradns/pkg-descr head/dns/maradns/pkg-plist head/dns/maradns1/Makefile Modified: head/dns/Makefile ============================================================================== --- head/dns/Makefile Thu Feb 20 15:41:30 2014 (r345250) +++ head/dns/Makefile Thu Feb 20 15:44:56 2014 (r345251) @@ -71,6 +71,7 @@ SUBDIR += libidn SUBDIR += linux-f10-libasyncns SUBDIR += maradns + SUBDIR += maradns1 SUBDIR += mdnsd SUBDIR += mydns SUBDIR += mydns-ng Modified: head/dns/maradns/Makefile ============================================================================== --- head/dns/maradns/Makefile Thu Feb 20 15:41:30 2014 (r345250) +++ head/dns/maradns/Makefile Thu Feb 20 15:44:56 2014 (r345251) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= maradns -PORTVERSION= 1.4.14 +PORTVERSION= 2.0.09 CATEGORIES= dns -MASTER_SITES= http://maradns.samiam.org/download/1.4/\ - http://www.maradns.org/download/1.4/ +MASTER_SITES= http://www.maradns.org/download/2.0/${PORTVERSION}/\ + SF/${PORTNAME}/MaraDNS/${PORTVERSION}/ MAINTAINER= mat@FreeBSD.org COMMENT= DNS server with focus on security and simplicity @@ -13,28 +13,36 @@ COMMENT= DNS server with focus on securi LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING -DEPRECATED= MaraDNS 1 end-of-life: June 21, 2015 -EXPIRATION_DATE=2015-06-21 +DEADWOOD_VER= 3.2.05 REINPLACE_ARGS= -i "" MAKE_ENV= FLAGS="${CFLAGS}" +CONFIGURE_ENV= LANG= -USE_RC_SUBR= ${PORTNAME} zoneserver +HAS_CONFIGURE= yes +USE_BZIP2= yes +USE_RC_SUBR= ${PORTNAME} zoneserver Deadwood USERS= bind GROUPS= bind +INSTALL_TARGET= install PREFIX=${STAGEDIR}${PREFIX} -OPTIONS_DEFINE= DOCS EXAMPLES +OPTIONS_DEFINE= IPV6 DOCS EXAMPLES +OPTIONS_DEFAULT= IPV6 +IPV6_DESC= With support for IPv6 -.include +IPV6_CONFIGURE_ON= --ipv6 + +PORTDOCS= * +PORTEXAMPLES= * post-patch: - @${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \ - 's|/etc/maradns|${ETCDIR}|g; s|/etc/mararc|${ETCDIR}|g' - @${FIND} ${WRKSRC} -name '*Makefile*' | ${XARGS} ${REINPLACE_CMD} -e \ - 's|make|\$$\{MAKE\}|g ; \ - s|^FLAGS =|#FLAGS =|g' + @${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' 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 @@ -52,26 +60,19 @@ do-install: ${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_DATA} ${WRKSRC}/doc/en/examples/example_full_mararc ${STAGEDIR}${PREFIX}/etc/mararc.sample - - ${MKDIR} ${STAGEDIR}${ETCDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_csv2 ${STAGEDIR}${ETCDIR}/example_csv2 - ${MKDIR} ${STAGEDIR}${ETCDIR}/logger - -.if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - (cd ${WRKSRC}/doc/en/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) -.endif -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR}/en - ${INSTALL_DATA} ${WRKSRC}/doc/en/*.* ${STAGEDIR}${DOCSDIR}/en - ${INSTALL_DATA} ${WRKSRC}/doc/en/QuickStart ${STAGEDIR}${DOCSDIR}/en - ${INSTALL_DATA} ${WRKSRC}/doc/en/README ${STAGEDIR}${DOCSDIR}/en - (cd ${WRKSRC}/doc/en && ${COPYTREE_SHARE} misc ${STAGEDIR}${DOCSDIR}/en) - (cd ${WRKSRC}/doc/en && ${COPYTREE_SHARE} pdf ${STAGEDIR}${DOCSDIR}/en) - (cd ${WRKSRC}/doc/en && ${COPYTREE_SHARE} tutorial ${STAGEDIR}${DOCSDIR}/en) - (cd ${WRKSRC}/doc/en && ${COPYTREE_SHARE} text ${STAGEDIR}${DOCSDIR}/en) -.endif + @${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 + + @${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 + ${MV} ${STAGEDIR}${DOCSDIR}/examples ${STAGEDIR}${EXAMPLESDIR} .include Modified: head/dns/maradns/distinfo ============================================================================== --- head/dns/maradns/distinfo Thu Feb 20 15:41:30 2014 (r345250) +++ head/dns/maradns/distinfo Thu Feb 20 15:44:56 2014 (r345251) @@ -1,2 +1,2 @@ -SHA256 (maradns-1.4.14.tar.gz) = 5002ef64a69e74bb09d67bee2f7631ace56e2b4a980af777c2e36b9c5a77db32 -SIZE (maradns-1.4.14.tar.gz) = 1662365 +SHA256 (maradns-2.0.09.tar.bz2) = e1ee80836f0fbc47b9b94ec839e112ea19c40bed0b70d672d231849a4dea1083 +SIZE (maradns-2.0.09.tar.bz2) = 1139409 Added: head/dns/maradns/files/Deadwood.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/maradns/files/Deadwood.in Thu Feb 20 15:44:56 2014 (r345251) @@ -0,0 +1,25 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: Deadwood +# REQUIRE: SERVERS +# BEFORE: DAEMON +# KEYWORD: shutdown +# + +. /etc/rc.subr + +: ${dwood3_enable="NO"} +: ${dwood3_conf="%%ETCDIR%%/dwood3rc"} + +name="Deadwood" +rcvar=dwood3_enable +command="%%PREFIX%%/bin/duende" +pidfile="/var/run/${name}.pid" +command_args="--pid=${pidfile} %%PREFIX%%/sbin/Deadwood -f ${dwood3_conf}" + +load_rc_config $name + +run_rc_command "$1" Modified: head/dns/maradns/files/maradns.in ============================================================================== --- head/dns/maradns/files/maradns.in Thu Feb 20 15:41:30 2014 (r345250) +++ head/dns/maradns/files/maradns.in Thu Feb 20 15:44:56 2014 (r345251) @@ -12,13 +12,13 @@ . /etc/rc.subr : ${maradns_enable="NO"} -: ${maradns_conf="%%PREFIX%%/etc/mararc"} +: ${maradns_conf="%%ETCDIR%%/mararc"} name="maradns" rcvar=maradns_enable command="%%PREFIX%%/bin/duende" -command_args="%%PREFIX%%/sbin/maradns -f ${maradns_conf}" pidfile="/var/run/${name}.pid" +command_args="--pid=${pidfile} %%PREFIX%%/sbin/maradns -f ${maradns_conf}" load_rc_config $name Modified: head/dns/maradns/files/patch-MaraDns.h ============================================================================== --- head/dns/maradns/files/patch-MaraDns.h Thu Feb 20 15:41:30 2014 (r345250) +++ head/dns/maradns/files/patch-MaraDns.h Thu Feb 20 15:44:56 2014 (r345251) @@ -1,6 +1,15 @@ ---- MaraDns.h.orig Sat Jun 2 13:46:12 2007 -+++ MaraDns.h Sat Jun 2 13:47:12 2007 -@@ -75,16 +75,16 @@ +--- ./MaraDns.h.orig 2014-02-12 08:17:18.000000000 +0000 ++++ ./MaraDns.h 2014-02-20 15:23:22.000000000 +0000 +@@ -54,7 +54,7 @@ + /* The default UID (User ID) that MaraDNS has; I put this here so packagers + can change this easily. This should be the 'nobody' user, or, optionally + a special 'MaraDNS' user. This user needs to be able to enter +- the /etc/maradns directory, and read all zone files in /etc/maradns ++ the /usr/local/usr/local/usr/local/etc/maradns directory, and read all zone files in /usr/local/usr/local/usr/local/etc/maradns + + If you change this from 99, please also change the mararc man page, which + states the default value for this is 99. To change the man page: +@@ -77,21 +77,21 @@ line to point to Bash */ @@ -20,3 +29,9 @@ /* The directory that Duende runs in. This directory has to exist for Duende to be able to run. Again, IF YOU CHANGE THIS, CHANGE THE + DUENDE MAN PAGE */ +-#define DUENDE_CHROOT_DIR "/etc/maradns/logger" ++#define DUENDE_CHROOT_DIR "/var/empty/" + + /* The default IP address that Askmara uses; this used to be 127.0.0.3 + but is now 127.0.0.1 because many non-Linux systems only use 127.0.0.1 Added: head/dns/maradns/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/maradns/files/patch-configure Thu Feb 20 15:44:56 2014 (r345251) @@ -0,0 +1,12 @@ +--- ./configure.orig 2014-01-14 21:46:25.000000000 +0000 ++++ ./configure 2014-02-20 15:33:18.000000000 +0000 +@@ -93,6 +93,9 @@ + echo It looks like you are using Cygwin\; this should compile fine + echo by typing in \'make\'. + EXITCODE=0 ++elif echo $UNAME | grep -i freebsd > /dev/null ; then ++ cat $BUILDDIR/Makefile.freebsd >> Makefile ++ EXITCODE=0 + # This is a a template for adding support to a new OS for MaraDNS. + # Some points: If you port MaraDNS, make sure the underlying OS has + # /dev/urandom support or have the default mararc have a Added: head/dns/maradns/files/patch-tools__Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/dns/maradns/files/patch-tools__Makefile Thu Feb 20 15:44:56 2014 (r345251) @@ -0,0 +1,11 @@ +--- ./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 @@ + rm -f core $(EXECS) *.exe + + askmara: askmara.c askmara_labels_en.h $(OBJECTS) $(Q) $(OUTOBJ) +- $(CC) $(FLAGS) -DAUTHONLY -o askmara askmara.c $(OBJECTS) $(Q) $(OUTOBJ) ++ $(CC) $(FLAGS) -DAUTHONLY -DIPV6 -o askmara askmara.c $(OBJECTS) $(Q) $(OUTOBJ) + + askmara-tcp: askmara-tcp.c askmara_labels_en.h $(OBJECTS) $(ROBJECTS) $(POBJECTS) + $(CC) $(FLAGS) -o askmara-tcp askmara-tcp.c $(OBJECTS) $(ROBJECTS) $(POBJECTS) Modified: head/dns/maradns/files/zoneserver.in ============================================================================== --- head/dns/maradns/files/zoneserver.in Thu Feb 20 15:41:30 2014 (r345250) +++ head/dns/maradns/files/zoneserver.in Thu Feb 20 15:44:56 2014 (r345251) @@ -12,13 +12,13 @@ . /etc/rc.subr : ${zoneserver_enable="NO"} -: ${maradns_conf="%%PREFIX%%/etc/mararc"} +: ${maradns_conf="%%ETCDIR%%/mararc"} name="zoneserver" rcvar=zoneserver_enable command="%%PREFIX%%/bin/duende" -command_args="%%PREFIX%%/sbin/zoneserver -f ${maradns_conf}" pidfile="/var/run/${name}.pid" +command_args="--pid=${pidfile} %%PREFIX%%/sbin/zoneserver -f ${maradns_conf}" load_rc_config $name Modified: head/dns/maradns/pkg-descr ============================================================================== --- head/dns/maradns/pkg-descr Thu Feb 20 15:41:30 2014 (r345250) +++ head/dns/maradns/pkg-descr Thu Feb 20 15:44:56 2014 (r345251) @@ -1,23 +1,6 @@ MaraDNS is a package that implements the Domain Name Service (DNS), an -essential internet service. MaraDNS has the following advantages: +essential internet service. +People like MaraDNS because it's small, lightweight, easy to set up, and +remarkably secure. -o Secure. MaraDNS has a security history as good as or better than any other DNS - server. For example, MaraDNS has always randomized, using a secure random - number generator, the Query ID and source port of DNS queries; and was never - vulnerable to the "new" cache poisoning attack. -o Supported. MaraDNS has a long history of being maintained and updated. - Actively developed since 2001, MaraDNS continues to be fully supported: The - most recent release was done on August 4, 2009. Deadwood, the code that will - become part of MaraDNS 2.0, is frequently updated. -o Easy to use. A basic recursive configuration needs only a single three-line - configuration file. A basic authoritative configuration needs only a four-line - configuration file and a one-line zone file. MaraDNS is fully documented, with - both easy-to-follow tutorials and a complete and up-to-date reference manual. -o Small. MaraDNS is well suited for embedded applications and other environments - where the server must use the absolute minimum number of resources possible. - MaraDNS' binary is smaller than that of any other currently maintained - recursive DNS server. -o Open Source. MaraDNS is fully open-source, The license is a two-clause BSD - license that is almost identical to the FreeBSD license. - -WWW: http://www.maradns.org/ +WWW: http://maradns.org/ Modified: head/dns/maradns/pkg-plist ============================================================================== --- head/dns/maradns/pkg-plist Thu Feb 20 15:41:30 2014 (r345250) +++ head/dns/maradns/pkg-plist Thu Feb 20 15:44:56 2014 (r345251) @@ -2,8 +2,16 @@ bin/askmara bin/duende bin/fetchzone bin/getzone -%%ETCDIR%%/example_csv2 -etc/mararc.sample +@unexec if cmp -s %D/%%ETCDIR%%/csv2.sample %D/%%ETCDIR%%/csv2; then rm -f %D/%%ETCDIR%%/csv2; fi +%%ETCDIR%%/csv2.sample +@exec if [ ! -f %D/%%ETCDIR%%/csv2 ] ; then cp -p %D/%F %B/csv2; fi +@unexec if cmp -s %D/%%ETCDIR%%/dwood3rc.sample %D/%%ETCDIR%%/dwood3rc; then rm -f %D/%%ETCDIR%%/dwood3rc; fi +%%ETCDIR%%/dwood3rc.sample +@exec if [ ! -f %D/%%ETCDIR%%/dwood3rc ] ; then cp -p %D/%F %B/dwood3rc; fi +@unexec if cmp -s %D/%%ETCDIR%%/mararc.sample %D/%%ETCDIR%%/mararc; then rm -f %D/%%ETCDIR%%/mararc; fi +%%ETCDIR%%/mararc.sample +@exec if [ ! -f %D/%%ETCDIR%%/mararc ] ; then cp -p %D/%F %B/mararc; fi +man/man1/Deadwood.1.gz man/man1/askmara.1.gz man/man1/fetchzone.1.gz man/man1/getzone.1.gz @@ -14,147 +22,7 @@ man/man5/mararc.5.gz man/man8/duende.8.gz man/man8/maradns.8.gz man/man8/zoneserver.8.gz +sbin/Deadwood sbin/maradns sbin/zoneserver -%%PORTDOCS%%%%DOCSDIR%%/en/QuickStart -%%PORTDOCS%%%%DOCSDIR%%/en/README -%%PORTDOCS%%%%DOCSDIR%%/en/changelog.txt -%%PORTDOCS%%%%DOCSDIR%%/en/credits.txt -%%PORTDOCS%%%%DOCSDIR%%/en/faq.html -%%PORTDOCS%%%%DOCSDIR%%/en/faq.txt -%%PORTDOCS%%%%DOCSDIR%%/en/files.txt -%%PORTDOCS%%%%DOCSDIR%%/en/misc/0README -%%PORTDOCS%%%%DOCSDIR%%/en/misc/csv2.regexmatch.functionlist -%%PORTDOCS%%%%DOCSDIR%%/en/misc/dns-record-types.txt -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/README -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_alloc.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_append.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_atoi.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_buf_eof.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_buf_getline.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_buf_read.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_close.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_copy.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_create.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_dealloc.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_destroy.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_destroy_force.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_fgrep.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_fgrep_offset.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_get_encode.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_getline_stdin.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_has_sanity.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_insert.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_issame.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_js2str.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_length.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_lock.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_match.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_match_offset.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_newline_chars.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_nonmatch.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_nonmatch_offset.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_octets.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_open.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_open_append.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_open_read.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_open_write.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_qstr2js.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_read.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_set_chsize.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_set_encode.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_show_stdout.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_space_chars.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_str2js.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_substr.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_tolower.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_unlock.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_val.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/js-manpages/js_write.3 -%%PORTDOCS%%%%DOCSDIR%%/en/misc/multiple.qdcount -%%PORTDOCS%%%%DOCSDIR%%/en/misc/propagation.txt -%%PORTDOCS%%%%DOCSDIR%%/en/misc/recursive.algorithm -%%PORTDOCS%%%%DOCSDIR%%/en/misc/setup.bind.djbdns.axfr.test -%%PORTDOCS%%%%DOCSDIR%%/en/misc/vim.cheatsheet -%%PORTDOCS%%%%DOCSDIR%%/en/misc/year_2038_statement.txt -%%PORTDOCS%%%%DOCSDIR%%/en/pdf/Makefile -%%PORTDOCS%%%%DOCSDIR%%/en/pdf/README -%%PORTDOCS%%%%DOCSDIR%%/en/pdf/tmac.an.patch -%%PORTDOCS%%%%DOCSDIR%%/en/text/Makefile -%%PORTDOCS%%%%DOCSDIR%%/en/text/authoritative.txt -%%PORTDOCS%%%%DOCSDIR%%/en/text/bind2csv2.txt -%%PORTDOCS%%%%DOCSDIR%%/en/text/coding_style.txt -%%PORTDOCS%%%%DOCSDIR%%/en/text/compile.txt -%%PORTDOCS%%%%DOCSDIR%%/en/text/convert.txt -%%PORTDOCS%%%%DOCSDIR%%/en/text/dangling.txt -%%PORTDOCS%%%%DOCSDIR%%/en/text/default_zonefile.txt -%%PORTDOCS%%%%DOCSDIR%%/en/text/dnsintro.txt -%%PORTDOCS%%%%DOCSDIR%%/en/text/dnsmaster.txt -%%PORTDOCS%%%%DOCSDIR%%/en/text/dnsslave.txt -%%PORTDOCS%%%%DOCSDIR%%/en/text/dnstcp.txt -%%PORTDOCS%%%%DOCSDIR%%/en/text/glossary.txt -%%PORTDOCS%%%%DOCSDIR%%/en/text/man.askmara.txt -%%PORTDOCS%%%%DOCSDIR%%/en/text/man.csv2.txt -%%PORTDOCS%%%%DOCSDIR%%/en/text/man.csv2_txt.txt -%%PORTDOCS%%%%DOCSDIR%%/en/text/man.duende.txt -%%PORTDOCS%%%%DOCSDIR%%/en/text/man.fetchzone.txt -%%PORTDOCS%%%%DOCSDIR%%/en/text/man.maradns.txt -%%PORTDOCS%%%%DOCSDIR%%/en/text/man.mararc.txt -%%PORTDOCS%%%%DOCSDIR%%/en/text/man.zoneserver.txt -%%PORTDOCS%%%%DOCSDIR%%/en/text/quick_start.txt -%%PORTDOCS%%%%DOCSDIR%%/en/text/recordtypes.txt -%%PORTDOCS%%%%DOCSDIR%%/en/text/recursive.txt -%%PORTDOCS%%%%DOCSDIR%%/en/text/troubleshoot.txt -%%PORTDOCS%%%%DOCSDIR%%/en/text/tutorial.txt -%%PORTDOCS%%%%DOCSDIR%%/en/text/update.txt -%%PORTDOCS%%%%DOCSDIR%%/en/text/win_service.txt -%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/00index.html -%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/Makefile -%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/authoritative.html -%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/bind2csv2.html -%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/coding_style.html -%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/compile.html -%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/convert.html -%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/dangling.html -%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/default_zonefile.html -%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/dnsintro.html -%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/dnsmaster.html -%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/dnsslave.html -%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/dnstcp.html -%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/glossary.html -%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/index.html -%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/make.index -%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.askmara.html -%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.csv2.html -%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.csv2_txt.html -%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.duende.html -%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.fetchzone.html -%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.maradns.html -%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.mararc.html -%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/man.zoneserver.html -%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/quick_start.html -%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/recordtypes.html -%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/recursive.html -%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/troubleshoot.html -%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/tutorial.html -%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/update.html -%%PORTDOCS%%%%DOCSDIR%%/en/tutorial/win_service.html -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_authoritative_mararc.txt -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_csv1 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_csv1.txt -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_csv2 -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_full_mararc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_full_mararc.orig -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_mararc -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/example_recursive_mararc.txt -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/tutorial -%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/text -%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/pdf -%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/misc/js-manpages -%%PORTDOCS%%@dirrm %%DOCSDIR%%/en/misc -%%PORTDOCS%%@dirrm %%DOCSDIR%%/en -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrmtry etc/maradns/logger -@dirrmtry etc/maradns +@dirrmtry %%ETCDIR%% Modified: head/dns/maradns1/Makefile ============================================================================== --- head/dns/maradns/Makefile Thu Feb 20 11:20:02 2014 (r345218) +++ head/dns/maradns1/Makefile Thu Feb 20 15:44:56 2014 (r345251) @@ -6,6 +6,7 @@ PORTVERSION= 1.4.14 CATEGORIES= dns MASTER_SITES= http://maradns.samiam.org/download/1.4/\ http://www.maradns.org/download/1.4/ +PKGNAMESUFFIX= 1 MAINTAINER= mat@FreeBSD.org COMMENT= DNS server with focus on security and simplicity @@ -25,8 +26,6 @@ GROUPS= bind OPTIONS_DEFINE= DOCS EXAMPLES -.include - post-patch: @${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \ 's|/etc/maradns|${ETCDIR}|g; s|/etc/mararc|${ETCDIR}|g' @@ -58,12 +57,8 @@ do-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/doc/en/examples/example_csv2 ${STAGEDIR}${ETCDIR}/example_csv2 ${MKDIR} ${STAGEDIR}${ETCDIR}/logger - -.if ${PORT_OPTIONS:MEXAMPLES} @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} (cd ${WRKSRC}/doc/en/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}) -.endif -.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR}/en ${INSTALL_DATA} ${WRKSRC}/doc/en/*.* ${STAGEDIR}${DOCSDIR}/en ${INSTALL_DATA} ${WRKSRC}/doc/en/QuickStart ${STAGEDIR}${DOCSDIR}/en @@ -72,6 +67,5 @@ do-install: (cd ${WRKSRC}/doc/en && ${COPYTREE_SHARE} pdf ${STAGEDIR}${DOCSDIR}/en) (cd ${WRKSRC}/doc/en && ${COPYTREE_SHARE} tutorial ${STAGEDIR}${DOCSDIR}/en) (cd ${WRKSRC}/doc/en && ${COPYTREE_SHARE} text ${STAGEDIR}${DOCSDIR}/en) -.endif .include