19 files changed, 19 insertions, 19 deletions

diff --git a/devel/cvsd/files/cvsd.in b/devel/cvsd/files/cvsd.in
index 171cd7edd678..0791f61b9d59 100644
--- a/devel/cvsd/files/cvsd.in
+++ b/devel/cvsd/files/cvsd.in
@@ -8,7 +8,7 @@
 . /etc/rc.subr
 
 name="cvsd"
-rcvar=${name}_enable
+rcvar=cvsd_enable
 
 command="%%PREFIX%%/sbin/$name"
 command_args='-f $cvsd_config'
diff --git a/devel/dbus/files/dbus.in b/devel/dbus/files/dbus.in
index 702a6e1f6b31..6a2b772c8cd9 100644
--- a/devel/dbus/files/dbus.in
+++ b/devel/dbus/files/dbus.in
@@ -17,7 +17,7 @@ dbus_enable=${dbus_enable-${gnome_enable}}
 dbus_flags=${dbus_flags-"--system"}
 
 name=dbus
-rcvar=`set_rcvar`
+rcvar=dbus_enable
 
 command="%%PREFIX%%/bin/dbus-daemon"
 pidfile="/var/run/dbus/${name}.pid"
diff --git a/devel/distcc/files/distccd.sh.in b/devel/distcc/files/distccd.sh.in
index faab44640c3c..c9b9d4ac3b2d 100644
--- a/devel/distcc/files/distccd.sh.in
+++ b/devel/distcc/files/distccd.sh.in
@@ -19,7 +19,7 @@ distccd_flags=${distccd_flags-"-a 127.0.0.0/8 --user distcc --daemon -P %%DISTCC
 . /etc/rc.subr
 
 name=distccd
-rcvar=`set_rcvar`
+rcvar=distccd_enable
 
 command=%%PREFIX%%/sbin/${name}
 # extract pid file from distccd_flags (if any)
diff --git a/devel/gearmand/files/gearmand.sh.in b/devel/gearmand/files/gearmand.sh.in
index 0b311622d9c9..e313c2e435b9 100644
--- a/devel/gearmand/files/gearmand.sh.in
+++ b/devel/gearmand/files/gearmand.sh.in
@@ -9,7 +9,7 @@
 . /etc/rc.subr
 
 name="gearmand"
-rcvar=`set_rcvar`
+rcvar=gearmand_enable
 command="%%PREFIX%%/sbin/gearmand"
 
 load_rc_config "$name"
diff --git a/devel/git/files/git_daemon.in b/devel/git/files/git_daemon.in
index 40ef95a6dc48..778259469202 100644
--- a/devel/git/files/git_daemon.in
+++ b/devel/git/files/git_daemon.in
@@ -15,7 +15,7 @@
 . /etc/rc.subr
 
 name="git_daemon"
-rcvar=`set_rcvar`
+rcvar=git_daemon_enable
 
 load_rc_config $name
 
diff --git a/devel/jenkins/files/jenkins.in b/devel/jenkins/files/jenkins.in
index b0f5b862efd1..3746dc0249d8 100644
--- a/devel/jenkins/files/jenkins.in
+++ b/devel/jenkins/files/jenkins.in
@@ -44,7 +44,7 @@
 . /etc/rc.subr
 
 name="jenkins"
-rcvar=`set_rcvar`
+rcvar=jenkins_enable
 
 load_rc_config "${name}"
 
diff --git a/devel/linux-js/files/jscal.sh.in b/devel/linux-js/files/jscal.sh.in
index 824930889cfe..1553dacf9db7 100644
--- a/devel/linux-js/files/jscal.sh.in
+++ b/devel/linux-js/files/jscal.sh.in
@@ -12,7 +12,7 @@ jscal_state="${jscal_state:-/var/db/jscal-state}"
 . /etc/rc.subr
 
 name="jscal"
-rcvar=`set_rcvar`
+rcvar=jscal_enable
 command="%%PREFIX%%/bin/jscal"
 start_cmd="jscal_start"
 stop_cmd="jscal_stop"
diff --git a/devel/linux-js/files/linux_js.sh.in b/devel/linux-js/files/linux_js.sh.in
index 3d519d1ac692..14b61dc761c2 100644
--- a/devel/linux-js/files/linux_js.sh.in
+++ b/devel/linux-js/files/linux_js.sh.in
@@ -9,7 +9,7 @@ linux_js_enable=${linux_js_enable-"NO"}
 . /etc/rc.subr
 
 name="linux_js"
-rcvar=`set_rcvar`
+rcvar=linux_js_enable
 start_cmd="linux_js_start"
 stop_cmd="linux_js_stop"
 
diff --git a/devel/p4d/files/p4d.sh.in b/devel/p4d/files/p4d.sh.in
index 020ed9801737..8cfbce26fb25 100644
--- a/devel/p4d/files/p4d.sh.in
+++ b/devel/p4d/files/p4d.sh.in
@@ -28,7 +28,7 @@
 . /etc/rc.subr
 
 name="p4d"
-rcvar=`set_rcvar`
+rcvar=p4d_enable
 
 load_rc_config $name
 
diff --git a/devel/p4ftpd/files/p4ftpd.sh.in b/devel/p4ftpd/files/p4ftpd.sh.in
index 064889b7a95a..aa7c0d5b026b 100644
--- a/devel/p4ftpd/files/p4ftpd.sh.in
+++ b/devel/p4ftpd/files/p4ftpd.sh.in
@@ -28,7 +28,7 @@
 . /etc/rc.subr
 
 name="p4ftpd"
-rcvar=`set_rcvar`
+rcvar=p4ftpd_enable
 
 load_rc_config $name
 
diff --git a/devel/p4p/files/p4p.sh.in b/devel/p4p/files/p4p.sh.in
index 83babd4c3a56..aa407e4d089f 100644
--- a/devel/p4p/files/p4p.sh.in
+++ b/devel/p4p/files/p4p.sh.in
@@ -30,7 +30,7 @@
 . /etc/rc.subr
 
 name="p4p"
-rcvar=`set_rcvar`
+rcvar=p4p_enable
 
 load_rc_config $name
 
diff --git a/devel/p4web/files/p4web.sh.in b/devel/p4web/files/p4web.sh.in
index efc69efd79c7..b2c3276bf6ec 100644
--- a/devel/p4web/files/p4web.sh.in
+++ b/devel/p4web/files/p4web.sh.in
@@ -29,7 +29,7 @@
 . /etc/rc.subr
 
 name="p4web"
-rcvar=`set_rcvar`
+rcvar=p4web_enable
 
 load_rc_config $name
 
diff --git a/devel/p5-Gearman-Server/files/gearmand-perl.in b/devel/p5-Gearman-Server/files/gearmand-perl.in
index 14ecec70601a..da5ff24c9cf7 100644
--- a/devel/p5-Gearman-Server/files/gearmand-perl.in
+++ b/devel/p5-Gearman-Server/files/gearmand-perl.in
@@ -13,7 +13,7 @@
 . /etc/rc.subr
 
 name="%%NAME%%"
-rcvar=`set_rcvar`
+rcvar=%%NAME%%_enable
 
 command="%%PREFIX%%/bin/gearmand"
 command_interpreter="%%PREFIX%%/bin/perl"
diff --git a/devel/p5-Java/files/javaserver.sh.in b/devel/p5-Java/files/javaserver.sh.in
index 9f80eb175f11..db4069de4e91 100644
--- a/devel/p5-Java/files/javaserver.sh.in
+++ b/devel/p5-Java/files/javaserver.sh.in
@@ -20,7 +20,7 @@
 . /etc/rc.subr
 
 name="javaserver"
-rcvar=`set_rcvar`
+rcvar=javaserver_enable
 
 load_rc_config $name
 
diff --git a/devel/pcsc-lite/files/pcscd.in b/devel/pcsc-lite/files/pcscd.in
index d8e781b8dcc5..8612fcea08b4 100644
--- a/devel/pcsc-lite/files/pcscd.in
+++ b/devel/pcsc-lite/files/pcscd.in
@@ -12,7 +12,7 @@
 . /etc/rc.subr
 
 name="pcscd"
-rcvar="pcscd_enable"
+rcvar=pcscd_enable
 
 command="%%PREFIX%%/sbin/pcscd"
 
diff --git a/devel/subversion/files/svnserve.in b/devel/subversion/files/svnserve.in
index ca09c07c4b41..29b1df8c838c 100644
--- a/devel/subversion/files/svnserve.in
+++ b/devel/subversion/files/svnserve.in
@@ -32,7 +32,7 @@ svnserve_user=${svnserve_user:-"svn"}
 svnserve_group=${svnserve_group:-"svn"}
 
 name=svnserve
-rcvar=`set_rcvar`
+rcvar=svnserve_enable
 load_rc_config $name
 command=%%PREFIX%%/bin/svnserve%%SVNSERVE_BIN_EXT%%
 command_args="-r ${svnserve_data}"
diff --git a/devel/subversion16/files/svnserve.in b/devel/subversion16/files/svnserve.in
index ca09c07c4b41..29b1df8c838c 100644
--- a/devel/subversion16/files/svnserve.in
+++ b/devel/subversion16/files/svnserve.in
@@ -32,7 +32,7 @@ svnserve_user=${svnserve_user:-"svn"}
 svnserve_group=${svnserve_group:-"svn"}
 
 name=svnserve
-rcvar=`set_rcvar`
+rcvar=svnserve_enable
 load_rc_config $name
 command=%%PREFIX%%/bin/svnserve%%SVNSERVE_BIN_EXT%%
 command_args="-r ${svnserve_data}"
diff --git a/devel/trac-bitten/files/bitten-slave.in b/devel/trac-bitten/files/bitten-slave.in
index c4e5406b6199..1847de99b67a 100644
--- a/devel/trac-bitten/files/bitten-slave.in
+++ b/devel/trac-bitten/files/bitten-slave.in
@@ -12,7 +12,7 @@
 . /etc/rc.subr
 
 name=bitten_slave
-rcvar=`set_rcvar`
+rcvar=bitten_slave_enable
 logfile=/var/log/bitten-slave.log
 conffile=%%ETCDIR%%/bitten-slave.conf
 workdir=/var/lib/bitten-slave
diff --git a/devel/viewvc/files/viewvc.in b/devel/viewvc/files/viewvc.in
index 3e51534a78d4..0e812deeadef 100644
--- a/devel/viewvc/files/viewvc.in
+++ b/devel/viewvc/files/viewvc.in
@@ -30,7 +30,7 @@
 . /etc/rc.subr
 
 name=viewvc
-rcvar=${name}_enable
+rcvar=viewvc_enable
 load_rc_config $name
 
 # Set defaults