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.

13 files changed, 20 insertions, 22 deletions

diff --git a/japanese/FreeWnn-server/files/cwnn.sh.in b/japanese/FreeWnn-server/files/cwnn.sh.in
index ba07c664fd15..721bc7d2e881 100644
--- a/japanese/FreeWnn-server/files/cwnn.sh.in
+++ b/japanese/FreeWnn-server/files/cwnn.sh.in
@@ -9,7 +9,7 @@
 . /etc/rc.subr
 
 name=cwnn
-rcvar=`set_rcvar`
+rcvar=cwnn_enable
 command=%%PREFIX%%/bin/cWnn4/cserver
 procname=%%PREFIX%%/bin/cWnn4/cserver
 start_precmd=start_precmd
diff --git a/japanese/FreeWnn-server/files/kwnn.sh.in b/japanese/FreeWnn-server/files/kwnn.sh.in
index eeae088659e4..fe7c4faa51b8 100644
--- a/japanese/FreeWnn-server/files/kwnn.sh.in
+++ b/japanese/FreeWnn-server/files/kwnn.sh.in
@@ -9,7 +9,7 @@
 . /etc/rc.subr
 
 name=kwnn
-rcvar=`set_rcvar`
+rcvar=kwnn_enable
 command=%%PREFIX%%/bin/kWnn4/kserver
 procname=%%PREFIX%%/bin/kWnn4/kserver
 start_precmd=start_precmd
diff --git a/japanese/FreeWnn-server/files/twnn.sh.in b/japanese/FreeWnn-server/files/twnn.sh.in
index 753d0b857023..88b91c9a7212 100644
--- a/japanese/FreeWnn-server/files/twnn.sh.in
+++ b/japanese/FreeWnn-server/files/twnn.sh.in
@@ -9,7 +9,7 @@
 . /etc/rc.subr
 
 name=twnn
-rcvar=`set_rcvar`
+rcvar=twnn_enable
 command=%%PREFIX%%/bin/cWnn4/tserver
 procname=%%PREFIX%%/bin/cWnn4/tserver
 start_precmd=start_precmd
diff --git a/japanese/FreeWnn-server/files/wnn.sh.in b/japanese/FreeWnn-server/files/wnn.sh.in
index 1a76d02351d3..1656fd9f4da4 100644
--- a/japanese/FreeWnn-server/files/wnn.sh.in
+++ b/japanese/FreeWnn-server/files/wnn.sh.in
@@ -9,7 +9,7 @@
 . /etc/rc.subr
 
 name=wnn
-rcvar=`set_rcvar`
+rcvar=wnn_enable
 command=%%PREFIX%%/bin/Wnn4/jserver
 procname=%%PREFIX%%/bin/Wnn4/jserver
 start_precmd=start_precmd
diff --git a/japanese/canna-server/files/canna.sh.in b/japanese/canna-server/files/canna.sh.in
index 158d6c80638d..db9b91097fb9 100644
--- a/japanese/canna-server/files/canna.sh.in
+++ b/japanese/canna-server/files/canna.sh.in
@@ -25,7 +25,7 @@ canna_flags=${canna_flags:-"-u bin"}		# Flags to canna program
 . /etc/rc.subr
 
 name="canna"
-rcvar=`set_rcvar`
+rcvar=canna_enable
 command="%%PREFIX%%/sbin/cannaserver"
 start_precmd="canna_start_precmd"
 stop_cmd="canna_stop_cmd"
diff --git a/japanese/ebnetd/files/ebnetd.sh b/japanese/ebnetd/files/ebnetd.sh
index c3cd2f516883..ae55580e3f26 100644
--- a/japanese/ebnetd/files/ebnetd.sh
+++ b/japanese/ebnetd/files/ebnetd.sh
@@ -27,7 +27,7 @@
 
 # ebnetd
 name=ebnetd
-rcvar=`set_rcvar`
+rcvar=ebnetd_enable
 command="%%PREFIX%%/sbin/${name}"
 pidfile="/var/run/ebnetd/ebnd.pid"
 required_dirs="/var/run/ebnetd"
@@ -44,7 +44,7 @@ run_rc_command "$1"
 
 # ndtpd
 name=ndtpd
-rcvar=`set_rcvar`
+rcvar=ndtpd_enable
 command="%%PREFIX%%/sbin/${name}"
 pidfile="/var/run/ebnetd/${name}.pid"
 required_dirs="/var/run/ebnetd"
@@ -61,7 +61,7 @@ run_rc_command "$1"
 
 # ebhttpd
 name=ebhttpd
-rcvar=`set_rcvar`
+rcvar=ebhttpd_enable
 command="%%PREFIX%%/sbin/${name}"
 pidfile="/var/run/ebnetd/${name}.pid"
 required_dirs="/var/run/ebnetd"
diff --git a/japanese/esecanna/files/esecanna.in b/japanese/esecanna/files/esecanna.in
index 6306ecbfbe97..a88d1d491a68 100644
--- a/japanese/esecanna/files/esecanna.in
+++ b/japanese/esecanna/files/esecanna.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name=esecanna
-rcvar=`set_rcvar`
+rcvar=esecanna_enable
 
 esecannaserver=%%PREFIX%%/sbin/esecannaserver
 
diff --git a/japanese/multiskkserv/files/multiskkserv.in b/japanese/multiskkserv/files/multiskkserv.in
index 93740cdcc30f..e0c3a3235325 100644
--- a/japanese/multiskkserv/files/multiskkserv.in
+++ b/japanese/multiskkserv/files/multiskkserv.in
@@ -17,7 +17,7 @@
 . /etc/rc.subr
 
 name=multiskkserv
-rcvar=`set_rcvar`
+rcvar=multiskkserv_enable
 
 command=%%PREFIX%%/sbin/multiskkserv
 
diff --git a/japanese/p5-Mail-SpamAssassin/files/sa-spamd.sh.in b/japanese/p5-Mail-SpamAssassin/files/sa-spamd.sh.in
index ce42c0a390fd..5398ea6fa7e7 100644
--- a/japanese/p5-Mail-SpamAssassin/files/sa-spamd.sh.in
+++ b/japanese/p5-Mail-SpamAssassin/files/sa-spamd.sh.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=spamd
-rcvar=`set_rcvar`
+rcvar=spamd_enable
 
 extra_commands="reload"
 load_rc_config $name
diff --git a/japanese/rskkserv/files/rskkserv.sh.in b/japanese/rskkserv/files/rskkserv.sh.in
index b9d1e9119f70..80b91210b540 100644
--- a/japanese/rskkserv/files/rskkserv.sh.in
+++ b/japanese/rskkserv/files/rskkserv.sh.in
@@ -15,7 +15,7 @@ rskkserv_flags=${rskkserv_flags:-""}
 . /etc/rc.subr
 
 name="rskkserv"
-rcvar=`set_rcvar`
+rcvar=rskkserv_enable
 command="${prefix}/sbin/${name}"
 command_interpreter="${prefix}/bin/ruby"
 pidfile="/var/run/${name}.pid"
diff --git a/japanese/sj3-server/files/sj3.sh.in b/japanese/sj3-server/files/sj3.sh.in
index 3753bf726c56..6d005045c50d 100644
--- a/japanese/sj3-server/files/sj3.sh.in
+++ b/japanese/sj3-server/files/sj3.sh.in
@@ -21,7 +21,7 @@ sj3_enable=${sj3_enable:-"NO"}		# Enable sj3
 . /etc/rc.subr
 
 name="sj3"
-rcvar=`set_rcvar`
+rcvar=sj3_enable
 command="%%PREFIX%%/sbin/sj3serv"
 start_precmd="sj3serv_precmd"
 
diff --git a/japanese/skkserv/files/skkserv.sh.in b/japanese/skkserv/files/skkserv.sh.in
index cf7e2aba557b..f2bbe584a817 100644
--- a/japanese/skkserv/files/skkserv.sh.in
+++ b/japanese/skkserv/files/skkserv.sh.in
@@ -9,7 +9,7 @@
 . /etc/rc.subr
 
 name=skkserv
-rcvar=`set_rcvar`
+rcvar=skkserv_enable
 command=%%PREFIX%%/sbin/skkserv
 
 : ${skkserv_flags:="-a 127.0.0.1 -u skkserv"}
diff --git a/japanese/tiarra/files/tiarra.in b/japanese/tiarra/files/tiarra.in
index 816c3678d3db..4707de6b611d 100644
--- a/japanese/tiarra/files/tiarra.in
+++ b/japanese/tiarra/files/tiarra.in
@@ -8,19 +8,17 @@
 # BEFORE: LOGIN
 # KEYWORD: shutdown
 
-prefix=%%PREFIX%%
+. /etc/rc.subr
+
 name="tiarra"
+rcvar=tiarra_enable
+
+load_rc_config $name
 
 tiarra_enable=${tiarra_enable:-"NO"}
 tiarra_flags=${tiarra_flags:-"--quiet"}
 tiarra_user=${tiarra_user:-"%%TIARRA_USER%%"}
-tiarra_chdir=${tiarra_chdir:-"${prefix}/${name}"}
-
-. /etc/rc.subr
-
-rcvar=`set_rcvar`
-
-load_rc_config $name
+tiarra_chdir=${tiarra_chdir:-"%%PREFIX%%/${name}"}
 
 command="${tiarra_chdir}/${name}"
 command_interpreter="/usr/bin/perl"