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

diff --git a/www/fcgiwrap/files/fcgiwrap.in b/www/fcgiwrap/files/fcgiwrap.in
index f3d9fb1f1472..cbbe791ccb5d 100644
--- a/www/fcgiwrap/files/fcgiwrap.in
+++ b/www/fcgiwrap/files/fcgiwrap.in
@@ -7,7 +7,6 @@
 # PROVIDE: fcgiwrap
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
-
 #
 # Add the following to /etc/rc.conf[.local] to enable this service
 #
@@ -22,6 +21,11 @@
 # fcgiwrap_flags=
 # Use fcgiwrap_user to run fcgiwrap as user
 
+. /etc/rc.subr
+
+name="fcgiwrap"
+rcvar=fcgiwrap_enable
+
 fcgiwrap_setfib() {
 	sysctl net.fibs >/dev/null 2>&1 || return 0
 
@@ -49,11 +53,7 @@ fcgiwrap_cleansocket() {
 	rm -f $pidfile
 }
 
-. /etc/rc.subr
-
 pidfile="/var/run/fcgiwrap/fcgiwrap.pid"
-name="fcgiwrap"
-rcvar=`set_rcvar`
 
 procname="%%PREFIX%%/sbin/${name}"
 command="/usr/sbin/daemon"