48 files changed, 53 insertions, 56 deletions

diff --git a/databases/cassandra/files/cassandra.in b/databases/cassandra/files/cassandra.in
index 4e023d1060ba..0058f2e2228e 100644
--- a/databases/cassandra/files/cassandra.in
+++ b/databases/cassandra/files/cassandra.in
@@ -33,7 +33,7 @@
 . /etc/rc.subr
 
 name="cassandra"
-rcvar=`set_rcvar`
+rcvar=cassandra_enable
 load_rc_config $name
 
 cassandra_enable=${cassandra_enable:-"NO"}
diff --git a/databases/cego/files/cego.in b/databases/cego/files/cego.in
index c4b09cf1c1d3..138079bb9a3b 100644
--- a/databases/cego/files/cego.in
+++ b/databases/cego/files/cego.in
@@ -20,7 +20,7 @@
 . /etc/rc.subr
 
 name="cego"
-rcvar=`set_rcvar`
+rcvar=cego_enable
 
 command="%%PREFIX%%/bin/cego"
 
diff --git a/databases/couchdb/files/couchdb.in b/databases/couchdb/files/couchdb.in
index 0bdf41fd6436..480c03ffbe30 100644
--- a/databases/couchdb/files/couchdb.in
+++ b/databases/couchdb/files/couchdb.in
@@ -23,7 +23,7 @@
 . /etc/rc.subr
 
 name="couchdb"
-rcvar=${name}_enable
+rcvar=couchdb_enable
 
 load_rc_config $name
 
diff --git a/databases/cyrus-imspd/files/imspd.in b/databases/cyrus-imspd/files/imspd.in
index 9644df1388a4..f18ef0f29b3c 100644
--- a/databases/cyrus-imspd/files/imspd.in
+++ b/databases/cyrus-imspd/files/imspd.in
@@ -13,13 +13,13 @@
 . /etc/rc.subr
 
 name=imspd
+rcvar=imspd_enable
 
 load_rc_config ${name}
 : ${imspd_enable="NO"}
 : ${imspd_pidfile=/var/run/imspd.pid}
 : ${imspd_options=/var/imspd/options}
 
-rcvar=`set_rcvar`
 pidfile=${imspd_pidfile}
 start_postcmd="start_postcmd"
 stop_postcmd="stop_postcmd"
diff --git a/databases/dbXML/files/dbxml.in b/databases/dbXML/files/dbxml.in
index 8f5b98abf2a3..4d3d7bec4b43 100644
--- a/databases/dbXML/files/dbxml.in
+++ b/databases/dbXML/files/dbxml.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name="%%PORTNAME%%"
-rcvar=${name}_enable
+rcvar=%%PORTNAME%%_enable
 
 command=%%LOCALBASE%%/bin/dbxmlctl
 pidfile=%%DBXML_HOME%%/config/${name}.pid
diff --git a/databases/drizzle/files/drizzle-server.sh.in b/databases/drizzle/files/drizzle-server.sh.in
index aeeedef74ede..162d3e71b36a 100644
--- a/databases/drizzle/files/drizzle-server.sh.in
+++ b/databases/drizzle/files/drizzle-server.sh.in
@@ -26,7 +26,7 @@
 . /etc/rc.subr
 
 name="drizzle"
-rcvar=`set_rcvar`
+rcvar=drizzle_enable
 
 load_rc_config $name
 
diff --git a/databases/exist/files/eXist.in b/databases/exist/files/eXist.in
index b0cd4330034a..3a4af787b85b 100644
--- a/databases/exist/files/eXist.in
+++ b/databases/exist/files/eXist.in
@@ -17,7 +17,7 @@
 . /etc/rc.subr
 
 name="eXist"
-rcvar=`set_rcvar`
+rcvar=eXist_enable
 
 # Read settings and set default values.
 load_rc_config "$name"
diff --git a/databases/firebird25-server/files/firebird.in b/databases/firebird25-server/files/firebird.in
index ef97db4252d3..a40239132cd4 100644
--- a/databases/firebird25-server/files/firebird.in
+++ b/databases/firebird25-server/files/firebird.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=firebird
-rcvar=`set_rcvar`
+rcvar=firebird_enable
 
 load_rc_config $name
 
diff --git a/databases/flare/files/flared.in b/databases/flare/files/flared.in
index 633e8af21259..dec0678b1567 100644
--- a/databases/flare/files/flared.in
+++ b/databases/flare/files/flared.in
@@ -17,7 +17,7 @@
 . /etc/rc.subr
 
 name=flared
-rcvar=`set_rcvar`
+rcvar=flared_enable
 command=%%PREFIX%%/bin/${name}
 extra_commands="reload"
 start_precmd=${name}_prestart
diff --git a/databases/flare/files/flarei.in b/databases/flare/files/flarei.in
index 2b83a0e13a76..4dc03426e706 100644
--- a/databases/flare/files/flarei.in
+++ b/databases/flare/files/flarei.in
@@ -17,7 +17,7 @@
 . /etc/rc.subr
 
 name=flarei
-rcvar=`set_rcvar`
+rcvar=flarei_enable
 command=%%PREFIX%%/bin/${name}
 extra_commands="reload"
 start_precmd=${name}_prestart
diff --git a/databases/frontbase/files/frontbase.sh.in b/databases/frontbase/files/frontbase.sh.in
index 14b69a30711e..b11a623a3d49 100644
--- a/databases/frontbase/files/frontbase.sh.in
+++ b/databases/frontbase/files/frontbase.sh.in
@@ -11,8 +11,11 @@
 #       /etc/rc.conf.local
 #
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
+
+. /etc/rc.subr
+
 name="frontbase"
+rcvar=frontbase_enable
 
 frontbase_enable="${frontbase_enable-NO}"
 frontbase_user="${frontbase_user-frontbase}"
@@ -20,10 +23,6 @@ frontbase_flags="${frontbase_flags--autostart}"
 frontbase_pidfile="${frontbase_pidfile-/var/run/frontbase.pid}"
 frontbase_logfile="${frontbase_logfile-/var/log/frontbase.log}"
 
-. /etc/rc.subr
-
-rcvar=`set_rcvar`
-
 logfile=${frontbase_logfile}
 runuser=${frontbase_user}
 
diff --git a/databases/kumofs/files/kumofs-gateway.in b/databases/kumofs/files/kumofs-gateway.in
index ce6d170ec489..e82a00ef57be 100644
--- a/databases/kumofs/files/kumofs-gateway.in
+++ b/databases/kumofs/files/kumofs-gateway.in
@@ -17,7 +17,7 @@
 . /etc/rc.subr
 
 name="kumofs_gateway"
-rcvar=`set_rcvar`
+rcvar=kumofs_gateway_enable
 
 load_rc_config $name
 
diff --git a/databases/kumofs/files/kumofs-manager.in b/databases/kumofs/files/kumofs-manager.in
index 36ebaab8937f..6cfcc9e0c63f 100644
--- a/databases/kumofs/files/kumofs-manager.in
+++ b/databases/kumofs/files/kumofs-manager.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name="kumofs_manager"
-rcvar=`set_rcvar`
+rcvar=kumofs_manager_enable
 
 load_rc_config $name
 
diff --git a/databases/kumofs/files/kumofs-server.in b/databases/kumofs/files/kumofs-server.in
index 4437817cd2bc..2f87b63e2091 100644
--- a/databases/kumofs/files/kumofs-server.in
+++ b/databases/kumofs/files/kumofs-server.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name="kumofs_server"
-rcvar=`set_rcvar`
+rcvar=kumofs_server_enable
 
 load_rc_config $name
 
diff --git a/databases/mariadb-server/files/mysql-server.in b/databases/mariadb-server/files/mysql-server.in
index 8f79202fd5a9..b0b6bff94c84 100644
--- a/databases/mariadb-server/files/mysql-server.in
+++ b/databases/mariadb-server/files/mysql-server.in
@@ -22,7 +22,7 @@
 . /etc/rc.subr
 
 name="mysql"
-rcvar="mysql_enable"
+rcvar=mysql_enable
 
 load_rc_config $name
 
diff --git a/databases/memcached/files/memcached.in b/databases/memcached/files/memcached.in
index 91040c81bfe5..41865e505670 100644
--- a/databases/memcached/files/memcached.in
+++ b/databases/memcached/files/memcached.in
@@ -20,7 +20,7 @@
 . /etc/rc.subr
 
 name="memcached"
-rcvar=${name}_enable
+rcvar=memcached_enable
 
 _piddir="/var/run/memcached"
 pidfile="${_piddir}/memcached.pid"
diff --git a/databases/memcached12/files/memcached.in b/databases/memcached12/files/memcached.in
index 77e8c4def515..113a139c5705 100644
--- a/databases/memcached12/files/memcached.in
+++ b/databases/memcached12/files/memcached.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name="memcached"
-rcvar=${name}_enable
+rcvar=memcached_enable
 
 load_rc_config ${name}
 
diff --git a/databases/memcachedb/files/memcachedb.in b/databases/memcachedb/files/memcachedb.in
index ec4331ee24a5..59e8ae1219e9 100644
--- a/databases/memcachedb/files/memcachedb.in
+++ b/databases/memcachedb/files/memcachedb.in
@@ -14,7 +14,7 @@
 . /etc/rc.subr
 
 name="memcachedb"
-rcvar=`set_rcvar`
+rcvar=memcachedb_enable
 
 load_rc_config $name
 
diff --git a/databases/memcacheq/files/memcacheq.in b/databases/memcacheq/files/memcacheq.in
index 74353e745b07..e0384dbfef83 100644
--- a/databases/memcacheq/files/memcacheq.in
+++ b/databases/memcacheq/files/memcacheq.in
@@ -21,7 +21,7 @@
 . /etc/rc.subr
 
 name="memcacheq"
-rcvar=${name}_enable
+rcvar=memcacheq_enable
 sig_stop=KILL
 
 load_rc_config ${name}
diff --git a/databases/mongodb/files/mongod.in b/databases/mongodb/files/mongod.in
index 1aad7017ea9e..c0e8efbf520a 100644
--- a/databases/mongodb/files/mongod.in
+++ b/databases/mongodb/files/mongod.in
@@ -21,7 +21,7 @@
 . /etc/rc.subr
 
 name="mongod"
-rcvar=${name}_enable
+rcvar=mongod_enable
 
 command=%%PREFIX%%/bin/${name}
 
diff --git a/databases/mysql-proxy/files/mysql-proxy.in b/databases/mysql-proxy/files/mysql-proxy.in
index 03cdabf9ef8b..125156ea814f 100644
--- a/databases/mysql-proxy/files/mysql-proxy.in
+++ b/databases/mysql-proxy/files/mysql-proxy.in
@@ -26,7 +26,7 @@
 . /etc/rc.subr
 
 name="mysql_proxy"
-rcvar=`set_rcvar`
+rcvar=mysql_proxy_enable
 
 load_rc_config $name
 
diff --git a/databases/mysql41-server/files/mysql-server.sh.in b/databases/mysql41-server/files/mysql-server.sh.in
index 14842477ea12..7d32b4390512 100644
--- a/databases/mysql41-server/files/mysql-server.sh.in
+++ b/databases/mysql41-server/files/mysql-server.sh.in
@@ -23,7 +23,7 @@
 . /etc/rc.subr
 
 name="mysql"
-rcvar=`set_rcvar`
+rcvar=mysql_enable
 
 load_rc_config $name
 
diff --git a/databases/mysql50-server/files/mysql-server.sh.in b/databases/mysql50-server/files/mysql-server.sh.in
index dbc3b80a5fd4..0f09381c1242 100644
--- a/databases/mysql50-server/files/mysql-server.sh.in
+++ b/databases/mysql50-server/files/mysql-server.sh.in
@@ -27,7 +27,7 @@
 . /etc/rc.subr
 
 name="mysql"
-rcvar=`set_rcvar`
+rcvar=mysql_enable
 
 load_rc_config $name
 
diff --git a/databases/mysql51-server/files/mysql-server.sh.in b/databases/mysql51-server/files/mysql-server.sh.in
index f5aab77782c1..14104b1cbba4 100644
--- a/databases/mysql51-server/files/mysql-server.sh.in
+++ b/databases/mysql51-server/files/mysql-server.sh.in
@@ -25,7 +25,7 @@
 . /etc/rc.subr
 
 name="mysql"
-rcvar=`set_rcvar`
+rcvar=mysql_enable
 
 load_rc_config $name
 
diff --git a/databases/mysql55-server/files/mysql-server.sh.in b/databases/mysql55-server/files/mysql-server.sh.in
index d7a666b6cf6f..fa701dcca45b 100644
--- a/databases/mysql55-server/files/mysql-server.sh.in
+++ b/databases/mysql55-server/files/mysql-server.sh.in
@@ -25,7 +25,7 @@
 . /etc/rc.subr
 
 name="mysql"
-rcvar=`set_rcvar`
+rcvar=mysql_enable
 
 load_rc_config $name
 
diff --git a/databases/percona55-server/files/mysql-server.sh.in b/databases/percona55-server/files/mysql-server.sh.in
index d7a666b6cf6f..fa701dcca45b 100644
--- a/databases/percona55-server/files/mysql-server.sh.in
+++ b/databases/percona55-server/files/mysql-server.sh.in
@@ -25,7 +25,7 @@
 . /etc/rc.subr
 
 name="mysql"
-rcvar=`set_rcvar`
+rcvar=mysql_enable
 
 load_rc_config $name
 
diff --git a/databases/pgbouncer/files/pgbouncer.sh.in b/databases/pgbouncer/files/pgbouncer.sh.in
index 9d4c8f2cffd0..f66379a9e238 100644
--- a/databases/pgbouncer/files/pgbouncer.sh.in
+++ b/databases/pgbouncer/files/pgbouncer.sh.in
@@ -20,7 +20,7 @@
 . /etc/rc.subr
 
 name="pgbouncer"
-rcvar=`set_rcvar`
+rcvar=pgbouncer_enable
 
 load_rc_config "$name"
 : ${pgbouncer_enable="NO"}
diff --git a/databases/pgpool-II-22/files/pgpool.in b/databases/pgpool-II-22/files/pgpool.in
index 6566ef9fa3be..9a9326a042d0 100644
--- a/databases/pgpool-II-22/files/pgpool.in
+++ b/databases/pgpool-II-22/files/pgpool.in
@@ -22,7 +22,7 @@
 . /etc/rc.subr
 
 name=pgpool
-rcvar=${name}_enable
+rcvar=pgpool_enable
 
 load_rc_config $name
 
diff --git a/databases/pgpool-II-23/files/pgpool.in b/databases/pgpool-II-23/files/pgpool.in
index 6566ef9fa3be..9a9326a042d0 100644
--- a/databases/pgpool-II-23/files/pgpool.in
+++ b/databases/pgpool-II-23/files/pgpool.in
@@ -22,7 +22,7 @@
 . /etc/rc.subr
 
 name=pgpool
-rcvar=${name}_enable
+rcvar=pgpool_enable
 
 load_rc_config $name
 
diff --git a/databases/pgpool-II-30/files/pgpool.in b/databases/pgpool-II-30/files/pgpool.in
index 6566ef9fa3be..9a9326a042d0 100644
--- a/databases/pgpool-II-30/files/pgpool.in
+++ b/databases/pgpool-II-30/files/pgpool.in
@@ -22,7 +22,7 @@
 . /etc/rc.subr
 
 name=pgpool
-rcvar=${name}_enable
+rcvar=pgpool_enable
 
 load_rc_config $name
 
diff --git a/databases/pgpool-II/files/pgpool.in b/databases/pgpool-II/files/pgpool.in
index e85863d25528..90ec820b1b99 100644
--- a/databases/pgpool-II/files/pgpool.in
+++ b/databases/pgpool-II/files/pgpool.in
@@ -22,7 +22,7 @@
 . /etc/rc.subr
 
 name=pgpool
-rcvar=${name}_enable
+rcvar=pgpool_enable
 
 load_rc_config $name
 
diff --git a/databases/pgpool/files/pgpool.in b/databases/pgpool/files/pgpool.in
index 0654f230e4a9..5d39db2f108d 100644
--- a/databases/pgpool/files/pgpool.in
+++ b/databases/pgpool/files/pgpool.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=pgpool
-rcvar=${name}_enable
+rcvar=pgpool_enable
 
 load_rc_config $name
 
diff --git a/databases/postgresql-relay/files/postgresql-relay.in b/databases/postgresql-relay/files/postgresql-relay.in
index 15017eef0b10..d3e2e69f6997 100644
--- a/databases/postgresql-relay/files/postgresql-relay.in
+++ b/databases/postgresql-relay/files/postgresql-relay.in
@@ -19,7 +19,7 @@
 . /etc/rc.subr
 
 name=postgresqlrelay
-rcvar=`set_rcvar`
+rcvar=postgresqlrelay_enable
 
 command=%%PREFIX%%/bin/postgresql-relay
 required_files=%%PREFIX%%/etc/postgresql-relay.conf
diff --git a/databases/postgresql82-server/files/postgresql.in b/databases/postgresql82-server/files/postgresql.in
index 405d2efaa4d3..0558e10b3ee5 100644
--- a/databases/postgresql82-server/files/postgresql.in
+++ b/databases/postgresql82-server/files/postgresql.in
@@ -38,7 +38,7 @@ postgresql_class=${postgresql_class:-"default"}
 postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"}
 
 name=postgresql
-rcvar=`set_rcvar`
+rcvar=postgresql_enable
 command_args="-D ${postgresql_data} ${postgresql_flags}"
 extra_commands="reload initdb"
 
diff --git a/databases/postgresql83-server/files/postgresql.in b/databases/postgresql83-server/files/postgresql.in
index 405d2efaa4d3..0558e10b3ee5 100644
--- a/databases/postgresql83-server/files/postgresql.in
+++ b/databases/postgresql83-server/files/postgresql.in
@@ -38,7 +38,7 @@ postgresql_class=${postgresql_class:-"default"}
 postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"}
 
 name=postgresql
-rcvar=`set_rcvar`
+rcvar=postgresql_enable
 command_args="-D ${postgresql_data} ${postgresql_flags}"
 extra_commands="reload initdb"
 
diff --git a/databases/postgresql84-server/files/postgresql.in b/databases/postgresql84-server/files/postgresql.in
index d1e3c763f8da..76a52ba521af 100644
--- a/databases/postgresql84-server/files/postgresql.in
+++ b/databases/postgresql84-server/files/postgresql.in
@@ -38,7 +38,7 @@ postgresql_class=${postgresql_class:-"default"}
 postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"}
 
 name=postgresql
-rcvar=`set_rcvar`
+rcvar=postgresql_enable
 command_args="-D ${postgresql_data} ${postgresql_flags}"
 extra_commands="reload initdb"
 
diff --git a/databases/postgresql90-server/files/postgresql.in b/databases/postgresql90-server/files/postgresql.in
index d1e3c763f8da..76a52ba521af 100644
--- a/databases/postgresql90-server/files/postgresql.in
+++ b/databases/postgresql90-server/files/postgresql.in
@@ -38,7 +38,7 @@ postgresql_class=${postgresql_class:-"default"}
 postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"}
 
 name=postgresql
-rcvar=`set_rcvar`
+rcvar=postgresql_enable
 command_args="-D ${postgresql_data} ${postgresql_flags}"
 extra_commands="reload initdb"
 
diff --git a/databases/postgresql91-server/files/postgresql.in b/databases/postgresql91-server/files/postgresql.in
index 1d89451644ce..ea7e9b99f7ec 100644
--- a/databases/postgresql91-server/files/postgresql.in
+++ b/databases/postgresql91-server/files/postgresql.in
@@ -38,7 +38,7 @@ postgresql_class=${postgresql_class:-"default"}
 postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"}
 
 name=postgresql
-rcvar=`set_rcvar`
+rcvar=postgresql_enable
 command_args="-D ${postgresql_data} ${postgresql_flags}"
 extra_commands="reload initdb"
 
diff --git a/databases/postgresql92-server/files/postgresql.in b/databases/postgresql92-server/files/postgresql.in
index 1d89451644ce..ea7e9b99f7ec 100644
--- a/databases/postgresql92-server/files/postgresql.in
+++ b/databases/postgresql92-server/files/postgresql.in
@@ -38,7 +38,7 @@ postgresql_class=${postgresql_class:-"default"}
 postgresql_initdb_flags=${postgresql_initdb_flags:-"--encoding=utf-8 --lc-collate=C"}
 
 name=postgresql
-rcvar=`set_rcvar`
+rcvar=postgresql_enable
 command_args="-D ${postgresql_data} ${postgresql_flags}"
 extra_commands="reload initdb"
 
diff --git a/databases/redis-scripting/files/redis.sh.in b/databases/redis-scripting/files/redis.sh.in
index 0e232f79f251..70bf3a691bc3 100644
--- a/databases/redis-scripting/files/redis.sh.in
+++ b/databases/redis-scripting/files/redis.sh.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name="redis"
-rcvar=`set_rcvar`
+rcvar=redis_enable
 
 extra_commands="reload"
 
diff --git a/databases/redis/files/redis.sh.in b/databases/redis/files/redis.sh.in
index 0e232f79f251..70bf3a691bc3 100644
--- a/databases/redis/files/redis.sh.in
+++ b/databases/redis/files/redis.sh.in
@@ -16,7 +16,7 @@
 . /etc/rc.subr
 
 name="redis"
-rcvar=`set_rcvar`
+rcvar=redis_enable
 
 extra_commands="reload"
 
diff --git a/databases/rrdtool/files/rrdcached.in b/databases/rrdtool/files/rrdcached.in
index d08dd33364f6..bcd7eda42e8b 100644
--- a/databases/rrdtool/files/rrdcached.in
+++ b/databases/rrdtool/files/rrdcached.in
@@ -17,7 +17,7 @@
 . /etc/rc.subr
 
 name=rrdcached
-rcvar=`set_rcvar`
+rcvar=rrdcached_enable
 
 load_rc_config $name
 
diff --git a/databases/rubygem-rubyrep/files/rubyrep.in b/databases/rubygem-rubyrep/files/rubyrep.in
index 7e55e62960d2..e770745ced26 100644
--- a/databases/rubygem-rubyrep/files/rubyrep.in
+++ b/databases/rubygem-rubyrep/files/rubyrep.in
@@ -137,7 +137,7 @@ rubyrep_init() {
 }
 
 name="rubyrep"
-rcvar=`set_rcvar`
+rcvar=rubyrep_enable
 
 # read configuration and set defaults
 load_rc_config $name
diff --git a/databases/slony1/files/slon.sh.in b/databases/slony1/files/slon.sh.in
index c2f1113f2e49..6a5f1a45d317 100644
--- a/databases/slony1/files/slon.sh.in
+++ b/databases/slony1/files/slon.sh.in
@@ -15,7 +15,7 @@
 . /etc/rc.subr
 
 name="slon"
-rcvar=`set_rcvar`
+rcvar=slon_enable
 
 load_rc_config "$name"
 _pidprefix="/var/run/${name}"
diff --git a/databases/slony1v2/files/slon.sh.in b/databases/slony1v2/files/slon.sh.in
index c2f1113f2e49..6a5f1a45d317 100644
--- a/databases/slony1v2/files/slon.sh.in
+++ b/databases/slony1v2/files/slon.sh.in
@@ -15,7 +15,7 @@
 . /etc/rc.subr
 
 name="slon"
-rcvar=`set_rcvar`
+rcvar=slon_enable
 
 load_rc_config "$name"
 _pidprefix="/var/run/${name}"
diff --git a/databases/tarantool/files/tarantool.in b/databases/tarantool/files/tarantool.in
index 65383b03acbf..d4b9ce8aaa30 100644
--- a/databases/tarantool/files/tarantool.in
+++ b/databases/tarantool/files/tarantool.in
@@ -13,17 +13,15 @@
 . /etc/rc.subr
 
 name="tarantool"
+rcvar=tarantool_enable
+
+load_rc_config "$name"
 
 tarantool_enable=${tarantool_enable:-"NO"}
 tarantool_config=${tarantool_config:-"%%ETCDIR%%/$name.cfg"}
 
-rcvar=`set_rcvar`
-
-load_rc_config "$name"
-
 command="%%PREFIX%%/bin/tarantool_silverbox"
 command_args="--daemonize --config ${tarantool_config}"
 pidfile="/var/run/$name.pid"
 
 run_rc_command "$1"
-
diff --git a/databases/tokyotyrant/files/ttserver.in b/databases/tokyotyrant/files/ttserver.in
index d4ed5d6099dc..ae032346b6b9 100644
--- a/databases/tokyotyrant/files/ttserver.in
+++ b/databases/tokyotyrant/files/ttserver.in
@@ -10,7 +10,7 @@
 . /etc/rc.subr
 
 name="ttserver"
-rcvar=`set_rcvar`
+rcvar=ttserver_enable
 
 : ${ttserver_enable:="NO"}
 
diff --git a/databases/virtuoso/files/virtuoso.sh.in b/databases/virtuoso/files/virtuoso.sh.in
index 47621549aa7e..da1c267b51ee 100644
--- a/databases/virtuoso/files/virtuoso.sh.in
+++ b/databases/virtuoso/files/virtuoso.sh.in
@@ -29,7 +29,7 @@ virtuoso_user=virtuoso
 virtuoso_data=%%PREFIX%%/virtuoso
 
 name=virtuoso
-rcvar=`set_rcvar`
+rcvar=virtuoso_enable
 
 command=%%PREFIX%%/bin/virtuoso-t
 command_args="+configfile ${virtuoso_config} ${virtuoso_flags}"