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.

3 files changed, 3 insertions, 3 deletions

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