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.

16 files changed, 24 insertions, 24 deletions

diff --git a/emulators/kqemu-kmod-devel/files/kqemu.in b/emulators/kqemu-kmod-devel/files/kqemu.in
index 7662ca3cccd1..1903deec4d71 100644
--- a/emulators/kqemu-kmod-devel/files/kqemu.in
+++ b/emulators/kqemu-kmod-devel/files/kqemu.in
@@ -12,7 +12,7 @@
 . /etc/rc.subr
 
 name="kqemu"
-rcvar=${name}_enable
+rcvar=kqemu_enable
 
 load_rc_config $name
 
diff --git a/emulators/kqemu-kmod/files/kqemu.in b/emulators/kqemu-kmod/files/kqemu.in
index 7662ca3cccd1..1903deec4d71 100644
--- a/emulators/kqemu-kmod/files/kqemu.in
+++ b/emulators/kqemu-kmod/files/kqemu.in
@@ -12,7 +12,7 @@
 . /etc/rc.subr
 
 name="kqemu"
-rcvar=${name}_enable
+rcvar=kqemu_enable
 
 load_rc_config $name
 
diff --git a/emulators/open-vm-tools/files/vmware-guestd.sh.in b/emulators/open-vm-tools/files/vmware-guestd.sh.in
index 08b77e5e3bed..25c42936435a 100644
--- a/emulators/open-vm-tools/files/vmware-guestd.sh.in
+++ b/emulators/open-vm-tools/files/vmware-guestd.sh.in
@@ -14,7 +14,7 @@ checkvm_cmd="%%PREFIX%%/bin/vmware-checkvm > /dev/null"
 
 # VMware guest daemon
 name="vmware_guestd"
-rcvar=`set_rcvar`
+rcvar=vmware_guestd_enable
 start_precmd="${checkvm_cmd}"
 unset start_cmd
 stop_precmd="${checkvm_cmd}"
diff --git a/emulators/open-vm-tools/files/vmware-kmod.sh.in b/emulators/open-vm-tools/files/vmware-kmod.sh.in
index 433604f536d4..4831d99a4366 100644
--- a/emulators/open-vm-tools/files/vmware-kmod.sh.in
+++ b/emulators/open-vm-tools/files/vmware-kmod.sh.in
@@ -42,7 +42,7 @@ vmware_mod_status()
 # VMware kernel module: vmmemctl
 kernel_mod="vmmemctl"
 name="vmware_guest_${kernel_mod}"
-rcvar=`set_rcvar`
+rcvar=vmware_guest_${kernel_mod}_enable
 extra_commands="status"
 status_cmd="vmware_mod_status ${kernel_mod}"
 start_precmd="${checkvm_cmd}"
@@ -58,7 +58,7 @@ run_rc_command "$1"
 # VMware kernel module: vmxnet
 kernel_mod="vmxnet"
 name="vmware_guest_${kernel_mod}"
-rcvar=`set_rcvar`
+rcvar=vmware_guest_${kernel_mod}_enable
 extra_commands="status"
 status_cmd="vmware_mod_status ${kernel_mod}"
 start_precmd="${checkvm_cmd}"
@@ -73,7 +73,7 @@ run_rc_command "$1"
 # VMware kernel module: vmblock
 kernel_mod="vmblock"
 name="vmware_guest_${kernel_mod}"
-rcvar=`set_rcvar`
+rcvar=vmware_guest_${kernel_mod}_enable
 extra_commands="status"
 status_cmd="vmware_mod_status ${kernel_mod}"
 start_precmd="${checkvm_cmd}"
@@ -88,7 +88,7 @@ run_rc_command "$1"
 # VMware kernel module: vmhgfs
 kernel_mod="vmhgfs"
 name="vmware_guest_${kernel_mod}"
-rcvar=`set_rcvar`
+rcvar=vmware_guest_${kernel_mod}_enable
 extra_commands="status"
 status_cmd="vmware_mod_status ${kernel_mod}"
 start_precmd="${checkvm_cmd}"
diff --git a/emulators/tpm-emulator/files/tpmd.in b/emulators/tpm-emulator/files/tpmd.in
index 0af8eaeac3e6..42e07df28575 100644
--- a/emulators/tpm-emulator/files/tpmd.in
+++ b/emulators/tpm-emulator/files/tpmd.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name=tpmd
-rcvar=`set_rcvar`
+rcvar=tpmd_enable
 command="%%PREFIX%%/bin/${name}"
 
 load_rc_config $name
diff --git a/emulators/virtualbox-ose-additions/files/vboxguest.in b/emulators/virtualbox-ose-additions/files/vboxguest.in
index 702b83499763..e2e1b501e2ae 100644
--- a/emulators/virtualbox-ose-additions/files/vboxguest.in
+++ b/emulators/virtualbox-ose-additions/files/vboxguest.in
@@ -18,7 +18,7 @@
 . /etc/rc.subr
 
 name="vboxguest"
-rcvar=${name}_enable
+rcvar=vboxguest_enable
 start_cmd="vboxguest_start"
 stop_cmd="vboxguest_stop"
 
diff --git a/emulators/virtualbox-ose-additions/files/vboxservice.in b/emulators/virtualbox-ose-additions/files/vboxservice.in
index 85a235fd2da1..cb2375868ca9 100644
--- a/emulators/virtualbox-ose-additions/files/vboxservice.in
+++ b/emulators/virtualbox-ose-additions/files/vboxservice.in
@@ -15,7 +15,7 @@
 . /etc/rc.subr
 
 name="vboxservice"
-rcvar=`set_rcvar`
+rcvar=vboxservice_enable
 command="%%PREFIX%%/sbin/VBoxService"
 
 load_rc_config $name
diff --git a/emulators/virtualbox-ose-kmod-legacy/files/vboxnet.in b/emulators/virtualbox-ose-kmod-legacy/files/vboxnet.in
index 17f079bd900c..cf4225486a30 100644
--- a/emulators/virtualbox-ose-kmod-legacy/files/vboxnet.in
+++ b/emulators/virtualbox-ose-kmod-legacy/files/vboxnet.in
@@ -18,7 +18,7 @@
 . /etc/rc.subr
 
 name="vboxnet"
-rcvar=${name}_enable
+rcvar=vboxnet_enable
 start_cmd="vboxnet_start"
 stop_cmd="vboxnet_stop"
 
diff --git a/emulators/virtualbox-ose-kmod/files/vboxnet.in b/emulators/virtualbox-ose-kmod/files/vboxnet.in
index 17f079bd900c..cf4225486a30 100644
--- a/emulators/virtualbox-ose-kmod/files/vboxnet.in
+++ b/emulators/virtualbox-ose-kmod/files/vboxnet.in
@@ -18,7 +18,7 @@
 . /etc/rc.subr
 
 name="vboxnet"
-rcvar=${name}_enable
+rcvar=vboxnet_enable
 start_cmd="vboxnet_start"
 stop_cmd="vboxnet_stop"
 
diff --git a/emulators/virtualbox-ose-legacy/files/vboxheadless.in b/emulators/virtualbox-ose-legacy/files/vboxheadless.in
index 8913f192ffb8..544b5912814f 100644
--- a/emulators/virtualbox-ose-legacy/files/vboxheadless.in
+++ b/emulators/virtualbox-ose-legacy/files/vboxheadless.in
@@ -26,7 +26,7 @@
 . /etc/rc.subr
 
 name="vboxheadless"
-rcvar=`set_rcvar`
+rcvar=vboxheadless_enable
 
 command="%%PREFIX%%/bin/VBoxHeadless"
 pidbase="/var/run/${name}"
diff --git a/emulators/virtualbox-ose-legacy/files/vboxwebsrv.in b/emulators/virtualbox-ose-legacy/files/vboxwebsrv.in
index 2905effbb3a8..73dabca8a8b3 100644
--- a/emulators/virtualbox-ose-legacy/files/vboxwebsrv.in
+++ b/emulators/virtualbox-ose-legacy/files/vboxwebsrv.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name=vboxwebsrv
-rcvar=`set_rcvar`
+rcvar=vboxwebsrv_enable
 
 command="%%PREFIX%%/bin/vboxwebsrv"
 pidfile="/var/run/${name}.pid"
diff --git a/emulators/virtualbox-ose/files/vboxheadless.in b/emulators/virtualbox-ose/files/vboxheadless.in
index 8913f192ffb8..544b5912814f 100644
--- a/emulators/virtualbox-ose/files/vboxheadless.in
+++ b/emulators/virtualbox-ose/files/vboxheadless.in
@@ -26,7 +26,7 @@
 . /etc/rc.subr
 
 name="vboxheadless"
-rcvar=`set_rcvar`
+rcvar=vboxheadless_enable
 
 command="%%PREFIX%%/bin/VBoxHeadless"
 pidbase="/var/run/${name}"
diff --git a/emulators/virtualbox-ose/files/vboxwebsrv.in b/emulators/virtualbox-ose/files/vboxwebsrv.in
index 2905effbb3a8..73dabca8a8b3 100644
--- a/emulators/virtualbox-ose/files/vboxwebsrv.in
+++ b/emulators/virtualbox-ose/files/vboxwebsrv.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name=vboxwebsrv
-rcvar=`set_rcvar`
+rcvar=vboxwebsrv_enable
 
 command="%%PREFIX%%/bin/vboxwebsrv"
 pidfile="/var/run/${name}.pid"
diff --git a/emulators/vmware-guestd4/files/vmware-guestd.sh.in b/emulators/vmware-guestd4/files/vmware-guestd.sh.in
index 8c9521ad98c6..2e076c9a3a94 100644
--- a/emulators/vmware-guestd4/files/vmware-guestd.sh.in
+++ b/emulators/vmware-guestd4/files/vmware-guestd.sh.in
@@ -22,7 +22,7 @@ vmware_guest_kmod_start()
 
 # VMware kernel modules
 name="vmware_guest_kmod"
-rcvar=`set_rcvar`
+rcvar=vmware_guest_kmod_enable
 start_precmd="${checkvm_cmd}"
 start_cmd="vmware_guest_kmod_start"
 stop_precmd="${checkvm_cmd}"
@@ -34,7 +34,7 @@ run_rc_command "$1"
 
 # VMware guest daemon
 name="vmware_guestd"
-rcvar=`set_rcvar`
+rcvar=vmware_guestd_enable
 start_precmd="${checkvm_cmd}"
 unset start_cmd
 stop_precmd="${checkvm_cmd}"
diff --git a/emulators/vmware-guestd5/files/vmware-guestd.sh.in b/emulators/vmware-guestd5/files/vmware-guestd.sh.in
index d66fccbc7892..98bcad2c83d3 100644
--- a/emulators/vmware-guestd5/files/vmware-guestd.sh.in
+++ b/emulators/vmware-guestd5/files/vmware-guestd.sh.in
@@ -27,7 +27,7 @@ vmware_guest_vmxnet_start()
 
 # VMware kernel module: vmmemctl
 name="vmware_guest_vmmemctl"
-rcvar=`set_rcvar`
+rcvar=vmware_guest_vmmemctl_enable
 start_precmd="${checkvm_cmd}"
 start_cmd="vmware_guest_vmmemctl_start"
 stop_precmd="${checkvm_cmd}"
@@ -40,7 +40,7 @@ run_rc_command "$1"
 
 # VMware kernel module: vmxnet
 name="vmware_guest_vmxnet"
-rcvar=`set_rcvar`
+rcvar=vmware_guest_vmxnet_enable
 start_precmd="${checkvm_cmd}"
 start_cmd="vmware_guest_vmxnet_start"
 stop_precmd="${checkvm_cmd}"
@@ -52,7 +52,7 @@ run_rc_command "$1"
 
 # VMware guest daemon
 name="vmware_guestd"
-rcvar=`set_rcvar`
+rcvar=vmware_guestd_enable
 start_precmd="${checkvm_cmd}"
 unset start_cmd
 stop_precmd="${checkvm_cmd}"
diff --git a/emulators/vmware-guestd6/files/vmware-guestd.sh.in b/emulators/vmware-guestd6/files/vmware-guestd.sh.in
index d66fccbc7892..98bcad2c83d3 100644
--- a/emulators/vmware-guestd6/files/vmware-guestd.sh.in
+++ b/emulators/vmware-guestd6/files/vmware-guestd.sh.in
@@ -27,7 +27,7 @@ vmware_guest_vmxnet_start()
 
 # VMware kernel module: vmmemctl
 name="vmware_guest_vmmemctl"
-rcvar=`set_rcvar`
+rcvar=vmware_guest_vmmemctl_enable
 start_precmd="${checkvm_cmd}"
 start_cmd="vmware_guest_vmmemctl_start"
 stop_precmd="${checkvm_cmd}"
@@ -40,7 +40,7 @@ run_rc_command "$1"
 
 # VMware kernel module: vmxnet
 name="vmware_guest_vmxnet"
-rcvar=`set_rcvar`
+rcvar=vmware_guest_vmxnet_enable
 start_precmd="${checkvm_cmd}"
 start_cmd="vmware_guest_vmxnet_start"
 stop_precmd="${checkvm_cmd}"
@@ -52,7 +52,7 @@ run_rc_command "$1"
 
 # VMware guest daemon
 name="vmware_guestd"
-rcvar=`set_rcvar`
+rcvar=vmware_guestd_enable
 start_precmd="${checkvm_cmd}"
 unset start_cmd
 stop_precmd="${checkvm_cmd}"