From owner-svn-ports-all@FreeBSD.ORG Tue Jan 7 09:55:08 2014 Return-Path: Delivered-To: svn-ports-all@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 6F935962; Tue, 7 Jan 2014 09:55:08 +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 5B67214E4; Tue, 7 Jan 2014 09:55:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s079t8jA039295; Tue, 7 Jan 2014 09:55:08 GMT (envelope-from erwin@svn.freebsd.org) Received: (from erwin@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s079t7Ka039287; Tue, 7 Jan 2014 09:55:07 GMT (envelope-from erwin@svn.freebsd.org) Message-Id: <201401070955.s079t7Ka039287@svn.freebsd.org> From: Erwin Lansing Date: Tue, 7 Jan 2014 09:55:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338989 - in head/dns: bind96 bind96/files bind98 bind98/files bind99 bind99/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.17 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, 07 Jan 2014 09:55:08 -0000 Author: erwin Date: Tue Jan 7 09:55:06 2014 New Revision: 338989 URL: http://svnweb.freebsd.org/changeset/ports/338989 Log: There's always a default value for named_conf now, so no need to check for it, and espcially not for a wrong value. Noticed by: Stefan Bethke Approved by: mat (maintainer) Modified: head/dns/bind96/Makefile head/dns/bind96/files/named head/dns/bind98/Makefile head/dns/bind98/files/named head/dns/bind99/Makefile head/dns/bind99/files/named Modified: head/dns/bind96/Makefile ============================================================================== --- head/dns/bind96/Makefile Tue Jan 7 09:46:29 2014 (r338988) +++ head/dns/bind96/Makefile Tue Jan 7 09:55:06 2014 (r338989) @@ -2,7 +2,7 @@ PORTNAME= bind96 PORTVERSION= 9.6.3.2.ESV.R10 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= dns net ipv6 MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= bind9/${ISCVERSION} Modified: head/dns/bind96/files/named ============================================================================== --- head/dns/bind96/files/named Tue Jan 7 09:46:29 2014 (r338988) +++ head/dns/bind96/files/named Tue Jan 7 09:55:06 2014 (r338989) @@ -98,14 +98,7 @@ named_prestart() chown ${named_uid}:${named_uid} ${pidfile%/pid} fi - command_args="-u ${named_uid:=root}" - - if [ ! "$named_conf" = '/etc/namedb/named.conf' ]; then - case "$named_flags" in - -c*|*' -c'*) ;; # No need to add it - *) command_args="-c $named_conf $command_args" ;; - esac - fi + command_args="-u ${named_uid:=root} -c $named_conf $command_args" local line nsip firstns Modified: head/dns/bind98/Makefile ============================================================================== --- head/dns/bind98/Makefile Tue Jan 7 09:46:29 2014 (r338988) +++ head/dns/bind98/Makefile Tue Jan 7 09:55:06 2014 (r338989) @@ -2,7 +2,7 @@ PORTNAME= bind98 PORTVERSION= 9.8.6 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= dns net ipv6 MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= bind9/${ISCVERSION} Modified: head/dns/bind98/files/named ============================================================================== --- head/dns/bind98/files/named Tue Jan 7 09:46:29 2014 (r338988) +++ head/dns/bind98/files/named Tue Jan 7 09:55:06 2014 (r338989) @@ -98,14 +98,7 @@ named_prestart() chown ${named_uid}:${named_uid} ${pidfile%/pid} fi - command_args="-u ${named_uid:=root}" - - if [ ! "$named_conf" = '/etc/namedb/named.conf' ]; then - case "$named_flags" in - -c*|*' -c'*) ;; # No need to add it - *) command_args="-c $named_conf $command_args" ;; - esac - fi + command_args="-u ${named_uid:=root} -c $named_conf $command_args" local line nsip firstns Modified: head/dns/bind99/Makefile ============================================================================== --- head/dns/bind99/Makefile Tue Jan 7 09:46:29 2014 (r338988) +++ head/dns/bind99/Makefile Tue Jan 7 09:55:06 2014 (r338989) @@ -2,7 +2,7 @@ PORTNAME?= bind99 PORTVERSION= 9.9.4 -PORTREVISION?= 7 +PORTREVISION?= 8 CATEGORIES= dns net ipv6 MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= bind9/${ISCVERSION} Modified: head/dns/bind99/files/named ============================================================================== --- head/dns/bind99/files/named Tue Jan 7 09:46:29 2014 (r338988) +++ head/dns/bind99/files/named Tue Jan 7 09:55:06 2014 (r338989) @@ -98,14 +98,7 @@ named_prestart() chown ${named_uid}:${named_uid} ${pidfile%/pid} fi - command_args="-u ${named_uid:=root}" - - if [ ! "$named_conf" = '/etc/namedb/named.conf' ]; then - case "$named_flags" in - -c*|*' -c'*) ;; # No need to add it - *) command_args="-c $named_conf $command_args" ;; - esac - fi + command_args="-u ${named_uid:=root} -c $named_conf $command_args" local line nsip firstns