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.

23 files changed, 23 insertions, 23 deletions

diff --git a/irc/anope/files/anope.in b/irc/anope/files/anope.in
index c3df3a6cf93e..124e3947dd84 100644
--- a/irc/anope/files/anope.in
+++ b/irc/anope/files/anope.in
@@ -17,7 +17,7 @@
 . /etc/rc.subr
 
 name="anope"
-rcvar=`set_rcvar`
+rcvar=anope_enable
 command=%%PREFIX%%/libexec/anope/services
 
 # set defaults
diff --git a/irc/bitlbee/files/bitlbee.in b/irc/bitlbee/files/bitlbee.in
index b28069a72778..a2f138e2ae85 100644
--- a/irc/bitlbee/files/bitlbee.in
+++ b/irc/bitlbee/files/bitlbee.in
@@ -13,7 +13,7 @@
 . /etc/rc.subr
 
 name="bitlbee"
-rcvar=`set_rcvar`
+rcvar=bitlbee_enable
 
 load_rc_config $name
 
diff --git a/irc/bopm/files/bopm.in b/irc/bopm/files/bopm.in
index 95d040dcf177..82b39136dd43 100644
--- a/irc/bopm/files/bopm.in
+++ b/irc/bopm/files/bopm.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name="bopm"
-rcvar=`set_rcvar`
+rcvar=bopm_enable
 
 load_rc_config $name
 
diff --git a/irc/charybdis/files/charybdis.in b/irc/charybdis/files/charybdis.in
index 54ac827056e3..aa32cffeede1 100644
--- a/irc/charybdis/files/charybdis.in
+++ b/irc/charybdis/files/charybdis.in
@@ -14,7 +14,7 @@
 . /etc/rc.subr
 
 name="charybdis"
-rcvar=`set_rcvar`
+rcvar=charybdis_enable
 
 load_rc_config $name
 
diff --git a/irc/inspircd/files/inspircd.in b/irc/inspircd/files/inspircd.in
index 88ebad8740d0..9844084f452a 100644
--- a/irc/inspircd/files/inspircd.in
+++ b/irc/inspircd/files/inspircd.in
@@ -30,7 +30,7 @@
 . /etc/rc.subr
 
 name=%%PORTNAME%%
-rcvar=`set_rcvar`
+rcvar=%%PORTNAME%%_enable
 
 load_rc_config ${name}
 
diff --git a/irc/inspircd12/files/inspircd.sh.in b/irc/inspircd12/files/inspircd.sh.in
index 441aa3afbb46..eb9e8366ac02 100644
--- a/irc/inspircd12/files/inspircd.sh.in
+++ b/irc/inspircd12/files/inspircd.sh.in
@@ -29,7 +29,7 @@
 . /etc/rc.subr
 
 name=inspircd
-rcvar=`set_rcvar`
+rcvar=inspircd_enable
 
 load_rc_config ${name}
 
diff --git a/irc/irc/files/ircd.sh.in b/irc/irc/files/ircd.sh.in
index 3a6fbb3732ef..5e1ff858b4c6 100644
--- a/irc/irc/files/ircd.sh.in
+++ b/irc/irc/files/ircd.sh.in
@@ -17,7 +17,7 @@
 . /etc/rc.subr
 
 name="ircd"
-rcvar=`set_rcvar`
+rcvar=ircd_enable
 
 load_rc_config $name
 
diff --git a/irc/irc2dc/files/irc2dc.in b/irc/irc2dc/files/irc2dc.in
index 8723dea3e4e6..0309224353d0 100644
--- a/irc/irc2dc/files/irc2dc.in
+++ b/irc/irc2dc/files/irc2dc.in
@@ -6,7 +6,7 @@
 . /etc/rc.subr
 
 name="irc2dc"
-rcvar=`set_rcvar`
+rcvar=irc2dc_enable
 load_rc_config $name
 command="%%PREFIX%%/bin/irc2dc"
 pidfile="/var/run/irc2dc.pid"
diff --git a/irc/ircd-hybrid/files/ircd-hybrid.sh.in b/irc/ircd-hybrid/files/ircd-hybrid.sh.in
index c70decfa5376..64b97bc81c19 100644
--- a/irc/ircd-hybrid/files/ircd-hybrid.sh.in
+++ b/irc/ircd-hybrid/files/ircd-hybrid.sh.in
@@ -12,7 +12,7 @@
 . /etc/rc.subr
 
 name="ircd_hybrid"
-rcvar=`set_rcvar`
+rcvar=ircd_hybrid_enable
 
 command=/usr/local/bin/ircd
 pidfile=/var/run/ircd/ircd.pid
diff --git a/irc/ircd-ratbox-devel/files/ircd-ratbox.sh.in b/irc/ircd-ratbox-devel/files/ircd-ratbox.sh.in
index 26ff7cace9bd..464cb9521f11 100644
--- a/irc/ircd-ratbox-devel/files/ircd-ratbox.sh.in
+++ b/irc/ircd-ratbox-devel/files/ircd-ratbox.sh.in
@@ -7,7 +7,7 @@
 . /etc/rc.subr
 
 name="ircd_ratbox"
-rcvar=`set_rcvar`
+rcvar=ircd_ratbox_enable
 load_rc_config $name
 
 ircd_ratbox_enable=${ircd_ratbox_enable:-"NO"}
diff --git a/irc/ircd-ratbox/files/ircd-ratbox.sh.in b/irc/ircd-ratbox/files/ircd-ratbox.sh.in
index 3cac766fcb27..fedd43d80296 100644
--- a/irc/ircd-ratbox/files/ircd-ratbox.sh.in
+++ b/irc/ircd-ratbox/files/ircd-ratbox.sh.in
@@ -7,7 +7,7 @@
 . /etc/rc.subr
 
 name="ircd_ratbox"
-rcvar=`set_rcvar`
+rcvar=ircd_ratbox_enable
 load_rc_config $name
 
 ircd_ratbox_enable=${ircd_ratbox_enable:-"NO"}
diff --git a/irc/ircd-ru/files/ircd.in b/irc/ircd-ru/files/ircd.in
index a7d5e339d575..a95392b93c4e 100644
--- a/irc/ircd-ru/files/ircd.in
+++ b/irc/ircd-ru/files/ircd.in
@@ -8,7 +8,7 @@
 . /etc/rc.subr
 
 name="ircd"
-rcvar=${name}_enable
+rcvar=ircd_enable
 
 command="%%PREFIX%%/sbin/$name"
 required_files="%%PREFIX%%/etc/ircd-ru/ircd.conf %%PREFIX%%/etc/ircd-ru/ircd.motd %%PREFIX%%/etc/ircd-ru/ircd.smotd"
diff --git a/irc/ircservices/files/ircservices.in b/irc/ircservices/files/ircservices.in
index 702a6c002036..5e4c84aaf802 100644
--- a/irc/ircservices/files/ircservices.in
+++ b/irc/ircservices/files/ircservices.in
@@ -8,7 +8,7 @@
 . /etc/rc.subr
 
 name=ircservices
-rcvar=${name}_enable
+rcvar=ircservices_enable
 
 command="%%PREFIX%%/sbin/${name}"
 command_args="-dir=%%PREFIX%%/etc/ircservices"
diff --git a/irc/iroffer-dinoex/files/iroffer-dinoex.in b/irc/iroffer-dinoex/files/iroffer-dinoex.in
index c8abb47c40e9..08ef365273e9 100644
--- a/irc/iroffer-dinoex/files/iroffer-dinoex.in
+++ b/irc/iroffer-dinoex/files/iroffer-dinoex.in
@@ -21,7 +21,7 @@
 . /etc/rc.subr
 
 name="iroffer"
-rcvar=`set_rcvar`
+rcvar=iroffer_enable
 
 # read configuration and set defaults
 load_rc_config "$name"
diff --git a/irc/minbif/files/minbif.in b/irc/minbif/files/minbif.in
index 6947fef39f4d..10e689e29dc5 100644
--- a/irc/minbif/files/minbif.in
+++ b/irc/minbif/files/minbif.in
@@ -12,7 +12,7 @@
 . /etc/rc.subr 
 
 name="minbif"
-rcvar=`set_rcvar`
+rcvar=minbif_enable
 
 load_rc_config $name
 
diff --git a/irc/ngircd/files/ngircd.in b/irc/ngircd/files/ngircd.in
index d0ffeb741709..68c54b82c6f7 100644
--- a/irc/ngircd/files/ngircd.in
+++ b/irc/ngircd/files/ngircd.in
@@ -18,7 +18,7 @@
 . /etc/rc.subr
 
 name="ngircd"
-rcvar=`set_rcvar`
+rcvar=ngircd_enable
 
 load_rc_config $name
 
diff --git a/irc/quassel/files/quasselcore.in b/irc/quassel/files/quasselcore.in
index 1039d04f5a1f..19b9151a3352 100644
--- a/irc/quassel/files/quasselcore.in
+++ b/irc/quassel/files/quasselcore.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=quasselcore
-rcvar=`set_rcvar`
+rcvar=quasselcore_enable
 
 load_rc_config ${name}
 
diff --git a/irc/ratbox-services/files/ratbox-services.sh.in b/irc/ratbox-services/files/ratbox-services.sh.in
index e2467d296c8a..5096eb5fa819 100644
--- a/irc/ratbox-services/files/ratbox-services.sh.in
+++ b/irc/ratbox-services/files/ratbox-services.sh.in
@@ -7,7 +7,7 @@
 . /etc/rc.subr
 
 name="ratbox_services"
-rcvar=`set_rcvar`
+rcvar=ratbox_services_enable
 load_rc_config $name
 
 ratbox_services_enable=${ratbox_services_enable:-"NO"}
diff --git a/irc/thales/files/thales.sh.in b/irc/thales/files/thales.sh.in
index 4c070fc174f2..6e007ac9e50a 100644
--- a/irc/thales/files/thales.sh.in
+++ b/irc/thales/files/thales.sh.in
@@ -17,7 +17,7 @@
 . /etc/rc.subr
 
 name="thales"
-rcvar=`set_rcvar`
+rcvar=thales_enable
 
 command="%%PREFIX%%/sbin/thales"
 
diff --git a/irc/tircd/files/tircd.sh.in b/irc/tircd/files/tircd.sh.in
index aaef1c8b0653..eae1eda6e24d 100644
--- a/irc/tircd/files/tircd.sh.in
+++ b/irc/tircd/files/tircd.sh.in
@@ -14,7 +14,7 @@
 . /etc/rc.subr
 
 name="tircd"
-rcvar=${name}_enable
+rcvar=tircd_enable
 
 command="%%PREFIX%%/bin/$name.pl"
 command_args="> /dev/null &"
diff --git a/irc/tr-ircd/files/trircd.in b/irc/tr-ircd/files/trircd.in
index 23af95c00f6b..fc0c3a380ecc 100644
--- a/irc/tr-ircd/files/trircd.in
+++ b/irc/tr-ircd/files/trircd.in
@@ -12,6 +12,7 @@
 . /etc/rc.subr
 
 name=trircd
+rcvar=trircd_enable
 
 load_rc_config ${name}
 : ${trircd_enable="NO"}
@@ -22,7 +23,6 @@ load_rc_config ${name}
 : ${trircd_pidfile=%%TRIRCD_RUNDIR%%/ircd.pid}
 : ${trircd_flags="-d ${trircd_confdir} -c ${trircd_conf} >/dev/null 2>&1"}
 
-rcvar=`set_rcvar`
 command=%%PREFIX%%/bin/tr-ircd
 pidfile=${trircd_pidfile}
 required_files="${trircd_conf}"
diff --git a/irc/undernet-ircu/files/undernet.sh.in b/irc/undernet-ircu/files/undernet.sh.in
index 4eea938b2a44..e30e7a8d8bb6 100644
--- a/irc/undernet-ircu/files/undernet.sh.in
+++ b/irc/undernet-ircu/files/undernet.sh.in
@@ -14,7 +14,7 @@
 . /etc/rc.subr
 
 name=undernet
-rcvar=`set_rcvar`
+rcvar=undernet_enable
 
 load_rc_config ${name}
 
diff --git a/irc/unreal/files/unrealircd.sh.in b/irc/unreal/files/unrealircd.sh.in
index 57ffc03b6ea4..9781f577850d 100644
--- a/irc/unreal/files/unrealircd.sh.in
+++ b/irc/unreal/files/unrealircd.sh.in
@@ -17,7 +17,7 @@
 . /etc/rc.subr
 
 name="unrealircd"
-rcvar=`set_rcvar`
+rcvar=unrealircd_enable
 
 command="%%PREFIX%%/libexec/ircd"
 pidfile="%%RUNDIR%%/ircd.pid"