svn commit: r351487 - in head/dns: bind910 bind910/files bind98 bind98/files bind99 bind99/files

[Mathieu Arnold]

Author: mat
Date: Thu Apr 17 16:43:48 2014
New Revision: 351487
URL: http://svnweb.freebsd.org/changeset/ports/351487
QAT: https://qat.redports.org/buildarchive/r351487/

Log:
  Fix the rc script reload command.
  
  Noticed by:	David Samms
  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 17 16:43:31 2014	(r351486)
+++ head/dns/bind910/Makefile	Thu Apr 17 16:43:48 2014	(r351487)
@@ -2,7 +2,7 @@
 
 PORTNAME=	bind
 PORTVERSION=	9.10.0rc1
-PORTREVISION=	2
+PORTREVISION=	3
 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 17 16:43:31 2014	(r351486)
+++ head/dns/bind910/files/named.in	Thu Apr 17 16:43:48 2014	(r351487)
@@ -19,7 +19,7 @@ extra_commands=reload
 
 start_precmd=named_prestart
 start_postcmd=named_poststart
-reload_cmd="${command%/named}/rndc reload"
+reload_cmd=named_reload
 stop_cmd=named_stop
 
 named_enable=${named_enable:-"NO"}		# Run named, the DNS server (or NO).
@@ -44,6 +44,13 @@ named_poststart()
 	fi
 }
 
+named_reload()
+{
+	# This is a one line function, but ${command} is not defined early
+	# enough to be there when the reload_cmd variable is defined up there.
+	${command%/named}/rndc reload
+}
+
 find_pidfile()
 {
 	if get_pidfile_from_conf pid-file $named_conf; then

Modified: head/dns/bind98/Makefile
==============================================================================
--- head/dns/bind98/Makefile	Thu Apr 17 16:43:31 2014	(r351486)
+++ head/dns/bind98/Makefile	Thu Apr 17 16:43:48 2014	(r351487)
@@ -2,7 +2,7 @@
 
 PORTNAME=	bind
 PORTVERSION=	9.8.7
-PORTREVISION=	9
+PORTREVISION=	10
 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 17 16:43:31 2014	(r351486)
+++ head/dns/bind98/files/named.in	Thu Apr 17 16:43:48 2014	(r351487)
@@ -19,7 +19,7 @@ extra_commands=reload
 
 start_precmd=named_prestart
 start_postcmd=named_poststart
-reload_cmd="${command%/named}/rndc reload"
+reload_cmd=named_reload
 stop_cmd=named_stop
 
 named_enable=${named_enable:-"NO"}		# Run named, the DNS server (or NO).
@@ -43,6 +43,13 @@ named_poststart()
 	fi
 }
 
+named_reload()
+{
+	# This is a one line function, but ${command} is not defined early
+	# enough to be there when the reload_cmd variable is defined up there.
+	${command%/named}/rndc reload
+}
+
 find_pidfile()
 {
 	if get_pidfile_from_conf pid-file $named_conf; then

Modified: head/dns/bind99/Makefile
==============================================================================
--- head/dns/bind99/Makefile	Thu Apr 17 16:43:31 2014	(r351486)
+++ head/dns/bind99/Makefile	Thu Apr 17 16:43:48 2014	(r351487)
@@ -2,7 +2,7 @@
 
 PORTNAME=	bind
 PORTVERSION=	9.9.5
-PORTREVISION=	11
+PORTREVISION=	12
 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 17 16:43:31 2014	(r351486)
+++ head/dns/bind99/files/named.in	Thu Apr 17 16:43:48 2014	(r351487)
@@ -19,7 +19,7 @@ extra_commands=reload
 
 start_precmd=named_prestart
 start_postcmd=named_poststart
-reload_cmd="${command%/named}/rndc reload"
+reload_cmd=named_reload
 stop_cmd=named_stop
 
 named_enable=${named_enable:-"NO"}		# Run named, the DNS server (or NO).
@@ -43,6 +43,13 @@ named_poststart()
 	fi
 }
 
+named_reload()
+{
+	# This is a one line function, but ${command} is not defined early
+	# enough to be there when the reload_cmd variable is defined up there.
+	${command%/named}/rndc reload
+}
+
 find_pidfile()
 {
 	if get_pidfile_from_conf pid-file $named_conf; then