From owner-svn-ports-all@FreeBSD.ORG Thu Apr 10 20:43:51 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 E301FA50; Thu, 10 Apr 2014 20:43:51 +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 D031D127F; Thu, 10 Apr 2014 20:43:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s3AKhpXd028609; Thu, 10 Apr 2014 20:43:51 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s3AKho3Y028603; Thu, 10 Apr 2014 20:43:50 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201404102043.s3AKho3Y028603@svn.freebsd.org> From: Mathieu Arnold Date: Thu, 10 Apr 2014 20:43:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350848 - in head/dns: bind910 bind910/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: Thu, 10 Apr 2014 20:43:52 -0000 Author: mat Date: Thu Apr 10 20:43:50 2014 New Revision: 350848 URL: http://svnweb.freebsd.org/changeset/ports/350848 QAT: https://qat.redports.org/buildarchive/r350848/ Log: Two changes to the RC script - Add a dependency on ldconfig - Allow people to change the pidfile PR: 188439 Submitted by: Oliver Lehmann Sponsored by: Absolight Modified: head/dns/bind910/Makefile head/dns/bind910/files/named.in head/dns/bind98/Makefile head/dns/bind98/files/named.in head/dns/bind99/Makefile head/dns/bind99/files/named.in Modified: head/dns/bind910/Makefile ============================================================================== --- head/dns/bind910/Makefile Thu Apr 10 20:20:35 2014 (r350847) +++ head/dns/bind910/Makefile Thu Apr 10 20:43:50 2014 (r350848) @@ -2,6 +2,7 @@ PORTNAME= bind PORTVERSION= 9.10.0rc1 +PORTREVISION= 1 CATEGORIES= dns net ipv6 MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= bind9/${ISCVERSION} Modified: head/dns/bind910/files/named.in ============================================================================== --- head/dns/bind910/files/named.in Thu Apr 10 20:20:35 2014 (r350847) +++ head/dns/bind910/files/named.in Thu Apr 10 20:43:50 2014 (r350848) @@ -4,7 +4,7 @@ # # PROVIDE: named -# REQUIRE: FILESYSTEMS defaultroute +# REQUIRE: FILESYSTEMS defaultroute ldconfig # BEFORE: NETWORKING # KEYWORD: shutdown @@ -92,9 +92,9 @@ named_prestart() warn 'named_pidfile: now determined from the conf file' fi - echo ${pidfile%/pid} - if [ ! -d ${pidfile%/pid} ]; then - install -d -o ${named_uid} -g ${named_uid} ${pidfile%/pid} + piddir=`/usr/bin/dirname ${pidfile}` + if [ ! -d ${piddir} ]; then + install -d -o ${named_uid} -g ${named_uid} ${piddir} fi command_args="-u ${named_uid:=root} -c $named_conf $command_args" Modified: head/dns/bind98/Makefile ============================================================================== --- head/dns/bind98/Makefile Thu Apr 10 20:20:35 2014 (r350847) +++ head/dns/bind98/Makefile Thu Apr 10 20:43:50 2014 (r350848) @@ -2,7 +2,7 @@ PORTNAME= bind PORTVERSION= 9.8.7 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= dns net ipv6 MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= bind9/${ISCVERSION} Modified: head/dns/bind98/files/named.in ============================================================================== --- head/dns/bind98/files/named.in Thu Apr 10 20:20:35 2014 (r350847) +++ head/dns/bind98/files/named.in Thu Apr 10 20:43:50 2014 (r350848) @@ -4,7 +4,7 @@ # # PROVIDE: named -# REQUIRE: FILESYSTEMS defaultroute +# REQUIRE: FILESYSTEMS defaultroute ldconfig # BEFORE: NETWORKING # KEYWORD: shutdown @@ -91,9 +91,9 @@ named_prestart() warn 'named_pidfile: now determined from the conf file' fi - echo ${pidfile%/pid} - if [ ! -d ${pidfile%/pid} ]; then - install -d -o ${named_uid} -g ${named_uid} ${pidfile%/pid} + piddir=`/usr/bin/dirname ${pidfile}` + if [ ! -d ${piddir} ]; then + install -d -o ${named_uid} -g ${named_uid} ${piddir} fi command_args="-u ${named_uid:=root} -c $named_conf $command_args" Modified: head/dns/bind99/Makefile ============================================================================== --- head/dns/bind99/Makefile Thu Apr 10 20:20:35 2014 (r350847) +++ head/dns/bind99/Makefile Thu Apr 10 20:43:50 2014 (r350848) @@ -2,7 +2,7 @@ PORTNAME= bind PORTVERSION= 9.9.5 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= dns net ipv6 MASTER_SITES= ${MASTER_SITE_ISC} MASTER_SITE_SUBDIR= bind9/${ISCVERSION} Modified: head/dns/bind99/files/named.in ============================================================================== --- head/dns/bind99/files/named.in Thu Apr 10 20:20:35 2014 (r350847) +++ head/dns/bind99/files/named.in Thu Apr 10 20:43:50 2014 (r350848) @@ -4,7 +4,7 @@ # # PROVIDE: named -# REQUIRE: FILESYSTEMS defaultroute +# REQUIRE: FILESYSTEMS defaultroute ldconfig # BEFORE: NETWORKING # KEYWORD: shutdown @@ -91,9 +91,9 @@ named_prestart() warn 'named_pidfile: now determined from the conf file' fi - echo ${pidfile%/pid} - if [ ! -d ${pidfile%/pid} ]; then - install -d -o ${named_uid} -g ${named_uid} ${pidfile%/pid} + piddir=`/usr/bin/dirname ${pidfile}` + if [ ! -d ${piddir} ]; then + install -d -o ${named_uid} -g ${named_uid} ${piddir} fi command_args="-u ${named_uid:=root} -c $named_conf $command_args"