In the rc.d scripts, change assignments to rcvar to use the

literal name_enable wherever possible, and ${name}_enable
when it's not, to prepare for the demise of set_rcvar().

In cases where I had to hand-edit unusual instances also
modify formatting slightly to be more uniform (and in
some cases, correct). This includes adding some $FreeBSD$
tags, and most importantly moving rcvar= to right after
name= so it's clear that one is derived from the other.

1 files changed, 8 insertions, 11 deletions

diff --git a/sysutils/nagios-statd/files/nagiosstatd.sh.in b/sysutils/nagios-statd/files/nagiosstatd.sh.in
index 0d1b57f35835..617f43df4463 100644
--- a/sysutils/nagios-statd/files/nagiosstatd.sh.in
+++ b/sysutils/nagios-statd/files/nagiosstatd.sh.in
@@ -1,36 +1,33 @@
 #!/bin/sh
 
+# $FreeBSD$
+#
 # PROVIDE: nagiosstatd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
 # KEYWORD: shutdown
 #
-#
-#
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf to enable nagiosstatd:
 # nagiosstatd_enable (bool): Set to "NO" by default.
 #                          Set it to "YES" to enable nagiosstatd 
 # nagiosstatd_flags="<set as needed>"
 
-nagiosstatd_enable=${nagiosstatd_enable-"NO"}
-nagiosstatd_pidfile=${nagiosstatd_pidfile-"/var/run/nagiosstatd.pid"}
-
 . /etc/rc.subr
 
 name="nagiosstatd"
-#rcvar=`set_rcvar`
-rcvar=${name}_enable
+rcvar=nagiosstatd_enable
 
-pidfile="${nagiosstatd_pidfile}"
+load_rc_config $name
 
+nagiosstatd_enable=${nagiosstatd_enable-"NO"}
+nagiosstatd_pidfile=${nagiosstatd_pidfile-"/var/run/nagiosstatd.pid"}
+
+pidfile="${nagiosstatd_pidfile}"
 
 command=%%PREFIX%%/sbin/nagios-statd
 command_args="-P ${nagiosstatd_pidfile}"
 command_interpreter="python"
 
-load_rc_config $name
-
 start_precmd="export PATH=\"$PATH:/usr/local/bin\""
 
 run_rc_command "$1"
-