From owner-svn-ports-head@FreeBSD.ORG Mon Nov 17 17:51:53 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 477811FD; Mon, 17 Nov 2014 17:51:53 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 33CE1C55; Mon, 17 Nov 2014 17:51:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAHHprOC085333; Mon, 17 Nov 2014 17:51:53 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAHHpqwO085328; Mon, 17 Nov 2014 17:51:52 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201411171751.sAHHpqwO085328@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Mon, 17 Nov 2014 17:51:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372675 - in head/dns: bind910 bind99 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.18-1 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: Mon, 17 Nov 2014 17:51:53 -0000 Author: mat Date: Mon Nov 17 17:51:51 2014 New Revision: 372675 URL: https://svnweb.freebsd.org/changeset/ports/372675 QAT: https://qat.redports.org/buildarchive/r372675/ Log: Install the bind.keys file with the root and dlv.isc.org keys. Sponsored by: Absolight Modified: head/dns/bind910/Makefile head/dns/bind910/pkg-plist head/dns/bind99/Makefile head/dns/bind99/pkg-plist Modified: head/dns/bind910/Makefile ============================================================================== --- head/dns/bind910/Makefile Mon Nov 17 17:33:11 2014 (r372674) +++ head/dns/bind910/Makefile Mon Nov 17 17:51:51 2014 (r372675) @@ -2,6 +2,7 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/} +PORTREVISION= 1 CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX?= 910 @@ -196,19 +197,11 @@ PORTDOCS= * post-patch: .for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \ rndc/rndc.8 - @${MV} ${WRKSRC}/bin/${FILE} ${WRKSRC}/bin/${FILE}.Dist - @${SED} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \ + @${REINPLACE_CMD} -e 's#/etc/named.conf#${ETCDIR}/named.conf#g' \ -e 's#/etc/rndc.conf#${ETCDIR}/rndc.conf#g' \ -e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \ - ${WRKSRC}/bin/${FILE}.Dist > ${WRKSRC}/bin/${FILE} + ${WRKSRC}/bin/${FILE} .endfor - @${MV} ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in.Dist - @${SED} -e 's#.*bind\.keys.*##' ${WRKSRC}/Makefile.in.Dist > \ - ${WRKSRC}/Makefile.in - @${MV} ${WRKSRC}/bin/named/Makefile.in ${WRKSRC}/bin/named/Makefile.in.Dist - @${SED} -e 's/$${PERL}/#/' -e 's/bind.keys.h/#/g' -e 's/bind9.xsl.h/#/g' \ - ${WRKSRC}/bin/named/Makefile.in.Dist > \ - ${WRKSRC}/bin/named/Makefile.in post-install: .if ${PORT_OPTIONS:MDOCS} Modified: head/dns/bind910/pkg-plist ============================================================================== --- head/dns/bind910/pkg-plist Mon Nov 17 17:33:11 2014 (r372674) +++ head/dns/bind910/pkg-plist Mon Nov 17 17:51:51 2014 (r372675) @@ -408,6 +408,7 @@ sbin/rndc sbin/rndc-confgen sbin/tsig-keygen %%ETCDIR%%/rndc.conf.sample +%%NOBASE%%%%ETCDIR%%/bind.keys %%NOBASE%%@sample %%ETCDIR%%/named.conf.sample %%NOBASE%%%%ETCDIR%%/named.root %%NOBASE%%%%ETCDIR%%/master/empty.db Modified: head/dns/bind99/Makefile ============================================================================== --- head/dns/bind99/Makefile Mon Nov 17 17:33:11 2014 (r372674) +++ head/dns/bind99/Makefile Mon Nov 17 17:51:51 2014 (r372675) @@ -2,6 +2,7 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/} +PORTREVISION= 1 CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX= 99 @@ -177,6 +178,7 @@ PKGDEINSTALL= ${PKGINSTALL} CONFIGURE_ARGS+= --prefix=${PREFIX} \ --sysconfdir=${BIND_DESTETC} SUB_LIST+= BIND_DESTETC="${BIND_DESTETC}" +PLIST_SUB+= BIND_DESTETC="${BIND_DESTETC}" PORTDOCS= * @@ -197,19 +199,11 @@ WITH_OPENSSL_PORT= yes post-patch: .for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \ rndc/rndc.8 - @${MV} ${WRKSRC}/bin/${FILE} ${WRKSRC}/bin/${FILE}.Dist - @${SED} -e 's#/etc/named.conf#${BIND_DESTETC}/named.conf#g' \ + @${REINPLACE_CMD} -e 's#/etc/named.conf#${BIND_DESTETC}/named.conf#g' \ -e 's#/etc/rndc.conf#${BIND_DESTETC}/rndc.conf#g' \ -e "s#/var\/run\/named\/named.pid#/var/run/named/pid#" \ - ${WRKSRC}/bin/${FILE}.Dist > ${WRKSRC}/bin/${FILE} + ${WRKSRC}/bin/${FILE} .endfor - @${MV} ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in.Dist - @${SED} -e 's#.*bind\.keys.*##' ${WRKSRC}/Makefile.in.Dist > \ - ${WRKSRC}/Makefile.in - @${MV} ${WRKSRC}/bin/named/Makefile.in ${WRKSRC}/bin/named/Makefile.in.Dist - @${SED} -e 's/$${PERL}/#/' -e 's/bind.keys.h/#/g' -e 's/bind9.xsl.h/#/g' \ - ${WRKSRC}/bin/named/Makefile.in.Dist > \ - ${WRKSRC}/bin/named/Makefile.in post-configure: @${REINPLACE_CMD} -e '/^SO_LDFLAGS/s/-Wl,-rpath,/-rpath /' ${WRKSRC}/bin/tests/system/dlzexternal/Makefile Modified: head/dns/bind99/pkg-plist ============================================================================== --- head/dns/bind99/pkg-plist Mon Nov 17 17:33:11 2014 (r372674) +++ head/dns/bind99/pkg-plist Mon Nov 17 17:51:51 2014 (r372675) @@ -374,6 +374,8 @@ sbin/named-journalprint sbin/nsec3hash sbin/rndc sbin/rndc-confgen +%%BASE%%%%BIND_DESTETC%%/bind.keys +%%NOBASE%%%%ETCDIR%%/bind.keys %%NOBASE%%@sample %%ETCDIR%%/named.conf.sample %%NOBASE%%%%ETCDIR%%/named.root %%NOBASE%%%%ETCDIR%%/master/empty.db