In the rc.d scripts, change assignments to rcvar to use the

literal name_enable wherever possible, and ${name}_enable
when it's not, to prepare for the demise of set_rcvar().

In cases where I had to hand-edit unusual instances also
modify formatting slightly to be more uniform (and in
some cases, correct). This includes adding some $FreeBSD$
tags, and most importantly moving rcvar= to right after
name= so it's clear that one is derived from the other.

16 files changed, 16 insertions, 16 deletions

diff --git a/ftp/atftp/files/atftpd.in b/ftp/atftp/files/atftpd.in
index 505536f0851b..fafc3f0f1044 100644
--- a/ftp/atftp/files/atftpd.in
+++ b/ftp/atftp/files/atftpd.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name="atftpd"
-rcvar=`set_rcvar`
+rcvar=atftpd_enable
 
 command=%%PREFIX%%/sbin/${name}
 pidfile=/var/run/${name}.pid
diff --git a/ftp/bbftp/files/bbftpd.in b/ftp/bbftp/files/bbftpd.in
index 0c02f39fd59f..e4c6cfaad521 100644
--- a/ftp/bbftp/files/bbftpd.in
+++ b/ftp/bbftp/files/bbftpd.in
@@ -13,7 +13,7 @@
 . /etc/rc.subr
 
 name="bbftpd"
-rcvar=${name}_enable
+rcvar=bbftpd_enable
 
 command=%%PREFIX%%/bin/${name}
 pidfile=/var/run/${name}.pid
diff --git a/ftp/bsdftpd-ssl/files/bsdftpd-ssl.in b/ftp/bsdftpd-ssl/files/bsdftpd-ssl.in
index dd04d4e87631..cd3415997585 100644
--- a/ftp/bsdftpd-ssl/files/bsdftpd-ssl.in
+++ b/ftp/bsdftpd-ssl/files/bsdftpd-ssl.in
@@ -17,7 +17,7 @@
 . /etc/rc.subr
 
 name="bsdftpd_ssl"
-rcvar=`set_rcvar`
+rcvar=bsdftpd_ssl_enable
 pidfile="/var/run/ftpd.pid"
 command="%%PREFIX%%/libexec/ftpd"
 command_args="-D -p ${pidfile}"
diff --git a/ftp/frox/files/frox.sh.in b/ftp/frox/files/frox.sh.in
index d87392621742..4b584b4167e3 100644
--- a/ftp/frox/files/frox.sh.in
+++ b/ftp/frox/files/frox.sh.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=frox
-rcvar=`set_rcvar`
+rcvar=frox_enable
 
 command=%%PREFIX%%/sbin/frox
 pidfile=/var/run/frox.pid
diff --git a/ftp/ftp-proxy/files/ftp-proxy.in b/ftp/ftp-proxy/files/ftp-proxy.in
index ed74e5a0d7ce..af70fa5588fe 100644
--- a/ftp/ftp-proxy/files/ftp-proxy.in
+++ b/ftp/ftp-proxy/files/ftp-proxy.in
@@ -14,7 +14,7 @@
 . /etc/rc.subr
 
 name="ftpproxy"
-rcvar=${name}_enable
+rcvar=ftpproxy_enable
 
 load_rc_config $name
 
diff --git a/ftp/ftpd-tls/files/ftpd-tls.sh.in b/ftp/ftpd-tls/files/ftpd-tls.sh.in
index d6344c01de48..a276e72ca1bc 100644
--- a/ftp/ftpd-tls/files/ftpd-tls.sh.in
+++ b/ftp/ftpd-tls/files/ftpd-tls.sh.in
@@ -22,7 +22,7 @@
 . /etc/rc.subr
 
 name="ftpd_tls"
-rcvar=${name}_enable
+rcvar=ftpd_tls_enable
 
 command=%%PREFIX%%/libexec/ftpd-tls
 command_args="> /dev/null"
diff --git a/ftp/ftpsesame/files/ftpsesame.sh.in b/ftp/ftpsesame/files/ftpsesame.sh.in
index eb8b16dc6fa4..6bcb29a525b3 100644
--- a/ftp/ftpsesame/files/ftpsesame.sh.in
+++ b/ftp/ftpsesame/files/ftpsesame.sh.in
@@ -20,7 +20,7 @@
 . /etc/rc.subr
 
 name=ftpsesame
-rcvar=`set_rcvar`
+rcvar=ftpsesame_enable
 command=%%PREFIX%%/bin/${name}
 pidfile="/var/run/${name}.pid"
 
diff --git a/ftp/jftpgw/files/jftpgw.in b/ftp/jftpgw/files/jftpgw.in
index 44a5f078ebd8..19993c725a01 100644
--- a/ftp/jftpgw/files/jftpgw.in
+++ b/ftp/jftpgw/files/jftpgw.in
@@ -14,7 +14,7 @@
 . /etc/rc.subr
 
 name=jftpgw
-rcvar=`set_rcvar`
+rcvar=jftpgw_enable
 
 command=%%PREFIX%%/sbin/jftpgw
 jftpgw_config=${jftpgw_config:-"%%PREFIX%%/etc/jftpgw.conf"}
diff --git a/ftp/ncftpd/files/ncftpd.sh.in b/ftp/ncftpd/files/ncftpd.sh.in
index 5c4d30935f32..779a78065c89 100644
--- a/ftp/ncftpd/files/ncftpd.sh.in
+++ b/ftp/ncftpd/files/ncftpd.sh.in
@@ -14,7 +14,7 @@
 . /etc/rc.subr
 
 name="ncftpd"
-rcvar=`set_rcvar`
+rcvar=ncftpd_enable
 
 load_rc_config $name
 : ${ncftpd_enable:="NO"}
diff --git a/ftp/proftpd/files/proftpd.in b/ftp/proftpd/files/proftpd.in
index 1ea8d03fb39f..a4674f2bb49b 100644
--- a/ftp/proftpd/files/proftpd.in
+++ b/ftp/proftpd/files/proftpd.in
@@ -20,7 +20,7 @@
 . /etc/rc.subr
 
 name=proftpd
-rcvar=`set_rcvar`
+rcvar=proftpd_enable
 
 command=%%PREFIX%%/sbin/proftpd
 pidfile=$(grep PidFile /usr/local/etc/proftpd.conf | awk '{print($2)}')
diff --git a/ftp/pure-ftpd/files/pure-ftpd.sh.in b/ftp/pure-ftpd/files/pure-ftpd.sh.in
index 2ef475e040dd..50043abd0d98 100644
--- a/ftp/pure-ftpd/files/pure-ftpd.sh.in
+++ b/ftp/pure-ftpd/files/pure-ftpd.sh.in
@@ -18,7 +18,7 @@
 . /etc/rc.subr
 
 name=pureftpd
-rcvar=`set_rcvar`
+rcvar=pureftpd_enable
 
 load_rc_config $name
 
diff --git a/ftp/smbftpd/files/smbftpd.sh.in b/ftp/smbftpd/files/smbftpd.sh.in
index 4a2ed7d2b2de..c079c4014309 100644
--- a/ftp/smbftpd/files/smbftpd.sh.in
+++ b/ftp/smbftpd/files/smbftpd.sh.in
@@ -14,7 +14,7 @@
 . /etc/rc.subr
 
 name=smbftpd
-rcvar=`set_rcvar`
+rcvar=smbftpd_enable
 
 load_rc_config $name
 
diff --git a/ftp/tftp-hpa/files/tftpd.in b/ftp/tftp-hpa/files/tftpd.in
index ad5fc47f1ec8..318f59f8d402 100644
--- a/ftp/tftp-hpa/files/tftpd.in
+++ b/ftp/tftp-hpa/files/tftpd.in
@@ -14,7 +14,7 @@
 . /etc/rc.subr
 
 name="tftpd"
-rcvar=`set_rcvar`
+rcvar=tftpd_enable
 pidfile=${tftpd_pidfile:-"/var/run/tftpd.pid"}
 command="%%PREFIX%%/libexec/in.tftpd"
 command_args="-P $pidfile -l"
diff --git a/ftp/vsftpd-ext/files/vsftpd.sh.in b/ftp/vsftpd-ext/files/vsftpd.sh.in
index 27d6c9c8255b..1832f6fe9d16 100644
--- a/ftp/vsftpd-ext/files/vsftpd.sh.in
+++ b/ftp/vsftpd-ext/files/vsftpd.sh.in
@@ -23,7 +23,7 @@
 . /etc/rc.subr
 
 name="vsftpd"
-rcvar=`set_rcvar`
+rcvar=vsftpd_enable
 
 load_rc_config "$name"
 : ${vsftpd_enable:="NO"}
diff --git a/ftp/vsftpd/files/vsftpd.sh.in b/ftp/vsftpd/files/vsftpd.sh.in
index 6b26ed855ad1..581eaa5135e0 100644
--- a/ftp/vsftpd/files/vsftpd.sh.in
+++ b/ftp/vsftpd/files/vsftpd.sh.in
@@ -24,7 +24,7 @@
 . /etc/rc.subr
 
 name="vsftpd"
-rcvar=`set_rcvar`
+rcvar=vsftpd_enable
 
 load_rc_config "$name"
 : ${vsftpd_enable:="NO"}
diff --git a/ftp/wzdftpd/files/wzdftpd.sh.in b/ftp/wzdftpd/files/wzdftpd.sh.in
index 77eb75af474b..133f8a3e5b82 100644
--- a/ftp/wzdftpd/files/wzdftpd.sh.in
+++ b/ftp/wzdftpd/files/wzdftpd.sh.in
@@ -18,7 +18,7 @@ wzdftpd_enable=${wzdftpd_enable:-"NO"}		# Enable wzdftpd
 . /etc/rc.subr
 
 name="wzdftpd"
-rcvar=`set_rcvar`
+rcvar=wzdftpd_enable
 command="%%PREFIX%%/sbin/${name}"
 required_files="%%PREFIX%%/etc/wzd.cfg"