From owner-svn-ports-all@FreeBSD.ORG Tue Sep 23 11:22:42 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6FC7F748; Tue, 23 Sep 2014 11:22:42 +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 5A834B0A; Tue, 23 Sep 2014 11:22:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8NBMg3n026564; Tue, 23 Sep 2014 11:22:42 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8NBMfHH026558; Tue, 23 Sep 2014 11:22:41 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201409231122.s8NBMfHH026558@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Tue, 23 Sep 2014 11:22:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r369042 - in head/dns/bind910: . 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.18-1 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: Tue, 23 Sep 2014 11:22:42 -0000 Author: mat Date: Tue Sep 23 11:22:40 2014 New Revision: 369042 URL: http://svnweb.freebsd.org/changeset/ports/369042 QAT: https://qat.redports.org/buildarchive/r369042/ Log: Update to 9.10.1. Sponsored by: Absolight Deleted: head/dns/bind910/files/patch-bin__python__Makefile.in Modified: head/dns/bind910/Makefile head/dns/bind910/distinfo head/dns/bind910/files/named.conf.in head/dns/bind910/pkg-plist Modified: head/dns/bind910/Makefile ============================================================================== --- head/dns/bind910/Makefile Tue Sep 23 11:22:02 2014 (r369041) +++ head/dns/bind910/Makefile Tue Sep 23 11:22:40 2014 (r369042) @@ -2,7 +2,6 @@ PORTNAME= bind PORTVERSION= ${ISCVERSION:S/-P/P/} -PORTREVISION= 5 CATEGORIES= dns net ipv6 MASTER_SITES= ISC/bind9/${ISCVERSION} PKGNAMESUFFIX?= 910 @@ -14,7 +13,7 @@ COMMENT= BIND DNS suite with updated DNS LICENSE= ISCL # ISC releases things like 9.8.0-P1, which our versioning doesn't like -ISCVERSION= 9.10.0-P2 +ISCVERSION= 9.10.1 MAKE_JOBS_UNSAFE= yes @@ -35,7 +34,7 @@ CONFIGURE_ARGS= --localstatedir=/var --d --with-libxml2=${LOCALBASE} ETCDIR= ${PREFIX}/etc/namedb -CONFLICTS= bind9*-9.[456789].* bind9*-sdb-9.[456789].* +CONFLICTS+= bind9*-9.[456789].* bind9*-sdb-9.[456789].* SUB_FILES= pkg-message @@ -117,8 +116,7 @@ GEOIP_LIB_DEPENDS= libGeoIP.so:${PORTSDI GOST_CONFIGURE_WITH= gost PYTHON_CONFIGURE_WITH= python -PYTHON_USE= PYTHON=yes -PYTHON_USES= gmake +PYTHON_USES= python gmake DLZ_POSTGRESQL_CONFIGURE_ON= --with-dlz-postgres=yes DLZ_POSTGRESQL_USE= pgsql=yes @@ -190,6 +188,8 @@ PKGDEINSTALL= ${PKGINSTALL} CONFIGURE_ARGS+= --prefix=${PREFIX} \ --sysconfdir=${ETCDIR} +PORTDOCS= * + .if !defined(BIND_TOOLS_SLAVE) post-patch: .for FILE in check/named-checkconf.8 named/named.8 nsupdate/nsupdate.1 \ @@ -208,15 +208,11 @@ post-patch: ${WRKSRC}/bin/named/Makefile.in.Dist > \ ${WRKSRC}/bin/named/Makefile.in -.if ${PORT_OPTIONS:MDOCS} -PORTDOCS= * -.endif post-install: .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${STAGEDIR}${DOCSDIR}/arm ${STAGEDIR}${DOCSDIR}/misc + ${MKDIR} ${STAGEDIR}${DOCSDIR}/arm ${INSTALL_DATA} ${WRKSRC}/doc/arm/*.html ${STAGEDIR}${DOCSDIR}/arm ${INSTALL_DATA} ${WRKSRC}/doc/arm/Bv9ARM.pdf ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/misc/[a-z]* ${STAGEDIR}${DOCSDIR}/misc ${INSTALL_DATA} ${WRKSRC}/CHANGES ${WRKSRC}/COPYRIGHT ${WRKSRC}/FAQ \ ${WRKSRC}/HISTORY ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} .endif Modified: head/dns/bind910/distinfo ============================================================================== --- head/dns/bind910/distinfo Tue Sep 23 11:22:02 2014 (r369041) +++ head/dns/bind910/distinfo Tue Sep 23 11:22:40 2014 (r369042) @@ -1,2 +1,2 @@ -SHA256 (bind-9.10.0-P2.tar.gz) = 335722ed66ae2cc9ffb2249f47f5cf39c86ebddd0a8ae86ac8282fec17df1e2b -SIZE (bind-9.10.0-P2.tar.gz) = 8335644 +SHA256 (bind-9.10.1.tar.gz) = 5361eca2b8b6bc0b13904b0f964336a478dfbc165711547f6cc3f8752ac60181 +SIZE (bind-9.10.1.tar.gz) = 8353313 Modified: head/dns/bind910/files/named.conf.in ============================================================================== --- head/dns/bind910/files/named.conf.in Tue Sep 23 11:22:02 2014 (r369041) +++ head/dns/bind910/files/named.conf.in Tue Sep 23 11:22:40 2014 (r369042) @@ -1,7 +1,7 @@ // $FreeBSD$ // // Refer to the named.conf(5) and named(8) man pages, and the documentation -// in /usr/share/doc/bind9 for more details. +// in /usr/local/share/doc/bind for more details. // // If you are going to set up an authoritative server, make sure you // understand the hairy details of how DNS works. Even with @@ -52,7 +52,7 @@ options { // the entries in /etc/resolv.conf, uncomment the following line and // set named_auto_forward=yes in /etc/rc.conf. You can also enable // named_auto_forward_only (the effect of which is described above). -// include "/etc/namedb/auto_forward.conf"; +// include "%%ETCDIR%%/auto_forward.conf"; /* Modern versions of BIND use a random UDP port for each outgoing @@ -100,7 +100,7 @@ zone "." { type hint; file "%%ETCDIR%%/n /* zone "." { type slave; - file "/etc/namedb/slave/root.slave"; + file "%%ETCDIR%%/slave/root.slave"; masters { 192.5.5.241; // F.ROOT-SERVERS.NET. }; @@ -108,7 +108,7 @@ zone "." { }; zone "arpa" { type slave; - file "/etc/namedb/slave/arpa.slave"; + file "%%ETCDIR%%/slave/arpa.slave"; masters { 192.5.5.241; // F.ROOT-SERVERS.NET. }; @@ -345,14 +345,14 @@ zone "example.org" { allow-update { key "exampleorgkey"; }; - file "/etc/namedb/dynamic/example.org"; + file "%%ETCDIR%%/dynamic/example.org"; }; */ /* Example of a slave reverse zone zone "1.168.192.in-addr.arpa" { type slave; - file "/etc/namedb/slave/1.168.192.in-addr.arpa"; + file "%%ETCDIR%%/slave/1.168.192.in-addr.arpa"; masters { 192.168.1.1; }; Modified: head/dns/bind910/pkg-plist ============================================================================== --- head/dns/bind910/pkg-plist Tue Sep 23 11:22:02 2014 (r369041) +++ head/dns/bind910/pkg-plist Tue Sep 23 11:22:40 2014 (r369042) @@ -238,6 +238,7 @@ include/lwres/netdb.h include/lwres/platform.h include/lwres/result.h include/lwres/stdlib.h +include/lwres/string.h include/lwres/version.h include/pk11/constants.h include/pk11/internal.h @@ -412,26 +413,7 @@ sbin/tsig-keygen %%NOBASE%%%%ETCDIR%%/master/empty.db %%NOBASE%%%%ETCDIR%%/master/localhost-forward.db %%NOBASE%%%%ETCDIR%%/master/localhost-reverse.db -%%NOBASE%%@exec mkdir -p %D/%%ETCDIR%%/dynamic -%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/dynamic -%%NOBASE%%@dirrmtry %%ETCDIR%%/dynamic -%%NOBASE%%@exec mkdir -p %D/%%ETCDIR%%/master -%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/master -%%NOBASE%%@dirrmtry %%ETCDIR%%/master -%%NOBASE%%@exec mkdir -p %D/%%ETCDIR%%/slave -%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/slave -%%NOBASE%%@dirrmtry %%ETCDIR%%/slave -%%NOBASE%%@exec mkdir -p %D/%%ETCDIR%%/working -%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/working -%%NOBASE%%@dirrmtry %%ETCDIR%%/working -%%NOBASE%%@dirrmtry %%ETCDIR%% -@dirrm include/pkcs11 -@dirrm include/pk11 -@dirrm include/lwres -@dirrm include/isccfg -@dirrm include/isccc -@dirrmtry include/isc -@dirrm include/irs -@dirrm include/dst -@dirrm include/dns -@dirrm include/bind9 +%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/dynamic +%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/master +%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/slave +%%NOBASE%%@dir(bind,bind,) %%ETCDIR%%/working