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.

9 files changed, 14 insertions, 13 deletions

diff --git a/multimedia/ffmpeg-devel/files/ffserver.in b/multimedia/ffmpeg-devel/files/ffserver.in
index c7aefb7edaa2..770913641f0b 100644
--- a/multimedia/ffmpeg-devel/files/ffserver.in
+++ b/multimedia/ffmpeg-devel/files/ffserver.in
@@ -17,7 +17,7 @@ ffserver_enable="${ffserver_enable-NO}"
 . /etc/rc.subr
 
 name=ffserver
-rcvar=`set_rcvar`
+rcvar=ffserver_enable
 
 command="%%PREFIX%%/bin/${name} &"
 required_files=%%PREFIX%%/etc/ffserver.conf
diff --git a/multimedia/ffmpeg/files/ffserver.in b/multimedia/ffmpeg/files/ffserver.in
index c7aefb7edaa2..770913641f0b 100644
--- a/multimedia/ffmpeg/files/ffserver.in
+++ b/multimedia/ffmpeg/files/ffserver.in
@@ -17,7 +17,7 @@ ffserver_enable="${ffserver_enable-NO}"
 . /etc/rc.subr
 
 name=ffserver
-rcvar=`set_rcvar`
+rcvar=ffserver_enable
 
 command="%%PREFIX%%/bin/${name} &"
 required_files=%%PREFIX%%/etc/ffserver.conf
diff --git a/multimedia/freevo/files/freevo-rcsubr.in b/multimedia/freevo/files/freevo-rcsubr.in
index 8e82488e3e94..4edbf452306b 100644
--- a/multimedia/freevo/files/freevo-rcsubr.in
+++ b/multimedia/freevo/files/freevo-rcsubr.in
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# $FreeBSD$
+#
 # PROVIDE: freevo
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
@@ -14,7 +16,7 @@
 . /etc/rc.subr
 
 name=freevo
-rcvar=`set_rcvar`
+rcvar=freevo_enable
 
 load_rc_config $name
 : ${freevo_enable="NO"}
@@ -36,7 +38,7 @@ fast*)	freevo_cmd=`expr "$1" : 'fast\(.*\)'` ;;
 esac
 
 name=freevo_recordserver
-rcvar=${name}_enable
+rcvar=freevo_recordserver_enable
 eval ${name}_user=${freevo_user}
 eval ${name}_group=${freevo_group}
 pidfile=/var/run/freevo/recordserver-${freevo_uid}.pid
@@ -44,7 +46,7 @@ command_args="recordserver ${freevo_cmd}"
 run_rc_command "$1"
 
 name=freevo_webserver
-rcvar=${name}_enable
+rcvar=freevo_webserver_enable
 eval ${name}_user=${freevo_user}
 eval ${name}_group=${freevo_group}
 pidfile=/var/run/freevo/webserver-${freevo_uid}.pid
@@ -52,10 +54,9 @@ command_args="webserver ${freevo_cmd}"
 run_rc_command "$1"
 
 name=freevo_gui
-rcvar=${name}_enable
+rcvar=freevo_gui_enable
 eval ${name}_user=${freevo_user}
 eval ${name}_group=${freevo_group}
 pidfile=/var/run/freevo/freevo-${freevo_uid}.pid
 command_args="${freevo_cmd}"
 run_rc_command "$1"
-
diff --git a/multimedia/freevo/files/freevo.in b/multimedia/freevo/files/freevo.in
index 5d4f37ab9ba3..dfb0b072e701 100644
--- a/multimedia/freevo/files/freevo.in
+++ b/multimedia/freevo/files/freevo.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name=freevo
-rcvar=`set_rcvar`
+rcvar=freevo_enable
 
 load_rc_config ${name}
 : ${freevo_enable:="NO"}
diff --git a/multimedia/mythtv/files/mythbackend.in b/multimedia/mythtv/files/mythbackend.in
index 6ddc1cfff746..b4f855276cfa 100644
--- a/multimedia/mythtv/files/mythbackend.in
+++ b/multimedia/mythtv/files/mythbackend.in
@@ -18,7 +18,7 @@
 . /etc/rc.subr
 
 name="mythbackend"
-rcvar=`set_rcvar`
+rcvar=mythbackend_enable
 command="%%PREFIX%%/bin/${name}"
 
 load_rc_config $name
diff --git a/multimedia/ptx-kmod/files/ptx.sh.in b/multimedia/ptx-kmod/files/ptx.sh.in
index 38232601639d..498196bf256c 100644
--- a/multimedia/ptx-kmod/files/ptx.sh.in
+++ b/multimedia/ptx-kmod/files/ptx.sh.in
@@ -8,7 +8,7 @@
 . /etc/rc.subr
 
 name="ptx"
-rcvar=`set_rcvar`
+rcvar=ptx_enable
 start_cmd="ptx_start"
 stop_cmd="ptx_stop"
 
diff --git a/multimedia/vdr/files/vdr.in b/multimedia/vdr/files/vdr.in
index b86f4609563e..cf963cba649f 100644
--- a/multimedia/vdr/files/vdr.in
+++ b/multimedia/vdr/files/vdr.in
@@ -22,7 +22,7 @@
 . /etc/rc.subr
 
 name=vdr
-rcvar=`set_rcvar`
+rcvar=vdr_enable
 
 command="%%PREFIX%%/bin/vdr"
 command_args="-d"
diff --git a/multimedia/webcamd/files/webcamd.in b/multimedia/webcamd/files/webcamd.in
index 11414484ff99..e02205b1e7a5 100644
--- a/multimedia/webcamd/files/webcamd.in
+++ b/multimedia/webcamd/files/webcamd.in
@@ -15,7 +15,7 @@ hald_enable=${hald_enable-"NO"}
 . /etc/rc.subr
 
 name=webcamd
-rcvar=`set_rcvar`
+rcvar=webcamd_enable
 command=%%PREFIX%%/sbin/webcamd
 command_args="-B -U webcamd -G webcamd"
 
diff --git a/multimedia/zoneminder/files/zoneminder.in b/multimedia/zoneminder/files/zoneminder.in
index f0d4f5008446..d1708642b9c2 100644
--- a/multimedia/zoneminder/files/zoneminder.in
+++ b/multimedia/zoneminder/files/zoneminder.in
@@ -15,7 +15,7 @@
 . /etc/rc.subr
 
 name="zoneminder"
-rcvar=${name}_enable
+rcvar=zoneminder_enable
 
 load_rc_config "$name"
 : ${zoneminder_enable="NO"}