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, 4 insertions, 5 deletions

diff --git a/net-mgmt/nagiosgrapher/files/nagiosgrapher.in b/net-mgmt/nagiosgrapher/files/nagiosgrapher.in
index 124473057083..3ec61d3a3f17 100644
--- a/net-mgmt/nagiosgrapher/files/nagiosgrapher.in
+++ b/net-mgmt/nagiosgrapher/files/nagiosgrapher.in
@@ -2,7 +2,6 @@
 #
 # $FreeBSD$
 #
-
 # PROVIDE: %%NAME%%
 # REQUIRE: NETWORKING SERVERS
 # BEFORE:  DAEMON
@@ -10,21 +9,21 @@
 
 # Add the following line to /etc/rc.conf to enable `%%NAME%%':
 #
-#%%NAME%%_enable="YES"
+# %%NAME%%_enable="YES"
 
 . /etc/rc.subr
 
 name="%%NAME%%"
-: ${%%NAME%%_user="nagios"}
-rcvar=`set_rcvar`
+rcvar=%%NAME%%_enable
 
 pidfile="/var/spool/nagios/nagios_grapher/$name.pid"
 
 command="%%PREFIX%%/libexec/nagios/contrib/$name"
 command_interpreter="/usr/bin/perl"
 
-# read configuration and set defaults
 load_rc_config $name
+
 : ${%%NAME%%_enable="NO"}
+: ${%%NAME%%_user="nagios"}
 
 run_rc_command "$1"