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, 16 insertions, 16 deletions

diff --git a/net-im/ejabberd/files/ejabberd.in b/net-im/ejabberd/files/ejabberd.in
index 15819d384263..816b7ae88648 100644
--- a/net-im/ejabberd/files/ejabberd.in
+++ b/net-im/ejabberd/files/ejabberd.in
@@ -20,7 +20,7 @@ ejabberd_epmd_address=${ejabberd_epmd_address-"127.0.0.1"}
 . /etc/rc.subr
 
 name="ejabberd"
-rcvar=`set_rcvar`
+rcvar=ejabberd_enable
 
 reload_cmd="ejabberd_reload"
 restart_cmd="ejabberd_reload"
diff --git a/net-im/imspector/files/imspector.in b/net-im/imspector/files/imspector.in
index acd7fbe4f991..412e1dde1870 100644
--- a/net-im/imspector/files/imspector.in
+++ b/net-im/imspector/files/imspector.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name="imspector"
-rcvar=${name}_enable
+rcvar=imspector_enable
 
 command=%%PREFIX%%/sbin/${name}
 
diff --git a/net-im/iserverd/files/iserverd.in b/net-im/iserverd/files/iserverd.in
index 03ab57f68033..157ace8c7766 100644
--- a/net-im/iserverd/files/iserverd.in
+++ b/net-im/iserverd/files/iserverd.in
@@ -19,7 +19,7 @@ load_rc_config $name
 iserverd_enable=${iserverd_enable:-"NO"}
 iserverd_user=iserv
 
-rcvar=`set_rcvar`
+rcvar=iserverd_enable
 command=%%PREFIX%%/bin/iserverd
 command_args="-o"
 
diff --git a/net-im/jabber-pyaim/files/jabber-pyaim-transport.sh.in b/net-im/jabber-pyaim/files/jabber-pyaim-transport.sh.in
index 80940eb87482..462bf4cd076f 100644
--- a/net-im/jabber-pyaim/files/jabber-pyaim-transport.sh.in
+++ b/net-im/jabber-pyaim/files/jabber-pyaim-transport.sh.in
@@ -14,7 +14,7 @@
 . /etc/rc.subr
 
 name="jabber_pyaim"
-rcvar=`set_rcvar`
+rcvar=jabber_pyaim_enable
 
 load_rc_config $name
 
diff --git a/net-im/jabber-pyicq/files/jabber-pyicq-transport.sh.in b/net-im/jabber-pyicq/files/jabber-pyicq-transport.sh.in
index b3ec5ab96571..f632d68bd6b9 100644
--- a/net-im/jabber-pyicq/files/jabber-pyicq-transport.sh.in
+++ b/net-im/jabber-pyicq/files/jabber-pyicq-transport.sh.in
@@ -14,7 +14,7 @@
 . /etc/rc.subr
 
 name="jabber_pyicq"
-rcvar=`set_rcvar`
+rcvar=jabber_pyicq_enable
 
 load_rc_config $name
 
diff --git a/net-im/jabber-pymsn/files/jabber-pymsn-transport.sh.in b/net-im/jabber-pymsn/files/jabber-pymsn-transport.sh.in
index decb3fb949f3..622be158185d 100644
--- a/net-im/jabber-pymsn/files/jabber-pymsn-transport.sh.in
+++ b/net-im/jabber-pymsn/files/jabber-pymsn-transport.sh.in
@@ -14,7 +14,7 @@
 . /etc/rc.subr
 
 name="jabber_pymsn"
-rcvar=`set_rcvar`
+rcvar=jabber_pymsn_enable
 
 load_rc_config $name
 
diff --git a/net-im/jabber/files/jabber.in b/net-im/jabber/files/jabber.in
index 76ce3ea2c8c7..a9e0f92e1b61 100644
--- a/net-im/jabber/files/jabber.in
+++ b/net-im/jabber/files/jabber.in
@@ -14,7 +14,7 @@
 . /etc/rc.subr
 
 name="jabber"
-rcvar=`set_rcvar`
+rcvar=jabber_enable
 
 load_rc_config $name
 
diff --git a/net-im/jabberd/files/jabberd.in b/net-im/jabberd/files/jabberd.in
index 7afd08dff668..bf139204f5f1 100644
--- a/net-im/jabberd/files/jabberd.in
+++ b/net-im/jabberd/files/jabberd.in
@@ -20,7 +20,7 @@ jabberd_user=${jabberd_user-"%%JABBER_USER%%"}
 . /etc/rc.subr
 
 name="jabberd"
-rcvar=`set_rcvar`
+rcvar=jabberd_enable
 command_interpreter="%%PERL%%"
 command="%%PREFIX%%/bin/jabberd"
 command_args="-b"
diff --git a/net-im/jggtrans/files/jggtrans.sh.in b/net-im/jggtrans/files/jggtrans.sh.in
index e605d289e9d8..2db822352d75 100644
--- a/net-im/jggtrans/files/jggtrans.sh.in
+++ b/net-im/jggtrans/files/jggtrans.sh.in
@@ -13,7 +13,7 @@
 . /etc/rc.subr
 
 name="jggtrans"
-rcvar=`set_rcvar`
+rcvar=jggtrans_enable
 
 load_rc_config $name
 
diff --git a/net-im/mu-conference/files/mu-conference.in b/net-im/mu-conference/files/mu-conference.in
index e7a18f178e49..433182ec482a 100644
--- a/net-im/mu-conference/files/mu-conference.in
+++ b/net-im/mu-conference/files/mu-conference.in
@@ -22,7 +22,7 @@
 . /etc/rc.subr
 
 name="mu_conference"
-rcvar=`set_rcvar`
+rcvar=mu_conference_enable
 
 command="%%PREFIX%%/bin/mu-conference"
 
diff --git a/net-im/openfire-devel/files/openfire.in b/net-im/openfire-devel/files/openfire.in
index e8457e382b7d..118bb35fe4b3 100644
--- a/net-im/openfire-devel/files/openfire.in
+++ b/net-im/openfire-devel/files/openfire.in
@@ -24,7 +24,7 @@
 . /etc/rc.subr
 
 name="openfire"
-rcvar=${name}_enable
+rcvar=openfire_enable
 load_rc_config $name
 
 # Set defaults
diff --git a/net-im/openfire/files/openfire.in b/net-im/openfire/files/openfire.in
index e8457e382b7d..118bb35fe4b3 100644
--- a/net-im/openfire/files/openfire.in
+++ b/net-im/openfire/files/openfire.in
@@ -24,7 +24,7 @@
 . /etc/rc.subr
 
 name="openfire"
-rcvar=${name}_enable
+rcvar=openfire_enable
 load_rc_config $name
 
 # Set defaults
diff --git a/net-im/prosody/files/prosody.in b/net-im/prosody/files/prosody.in
index 3c14232335ce..e336d1eca09c 100644
--- a/net-im/prosody/files/prosody.in
+++ b/net-im/prosody/files/prosody.in
@@ -15,7 +15,7 @@
 . /etc/rc.subr
 
 name="prosody"
-rcvar=`set_rcvar`
+rcvar=prosody_enable
 pidfile="%%PREFIX%%/var/lib/prosody/prosody.pid"
 command="%%PREFIX%%/bin/prosodyctl"
 
diff --git a/net-im/py-punjab/files/punjab.sh.in b/net-im/py-punjab/files/punjab.sh.in
index 78477b78f9fe..d41f04dc8bbc 100644
--- a/net-im/py-punjab/files/punjab.sh.in
+++ b/net-im/py-punjab/files/punjab.sh.in
@@ -8,7 +8,7 @@
 . /etc/rc.subr
 
 name="punjab"
-rcvar=`set_rcvar`
+rcvar=punjab_enable
 command="%%PREFIX%%/bin/twistd"
 
 load_rc_config $name
diff --git a/net-im/py-xmpppy-yahoo/files/xmpppy_yahoo.in b/net-im/py-xmpppy-yahoo/files/xmpppy_yahoo.in
index 033e9d564773..8638b52dd4da 100644
--- a/net-im/py-xmpppy-yahoo/files/xmpppy_yahoo.in
+++ b/net-im/py-xmpppy-yahoo/files/xmpppy_yahoo.in
@@ -15,7 +15,7 @@
 . /etc/rc.subr
 
 name="xmpppy_yahoo"
-rcvar=`set_rcvar`
+rcvar=xmpppy_yahoo_enable
 
 load_rc_config $name
 
diff --git a/net-im/zephyr/files/zhm.in b/net-im/zephyr/files/zhm.in
index 82cc5009ee67..c374a9c85b21 100644
--- a/net-im/zephyr/files/zhm.in
+++ b/net-im/zephyr/files/zhm.in
@@ -7,7 +7,7 @@
 . /etc/rc.subr
 
 name="zhm"
-rcvar="zhm_enable"
+rcvar=zhm_enable
 start_cmd="zhm_start"
 stop_postcmd="zhm_postcmd"
 start_precmd="zhm_precmd"