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, 6 insertions, 8 deletions

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"