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.

2 files changed, 20 insertions, 16 deletions

diff --git a/www/webobjects/files/JavaMonitor.sh.in b/www/webobjects/files/JavaMonitor.sh.in
index 4801c93d9bf5..a3b9cdcba75a 100644
--- a/www/webobjects/files/JavaMonitor.sh.in
+++ b/www/webobjects/files/JavaMonitor.sh.in
@@ -1,17 +1,25 @@
 #!/bin/sh
+
 # $FreeBSD$
+#
 # PROVIDE: JavaMonitor
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
 # KEYWORD: shutdown
-
+#
 # Define these JavaMonitor_* variables in one of these files:
 #       /etc/rc.conf
 #       /etc/rc.conf.local
 #
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
+
+. /etc/rc.subr
+
 name="JavaMonitor"
+rcvar=JavaMonitor_enable
+
+load_rc_config "$name"
+load_rc_config NEXT
 
 JavaMonitor_enable="${JavaMonitor_enable-"NO"}"
 JavaMonitor_user="${JavaMonitor_user-%%USER%%}"
@@ -20,12 +28,6 @@ JavaMonitor_pidfile="${JavaMonitor_pidfile:-/var/run/webobjects/${name}.pid}"
 JavaMonitor_logfile="${JavaMonitor_logfile:-/var/log/webobjects/${name}.log}"
 NEXT_ROOT="${NEXT_ROOT-%%PREFIX%%/%%NEXT_ROOT%%}"
 
-. /etc/rc.subr
-rcvar=`set_rcvar`
-
-load_rc_config "$name"
-load_rc_config NEXT
-
 pidfile="${JavaMonitor_pidfile}"
 logfile="${JavaMonitor_logfile}"
 runuser="${JavaMonitor_user}"
diff --git a/www/webobjects/files/wotaskd.sh.in b/www/webobjects/files/wotaskd.sh.in
index cee2a604357b..e6afe23937b8 100644
--- a/www/webobjects/files/wotaskd.sh.in
+++ b/www/webobjects/files/wotaskd.sh.in
@@ -1,17 +1,25 @@
 #!/bin/sh
+
 # $FreeBSD$
+#
 # PROVIDE: wotaskd
 # REQUIRE: NETWORKING SERVERS
 # BEFORE: DAEMON
 # KEYWORD: shutdown
-
+#
 # Define these wotaskd_* variables in one of these files:
 #       /etc/rc.conf
 #       /etc/rc.conf.local
 #
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
+
+. /etc/rc.subr
+
 name="wotaskd"
+rcvar=wotaskd_enable
+
+load_rc_config "$name"
+load_rc_config NEXT
 
 wotaskd_enable="${wotaskd_enable-"NO"}"
 wotaskd_user="${wotaskd_user-%%USER%%}"
@@ -19,12 +27,6 @@ wotaskd_pidfile="${wotaskd_pidfile:-/var/run/webobjects/${name}.pid}"
 wotaskd_logfile="${wotaskd_logfile:-/var/log/webobjects/${name}.log}"
 NEXT_ROOT="${NEXT_ROOT-%%PREFIX%%/%%NEXT_ROOT%%}"
 
-. /etc/rc.subr
-rcvar=`set_rcvar`
-
-load_rc_config "$name"
-load_rc_config NEXT
-
 pidfile="${wotaskd_pidfile}"
 logfile="${wotaskd_logfile}"
 runuser="${wotaskd_user}"