svn commit: r350861 - in branches/2014Q2/dns: bind98 bind98/files bind99 bind99/files

[Mathieu Arnold]

Author: mat
Date: Thu Apr 10 21:52:06 2014
New Revision: 350861
URL: http://svnweb.freebsd.org/changeset/ports/350861
QAT: https://qat.redports.org/buildarchive/r350861/

Log:
  MFH: r350848
  
  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:
  branches/2014Q2/dns/bind98/Makefile
  branches/2014Q2/dns/bind98/files/named.in
  branches/2014Q2/dns/bind99/Makefile
  branches/2014Q2/dns/bind99/files/named.in
Directory Properties:
  branches/2014Q2/   (props changed)

Modified: branches/2014Q2/dns/bind98/Makefile
==============================================================================
--- branches/2014Q2/dns/bind98/Makefile	Thu Apr 10 21:48:42 2014	(r350860)
+++ branches/2014Q2/dns/bind98/Makefile	Thu Apr 10 21:52:06 2014	(r350861)
@@ -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: branches/2014Q2/dns/bind98/files/named.in
==============================================================================
--- branches/2014Q2/dns/bind98/files/named.in	Thu Apr 10 21:48:42 2014	(r350860)
+++ branches/2014Q2/dns/bind98/files/named.in	Thu Apr 10 21:52:06 2014	(r350861)
@@ -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: branches/2014Q2/dns/bind99/Makefile
==============================================================================
--- branches/2014Q2/dns/bind99/Makefile	Thu Apr 10 21:48:42 2014	(r350860)
+++ branches/2014Q2/dns/bind99/Makefile	Thu Apr 10 21:52:06 2014	(r350861)
@@ -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: branches/2014Q2/dns/bind99/files/named.in
==============================================================================
--- branches/2014Q2/dns/bind99/files/named.in	Thu Apr 10 21:48:42 2014	(r350860)
+++ branches/2014Q2/dns/bind99/files/named.in	Thu Apr 10 21:52:06 2014	(r350861)
@@ -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"