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.

138 files changed, 139 insertions, 138 deletions

diff --git a/mail/antivirus-milter/files/antivirus-milter.sh.in b/mail/antivirus-milter/files/antivirus-milter.sh.in
index cee33194de97..8e5683091829 100644
--- a/mail/antivirus-milter/files/antivirus-milter.sh.in
+++ b/mail/antivirus-milter/files/antivirus-milter.sh.in
@@ -25,7 +25,7 @@ antivirus_socket=${antivirus_socket:-"%%ANTIVIRUS%%/antivirus.sock"} # Path to s
 . /etc/rc.subr
 
 name="antivirus"
-rcvar=`set_rcvar`
+rcvar=antivirus_enable
 command="%%PREFIX%%/libexec/antivirus"
 required_files="%%PREFIX%%/etc/antivirus.conf"
 start_precmd="antivirus_prestart"
diff --git a/mail/anubis/files/anubis.in b/mail/anubis/files/anubis.in
index 99b5e85f2429..dded8c7add24 100644
--- a/mail/anubis/files/anubis.in
+++ b/mail/anubis/files/anubis.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name="anubis"
-rcvar=`set_rcvar`
+rcvar=anubis_enable
 
 load_rc_config ${name}
 
diff --git a/mail/archiveopteryx/files/archiveopteryx.in b/mail/archiveopteryx/files/archiveopteryx.in
index c65a3349812e..620724fe201b 100644
--- a/mail/archiveopteryx/files/archiveopteryx.in
+++ b/mail/archiveopteryx/files/archiveopteryx.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name="archiveopteryx"
-rcvar=`set_rcvar`
+rcvar=archiveopteryx_enable
 
 archiveopteryx_enable=${archiveopteryx_enable:-"NO"}
 pidfile=/var/run/${name}.pid
diff --git a/mail/archivesmtp/files/archivesmtp.in b/mail/archivesmtp/files/archivesmtp.in
index 6463f1c320d7..dddeffa828bf 100644
--- a/mail/archivesmtp/files/archivesmtp.in
+++ b/mail/archivesmtp/files/archivesmtp.in
@@ -6,7 +6,7 @@
 . /etc/rc.subr
 
 name="archivesmtp"
-rcvar=`set_rcvar`
+rcvar=archivesmtp_enable
 
 command="%%PREFIX%%/sbin/${name}"
 
diff --git a/mail/assp/files/510.assp.in b/mail/assp/files/510.assp.in
index af074b41acfe..9b8331a9337e 100644
--- a/mail/assp/files/510.assp.in
+++ b/mail/assp/files/510.assp.in
@@ -20,7 +20,7 @@ fi
 
 . /etc/rc.subr
 name=assp
-rcvar=`set_rcvar`
+rcvar=assp_enable
 load_rc_config $name
 : ${assp_logexpire="45"}
 
diff --git a/mail/assp/files/assp.in b/mail/assp/files/assp.in
index 9fdd0b3b6227..0105b5ccff94 100644
--- a/mail/assp/files/assp.in
+++ b/mail/assp/files/assp.in
@@ -10,7 +10,7 @@
 . /etc/rc.subr
 
 name=assp
-rcvar=`set_rcvar`
+rcvar=assp_enable
 
 command=%%PREFIX%%/sbin/assp
 command_interpreter=%%PERL%%
diff --git a/mail/batv-milter/files/milter-batv.sh.in b/mail/batv-milter/files/milter-batv.sh.in
index 8fdaee60c9dd..f9f901763bce 100644
--- a/mail/batv-milter/files/milter-batv.sh.in
+++ b/mail/batv-milter/files/milter-batv.sh.in
@@ -33,7 +33,7 @@
 . /etc/rc.subr
 
 name="milterbatv"
-rcvar=`set_rcvar`
+rcvar=milterbatv_enable
 
 start_precmd="batv_prepcmd"
 stop_postcmd="batv_postcmd"
diff --git a/mail/courier-imap/files/courier-imap-imapd-ssl.in b/mail/courier-imap/files/courier-imap-imapd-ssl.in
index 5c140b505ec8..526b69644c84 100644
--- a/mail/courier-imap/files/courier-imap-imapd-ssl.in
+++ b/mail/courier-imap/files/courier-imap-imapd-ssl.in
@@ -18,7 +18,7 @@ courier_imap_imapd_ssl_enable=${courier_imap_imapd_ssl_enable-"NO"}
 . /etc/rc.subr
 
 name="courier_imap_imapd_ssl"
-rcvar=`set_rcvar`
+rcvar=courier_imap_imapd_ssl_enable
 command="%%PREFIX%%/libexec/courier-imap/imapd-ssl.rc"
 pidfile="/var/run/imapd-ssl.pid"
 procname="%%PREFIX%%/sbin/courierlogger"
diff --git a/mail/courier-imap/files/courier-imap-imapd.in b/mail/courier-imap/files/courier-imap-imapd.in
index 783a18c814b5..911555434e3f 100644
--- a/mail/courier-imap/files/courier-imap-imapd.in
+++ b/mail/courier-imap/files/courier-imap-imapd.in
@@ -18,7 +18,7 @@ courier_imap_imapd_enable=${courier_imap_imapd_enable-"NO"}
 . /etc/rc.subr
 
 name="courier_imap_imapd"
-rcvar=`set_rcvar`
+rcvar=courier_imap_imapd_enable
 command="%%PREFIX%%/libexec/courier-imap/imapd.rc"
 pidfile="/var/run/imapd.pid"
 procname="%%PREFIX%%/sbin/courierlogger"
diff --git a/mail/courier-imap/files/courier-imap-pop3d-ssl.in b/mail/courier-imap/files/courier-imap-pop3d-ssl.in
index 165ab126694f..03072bd76059 100644
--- a/mail/courier-imap/files/courier-imap-pop3d-ssl.in
+++ b/mail/courier-imap/files/courier-imap-pop3d-ssl.in
@@ -18,7 +18,7 @@ courier_imap_pop3d_ssl_enable=${courier_imap_pop3d_ssl_enable-"NO"}
 . /etc/rc.subr
 
 name="courier_imap_pop3d_ssl"
-rcvar=`set_rcvar`
+rcvar=courier_imap_pop3d_ssl_enable
 command="%%PREFIX%%/libexec/courier-imap/pop3d-ssl.rc"
 pidfile="/var/run/pop3d-ssl.pid"
 procname="%%PREFIX%%/sbin/courierlogger"
diff --git a/mail/courier-imap/files/courier-imap-pop3d.in b/mail/courier-imap/files/courier-imap-pop3d.in
index 5f8d3fc20c36..8d002dbc1ce8 100644
--- a/mail/courier-imap/files/courier-imap-pop3d.in
+++ b/mail/courier-imap/files/courier-imap-pop3d.in
@@ -18,7 +18,7 @@ courier_imap_pop3d_enable=${courier_imap_pop3d_enable-"NO"}
 . /etc/rc.subr
 
 name="courier_imap_pop3d"
-rcvar=`set_rcvar`
+rcvar=courier_imap_pop3d_enable
 command="%%PREFIX%%/libexec/courier-imap/pop3d.rc"
 pidfile="/var/run/pop3d.pid"
 procname="%%PREFIX%%/sbin/courierlogger"
diff --git a/mail/courier/files/courier.sh.in b/mail/courier/files/courier.sh.in
index 977b14d61160..38e676ca7ae6 100644
--- a/mail/courier/files/courier.sh.in
+++ b/mail/courier/files/courier.sh.in
@@ -36,7 +36,7 @@ courier_enable=${courier_enable:-"NO"}	# Run Courier-MTA (YES/NO).
 . /etc/rc.subr
 
 name="courier"
-rcvar=`set_rcvar`
+rcvar=courier_enable
 
 start_precmd="${name}_prestart"
 start_cmd="${name}_start"
diff --git a/mail/couriergraph/files/couriergraph.sh.in b/mail/couriergraph/files/couriergraph.sh.in
index 33fb155af860..c39859255592 100644
--- a/mail/couriergraph/files/couriergraph.sh.in
+++ b/mail/couriergraph/files/couriergraph.sh.in
@@ -14,7 +14,7 @@
 . /etc/rc.subr
 
 name=couriergraph
-rcvar=`set_rcvar`
+rcvar=couriergraph_enable
 
 command=%%PREFIX%%/sbin/couriergraph.pl > /dev/null 2>&1
 command_interpreter=/usr/bin/perl
diff --git a/mail/cyrus-imapd2/files/imapd.sh.in b/mail/cyrus-imapd2/files/imapd.sh.in
index 4fc58fbd38de..1af0b40f32df 100644
--- a/mail/cyrus-imapd2/files/imapd.sh.in
+++ b/mail/cyrus-imapd2/files/imapd.sh.in
@@ -22,7 +22,7 @@
 . /etc/rc.subr
 
 name="cyrus_imapd"
-rcvar=`set_rcvar`
+rcvar=cyrus_imapd_enable
 command="%%PREFIX%%/cyrus/bin/master"
 pidfile="/var/run/cyrus-master.pid"
 required_files="%%PREFIX%%/etc/cyrus.conf %%PREFIX%%/etc/imapd.conf"
diff --git a/mail/cyrus-imapd22/files/imapd.sh.in b/mail/cyrus-imapd22/files/imapd.sh.in
index 4fc58fbd38de..1af0b40f32df 100644
--- a/mail/cyrus-imapd22/files/imapd.sh.in
+++ b/mail/cyrus-imapd22/files/imapd.sh.in
@@ -22,7 +22,7 @@
 . /etc/rc.subr
 
 name="cyrus_imapd"
-rcvar=`set_rcvar`
+rcvar=cyrus_imapd_enable
 command="%%PREFIX%%/cyrus/bin/master"
 pidfile="/var/run/cyrus-master.pid"
 required_files="%%PREFIX%%/etc/cyrus.conf %%PREFIX%%/etc/imapd.conf"
diff --git a/mail/cyrus-imapd23/files/imapd.sh.in b/mail/cyrus-imapd23/files/imapd.sh.in
index 4fc58fbd38de..1af0b40f32df 100644
--- a/mail/cyrus-imapd23/files/imapd.sh.in
+++ b/mail/cyrus-imapd23/files/imapd.sh.in
@@ -22,7 +22,7 @@
 . /etc/rc.subr
 
 name="cyrus_imapd"
-rcvar=`set_rcvar`
+rcvar=cyrus_imapd_enable
 command="%%PREFIX%%/cyrus/bin/master"
 pidfile="/var/run/cyrus-master.pid"
 required_files="%%PREFIX%%/etc/cyrus.conf %%PREFIX%%/etc/imapd.conf"
diff --git a/mail/cyrus-imapd24/files/imapd.sh.in b/mail/cyrus-imapd24/files/imapd.sh.in
index 4fc58fbd38de..1af0b40f32df 100644
--- a/mail/cyrus-imapd24/files/imapd.sh.in
+++ b/mail/cyrus-imapd24/files/imapd.sh.in
@@ -22,7 +22,7 @@
 . /etc/rc.subr
 
 name="cyrus_imapd"
-rcvar=`set_rcvar`
+rcvar=cyrus_imapd_enable
 command="%%PREFIX%%/cyrus/bin/master"
 pidfile="/var/run/cyrus-master.pid"
 required_files="%%PREFIX%%/etc/cyrus.conf %%PREFIX%%/etc/imapd.conf"
diff --git a/mail/davmail/files/davmail.in b/mail/davmail/files/davmail.in
index 24415bf85ba9..0e0dec681c1c 100644
--- a/mail/davmail/files/davmail.in
+++ b/mail/davmail/files/davmail.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name="davmail"
-rcvar=`set_rcvar`
+rcvar=davmail_enable
 
 load_rc_config $name
 
diff --git a/mail/dbmail/files/dbmail-imapd.sh.in b/mail/dbmail/files/dbmail-imapd.sh.in
index 66d4e34fa0af..7d1ca96ea7d0 100644
--- a/mail/dbmail/files/dbmail-imapd.sh.in
+++ b/mail/dbmail/files/dbmail-imapd.sh.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=dbmail_imapd
-rcvar=`set_rcvar`
+rcvar=dbmail_imapd_enable
 
 command=%%PREFIX%%/sbin/dbmail-imapd
 pidfile=/var/run/dbmail-imapd.pid
diff --git a/mail/dbmail/files/dbmail-lmtpd.sh.in b/mail/dbmail/files/dbmail-lmtpd.sh.in
index 97677ad4b1f6..f1805db488b1 100644
--- a/mail/dbmail/files/dbmail-lmtpd.sh.in
+++ b/mail/dbmail/files/dbmail-lmtpd.sh.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=dbmail_lmtpd
-rcvar=`set_rcvar`
+rcvar=dbmail_lmtpd_enable
 
 command=%%PREFIX%%/sbin/dbmail-lmtpd
 pidfile=/var/run/dbmail-lmtpd.pid
diff --git a/mail/dbmail/files/dbmail-pop3d.sh.in b/mail/dbmail/files/dbmail-pop3d.sh.in
index 2430180a14c5..71a567fbd393 100644
--- a/mail/dbmail/files/dbmail-pop3d.sh.in
+++ b/mail/dbmail/files/dbmail-pop3d.sh.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=dbmail_pop3d
-rcvar=`set_rcvar`
+rcvar=dbmail_pop3d_enable
 
 command=%%PREFIX%%/sbin/dbmail-pop3d
 pidfile=/var/run/dbmail-pop3d.pid
diff --git a/mail/dbmail/files/dbmail-timsieved.sh.in b/mail/dbmail/files/dbmail-timsieved.sh.in
index 5db24fffb623..27eb49540333 100644
--- a/mail/dbmail/files/dbmail-timsieved.sh.in
+++ b/mail/dbmail/files/dbmail-timsieved.sh.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=dbmail_timsieved
-rcvar=`set_rcvar`
+rcvar=dbmail_timsieved_enable
 
 command=%%PREFIX%%/sbin/dbmail-timsieved
 pidfile=/var/run/dbmail-timsieved.pid
diff --git a/mail/dbmail20/files/dbmail-imapd.sh.in b/mail/dbmail20/files/dbmail-imapd.sh.in
index 66d4e34fa0af..7d1ca96ea7d0 100644
--- a/mail/dbmail20/files/dbmail-imapd.sh.in
+++ b/mail/dbmail20/files/dbmail-imapd.sh.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=dbmail_imapd
-rcvar=`set_rcvar`
+rcvar=dbmail_imapd_enable
 
 command=%%PREFIX%%/sbin/dbmail-imapd
 pidfile=/var/run/dbmail-imapd.pid
diff --git a/mail/dbmail20/files/dbmail-lmtpd.sh.in b/mail/dbmail20/files/dbmail-lmtpd.sh.in
index 97677ad4b1f6..f1805db488b1 100644
--- a/mail/dbmail20/files/dbmail-lmtpd.sh.in
+++ b/mail/dbmail20/files/dbmail-lmtpd.sh.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=dbmail_lmtpd
-rcvar=`set_rcvar`
+rcvar=dbmail_lmtpd_enable
 
 command=%%PREFIX%%/sbin/dbmail-lmtpd
 pidfile=/var/run/dbmail-lmtpd.pid
diff --git a/mail/dbmail20/files/dbmail-pop3d.sh.in b/mail/dbmail20/files/dbmail-pop3d.sh.in
index 2430180a14c5..71a567fbd393 100644
--- a/mail/dbmail20/files/dbmail-pop3d.sh.in
+++ b/mail/dbmail20/files/dbmail-pop3d.sh.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=dbmail_pop3d
-rcvar=`set_rcvar`
+rcvar=dbmail_pop3d_enable
 
 command=%%PREFIX%%/sbin/dbmail-pop3d
 pidfile=/var/run/dbmail-pop3d.pid
diff --git a/mail/dbmail21/files/dbmail-imapd.sh.in b/mail/dbmail21/files/dbmail-imapd.sh.in
index 66d4e34fa0af..7d1ca96ea7d0 100644
--- a/mail/dbmail21/files/dbmail-imapd.sh.in
+++ b/mail/dbmail21/files/dbmail-imapd.sh.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=dbmail_imapd
-rcvar=`set_rcvar`
+rcvar=dbmail_imapd_enable
 
 command=%%PREFIX%%/sbin/dbmail-imapd
 pidfile=/var/run/dbmail-imapd.pid
diff --git a/mail/dbmail21/files/dbmail-lmtpd.sh.in b/mail/dbmail21/files/dbmail-lmtpd.sh.in
index 97677ad4b1f6..f1805db488b1 100644
--- a/mail/dbmail21/files/dbmail-lmtpd.sh.in
+++ b/mail/dbmail21/files/dbmail-lmtpd.sh.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=dbmail_lmtpd
-rcvar=`set_rcvar`
+rcvar=dbmail_lmtpd_enable
 
 command=%%PREFIX%%/sbin/dbmail-lmtpd
 pidfile=/var/run/dbmail-lmtpd.pid
diff --git a/mail/dbmail21/files/dbmail-pop3d.sh.in b/mail/dbmail21/files/dbmail-pop3d.sh.in
index 8219921e6b66..afb34fb432e9 100644
--- a/mail/dbmail21/files/dbmail-pop3d.sh.in
+++ b/mail/dbmail21/files/dbmail-pop3d.sh.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=dbmail_pop3d
-rcvar=`set_rcvar`
+rcvar=dbmail_pop3d_enable
 
 command=%%PREFIX%%/sbin/dbmail-pop3d
 pidfile=/var/run/dbmail-pop3d.pid
diff --git a/mail/dbmail21/files/dbmail-timsieved.sh.in b/mail/dbmail21/files/dbmail-timsieved.sh.in
index 5db24fffb623..27eb49540333 100644
--- a/mail/dbmail21/files/dbmail-timsieved.sh.in
+++ b/mail/dbmail21/files/dbmail-timsieved.sh.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=dbmail_timsieved
-rcvar=`set_rcvar`
+rcvar=dbmail_timsieved_enable
 
 command=%%PREFIX%%/sbin/dbmail-timsieved
 pidfile=/var/run/dbmail-timsieved.pid
diff --git a/mail/dbmail22/files/dbmail-imapd.sh.in b/mail/dbmail22/files/dbmail-imapd.sh.in
index 66d4e34fa0af..7d1ca96ea7d0 100644
--- a/mail/dbmail22/files/dbmail-imapd.sh.in
+++ b/mail/dbmail22/files/dbmail-imapd.sh.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=dbmail_imapd
-rcvar=`set_rcvar`
+rcvar=dbmail_imapd_enable
 
 command=%%PREFIX%%/sbin/dbmail-imapd
 pidfile=/var/run/dbmail-imapd.pid
diff --git a/mail/dbmail22/files/dbmail-lmtpd.sh.in b/mail/dbmail22/files/dbmail-lmtpd.sh.in
index 97677ad4b1f6..f1805db488b1 100644
--- a/mail/dbmail22/files/dbmail-lmtpd.sh.in
+++ b/mail/dbmail22/files/dbmail-lmtpd.sh.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=dbmail_lmtpd
-rcvar=`set_rcvar`
+rcvar=dbmail_lmtpd_enable
 
 command=%%PREFIX%%/sbin/dbmail-lmtpd
 pidfile=/var/run/dbmail-lmtpd.pid
diff --git a/mail/dbmail22/files/dbmail-pop3d.sh.in b/mail/dbmail22/files/dbmail-pop3d.sh.in
index 2430180a14c5..71a567fbd393 100644
--- a/mail/dbmail22/files/dbmail-pop3d.sh.in
+++ b/mail/dbmail22/files/dbmail-pop3d.sh.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=dbmail_pop3d
-rcvar=`set_rcvar`
+rcvar=dbmail_pop3d_enable
 
 command=%%PREFIX%%/sbin/dbmail-pop3d
 pidfile=/var/run/dbmail-pop3d.pid
diff --git a/mail/dbmail22/files/dbmail-timsieved.sh.in b/mail/dbmail22/files/dbmail-timsieved.sh.in
index 5db24fffb623..27eb49540333 100644
--- a/mail/dbmail22/files/dbmail-timsieved.sh.in
+++ b/mail/dbmail22/files/dbmail-timsieved.sh.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=dbmail_timsieved
-rcvar=`set_rcvar`
+rcvar=dbmail_timsieved_enable
 
 command=%%PREFIX%%/sbin/dbmail-timsieved
 pidfile=/var/run/dbmail-timsieved.pid
diff --git a/mail/dbmail23/files/dbmail-imapd.sh.in b/mail/dbmail23/files/dbmail-imapd.sh.in
index 66d4e34fa0af..7d1ca96ea7d0 100644
--- a/mail/dbmail23/files/dbmail-imapd.sh.in
+++ b/mail/dbmail23/files/dbmail-imapd.sh.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=dbmail_imapd
-rcvar=`set_rcvar`
+rcvar=dbmail_imapd_enable
 
 command=%%PREFIX%%/sbin/dbmail-imapd
 pidfile=/var/run/dbmail-imapd.pid
diff --git a/mail/dbmail23/files/dbmail-lmtpd.sh.in b/mail/dbmail23/files/dbmail-lmtpd.sh.in
index 97677ad4b1f6..f1805db488b1 100644
--- a/mail/dbmail23/files/dbmail-lmtpd.sh.in
+++ b/mail/dbmail23/files/dbmail-lmtpd.sh.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=dbmail_lmtpd
-rcvar=`set_rcvar`
+rcvar=dbmail_lmtpd_enable
 
 command=%%PREFIX%%/sbin/dbmail-lmtpd
 pidfile=/var/run/dbmail-lmtpd.pid
diff --git a/mail/dbmail23/files/dbmail-pop3d.sh.in b/mail/dbmail23/files/dbmail-pop3d.sh.in
index 2430180a14c5..71a567fbd393 100644
--- a/mail/dbmail23/files/dbmail-pop3d.sh.in
+++ b/mail/dbmail23/files/dbmail-pop3d.sh.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=dbmail_pop3d
-rcvar=`set_rcvar`
+rcvar=dbmail_pop3d_enable
 
 command=%%PREFIX%%/sbin/dbmail-pop3d
 pidfile=/var/run/dbmail-pop3d.pid
diff --git a/mail/dbmail23/files/dbmail-timsieved.sh.in b/mail/dbmail23/files/dbmail-timsieved.sh.in
index 5db24fffb623..27eb49540333 100644
--- a/mail/dbmail23/files/dbmail-timsieved.sh.in
+++ b/mail/dbmail23/files/dbmail-timsieved.sh.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=dbmail_timsieved
-rcvar=`set_rcvar`
+rcvar=dbmail_timsieved_enable
 
 command=%%PREFIX%%/sbin/dbmail-timsieved
 pidfile=/var/run/dbmail-timsieved.pid
diff --git a/mail/dcc-dccd/files/dccd.sh.in b/mail/dcc-dccd/files/dccd.sh.in
index 1de2096f108e..5618e428bf27 100644
--- a/mail/dcc-dccd/files/dccd.sh.in
+++ b/mail/dcc-dccd/files/dccd.sh.in
@@ -25,7 +25,7 @@
 . /etc/rc.subr
 
 name=dccd
-rcvar=`set_rcvar`
+rcvar=dccd_enable
 
 load_rc_config $name
 
diff --git a/mail/dcc-dccd/files/dccgrey.sh.in b/mail/dcc-dccd/files/dccgrey.sh.in
index df2e6c051cbc..87267ba69ad1 100644
--- a/mail/dcc-dccd/files/dccgrey.sh.in
+++ b/mail/dcc-dccd/files/dccgrey.sh.in
@@ -25,7 +25,7 @@
 . /etc/rc.subr
 
 name=dccgrey
-rcvar=`set_rcvar`
+rcvar=dccgrey_enable
 
 load_rc_config $name
 
diff --git a/mail/dcc-dccd/files/dccifd.sh.in b/mail/dcc-dccd/files/dccifd.sh.in
index 7a5d2051bf11..95fa8cd54fcd 100644
--- a/mail/dcc-dccd/files/dccifd.sh.in
+++ b/mail/dcc-dccd/files/dccifd.sh.in
@@ -25,7 +25,7 @@
 . /etc/rc.subr
 
 name=dccifd
-rcvar=`set_rcvar`
+rcvar=dccifd_enable
 
 load_rc_config $name
 
diff --git a/mail/dcc-dccd/files/dccm.sh.in b/mail/dcc-dccd/files/dccm.sh.in
index 4e3a2400c509..4ef5ea578ef0 100644
--- a/mail/dcc-dccd/files/dccm.sh.in
+++ b/mail/dcc-dccd/files/dccm.sh.in
@@ -25,7 +25,7 @@
 . /etc/rc.subr
 
 name=dccm
-rcvar=`set_rcvar`
+rcvar=dccm_enable
 
 load_rc_config $name
 
diff --git a/mail/dk-milter/files/milter-dk.sh.in b/mail/dk-milter/files/milter-dk.sh.in
index 07310a9a2c2c..8027d75814c9 100644
--- a/mail/dk-milter/files/milter-dk.sh.in
+++ b/mail/dk-milter/files/milter-dk.sh.in
@@ -32,7 +32,7 @@
 . /etc/rc.subr
 
 name="milterdk"
-rcvar=`set_rcvar`
+rcvar=milterdk_enable
 load_rc_config $name
 
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
diff --git a/mail/dkfilter/files/dkfilter_in.in b/mail/dkfilter/files/dkfilter_in.in
index f11ec2b75c29..06ec480b6678 100644
--- a/mail/dkfilter/files/dkfilter_in.in
+++ b/mail/dkfilter/files/dkfilter_in.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name=dkfilter_in
-rcvar=`set_rcvar`
+rcvar=dkfilter_in_enable
 
 # set defaults
 
diff --git a/mail/dkfilter/files/dkfilter_out.in b/mail/dkfilter/files/dkfilter_out.in
index 6fb1264717a9..afdd604ae15d 100644
--- a/mail/dkfilter/files/dkfilter_out.in
+++ b/mail/dkfilter/files/dkfilter_out.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name="dkfilter_out"
-rcvar=`set_rcvar`
+rcvar=dkfilter_out_enable
 
 # set defaults
 
diff --git a/mail/dkimproxy/files/dkimproxy_in.in b/mail/dkimproxy/files/dkimproxy_in.in
index 4d78fd1f7642..49f48d6be099 100644
--- a/mail/dkimproxy/files/dkimproxy_in.in
+++ b/mail/dkimproxy/files/dkimproxy_in.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name=dkimproxy_in
-rcvar=`set_rcvar`
+rcvar=dkimproxy_in_enable
 
 # set defaults
 : ${dkimproxy_in_enable="NO"}
diff --git a/mail/dkimproxy/files/dkimproxy_out.in b/mail/dkimproxy/files/dkimproxy_out.in
index cd8a0410e379..f74da883def7 100644
--- a/mail/dkimproxy/files/dkimproxy_out.in
+++ b/mail/dkimproxy/files/dkimproxy_out.in
@@ -20,7 +20,7 @@
 . /etc/rc.subr
 
 name=dkimproxy_out
-rcvar=`set_rcvar`
+rcvar=dkimproxy_out_enable
 
 # set defaults
 : ${dkimproxy_out_enable="NO"}
diff --git a/mail/dma/files/dma_flushq.in b/mail/dma/files/dma_flushq.in
index e369b83359ff..9b814a3aaea4 100644
--- a/mail/dma/files/dma_flushq.in
+++ b/mail/dma/files/dma_flushq.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name="dma_flushq"
-rcvar=${name}_enable
+rcvar=dma_flushq_enable
 
 load_rc_config ${name}
 
diff --git a/mail/dovecot/files/dovecot.sh.in b/mail/dovecot/files/dovecot.sh.in
index 7d75a9feb237..cadfadc7c8de 100644
--- a/mail/dovecot/files/dovecot.sh.in
+++ b/mail/dovecot/files/dovecot.sh.in
@@ -15,7 +15,7 @@
 . /etc/rc.subr
 
 name=dovecot
-rcvar=`set_rcvar`
+rcvar=dovecot_enable
 
 # read configuration and set defaults
 load_rc_config ${name}
diff --git a/mail/dovecot2/files/dovecot.sh.in b/mail/dovecot2/files/dovecot.sh.in
index 35fe743f2691..8c7a91dbe14a 100644
--- a/mail/dovecot2/files/dovecot.sh.in
+++ b/mail/dovecot2/files/dovecot.sh.in
@@ -15,7 +15,7 @@
 . /etc/rc.subr
 
 name=dovecot
-rcvar=`set_rcvar`
+rcvar=dovecot_enable
 
 # read configuration and set defaults
 load_rc_config ${name}
diff --git a/mail/drac/files/dracd.sh.in b/mail/drac/files/dracd.sh.in
index 14dd608cc207..83054f707369 100644
--- a/mail/drac/files/dracd.sh.in
+++ b/mail/drac/files/dracd.sh.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name="dracd"
-rcvar=`set_rcvar`
+rcvar=dracd_enable
 command="%%PREFIX%%/sbin/rpc.dracd"
 
 load_rc_config $name
diff --git a/mail/dspam-devel/files/dspam-devel.in b/mail/dspam-devel/files/dspam-devel.in
index 3e6564cbf640..becc8b86533b 100644
--- a/mail/dspam-devel/files/dspam-devel.in
+++ b/mail/dspam-devel/files/dspam-devel.in
@@ -18,7 +18,7 @@
 . /etc/rc.subr
 
 name="dspam"
-rcvar=${name}_enable
+rcvar=dspam_enable
 
 load_rc_config $name
 
diff --git a/mail/dspam/files/dspam.in b/mail/dspam/files/dspam.in
index c6756868e9dc..2a933eb5bc0f 100644
--- a/mail/dspam/files/dspam.in
+++ b/mail/dspam/files/dspam.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name="dspam"
-rcvar=${name}_enable
+rcvar=dspam_enable
 
 load_rc_config $name
 
diff --git a/mail/enma/files/milter-enma.in b/mail/enma/files/milter-enma.in
index 219ac4f97c64..1a677aaecd81 100644
--- a/mail/enma/files/milter-enma.in
+++ b/mail/enma/files/milter-enma.in
@@ -29,7 +29,7 @@ milterenma_uid=${milterenma_uid:-"mailnull"}
 . /etc/rc.subr
 
 name="milterenma"
-rcvar=`set_rcvar`
+rcvar=milterenma_enable
 
 load_rc_config $name
 
diff --git a/mail/exilog/files/exilog.sh.in b/mail/exilog/files/exilog.sh.in
index 66b77e3d9756..887be6cbdce8 100644
--- a/mail/exilog/files/exilog.sh.in
+++ b/mail/exilog/files/exilog.sh.in
@@ -15,7 +15,7 @@
 . /etc/rc.subr
 
 name=exilog
-rcvar=`set_rcvar`
+rcvar=exilog_enable
 
 command=%%PREFIX%%/sbin/exilog_agent.pl
 pidfile=/var/run/exilog.pid
diff --git a/mail/exim/files/exim.sh.in b/mail/exim/files/exim.sh.in
index 49f62bf1b7fe..119be1e21e9b 100644
--- a/mail/exim/files/exim.sh.in
+++ b/mail/exim/files/exim.sh.in
@@ -20,7 +20,7 @@
 . /etc/rc.subr
 
 name=exim
-rcvar=`set_rcvar`
+rcvar=exim_enable
 
 command=%%PREFIX%%/sbin/exim
 pidfile=/var/run/exim.pid
diff --git a/mail/fetchmail/files/fetchmail.in b/mail/fetchmail/files/fetchmail.in
index 953ee8210c2b..41723ccfc0c0 100644
--- a/mail/fetchmail/files/fetchmail.in
+++ b/mail/fetchmail/files/fetchmail.in
@@ -59,7 +59,7 @@
 . /etc/rc.subr
 
 name=fetchmail
-rcvar=`set_rcvar`
+rcvar=fetchmail_enable
 
 command=%%PREFIX%%/bin/${name}
 pidfile=/var/run/fetchmail/${name}.pid
diff --git a/mail/gld/files/gld.in b/mail/gld/files/gld.in
index 74218f4cd2e9..d61f6fe8ec8f 100644
--- a/mail/gld/files/gld.in
+++ b/mail/gld/files/gld.in
@@ -18,7 +18,7 @@
 . /etc/rc.subr
 
 name=gld
-rcvar=`set_rcvar`
+rcvar=gld_enable
 
 load_rc_config $name
 
diff --git a/mail/james/files/james.sh.in b/mail/james/files/james.sh.in
index 3f78bfb4d16e..838ae5f61443 100644
--- a/mail/james/files/james.sh.in
+++ b/mail/james/files/james.sh.in
@@ -52,7 +52,7 @@ james%%JAMES_VERSION%%_stop_timeout="${james%%JAMES_VERSION%%_stop_timeout:-"10"
 . /etc/rc.subr
 
 name="james%%JAMES_VERSION%%"
-rcvar=`set_rcvar`
+rcvar=james%%JAMES_VERSION%%_enable
 pidfile="%%PID_FILE%%"
 
 JAVA_HOME=%%JAVA_HOME%%
diff --git a/mail/mailgraph/files/mailgraph.in b/mail/mailgraph/files/mailgraph.in
index bcbcdc353b03..a619e77be4c4 100644
--- a/mail/mailgraph/files/mailgraph.in
+++ b/mail/mailgraph/files/mailgraph.in
@@ -13,7 +13,7 @@
 . /etc/rc.subr
 
 name="mailgraph"
-rcvar=`set_rcvar`
+rcvar=mailgraph_enable
 
 command=%%PREFIX%%/sbin/${name}.pl > /dev/null 2>&1
 command_interpreter=/usr/bin/perl
diff --git a/mail/mailman/files/mailman.in b/mail/mailman/files/mailman.in
index 6e5e68dac641..6efc839a273e 100644
--- a/mail/mailman/files/mailman.in
+++ b/mail/mailman/files/mailman.in
@@ -13,7 +13,7 @@
 . /etc/rc.subr
 
 name="mailman"
-rcvar=${name}_enable
+rcvar=mailman_enable
 
 pidfile="%%MAILMANDIR%%/data/master-qrunner.pid"
 
diff --git a/mail/mailscanner/files/mailscanner.in b/mail/mailscanner/files/mailscanner.in
index c6d821f6f3b8..f4832a0ab7c7 100644
--- a/mail/mailscanner/files/mailscanner.in
+++ b/mail/mailscanner/files/mailscanner.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name="mailscanner"
-rcvar=`set_rcvar`
+rcvar=mailscanner_enable
 
 load_rc_config $name
 
diff --git a/mail/mailscanner/files/mta.in b/mail/mailscanner/files/mta.in
index 65c78c0ee3c2..d1de08b42189 100644
--- a/mail/mailscanner/files/mta.in
+++ b/mail/mailscanner/files/mta.in
@@ -61,7 +61,7 @@ PATH=$PATH:/sbin:/usr/sbin; export PATH
 . /etc/rc.subr
 
 name="mta"
-rcvar=`set_rcvar`
+rcvar=mta_enable
 
 _mta_rc_script="%%PREFIX%%/etc/rc.d/mta"
 
diff --git a/mail/mailscanner/files/patch-bin-cron-update_phishing_sites.cron b/mail/mailscanner/files/patch-bin-cron-update_phishing_sites.cron
index 54a239901092..c2bc49fa7101 100644
--- a/mail/mailscanner/files/patch-bin-cron-update_phishing_sites.cron
+++ b/mail/mailscanner/files/patch-bin-cron-update_phishing_sites.cron
@@ -18,7 +18,7 @@
 +. /etc/rc.subr
 +
 +name="mailscanner"
-+rcvar=`set_rcvar`
++rcvar=mailscanner_enable
 +
 +load_rc_config $name
 +
diff --git a/mail/mailscanner/files/patch-bin-cron-update_virus_scanners.cron b/mail/mailscanner/files/patch-bin-cron-update_virus_scanners.cron
index a6976863a1e6..c926a5ee82b6 100644
--- a/mail/mailscanner/files/patch-bin-cron-update_virus_scanners.cron
+++ b/mail/mailscanner/files/patch-bin-cron-update_virus_scanners.cron
@@ -18,7 +18,7 @@
 +. /etc/rc.subr
 +
 +name="mailscanner"
-+rcvar=`set_rcvar`
++rcvar=mailscanner_enable
 +
 +load_rc_config $name
 +
diff --git a/mail/masqmail/files/masqmail.in b/mail/masqmail/files/masqmail.in
index 1af5b37688d4..75a0c5a57d6e 100644
--- a/mail/masqmail/files/masqmail.in
+++ b/mail/masqmail/files/masqmail.in
@@ -20,7 +20,7 @@
 . /etc/rc.subr
 
 name=masqmail
-rcvar=`set_rcvar`
+rcvar=masqmail_enable
 
 command=%%PREFIX%%/sbin/masqmail
 required_dirs=/var/log/masqmail
diff --git a/mail/milter-bogom/files/milter-bogom.sh.in b/mail/milter-bogom/files/milter-bogom.sh.in
index d4768dd27df8..778dccdc9321 100644
--- a/mail/milter-bogom/files/milter-bogom.sh.in
+++ b/mail/milter-bogom/files/milter-bogom.sh.in
@@ -8,7 +8,7 @@
 . /etc/rc.subr
 
 name=milterbogom
-rcvar=`set_rcvar`
+rcvar=milterbogom_enable
 command=%%PREFIX%%/sbin/bogom
 start_precmd="bogom_precmd"
 stop_postcmd="bogom_postcmd"
diff --git a/mail/milter-callback/files/milter-callback.in b/mail/milter-callback/files/milter-callback.in
index 82f613d59baf..d5ed535e4070 100644
--- a/mail/milter-callback/files/milter-callback.in
+++ b/mail/milter-callback/files/milter-callback.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name="miltercallback"
-rcvar=`set_rcvar`
+rcvar=miltercallback_enable
 
 command="%%PREFIX%%/libexec/milter-callback"
 required_files="%%PREFIX%%/etc/mail/milter-callback.conf"
diff --git a/mail/milter-greylist-devel/files/milter-greylist.in b/mail/milter-greylist-devel/files/milter-greylist.in
index 11186765cf43..3bb77574c447 100644
--- a/mail/milter-greylist-devel/files/milter-greylist.in
+++ b/mail/milter-greylist-devel/files/milter-greylist.in
@@ -17,7 +17,7 @@
 . /etc/rc.subr
 
 name="miltergreylist"
-rcvar=`set_rcvar`
+rcvar=miltergreylist_enable
 command="%%PREFIX%%/bin/milter-greylist"
 
 load_rc_config $name
diff --git a/mail/milter-greylist/files/milter-greylist.in b/mail/milter-greylist/files/milter-greylist.in
index 5a6afb472c83..158117595b36 100644
--- a/mail/milter-greylist/files/milter-greylist.in
+++ b/mail/milter-greylist/files/milter-greylist.in
@@ -17,7 +17,7 @@
 . /etc/rc.subr
 
 name="miltergreylist"
-rcvar=`set_rcvar`
+rcvar=miltergreylist_enable
 
 command="%%PREFIX%%/libexec/milter-greylist"
 
diff --git a/mail/milter-manager/files/milter-manager.in b/mail/milter-manager/files/milter-manager.in
index 8a63f4425d05..271922cc1023 100644
--- a/mail/milter-manager/files/milter-manager.in
+++ b/mail/milter-manager/files/milter-manager.in
@@ -33,7 +33,7 @@
 . /etc/rc.subr
 
 name="miltermanager"
-rcvar=`set_rcvar`
+rcvar=miltermanager_enable
 
 extra_commands="reload"
 start_precmd="manager_precmd"
diff --git a/mail/milter-regex/files/milterregex.sh.in b/mail/milter-regex/files/milterregex.sh.in
index 0ee9590577ed..96e36218fc85 100644
--- a/mail/milter-regex/files/milterregex.sh.in
+++ b/mail/milter-regex/files/milterregex.sh.in
@@ -25,7 +25,7 @@ spooldir=%%SPOOLDIR%%
 . /etc/rc.subr
 
 name="milterregex"
-rcvar=`set_rcvar`
+rcvar=milterregex_enable
 command="%%PREFIX%%/libexec/milter-regex"
 pidfile="${spooldir}/milter-regex.pid"
 required_files="%%PREFIX%%/etc/milter-regex.conf"
diff --git a/mail/missey/files/mps.sh.in b/mail/missey/files/mps.sh.in
index cf5c8c5f313a..fce084360b03 100644
--- a/mail/missey/files/mps.sh.in
+++ b/mail/missey/files/mps.sh.in
@@ -15,7 +15,7 @@
 . /etc/rc.subr
 
 name="mps"
-rcvar=`set_rcvar`
+rcvar=mps_enable
 
 load_rc_config $name
 
diff --git a/mail/mixminion/files/mixminiond.in b/mail/mixminion/files/mixminiond.in
index 6c32b36f41e4..656ce2628ce5 100644
--- a/mail/mixminion/files/mixminiond.in
+++ b/mail/mixminion/files/mixminiond.in
@@ -17,7 +17,7 @@
 . /etc/rc.subr
 
 name="mixminiond"
-rcvar=${name}_enable
+rcvar=mixminiond_enable
 
 load_rc_config ${name}
 
diff --git a/mail/noattach/files/noattach.sh.in b/mail/noattach/files/noattach.sh.in
index c11bd3648464..7d1cc8820a75 100644
--- a/mail/noattach/files/noattach.sh.in
+++ b/mail/noattach/files/noattach.sh.in
@@ -26,7 +26,7 @@ noattach_socket=${noattach_socket:-"/var/run/noattach"} # Path to socket
 . /etc/rc.subr
 
 name="noattach"
-rcvar=`set_rcvar`
+rcvar=noattach_enable
 command="%%PREFIX%%/libexec/${name}"
 required_files="%%PREFIX%%/etc/noattach.patterns"
 start_precmd="noattach_prestart"
diff --git a/mail/nullmailer/files/nullmailer.in b/mail/nullmailer/files/nullmailer.in
index 197c4b38d2d8..5eb803939ef0 100644
--- a/mail/nullmailer/files/nullmailer.in
+++ b/mail/nullmailer/files/nullmailer.in
@@ -14,7 +14,7 @@
 . /etc/rc.subr
 
 name=nullmailer
-rcvar=`set_rcvar`
+rcvar=nullmailer_enable
 
 command=/usr/sbin/daemon
 procname=%%PREFIX%%/sbin/nullmailer-send
diff --git a/mail/opendkim/files/milter-opendkim.in b/mail/opendkim/files/milter-opendkim.in
index a21f95e121a4..c69ba0b5ddbf 100644
--- a/mail/opendkim/files/milter-opendkim.in
+++ b/mail/opendkim/files/milter-opendkim.in
@@ -34,7 +34,7 @@
 . /etc/rc.subr
 
 name="milteropendkim"
-rcvar=`set_rcvar`
+rcvar=milteropendkim_enable
 
 extra_commands="reload"
 start_precmd="dkim_prepcmd"
diff --git a/mail/ovs/files/ovs.sh.in b/mail/ovs/files/ovs.sh.in
index 229c7692f13e..1c8e16be08ad 100644
--- a/mail/ovs/files/ovs.sh.in
+++ b/mail/ovs/files/ovs.sh.in
@@ -13,7 +13,7 @@
 . /etc/rc.subr
 
 name="ovs"
-rcvar=`set_rcvar`
+rcvar=ovs_enable
 
 command=%%PREFIX%%/sbin/${name}.pl > /dev/null 2>&1
 command_interpreter=/usr/bin/perl
diff --git a/mail/p3scan/files/p3scan.in b/mail/p3scan/files/p3scan.in
index dde820b6449c..09e185ba21e3 100644
--- a/mail/p3scan/files/p3scan.in
+++ b/mail/p3scan/files/p3scan.in
@@ -15,7 +15,7 @@
 . /etc/rc.subr
 
 name=p3scan
-rcvar=`set_rcvar`
+rcvar=p3scan_enable
 
 required_files=%%PREFIX%%/etc/p3scan/p3scan.conf
 
diff --git a/mail/p5-Mail-SpamAssassin/files/sa-spamd.sh.in b/mail/p5-Mail-SpamAssassin/files/sa-spamd.sh.in
index ce42c0a390fd..5398ea6fa7e7 100644
--- a/mail/p5-Mail-SpamAssassin/files/sa-spamd.sh.in
+++ b/mail/p5-Mail-SpamAssassin/files/sa-spamd.sh.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=spamd
-rcvar=`set_rcvar`
+rcvar=spamd_enable
 
 extra_commands="reload"
 load_rc_config $name
diff --git a/mail/p5-qpsmtpd/files/qpsmtpd.in b/mail/p5-qpsmtpd/files/qpsmtpd.in
index d231a17ac68c..a5afba502bd7 100644
--- a/mail/p5-qpsmtpd/files/qpsmtpd.in
+++ b/mail/p5-qpsmtpd/files/qpsmtpd.in
@@ -27,7 +27,7 @@
 . /etc/rc.subr
 
 name="qpsmtpd"
-rcvar=`set_rcvar`
+rcvar=qpsmtpd_enable
 
 command="%%PREFIX%%/bin/qpsmtpd-forkserver"
 command_interpreter=%%PERL%%
diff --git a/mail/perdition/files/perdition.imap4.in b/mail/perdition/files/perdition.imap4.in
index 4a53f39a25f4..841bed798c15 100644
--- a/mail/perdition/files/perdition.imap4.in
+++ b/mail/perdition/files/perdition.imap4.in
@@ -19,7 +19,7 @@ perdition_imap4_enable=${perdition_imap4_enable-"NO"}
 . /etc/rc.subr
 
 name="perdition_imap4"
-rcvar=`set_rcvar`
+rcvar=perdition_imap4_enable
 
 command="%%PREFIX%%/sbin/perdition.imap4"
 pidfile="/var/run/perdition.imap4/perdition.imap4.pid"
diff --git a/mail/perdition/files/perdition.imap4s.in b/mail/perdition/files/perdition.imap4s.in
index d257df64d1e4..f37fc7a7e448 100644
--- a/mail/perdition/files/perdition.imap4s.in
+++ b/mail/perdition/files/perdition.imap4s.in
@@ -19,7 +19,7 @@ perdition_imap4s_enable=${perdition_imap4s_enable-"NO"}
 . /etc/rc.subr
 
 name="perdition_imap4s"
-rcvar=`set_rcvar`
+rcvar=perdition_imap4s_enable
 
 command="%%PREFIX%%/sbin/perdition.imap4s"
 pidfile="/var/run/perdition.imap4s/perdition.imap4s.pid"
diff --git a/mail/perdition/files/perdition.imaps.in b/mail/perdition/files/perdition.imaps.in
index 997bd4e3cc61..abda91a346db 100644
--- a/mail/perdition/files/perdition.imaps.in
+++ b/mail/perdition/files/perdition.imaps.in
@@ -19,7 +19,7 @@ perdition_imaps_enable=${perdition_imaps_enable-"NO"}
 . /etc/rc.subr
 
 name="perdition_imaps"
-rcvar=`set_rcvar`
+rcvar=perdition_imaps_enable
 
 command="%%PREFIX%%/sbin/perdition.imaps"
 pidfile="/var/run/perdition.imaps/perdition.imaps.pid"
diff --git a/mail/perdition/files/perdition.in b/mail/perdition/files/perdition.in
index 37197d213ece..eb1d32855a8f 100644
--- a/mail/perdition/files/perdition.in
+++ b/mail/perdition/files/perdition.in
@@ -19,7 +19,7 @@ perdition_enable=${perdition_enable-"NO"}
 . /etc/rc.subr
 
 name="perdition"
-rcvar=`set_rcvar`
+rcvar=perdition_enable
 
 command="%%PREFIX%%/sbin/${name}"
 pidfile="/var/run/perdition/${name}.pid"
diff --git a/mail/perdition/files/perdition.pop3.in b/mail/perdition/files/perdition.pop3.in
index f95a7e370f4c..7e6926f0f6fc 100644
--- a/mail/perdition/files/perdition.pop3.in
+++ b/mail/perdition/files/perdition.pop3.in
@@ -19,7 +19,7 @@ perdition_pop3_enable=${perdition_pop3_enable-"NO"}
 . /etc/rc.subr
 
 name="perdition_pop3"
-rcvar=`set_rcvar`
+rcvar=perdition_pop3_enable
 
 command="%%PREFIX%%/sbin/perdition.pop3"
 pidfile="/var/run/perdition.pop3/perdition.pop3.pid"
diff --git a/mail/perdition/files/perdition.pop3s.in b/mail/perdition/files/perdition.pop3s.in
index e0a3fbac2f5a..65339fb54f90 100644
--- a/mail/perdition/files/perdition.pop3s.in
+++ b/mail/perdition/files/perdition.pop3s.in
@@ -19,7 +19,7 @@ perdition_pop3s_enable=${perdition_pop3s_enable-"NO"}
 . /etc/rc.subr
 
 name="perdition_pop3s"
-rcvar=`set_rcvar`
+rcvar=perdition_pop3s_enable
 
 command="%%PREFIX%%/sbin/perdition.pop3s"
 pidfile="/var/run/perdition.pop3s/perdition.pop3s.pid"
diff --git a/mail/policyd2/files/policyd2.sh.in b/mail/policyd2/files/policyd2.sh.in
index 6868b25f213d..a5443c618452 100644
--- a/mail/policyd2/files/policyd2.sh.in
+++ b/mail/policyd2/files/policyd2.sh.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name="policyd2"
-rcvar=`set_rcvar`
+rcvar=policyd2_enable
 
 command="%%LOCALBASE%%/bin/cbpolicyd"
 command_interpreter="/usr/bin/perl"
diff --git a/mail/pop-before-smtp/files/pop-before-smtp.sh.in b/mail/pop-before-smtp/files/pop-before-smtp.sh.in
index b81f25a95fb1..10f262c65dd5 100644
--- a/mail/pop-before-smtp/files/pop-before-smtp.sh.in
+++ b/mail/pop-before-smtp/files/pop-before-smtp.sh.in
@@ -37,8 +37,9 @@
 
 # sh interprets dash chars as the numeric minus operator...
 name="pop_before_smtp"
+rcvar=pop_before_smtp_enable
+
 filename="pop-before-smtp"
-rcvar=`set_rcvar`
 
 load_rc_config $name
 
diff --git a/mail/pop3proxy/files/pop3proxyd.in b/mail/pop3proxy/files/pop3proxyd.in
index 7d13b9ea67b2..65d3e3533fa0 100644
--- a/mail/pop3proxy/files/pop3proxyd.in
+++ b/mail/pop3proxy/files/pop3proxyd.in
@@ -17,7 +17,7 @@
 . /etc/rc.subr
 
 name=pop3proxyd
-rcvar=`set_rcvar`
+rcvar=pop3proxyd_enable
 
 command=%%PREFIX%%/sbin/pop3proxyd
 
diff --git a/mail/popa3d/files/popa3d.in b/mail/popa3d/files/popa3d.in
index 0bb18f080a08..862b5dc68d2f 100644
--- a/mail/popa3d/files/popa3d.in
+++ b/mail/popa3d/files/popa3d.in
@@ -6,7 +6,7 @@
 . /etc/rc.subr
 
 name="popa3d"
-rcvar=`set_rcvar`
+rcvar=popa3d_enable
 
 command="%%PREFIX%%/libexec/${name}"
 command_args="-D"
diff --git a/mail/popular/files/0ringd.sh.in b/mail/popular/files/0ringd.sh.in
index 1d0947b9dfda..9ee445bd60b3 100644
--- a/mail/popular/files/0ringd.sh.in
+++ b/mail/popular/files/0ringd.sh.in
@@ -15,7 +15,7 @@
 . /etc/rc.subr
 
 name="ringd"
-rcvar=`set_rcvar`
+rcvar=ringd_enable
 
 load_rc_config $name
 
diff --git a/mail/popular/files/pcheckd.sh.in b/mail/popular/files/pcheckd.sh.in
index 1aac331b4056..ab860cc4d5a2 100644
--- a/mail/popular/files/pcheckd.sh.in
+++ b/mail/popular/files/pcheckd.sh.in
@@ -15,7 +15,7 @@
 . /etc/rc.subr
 
 name="pcheckd"
-rcvar=`set_rcvar`
+rcvar=pcheckd_enable
 
 load_rc_config $name
 
diff --git a/mail/popular/files/pproxy.sh.in b/mail/popular/files/pproxy.sh.in
index f1039e6062eb..b401625a85e7 100644
--- a/mail/popular/files/pproxy.sh.in
+++ b/mail/popular/files/pproxy.sh.in
@@ -15,7 +15,7 @@
 . /etc/rc.subr
 
 name="pproxy"
-rcvar=`set_rcvar`
+rcvar=pproxy_enable
 
 load_rc_config $name
 
diff --git a/mail/popular/files/pserv.sh.in b/mail/popular/files/pserv.sh.in
index b1984e7092ee..e5ef1c117cd7 100644
--- a/mail/popular/files/pserv.sh.in
+++ b/mail/popular/files/pserv.sh.in
@@ -15,7 +15,7 @@
 . /etc/rc.subr
 
 name="pserv"
-rcvar=`set_rcvar`
+rcvar=pserv_enable
 
 load_rc_config $name
 
diff --git a/mail/postfix-current/files/postfix.sh.in b/mail/postfix-current/files/postfix.sh.in
index 849e6c1f9bd6..216a3a5b21f0 100644
--- a/mail/postfix-current/files/postfix.sh.in
+++ b/mail/postfix-current/files/postfix.sh.in
@@ -21,7 +21,7 @@
 . /etc/rc.subr
 
 name="postfix"
-rcvar=${name}_enable
+rcvar=postfix_enable
 
 load_rc_config $name
 
diff --git a/mail/postfix-policyd-sf/files/policyd.sh.in b/mail/postfix-policyd-sf/files/policyd.sh.in
index cd3b346732f3..2a2648ef2335 100644
--- a/mail/postfix-policyd-sf/files/policyd.sh.in
+++ b/mail/postfix-policyd-sf/files/policyd.sh.in
@@ -17,7 +17,7 @@
 . /etc/rc.subr
 
 name=postfix_policyd_sf
-rcvar=`set_rcvar`
+rcvar=postfix_policyd_sf_enable
 
 command=%%PREFIX%%/sbin/%%REALNAME%%
 
diff --git a/mail/postfix-postfwd/files/postfwd.in b/mail/postfix-postfwd/files/postfwd.in
index 19d91864bda5..a2b57bd7c622 100644
--- a/mail/postfix-postfwd/files/postfwd.in
+++ b/mail/postfix-postfwd/files/postfwd.in
@@ -17,7 +17,7 @@
 . /etc/rc.subr
 
 name=postfwd
-rcvar=${name}_enable
+rcvar=postfwd_enable
 
 command=%%PREFIX%%/bin/${name}
 required_files=%%PREFIX%%/etc/${name}.conf
diff --git a/mail/postfix/files/postfix.sh.in b/mail/postfix/files/postfix.sh.in
index 849e6c1f9bd6..216a3a5b21f0 100644
--- a/mail/postfix/files/postfix.sh.in
+++ b/mail/postfix/files/postfix.sh.in
@@ -21,7 +21,7 @@
 . /etc/rc.subr
 
 name="postfix"
-rcvar=${name}_enable
+rcvar=postfix_enable
 
 load_rc_config $name
 
diff --git a/mail/postfix25/files/postfix.sh.in b/mail/postfix25/files/postfix.sh.in
index 44aa542f07a8..74956f6a02d1 100644
--- a/mail/postfix25/files/postfix.sh.in
+++ b/mail/postfix25/files/postfix.sh.in
@@ -21,7 +21,7 @@
 . /etc/rc.subr
 
 name="postfix"
-rcvar=${name}_enable
+rcvar=postfix_enable
 
 load_rc_config $name
 
diff --git a/mail/postfix26/files/postfix.sh.in b/mail/postfix26/files/postfix.sh.in
index 849e6c1f9bd6..216a3a5b21f0 100644
--- a/mail/postfix26/files/postfix.sh.in
+++ b/mail/postfix26/files/postfix.sh.in
@@ -21,7 +21,7 @@
 . /etc/rc.subr
 
 name="postfix"
-rcvar=${name}_enable
+rcvar=postfix_enable
 
 load_rc_config $name
 
diff --git a/mail/postfix27/files/postfix.sh.in b/mail/postfix27/files/postfix.sh.in
index 849e6c1f9bd6..216a3a5b21f0 100644
--- a/mail/postfix27/files/postfix.sh.in
+++ b/mail/postfix27/files/postfix.sh.in
@@ -21,7 +21,7 @@
 . /etc/rc.subr
 
 name="postfix"
-rcvar=${name}_enable
+rcvar=postfix_enable
 
 load_rc_config $name
 
diff --git a/mail/postfix28/files/postfix.sh.in b/mail/postfix28/files/postfix.sh.in
index 849e6c1f9bd6..216a3a5b21f0 100644
--- a/mail/postfix28/files/postfix.sh.in
+++ b/mail/postfix28/files/postfix.sh.in
@@ -21,7 +21,7 @@
 . /etc/rc.subr
 
 name="postfix"
-rcvar=${name}_enable
+rcvar=postfix_enable
 
 load_rc_config $name
 
diff --git a/mail/postgrey/files/postgrey.in b/mail/postgrey/files/postgrey.in
index c8b25560a99e..55e9e3d2dbcb 100644
--- a/mail/postgrey/files/postgrey.in
+++ b/mail/postgrey/files/postgrey.in
@@ -18,7 +18,7 @@
 . /etc/rc.subr
 
 name=postgrey
-rcvar=`set_rcvar`
+rcvar=postgrey_enable
 
 command=%%PREFIX%%/sbin/postgrey
 required_dirs=/var/db/postgrey
diff --git a/mail/postpals/files/postpals-taillog.in b/mail/postpals/files/postpals-taillog.in
index 86bc4153dcae..f8a95a45da0e 100644
--- a/mail/postpals/files/postpals-taillog.in
+++ b/mail/postpals/files/postpals-taillog.in
@@ -17,7 +17,7 @@
 . /etc/rc.subr
 
 name=postpals_taillog
-rcvar=`set_rcvar`
+rcvar=postpals_taillog_enable
 
 command=%%PREFIX%%/sbin/postpals-taillog
 pidfile=/var/run/${name}.pid
diff --git a/mail/postpals/files/postpals.in b/mail/postpals/files/postpals.in
index 6f6c65c41cc7..76706b6b9879 100644
--- a/mail/postpals/files/postpals.in
+++ b/mail/postpals/files/postpals.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name=postpals
-rcvar=`set_rcvar`
+rcvar=postpals_enable
 
 command=%%PREFIX%%/sbin/${name}
 pidfile="/var/run/${name}.pid"
diff --git a/mail/prayer/files/prayer.in b/mail/prayer/files/prayer.in
index c2aea58ac999..c6daa2f6ab14 100644
--- a/mail/prayer/files/prayer.in
+++ b/mail/prayer/files/prayer.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name="prayer"
-rcvar=${name}_enable
+rcvar=prayer_enable
 
 command=%%PREFIX%%/sbin/${name}
 pidfile="/var/spool/prayer/pid/${name}.pid"
diff --git a/mail/proxsmtp/files/proxsmtpd.sh.in b/mail/proxsmtp/files/proxsmtpd.sh.in
index c49bbe11d433..b2f97d3770f1 100644
--- a/mail/proxsmtp/files/proxsmtpd.sh.in
+++ b/mail/proxsmtp/files/proxsmtpd.sh.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name="proxsmtpd"
-rcvar=${name}_enable
+rcvar=proxsmtpd_enable
 
 load_rc_config ${name}
 
diff --git a/mail/py-apolicy/files/apolicyd.in b/mail/py-apolicy/files/apolicyd.in
index 377412b363f7..10c373acdc24 100644
--- a/mail/py-apolicy/files/apolicyd.in
+++ b/mail/py-apolicy/files/apolicyd.in
@@ -18,7 +18,7 @@
 . /etc/rc.subr
 
 name="apolicyd"
-rcvar=`set_rcvar`
+rcvar=apolicyd_enable
 
 command="%%PREFIX%%/bin/twistd"
 pidfile="/var/run/apolicyd.pid"
diff --git a/mail/py-ppolicy/files/ppolicyd.sh.in b/mail/py-ppolicy/files/ppolicyd.sh.in
index 28e66748fbda..f4846ad02958 100644
--- a/mail/py-ppolicy/files/ppolicyd.sh.in
+++ b/mail/py-ppolicy/files/ppolicyd.sh.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name="ppolicyd"
-rcvar=`set_rcvar`
+rcvar=ppolicyd_enable
 
 command="%%LOCALBASE%%/bin/twistd"
 pidfile="/var/run/ppolicyd.pid"
diff --git a/mail/py-spambayes/files/pyspamd.in b/mail/py-spambayes/files/pyspamd.in
index 0ea683885576..3336584074f4 100644
--- a/mail/py-spambayes/files/pyspamd.in
+++ b/mail/py-spambayes/files/pyspamd.in
@@ -18,7 +18,7 @@
 . /etc/rc.subr
 
 name="pyspamd"
-rcvar=`set_rcvar`
+rcvar=pyspamd_enable
 
 load_rc_config $name
 
diff --git a/mail/pysieved/files/pysieved.in b/mail/pysieved/files/pysieved.in
index 624f8e64b05d..d1783441058e 100644
--- a/mail/pysieved/files/pysieved.in
+++ b/mail/pysieved/files/pysieved.in
@@ -13,7 +13,7 @@
 . /etc/rc.subr
 
 name="%%PORTNAME%%"
-rcvar=`set_rcvar`
+rcvar=%%PORTNAME%%_enable
 
 load_rc_config $name
 
diff --git a/mail/qmail/files/qmail-smtpd.rcNG b/mail/qmail/files/qmail-smtpd.rcNG
index 4497bf4215c6..7eb43e3b9cbc 100644
--- a/mail/qmail/files/qmail-smtpd.rcNG
+++ b/mail/qmail/files/qmail-smtpd.rcNG
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name="qmailsmtpd"
-rcvar=`set_rcvar`
+rcvar=qmailsmtpd_enable
 load_rc_config $name
 
 : ${qmailsmtpd_tcpserver="/usr/local/bin/tcpserver"}
diff --git a/mail/qpopper/qpopper.in b/mail/qpopper/qpopper.in
index 896c7852889f..ee7314787bfa 100644
--- a/mail/qpopper/qpopper.in
+++ b/mail/qpopper/qpopper.in
@@ -18,7 +18,7 @@ qpopper_flags=${qpopper_flags-""}
 . /etc/rc.subr
 
 name=qpopper
-rcvar=`set_rcvar`
+rcvar=qpopper_enable
 command=%%PREFIX%%/libexec/qpopper
 command_args="${qpopper_flags}"
 
diff --git a/mail/quickml/files/quickml.in b/mail/quickml/files/quickml.in
index cc91df66db13..5278224cc5a7 100644
--- a/mail/quickml/files/quickml.in
+++ b/mail/quickml/files/quickml.in
@@ -15,7 +15,7 @@
 . /etc/rc.subr
 
 name="quickml"
-rcvar=`set_rcvar`
+rcvar=quickml_enable
 
 command="%%PREFIX%%/sbin/${name}"
 command_interpreter="%%RUBY%%"
diff --git a/mail/rabl_server/files/rabl_server.sh.in b/mail/rabl_server/files/rabl_server.sh.in
index da0db9fa614c..19efce4e5f21 100644
--- a/mail/rabl_server/files/rabl_server.sh.in
+++ b/mail/rabl_server/files/rabl_server.sh.in
@@ -20,7 +20,7 @@
 . /etc/rc.subr
 
 name=rabl_server
-rcvar=`set_rcvar`
+rcvar=rabl_server_enable
 
 command=%%PREFIX%%/bin/${name}
 required_files=%%PREFIX%%/etc/${name}.conf
diff --git a/mail/rbl-milter/files/rblmilter.sh.in b/mail/rbl-milter/files/rblmilter.sh.in
index d5918b855cd4..14180e95c5eb 100644
--- a/mail/rbl-milter/files/rblmilter.sh.in
+++ b/mail/rbl-milter/files/rblmilter.sh.in
@@ -24,7 +24,7 @@ rblmilter_flags=${rblmilter_flags:-"-l -r -d relays.ordb.org"} # Flags to rblmil
 . /etc/rc.subr
 
 name="rblmilter"
-rcvar=`set_rcvar`
+rcvar=rblmilter_enable
 command="%%PREFIX%%/sbin/rbl-milter"
 start_precmd="rblmilter_prestart"
 stop_postcmd="rblmilter_poststop"
diff --git a/mail/rspamd/files/rspamd.in b/mail/rspamd/files/rspamd.in
index f90b47773e26..84b21ea65d23 100644
--- a/mail/rspamd/files/rspamd.in
+++ b/mail/rspamd/files/rspamd.in
@@ -20,7 +20,7 @@
 . /etc/rc.subr
 
 name=rspamd
-rcvar=`set_rcvar`
+rcvar=rspamd_enable
 command=%%PREFIX%%/bin/rspamd
 restart_precmd="rspamd_checkconfig"
 reload_precmd="rspamd_checkconfig"
diff --git a/mail/rspamd/files/rspamd_redirector.in b/mail/rspamd/files/rspamd_redirector.in
index fa750b0ad590..1b5c7456ed01 100644
--- a/mail/rspamd/files/rspamd_redirector.in
+++ b/mail/rspamd/files/rspamd_redirector.in
@@ -15,7 +15,7 @@
 . /etc/rc.subr
 
 name="rspamd_redirector"
-rcvar=`set_rcvar`
+rcvar=rspamd_redirector_enable
 command="%%PREFIX%%/bin/rspamd-redirector"
 
 load_rc_config $name
diff --git a/mail/sastatd/files/sastatd.in b/mail/sastatd/files/sastatd.in
index d3b1c674ba87..0042ad041d4b 100644
--- a/mail/sastatd/files/sastatd.in
+++ b/mail/sastatd/files/sastatd.in
@@ -17,7 +17,7 @@
 
 
 name="sastatd"
-rcvar=`set_rcvar`
+rcvar=sastatd_enable
 
 load_rc_config "$name"
 : ${sastatd_enable="NO"}
diff --git a/mail/scam-backscatter/files/scam-backscatter.in b/mail/scam-backscatter/files/scam-backscatter.in
index 001b5524a470..f23e6e1c771d 100644
--- a/mail/scam-backscatter/files/scam-backscatter.in
+++ b/mail/scam-backscatter/files/scam-backscatter.in
@@ -21,7 +21,7 @@
 . /etc/rc.subr
 
 name="scambackscatter"
-rcvar=`set_rcvar`
+rcvar=scambackscatter_enable
 command="%%PREFIX%%/libexec/scam-back"
 start_precmd="${name}_prestart"
 
diff --git a/mail/sid-milter/files/milter-sid.sh.in b/mail/sid-milter/files/milter-sid.sh.in
index e8dcda6fb770..22f918196b9e 100644
--- a/mail/sid-milter/files/milter-sid.sh.in
+++ b/mail/sid-milter/files/milter-sid.sh.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name="miltersid"
-rcvar=`set_rcvar`
+rcvar=miltersid_enable
 load_rc_config $name
 
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
diff --git a/mail/smfsav/files/smfsav.in b/mail/smfsav/files/smfsav.in
index 10c60eb586e6..8ebddd4e9e90 100644
--- a/mail/smfsav/files/smfsav.in
+++ b/mail/smfsav/files/smfsav.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name="smfsav"
-rcvar=`set_rcvar`
+rcvar=smfsav_enable
 command="%%PREFIX%%/sbin/smfsav"
 
 load_rc_config ${name}
diff --git a/mail/smtpd/files/smtpd.in b/mail/smtpd/files/smtpd.in
index b48e54eccce4..6754c17a5c90 100644
--- a/mail/smtpd/files/smtpd.in
+++ b/mail/smtpd/files/smtpd.in
@@ -14,7 +14,7 @@
 . /etc/rc.subr
 
 name="smtpd"
-rcvar=${name}_enable
+rcvar=smtpd_enable
 
 command=%%PREFIX%%/sbin/smtpfwdd
 
diff --git a/mail/smtptrapd/files/smtptrapd.sh.in b/mail/smtptrapd/files/smtptrapd.sh.in
index ade1b567a0ac..fc22353cdc80 100644
--- a/mail/smtptrapd/files/smtptrapd.sh.in
+++ b/mail/smtptrapd/files/smtptrapd.sh.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=smtptrapd
-rcvar=`set_rcvar`
+rcvar=smtptrapd_enable
 
 command=%%PREFIX%%/bin/smtptrapd
 
diff --git a/mail/spamass-milter/files/spamass-milter.in b/mail/spamass-milter/files/spamass-milter.in
index 6defd6c48904..67ffe563e3e5 100644
--- a/mail/spamass-milter/files/spamass-milter.in
+++ b/mail/spamass-milter/files/spamass-milter.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=spamass_milter
-rcvar=`set_rcvar`
+rcvar=spamass_milter_enable
 
 command=%%PREFIX%%/sbin/spamass-milter
 required_dirs=%%PREFIX%%/share/spamassassin
diff --git a/mail/spamd/files/obspamd.in b/mail/spamd/files/obspamd.in
index 8b53f4f5370b..9dac8700056c 100644
--- a/mail/spamd/files/obspamd.in
+++ b/mail/spamd/files/obspamd.in
@@ -23,7 +23,7 @@ obspamd_enable=${obspamd_enable:-"NO"}
 . /etc/rc.subr
 
 name="obspamd"
-rcvar=`set_rcvar`
+rcvar=obspamd_enable
 
 command="%%PREFIX%%/libexec/%%SPAMDBIN%%"
 start_precmd="obspamd_precmd"
diff --git a/mail/spamd/files/obspamlogd.in b/mail/spamd/files/obspamlogd.in
index f2942c9835f0..7182e92ecb24 100644
--- a/mail/spamd/files/obspamlogd.in
+++ b/mail/spamd/files/obspamlogd.in
@@ -24,7 +24,7 @@ obspamlogd_enable=${obspamlogd_enable:-"NO"}
 . /etc/rc.subr
 
 name="obspamlogd"
-rcvar=`set_rcvar`
+rcvar=obspamlogd_enable
 
 command="%%PREFIX%%/libexec/spamlogd"
 start_precmd="obspamlogd_precmd"
diff --git a/mail/spamilter/files/spamilter.sh.in b/mail/spamilter/files/spamilter.sh.in
index 8ef4f1406e5e..71a4f99c5f1a 100644
--- a/mail/spamilter/files/spamilter.sh.in
+++ b/mail/spamilter/files/spamilter.sh.in
@@ -24,7 +24,7 @@ spamilter_enable=${spamilter_enable:-"NO"}      # Enable spamilter-milter
 . /etc/rc.subr
 
 name="spamilter"
-rcvar=`set_rcvar`
+rcvar=spamilter_enable
 command="%%PREFIX%%/bin/spamilter"
 pidfile="/tmp/Spamilter.pid"
 required_files="%%PREFIX%%/etc/spamilter.rc"
diff --git a/mail/spampd/files/spampd.in b/mail/spampd/files/spampd.in
index 4b3127ba52f8..ce60c2c7e0c6 100644
--- a/mail/spampd/files/spampd.in
+++ b/mail/spampd/files/spampd.in
@@ -14,7 +14,7 @@
 . /etc/rc.subr
 
 name="spampd"
-rcvar=`set_rcvar`
+rcvar=spampd_enable
 
 : ${spampd_enable="NO"}
 : ${spampd_pidfile="/var/run/spamd/spampd.pid"}
diff --git a/mail/spmfilter/files/spmfilter.in b/mail/spmfilter/files/spmfilter.in
index 2c2322981e92..f280bb715129 100644
--- a/mail/spmfilter/files/spmfilter.in
+++ b/mail/spmfilter/files/spmfilter.in
@@ -18,7 +18,7 @@
 . /etc/rc.subr
 
 name=spmfilter
-rcvar=`set_rcvar`
+rcvar=spmfilter_enable
 
 command=%%PREFIX%%/sbin/spmfilter
 
diff --git a/mail/sqlgrey/files/sqlgrey.in b/mail/sqlgrey/files/sqlgrey.in
index d44fc2ea558b..bb2652bddb7f 100644
--- a/mail/sqlgrey/files/sqlgrey.in
+++ b/mail/sqlgrey/files/sqlgrey.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name=sqlgrey
-rcvar=`set_rcvar`
+rcvar=sqlgrey_enable
 
 command=%%PREFIX%%/sbin/sqlgrey
 extra_commands=reload
diff --git a/mail/sqwebmail/files/sqwebmail-sqwebmaild.in b/mail/sqwebmail/files/sqwebmail-sqwebmaild.in
index f1490954b700..1dc0ad6caeaa 100644
--- a/mail/sqwebmail/files/sqwebmail-sqwebmaild.in
+++ b/mail/sqwebmail/files/sqwebmail-sqwebmaild.in
@@ -18,7 +18,7 @@ sqwebmaild_enable=${sqwebmaild_enable-"NO"}
 . /etc/rc.subr
 
 name="sqwebmaild"
-rcvar=`set_rcvar`
+rcvar=sqwebmaild_enable
 command="%%PREFIX%%/libexec/sqwebmaild.rc"
 
 start_cmd="sqwebmaild_cmd start"
diff --git a/mail/synonym/files/synonym.sh.in b/mail/synonym/files/synonym.sh.in
index 4c190964ad26..298b7eea3b47 100644
--- a/mail/synonym/files/synonym.sh.in
+++ b/mail/synonym/files/synonym.sh.in
@@ -21,7 +21,7 @@ synonym_conffile=${synonym_conffile-"%%PREFIX%%/etc/synonym.conf"}
 . /etc/rc.subr
 
 name=synonym
-rcvar=`set_rcvar`
+rcvar=synonym_enable
 command=%%PREFIX%%/sbin/${name}
 
 load_rc_config ${name}
diff --git a/mail/tpop3d/files/tpop3d.sh.in b/mail/tpop3d/files/tpop3d.sh.in
index 64c74ff8aeeb..090d50549457 100644
--- a/mail/tpop3d/files/tpop3d.sh.in
+++ b/mail/tpop3d/files/tpop3d.sh.in
@@ -15,7 +15,7 @@
 . /etc/rc.subr
 
 name="tpop3d"
-rcvar=`set_rcvar`
+rcvar=tpop3d_enable
 
 
 stop_postcmd=stop_postcmd
diff --git a/mail/up-imapproxy/files/imapproxyd.sh.in b/mail/up-imapproxy/files/imapproxyd.sh.in
index c9bebba1ced5..ffbeb7e6d032 100644
--- a/mail/up-imapproxy/files/imapproxyd.sh.in
+++ b/mail/up-imapproxy/files/imapproxyd.sh.in
@@ -17,7 +17,7 @@
 . /etc/rc.subr
 
 name=imapproxyd
-rcvar=${name}_enable
+rcvar=imapproxyd_enable
 
 load_rc_config $name
 
diff --git a/mail/vbsfilter/files/vbsfilter.sh.in b/mail/vbsfilter/files/vbsfilter.sh.in
index 11302be8bd82..144b009abddc 100644
--- a/mail/vbsfilter/files/vbsfilter.sh.in
+++ b/mail/vbsfilter/files/vbsfilter.sh.in
@@ -25,7 +25,7 @@ vbsfilter_socket=${vbsfilter_socket:-"/var/run/vbsfilter"} # Path to socket
 . /etc/rc.subr
 
 name="vbsfilter"
-rcvar=`set_rcvar`
+rcvar=vbsfilter_enable
 command="%%PREFIX%%/libexec/vbsfilter"
 procname="${command}"
 start_precmd="vbsfilter_prestart"
diff --git a/mail/whoson/files/whoson.sh.in b/mail/whoson/files/whoson.sh.in
index fada0bff97c2..8f28b3d692a0 100644
--- a/mail/whoson/files/whoson.sh.in
+++ b/mail/whoson/files/whoson.sh.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name=whosond
-rcvar=`set_rcvar`
+rcvar=whosond_enable
 
 command=%%PREFIX%%/sbin/${name}
 required_files=%%PREFIX%%/etc/whoson.conf
diff --git a/mail/zmailer/files/zmailer.sh.in b/mail/zmailer/files/zmailer.sh.in
index 9a0f7848a591..eb3968a4ba0a 100644
--- a/mail/zmailer/files/zmailer.sh.in
+++ b/mail/zmailer/files/zmailer.sh.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name=zmailer
-rcvar=`set_rcvar`
+rcvar=zmailer_enable
 
 command=%%PREFIX%%/sbin/zmailer
 required_files=%%PREFIX%%/etc/zmailer/mail.conf