From owner-svn-ports-head@FreeBSD.ORG Mon Jan 6 23:15:21 2014 Return-Path: Delivered-To: svn-ports-head@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 7C030EBD; Mon, 6 Jan 2014 23:15:21 +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 5C72414E3; Mon, 6 Jan 2014 23:15:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s06NFLgp092778; Mon, 6 Jan 2014 23:15:21 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s06NFKGx092774; Mon, 6 Jan 2014 23:15:20 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201401062315.s06NFKGx092774@svn.freebsd.org> From: Mathieu Arnold Date: Mon, 6 Jan 2014 23:15:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338952 - in head/dns: bind98 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.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: Mon, 06 Jan 2014 23:15:21 -0000 Author: mat Date: Mon Jan 6 23:15:20 2014 New Revision: 338952 URL: http://svnweb.freebsd.org/changeset/ports/338952 Log: Yet another round of fixes. This time, it seems all of REPLACE_BASE, not REPLACE_BASE and post Bind removal from base seem to work consistently. Modified: head/dns/bind98/Makefile head/dns/bind98/pkg-plist head/dns/bind99/Makefile head/dns/bind99/pkg-plist Modified: head/dns/bind98/Makefile ============================================================================== --- head/dns/bind98/Makefile Mon Jan 6 23:08:14 2014 (r338951) +++ head/dns/bind98/Makefile Mon Jan 6 23:15:20 2014 (r338952) @@ -2,7 +2,7 @@ PORTNAME= bind98 PORTVERSION= 9.8.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= dns net ipv6 MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= bind9/${ISCVERSION} @@ -22,6 +22,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var --disable-linux-caps \ --disable-symtable \ --with-randomdev=/dev/random +ETCDIR= ${PREFIX}/etc/namedb CONFLICTS= bind9*-9.[45679].* bind9*-sdb-9.[45679].* bind-tools-9.* @@ -106,13 +107,11 @@ GSSAPI_CONFIGURE_WITH= gssapi ARCH= x86_64 .endif -.if ${PORT_OPTIONS:MLINKS} && empty(${PORT_OPTIONS:MREPLACE_BASE}) -PLIST_SUB+= LINKS="" -.else -PLIST_SUB+= LINKS="@comment " +.if !${PORT_OPTIONS:MLINKS} || ${PORT_OPTIONS:MREPLACE_BASE} +PKGINSTALL=${NONEXISTENT} .endif -.if ${PORT_OPTIONS:MTHREADS} && empty(PORT_OPTIONS:MDLZ_MYSQL) +.if ${PORT_OPTIONS:MTHREADS} && !${PORT_OPTIONS:MDLZ_MYSQL} CONFIGURE_ARGS+= --enable-threads .else CONFIGURE_ARGS+= --disable-threads @@ -139,7 +138,7 @@ BIND_DESTETC= /etc/namedb PLIST_SUB+= SHARE_MAN="" .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100 BIND_DESTETC= ${PREFIX}/etc/namedb -PKGINSTALL= /nonexistent +PKGINSTALL= ${NONEXISTENT} .else BIND_DESTETC= ${PREFIX}/etc .endif Modified: head/dns/bind98/pkg-plist ============================================================================== --- head/dns/bind98/pkg-plist Mon Jan 6 23:08:14 2014 (r338951) +++ head/dns/bind98/pkg-plist Mon Jan 6 23:15:20 2014 (r338952) @@ -334,26 +334,26 @@ sbin/rndc sbin/rndc-confgen @unexec rm -f %%BIND_DESTETC%%/rndc.conf.sample %%NOBASE%%etc/rc.d/named -%%NOBASE%%@unexec if cmp -s %%BIND_DESTETC%%/named.conf.sample %%BIND_DESTETC%%/named.conf; then rm -f %%BIND_DESTETC%%/named.conf; fi -%%NOBASE%%%%BIND_DESTETC%%/named.conf.sample -%%NOBASE%%@exec if [ ! -f %%BIND_DESTETC%%/named.conf ] ; then cp -p %D/%F %B/named.conf; fi -%%NOBASE%%%%BIND_DESTETC%%/named.root -%%NOBASE%%%%BIND_DESTETC%%/master/empty.db -%%NOBASE%%%%BIND_DESTETC%%/master/localhost-forward.db -%%NOBASE%%%%BIND_DESTETC%%/master/localhost-reverse.db -%%NOBASE%%@exec mkdir %%BIND_DESTETC%%/dynamic -%%NOBASE%%@exec chown bind:bind %%BIND_DESTETC%%/dynamic -%%NOBASE%%@dirrmtry %%BIND_DESTETC%%/dynamic -%%NOBASE%%@exec mkdir %%BIND_DESTETC%%/master -%%NOBASE%%@exec chown bind:bind %%BIND_DESTETC%%/master -%%NOBASE%%@dirrmtry %%BIND_DESTETC%%/master -%%NOBASE%%@exec mkdir %%BIND_DESTETC%%/slave -%%NOBASE%%@exec chown bind:bind %%BIND_DESTETC%%/slave -%%NOBASE%%@dirrmtry %%BIND_DESTETC%%/slave -%%NOBASE%%@exec mkdir %%BIND_DESTETC%%/working -%%NOBASE%%@exec chown bind:bind %%BIND_DESTETC%%/working -%%NOBASE%%@dirrmtry %%BIND_DESTETC%%/working -%%NOBASE%%@dirrmtry %%BIND_DESTETC%% +%%NOBASE%%@unexec if cmp -s %D/%%ETCDIR%%/named.conf.sample %D/%%ETCDIR%%/named.conf; then rm -f %D/%%ETCDIR%%/named.conf; fi +%%NOBASE%%%%ETCDIR%%/named.conf.sample +%%NOBASE%%@exec if [ ! -f %D/%%ETCDIR%%/named.conf ] ; then cp -p %D/%F %B/named.conf; fi +%%NOBASE%%%%ETCDIR%%/named.root +%%NOBASE%%%%ETCDIR%%/master/empty.db +%%NOBASE%%%%ETCDIR%%/master/localhost-forward.db +%%NOBASE%%%%ETCDIR%%/master/localhost-reverse.db +%%NOBASE%%@exec mkdir %D/%%ETCDIR%%/dynamic +%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/dynamic +%%NOBASE%%@dirrmtry %%ETCDIR%%/dynamic +%%NOBASE%%@exec mkdir %D/%%ETCDIR%%/master +%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/master +%%NOBASE%%@dirrmtry %%ETCDIR%%/master +%%NOBASE%%@exec mkdir %D/%%ETCDIR%%/slave +%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/slave +%%NOBASE%%@dirrmtry %%ETCDIR%%/slave +%%NOBASE%%@exec mkdir %D/%%ETCDIR%%/working +%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/working +%%NOBASE%%@dirrmtry %%ETCDIR%%/working +%%NOBASE%%@dirrmtry %%ETCDIR%% @dirrm include/bind9 @dirrm include/dns @dirrm include/dst Modified: head/dns/bind99/Makefile ============================================================================== --- head/dns/bind99/Makefile Mon Jan 6 23:08:14 2014 (r338951) +++ head/dns/bind99/Makefile Mon Jan 6 23:15:20 2014 (r338952) @@ -2,7 +2,7 @@ PORTNAME?= bind99 PORTVERSION= 9.9.4 -PORTREVISION?= 6 +PORTREVISION?= 7 CATEGORIES= dns net ipv6 MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= bind9/${ISCVERSION} @@ -23,6 +23,7 @@ CONFIGURE_ARGS= --localstatedir=/var --d --disable-symtable \ --with-randomdev=/dev/random \ --without-python +ETCDIR= ${PREFIX}/etc/namedb CONFLICTS= bind9*-9.[45678].* bind9*-sdb-9.[45678].* bind-tools-9.* @@ -113,13 +114,11 @@ GSSAPI_CONFIGURE_WITH= gssapi ARCH= x86_64 .endif -.if ${PORT_OPTIONS:MLINKS} && empty(PORT_OPTIONS:MREPLACE_BASE) -PLIST_SUB+= LINKS="" -.else -PLIST_SUB+= LINKS="@comment " +.if !${PORT_OPTIONS:MLINKS} || ${PORT_OPTIONS:MREPLACE_BASE} +PKGINSTALL=${NONEXISTENT} .endif -.if ${PORT_OPTIONS:MTHREADS} && empty(PORT_OPTIONS:MDLZ_MYSQL) +.if ${PORT_OPTIONS:MTHREADS} && !${PORT_OPTIONS:MDLZ_MYSQL} CONFIGURE_ARGS+= --enable-threads .else CONFIGURE_ARGS+= --disable-threads @@ -146,7 +145,7 @@ BIND_DESTETC= /etc/namedb PLIST_SUB+= SHARE_MAN="" .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000100 BIND_DESTETC= ${PREFIX}/etc/namedb -PKGINSTALL= /nonexistent +PKGINSTALL= ${NONEXISTENT} .else BIND_DESTETC= ${PREFIX}/etc .endif Modified: head/dns/bind99/pkg-plist ============================================================================== --- head/dns/bind99/pkg-plist Mon Jan 6 23:08:14 2014 (r338951) +++ head/dns/bind99/pkg-plist Mon Jan 6 23:15:20 2014 (r338952) @@ -337,26 +337,26 @@ sbin/rndc sbin/rndc-confgen @unexec rm -f %%BIND_DESTETC%%/rndc.conf.sample %%NOBASE%%etc/rc.d/named -%%NOBASE%%@unexec if cmp -s %%BIND_DESTETC%%/named.conf.sample %%BIND_DESTETC%%/named.conf; then rm -f %%BIND_DESTETC%%/named.conf; fi -%%NOBASE%%%%BIND_DESTETC%%/named.conf.sample -%%NOBASE%%@exec if [ ! -f %%BIND_DESTETC%%/named.conf ] ; then cp -p %D/%F %B/named.conf; fi -%%NOBASE%%%%BIND_DESTETC%%/named.root -%%NOBASE%%%%BIND_DESTETC%%/master/empty.db -%%NOBASE%%%%BIND_DESTETC%%/master/localhost-forward.db -%%NOBASE%%%%BIND_DESTETC%%/master/localhost-reverse.db -%%NOBASE%%@exec mkdir %%BIND_DESTETC%%/dynamic -%%NOBASE%%@exec chown bind:bind %%BIND_DESTETC%%/dynamic -%%NOBASE%%@dirrmtry %%BIND_DESTETC%%/dynamic -%%NOBASE%%@exec mkdir %%BIND_DESTETC%%/master -%%NOBASE%%@exec chown bind:bind %%BIND_DESTETC%%/master -%%NOBASE%%@dirrmtry %%BIND_DESTETC%%/master -%%NOBASE%%@exec mkdir %%BIND_DESTETC%%/slave -%%NOBASE%%@exec chown bind:bind %%BIND_DESTETC%%/slave -%%NOBASE%%@dirrmtry %%BIND_DESTETC%%/slave -%%NOBASE%%@exec mkdir %%BIND_DESTETC%%/working -%%NOBASE%%@exec chown bind:bind %%BIND_DESTETC%%/working -%%NOBASE%%@dirrmtry %%BIND_DESTETC%%/working -%%NOBASE%%@dirrmtry %%BIND_DESTETC%% +%%NOBASE%%@unexec if cmp -s %D/%%ETCDIR%%/named.conf.sample %D/%%ETCDIR%%/named.conf; then rm -f %D/%%ETCDIR%%/named.conf; fi +%%NOBASE%%%%ETCDIR%%/named.conf.sample +%%NOBASE%%@exec if [ ! -f %D/%%ETCDIR%%/named.conf ] ; then cp -p %D/%F %B/named.conf; fi +%%NOBASE%%%%ETCDIR%%/named.root +%%NOBASE%%%%ETCDIR%%/master/empty.db +%%NOBASE%%%%ETCDIR%%/master/localhost-forward.db +%%NOBASE%%%%ETCDIR%%/master/localhost-reverse.db +%%NOBASE%%@exec mkdir %D/%%ETCDIR%%/dynamic +%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/dynamic +%%NOBASE%%@dirrmtry %%ETCDIR%%/dynamic +%%NOBASE%%@exec mkdir %D/%%ETCDIR%%/master +%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/master +%%NOBASE%%@dirrmtry %%ETCDIR%%/master +%%NOBASE%%@exec mkdir %D/%%ETCDIR%%/slave +%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/slave +%%NOBASE%%@dirrmtry %%ETCDIR%%/slave +%%NOBASE%%@exec mkdir %D/%%ETCDIR%%/working +%%NOBASE%%@exec chown bind:bind %D/%%ETCDIR%%/working +%%NOBASE%%@dirrmtry %%ETCDIR%%/working +%%NOBASE%%@dirrmtry %%ETCDIR%% @dirrm include/bind9 @dirrm include/dns @dirrm include/dst