80 files changed, 80 insertions, 82 deletions

diff --git a/security/amavisd-milter/files/amavisd-milter.sh.in b/security/amavisd-milter/files/amavisd-milter.sh.in
index 10b77a8ff515..546220cc1cf3 100644
--- a/security/amavisd-milter/files/amavisd-milter.sh.in
+++ b/security/amavisd-milter/files/amavisd-milter.sh.in
@@ -18,7 +18,7 @@
 . /etc/rc.subr
 
 name="amavisd_milter"
-rcvar=`set_rcvar`
+rcvar=amavisd_milter_enable
 
 load_rc_config $name
 
diff --git a/security/amavisd-new/files/amavis-milter.sh.in b/security/amavisd-new/files/amavis-milter.sh.in
index 3763d470cc47..ec6136b96661 100644
--- a/security/amavisd-new/files/amavis-milter.sh.in
+++ b/security/amavisd-new/files/amavis-milter.sh.in
@@ -17,7 +17,7 @@
 . /etc/rc.subr
 
 name=amavis_milter
-rcvar=`set_rcvar`
+rcvar=amavis_milter_enable
 
 command=%%PREFIX%%/sbin/amavis-milter
 required_files=%%PREFIX%%/etc/amavisd.conf
diff --git a/security/amavisd-new/files/amavis-p0fanalyzer.sh.in b/security/amavisd-new/files/amavis-p0fanalyzer.sh.in
index 4ab419fa5c1b..d7009711bcfc 100644
--- a/security/amavisd-new/files/amavis-p0fanalyzer.sh.in
+++ b/security/amavisd-new/files/amavis-p0fanalyzer.sh.in
@@ -15,7 +15,7 @@ amavis_p0fanalyzer_flags="${amavis_p0fanalyzer_flags-2345}"
 . /etc/rc.subr
 
 name="amavis_p0fanalyzer"
-rcvar=`set_rcvar`
+rcvar=amavis_p0fanalyzer_enable
 
 start_cmd=p0fanalyzer_start
 stop_cmd=p0fanalyzer_stop
diff --git a/security/amavisd-new/files/amavisd-snmp.sh.in b/security/amavisd-new/files/amavisd-snmp.sh.in
index 60a174db49a7..0f724ae759f3 100644
--- a/security/amavisd-new/files/amavisd-snmp.sh.in
+++ b/security/amavisd-new/files/amavisd-snmp.sh.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name=amavisd_snmp
-rcvar=`set_rcvar`
+rcvar=amavisd_snmp_enable
 
 command="%%PREFIX%%/sbin/amavisd-snmp-subagent"
 command_interpreter="%%PERL%%"
diff --git a/security/amavisd-new/files/amavisd.sh.in b/security/amavisd-new/files/amavisd.sh.in
index c885608169d3..593d26982d81 100644
--- a/security/amavisd-new/files/amavisd.sh.in
+++ b/security/amavisd-new/files/amavisd.sh.in
@@ -17,7 +17,7 @@
 . /etc/rc.subr
 
 name=amavisd
-rcvar=`set_rcvar`
+rcvar=amavisd_enable
 
 command=%%PREFIX%%/sbin/amavisd > /dev/null 2>&1
 required_files=%%PREFIX%%/etc/amavisd.conf
diff --git a/security/arpCounterattack/files/arpCounterattack.in b/security/arpCounterattack/files/arpCounterattack.in
index 6594649d5b21..cb7fe9b9ec6a 100644
--- a/security/arpCounterattack/files/arpCounterattack.in
+++ b/security/arpCounterattack/files/arpCounterattack.in
@@ -19,7 +19,7 @@ arpcounterattack_pidfile="/var/run/arpCounterattack.pid"
 . /etc/rc.subr
 
 name="arpcounterattack"
-rcvar=`set_rcvar`
+rcvar=arpcounterattack_enable
 command="%%PREFIX%%/sbin/arpCounterattack"
 
 load_rc_config $name
diff --git a/security/barnyard2/files/barnyard2.sh.in b/security/barnyard2/files/barnyard2.sh.in
index ecaa513a9ef4..08a37f4b8030 100644
--- a/security/barnyard2/files/barnyard2.sh.in
+++ b/security/barnyard2/files/barnyard2.sh.in
@@ -23,7 +23,7 @@
 . /etc/rc.subr
 
 name="barnyard2"
-rcvar=`set_rcvar`
+rcvar=barnyard2_enable
 # set some defaults
 : ${barnyard2_enable="NO"}
 : ${barnyard2_conf="%%PREFIX%%/etc/barnyard2.conf"}
diff --git a/security/blocksshd/files/blocksshd.in b/security/blocksshd/files/blocksshd.in
index 45f7a1a4eaed..ec27ea9275ca 100644
--- a/security/blocksshd/files/blocksshd.in
+++ b/security/blocksshd/files/blocksshd.in
@@ -9,7 +9,7 @@
 . /etc/rc.subr
 
 name="blocksshd"
-rcvar="`set_rcvar`"
+rcvar=blocksshd_enable
 command="%%PREFIX%%/bin/${name}"
 command_interpreter="/usr/bin/perl"
 pidfile="/var/run/${name}.pid"
diff --git a/security/bruteblock/files/bruteblockd.sh.in b/security/bruteblock/files/bruteblockd.sh.in
index ab42438e7057..51de2ea73635 100644
--- a/security/bruteblock/files/bruteblockd.sh.in
+++ b/security/bruteblock/files/bruteblockd.sh.in
@@ -7,7 +7,7 @@
 . /etc/rc.subr
 
 name="bruteblockd"
-rcvar=`set_rcvar`
+rcvar=bruteblockd_enable
 
 load_rc_config $name
 
diff --git a/security/clamav-devel/files/clamav-clamd.in b/security/clamav-devel/files/clamav-clamd.in
index a8e79d4c1c6f..e0fd6958b4f6 100644
--- a/security/clamav-devel/files/clamav-clamd.in
+++ b/security/clamav-devel/files/clamav-clamd.in
@@ -20,7 +20,7 @@
 . /etc/rc.subr
 
 name=clamav_clamd
-rcvar=`set_rcvar`
+rcvar=clamav_clamd_enable
 
 command=%%PREFIX%%/sbin/clamd
 required_dirs=%%DBDIR%%
diff --git a/security/clamav-devel/files/clamav-freshclam.in b/security/clamav-devel/files/clamav-freshclam.in
index 86d7b8c71f9b..5d6a806994d5 100644
--- a/security/clamav-devel/files/clamav-freshclam.in
+++ b/security/clamav-devel/files/clamav-freshclam.in
@@ -20,7 +20,7 @@
 . /etc/rc.subr
 
 name=clamav_freshclam
-rcvar=`set_rcvar`
+rcvar=clamav_freshclam_enable
 
 command=%%PREFIX%%/bin/freshclam
 pidfile=%%RUNDIR%%/freshclam.pid
diff --git a/security/clamav-devel/files/clamav-milter.in b/security/clamav-devel/files/clamav-milter.in
index b4d58885a346..d8b2e11818bb 100644
--- a/security/clamav-devel/files/clamav-milter.in
+++ b/security/clamav-devel/files/clamav-milter.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=clamav_milter
-rcvar=`set_rcvar`
+rcvar=clamav_milter_enable
 
 conf_file=%%PREFIX%%/etc/clamav-milter.conf
 command=%%PREFIX%%/sbin/clamav-milter
diff --git a/security/clamav/files/clamav-clamd.in b/security/clamav/files/clamav-clamd.in
index 2ecc189102fd..7abcad137686 100644
--- a/security/clamav/files/clamav-clamd.in
+++ b/security/clamav/files/clamav-clamd.in
@@ -20,7 +20,7 @@
 . /etc/rc.subr
 
 name=clamav_clamd
-rcvar=`set_rcvar`
+rcvar=clamav_clamd_enable
 
 command=%%PREFIX%%/sbin/clamd
 required_dirs=%%DBDIR%%
diff --git a/security/clamav/files/clamav-freshclam.in b/security/clamav/files/clamav-freshclam.in
index 86d7b8c71f9b..5d6a806994d5 100644
--- a/security/clamav/files/clamav-freshclam.in
+++ b/security/clamav/files/clamav-freshclam.in
@@ -20,7 +20,7 @@
 . /etc/rc.subr
 
 name=clamav_freshclam
-rcvar=`set_rcvar`
+rcvar=clamav_freshclam_enable
 
 command=%%PREFIX%%/bin/freshclam
 pidfile=%%RUNDIR%%/freshclam.pid
diff --git a/security/clamav/files/clamav-milter.in b/security/clamav/files/clamav-milter.in
index b4d58885a346..d8b2e11818bb 100644
--- a/security/clamav/files/clamav-milter.in
+++ b/security/clamav/files/clamav-milter.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=clamav_milter
-rcvar=`set_rcvar`
+rcvar=clamav_milter_enable
 
 conf_file=%%PREFIX%%/etc/clamav-milter.conf
 command=%%PREFIX%%/sbin/clamav-milter
diff --git a/security/clamsmtp/files/clamsmtpd.sh.in b/security/clamsmtp/files/clamsmtpd.sh.in
index 772461b33574..c5c93c5c1a9c 100644
--- a/security/clamsmtp/files/clamsmtpd.sh.in
+++ b/security/clamsmtp/files/clamsmtpd.sh.in
@@ -17,7 +17,7 @@
 . /etc/rc.subr
 
 name="clamsmtpd"
-rcvar=${name}_enable
+rcvar=clamsmtpd_enable
 
 : ${clamsmtpd_enable="NO"}
 : ${clamsmtpd_conf="%%PREFIX%%/etc/clamsmtpd.conf"}
diff --git a/security/courier-authlib/files/courier-authdaemond.sh.in b/security/courier-authlib/files/courier-authdaemond.sh.in
index 0fe8ffd7c0d2..6dc0304c5e4a 100644
--- a/security/courier-authlib/files/courier-authdaemond.sh.in
+++ b/security/courier-authlib/files/courier-authdaemond.sh.in
@@ -28,7 +28,7 @@ courier_authdaemond_enable=${courier_authdaemond_enable-"NO"}	# Run courier-auth
 . /etc/rc.subr
 
 name="courier_authdaemond"
-rcvar=`set_rcvar`
+rcvar=courier_authdaemond_enable
 
 command="${sbindir}/authdaemond"
 procname="${sbindir}/courierlogger"
diff --git a/security/cyrus-sasl2-saslauthd/files/saslauthd.sh.in b/security/cyrus-sasl2-saslauthd/files/saslauthd.sh.in
index e0b619acf453..f5468ce36096 100644
--- a/security/cyrus-sasl2-saslauthd/files/saslauthd.sh.in
+++ b/security/cyrus-sasl2-saslauthd/files/saslauthd.sh.in
@@ -23,7 +23,7 @@ saslauthd_flags=${saslauthd_flags:-"-a pam"}	# Flags to saslauthd program
 . /etc/rc.subr
 
 name="saslauthd"
-rcvar=`set_rcvar`
+rcvar=saslauthd_enable
 command="%%PREFIX%%/sbin/${name}"
 
 load_rc_config $name
diff --git a/security/denyhosts/files/denyhosts.in b/security/denyhosts/files/denyhosts.in
index c463c71d06de..f482617b86c9 100644
--- a/security/denyhosts/files/denyhosts.in
+++ b/security/denyhosts/files/denyhosts.in
@@ -9,7 +9,7 @@
 . /etc/rc.subr
 
 name="denyhosts"
-rcvar=${name}_enable
+rcvar=denyhosts_enable
 
 command="%%PREFIX%%/bin/denyhosts.py"
 command_interpreter="%%PYTHON%%"
diff --git a/security/distcache-devel/files/dc_server.sh.in b/security/distcache-devel/files/dc_server.sh.in
index 7647cefa6a55..6f2d02c72b6b 100644
--- a/security/distcache-devel/files/dc_server.sh.in
+++ b/security/distcache-devel/files/dc_server.sh.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name="%%NAME%%"
-rcvar=`set_rcvar`
+rcvar=%%NAME%%_enable
 
 command="%%PREFIX%%/bin/dc_server"
 command_args="-daemon -listen IP:9001 -user nobody -pidfile /var/run/$name.pid"
diff --git a/security/distcache/files/dc_server.sh.in b/security/distcache/files/dc_server.sh.in
index 7647cefa6a55..6f2d02c72b6b 100644
--- a/security/distcache/files/dc_server.sh.in
+++ b/security/distcache/files/dc_server.sh.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name="%%NAME%%"
-rcvar=`set_rcvar`
+rcvar=%%NAME%%_enable
 
 command="%%PREFIX%%/bin/dc_server"
 command_args="-daemon -listen IP:9001 -user nobody -pidfile /var/run/$name.pid"
diff --git a/security/doorman/files/doorman.sh.in b/security/doorman/files/doorman.sh.in
index 8d39304b496b..98e25a3d383b 100644
--- a/security/doorman/files/doorman.sh.in
+++ b/security/doorman/files/doorman.sh.in
@@ -14,7 +14,7 @@
 . /etc/rc.subr
 
 name="doorman"
-rcvar=`set_rcvar`
+rcvar=doorman_enable
 
 [ -z "$doorman_enable" ] && doorman_enable="NO"
 [ -z "$doorman_config" ] && doorman_config="%%PREFIX%%/etc/doormand/doormand.cf"
diff --git a/security/dradis/files/dradis.in b/security/dradis/files/dradis.in
index 6678d21f24d5..f2cb2a86159b 100644
--- a/security/dradis/files/dradis.in
+++ b/security/dradis/files/dradis.in
@@ -20,7 +20,7 @@
 . /etc/rc.subr
 
 name=dradis
-rcvar=`set_rcvar`
+rcvar=dradis_enable
 
 dradis_enable=${dradis_enable-"NO"}
 dradis_bindip=${dradis_bindip-"127.0.0.1"}
diff --git a/security/dropbear/files/dropbear.in b/security/dropbear/files/dropbear.in
index 40c479b703a3..3f5495794910 100644
--- a/security/dropbear/files/dropbear.in
+++ b/security/dropbear/files/dropbear.in
@@ -13,7 +13,7 @@
 . /etc/rc.subr
 
 name="dropbear"
-rcvar=`set_rcvar`
+rcvar=dropbear_enable
 command="%%PREFIX%%/sbin/${name}"
 keygen_cmd="dropbear_keygen"
 start_precmd="dropbear_precmd"
diff --git a/security/expiretable/files/expiretable.in b/security/expiretable/files/expiretable.in
index ad5ee98139fd..18c8380bce3b 100644
--- a/security/expiretable/files/expiretable.in
+++ b/security/expiretable/files/expiretable.in
@@ -11,7 +11,7 @@
 . /etc/rc.subr
 
 name="expiretable"
-rcvar=`set_rcvar`
+rcvar=expiretable_enable
 command="/usr/local/sbin/expiretable"
 load_rc_config "$name"
 
diff --git a/security/hamachi/files/hamachi.sh.in b/security/hamachi/files/hamachi.sh.in
index d75540d09b57..99e6877c70bd 100644
--- a/security/hamachi/files/hamachi.sh.in
+++ b/security/hamachi/files/hamachi.sh.in
@@ -32,7 +32,7 @@
 . /etc/rc.subr
 
 name="hamachi"
-rcvar=`set_rcvar`
+rcvar=hamachi_enable
 
 load_rc_config $name
 
diff --git a/security/ike/files/iked.in b/security/ike/files/iked.in
index 03ad7f80caf5..73d8f38cb025 100644
--- a/security/ike/files/iked.in
+++ b/security/ike/files/iked.in
@@ -21,7 +21,7 @@
 iked_enable=${iked_enable:-"NO"}
 
 name=iked
-rcvar=`set_rcvar`
+rcvar=iked_enable
 load_rc_config $name
 command=/usr/local/sbin/iked
 command_args="-p /var/run/iked.pid > /dev/null"
diff --git a/security/ipguard/files/ipguard.in b/security/ipguard/files/ipguard.in
index d87894880fa8..1389943cfb75 100644
--- a/security/ipguard/files/ipguard.in
+++ b/security/ipguard/files/ipguard.in
@@ -13,7 +13,7 @@
 . /etc/rc.subr
 
 name=ipguard
-rcvar=`set_rcvar`
+rcvar=ipguard_enable
 start_precmd=ipguard_precmd
 command=%%PREFIX%%/sbin/${name}
 
diff --git a/security/ipsec-tools/files/racoon.sh.in b/security/ipsec-tools/files/racoon.sh.in
index 7d7c4bf9259e..1ab85061fcfa 100644
--- a/security/ipsec-tools/files/racoon.sh.in
+++ b/security/ipsec-tools/files/racoon.sh.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name="racoon"
-rcvar=`set_rcvar`
+rcvar=racoon_enable
 
 load_rc_config $name
 
diff --git a/security/isakmpd/files/isakmpd.sh.in b/security/isakmpd/files/isakmpd.sh.in
index 3e0adbb29098..fb30d09d8c51 100644
--- a/security/isakmpd/files/isakmpd.sh.in
+++ b/security/isakmpd/files/isakmpd.sh.in
@@ -11,7 +11,7 @@
 . /etc/rc.subr
 
 name="isakmpd"
-rcvar=`set_rcvar`
+rcvar=isakmpd_enable
 command="%%PREFIX%%/sbin/${name}"
 extra_commands="reload"
 
diff --git a/security/knock/files/knockd.sh.in b/security/knock/files/knockd.sh.in
index 65b9e35b6cce..67e17f929a82 100644
--- a/security/knock/files/knockd.sh.in
+++ b/security/knock/files/knockd.sh.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name="knockd"
-rcvar=`set_rcvar`
+rcvar=knockd_enable
 
 load_rc_config $name
 
diff --git a/security/maia/files/maiad.in b/security/maia/files/maiad.in
index e109e32e6080..dbbcb5397dd7 100644
--- a/security/maia/files/maiad.in
+++ b/security/maia/files/maiad.in
@@ -14,7 +14,7 @@
 . /etc/rc.subr
 
 name="maiad"
-rcvar=${name}_enable
+rcvar=maiad_enable
 
 load_rc_config $name
 
diff --git a/security/nessus/files/nessusd.sh.in b/security/nessus/files/nessusd.sh.in
index 14c019e48ea5..10e0801a9637 100644
--- a/security/nessus/files/nessusd.sh.in
+++ b/security/nessus/files/nessusd.sh.in
@@ -22,7 +22,7 @@ nessusd_flags="-D"				# Flags to nessusd program
 . /etc/rc.subr
 
 name="nessusd"
-rcvar=`set_rcvar`
+rcvar=nessusd_enable
 command="%%PREFIX%%/sbin/nessusd"
 pidfile="%%PREFIX%%/var/nessus/nessusd.pid"
 required_files="%%PREFIX%%/etc/nessus/nessusd.conf"
diff --git a/security/oidentd/files/oidentd.in b/security/oidentd/files/oidentd.in
index aa236aca2a38..5a035a8fca9b 100644
--- a/security/oidentd/files/oidentd.in
+++ b/security/oidentd/files/oidentd.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=oidentd
-rcvar=`set_rcvar`
+rcvar=oidentd_enable
 
 command=%%PREFIX%%/sbin/${name}
 
diff --git a/security/opencryptoki/files/pkcsslotd.in b/security/opencryptoki/files/pkcsslotd.in
index ca0fb7744dc3..e931d6143280 100644
--- a/security/opencryptoki/files/pkcsslotd.in
+++ b/security/opencryptoki/files/pkcsslotd.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name=pkcsslotd
-rcvar=`set_rcvar`
+rcvar=pkcsslotd_enable
 command=%%PREFIX%%/sbin/${name}
 start_precmd=${name}_prestart
 
diff --git a/security/openct/files/openct.in b/security/openct/files/openct.in
index aaaa5b7ac191..5495a951f63f 100644
--- a/security/openct/files/openct.in
+++ b/security/openct/files/openct.in
@@ -17,7 +17,7 @@
 . /etc/rc.subr
 
 name="openct"
-rcvar=`set_rcvar`
+rcvar=openct_enable
 
 load_rc_config $name
 
diff --git a/security/openssh-portable/files/openssh.in b/security/openssh-portable/files/openssh.in
index 4277b3984fed..1eb8a951a3e9 100644
--- a/security/openssh-portable/files/openssh.in
+++ b/security/openssh-portable/files/openssh.in
@@ -18,7 +18,7 @@
 . /etc/rc.subr
 
 name="openssh"
-rcvar=${name}_enable
+rcvar=openssh_enable
 
 load_rc_config ${name}
 
diff --git a/security/openvas-server/files/openvasd.in b/security/openvas-server/files/openvasd.in
index 9b07a57e3a75..5685174ae73b 100644
--- a/security/openvas-server/files/openvasd.in
+++ b/security/openvas-server/files/openvasd.in
@@ -25,7 +25,7 @@ openvasd_flags="-D -q"				# Flags to openvasd program
 . /etc/rc.subr
 
 name="openvasd"
-rcvar=`set_rcvar`
+rcvar=openvasd_enable
 command="${prefix}/sbin/openvasd"
 pidfile="/var/run/openvasd.pid"
 required_files="${prefix}/etc/openvas/openvasd.conf"
diff --git a/security/openvpn-beta/files/openvpn.sh.in b/security/openvpn-beta/files/openvpn.sh.in
index a60af9ac9e21..124082b72687 100644
--- a/security/openvpn-beta/files/openvpn.sh.in
+++ b/security/openvpn-beta/files/openvpn.sh.in
@@ -73,7 +73,7 @@ case "$0" in
 	;;
 esac
 
-rcvar=$(set_rcvar)
+rcvar=${name}_enable
 
 openvpn_precmd()
 {
diff --git a/security/openvpn-devel/files/openvpn.sh.in b/security/openvpn-devel/files/openvpn.sh.in
index a60af9ac9e21..124082b72687 100644
--- a/security/openvpn-devel/files/openvpn.sh.in
+++ b/security/openvpn-devel/files/openvpn.sh.in
@@ -73,7 +73,7 @@ case "$0" in
 	;;
 esac
 
-rcvar=$(set_rcvar)
+rcvar=${name}_enable
 
 openvpn_precmd()
 {
diff --git a/security/openvpn/files/openvpn.sh.in b/security/openvpn/files/openvpn.sh.in
index d2539131a212..f4f1dbdbb7ad 100644
--- a/security/openvpn/files/openvpn.sh.in
+++ b/security/openvpn/files/openvpn.sh.in
@@ -76,8 +76,7 @@ case "$0" in
 esac
 
 name="${name##*/}"
-
-rcvar=$(set_rcvar)
+rcvar=${name}_enable
 
 stop_postcmd()
 {
diff --git a/security/openvpn20/files/openvpn.sh.in b/security/openvpn20/files/openvpn.sh.in
index d2539131a212..f4f1dbdbb7ad 100644
--- a/security/openvpn20/files/openvpn.sh.in
+++ b/security/openvpn20/files/openvpn.sh.in
@@ -76,8 +76,7 @@ case "$0" in
 esac
 
 name="${name##*/}"
-
-rcvar=$(set_rcvar)
+rcvar=${name}_enable
 
 stop_postcmd()
 {
diff --git a/security/ossec-hids-server/files/ossec-hids.in b/security/ossec-hids-server/files/ossec-hids.in
index 4f464fb6e9ff..bd6c7e96f360 100644
--- a/security/ossec-hids-server/files/ossec-hids.in
+++ b/security/ossec-hids-server/files/ossec-hids.in
@@ -8,7 +8,7 @@
 . /etc/rc.subr
 
 name="ossechids"
-rcvar=`set_rcvar`
+rcvar=ossechids_enable
 
 load_rc_config $name
 
diff --git a/security/p5-openxpki-deployment/files/openxpki.sh.in b/security/p5-openxpki-deployment/files/openxpki.sh.in
index b79847e61488..acb2aa9cfd64 100644
--- a/security/p5-openxpki-deployment/files/openxpki.sh.in
+++ b/security/p5-openxpki-deployment/files/openxpki.sh.in
@@ -25,7 +25,7 @@ esac
 . /etc/rc.subr
 
 name="openxpki"
-rcvar=`set_rcvar`
+rcvar=openxpki_enable
 command="%%PREFIX%%/bin/openxpkictl"
 procname="openxpkid"
 
diff --git a/security/pks/files/pksd.sh.in b/security/pks/files/pksd.sh.in
index 9f520df6f97c..ff9a23a6f05e 100644
--- a/security/pks/files/pksd.sh.in
+++ b/security/pks/files/pksd.sh.in
@@ -9,7 +9,7 @@
 . /etc/rc.subr
 
 name="pksd"
-rcvar=`set_rcvar`
+rcvar=pksd_enable
 command="%%PREFIX%%/sbin/pksd"
 command_args="%%PREFIX%%/etc/${name}.conf &"
 required_files="%%PREFIX%%/etc/${name}.conf"
diff --git a/security/prelude-lml/files/prelude-lml.sh.in b/security/prelude-lml/files/prelude-lml.sh.in
index 8622d418b11e..e0e5bf1f98fd 100644
--- a/security/prelude-lml/files/prelude-lml.sh.in
+++ b/security/prelude-lml/files/prelude-lml.sh.in
@@ -14,7 +14,7 @@
 . /etc/rc.subr
 
 name="prelude_lml"
-rcvar=${name}_enable
+rcvar=prelude_lml_enable
 
 command=%%PREFIX%%/bin/prelude-lml
 pidfile=/var/run/prelude-lml.pid
diff --git a/security/prelude-manager/files/prelude-manager.sh.in b/security/prelude-manager/files/prelude-manager.sh.in
index 14c862696e31..6f843826a8b5 100644
--- a/security/prelude-manager/files/prelude-manager.sh.in
+++ b/security/prelude-manager/files/prelude-manager.sh.in
@@ -14,7 +14,7 @@
 . /etc/rc.subr
 
 name="prelude_manager"
-rcvar=${name}_enable
+rcvar=prelude_manager_enable
 
 command=%%PREFIX%%/bin/prelude-manager
 pidfile=/var/run/prelude-manager.pid
diff --git a/security/prelude-pflogger/files/prelude-pflogger.in b/security/prelude-pflogger/files/prelude-pflogger.in
index cfd45b77843a..ef8f9e73e933 100644
--- a/security/prelude-pflogger/files/prelude-pflogger.in
+++ b/security/prelude-pflogger/files/prelude-pflogger.in
@@ -14,7 +14,7 @@
 . /etc/rc.subr
 
 name="prelude_pflogger"
-rcvar=${name}_enable
+rcvar=prelude_pflogger_enable
 
 command=%%PREFIX%%/bin/prelude-pflogger
 pidfile=/var/run/prelude-pflogger.pid
diff --git a/security/py-fail2ban/files/fail2ban.in b/security/py-fail2ban/files/fail2ban.in
index 5cbcf31bf95c..ebaa0f8dd7bf 100644
--- a/security/py-fail2ban/files/fail2ban.in
+++ b/security/py-fail2ban/files/fail2ban.in
@@ -14,7 +14,7 @@ fail2ban_pidfile=${fail2ban_pidfile-"/var/run/fail2ban/fail2ban.pid"}
 . /etc/rc.subr
 
 name="fail2ban"
-rcvar=`set_rcvar`
+rcvar=fail2ban_enable
 pidfile="${fail2ban_pidfile}"
 
 command="%%PREFIX%%/bin/fail2ban-server"
diff --git a/security/racoon2/files/patch-samples-rc.d-iked.in b/security/racoon2/files/patch-samples-rc.d-iked.in
index 0aedae7a2dcd..713bae1a5cdd 100644
--- a/security/racoon2/files/patch-samples-rc.d-iked.in
+++ b/security/racoon2/files/patch-samples-rc.d-iked.in
@@ -5,7 +5,7 @@
  
  name="iked"
 -rcvar=$name
-+rcvar=`set_rcvar`
++rcvar=iked_enable
  command="@sbindir@/${name}"
  extra_commands="reload"
 -required_vars="spmd"
diff --git a/security/racoon2/files/patch-samples-rc.d-kinkd.in b/security/racoon2/files/patch-samples-rc.d-kinkd.in
index 7200054e53cf..1db90288a603 100644
--- a/security/racoon2/files/patch-samples-rc.d-kinkd.in
+++ b/security/racoon2/files/patch-samples-rc.d-kinkd.in
@@ -5,7 +5,7 @@
  
  name="kinkd"
 -rcvar=$name
-+rcvar=`set_rcvar`
++rcvar=kinkd_enable
  command="@sbindir@/${name}"
  extra_commands="reload"
 -required_vars="spmd"
diff --git a/security/racoon2/files/patch-samples-rc.d-spmd.in b/security/racoon2/files/patch-samples-rc.d-spmd.in
index 7260892b5ef6..f4e962fba6d2 100644
--- a/security/racoon2/files/patch-samples-rc.d-spmd.in
+++ b/security/racoon2/files/patch-samples-rc.d-spmd.in
@@ -5,7 +5,7 @@
  
  name="spmd"
 -rcvar=$name
-+rcvar=`set_rcvar`
++rcvar=spmd_enable
  command="@sbindir@/${name}"
  extra_commands="reload"
  pidfile="/var/run/${name}.pid"
diff --git a/security/sancp/files/sancp.in b/security/sancp/files/sancp.in
index 8e67d5e8e779..a5396fb77658 100644
--- a/security/sancp/files/sancp.in
+++ b/security/sancp/files/sancp.in
@@ -55,7 +55,7 @@
 . /etc/rc.subr
 
 name="sancp"
-rcvar=`set_rcvar`
+rcvar=sancp_enable
 
 command="%%PREFIX%%/bin/sancp"
 
diff --git a/security/scanlogd/files/scanlogd.in b/security/scanlogd/files/scanlogd.in
index 9070a9b664e4..ff7a54fae128 100644
--- a/security/scanlogd/files/scanlogd.in
+++ b/security/scanlogd/files/scanlogd.in
@@ -14,7 +14,7 @@
 . /etc/rc.subr
 
 name="scanlogd"
-rcvar=`set_rcvar`
+rcvar=scanlogd_enable
 command="%%PREFIX%%/bin/${name}"
 
 load_rc_config $name
diff --git a/security/scannedonly/files/scannedonly.in b/security/scannedonly/files/scannedonly.in
index 744943d8c3e5..621a67bfc6b0 100644
--- a/security/scannedonly/files/scannedonly.in
+++ b/security/scannedonly/files/scannedonly.in
@@ -20,7 +20,7 @@
 . /etc/rc.subr
 
 name=scannedonly_clamav
-rcvar=`set_rcvar`
+rcvar=scannedonly_clamav_enable
 
 command=%%PREFIX%%/sbin/scannedonlyd_clamav
 pidfile=/var/run/scannedonlyd_clamav.pid
diff --git a/security/sfs/files/sfscd.in b/security/sfs/files/sfscd.in
index 939ac15074a5..972d4f590575 100644
--- a/security/sfs/files/sfscd.in
+++ b/security/sfs/files/sfscd.in
@@ -14,7 +14,7 @@
 . /etc/rc.subr
 
 name=sfscd
-rcvar=`set_rcvar`
+rcvar=sfscd_enable
 
 command="%%PREFIX%%/sbin/${name}"
 pidfile="/var/run/${name}.pid"
diff --git a/security/sfs/files/sfssd.in b/security/sfs/files/sfssd.in
index c17360201ad6..eb33547f3115 100644
--- a/security/sfs/files/sfssd.in
+++ b/security/sfs/files/sfssd.in
@@ -14,7 +14,7 @@
 . /etc/rc.subr
 
 name=sfssd
-rcvar=`set_rcvar`
+rcvar=sfssd_enable
 
 command="%%PREFIX%%/sbin/${name}"
 pidfile="/var/run/${name}.pid"
diff --git a/security/sguil-sensor/files/example_agent.sh.in b/security/sguil-sensor/files/example_agent.sh.in
index 58b94f114353..79b449745ea3 100644
--- a/security/sguil-sensor/files/example_agent.sh.in
+++ b/security/sguil-sensor/files/example_agent.sh.in
@@ -24,7 +24,7 @@ example_agent_conf=${example_agent_conf:-"%%PREFIX%%/etc/%%SGUILDIR%%/example_ag
 example_agent_flags=${example_agent_flags:-"-D"}
 
 name="example_agent"
-rcvar=`set_rcvar`
+rcvar=example_agent_enable
 command="%%PREFIX%%/bin/%%SGUILDIR%%/example_agent.tcl"
 command_args="-c ${example_agent_conf} ${example_agent_flags}"
 procname="%%PREFIX%%/bin/tclsh8.4"
diff --git a/security/sguil-sensor/files/pads_agent.sh.in b/security/sguil-sensor/files/pads_agent.sh.in
index 02de467af839..757f03ee2e35 100644
--- a/security/sguil-sensor/files/pads_agent.sh.in
+++ b/security/sguil-sensor/files/pads_agent.sh.in
@@ -24,7 +24,7 @@ pads_agent_conf=${pads_agent_conf:-"%%PREFIX%%/etc/%%SGUILDIR%%/pads_agent.conf"
 pads_agent_flags=${pads_agent_flags:-"-D"}
 
 name="pads_agent"
-rcvar=`set_rcvar`
+rcvar=pads_agent_enable
 command="%%PREFIX%%/bin/%%SGUILDIR%%/pads_agent.tcl"
 command_args="-c ${pads_agent_conf} ${pads_agent_flags}"
 procname="%%PREFIX%%/bin/tclsh8.4"
diff --git a/security/sguil-sensor/files/pcap_agent.sh.in b/security/sguil-sensor/files/pcap_agent.sh.in
index 2370ff7b0294..264c2ab4b865 100644
--- a/security/sguil-sensor/files/pcap_agent.sh.in
+++ b/security/sguil-sensor/files/pcap_agent.sh.in
@@ -24,7 +24,7 @@ pcap_agent_conf=${pcap_agent_conf:-"%%PREFIX%%/etc/%%SGUILDIR%%/pcap_agent.conf"
 pcap_agent_flags=${pcap_agent_flags:-"-D"}
 
 name="pcap_agent"
-rcvar=`set_rcvar`
+rcvar=pcap_agent_enable
 command="%%PREFIX%%/bin/%%SGUILDIR%%/pcap_agent.tcl"
 command_args="-c ${pcap_agent_conf} ${pcap_agent_flags}"
 procname="%%PREFIX%%/bin/tclsh8.4"
diff --git a/security/sguil-sensor/files/sancp_agent.sh.in b/security/sguil-sensor/files/sancp_agent.sh.in
index 11e692a0420f..7b93fd4f6c39 100644
--- a/security/sguil-sensor/files/sancp_agent.sh.in
+++ b/security/sguil-sensor/files/sancp_agent.sh.in
@@ -24,7 +24,7 @@ sancp_agent_conf=${sancp_agent_conf:-"%%PREFIX%%/etc/%%SGUILDIR%%/sancp_agent.co
 sancp_agent_flags=${sancp_agent_flags:-"-D"}
 
 name="sancp_agent"
-rcvar=`set_rcvar`
+rcvar=sancp_agent_enable
 command="%%PREFIX%%/bin/%%SGUILDIR%%/sancp_agent.tcl"
 command_args="-c ${sancp_agent_conf} ${sancp_agent_flags}"
 procname="%%PREFIX%%/bin/tclsh8.4"
diff --git a/security/sguil-sensor/files/snort_agent.sh.in b/security/sguil-sensor/files/snort_agent.sh.in
index 985af4a36f6b..154f738118f7 100644
--- a/security/sguil-sensor/files/snort_agent.sh.in
+++ b/security/sguil-sensor/files/snort_agent.sh.in
@@ -24,7 +24,7 @@ snort_agent_conf=${snort_agent_conf:-"%%PREFIX%%/etc/%%SGUILDIR%%/snort_agent.co
 snort_agent_flags=${snort_agent_flags:-"-D"}
 
 name="snort_agent"
-rcvar=`set_rcvar`
+rcvar=snort_agent_enable
 command="%%PREFIX%%/bin/%%SGUILDIR%%/snort_agent.tcl"
 command_args="-c ${snort_agent_conf} ${snort_agent_flags}"
 procname="%%PREFIX%%/bin/tclsh8.4"
diff --git a/security/sguil-server/files/sguild.sh.in b/security/sguil-server/files/sguild.sh.in
index 692054241ace..10860b427017 100644
--- a/security/sguil-server/files/sguild.sh.in
+++ b/security/sguil-server/files/sguild.sh.in
@@ -41,7 +41,7 @@ sguild_flags=${sguild_flags:-"-D -P ${pid}"}
 sguild_user=${sguild_user:-"sguil"}
 
 name="sguild"
-rcvar=`set_rcvar`
+rcvar=sguild_enable
 command="%%PREFIX%%/bin/${name}"
 command_args="-c ${sguild_conf} ${sguild_flags}"
 procname="%%TCLSH%%"
diff --git a/security/shibboleth2-sp/files/shibboleth-sp.in b/security/shibboleth2-sp/files/shibboleth-sp.in
index 6501467ece77..5a81e04202f5 100644
--- a/security/shibboleth2-sp/files/shibboleth-sp.in
+++ b/security/shibboleth2-sp/files/shibboleth-sp.in
@@ -9,7 +9,7 @@
 . /etc/rc.subr
 
 name="shibboleth_sp"
-rcvar=${name}_enable
+rcvar=shibboleth_sp_enable
 
 command=${shibboleth_sp_program:-%%PREFIX%%/sbin/shibd}
 pidfile="${shibboleth_sp_pidfile:-/var/run/${name}.pid}"
diff --git a/security/snort/files/snort.sh.in b/security/snort/files/snort.sh.in
index 6f7aef1045ed..41e272dec014 100644
--- a/security/snort/files/snort.sh.in
+++ b/security/snort/files/snort.sh.in
@@ -29,7 +29,7 @@
 . /etc/rc.subr
 
 name="snort"
-rcvar=`set_rcvar`
+rcvar=snort_enable
 extra_commands=reload
 
 command="%%PREFIX%%/bin/snort"
diff --git a/security/snortsam/files/snortsam.sh.in b/security/snortsam/files/snortsam.sh.in
index faee0c9274b5..27d709129c57 100644
--- a/security/snortsam/files/snortsam.sh.in
+++ b/security/snortsam/files/snortsam.sh.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name="snortsam"
-rcvar=`set_rcvar`
+rcvar=snortsam_enable
 load_rc_config snortsam
 
 # defaults
diff --git a/security/spybye/files/spybye.sh.in b/security/spybye/files/spybye.sh.in
index 1768f027369e..9c535e002be0 100644
--- a/security/spybye/files/spybye.sh.in
+++ b/security/spybye/files/spybye.sh.in
@@ -26,7 +26,7 @@
 
 name="spybye"
 load_rc_config ${name}
-rcvar=`set_rcvar`
+rcvar=spybye_enable
 # set the defaults
 : ${spybye_enable="NO"}
 : ${spybye_flags="-x -p 8080 -l /var/log/spybye.log"}
diff --git a/security/sshblock/files/sshblock.in b/security/sshblock/files/sshblock.in
index 17941c4ec447..0da0d074fb97 100644
--- a/security/sshblock/files/sshblock.in
+++ b/security/sshblock/files/sshblock.in
@@ -15,7 +15,7 @@
 . /etc/rc.subr
 
 name="sshblock"
-rcvar=`set_rcvar`
+rcvar=sshblock_enable
 
 command_interpreter=%%PERL%%
 command="%%PREFIX%%/sbin/sshblock"
diff --git a/security/sssd/files/sssd.in b/security/sssd/files/sssd.in
index 23596ffb19a5..9123c92f9db7 100644
--- a/security/sssd/files/sssd.in
+++ b/security/sssd/files/sssd.in
@@ -18,7 +18,7 @@
 . /etc/rc.subr
 
 name="sssd"
-rcvar=`set_rcvar`
+rcvar=sssd_enable
 
 command="%%PREFIX%%/sbin/$name"
 sssd_flags="-D"
diff --git a/security/strongswan/files/strongswan.in b/security/strongswan/files/strongswan.in
index 3e3c16147c94..8f6bb47ce4aa 100644
--- a/security/strongswan/files/strongswan.in
+++ b/security/strongswan/files/strongswan.in
@@ -15,7 +15,7 @@
 . /etc/rc.subr
 
 name="strongswan"
-rcvar=`set_rcvar`
+rcvar=strongswan_enable
 
 command="%%PREFIX%%/sbin/ipsec"
 extra_commands="reload statusall"
diff --git a/security/stunnel/files/stunnel.in b/security/stunnel/files/stunnel.in
index d639588cd9aa..987b9861b38a 100644
--- a/security/stunnel/files/stunnel.in
+++ b/security/stunnel/files/stunnel.in
@@ -24,7 +24,7 @@
 . /etc/rc.subr
 
 name="stunnel"
-rcvar=`set_rcvar`
+rcvar=stunnel_enable
 
 load_rc_config $name
 
diff --git a/security/suricata/files/suricata.in b/security/suricata/files/suricata.in
index 5174657beb11..582e117c65e5 100644
--- a/security/suricata/files/suricata.in
+++ b/security/suricata/files/suricata.in
@@ -22,7 +22,7 @@
 . /etc/rc.subr
 
 name="suricata"
-rcvar=`set_rcvar`
+rcvar=suricata_enable
 
 command="%%PREFIX%%/bin/suricata"
 
diff --git a/security/swatch/files/swatch.in b/security/swatch/files/swatch.in
index a81590fcff24..038701a44ea7 100644
--- a/security/swatch/files/swatch.in
+++ b/security/swatch/files/swatch.in
@@ -20,7 +20,7 @@
 . /etc/rc.subr
 
 name=swatch
-rcvar=`set_rcvar`
+rcvar=swatch_enable
 
 command=%%PREFIX%%/bin/swatch
 procname=%%LOCALBASE%%/bin/perl
diff --git a/security/termlog/files/termlog.in b/security/termlog/files/termlog.in
index 3d194bdc865d..8f7946bdf8ac 100644
--- a/security/termlog/files/termlog.in
+++ b/security/termlog/files/termlog.in
@@ -8,7 +8,7 @@
 load_rc_config termlog
 
 name=termlog
-rcvar=`set_rcvar`
+rcvar=termlog_enable
 
 command="/usr/local/bin/termlog"
 
diff --git a/security/tinc/files/tincd.sh.in b/security/tinc/files/tincd.sh.in
index 94a8d257729a..c4d72fb537af 100644
--- a/security/tinc/files/tincd.sh.in
+++ b/security/tinc/files/tincd.sh.in
@@ -18,7 +18,7 @@ tincd_enable=${tincd_enable:-"NO"}
 . /etc/rc.subr
 
 name="tincd"
-rcvar=`set_rcvar`
+rcvar=tincd_enable
 command="%%PREFIX%%/sbin/tincd"
 start_cmd="tincd_start"
 stop_cmd="tincd_stop"
diff --git a/security/tor-devel/files/tor.in b/security/tor-devel/files/tor.in
index 8ed480b7d630..ac24b8ba4872 100644
--- a/security/tor-devel/files/tor.in
+++ b/security/tor-devel/files/tor.in
@@ -22,7 +22,7 @@
 . /etc/rc.subr
 
 name="tor"
-rcvar=${name}_enable
+rcvar=tor_enable
 
 load_rc_config ${name}
 
diff --git a/security/tor/files/tor.in b/security/tor/files/tor.in
index 8ed480b7d630..ac24b8ba4872 100644
--- a/security/tor/files/tor.in
+++ b/security/tor/files/tor.in
@@ -22,7 +22,7 @@
 . /etc/rc.subr
 
 name="tor"
-rcvar=${name}_enable
+rcvar=tor_enable
 
 load_rc_config ${name}
 
diff --git a/security/trousers/files/tcsd.in b/security/trousers/files/tcsd.in
index 388108738a3e..f9c3773da85b 100644
--- a/security/trousers/files/tcsd.in
+++ b/security/trousers/files/tcsd.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name=tcsd
-rcvar=`set_rcvar`
+rcvar=tcsd_enable
 command="%%PREFIX%%/sbin/${name}"
 required_files="%%PREFIX%%/etc/${name}.conf"
 
diff --git a/security/vpnc/files/vpnc.in b/security/vpnc/files/vpnc.in
index 7c02909915f0..464a013b21ef 100644
--- a/security/vpnc/files/vpnc.in
+++ b/security/vpnc/files/vpnc.in
@@ -24,7 +24,7 @@
 . /etc/rc.subr
 
 name="vpnc"
-rcvar=`set_rcvar`
+rcvar=vpnc_enable
 
 command="%%PREFIX%%/sbin/$name"
 
diff --git a/security/xinetd/files/xinetd.in b/security/xinetd/files/xinetd.in
index 41f0241aa1fb..9e66788e2428 100644
--- a/security/xinetd/files/xinetd.in
+++ b/security/xinetd/files/xinetd.in
@@ -13,7 +13,7 @@
 . /etc/rc.subr
 
 name=xinetd
-rcvar=`set_rcvar`
+rcvar=xinetd_enable
 
 command=%%PREFIX%%/sbin/xinetd > /dev/null 2>&1
 pidfile=/var/run/xinetd.pid