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.

10 files changed, 10 insertions, 10 deletions

diff --git a/net-p2p/amule-devel/files/amuled.sh.in b/net-p2p/amule-devel/files/amuled.sh.in
index d3dae43db169..2ed3fa8d8548 100644
--- a/net-p2p/amule-devel/files/amuled.sh.in
+++ b/net-p2p/amule-devel/files/amuled.sh.in
@@ -21,7 +21,7 @@
 . /etc/rc.subr
 
 name="amuled"
-rcvar=`set_rcvar`
+rcvar=amuled_enable
 
 load_rc_config $name
 
diff --git a/net-p2p/amule/files/amuled.sh.in b/net-p2p/amule/files/amuled.sh.in
index d3dae43db169..2ed3fa8d8548 100644
--- a/net-p2p/amule/files/amuled.sh.in
+++ b/net-p2p/amule/files/amuled.sh.in
@@ -21,7 +21,7 @@
 . /etc/rc.subr
 
 name="amuled"
-rcvar=`set_rcvar`
+rcvar=amuled_enable
 
 load_rc_config $name
 
diff --git a/net-p2p/bnbt/files/bnbt.sh.in b/net-p2p/bnbt/files/bnbt.sh.in
index cbdc3b3d77f6..f8bde3c225cb 100644
--- a/net-p2p/bnbt/files/bnbt.sh.in
+++ b/net-p2p/bnbt/files/bnbt.sh.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name="bnbt"
-rcvar=`set_rcvar`
+rcvar=bnbt_enable
 
 # path to your executable, might be libxec, bin, sbin, ...
 command="%%PREFIX%%/bin/$name"
diff --git a/net-p2p/deluge/files/deluged.in b/net-p2p/deluge/files/deluged.in
index a85ce4646562..67c505852f3c 100644
--- a/net-p2p/deluge/files/deluged.in
+++ b/net-p2p/deluge/files/deluged.in
@@ -31,7 +31,7 @@
 . /etc/rc.subr
 
 name="deluged"
-rcvar=${name}_enable
+rcvar=deluged_enable
 
 command=%%PREFIX%%/bin/${name}
 command_interpreter=%%PYTHON_CMD%%
diff --git a/net-p2p/i2p/files/i2p.sh.in b/net-p2p/i2p/files/i2p.sh.in
index 58161b0e8ca4..ffc192912fe7 100644
--- a/net-p2p/i2p/files/i2p.sh.in
+++ b/net-p2p/i2p/files/i2p.sh.in
@@ -17,7 +17,7 @@
 . /etc/rc.subr
 
 name="i2p"
-rcvar=`set_rcvar`
+rcvar=i2p_enable
 command="%%PREFIX%%/sbin/i2prouter"
 extra_commands="install uninstall update"
 
diff --git a/net-p2p/mldonkey/files/mlnet.in b/net-p2p/mldonkey/files/mlnet.in
index 71a961417124..ea201b3cc92b 100644
--- a/net-p2p/mldonkey/files/mlnet.in
+++ b/net-p2p/mldonkey/files/mlnet.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name="mlnet"
-rcvar=`set_rcvar`
+rcvar=mlnet_enable
 command="%%PREFIX%%/bin/${name}"
 procname="%%PREFIX%%/bin/${name}-real"
 
diff --git a/net-p2p/py-bittornado/files/bttrack.in b/net-p2p/py-bittornado/files/bttrack.in
index a702107672f3..154aec0a5ec6 100644
--- a/net-p2p/py-bittornado/files/bttrack.in
+++ b/net-p2p/py-bittornado/files/bttrack.in
@@ -18,7 +18,7 @@
 . /etc/rc.subr
 
 name=bttrack
-rcvar=`set_rcvar`
+rcvar=bttrack_enable
 
 command=%%PREFIX%%/bin/${name}.py
 command_args="&"
diff --git a/net-p2p/transmission-cli/files/transmission.in b/net-p2p/transmission-cli/files/transmission.in
index 3fe976163862..def430c8b88b 100644
--- a/net-p2p/transmission-cli/files/transmission.in
+++ b/net-p2p/transmission-cli/files/transmission.in
@@ -25,7 +25,7 @@
 . /etc/rc.subr
 
 name="transmission"
-rcvar=${name}_enable
+rcvar=transmission_enable
 
 command=%%PREFIX%%/bin/transmission-daemon
 
diff --git a/net-p2p/uhub/files/uhub.sh.in b/net-p2p/uhub/files/uhub.sh.in
index f4abad5a2de6..7a06bcfefaf2 100644
--- a/net-p2p/uhub/files/uhub.sh.in
+++ b/net-p2p/uhub/files/uhub.sh.in
@@ -17,7 +17,7 @@
 . /etc/rc.subr
 
 name="uhub"
-rcvar=`set_rcvar`
+rcvar=uhub_enable
 
 load_rc_config $name
 
diff --git a/net-p2p/verlihub/files/verlihub.in b/net-p2p/verlihub/files/verlihub.in
index 4508f969b91f..faf64b878aaa 100644
--- a/net-p2p/verlihub/files/verlihub.in
+++ b/net-p2p/verlihub/files/verlihub.in
@@ -13,7 +13,7 @@
 . /etc/rc.subr
 
 name="verlihub"
-rcvar=${name}_enable
+rcvar=verlihub_enable
 
 command=%%PREFIX%%/bin/${name}
 pidfile=/var/run/${name}.pid