aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2012-01-14 08:57:23 +0000
committerDoug Barton <dougb@FreeBSD.org>2012-01-14 08:57:23 +0000
commit83eb2c37009874672764765ec3bf3b59286c7391 (patch)
treea956ace1a4a1e10876d4c36f12af02bc9df6cb29
parent3c1484f2613137d7eaba8577f6d580c5532ac912 (diff)
downloadports-83eb2c37009874672764765ec3bf3b59286c7391.tar.gz
ports-83eb2c37009874672764765ec3bf3b59286c7391.zip
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.
Notes
Notes: svn path=/head/; revision=289156
-rw-r--r--astro/gpsd/files/gpsd.in2
-rw-r--r--astro/gpxloggerd/files/gpxloggerd.in2
-rw-r--r--audio/aureal-kmod/files/aureal.in2
-rw-r--r--audio/autocd/files/autocd.in2
-rw-r--r--audio/darkice/files/darkice.in2
-rw-r--r--audio/ezstream/files/ezstream.in2
-rw-r--r--audio/firefly/files/mt-daapd.in2
-rw-r--r--audio/gnump3d/files/gnump3d.sh.in2
-rw-r--r--audio/icecast2/files/icecast2.sh.in2
-rw-r--r--audio/ices0/files/ices0.sh.in2
-rw-r--r--audio/liquidsoap/files/liquidsoap.sh.in2
-rw-r--r--audio/madfufw/files/maudio.in2
-rw-r--r--audio/mpdas/files/mpdas.in2
-rw-r--r--audio/mpdscribble/files/mpdscribble.in2
-rw-r--r--audio/murmur/files/murmur.in2
-rw-r--r--audio/musicpd/files/musicpd.in2
-rw-r--r--audio/oss/files/oss.in2
-rw-r--r--audio/shairport/files/shairport.in2
-rw-r--r--audio/squeezeboxserver/files/squeezeboxserver.sh.in2
-rw-r--r--audio/teamspeak3-server/files/teamspeak.in2
-rw-r--r--audio/teamspeak_server/files/teamspeak-server.in2
-rw-r--r--audio/umurmur/files/umurmur.in2
-rw-r--r--audio/ventrilo-server/files/ventrilo-server.sh.in4
-rw-r--r--benchmarks/thrulay/files/thrulayd.in2
-rw-r--r--comms/aprsd/files/aprsd2
-rw-r--r--comms/atslog/files/atslogd.in2
-rw-r--r--comms/conserver-com/files/conserver.sh.in2
-rw-r--r--comms/conserver/files/conserver.sh.in2
-rw-r--r--comms/hylafax/files/hylafax.sh.in2
-rw-r--r--comms/lirc/files/lircd.sh.in2
-rw-r--r--comms/qpage/files/qpage.in2
-rw-r--r--comms/ser2net/files/ser2net.in2
-rw-r--r--comms/smstools3/files/smsd.in2
-rw-r--r--comms/soundmodem/files/soundmodem2
-rw-r--r--comms/thebridge/files/tbd.in2
-rw-r--r--comms/tits/files/tits.in2
-rw-r--r--databases/cassandra/files/cassandra.in2
-rw-r--r--databases/cego/files/cego.in2
-rw-r--r--databases/couchdb/files/couchdb.in2
-rw-r--r--databases/cyrus-imspd/files/imspd.in2
-rw-r--r--databases/dbXML/files/dbxml.in2
-rw-r--r--databases/drizzle/files/drizzle-server.sh.in2
-rw-r--r--databases/exist/files/eXist.in2
-rw-r--r--databases/firebird25-server/files/firebird.in2
-rw-r--r--databases/flare/files/flared.in2
-rw-r--r--databases/flare/files/flarei.in2
-rw-r--r--databases/frontbase/files/frontbase.sh.in9
-rw-r--r--databases/kumofs/files/kumofs-gateway.in2
-rw-r--r--databases/kumofs/files/kumofs-manager.in2
-rw-r--r--databases/kumofs/files/kumofs-server.in2
-rw-r--r--databases/mariadb-server/files/mysql-server.in2
-rw-r--r--databases/memcached/files/memcached.in2
-rw-r--r--databases/memcached12/files/memcached.in2
-rw-r--r--databases/memcachedb/files/memcachedb.in2
-rw-r--r--databases/memcacheq/files/memcacheq.in2
-rw-r--r--databases/mongodb/files/mongod.in2
-rw-r--r--databases/mysql-proxy/files/mysql-proxy.in2
-rw-r--r--databases/mysql41-server/files/mysql-server.sh.in2
-rw-r--r--databases/mysql50-server/files/mysql-server.sh.in2
-rw-r--r--databases/mysql51-server/files/mysql-server.sh.in2
-rw-r--r--databases/mysql55-server/files/mysql-server.sh.in2
-rw-r--r--databases/percona55-server/files/mysql-server.sh.in2
-rw-r--r--databases/pgbouncer/files/pgbouncer.sh.in2
-rw-r--r--databases/pgpool-II-22/files/pgpool.in2
-rw-r--r--databases/pgpool-II-23/files/pgpool.in2
-rw-r--r--databases/pgpool-II-30/files/pgpool.in2
-rw-r--r--databases/pgpool-II/files/pgpool.in2
-rw-r--r--databases/pgpool/files/pgpool.in2
-rw-r--r--databases/postgresql-relay/files/postgresql-relay.in2
-rw-r--r--databases/postgresql82-server/files/postgresql.in2
-rw-r--r--databases/postgresql83-server/files/postgresql.in2
-rw-r--r--databases/postgresql84-server/files/postgresql.in2
-rw-r--r--databases/postgresql90-server/files/postgresql.in2
-rw-r--r--databases/postgresql91-server/files/postgresql.in2
-rw-r--r--databases/postgresql92-server/files/postgresql.in2
-rw-r--r--databases/redis-scripting/files/redis.sh.in2
-rw-r--r--databases/redis/files/redis.sh.in2
-rw-r--r--databases/rrdtool/files/rrdcached.in2
-rw-r--r--databases/rubygem-rubyrep/files/rubyrep.in2
-rw-r--r--databases/slony1/files/slon.sh.in2
-rw-r--r--databases/slony1v2/files/slon.sh.in2
-rw-r--r--databases/tarantool/files/tarantool.in8
-rw-r--r--databases/tokyotyrant/files/ttserver.in2
-rw-r--r--databases/virtuoso/files/virtuoso.sh.in2
-rw-r--r--devel/cvsd/files/cvsd.in2
-rw-r--r--devel/dbus/files/dbus.in2
-rw-r--r--devel/distcc/files/distccd.sh.in2
-rw-r--r--devel/gearmand/files/gearmand.sh.in2
-rw-r--r--devel/git/files/git_daemon.in2
-rw-r--r--devel/jenkins/files/jenkins.in2
-rw-r--r--devel/linux-js/files/jscal.sh.in2
-rw-r--r--devel/linux-js/files/linux_js.sh.in2
-rw-r--r--devel/p4d/files/p4d.sh.in2
-rw-r--r--devel/p4ftpd/files/p4ftpd.sh.in2
-rw-r--r--devel/p4p/files/p4p.sh.in2
-rw-r--r--devel/p4web/files/p4web.sh.in2
-rw-r--r--devel/p5-Gearman-Server/files/gearmand-perl.in2
-rw-r--r--devel/p5-Java/files/javaserver.sh.in2
-rw-r--r--devel/pcsc-lite/files/pcscd.in2
-rw-r--r--devel/subversion/files/svnserve.in2
-rw-r--r--devel/subversion16/files/svnserve.in2
-rw-r--r--devel/trac-bitten/files/bitten-slave.in2
-rw-r--r--devel/viewvc/files/viewvc.in2
-rw-r--r--dns/adsuck/files/adsuck.in2
-rw-r--r--dns/bindgraph/files/bindgraph.in2
-rw-r--r--dns/ddclient/files/ddclient.in2
-rw-r--r--dns/dnrd/files/dnrd.sh.in2
-rw-r--r--dns/dns_balance/files/dns_balance.sh.in2
-rw-r--r--dns/dnscheckengine/files/patch-contrib_dnscheck-dispatcher.sh2
-rw-r--r--dns/dnsmasq/files/dnsmasq.sh.in2
-rw-r--r--dns/dnsproxy/files/dnsproxy.in2
-rw-r--r--dns/dnsreflector/files/dnsreflector.in2
-rw-r--r--dns/dualserver/files/dualserver.sh.in2
-rw-r--r--dns/ez-ipupdate/files/ez-ipupdate.sh.in2
-rw-r--r--dns/inadyn/files/inadyn.in2
-rw-r--r--dns/maradns/files/maradns.in2
-rw-r--r--dns/maradns/files/zoneserver.in2
-rw-r--r--dns/mydns-ng/files/mydns.in2
-rw-r--r--dns/mydns/files/mydns.sh.in2
-rw-r--r--dns/noip/files/noip.in2
-rw-r--r--dns/nsd/files/nsd.in2
-rw-r--r--dns/opendd/files/opendd.in2
-rw-r--r--dns/opendnssec/files/opendnssec.in2
-rw-r--r--dns/pdnsd/files/pdnsd.in2
-rw-r--r--dns/powerdns-devel/files/pdns-devel.in2
-rw-r--r--dns/powerdns-recursor/files/pdns-recursor.in2
-rw-r--r--dns/powerdns/files/pdns.in2
-rw-r--r--dns/radns/files/radns.in2
-rw-r--r--dns/rbldnsd/files/rbldnsd.in2
-rw-r--r--dns/totd/files/totd.in2
-rw-r--r--dns/unbound/files/unbound.in2
-rw-r--r--emulators/kqemu-kmod-devel/files/kqemu.in2
-rw-r--r--emulators/kqemu-kmod/files/kqemu.in2
-rw-r--r--emulators/open-vm-tools/files/vmware-guestd.sh.in2
-rw-r--r--emulators/open-vm-tools/files/vmware-kmod.sh.in8
-rw-r--r--emulators/tpm-emulator/files/tpmd.in2
-rw-r--r--emulators/virtualbox-ose-additions/files/vboxguest.in2
-rw-r--r--emulators/virtualbox-ose-additions/files/vboxservice.in2
-rw-r--r--emulators/virtualbox-ose-kmod-legacy/files/vboxnet.in2
-rw-r--r--emulators/virtualbox-ose-kmod/files/vboxnet.in2
-rw-r--r--emulators/virtualbox-ose-legacy/files/vboxheadless.in2
-rw-r--r--emulators/virtualbox-ose-legacy/files/vboxwebsrv.in2
-rw-r--r--emulators/virtualbox-ose/files/vboxheadless.in2
-rw-r--r--emulators/virtualbox-ose/files/vboxwebsrv.in2
-rw-r--r--emulators/vmware-guestd4/files/vmware-guestd.sh.in4
-rw-r--r--emulators/vmware-guestd5/files/vmware-guestd.sh.in6
-rw-r--r--emulators/vmware-guestd6/files/vmware-guestd.sh.in6
-rw-r--r--finance/openerp-server/files/openerpd.in2
-rw-r--r--finance/openerp-web/files/openerp-web.in2
-rw-r--r--finance/openerp/files/openerpd.in2
-rw-r--r--ftp/atftp/files/atftpd.in2
-rw-r--r--ftp/bbftp/files/bbftpd.in2
-rw-r--r--ftp/bsdftpd-ssl/files/bsdftpd-ssl.in2
-rw-r--r--ftp/frox/files/frox.sh.in2
-rw-r--r--ftp/ftp-proxy/files/ftp-proxy.in2
-rw-r--r--ftp/ftpd-tls/files/ftpd-tls.sh.in2
-rw-r--r--ftp/ftpsesame/files/ftpsesame.sh.in2
-rw-r--r--ftp/jftpgw/files/jftpgw.in2
-rw-r--r--ftp/ncftpd/files/ncftpd.sh.in2
-rw-r--r--ftp/proftpd/files/proftpd.in2
-rw-r--r--ftp/pure-ftpd/files/pure-ftpd.sh.in2
-rw-r--r--ftp/smbftpd/files/smbftpd.sh.in2
-rw-r--r--ftp/tftp-hpa/files/tftpd.in2
-rw-r--r--ftp/vsftpd-ext/files/vsftpd.sh.in2
-rw-r--r--ftp/vsftpd/files/vsftpd.sh.in2
-rw-r--r--ftp/wzdftpd/files/wzdftpd.sh.in2
-rw-r--r--games/armagetron/files/armagetronad_dedicated.in2
-rw-r--r--games/kaid/files/kaid.sh2
-rw-r--r--games/ldmud/files/ldmud.in2
-rw-r--r--games/minecraft-server/files/minecraft.in2
-rw-r--r--games/mtaserver/files/mtad.in2
-rw-r--r--games/openttd/files/openttd.in2
-rw-r--r--games/pvpgn/files/bnetd.sh.in2
-rw-r--r--games/quaqut/files/quaqut.in2
-rw-r--r--games/sampsvr/files/sampd.in2
-rw-r--r--games/utserver/files/ucc.in2
-rw-r--r--games/wolfpack/files/wolfpack.in2
-rw-r--r--graphics/geoserver/files/geoserver.in2
-rw-r--r--graphics/sane-backends/files/saned.in2
-rw-r--r--irc/anope/files/anope.in2
-rw-r--r--irc/bitlbee/files/bitlbee.in2
-rw-r--r--irc/bopm/files/bopm.in2
-rw-r--r--irc/charybdis/files/charybdis.in2
-rw-r--r--irc/inspircd/files/inspircd.in2
-rw-r--r--irc/inspircd12/files/inspircd.sh.in2
-rw-r--r--irc/irc/files/ircd.sh.in2
-rw-r--r--irc/irc2dc/files/irc2dc.in2
-rw-r--r--irc/ircd-hybrid/files/ircd-hybrid.sh.in2
-rw-r--r--irc/ircd-ratbox-devel/files/ircd-ratbox.sh.in2
-rw-r--r--irc/ircd-ratbox/files/ircd-ratbox.sh.in2
-rw-r--r--irc/ircd-ru/files/ircd.in2
-rw-r--r--irc/ircservices/files/ircservices.in2
-rw-r--r--irc/iroffer-dinoex/files/iroffer-dinoex.in2
-rw-r--r--irc/minbif/files/minbif.in2
-rw-r--r--irc/ngircd/files/ngircd.in2
-rw-r--r--irc/quassel/files/quasselcore.in2
-rw-r--r--irc/ratbox-services/files/ratbox-services.sh.in2
-rw-r--r--irc/thales/files/thales.sh.in2
-rw-r--r--irc/tircd/files/tircd.sh.in2
-rw-r--r--irc/tr-ircd/files/trircd.in2
-rw-r--r--irc/undernet-ircu/files/undernet.sh.in2
-rw-r--r--irc/unreal/files/unrealircd.sh.in2
-rw-r--r--japanese/FreeWnn-server/files/cwnn.sh.in2
-rw-r--r--japanese/FreeWnn-server/files/kwnn.sh.in2
-rw-r--r--japanese/FreeWnn-server/files/twnn.sh.in2
-rw-r--r--japanese/FreeWnn-server/files/wnn.sh.in2
-rw-r--r--japanese/canna-server/files/canna.sh.in2
-rw-r--r--japanese/ebnetd/files/ebnetd.sh6
-rw-r--r--japanese/esecanna/files/esecanna.in2
-rw-r--r--japanese/multiskkserv/files/multiskkserv.in2
-rw-r--r--japanese/p5-Mail-SpamAssassin/files/sa-spamd.sh.in2
-rw-r--r--japanese/rskkserv/files/rskkserv.sh.in2
-rw-r--r--japanese/sj3-server/files/sj3.sh.in2
-rw-r--r--japanese/skkserv/files/skkserv.sh.in2
-rw-r--r--japanese/tiarra/files/tiarra.in14
-rw-r--r--java/avis/files/avisd.in2
-rw-r--r--java/jboss5/files/jboss5.sh.in2
-rw-r--r--lang/erlang/files/epmd.sh.in2
-rw-r--r--lang/erlang14/files/epmd.sh.in2
-rw-r--r--lang/php5/files/php-fpm.in2
-rw-r--r--lang/php52/files/php-fpm.in2
-rw-r--r--lang/php53/files/php-fpm.in2
-rw-r--r--lang/rexx-regina/files/rxstack.in2
-rw-r--r--mail/antivirus-milter/files/antivirus-milter.sh.in2
-rw-r--r--mail/anubis/files/anubis.in2
-rw-r--r--mail/archiveopteryx/files/archiveopteryx.in2
-rw-r--r--mail/archivesmtp/files/archivesmtp.in2
-rw-r--r--mail/assp/files/510.assp.in2
-rw-r--r--mail/assp/files/assp.in2
-rw-r--r--mail/batv-milter/files/milter-batv.sh.in2
-rw-r--r--mail/courier-imap/files/courier-imap-imapd-ssl.in2
-rw-r--r--mail/courier-imap/files/courier-imap-imapd.in2
-rw-r--r--mail/courier-imap/files/courier-imap-pop3d-ssl.in2
-rw-r--r--mail/courier-imap/files/courier-imap-pop3d.in2
-rw-r--r--mail/courier/files/courier.sh.in2
-rw-r--r--mail/couriergraph/files/couriergraph.sh.in2
-rw-r--r--mail/cyrus-imapd2/files/imapd.sh.in2
-rw-r--r--mail/cyrus-imapd22/files/imapd.sh.in2
-rw-r--r--mail/cyrus-imapd23/files/imapd.sh.in2
-rw-r--r--mail/cyrus-imapd24/files/imapd.sh.in2
-rw-r--r--mail/davmail/files/davmail.in2
-rw-r--r--mail/dbmail/files/dbmail-imapd.sh.in2
-rw-r--r--mail/dbmail/files/dbmail-lmtpd.sh.in2
-rw-r--r--mail/dbmail/files/dbmail-pop3d.sh.in2
-rw-r--r--mail/dbmail/files/dbmail-timsieved.sh.in2
-rw-r--r--mail/dbmail20/files/dbmail-imapd.sh.in2
-rw-r--r--mail/dbmail20/files/dbmail-lmtpd.sh.in2
-rw-r--r--mail/dbmail20/files/dbmail-pop3d.sh.in2
-rw-r--r--mail/dbmail21/files/dbmail-imapd.sh.in2
-rw-r--r--mail/dbmail21/files/dbmail-lmtpd.sh.in2
-rw-r--r--mail/dbmail21/files/dbmail-pop3d.sh.in2
-rw-r--r--mail/dbmail21/files/dbmail-timsieved.sh.in2
-rw-r--r--mail/dbmail22/files/dbmail-imapd.sh.in2
-rw-r--r--mail/dbmail22/files/dbmail-lmtpd.sh.in2
-rw-r--r--mail/dbmail22/files/dbmail-pop3d.sh.in2
-rw-r--r--mail/dbmail22/files/dbmail-timsieved.sh.in2
-rw-r--r--mail/dbmail23/files/dbmail-imapd.sh.in2
-rw-r--r--mail/dbmail23/files/dbmail-lmtpd.sh.in2
-rw-r--r--mail/dbmail23/files/dbmail-pop3d.sh.in2
-rw-r--r--mail/dbmail23/files/dbmail-timsieved.sh.in2
-rw-r--r--mail/dcc-dccd/files/dccd.sh.in2
-rw-r--r--mail/dcc-dccd/files/dccgrey.sh.in2
-rw-r--r--mail/dcc-dccd/files/dccifd.sh.in2
-rw-r--r--mail/dcc-dccd/files/dccm.sh.in2
-rw-r--r--mail/dk-milter/files/milter-dk.sh.in2
-rw-r--r--mail/dkfilter/files/dkfilter_in.in2
-rw-r--r--mail/dkfilter/files/dkfilter_out.in2
-rw-r--r--mail/dkimproxy/files/dkimproxy_in.in2
-rw-r--r--mail/dkimproxy/files/dkimproxy_out.in2
-rw-r--r--mail/dma/files/dma_flushq.in2
-rw-r--r--mail/dovecot/files/dovecot.sh.in2
-rw-r--r--mail/dovecot2/files/dovecot.sh.in2
-rw-r--r--mail/drac/files/dracd.sh.in2
-rw-r--r--mail/dspam-devel/files/dspam-devel.in2
-rw-r--r--mail/dspam/files/dspam.in2
-rw-r--r--mail/enma/files/milter-enma.in2
-rw-r--r--mail/exilog/files/exilog.sh.in2
-rw-r--r--mail/exim/files/exim.sh.in2
-rw-r--r--mail/fetchmail/files/fetchmail.in2
-rw-r--r--mail/gld/files/gld.in2
-rw-r--r--mail/james/files/james.sh.in2
-rw-r--r--mail/mailgraph/files/mailgraph.in2
-rw-r--r--mail/mailman/files/mailman.in2
-rw-r--r--mail/mailscanner/files/mailscanner.in2
-rw-r--r--mail/mailscanner/files/mta.in2
-rw-r--r--mail/mailscanner/files/patch-bin-cron-update_phishing_sites.cron2
-rw-r--r--mail/mailscanner/files/patch-bin-cron-update_virus_scanners.cron2
-rw-r--r--mail/masqmail/files/masqmail.in2
-rw-r--r--mail/milter-bogom/files/milter-bogom.sh.in2
-rw-r--r--mail/milter-callback/files/milter-callback.in2
-rw-r--r--mail/milter-greylist-devel/files/milter-greylist.in2
-rw-r--r--mail/milter-greylist/files/milter-greylist.in2
-rw-r--r--mail/milter-manager/files/milter-manager.in2
-rw-r--r--mail/milter-regex/files/milterregex.sh.in2
-rw-r--r--mail/missey/files/mps.sh.in2
-rw-r--r--mail/mixminion/files/mixminiond.in2
-rw-r--r--mail/noattach/files/noattach.sh.in2
-rw-r--r--mail/nullmailer/files/nullmailer.in2
-rw-r--r--mail/opendkim/files/milter-opendkim.in2
-rw-r--r--mail/ovs/files/ovs.sh.in2
-rw-r--r--mail/p3scan/files/p3scan.in2
-rw-r--r--mail/p5-Mail-SpamAssassin/files/sa-spamd.sh.in2
-rw-r--r--mail/p5-qpsmtpd/files/qpsmtpd.in2
-rw-r--r--mail/perdition/files/perdition.imap4.in2
-rw-r--r--mail/perdition/files/perdition.imap4s.in2
-rw-r--r--mail/perdition/files/perdition.imaps.in2
-rw-r--r--mail/perdition/files/perdition.in2
-rw-r--r--mail/perdition/files/perdition.pop3.in2
-rw-r--r--mail/perdition/files/perdition.pop3s.in2
-rw-r--r--mail/policyd2/files/policyd2.sh.in2
-rw-r--r--mail/pop-before-smtp/files/pop-before-smtp.sh.in3
-rw-r--r--mail/pop3proxy/files/pop3proxyd.in2
-rw-r--r--mail/popa3d/files/popa3d.in2
-rw-r--r--mail/popular/files/0ringd.sh.in2
-rw-r--r--mail/popular/files/pcheckd.sh.in2
-rw-r--r--mail/popular/files/pproxy.sh.in2
-rw-r--r--mail/popular/files/pserv.sh.in2
-rw-r--r--mail/postfix-current/files/postfix.sh.in2
-rw-r--r--mail/postfix-policyd-sf/files/policyd.sh.in2
-rw-r--r--mail/postfix-postfwd/files/postfwd.in2
-rw-r--r--mail/postfix/files/postfix.sh.in2
-rw-r--r--mail/postfix25/files/postfix.sh.in2
-rw-r--r--mail/postfix26/files/postfix.sh.in2
-rw-r--r--mail/postfix27/files/postfix.sh.in2
-rw-r--r--mail/postfix28/files/postfix.sh.in2
-rw-r--r--mail/postgrey/files/postgrey.in2
-rw-r--r--mail/postpals/files/postpals-taillog.in2
-rw-r--r--mail/postpals/files/postpals.in2
-rw-r--r--mail/prayer/files/prayer.in2
-rw-r--r--mail/proxsmtp/files/proxsmtpd.sh.in2
-rw-r--r--mail/py-apolicy/files/apolicyd.in2
-rw-r--r--mail/py-ppolicy/files/ppolicyd.sh.in2
-rw-r--r--mail/py-spambayes/files/pyspamd.in2
-rw-r--r--mail/pysieved/files/pysieved.in2
-rw-r--r--mail/qmail/files/qmail-smtpd.rcNG2
-rw-r--r--mail/qpopper/qpopper.in2
-rw-r--r--mail/quickml/files/quickml.in2
-rw-r--r--mail/rabl_server/files/rabl_server.sh.in2
-rw-r--r--mail/rbl-milter/files/rblmilter.sh.in2
-rw-r--r--mail/rspamd/files/rspamd.in2
-rw-r--r--mail/rspamd/files/rspamd_redirector.in2
-rw-r--r--mail/sastatd/files/sastatd.in2
-rw-r--r--mail/scam-backscatter/files/scam-backscatter.in2
-rw-r--r--mail/sid-milter/files/milter-sid.sh.in2
-rw-r--r--mail/smfsav/files/smfsav.in2
-rw-r--r--mail/smtpd/files/smtpd.in2
-rw-r--r--mail/smtptrapd/files/smtptrapd.sh.in2
-rw-r--r--mail/spamass-milter/files/spamass-milter.in2
-rw-r--r--mail/spamd/files/obspamd.in2
-rw-r--r--mail/spamd/files/obspamlogd.in2
-rw-r--r--mail/spamilter/files/spamilter.sh.in2
-rw-r--r--mail/spampd/files/spampd.in2
-rw-r--r--mail/spmfilter/files/spmfilter.in2
-rw-r--r--mail/sqlgrey/files/sqlgrey.in2
-rw-r--r--mail/sqwebmail/files/sqwebmail-sqwebmaild.in2
-rw-r--r--mail/synonym/files/synonym.sh.in2
-rw-r--r--mail/tpop3d/files/tpop3d.sh.in2
-rw-r--r--mail/up-imapproxy/files/imapproxyd.sh.in2
-rw-r--r--mail/vbsfilter/files/vbsfilter.sh.in2
-rw-r--r--mail/whoson/files/whoson.sh.in2
-rw-r--r--mail/zmailer/files/zmailer.sh.in2
-rw-r--r--misc/dahdi-kmod/files/dahdi.in2
-rw-r--r--misc/dnetc/files/dnetc.sh.in2
-rw-r--r--misc/e2fsprogs-libuuid/files/uuidd.in2
-rw-r--r--misc/proxyper/files/proxyper.in2
-rw-r--r--misc/upclient/files/upclient.sh.in2
-rw-r--r--misc/yaunc/files/yaunc.sh.in2
-rw-r--r--multimedia/ffmpeg-devel/files/ffserver.in2
-rw-r--r--multimedia/ffmpeg/files/ffserver.in2
-rw-r--r--multimedia/freevo/files/freevo-rcsubr.in11
-rw-r--r--multimedia/freevo/files/freevo.in2
-rw-r--r--multimedia/mythtv/files/mythbackend.in2
-rw-r--r--multimedia/ptx-kmod/files/ptx.sh.in2
-rw-r--r--multimedia/vdr/files/vdr.in2
-rw-r--r--multimedia/webcamd/files/webcamd.in2
-rw-r--r--multimedia/zoneminder/files/zoneminder.in2
-rw-r--r--net-im/ejabberd/files/ejabberd.in2
-rw-r--r--net-im/imspector/files/imspector.in2
-rw-r--r--net-im/iserverd/files/iserverd.in2
-rw-r--r--net-im/jabber-pyaim/files/jabber-pyaim-transport.sh.in2
-rw-r--r--net-im/jabber-pyicq/files/jabber-pyicq-transport.sh.in2
-rw-r--r--net-im/jabber-pymsn/files/jabber-pymsn-transport.sh.in2
-rw-r--r--net-im/jabber/files/jabber.in2
-rw-r--r--net-im/jabberd/files/jabberd.in2
-rw-r--r--net-im/jggtrans/files/jggtrans.sh.in2
-rw-r--r--net-im/mu-conference/files/mu-conference.in2
-rw-r--r--net-im/openfire-devel/files/openfire.in2
-rw-r--r--net-im/openfire/files/openfire.in2
-rw-r--r--net-im/prosody/files/prosody.in2
-rw-r--r--net-im/py-punjab/files/punjab.sh.in2
-rw-r--r--net-im/py-xmpppy-yahoo/files/xmpppy_yahoo.in2
-rw-r--r--net-im/zephyr/files/zhm.in2
-rw-r--r--net-mgmt/argus-monitor/files/argusd.in2
-rw-r--r--net-mgmt/argus3/files/argus.in2
-rw-r--r--net-mgmt/arpwatch/files/arpwatch.sh.in2
-rw-r--r--net-mgmt/bigsister/files/bigsister.sh.in2
-rw-r--r--net-mgmt/cdpd/files/cdpd.in2
-rw-r--r--net-mgmt/chillispot/files/chillispot.in2
-rw-r--r--net-mgmt/choparp/files/choparp.sh.in2
-rw-r--r--net-mgmt/collectd/files/collectd.in2
-rw-r--r--net-mgmt/collectd/files/collectdmon.in2
-rw-r--r--net-mgmt/collectd5/files/collectd.in2
-rw-r--r--net-mgmt/collectd5/files/collectdmon.in2
-rw-r--r--net-mgmt/darkstat/files/darkstat.in2
-rw-r--r--net-mgmt/flow-tools-ng/files/flow_capture.in2
-rw-r--r--net-mgmt/flow-tools-ng/files/flow_fanout.in2
-rw-r--r--net-mgmt/flow-tools/files/flow_capture.in2
-rw-r--r--net-mgmt/flow-tools/files/flow_fanout.in2
-rw-r--r--net-mgmt/flowd/files/flowd.in2
-rw-r--r--net-mgmt/fprobe/files/fprobe.sh.in2
-rw-r--r--net-mgmt/icinga/files/icinga.in2
-rw-r--r--net-mgmt/ipacctd/files/ipacctd.sh.in2
-rw-r--r--net-mgmt/ipcad/files/ipcad.in2
-rw-r--r--net-mgmt/macroscope/files/macroscope.in2
-rw-r--r--net-mgmt/mrtg/files/mrtg_daemon.in2
-rw-r--r--net-mgmt/nagios-devel/files/nagios.sh.in2
-rw-r--r--net-mgmt/nagios/files/nagios.in2
-rw-r--r--net-mgmt/nagiosgrapher/files/nagiosgrapher.in9
-rw-r--r--net-mgmt/nagircbot/files/nagircbot.in2
-rw-r--r--net-mgmt/ndoutils/files/ndo2db.in2
-rw-r--r--net-mgmt/ndpmon/files/ndpmonitor.in2
-rw-r--r--net-mgmt/nefu/files/nefu.in2
-rw-r--r--net-mgmt/net-snmp/files/snmpd.sh.in2
-rw-r--r--net-mgmt/net-snmp/files/snmptrapd.sh.in2
-rw-r--r--net-mgmt/netams/files/netams.in2
-rw-r--r--net-mgmt/netdisco/files/netdisco.in2
-rw-r--r--net-mgmt/netmond/files/netmond.sh.in2
-rw-r--r--net-mgmt/netustad/files/netustad.in2
-rw-r--r--net-mgmt/netxms/files/netxmsd.in2
-rw-r--r--net-mgmt/netxms/files/nxagentd.in2
-rw-r--r--net-mgmt/netxms/files/nxhttpd.in2
-rw-r--r--net-mgmt/nfsen/files/nfsen.in2
-rw-r--r--net-mgmt/ng_ipacct/files/ng_ipacct.sh.in2
-rw-r--r--net-mgmt/noc/files/noc.sh.in2
-rw-r--r--net-mgmt/nrpe2/files/nrpe2.in2
-rw-r--r--net-mgmt/nsca/files/nsca.in2
-rw-r--r--net-mgmt/openlldp/files/lldpd.in2
-rw-r--r--net-mgmt/openvmps/files/vpmsd.in2
-rw-r--r--net-mgmt/ourmon/files/ourmon.in2
-rw-r--r--net-mgmt/pftabled/files/pftabled.in2
-rw-r--r--net-mgmt/pmacct/files/pmacctd.in2
-rw-r--r--net-mgmt/pnp/files/npcd.sh.in2
-rw-r--r--net-mgmt/ramond/files/ramon.in2
-rw-r--r--net-mgmt/rotorouter/files/rotorouter.in2
-rw-r--r--net-mgmt/rrdbot/files/rrdbot.in2
-rw-r--r--net-mgmt/send/files/patch-sendd-os-sendd2
-rw-r--r--net-mgmt/smokeping/files/smokeping.in2
-rw-r--r--net-mgmt/snmptt/files/snmptt.sh.in2
-rw-r--r--net-mgmt/softflowd/files/softflowd.in2
-rw-r--r--net-mgmt/torrus/files/torrus_collector.in2
-rw-r--r--net-mgmt/torrus/files/torrus_monitor.in2
-rw-r--r--net-mgmt/xymon-client/files/xymon-client.sh.in2
-rw-r--r--net-mgmt/xymon-server/files/xymon-server.sh.in2
-rw-r--r--net-mgmt/zabbix-server/files/zabbix_agentd.in2
-rw-r--r--net-mgmt/zabbix-server/files/zabbix_proxy.in2
-rw-r--r--net-mgmt/zabbix-server/files/zabbix_server.in2
-rw-r--r--net-mgmt/zabbix2-server/files/zabbix_agentd.in2
-rw-r--r--net-mgmt/zabbix2-server/files/zabbix_proxy.in2
-rw-r--r--net-mgmt/zabbix2-server/files/zabbix_server.in2
-rw-r--r--net-mgmt/zenoss/files/zenoss.in2
-rw-r--r--net-p2p/amule-devel/files/amuled.sh.in2
-rw-r--r--net-p2p/amule/files/amuled.sh.in2
-rw-r--r--net-p2p/bnbt/files/bnbt.sh.in2
-rw-r--r--net-p2p/deluge/files/deluged.in2
-rw-r--r--net-p2p/i2p/files/i2p.sh.in2
-rw-r--r--net-p2p/mldonkey/files/mlnet.in2
-rw-r--r--net-p2p/py-bittornado/files/bttrack.in2
-rw-r--r--net-p2p/transmission-cli/files/transmission.in2
-rw-r--r--net-p2p/uhub/files/uhub.sh.in2
-rw-r--r--net-p2p/verlihub/files/verlihub.in2
-rw-r--r--net/3proxy/files/3proxy.sh.in2
-rw-r--r--net/DarwinStreamingServer/files/darwin_streaming_server.sh.in2
-rw-r--r--net/DarwinStreamingServer/files/streamingadminserver.sh.in2
-rw-r--r--net/activemq/files/activemq.in2
-rw-r--r--net/aoe/files/aoe.in2
-rw-r--r--net/apinger/files/apinger.in2
-rw-r--r--net/asterisk/files/asterisk.sh.in2
-rw-r--r--net/asterisk10/files/asterisk.sh.in2
-rw-r--r--net/asterisk14/files/asterisk.sh.in2
-rw-r--r--net/asterisk16/files/asterisk.sh.in2
-rw-r--r--net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in2
-rw-r--r--net/avahi-app/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in2
-rw-r--r--net/balance/files/balance.sh.in2
-rw-r--r--net/beanstalkd/files/beanstalkd.in2
-rw-r--r--net/bfilter/files/bfilter.sh.in2
-rw-r--r--net/binkd/files/binkd.sh.in2
-rw-r--r--net/bird-devel/files/bird.in2
-rw-r--r--net/bird/files/bird.in2
-rw-r--r--net/bird6/files/bird6.in2
-rw-r--r--net/bld/files/bld.in2
-rw-r--r--net/boinc-client/files/boinc.sh.in2
-rw-r--r--net/bounce/files/bounce.in2
-rw-r--r--net/callweaver/files/callweaver.in2
-rw-r--r--net/ccxstream/files/ccxstream.in2
-rw-r--r--net/cnupm/files/cnupm.sh.in2
-rw-r--r--net/crtmpserver/files/crtmpserver.in2
-rw-r--r--net/csync2/files/csync2.in2
-rw-r--r--net/cvsup-mirror/files/cvsupd.sh.in2
-rw-r--r--net/cvsync/files/cvsyncd.in2
-rw-r--r--net/daemonlogger/files/daemonlogger.sh.in2
-rw-r--r--net/dante/files/sockd.sh.in2
-rw-r--r--net/dbeacon/files/dbeacon.in2
-rw-r--r--net/dhcp6/files/dhcp6c.sh.in2
-rw-r--r--net/dhcp6/files/dhcp6relay.sh.in2
-rw-r--r--net/dhcp6/files/dhcp6s.sh.in2
-rw-r--r--net/dhcprelay/files/dhcprelay.in2
-rw-r--r--net/dhcprelya/files/dhcprelya.in2
-rw-r--r--net/dictd/files/dictd.in2
-rw-r--r--net/dtcp/files/dtcpc.sh.in2
-rw-r--r--net/dtcp/files/dtcps.sh.in2
-rw-r--r--net/dtcpclient/files/dtcpclient.sh.in2
-rw-r--r--net/freenet6/files/freenet6.in2
-rw-r--r--net/freeradius/files/radiusd.in2
-rw-r--r--net/freeradius2/files/radiusd.sh.in2
-rw-r--r--net/freeswitch-core/files/freeswitch.in2
-rw-r--r--net/frickin/files/frickin.sh.in2
-rw-r--r--net/gatekeeper/files/gnugk.sh.in2
-rw-r--r--net/gateway6/files/gateway6.sh.in2
-rw-r--r--net/get_iplayer/files/get_iplayer.in2
-rw-r--r--net/gnu-dico/files/dicod.sh.in2
-rw-r--r--net/gnu-radius/files/radiusd.sh.in2
-rw-r--r--net/gogoc/files/gogoc.in2
-rw-r--r--net/haproxy-devel/files/haproxy.in2
-rw-r--r--net/haproxy/files/haproxy.in2
-rw-r--r--net/howl/files/mdnsresponder.in2
-rw-r--r--net/httpry/files/httpry.in2
-rw-r--r--net/iaxmodem/files/iaxmodem.in2
-rw-r--r--net/iet/files/ietd.in2
-rw-r--r--net/ifdepd/files/ifdepd.in2
-rw-r--r--net/ifstated/files/ifstated.in2
-rw-r--r--net/igmpproxy/files/igmpproxy.in2
-rw-r--r--net/iodine/files/iodined.in2
-rw-r--r--net/iplog/files/iplog.in2
-rw-r--r--net/ipw-firmware/files/ipw.sh.in2
-rw-r--r--net/irrd/files/irrd.sh.in2
-rw-r--r--net/iscsi-target/files/iscsi_target.in2
-rw-r--r--net/iwi-firmware/files/iwi.sh.in2
-rw-r--r--net/ladvd/files/ladvd.in2
-rw-r--r--net/lanbrowsing/files/lisa.in2
-rw-r--r--net/linknx/files/linknx.in2
-rw-r--r--net/linuxigd/files/linuxigd.in2
-rw-r--r--net/lvwimax/files/lvwimax.in2
-rw-r--r--net/mDNSResponder/files/mdnsd.in2
-rw-r--r--net/mediaproxy/files/mediaproxy.in2
-rw-r--r--net/mediaproxy/files/proxydispatcher.in2
-rw-r--r--net/mediatomb/files/mediatomb.sh.in2
-rw-r--r--net/minidlna/files/minidlna.sh.in2
-rw-r--r--net/minisapserver/files/sapserver.in2
-rw-r--r--net/minissdpd/files/minissdpd.in2
-rw-r--r--net/miniupnpd/files/miniupnpd.sh.in2
-rw-r--r--net/miredo/files/miredo.in2
-rw-r--r--net/miredo/files/miredo_server.in2
-rw-r--r--net/mpd5/files/mpd5.sh.in7
-rw-r--r--net/mrouted/files/mrouted.in2
-rw-r--r--net/nakenchat/files/nakenchat.in2
-rw-r--r--net/ndisc6/files/rdnssd.in2
-rw-r--r--net/netatalk/files/netatalk.in2
-rw-r--r--net/neubot/files/neubotd.in2
-rw-r--r--net/nss-pam-ldapd/files/nslcd.in2
-rw-r--r--net/nstxd/files/nstxd.in2
-rw-r--r--net/ntop/files/ntop.sh.in2
-rw-r--r--net/nylon/files/nylon.sh.in2
-rw-r--r--net/olsrd/files/olsrd.sh.in2
-rw-r--r--net/onioncat/files/onioncat.in2
-rw-r--r--net/openafs/files/afsd.in2
-rw-r--r--net/openbgpd/files/openbgpd.sh.in2
-rw-r--r--net/openldap23-server/files/slapd.sh.in2
-rw-r--r--net/openldap23-server/files/slurpd.sh.in2
-rw-r--r--net/openldap24-server/files/slapd.sh.in2
-rw-r--r--net/openmq/files/imq.in9
-rw-r--r--net/openntpd/files/openntpd.in2
-rw-r--r--net/openospfd/files/openospfd.sh.in2
-rw-r--r--net/openradius/files/openradius.in2
-rw-r--r--net/openslp/files/slpd.in2
-rw-r--r--net/opentracker/files/opentracker.in2
-rw-r--r--net/openvswitch/files/ovs-vswitchd.in2
-rw-r--r--net/openvswitch/files/ovsdb-server.in2
-rw-r--r--net/pen/files/pen.sh.in2
-rw-r--r--net/pfflowd/files/pfflowd.in2
-rw-r--r--net/poptop/files/pptpd.sh.in2
-rw-r--r--net/ptpd/files/ptpd.in2
-rw-r--r--net/ptpd2/files/ptpd2.in2
-rw-r--r--net/pxe/files/pxe.sh.in2
-rw-r--r--net/qadsl/files/qadsl.sh.in2
-rw-r--r--net/quagga-re/files/quagga.sh.in2
-rw-r--r--net/quagga-re/files/watchquagga.sh.in2
-rw-r--r--net/quagga/files/quagga.sh.in2
-rw-r--r--net/quagga/files/watchquagga.sh.in2
-rw-r--r--net/quoted/files/quoted.in2
-rw-r--r--net/rabbitmq/files/rabbitmq.in2
-rw-r--r--net/radiusd-cistron/files/radiusd-cistron.in2
-rw-r--r--net/radiusd-cistron/files/radrelay-cistron.in2
-rw-r--r--net/radsecproxy/files/radsecproxy.in2
-rw-r--r--net/radvd/files/radvd.in2
-rw-r--r--net/redir/files/redir.in2
-rw-r--r--net/relayd/files/relayd.in2
-rw-r--r--net/repeater/files/repeater.in2
-rw-r--r--net/rinetd/files/rinetd.sh.in2
-rw-r--r--net/ris/files/binlsrv.sh.in2
-rw-r--r--net/rsmb/files/rsmbd.in2
-rw-r--r--net/rsync/files/rsyncd.sh.in2
-rw-r--r--net/rtg/files/rtgpoll.in2
-rw-r--r--net/rwhoisd/files/rwhoisd.in2
-rw-r--r--net/samba34/files/samba.in18
-rw-r--r--net/samba35/files/samba.in18
-rw-r--r--net/samba36/files/samba.in18
-rw-r--r--net/samba4-devel/files/samba4.in2
-rw-r--r--net/samba4wins/files/smbd4wins.in2
-rw-r--r--net/scribe/files/scribe.in2
-rw-r--r--net/sendfile/files/sendfiled.in2
-rw-r--r--net/ser/files/ser.in2
-rw-r--r--net/serviio/files/serviio.in2
-rw-r--r--net/sflowtool/files/sflowtool.in2
-rw-r--r--net/silc-server/files/silcd.in2
-rw-r--r--net/siproxd/files/siproxd.sh.in2
-rw-r--r--net/sixxs-aiccu/files/sixxs-aiccu.in2
-rw-r--r--net/socat/files/socat.in2
-rw-r--r--net/socks5/files/socks5.sh.in2
-rw-r--r--net/splatd/files/splatd.sh.in2
-rw-r--r--net/spread/files/spread.sh.in2
-rw-r--r--net/spread4/files/spread.sh.in2
-rw-r--r--net/ss5/files/ss5.in2
-rw-r--r--net/sslh/files/sslh.in2
-rw-r--r--net/stone/files/stone.sh.in2
-rw-r--r--net/stund/files/stund.sh.in2
-rw-r--r--net/tac_plus-libradius/files/tac_plus.in2
-rw-r--r--net/tac_plus4/files/tac_plus.in2
-rw-r--r--net/tcpproxy/files/tcpproxy.in2
-rw-r--r--net/throttled/files/throttled.in2
-rw-r--r--net/traff/files/traff.in2
-rw-r--r--net/ucarp/files/ucarp.in2
-rw-r--r--net/udpxy/files/udpxy.in2
-rw-r--r--net/ushare/files/patch-ushare2
-rw-r--r--net/vncreflector/files/vncreflector.sh.in2
-rw-r--r--net/vserver/files/vserver.in2
-rw-r--r--net/vtun/files/vtunclient.in2
-rw-r--r--net/vtun/files/vtund.in2
-rw-r--r--net/widentd/files/widentd.sh.in2
-rw-r--r--net/wired-tracker/files/trackerd.sh.in2
-rw-r--r--net/wired/files/wired.sh.in2
-rw-r--r--net/wizd/files/wizd.sh.in2
-rw-r--r--net/wowzamediaserverpro/files/wowza.in2
-rw-r--r--net/xboxproxy/files/xboxproxy.in2
-rw-r--r--net/xorp-devel/files/xorp.in2
-rw-r--r--net/xorp/files/xorp.in2
-rw-r--r--net/xrdp/files/xrdp.in4
-rw-r--r--net/yate-devel/files/yate.sh.in2
-rw-r--r--net/yate/files/yate.sh.in2
-rw-r--r--news/inn/files/innd.sh.in13
-rw-r--r--news/newscache/files/newscache.sh.in2
-rw-r--r--news/nntpcache/files/nntpcached.in2
-rw-r--r--news/sabnzbdplus/files/sabnzbd.in2
-rw-r--r--ports-mgmt/pkg_jail/files/pkg_jail2
-rw-r--r--print/acroreadwrapper/files/linux_adobe.sh.in2
-rw-r--r--print/cups-base/files/cupsd.in2
-rw-r--r--print/pips800/files/ekpd.sh2
-rw-r--r--print/pips800/files/pips.sh2
-rw-r--r--security/amavisd-milter/files/amavisd-milter.sh.in2
-rw-r--r--security/amavisd-new/files/amavis-milter.sh.in2
-rw-r--r--security/amavisd-new/files/amavis-p0fanalyzer.sh.in2
-rw-r--r--security/amavisd-new/files/amavisd-snmp.sh.in2
-rw-r--r--security/amavisd-new/files/amavisd.sh.in2
-rw-r--r--security/arpCounterattack/files/arpCounterattack.in2
-rw-r--r--security/barnyard2/files/barnyard2.sh.in2
-rw-r--r--security/blocksshd/files/blocksshd.in2
-rw-r--r--security/bruteblock/files/bruteblockd.sh.in2
-rw-r--r--security/clamav-devel/files/clamav-clamd.in2
-rw-r--r--security/clamav-devel/files/clamav-freshclam.in2
-rw-r--r--security/clamav-devel/files/clamav-milter.in2
-rw-r--r--security/clamav/files/clamav-clamd.in2
-rw-r--r--security/clamav/files/clamav-freshclam.in2
-rw-r--r--security/clamav/files/clamav-milter.in2
-rw-r--r--security/clamsmtp/files/clamsmtpd.sh.in2
-rw-r--r--security/courier-authlib/files/courier-authdaemond.sh.in2
-rw-r--r--security/cyrus-sasl2-saslauthd/files/saslauthd.sh.in2
-rw-r--r--security/denyhosts/files/denyhosts.in2
-rw-r--r--security/distcache-devel/files/dc_server.sh.in2
-rw-r--r--security/distcache/files/dc_server.sh.in2
-rw-r--r--security/doorman/files/doorman.sh.in2
-rw-r--r--security/dradis/files/dradis.in2
-rw-r--r--security/dropbear/files/dropbear.in2
-rw-r--r--security/expiretable/files/expiretable.in2
-rw-r--r--security/hamachi/files/hamachi.sh.in2
-rw-r--r--security/ike/files/iked.in2
-rw-r--r--security/ipguard/files/ipguard.in2
-rw-r--r--security/ipsec-tools/files/racoon.sh.in2
-rw-r--r--security/isakmpd/files/isakmpd.sh.in2
-rw-r--r--security/knock/files/knockd.sh.in2
-rw-r--r--security/maia/files/maiad.in2
-rw-r--r--security/nessus/files/nessusd.sh.in2
-rw-r--r--security/oidentd/files/oidentd.in2
-rw-r--r--security/opencryptoki/files/pkcsslotd.in2
-rw-r--r--security/openct/files/openct.in2
-rw-r--r--security/openssh-portable/files/openssh.in2
-rw-r--r--security/openvas-server/files/openvasd.in2
-rw-r--r--security/openvpn-beta/files/openvpn.sh.in2
-rw-r--r--security/openvpn-devel/files/openvpn.sh.in2
-rw-r--r--security/openvpn/files/openvpn.sh.in3
-rw-r--r--security/openvpn20/files/openvpn.sh.in3
-rw-r--r--security/ossec-hids-server/files/ossec-hids.in2
-rw-r--r--security/p5-openxpki-deployment/files/openxpki.sh.in2
-rw-r--r--security/pks/files/pksd.sh.in2
-rw-r--r--security/prelude-lml/files/prelude-lml.sh.in2
-rw-r--r--security/prelude-manager/files/prelude-manager.sh.in2
-rw-r--r--security/prelude-pflogger/files/prelude-pflogger.in2
-rw-r--r--security/py-fail2ban/files/fail2ban.in2
-rw-r--r--security/racoon2/files/patch-samples-rc.d-iked.in2
-rw-r--r--security/racoon2/files/patch-samples-rc.d-kinkd.in2
-rw-r--r--security/racoon2/files/patch-samples-rc.d-spmd.in2
-rw-r--r--security/sancp/files/sancp.in2
-rw-r--r--security/scanlogd/files/scanlogd.in2
-rw-r--r--security/scannedonly/files/scannedonly.in2
-rw-r--r--security/sfs/files/sfscd.in2
-rw-r--r--security/sfs/files/sfssd.in2
-rw-r--r--security/sguil-sensor/files/example_agent.sh.in2
-rw-r--r--security/sguil-sensor/files/pads_agent.sh.in2
-rw-r--r--security/sguil-sensor/files/pcap_agent.sh.in2
-rw-r--r--security/sguil-sensor/files/sancp_agent.sh.in2
-rw-r--r--security/sguil-sensor/files/snort_agent.sh.in2
-rw-r--r--security/sguil-server/files/sguild.sh.in2
-rw-r--r--security/shibboleth2-sp/files/shibboleth-sp.in2
-rw-r--r--security/snort/files/snort.sh.in2
-rw-r--r--security/snortsam/files/snortsam.sh.in2
-rw-r--r--security/spybye/files/spybye.sh.in2
-rw-r--r--security/sshblock/files/sshblock.in2
-rw-r--r--security/sssd/files/sssd.in2
-rw-r--r--security/strongswan/files/strongswan.in2
-rw-r--r--security/stunnel/files/stunnel.in2
-rw-r--r--security/suricata/files/suricata.in2
-rw-r--r--security/swatch/files/swatch.in2
-rw-r--r--security/termlog/files/termlog.in2
-rw-r--r--security/tinc/files/tincd.sh.in2
-rw-r--r--security/tor-devel/files/tor.in2
-rw-r--r--security/tor/files/tor.in2
-rw-r--r--security/trousers/files/tcsd.in2
-rw-r--r--security/vpnc/files/vpnc.in2
-rw-r--r--security/xinetd/files/xinetd.in2
-rw-r--r--shells/scponly/files/scponlyc.in2
-rw-r--r--shells/wapsh/files/htshd.sh.in2
-rw-r--r--sysutils/3dm/files/3dm2.sh.in2
-rw-r--r--sysutils/915resolution/files/915resolution.sh.in2
-rw-r--r--sysutils/LPRng/files/lprng.in2
-rw-r--r--sysutils/afbinit/files/afbinit.sh.in2
-rw-r--r--sysutils/aird/files/aird.in2
-rw-r--r--sysutils/anacron/files/anacron.sh.in2
-rw-r--r--sysutils/apcupsd/files/apcupsd.in2
-rw-r--r--sysutils/asusoled/files/asusoled.sh.in2
-rw-r--r--sysutils/asusoled/files/oled_clock.sh.in2
-rw-r--r--sysutils/ataidle/files/ataidle.in2
-rw-r--r--sysutils/atop/files/atop.in2
-rw-r--r--sysutils/backuppc/files/backuppc.in2
-rw-r--r--sysutils/bacula-server/files/bacula-dir.in2
-rw-r--r--sysutils/bacula-server/files/bacula-fd.in2
-rw-r--r--sysutils/bacula-server/files/bacula-sd.in2
-rw-r--r--sysutils/bacula2-server/files/bacula-dir.in2
-rw-r--r--sysutils/bacula2-server/files/bacula-fd.in2
-rw-r--r--sysutils/bacula2-server/files/bacula-sd.in2
-rw-r--r--sysutils/be_agent/files/be-agent.sh.in2
-rw-r--r--sysutils/boxbackup-devel/files/bbackupd.in2
-rw-r--r--sysutils/boxbackup-devel/files/bbstored.in2
-rw-r--r--sysutils/boxbackup/files/bbackupd.in2
-rw-r--r--sysutils/boxbackup/files/bbstored.in2
-rw-r--r--sysutils/bsd-splash-changer/files/change_splash.sh.in14
-rw-r--r--sysutils/bsdstats/files/bsdstats.in2
-rw-r--r--sysutils/cfengine/files/cfexecd.in2
-rw-r--r--sysutils/cfengine/files/cfservd.in2
-rw-r--r--sysutils/cfengine3-legacy/files/cf-execd.in2
-rw-r--r--sysutils/cfengine3-legacy/files/cf-serverd.in2
-rw-r--r--sysutils/cfengine3/files/cf-execd.in2
-rw-r--r--sysutils/cfengine3/files/cf-serverd.in2
-rw-r--r--sysutils/cpupowerd/files/cpupowerd.in2
-rw-r--r--sysutils/daedalus/files/daedalus.sh2
-rw-r--r--sysutils/daemontools/files/svscan.in2
-rw-r--r--sysutils/devcpu-data/files/microcode_update.in2
-rw-r--r--sysutils/devcpu/files/devcpu.in2
-rw-r--r--sysutils/diskcheckd/files/diskcheckd.in2
-rw-r--r--sysutils/diskprep/files/diskprep.in11
-rw-r--r--sysutils/doinkd/files/doinkd.in2
-rw-r--r--sysutils/downtimed/files/downtimed.in2
-rw-r--r--sysutils/fcron/files/fcron.in2
-rw-r--r--sysutils/freqsdwn/files/000.freqshpk.sh.in2
-rw-r--r--sysutils/freqsdwn/files/freqshpd.sh.in2
-rw-r--r--sysutils/fusefs-kmod/files/fusefs.in5
-rw-r--r--sysutils/fvcool/files/fvcool.sh.in2
-rw-r--r--sysutils/ganglia-monitor-core/files/gmetad.sh.in2
-rw-r--r--sysutils/ganglia-monitor-core/files/gmond.sh.in3
-rw-r--r--sysutils/geomWatch/files/geomWatch.in2
-rw-r--r--sysutils/gkrellm2/files/gkrellmd.sh.in2
-rw-r--r--sysutils/hal/files/hald.in2
-rw-r--r--sysutils/healthd/files/healthd.in2
-rw-r--r--sysutils/heartbeat/files/heartbeat.in2
-rw-r--r--sysutils/ipa/files/ipa.in2
-rw-r--r--sysutils/istatd/files/istatd.in2
-rw-r--r--sysutils/jailrc/files/jailrc.in2
-rw-r--r--sysutils/lcdproc/files/LCDd.in2
-rw-r--r--sysutils/lcdproc/files/lcdexec.in2
-rw-r--r--sysutils/lcdproc/files/lcdproc.in2
-rw-r--r--sysutils/lookupd/files/lookupd.in2
-rw-r--r--sysutils/mbmon/files/mbmon.sh.in2
-rw-r--r--sysutils/mcollective/files/mcollectived.in2
-rw-r--r--sysutils/metalog/files/metalog.in2
-rw-r--r--sysutils/monit/files/monit.sh.in2
-rw-r--r--sysutils/monitord/files/monitord.in2
-rw-r--r--sysutils/monitorix/files/monitorix.in2
-rw-r--r--sysutils/moosefs-chunkserver/files/mfschunkserver.in2
-rw-r--r--sysutils/moosefs-master/files/mfscgiserv.in2
-rw-r--r--sysutils/moosefs-master/files/mfsmaster.in2
-rw-r--r--sysutils/moosefs-master/files/mfsmetalogger.in2
-rw-r--r--sysutils/msyslog/files/msyslogd.sh.in2
-rw-r--r--sysutils/munin-node/files/munin-node-revive.sh.in2
-rw-r--r--sysutils/munin-node/files/munin-node.in2
-rw-r--r--sysutils/nagios-statd/files/nagiosstatd.sh.in19
-rw-r--r--sysutils/netdump-server/files/netdump-server.sh.in16
-rw-r--r--sysutils/nut/files/nut.sh.in2
-rw-r--r--sysutils/nut/files/nut_upslog.sh.in2
-rw-r--r--sysutils/nut/files/nut_upsmon.sh.in2
-rw-r--r--sysutils/nut22/files/nut.sh.in2
-rw-r--r--sysutils/nut22/files/nut_upslog.sh.in2
-rw-r--r--sysutils/nut22/files/nut_upsmon.sh.in2
-rw-r--r--sysutils/oak/files/oak.in2
-rw-r--r--sysutils/openupsd/files/openupsd.in2
-rw-r--r--sysutils/p5-Tail-Stat/files/tstatd.in2
-rw-r--r--sysutils/pcfclock/files/pcfdate.in2
-rw-r--r--sysutils/pfstat/files/pfstatd.in2
-rw-r--r--sysutils/powerman/files/powerman.sh.in2
-rw-r--r--sysutils/pprotectd/files/pprotectd.in2
-rw-r--r--sysutils/puppet/files/puppet.in2
-rw-r--r--sysutils/puppet/files/puppetmaster.in2
-rw-r--r--sysutils/py-bcfg2/files/bcfg2.in2
-rw-r--r--sysutils/py-supervisor/files/supervisord.in2
-rw-r--r--sysutils/radmind/files/radmind.sh.in2
-rw-r--r--sysutils/rsyncmanager/files/rsyncmanager.sh.in2
-rw-r--r--sysutils/rsyslog4/files/rsyslogd.in12
-rw-r--r--sysutils/rsyslog5/files/rsyslogd.in2
-rw-r--r--sysutils/rsyslog6-devel/files/rsyslogd.in2
-rw-r--r--sysutils/rubygem-chef/files/chef_client.in2
-rw-r--r--sysutils/runit/files/runsvdir.sh.in2
-rw-r--r--sysutils/salt/files/salt_master.in2
-rw-r--r--sysutils/salt/files/salt_minion.in2
-rw-r--r--sysutils/salt/files/salt_syndic.in2
-rw-r--r--sysutils/sec/files/sec.in2
-rw-r--r--sysutils/smartmontools/files/smartd.in2
-rw-r--r--sysutils/spiped/files/spiped.in2
-rw-r--r--sysutils/swapd/files/swapd.in2
-rw-r--r--sysutils/swapexd/files/patch-rc.d__swapexd2
-rw-r--r--sysutils/swapmon/files/swapmon.in2
-rw-r--r--sysutils/symon/files/symon.sh.in2
-rw-r--r--sysutils/symon/files/symux.sh.in2
-rw-r--r--sysutils/syslog-ng-devel/files/syslog-ng.sh.in2
-rw-r--r--sysutils/syslog-ng/files/syslog-ng.sh.in2
-rw-r--r--sysutils/syslog-ng2/files/syslog-ng.sh.in2
-rw-r--r--sysutils/tenshi/files/tenshi.sh.in19
-rw-r--r--sysutils/torque/files/pbs_mom.sh.in2
-rw-r--r--sysutils/torque/files/pbs_sched.sh.in2
-rw-r--r--sysutils/torque/files/pbs_server.sh.in2
-rw-r--r--sysutils/uhidd/files/uhidd.in2
-rw-r--r--sysutils/upsdaemon/files/upsdaemon.in2
-rw-r--r--sysutils/uptimed/files/uptimed.in2
-rw-r--r--sysutils/usermin/files/usermin.sh.in2
-rw-r--r--sysutils/volman/files/volmand.in2
-rw-r--r--sysutils/watchfolder/files/watchd.in2
-rw-r--r--sysutils/webmin/files/webmin.sh.in2
-rw-r--r--sysutils/xsi/files/xsi.in2
-rw-r--r--textproc/pootle/files/pootle.sh.in2
-rw-r--r--textproc/sphinxsearch-devel/files/sphinxsearch.sh.in2
-rw-r--r--textproc/sphinxsearch/files/sphinxsearch.sh.in2
-rw-r--r--textproc/xaira/files/xaira-server.in2
-rw-r--r--www/abyssws/files/abyssws.sh.in2
-rw-r--r--www/amphetadesk/files/amphetadesk.in2
-rw-r--r--www/anyterm/files/anytermd.in2
-rw-r--r--www/aolserver/files/aolserver.in7
-rw-r--r--www/apache20/files/apache2.in2
-rw-r--r--www/apache22/files/apache22.in2
-rw-r--r--www/apache22/files/htcacheclean.in16
-rw-r--r--www/bigbluebutton/files/openoffice.in2
-rw-r--r--www/bozohttpd/files/bozohttpd.in2
-rw-r--r--www/c-icap/files/c_icap.in2
-rw-r--r--www/cacheboy15-devel/files/squid.in2
-rw-r--r--www/cacheboy16/files/squid.in2
-rw-r--r--www/cblog/files/cblog.in2
-rw-r--r--www/cherokee/files/cherokee.sh.in2
-rw-r--r--www/cntlm/files/cntlm.in2
-rw-r--r--www/cocoon/files/cocoon.sh.in2
-rw-r--r--www/dansguardian-devel/files/dansguardian.in2
-rw-r--r--www/dansguardian/files/dansguardian.in2
-rw-r--r--www/dhttpd/files/dhttpd.sh.in2
-rw-r--r--www/elog/files/elogd.in2
-rw-r--r--www/fcgiwrap/files/fcgiwrap.in10
-rw-r--r--www/gatling/files/gatling.in2
-rw-r--r--www/geronimo/files/geronimo2.sh.in2
-rw-r--r--www/havp/files/havp.in2
-rw-r--r--www/helma/files/helma.in2
-rw-r--r--www/hiawatha/files/hiawatha.in2
-rw-r--r--www/hiawatha/files/php-fcgi.in2
-rw-r--r--www/httptunnel/files/htc.in2
-rw-r--r--www/httptunnel/files/hts.in2
-rw-r--r--www/hudson/files/hudson.sh.in2
-rw-r--r--www/hydra/files/hydra.sh.in2
-rw-r--r--www/interchange/files/interchange.sh.in2
-rw-r--r--www/jetty/files/jetty.in2
-rw-r--r--www/kannel/files/kannel.in12
-rw-r--r--www/lighttpd/files/lighttpd.sh.in2
-rw-r--r--www/lusca-head/files/squid.in2
-rw-r--r--www/mohawk/files/mohawk.in2
-rw-r--r--www/monast/files/monast.in2
-rw-r--r--www/nginx-devel/files/nginx.sh.in2
-rw-r--r--www/nginx/files/nginx.sh.in2
-rw-r--r--www/nostromo/files/nostromo.sh.in2
-rw-r--r--www/oops/files/oops.in2
-rw-r--r--www/openacs/files/dotlrn.in7
-rw-r--r--www/openacs/files/openacs.in7
-rw-r--r--www/p5-FCGI-Spawn/files/fcgi_spawn.in2
-rw-r--r--www/p5-Starman/files/starman.in2
-rw-r--r--www/polipo/files/polipo.sh.in2
-rw-r--r--www/pound/files/pound.sh.in2
-rw-r--r--www/privoxy/files/privoxy.in2
-rw-r--r--www/red5/files/red5.in2
-rw-r--r--www/redmine/files/redmine.in2
-rw-r--r--www/resin2/files/resin.sh.in2
-rw-r--r--www/resin3/files/resin.sh.in2
-rw-r--r--www/ruby-cruisecontrolrb/files/cruisecontrolrb.in2
-rw-r--r--www/rubygem-mongrel_cluster/files/mongrel_cluster.in2
-rw-r--r--www/sams/files/sams.sh.in2
-rw-r--r--www/shellinabox/files/shellinaboxd.in2
-rw-r--r--www/spawn-fcgi/files/spawn-fcgi.sh.in2
-rw-r--r--www/spreadlogd/files/spreadlogd.sh.in2
-rw-r--r--www/squid/files/squid.in2
-rw-r--r--www/squid31/files/squid.in2
-rw-r--r--www/tclhttpd/files/tclhttpd.sh.in2
-rw-r--r--www/thttpd/files/thttpd.sh.in2
-rw-r--r--www/thundercache/files/thundercache.in2
-rw-r--r--www/tinyproxy/files/tinyproxy.sh.in2
-rw-r--r--www/tomcat55/files/tomcat55.sh.in2
-rw-r--r--www/tomcat6/files/tomcat6.sh.in2
-rw-r--r--www/tomcat7/files/tomcat7.in2
-rw-r--r--www/trac/files/tracd.in2
-rw-r--r--www/transproxy/files/tproxy.in2
-rw-r--r--www/tt-rss/files/ttrssd.in2
-rw-r--r--www/twms/files/twms.in2
-rw-r--r--www/uwsgi/files/uwsgi.in2
-rw-r--r--www/varnish/files/varnishd.in2
-rw-r--r--www/varnish/files/varnishlog.in2
-rw-r--r--www/varnish/files/varnishncsa.in2
-rw-r--r--www/varnish2/files/varnishd.in2
-rw-r--r--www/varnish2/files/varnishlog.in2
-rw-r--r--www/varnish2/files/varnishncsa.in2
-rw-r--r--www/vdradmin-am/files/vdradmind.in2
-rw-r--r--www/webfs/files/webfsd.in2
-rw-r--r--www/webobjects/files/JavaMonitor.sh.in18
-rw-r--r--www/webobjects/files/wotaskd.sh.in18
-rw-r--r--www/www6to4/files/www6to4.in2
-rw-r--r--www/wwwoffle/files/wwwoffled.sh.in2
-rw-r--r--www/wyvern/files/wyvern.in2
-rw-r--r--www/xshttpd-devel/files/xshttpd.sh.in2
-rw-r--r--www/xshttpd/files/xshttpd.sh.in2
-rw-r--r--www/zerowait-httpd/files/0W-httpd.in2
-rw-r--r--www/zope/files/zeo.in2
-rw-r--r--www/zope/files/zope.in2
-rw-r--r--www/zope211/files/zeo211.in2
-rw-r--r--www/zope211/files/zope211.in2
-rw-r--r--www/zope213/files/zope213.in2
-rw-r--r--x11-drivers/input-wacom/files/wacom.in2
-rw-r--r--x11-fonts/xfs/files/xfs.in2
-rw-r--r--x11/gdm/files/gdm.in2
-rw-r--r--x11/kde4-workspace/files/kdm4.in2
-rw-r--r--x11/slim/files/slim.sh.in2
966 files changed, 1119 insertions, 1114 deletions
diff --git a/astro/gpsd/files/gpsd.in b/astro/gpsd/files/gpsd.in
index a926cb3d3bfe..644d47454d0e 100644
--- a/astro/gpsd/files/gpsd.in
+++ b/astro/gpsd/files/gpsd.in
@@ -24,7 +24,7 @@
. /etc/rc.subr
name=gpsd
-rcvar=`set_rcvar`
+rcvar=gpsd_enable
start_postcmd=start_postcmd
stop_postcmd=stop_postcmd
diff --git a/astro/gpxloggerd/files/gpxloggerd.in b/astro/gpxloggerd/files/gpxloggerd.in
index 28b7ada92f1a..d3874cfb2d45 100644
--- a/astro/gpxloggerd/files/gpxloggerd.in
+++ b/astro/gpxloggerd/files/gpxloggerd.in
@@ -28,7 +28,7 @@
. /etc/rc.subr
name=gpxloggerd
-rcvar=`set_rcvar`
+rcvar=gpxloggerd_enable
load_rc_config $name
diff --git a/audio/aureal-kmod/files/aureal.in b/audio/aureal-kmod/files/aureal.in
index 58b543ecb617..583c641d6793 100644
--- a/audio/aureal-kmod/files/aureal.in
+++ b/audio/aureal-kmod/files/aureal.in
@@ -23,7 +23,7 @@
. /etc/rc.subr
name="aureal"
-rcvar=${name}_enable
+rcvar=aureal_enable
start_cmd="aureal_start"
stop_cmd="aureal_stop"
diff --git a/audio/autocd/files/autocd.in b/audio/autocd/files/autocd.in
index a46cc53bceb7..d512e15cb91f 100644
--- a/audio/autocd/files/autocd.in
+++ b/audio/autocd/files/autocd.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name=autocd
-rcvar=${name}_enable
+rcvar=autocd_enable
command=%%PREFIX%%/sbin/autocd
diff --git a/audio/darkice/files/darkice.in b/audio/darkice/files/darkice.in
index 5a255933b585..8a01894b29e3 100644
--- a/audio/darkice/files/darkice.in
+++ b/audio/darkice/files/darkice.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name="darkice"
-rcvar=`set_rcvar`
+rcvar=darkice_enable
command="%%PREFIX%%/bin/$name"
command_args="& 1>/dev/null"
diff --git a/audio/ezstream/files/ezstream.in b/audio/ezstream/files/ezstream.in
index 620868bc70ea..24e51576a0f9 100644
--- a/audio/ezstream/files/ezstream.in
+++ b/audio/ezstream/files/ezstream.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name="ezstream"
-rcvar=`set_rcvar`
+rcvar=ezstream_enable
# read configuration and set defaults
load_rc_config "$name"
diff --git a/audio/firefly/files/mt-daapd.in b/audio/firefly/files/mt-daapd.in
index 0a600ef0bc91..28ac781b1938 100644
--- a/audio/firefly/files/mt-daapd.in
+++ b/audio/firefly/files/mt-daapd.in
@@ -9,7 +9,7 @@
: ${firefly_enable=NO}
name="firefly"
-rcvar="`set_rcvar`"
+rcvar=firefly_enable
command="%%PREFIX%%/sbin/mt-daapd"
command_args="-c %%PREFIX%%/etc/mt-daapd.conf"
diff --git a/audio/gnump3d/files/gnump3d.sh.in b/audio/gnump3d/files/gnump3d.sh.in
index 815966924b08..e68f1c1cf09c 100644
--- a/audio/gnump3d/files/gnump3d.sh.in
+++ b/audio/gnump3d/files/gnump3d.sh.in
@@ -12,7 +12,7 @@ gnump3d_flags=${gnump3d_flags-"--fast --quiet --background"}
gnump3d_pidfile=${gnump3d_pidfile:-/var/run/gnump3d.pid}
name="gnump3d"
-rcvar=`set_rcvar`
+rcvar=gnump3d_enable
command="%%PREFIX%%/bin/gnump3d"
command_interpreter="%%PERL%%"
pidfile="${gnump3d_pidfile}"
diff --git a/audio/icecast2/files/icecast2.sh.in b/audio/icecast2/files/icecast2.sh.in
index caa5edee2448..05f0f7494cb2 100644
--- a/audio/icecast2/files/icecast2.sh.in
+++ b/audio/icecast2/files/icecast2.sh.in
@@ -24,7 +24,7 @@
. /etc/rc.subr
name="icecast"
-rcvar=`set_rcvar`
+rcvar=icecast_enable
command="%%PREFIX%%/bin/icecast"
command_args="-b 1>/dev/null"
diff --git a/audio/ices0/files/ices0.sh.in b/audio/ices0/files/ices0.sh.in
index 18c7b3973ba3..698128f462d7 100644
--- a/audio/ices0/files/ices0.sh.in
+++ b/audio/ices0/files/ices0.sh.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name="ices0"
-rcvar=`set_rcvar`
+rcvar=ices0_enable
command="%%PREFIX%%/bin/$name"
command_args="1>/dev/null 2>&1"
diff --git a/audio/liquidsoap/files/liquidsoap.sh.in b/audio/liquidsoap/files/liquidsoap.sh.in
index 03c3bddee773..bc7bb18b0872 100644
--- a/audio/liquidsoap/files/liquidsoap.sh.in
+++ b/audio/liquidsoap/files/liquidsoap.sh.in
@@ -12,7 +12,7 @@
. /etc/rc.subr
name=liquidsoap
-rcvar=`set_rcvar`
+rcvar=liquidsoap_enable
command=%%PREFIX%%/bin/liquidsoap
diff --git a/audio/madfufw/files/maudio.in b/audio/madfufw/files/maudio.in
index b12a2b51e96c..e60c6c971ee9 100644
--- a/audio/madfufw/files/maudio.in
+++ b/audio/madfufw/files/maudio.in
@@ -22,7 +22,7 @@ echo $$ >/var/run/maudio.pid
. /etc/rc.subr
name="maudio"
-rcvar=`set_rcvar`
+rcvar=maudio_enable
load_rc_config $name
: ${maudio_enable="NO"}
diff --git a/audio/mpdas/files/mpdas.in b/audio/mpdas/files/mpdas.in
index f9d17b01f7ca..3556061a64ec 100644
--- a/audio/mpdas/files/mpdas.in
+++ b/audio/mpdas/files/mpdas.in
@@ -12,7 +12,7 @@
. /etc/rc.subr
name=mpdas
-rcvar=`set_rcvar`
+rcvar=mpdas_enable
command=%%PREFIX%%/bin/mpdas
diff --git a/audio/mpdscribble/files/mpdscribble.in b/audio/mpdscribble/files/mpdscribble.in
index 1193858e03eb..d7e62fb4ed53 100644
--- a/audio/mpdscribble/files/mpdscribble.in
+++ b/audio/mpdscribble/files/mpdscribble.in
@@ -12,7 +12,7 @@
. /etc/rc.subr
name=mpdscribble
-rcvar=`set_rcvar`
+rcvar=mpdscribble_enable
command=%%PREFIX%%/bin/mpdscribble
diff --git a/audio/murmur/files/murmur.in b/audio/murmur/files/murmur.in
index 185730ecc91c..a3baee3084e8 100644
--- a/audio/murmur/files/murmur.in
+++ b/audio/murmur/files/murmur.in
@@ -22,7 +22,7 @@
: ${murmur_user="murmur"}
name=murmur
-rcvar=${name}_enable
+rcvar=murmur_enable
command="%%PREFIX%%/sbin/murmurd"
command_args="-ini %%PREFIX%%/etc/murmur.ini"
diff --git a/audio/musicpd/files/musicpd.in b/audio/musicpd/files/musicpd.in
index 05ce1d909cdf..cf41cc5173b5 100644
--- a/audio/musicpd/files/musicpd.in
+++ b/audio/musicpd/files/musicpd.in
@@ -13,7 +13,7 @@
. /etc/rc.subr
name=musicpd
-rcvar=`set_rcvar`
+rcvar=musicpd_enable
start_precmd="${name}_getpidfile"
stop_precmd="${name}_getpidfile"
diff --git a/audio/oss/files/oss.in b/audio/oss/files/oss.in
index aa4a8a93b3cd..1ed49145aba2 100644
--- a/audio/oss/files/oss.in
+++ b/audio/oss/files/oss.in
@@ -7,7 +7,7 @@
. /etc/rc.subr
name="oss"
-rcvar=`set_rcvar`
+rcvar=oss_enable
stop_cmd="oss_stop"
start_cmd="oss_start"
diff --git a/audio/shairport/files/shairport.in b/audio/shairport/files/shairport.in
index d4177ffa741d..8113274556c0 100644
--- a/audio/shairport/files/shairport.in
+++ b/audio/shairport/files/shairport.in
@@ -20,7 +20,7 @@
. /etc/rc.subr
name="shairport"
-rcvar=${name}_enable
+rcvar=shairport_enable
load_rc_config ${name}
diff --git a/audio/squeezeboxserver/files/squeezeboxserver.sh.in b/audio/squeezeboxserver/files/squeezeboxserver.sh.in
index 39745682acc7..833ea1871af0 100644
--- a/audio/squeezeboxserver/files/squeezeboxserver.sh.in
+++ b/audio/squeezeboxserver/files/squeezeboxserver.sh.in
@@ -18,7 +18,7 @@
name=%%PORTNAME%%
start_precmd="%%PORTNAME%%_start_precmd"
stop_postcmd="%%PORTNAME%%_stop_postcmd"
-rcvar=`set_rcvar`
+rcvar=%%PORTNAME%%_enable
command=%%PREFIX%%/%%SLIMDIR%%/slimserver.pl
command_interpreter=%%PERL%%
diff --git a/audio/teamspeak3-server/files/teamspeak.in b/audio/teamspeak3-server/files/teamspeak.in
index d9edb0ad6ee4..e580ccc3d43c 100644
--- a/audio/teamspeak3-server/files/teamspeak.in
+++ b/audio/teamspeak3-server/files/teamspeak.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name="teamspeak"
-rcvar=${name}_enable
+rcvar=teamspeak_enable
db_dir=/var/db/teamspeak
log_dir=/var/log/teamspeak
diff --git a/audio/teamspeak_server/files/teamspeak-server.in b/audio/teamspeak_server/files/teamspeak-server.in
index 450b096b377f..1052c175e4ce 100644
--- a/audio/teamspeak_server/files/teamspeak-server.in
+++ b/audio/teamspeak_server/files/teamspeak-server.in
@@ -19,7 +19,7 @@
teamspeak_user=${teamspeak_user:-"teamspeak"}
name=teamspeak
-rcvar=${name}_enable
+rcvar=teamspeak_enable
command="%%PREFIX%%/lib/teamspeak_server/server_linux"
command_args=">/dev/null"
diff --git a/audio/umurmur/files/umurmur.in b/audio/umurmur/files/umurmur.in
index e6b022be9cee..7bd77f218366 100644
--- a/audio/umurmur/files/umurmur.in
+++ b/audio/umurmur/files/umurmur.in
@@ -20,7 +20,7 @@
. /etc/rc.subr
name=umurmur
-rcvar=${name}_enable
+rcvar=umurmur_enable
# pidfile
pidfile="/var/run/umurmur/umurmur.pid"
diff --git a/audio/ventrilo-server/files/ventrilo-server.sh.in b/audio/ventrilo-server/files/ventrilo-server.sh.in
index 9b3df6607428..f638cd279564 100644
--- a/audio/ventrilo-server/files/ventrilo-server.sh.in
+++ b/audio/ventrilo-server/files/ventrilo-server.sh.in
@@ -9,6 +9,8 @@
. /etc/rc.subr
name=ventrilo
+rcvar=ventrilo_enable
+
homedir="%%PREFIX%%/ventrilo-server"
pidfile="${homedir}/ventrilo_srv.pid"
ventrilo_user=${name}
@@ -17,8 +19,6 @@ command_args="'-f${homedir}/ventrilo_srv' -d >/dev/null"
extra_commands="info"
info_cmd="ventrilo_info"
-rcvar=`set_rcvar`
-
load_rc_config $name
: ${ventrilo_enable="NO"}
diff --git a/benchmarks/thrulay/files/thrulayd.in b/benchmarks/thrulay/files/thrulayd.in
index 9161623427fb..369de3b6f4f6 100644
--- a/benchmarks/thrulay/files/thrulayd.in
+++ b/benchmarks/thrulay/files/thrulayd.in
@@ -10,7 +10,7 @@
. /etc/rc.subr
name="thrulayd"
-rcvar=`set_rcvar`
+rcvar=thrulayd_enable
# read settings, set default values
load_rc_config "${name}"
diff --git a/comms/aprsd/files/aprsd b/comms/aprsd/files/aprsd
index 5556e8572595..3f260afc9057 100644
--- a/comms/aprsd/files/aprsd
+++ b/comms/aprsd/files/aprsd
@@ -10,7 +10,7 @@
. /etc/rc.subr
name="aprsd"
-rcvar=`set_rcvar`
+rcvar=aprsd_enable
load_rc_config $name
aprsd_enable=${aprsd_enable-"NO"}
aprsd_root=${aprsd_root-"NO"}
diff --git a/comms/atslog/files/atslogd.in b/comms/atslog/files/atslogd.in
index f8ccc67f06a6..d1db9a2ab112 100644
--- a/comms/atslog/files/atslogd.in
+++ b/comms/atslog/files/atslogd.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name="atslogd"
-rcvar=${name}_enable
+rcvar=atslogd_enable
load_rc_config $name
diff --git a/comms/conserver-com/files/conserver.sh.in b/comms/conserver-com/files/conserver.sh.in
index d73e9c5fc987..cb7e87dfece7 100644
--- a/comms/conserver-com/files/conserver.sh.in
+++ b/comms/conserver-com/files/conserver.sh.in
@@ -10,7 +10,7 @@
. /etc/rc.subr
name="conserver"
-rcvar=`set_rcvar`
+rcvar=conserver_enable
command=%%PREFIX%%/sbin/${name}
pidfile=/var/run/${name}.pid
diff --git a/comms/conserver/files/conserver.sh.in b/comms/conserver/files/conserver.sh.in
index 73c41fcbaecb..0cc210e94f2e 100644
--- a/comms/conserver/files/conserver.sh.in
+++ b/comms/conserver/files/conserver.sh.in
@@ -16,7 +16,7 @@ conserver_enable=${conserver_enable:-"no"}
. /etc/rc.subr
name=conserver
-rcvar=`set_rcvar`
+rcvar=conserver_enable
command=%%PREFIX%%/sbin/conserver
conserver_configfile=${conserver_configfile:-"%%PREFIX%%/etc/conserver.cf"}
diff --git a/comms/hylafax/files/hylafax.sh.in b/comms/hylafax/files/hylafax.sh.in
index 3fa44f733788..3e08c32ae05b 100644
--- a/comms/hylafax/files/hylafax.sh.in
+++ b/comms/hylafax/files/hylafax.sh.in
@@ -17,7 +17,7 @@ hylafax_enable=${hylafax_enable-"NO"}
. /etc/rc.subr
name="hylafax"
-rcvar=`set_rcvar`
+rcvar=hylafax_enable
start_cmd="%%PREFIX%%/sbin/hylafax start"
stop_cmd="%%PREFIX%%/sbin/hylafax stop"
diff --git a/comms/lirc/files/lircd.sh.in b/comms/lirc/files/lircd.sh.in
index c1ade263601c..ecc2cc83d122 100644
--- a/comms/lirc/files/lircd.sh.in
+++ b/comms/lirc/files/lircd.sh.in
@@ -13,7 +13,7 @@
. /etc/rc.subr
name="lircd"
-rcvar=`set_rcvar`
+rcvar=lircd_enable
load_rc_config ${name}
: ${lircd_enable="NO"}
diff --git a/comms/qpage/files/qpage.in b/comms/qpage/files/qpage.in
index dc29bc609441..f55223805ff9 100644
--- a/comms/qpage/files/qpage.in
+++ b/comms/qpage/files/qpage.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name="qpage"
-rcvar=${name}_enable
+rcvar=qpage_enable
command=%%PREFIX%%/bin/${name}
diff --git a/comms/ser2net/files/ser2net.in b/comms/ser2net/files/ser2net.in
index 7d6e3cdaa7fe..5e96e013ceb5 100644
--- a/comms/ser2net/files/ser2net.in
+++ b/comms/ser2net/files/ser2net.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name="ser2net"
-rcvar=`set_rcvar`
+rcvar=ser2net_enable
command="%%PREFIX%%/sbin/ser2net"
load_rc_config $name
diff --git a/comms/smstools3/files/smsd.in b/comms/smstools3/files/smsd.in
index 68ca1681314b..df8062f81e45 100644
--- a/comms/smstools3/files/smsd.in
+++ b/comms/smstools3/files/smsd.in
@@ -13,6 +13,7 @@
. /etc/rc.subr
name="smsd"
+rcvar=smsd_enable
load_rc_config ${name}
: ${smsd_enable="NO"}
@@ -23,7 +24,6 @@ load_rc_config ${name}
: ${smsd_user="uucp"}
: ${smsd_group="dialer"}
-rcvar=`set_rcvar`
pidfile=${smsd_pidfile}
command="%%PREFIX%%/bin/smsd"
command_args="-c${smsd_config} -p${smsd_pidfile} -i${smsd_infofile} -l${smsd_logfile} -u${smsd_user} -g${smsd_group}"
diff --git a/comms/soundmodem/files/soundmodem b/comms/soundmodem/files/soundmodem
index 4bfdf0c6116e..f602fd3bf9cc 100644
--- a/comms/soundmodem/files/soundmodem
+++ b/comms/soundmodem/files/soundmodem
@@ -10,7 +10,7 @@
. /etc/rc.subr
name=soundmodem
-rcvar=`set_rcvar`
+rcvar=soundmodem_enable
load_rc_config $name
soundmodem_enable=${soundmodem_enable-"NO"}
diff --git a/comms/thebridge/files/tbd.in b/comms/thebridge/files/tbd.in
index 6ba5d9749bfc..4fee29232cce 100644
--- a/comms/thebridge/files/tbd.in
+++ b/comms/thebridge/files/tbd.in
@@ -20,7 +20,7 @@ tbd_enable=${tbd_enable-"NO"}
. /etc/rc.subr
name="tbd"
-rcvar=`set_rcvar`
+rcvar=tbd_enable
command="%%PREFIX%%/libexec/tbd"
load_rc_config $name
diff --git a/comms/tits/files/tits.in b/comms/tits/files/tits.in
index fe2ebd239220..ffddab60aa6e 100644
--- a/comms/tits/files/tits.in
+++ b/comms/tits/files/tits.in
@@ -19,7 +19,7 @@ tits_enable="${tits_enable-NO}"
. /etc/rc.subr
name="tits"
-rcvar=`set_rcvar`
+rcvar=tits_enable
command="%%PREFIX%%/sbin/tits"
load_rc_config $name
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}"
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
diff --git a/dns/adsuck/files/adsuck.in b/dns/adsuck/files/adsuck.in
index 966af0637698..d9c694e94bfb 100644
--- a/dns/adsuck/files/adsuck.in
+++ b/dns/adsuck/files/adsuck.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name="adsuck"
-rcvar=${name}_enable
+rcvar=adsuck_enable
command=%%PREFIX%%/sbin/${name}
extra_commands="reload"
diff --git a/dns/bindgraph/files/bindgraph.in b/dns/bindgraph/files/bindgraph.in
index 2856d87006b2..62b0fd34d204 100644
--- a/dns/bindgraph/files/bindgraph.in
+++ b/dns/bindgraph/files/bindgraph.in
@@ -13,7 +13,7 @@
. /etc/rc.subr
name="bindgraph"
-rcvar=`set_rcvar`
+rcvar=bindgraph_enable
command=%%PREFIX%%/sbin/${name}.pl > /dev/null 2>&1
command_interpreter=/usr/bin/perl
diff --git a/dns/ddclient/files/ddclient.in b/dns/ddclient/files/ddclient.in
index ea066ddf1bb0..7e32aa4e3408 100644
--- a/dns/ddclient/files/ddclient.in
+++ b/dns/ddclient/files/ddclient.in
@@ -17,7 +17,7 @@
. /etc/rc.subr
name="ddclient"
-rcvar=${name}_enable
+rcvar=ddclient_enable
command="%%PREFIX%%/sbin/${name}"
required_files="%%PREFIX%%/etc/${name}.conf"
diff --git a/dns/dnrd/files/dnrd.sh.in b/dns/dnrd/files/dnrd.sh.in
index 0ec87c0d7df2..1e801c5d493d 100644
--- a/dns/dnrd/files/dnrd.sh.in
+++ b/dns/dnrd/files/dnrd.sh.in
@@ -15,7 +15,7 @@ dnrd_enable=${dnrd_enable-"NO"}
. /etc/rc.subr
name=dnrd
-rcvar=$(set_rcvar)
+rcvar=dnrd_enable
command=%%PREFIX%%/sbin/${name}
pidfile=/var/run/${name}.pid
diff --git a/dns/dns_balance/files/dns_balance.sh.in b/dns/dns_balance/files/dns_balance.sh.in
index cbeac7ab8d2d..50a51098631c 100644
--- a/dns/dns_balance/files/dns_balance.sh.in
+++ b/dns/dns_balance/files/dns_balance.sh.in
@@ -12,7 +12,7 @@
. /etc/rc.subr
name=dns_balance
-rcvar=`set_rcvar`
+rcvar=dns_balance_enable
load_rc_config ${name}
: ${dns_balance_enable="NO"}
diff --git a/dns/dnscheckengine/files/patch-contrib_dnscheck-dispatcher.sh b/dns/dnscheckengine/files/patch-contrib_dnscheck-dispatcher.sh
index 5aa9989f5e45..bc9b80e8438f 100644
--- a/dns/dnscheckengine/files/patch-contrib_dnscheck-dispatcher.sh
+++ b/dns/dnscheckengine/files/patch-contrib_dnscheck-dispatcher.sh
@@ -6,7 +6,7 @@ $FreeBSD$
@@ -20,7 +20,7 @@
name="dnscheck_dispatcher"
- rcvar=`set_rcvar`
+ rcvar=dnscheck_dispatcher_enable
-command="/usr/local/bin/dnscheck-dispatcher"
+command="%%PREFIX%%/libexec/dnscheck/dnscheck-dispatcher"
diff --git a/dns/dnsmasq/files/dnsmasq.sh.in b/dns/dnsmasq/files/dnsmasq.sh.in
index a56289ab2d22..26d7b267d301 100644
--- a/dns/dnsmasq/files/dnsmasq.sh.in
+++ b/dns/dnsmasq/files/dnsmasq.sh.in
@@ -43,7 +43,7 @@
. /etc/rc.subr
name=dnsmasq
-rcvar=$(set_rcvar)
+rcvar=dnsmasq_enable
command="%%PREFIX%%/sbin/${name}"
pidfile="/var/run/${name}.pid"
diff --git a/dns/dnsproxy/files/dnsproxy.in b/dns/dnsproxy/files/dnsproxy.in
index e35fd5660d43..9e60ce4d9a79 100644
--- a/dns/dnsproxy/files/dnsproxy.in
+++ b/dns/dnsproxy/files/dnsproxy.in
@@ -24,7 +24,7 @@ command_args=${dnsproxy_flags:-"-c %%ETCDIR%%/dnsproxy.conf -d"}
. /etc/rc.subr
name="dnsproxy"
-rcvar=`set_rcvar`
+rcvar=dnsproxy_enable
command="%%PREFIX%%/sbin/dnsproxy"
diff --git a/dns/dnsreflector/files/dnsreflector.in b/dns/dnsreflector/files/dnsreflector.in
index 6d51b18cdda0..c70af615e15f 100644
--- a/dns/dnsreflector/files/dnsreflector.in
+++ b/dns/dnsreflector/files/dnsreflector.in
@@ -24,7 +24,7 @@ command_args=${dnsreflector_flags:-"-d -a 127.0.0.1 -p 53000"}
. /etc/rc.subr
name="dnsreflector"
-rcvar=`set_rcvar`
+rcvar=dnsreflector_enable
command="%%PREFIX%%/sbin/dnsreflector"
diff --git a/dns/dualserver/files/dualserver.sh.in b/dns/dualserver/files/dualserver.sh.in
index bcd54f6eb1d5..9c90a19714bd 100644
--- a/dns/dualserver/files/dualserver.sh.in
+++ b/dns/dualserver/files/dualserver.sh.in
@@ -9,7 +9,7 @@
. /etc/rc.subr
name="dualserver"
-rcvar=`set_rcvar`
+rcvar=dualserver_enable
start_cmd="dualserver_startcmd"
stop_cmd="dualserver_stopcmd"
diff --git a/dns/ez-ipupdate/files/ez-ipupdate.sh.in b/dns/ez-ipupdate/files/ez-ipupdate.sh.in
index fb9a4a77cc5d..1209b62e4770 100644
--- a/dns/ez-ipupdate/files/ez-ipupdate.sh.in
+++ b/dns/ez-ipupdate/files/ez-ipupdate.sh.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name=ez_ipupdate
-rcvar=`set_rcvar`
+rcvar=ez_ipupdate_enable
load_rc_config $name
diff --git a/dns/inadyn/files/inadyn.in b/dns/inadyn/files/inadyn.in
index e7ed8818edc0..8f70254405ea 100644
--- a/dns/inadyn/files/inadyn.in
+++ b/dns/inadyn/files/inadyn.in
@@ -23,7 +23,7 @@
. /etc/rc.subr
name="inadyn"
-rcvar=`set_rcvar`
+rcvar=inadyn_enable
command=%%PREFIX%%/bin/${name}
diff --git a/dns/maradns/files/maradns.in b/dns/maradns/files/maradns.in
index dafc71d470f3..0d36f307f9b6 100644
--- a/dns/maradns/files/maradns.in
+++ b/dns/maradns/files/maradns.in
@@ -15,7 +15,7 @@
: ${maradns_conf="%%PREFIX%%/etc/mararc"}
name="maradns"
-rcvar=`set_rcvar`
+rcvar=maradns_enable
command="%%PREFIX%%/bin/duende"
command_args="%%PREFIX%%/sbin/maradns -f ${maradns_conf}"
pidfile="/var/run/${name}.pid"
diff --git a/dns/maradns/files/zoneserver.in b/dns/maradns/files/zoneserver.in
index 84e59315b98f..40614d213081 100644
--- a/dns/maradns/files/zoneserver.in
+++ b/dns/maradns/files/zoneserver.in
@@ -15,7 +15,7 @@
: ${maradns_conf="%%PREFIX%%/etc/mararc"}
name="zoneserver"
-rcvar=`set_rcvar`
+rcvar=zoneserver_enable
command="%%PREFIX%%/bin/duende"
command_args="%%PREFIX%%/sbin/zoneserver -f ${maradns_conf}"
pidfile="/var/run/${name}.pid"
diff --git a/dns/mydns-ng/files/mydns.in b/dns/mydns-ng/files/mydns.in
index 20bd91a7931d..896a550fda4b 100644
--- a/dns/mydns-ng/files/mydns.in
+++ b/dns/mydns-ng/files/mydns.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name="mydns"
-rcvar=`set_rcvar`
+rcvar=mydns_enable
load_rc_config $name
diff --git a/dns/mydns/files/mydns.sh.in b/dns/mydns/files/mydns.sh.in
index 20bd91a7931d..896a550fda4b 100644
--- a/dns/mydns/files/mydns.sh.in
+++ b/dns/mydns/files/mydns.sh.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name="mydns"
-rcvar=`set_rcvar`
+rcvar=mydns_enable
load_rc_config $name
diff --git a/dns/noip/files/noip.in b/dns/noip/files/noip.in
index b9e7326f0355..67509068fedc 100644
--- a/dns/noip/files/noip.in
+++ b/dns/noip/files/noip.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name="noip"
-rcvar=`set_rcvar`
+rcvar=noip_enable
command="%%PREFIX%%/bin/noip2"
diff --git a/dns/nsd/files/nsd.in b/dns/nsd/files/nsd.in
index a040d4d5b59c..5021db398267 100644
--- a/dns/nsd/files/nsd.in
+++ b/dns/nsd/files/nsd.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name=nsd
-rcvar=`set_rcvar`
+rcvar=nsd_enable
required_files=%%PREFIX%%/etc/nsd/nsd.conf
diff --git a/dns/opendd/files/opendd.in b/dns/opendd/files/opendd.in
index b8f3ce6dfddd..c1b6d5bdc6a2 100644
--- a/dns/opendd/files/opendd.in
+++ b/dns/opendd/files/opendd.in
@@ -13,7 +13,7 @@
. /etc/rc.subr
name="opendd"
-rcvar=${name}_enable
+rcvar=opendd_enable
load_rc_config $name
diff --git a/dns/opendnssec/files/opendnssec.in b/dns/opendnssec/files/opendnssec.in
index 9fedbd161f99..7f76f0e00f71 100644
--- a/dns/opendnssec/files/opendnssec.in
+++ b/dns/opendnssec/files/opendnssec.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name=opendnssec
-rcvar=`set_rcvar`
+rcvar=opendnssec_enable
load_rc_config $name
diff --git a/dns/pdnsd/files/pdnsd.in b/dns/pdnsd/files/pdnsd.in
index 1d8172b210fe..0d497057301b 100644
--- a/dns/pdnsd/files/pdnsd.in
+++ b/dns/pdnsd/files/pdnsd.in
@@ -7,7 +7,7 @@
. /etc/rc.subr
name="pdnsd"
-rcvar=${name}_enable
+rcvar=pdnsd_enable
command="%%PREFIX%%/sbin/pdnsd"
command_args="-d"
required_files="%%PREFIX%%/etc/pdnsd.conf"
diff --git a/dns/powerdns-devel/files/pdns-devel.in b/dns/powerdns-devel/files/pdns-devel.in
index 5d4e241c4e81..27be465f7546 100644
--- a/dns/powerdns-devel/files/pdns-devel.in
+++ b/dns/powerdns-devel/files/pdns-devel.in
@@ -19,7 +19,7 @@
. /etc/rc.subr
name=pdns
-rcvar=`set_rcvar`
+rcvar=pdns_enable
command=%%PREFIX%%/sbin/pdns_server
diff --git a/dns/powerdns-recursor/files/pdns-recursor.in b/dns/powerdns-recursor/files/pdns-recursor.in
index fa96b8e928ae..8c3310be695a 100644
--- a/dns/powerdns-recursor/files/pdns-recursor.in
+++ b/dns/powerdns-recursor/files/pdns-recursor.in
@@ -20,7 +20,7 @@
. /etc/rc.subr
name=pdns_recursor
-rcvar=`set_rcvar`
+rcvar=pdns_recursor_enable
command=%%PREFIX%%/sbin/pdns_recursor
diff --git a/dns/powerdns/files/pdns.in b/dns/powerdns/files/pdns.in
index 5d4e241c4e81..27be465f7546 100644
--- a/dns/powerdns/files/pdns.in
+++ b/dns/powerdns/files/pdns.in
@@ -19,7 +19,7 @@
. /etc/rc.subr
name=pdns
-rcvar=`set_rcvar`
+rcvar=pdns_enable
command=%%PREFIX%%/sbin/pdns_server
diff --git a/dns/radns/files/radns.in b/dns/radns/files/radns.in
index 81d31496c68f..63977fd9cf07 100644
--- a/dns/radns/files/radns.in
+++ b/dns/radns/files/radns.in
@@ -17,7 +17,7 @@
. /etc/rc.subr
name=radns
-rcvar=`set_rcvar`
+rcvar=radns_enable
radns_dir="%%PREFIX%%/etc/radns"
load_rc_config $name
diff --git a/dns/rbldnsd/files/rbldnsd.in b/dns/rbldnsd/files/rbldnsd.in
index 799d4c707190..dcab5decfb7b 100644
--- a/dns/rbldnsd/files/rbldnsd.in
+++ b/dns/rbldnsd/files/rbldnsd.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name=rbldnsd
-rcvar=`set_rcvar`
+rcvar=rbldnsd_enable
command=%%PREFIX%%/sbin/rbldnsd
pidfile=/var/run/rbldnsd.pid
diff --git a/dns/totd/files/totd.in b/dns/totd/files/totd.in
index d66cdfa44a22..c0c9eb9a8e50 100644
--- a/dns/totd/files/totd.in
+++ b/dns/totd/files/totd.in
@@ -20,7 +20,7 @@ totd_enable=${totd_enable:-"NO"} # Enable totd
. /etc/rc.subr
name="totd"
-rcvar=`set_rcvar`
+rcvar=totd_enable
command="%%PREFIX%%/sbin/${name}"
pidfile="/var/run/${name}.pid"
required_files="%%PREFIX%%/etc/${name}.conf"
diff --git a/dns/unbound/files/unbound.in b/dns/unbound/files/unbound.in
index a6125df1778e..94d3807870b3 100644
--- a/dns/unbound/files/unbound.in
+++ b/dns/unbound/files/unbound.in
@@ -13,7 +13,7 @@
. /etc/rc.subr
name="unbound"
-rcvar=`set_rcvar`
+rcvar=unbound_enable
command="%%PREFIX%%/sbin/unbound"
extra_commands="reload"
diff --git a/emulators/kqemu-kmod-devel/files/kqemu.in b/emulators/kqemu-kmod-devel/files/kqemu.in
index 7662ca3cccd1..1903deec4d71 100644
--- a/emulators/kqemu-kmod-devel/files/kqemu.in
+++ b/emulators/kqemu-kmod-devel/files/kqemu.in
@@ -12,7 +12,7 @@
. /etc/rc.subr
name="kqemu"
-rcvar=${name}_enable
+rcvar=kqemu_enable
load_rc_config $name
diff --git a/emulators/kqemu-kmod/files/kqemu.in b/emulators/kqemu-kmod/files/kqemu.in
index 7662ca3cccd1..1903deec4d71 100644
--- a/emulators/kqemu-kmod/files/kqemu.in
+++ b/emulators/kqemu-kmod/files/kqemu.in
@@ -12,7 +12,7 @@
. /etc/rc.subr
name="kqemu"
-rcvar=${name}_enable
+rcvar=kqemu_enable
load_rc_config $name
diff --git a/emulators/open-vm-tools/files/vmware-guestd.sh.in b/emulators/open-vm-tools/files/vmware-guestd.sh.in
index 08b77e5e3bed..25c42936435a 100644
--- a/emulators/open-vm-tools/files/vmware-guestd.sh.in
+++ b/emulators/open-vm-tools/files/vmware-guestd.sh.in
@@ -14,7 +14,7 @@ checkvm_cmd="%%PREFIX%%/bin/vmware-checkvm > /dev/null"
# VMware guest daemon
name="vmware_guestd"
-rcvar=`set_rcvar`
+rcvar=vmware_guestd_enable
start_precmd="${checkvm_cmd}"
unset start_cmd
stop_precmd="${checkvm_cmd}"
diff --git a/emulators/open-vm-tools/files/vmware-kmod.sh.in b/emulators/open-vm-tools/files/vmware-kmod.sh.in
index 433604f536d4..4831d99a4366 100644
--- a/emulators/open-vm-tools/files/vmware-kmod.sh.in
+++ b/emulators/open-vm-tools/files/vmware-kmod.sh.in
@@ -42,7 +42,7 @@ vmware_mod_status()
# VMware kernel module: vmmemctl
kernel_mod="vmmemctl"
name="vmware_guest_${kernel_mod}"
-rcvar=`set_rcvar`
+rcvar=vmware_guest_${kernel_mod}_enable
extra_commands="status"
status_cmd="vmware_mod_status ${kernel_mod}"
start_precmd="${checkvm_cmd}"
@@ -58,7 +58,7 @@ run_rc_command "$1"
# VMware kernel module: vmxnet
kernel_mod="vmxnet"
name="vmware_guest_${kernel_mod}"
-rcvar=`set_rcvar`
+rcvar=vmware_guest_${kernel_mod}_enable
extra_commands="status"
status_cmd="vmware_mod_status ${kernel_mod}"
start_precmd="${checkvm_cmd}"
@@ -73,7 +73,7 @@ run_rc_command "$1"
# VMware kernel module: vmblock
kernel_mod="vmblock"
name="vmware_guest_${kernel_mod}"
-rcvar=`set_rcvar`
+rcvar=vmware_guest_${kernel_mod}_enable
extra_commands="status"
status_cmd="vmware_mod_status ${kernel_mod}"
start_precmd="${checkvm_cmd}"
@@ -88,7 +88,7 @@ run_rc_command "$1"
# VMware kernel module: vmhgfs
kernel_mod="vmhgfs"
name="vmware_guest_${kernel_mod}"
-rcvar=`set_rcvar`
+rcvar=vmware_guest_${kernel_mod}_enable
extra_commands="status"
status_cmd="vmware_mod_status ${kernel_mod}"
start_precmd="${checkvm_cmd}"
diff --git a/emulators/tpm-emulator/files/tpmd.in b/emulators/tpm-emulator/files/tpmd.in
index 0af8eaeac3e6..42e07df28575 100644
--- a/emulators/tpm-emulator/files/tpmd.in
+++ b/emulators/tpm-emulator/files/tpmd.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name=tpmd
-rcvar=`set_rcvar`
+rcvar=tpmd_enable
command="%%PREFIX%%/bin/${name}"
load_rc_config $name
diff --git a/emulators/virtualbox-ose-additions/files/vboxguest.in b/emulators/virtualbox-ose-additions/files/vboxguest.in
index 702b83499763..e2e1b501e2ae 100644
--- a/emulators/virtualbox-ose-additions/files/vboxguest.in
+++ b/emulators/virtualbox-ose-additions/files/vboxguest.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name="vboxguest"
-rcvar=${name}_enable
+rcvar=vboxguest_enable
start_cmd="vboxguest_start"
stop_cmd="vboxguest_stop"
diff --git a/emulators/virtualbox-ose-additions/files/vboxservice.in b/emulators/virtualbox-ose-additions/files/vboxservice.in
index 85a235fd2da1..cb2375868ca9 100644
--- a/emulators/virtualbox-ose-additions/files/vboxservice.in
+++ b/emulators/virtualbox-ose-additions/files/vboxservice.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name="vboxservice"
-rcvar=`set_rcvar`
+rcvar=vboxservice_enable
command="%%PREFIX%%/sbin/VBoxService"
load_rc_config $name
diff --git a/emulators/virtualbox-ose-kmod-legacy/files/vboxnet.in b/emulators/virtualbox-ose-kmod-legacy/files/vboxnet.in
index 17f079bd900c..cf4225486a30 100644
--- a/emulators/virtualbox-ose-kmod-legacy/files/vboxnet.in
+++ b/emulators/virtualbox-ose-kmod-legacy/files/vboxnet.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name="vboxnet"
-rcvar=${name}_enable
+rcvar=vboxnet_enable
start_cmd="vboxnet_start"
stop_cmd="vboxnet_stop"
diff --git a/emulators/virtualbox-ose-kmod/files/vboxnet.in b/emulators/virtualbox-ose-kmod/files/vboxnet.in
index 17f079bd900c..cf4225486a30 100644
--- a/emulators/virtualbox-ose-kmod/files/vboxnet.in
+++ b/emulators/virtualbox-ose-kmod/files/vboxnet.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name="vboxnet"
-rcvar=${name}_enable
+rcvar=vboxnet_enable
start_cmd="vboxnet_start"
stop_cmd="vboxnet_stop"
diff --git a/emulators/virtualbox-ose-legacy/files/vboxheadless.in b/emulators/virtualbox-ose-legacy/files/vboxheadless.in
index 8913f192ffb8..544b5912814f 100644
--- a/emulators/virtualbox-ose-legacy/files/vboxheadless.in
+++ b/emulators/virtualbox-ose-legacy/files/vboxheadless.in
@@ -26,7 +26,7 @@
. /etc/rc.subr
name="vboxheadless"
-rcvar=`set_rcvar`
+rcvar=vboxheadless_enable
command="%%PREFIX%%/bin/VBoxHeadless"
pidbase="/var/run/${name}"
diff --git a/emulators/virtualbox-ose-legacy/files/vboxwebsrv.in b/emulators/virtualbox-ose-legacy/files/vboxwebsrv.in
index 2905effbb3a8..73dabca8a8b3 100644
--- a/emulators/virtualbox-ose-legacy/files/vboxwebsrv.in
+++ b/emulators/virtualbox-ose-legacy/files/vboxwebsrv.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name=vboxwebsrv
-rcvar=`set_rcvar`
+rcvar=vboxwebsrv_enable
command="%%PREFIX%%/bin/vboxwebsrv"
pidfile="/var/run/${name}.pid"
diff --git a/emulators/virtualbox-ose/files/vboxheadless.in b/emulators/virtualbox-ose/files/vboxheadless.in
index 8913f192ffb8..544b5912814f 100644
--- a/emulators/virtualbox-ose/files/vboxheadless.in
+++ b/emulators/virtualbox-ose/files/vboxheadless.in
@@ -26,7 +26,7 @@
. /etc/rc.subr
name="vboxheadless"
-rcvar=`set_rcvar`
+rcvar=vboxheadless_enable
command="%%PREFIX%%/bin/VBoxHeadless"
pidbase="/var/run/${name}"
diff --git a/emulators/virtualbox-ose/files/vboxwebsrv.in b/emulators/virtualbox-ose/files/vboxwebsrv.in
index 2905effbb3a8..73dabca8a8b3 100644
--- a/emulators/virtualbox-ose/files/vboxwebsrv.in
+++ b/emulators/virtualbox-ose/files/vboxwebsrv.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name=vboxwebsrv
-rcvar=`set_rcvar`
+rcvar=vboxwebsrv_enable
command="%%PREFIX%%/bin/vboxwebsrv"
pidfile="/var/run/${name}.pid"
diff --git a/emulators/vmware-guestd4/files/vmware-guestd.sh.in b/emulators/vmware-guestd4/files/vmware-guestd.sh.in
index 8c9521ad98c6..2e076c9a3a94 100644
--- a/emulators/vmware-guestd4/files/vmware-guestd.sh.in
+++ b/emulators/vmware-guestd4/files/vmware-guestd.sh.in
@@ -22,7 +22,7 @@ vmware_guest_kmod_start()
# VMware kernel modules
name="vmware_guest_kmod"
-rcvar=`set_rcvar`
+rcvar=vmware_guest_kmod_enable
start_precmd="${checkvm_cmd}"
start_cmd="vmware_guest_kmod_start"
stop_precmd="${checkvm_cmd}"
@@ -34,7 +34,7 @@ run_rc_command "$1"
# VMware guest daemon
name="vmware_guestd"
-rcvar=`set_rcvar`
+rcvar=vmware_guestd_enable
start_precmd="${checkvm_cmd}"
unset start_cmd
stop_precmd="${checkvm_cmd}"
diff --git a/emulators/vmware-guestd5/files/vmware-guestd.sh.in b/emulators/vmware-guestd5/files/vmware-guestd.sh.in
index d66fccbc7892..98bcad2c83d3 100644
--- a/emulators/vmware-guestd5/files/vmware-guestd.sh.in
+++ b/emulators/vmware-guestd5/files/vmware-guestd.sh.in
@@ -27,7 +27,7 @@ vmware_guest_vmxnet_start()
# VMware kernel module: vmmemctl
name="vmware_guest_vmmemctl"
-rcvar=`set_rcvar`
+rcvar=vmware_guest_vmmemctl_enable
start_precmd="${checkvm_cmd}"
start_cmd="vmware_guest_vmmemctl_start"
stop_precmd="${checkvm_cmd}"
@@ -40,7 +40,7 @@ run_rc_command "$1"
# VMware kernel module: vmxnet
name="vmware_guest_vmxnet"
-rcvar=`set_rcvar`
+rcvar=vmware_guest_vmxnet_enable
start_precmd="${checkvm_cmd}"
start_cmd="vmware_guest_vmxnet_start"
stop_precmd="${checkvm_cmd}"
@@ -52,7 +52,7 @@ run_rc_command "$1"
# VMware guest daemon
name="vmware_guestd"
-rcvar=`set_rcvar`
+rcvar=vmware_guestd_enable
start_precmd="${checkvm_cmd}"
unset start_cmd
stop_precmd="${checkvm_cmd}"
diff --git a/emulators/vmware-guestd6/files/vmware-guestd.sh.in b/emulators/vmware-guestd6/files/vmware-guestd.sh.in
index d66fccbc7892..98bcad2c83d3 100644
--- a/emulators/vmware-guestd6/files/vmware-guestd.sh.in
+++ b/emulators/vmware-guestd6/files/vmware-guestd.sh.in
@@ -27,7 +27,7 @@ vmware_guest_vmxnet_start()
# VMware kernel module: vmmemctl
name="vmware_guest_vmmemctl"
-rcvar=`set_rcvar`
+rcvar=vmware_guest_vmmemctl_enable
start_precmd="${checkvm_cmd}"
start_cmd="vmware_guest_vmmemctl_start"
stop_precmd="${checkvm_cmd}"
@@ -40,7 +40,7 @@ run_rc_command "$1"
# VMware kernel module: vmxnet
name="vmware_guest_vmxnet"
-rcvar=`set_rcvar`
+rcvar=vmware_guest_vmxnet_enable
start_precmd="${checkvm_cmd}"
start_cmd="vmware_guest_vmxnet_start"
stop_precmd="${checkvm_cmd}"
@@ -52,7 +52,7 @@ run_rc_command "$1"
# VMware guest daemon
name="vmware_guestd"
-rcvar=`set_rcvar`
+rcvar=vmware_guestd_enable
start_precmd="${checkvm_cmd}"
unset start_cmd
stop_precmd="${checkvm_cmd}"
diff --git a/finance/openerp-server/files/openerpd.in b/finance/openerp-server/files/openerpd.in
index 0d70d634c473..240e2ebaba47 100644
--- a/finance/openerp-server/files/openerpd.in
+++ b/finance/openerp-server/files/openerpd.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name="openerpd"
-rcvar=${name}_enable
+rcvar=openerpd_enable
command=%%PREFIX%%/bin/openerp-server
diff --git a/finance/openerp-web/files/openerp-web.in b/finance/openerp-web/files/openerp-web.in
index 7fba9cf4aa36..4e083eb17804 100644
--- a/finance/openerp-web/files/openerp-web.in
+++ b/finance/openerp-web/files/openerp-web.in
@@ -33,7 +33,7 @@
. /etc/rc.subr
name="openerpweb"
-rcvar=`set_rcvar`
+rcvar=openerpweb_enable
#command="/usr/local/bin/${name}"
command="/usr/local/bin/openerp-web"
command_interpreter="/bin/sh"
diff --git a/finance/openerp/files/openerpd.in b/finance/openerp/files/openerpd.in
index 0d70d634c473..240e2ebaba47 100644
--- a/finance/openerp/files/openerpd.in
+++ b/finance/openerp/files/openerpd.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name="openerpd"
-rcvar=${name}_enable
+rcvar=openerpd_enable
command=%%PREFIX%%/bin/openerp-server
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"
diff --git a/games/armagetron/files/armagetronad_dedicated.in b/games/armagetron/files/armagetronad_dedicated.in
index 6a3048b74ee0..4732d5247c5b 100644
--- a/games/armagetron/files/armagetronad_dedicated.in
+++ b/games/armagetron/files/armagetronad_dedicated.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name="armagetronad_dedicated"
-rcvar=${name}_enable
+rcvar=armagetronad_dedicated_enable
command=%%PREFIX%%/bin/${name}
pidfile=/var/run/${name}.pid
diff --git a/games/kaid/files/kaid.sh b/games/kaid/files/kaid.sh
index 4cf3de99b256..f87a939f9d7c 100644
--- a/games/kaid/files/kaid.sh
+++ b/games/kaid/files/kaid.sh
@@ -17,7 +17,7 @@ kaid_enable="${kaid_enable-NO}"
. /etc/rc.subr
name=kaid
-rcvar=`set_rcvar`
+rcvar=kaid_enable
command=/usr/local/sbin/${name}
command_args=-d
diff --git a/games/ldmud/files/ldmud.in b/games/ldmud/files/ldmud.in
index 95a78155ed31..8b37449788bf 100644
--- a/games/ldmud/files/ldmud.in
+++ b/games/ldmud/files/ldmud.in
@@ -12,7 +12,7 @@
name=ldmud
ldmud_user=mud
-rcvar=`set_rcvar`
+rcvar=ldmud_enable
start_cmd="${name}_start"
diff --git a/games/minecraft-server/files/minecraft.in b/games/minecraft-server/files/minecraft.in
index 1108a8db0a5b..bd068e3c5d40 100644
--- a/games/minecraft-server/files/minecraft.in
+++ b/games/minecraft-server/files/minecraft.in
@@ -7,7 +7,7 @@
. /etc/rc.subr
name="minecraft"
-rcvar=`set_rcvar`
+rcvar=minecraft_enable
load_rc_config $name
diff --git a/games/mtaserver/files/mtad.in b/games/mtaserver/files/mtad.in
index 654167633bf5..4883303d07d0 100644
--- a/games/mtaserver/files/mtad.in
+++ b/games/mtaserver/files/mtad.in
@@ -13,7 +13,7 @@
. /etc/rc.subr
name="mtad"
-rcvar=${name}_enable
+rcvar=mtad_enable
load_rc_config $name
diff --git a/games/openttd/files/openttd.in b/games/openttd/files/openttd.in
index a2b5e0e6e786..031a2274e13e 100644
--- a/games/openttd/files/openttd.in
+++ b/games/openttd/files/openttd.in
@@ -19,7 +19,7 @@
. /etc/rc.subr
name="openttd"
-rcvar=`set_rcvar`
+rcvar=openttd_enable
command="%%PREFIX%%/bin/${name}"
command_args="-s null -m null -v null -b null -D -f"
diff --git a/games/pvpgn/files/bnetd.sh.in b/games/pvpgn/files/bnetd.sh.in
index f8389f652bdb..c0381ea9871e 100644
--- a/games/pvpgn/files/bnetd.sh.in
+++ b/games/pvpgn/files/bnetd.sh.in
@@ -20,7 +20,7 @@
. /etc/rc.subr
name=bnetd
-rcvar=`set_rcvar`
+rcvar=bnetd_enable
command=%%PREFIX%%/sbin/bnetd
pidfile=/var/run/pvpgn/bnetd.pid
diff --git a/games/quaqut/files/quaqut.in b/games/quaqut/files/quaqut.in
index 30e3cf5fc288..c3b4233b784d 100644
--- a/games/quaqut/files/quaqut.in
+++ b/games/quaqut/files/quaqut.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name="quaqut"
-rcvar=${name}_enable
+rcvar=quaqut_enable
load_rc_config $name
diff --git a/games/sampsvr/files/sampd.in b/games/sampsvr/files/sampd.in
index d766cafd0f56..366b116760b4 100644
--- a/games/sampsvr/files/sampd.in
+++ b/games/sampsvr/files/sampd.in
@@ -13,7 +13,7 @@
. /etc/rc.subr
name="sampd"
-rcvar=${name}_enable
+rcvar=sampd_enable
load_rc_config $name
diff --git a/games/utserver/files/ucc.in b/games/utserver/files/ucc.in
index d3382d77d65e..6ec32987fd73 100644
--- a/games/utserver/files/ucc.in
+++ b/games/utserver/files/ucc.in
@@ -13,7 +13,7 @@
. /etc/rc.subr
name="ucc"
-rcvar=${name}_enable
+rcvar=ucc_enable
load_rc_config $name
diff --git a/games/wolfpack/files/wolfpack.in b/games/wolfpack/files/wolfpack.in
index be0ab909a0c0..355ef7a34a85 100644
--- a/games/wolfpack/files/wolfpack.in
+++ b/games/wolfpack/files/wolfpack.in
@@ -13,7 +13,7 @@
. /etc/rc.subr
name=wolfpack
-rcvar=`set_rcvar`
+rcvar=wolfpack_enable
load_rc_config $name
diff --git a/graphics/geoserver/files/geoserver.in b/graphics/geoserver/files/geoserver.in
index 5bfb4bebdff3..3f81ecaa456e 100644
--- a/graphics/geoserver/files/geoserver.in
+++ b/graphics/geoserver/files/geoserver.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name="geoserver"
-rcvar=${name}_enable
+rcvar=geoserver_enable
load_rc_config ${name}
diff --git a/graphics/sane-backends/files/saned.in b/graphics/sane-backends/files/saned.in
index ae4345a58a05..dd1ddff849a7 100644
--- a/graphics/sane-backends/files/saned.in
+++ b/graphics/sane-backends/files/saned.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name="saned"
-rcvar=`set_rcvar`
+rcvar=saned_enable
command="%%PREFIX%%/sbin/${name}"
start_precmd=${name}_prestart
diff --git a/irc/anope/files/anope.in b/irc/anope/files/anope.in
index c3df3a6cf93e..124e3947dd84 100644
--- a/irc/anope/files/anope.in
+++ b/irc/anope/files/anope.in
@@ -17,7 +17,7 @@
. /etc/rc.subr
name="anope"
-rcvar=`set_rcvar`
+rcvar=anope_enable
command=%%PREFIX%%/libexec/anope/services
# set defaults
diff --git a/irc/bitlbee/files/bitlbee.in b/irc/bitlbee/files/bitlbee.in
index b28069a72778..a2f138e2ae85 100644
--- a/irc/bitlbee/files/bitlbee.in
+++ b/irc/bitlbee/files/bitlbee.in
@@ -13,7 +13,7 @@
. /etc/rc.subr
name="bitlbee"
-rcvar=`set_rcvar`
+rcvar=bitlbee_enable
load_rc_config $name
diff --git a/irc/bopm/files/bopm.in b/irc/bopm/files/bopm.in
index 95d040dcf177..82b39136dd43 100644
--- a/irc/bopm/files/bopm.in
+++ b/irc/bopm/files/bopm.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name="bopm"
-rcvar=`set_rcvar`
+rcvar=bopm_enable
load_rc_config $name
diff --git a/irc/charybdis/files/charybdis.in b/irc/charybdis/files/charybdis.in
index 54ac827056e3..aa32cffeede1 100644
--- a/irc/charybdis/files/charybdis.in
+++ b/irc/charybdis/files/charybdis.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name="charybdis"
-rcvar=`set_rcvar`
+rcvar=charybdis_enable
load_rc_config $name
diff --git a/irc/inspircd/files/inspircd.in b/irc/inspircd/files/inspircd.in
index 88ebad8740d0..9844084f452a 100644
--- a/irc/inspircd/files/inspircd.in
+++ b/irc/inspircd/files/inspircd.in
@@ -30,7 +30,7 @@
. /etc/rc.subr
name=%%PORTNAME%%
-rcvar=`set_rcvar`
+rcvar=%%PORTNAME%%_enable
load_rc_config ${name}
diff --git a/irc/inspircd12/files/inspircd.sh.in b/irc/inspircd12/files/inspircd.sh.in
index 441aa3afbb46..eb9e8366ac02 100644
--- a/irc/inspircd12/files/inspircd.sh.in
+++ b/irc/inspircd12/files/inspircd.sh.in
@@ -29,7 +29,7 @@
. /etc/rc.subr
name=inspircd
-rcvar=`set_rcvar`
+rcvar=inspircd_enable
load_rc_config ${name}
diff --git a/irc/irc/files/ircd.sh.in b/irc/irc/files/ircd.sh.in
index 3a6fbb3732ef..5e1ff858b4c6 100644
--- a/irc/irc/files/ircd.sh.in
+++ b/irc/irc/files/ircd.sh.in
@@ -17,7 +17,7 @@
. /etc/rc.subr
name="ircd"
-rcvar=`set_rcvar`
+rcvar=ircd_enable
load_rc_config $name
diff --git a/irc/irc2dc/files/irc2dc.in b/irc/irc2dc/files/irc2dc.in
index 8723dea3e4e6..0309224353d0 100644
--- a/irc/irc2dc/files/irc2dc.in
+++ b/irc/irc2dc/files/irc2dc.in
@@ -6,7 +6,7 @@
. /etc/rc.subr
name="irc2dc"
-rcvar=`set_rcvar`
+rcvar=irc2dc_enable
load_rc_config $name
command="%%PREFIX%%/bin/irc2dc"
pidfile="/var/run/irc2dc.pid"
diff --git a/irc/ircd-hybrid/files/ircd-hybrid.sh.in b/irc/ircd-hybrid/files/ircd-hybrid.sh.in
index c70decfa5376..64b97bc81c19 100644
--- a/irc/ircd-hybrid/files/ircd-hybrid.sh.in
+++ b/irc/ircd-hybrid/files/ircd-hybrid.sh.in
@@ -12,7 +12,7 @@
. /etc/rc.subr
name="ircd_hybrid"
-rcvar=`set_rcvar`
+rcvar=ircd_hybrid_enable
command=/usr/local/bin/ircd
pidfile=/var/run/ircd/ircd.pid
diff --git a/irc/ircd-ratbox-devel/files/ircd-ratbox.sh.in b/irc/ircd-ratbox-devel/files/ircd-ratbox.sh.in
index 26ff7cace9bd..464cb9521f11 100644
--- a/irc/ircd-ratbox-devel/files/ircd-ratbox.sh.in
+++ b/irc/ircd-ratbox-devel/files/ircd-ratbox.sh.in
@@ -7,7 +7,7 @@
. /etc/rc.subr
name="ircd_ratbox"
-rcvar=`set_rcvar`
+rcvar=ircd_ratbox_enable
load_rc_config $name
ircd_ratbox_enable=${ircd_ratbox_enable:-"NO"}
diff --git a/irc/ircd-ratbox/files/ircd-ratbox.sh.in b/irc/ircd-ratbox/files/ircd-ratbox.sh.in
index 3cac766fcb27..fedd43d80296 100644
--- a/irc/ircd-ratbox/files/ircd-ratbox.sh.in
+++ b/irc/ircd-ratbox/files/ircd-ratbox.sh.in
@@ -7,7 +7,7 @@
. /etc/rc.subr
name="ircd_ratbox"
-rcvar=`set_rcvar`
+rcvar=ircd_ratbox_enable
load_rc_config $name
ircd_ratbox_enable=${ircd_ratbox_enable:-"NO"}
diff --git a/irc/ircd-ru/files/ircd.in b/irc/ircd-ru/files/ircd.in
index a7d5e339d575..a95392b93c4e 100644
--- a/irc/ircd-ru/files/ircd.in
+++ b/irc/ircd-ru/files/ircd.in
@@ -8,7 +8,7 @@
. /etc/rc.subr
name="ircd"
-rcvar=${name}_enable
+rcvar=ircd_enable
command="%%PREFIX%%/sbin/$name"
required_files="%%PREFIX%%/etc/ircd-ru/ircd.conf %%PREFIX%%/etc/ircd-ru/ircd.motd %%PREFIX%%/etc/ircd-ru/ircd.smotd"
diff --git a/irc/ircservices/files/ircservices.in b/irc/ircservices/files/ircservices.in
index 702a6c002036..5e4c84aaf802 100644
--- a/irc/ircservices/files/ircservices.in
+++ b/irc/ircservices/files/ircservices.in
@@ -8,7 +8,7 @@
. /etc/rc.subr
name=ircservices
-rcvar=${name}_enable
+rcvar=ircservices_enable
command="%%PREFIX%%/sbin/${name}"
command_args="-dir=%%PREFIX%%/etc/ircservices"
diff --git a/irc/iroffer-dinoex/files/iroffer-dinoex.in b/irc/iroffer-dinoex/files/iroffer-dinoex.in
index c8abb47c40e9..08ef365273e9 100644
--- a/irc/iroffer-dinoex/files/iroffer-dinoex.in
+++ b/irc/iroffer-dinoex/files/iroffer-dinoex.in
@@ -21,7 +21,7 @@
. /etc/rc.subr
name="iroffer"
-rcvar=`set_rcvar`
+rcvar=iroffer_enable
# read configuration and set defaults
load_rc_config "$name"
diff --git a/irc/minbif/files/minbif.in b/irc/minbif/files/minbif.in
index 6947fef39f4d..10e689e29dc5 100644
--- a/irc/minbif/files/minbif.in
+++ b/irc/minbif/files/minbif.in
@@ -12,7 +12,7 @@
. /etc/rc.subr
name="minbif"
-rcvar=`set_rcvar`
+rcvar=minbif_enable
load_rc_config $name
diff --git a/irc/ngircd/files/ngircd.in b/irc/ngircd/files/ngircd.in
index d0ffeb741709..68c54b82c6f7 100644
--- a/irc/ngircd/files/ngircd.in
+++ b/irc/ngircd/files/ngircd.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name="ngircd"
-rcvar=`set_rcvar`
+rcvar=ngircd_enable
load_rc_config $name
diff --git a/irc/quassel/files/quasselcore.in b/irc/quassel/files/quasselcore.in
index 1039d04f5a1f..19b9151a3352 100644
--- a/irc/quassel/files/quasselcore.in
+++ b/irc/quassel/files/quasselcore.in
@@ -19,7 +19,7 @@
. /etc/rc.subr
name=quasselcore
-rcvar=`set_rcvar`
+rcvar=quasselcore_enable
load_rc_config ${name}
diff --git a/irc/ratbox-services/files/ratbox-services.sh.in b/irc/ratbox-services/files/ratbox-services.sh.in
index e2467d296c8a..5096eb5fa819 100644
--- a/irc/ratbox-services/files/ratbox-services.sh.in
+++ b/irc/ratbox-services/files/ratbox-services.sh.in
@@ -7,7 +7,7 @@
. /etc/rc.subr
name="ratbox_services"
-rcvar=`set_rcvar`
+rcvar=ratbox_services_enable
load_rc_config $name
ratbox_services_enable=${ratbox_services_enable:-"NO"}
diff --git a/irc/thales/files/thales.sh.in b/irc/thales/files/thales.sh.in
index 4c070fc174f2..6e007ac9e50a 100644
--- a/irc/thales/files/thales.sh.in
+++ b/irc/thales/files/thales.sh.in
@@ -17,7 +17,7 @@
. /etc/rc.subr
name="thales"
-rcvar=`set_rcvar`
+rcvar=thales_enable
command="%%PREFIX%%/sbin/thales"
diff --git a/irc/tircd/files/tircd.sh.in b/irc/tircd/files/tircd.sh.in
index aaef1c8b0653..eae1eda6e24d 100644
--- a/irc/tircd/files/tircd.sh.in
+++ b/irc/tircd/files/tircd.sh.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name="tircd"
-rcvar=${name}_enable
+rcvar=tircd_enable
command="%%PREFIX%%/bin/$name.pl"
command_args="> /dev/null &"
diff --git a/irc/tr-ircd/files/trircd.in b/irc/tr-ircd/files/trircd.in
index 23af95c00f6b..fc0c3a380ecc 100644
--- a/irc/tr-ircd/files/trircd.in
+++ b/irc/tr-ircd/files/trircd.in
@@ -12,6 +12,7 @@
. /etc/rc.subr
name=trircd
+rcvar=trircd_enable
load_rc_config ${name}
: ${trircd_enable="NO"}
@@ -22,7 +23,6 @@ load_rc_config ${name}
: ${trircd_pidfile=%%TRIRCD_RUNDIR%%/ircd.pid}
: ${trircd_flags="-d ${trircd_confdir} -c ${trircd_conf} >/dev/null 2>&1"}
-rcvar=`set_rcvar`
command=%%PREFIX%%/bin/tr-ircd
pidfile=${trircd_pidfile}
required_files="${trircd_conf}"
diff --git a/irc/undernet-ircu/files/undernet.sh.in b/irc/undernet-ircu/files/undernet.sh.in
index 4eea938b2a44..e30e7a8d8bb6 100644
--- a/irc/undernet-ircu/files/undernet.sh.in
+++ b/irc/undernet-ircu/files/undernet.sh.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name=undernet
-rcvar=`set_rcvar`
+rcvar=undernet_enable
load_rc_config ${name}
diff --git a/irc/unreal/files/unrealircd.sh.in b/irc/unreal/files/unrealircd.sh.in
index 57ffc03b6ea4..9781f577850d 100644
--- a/irc/unreal/files/unrealircd.sh.in
+++ b/irc/unreal/files/unrealircd.sh.in
@@ -17,7 +17,7 @@
. /etc/rc.subr
name="unrealircd"
-rcvar=`set_rcvar`
+rcvar=unrealircd_enable
command="%%PREFIX%%/libexec/ircd"
pidfile="%%RUNDIR%%/ircd.pid"
diff --git a/japanese/FreeWnn-server/files/cwnn.sh.in b/japanese/FreeWnn-server/files/cwnn.sh.in
index ba07c664fd15..721bc7d2e881 100644
--- a/japanese/FreeWnn-server/files/cwnn.sh.in
+++ b/japanese/FreeWnn-server/files/cwnn.sh.in
@@ -9,7 +9,7 @@
. /etc/rc.subr
name=cwnn
-rcvar=`set_rcvar`
+rcvar=cwnn_enable
command=%%PREFIX%%/bin/cWnn4/cserver
procname=%%PREFIX%%/bin/cWnn4/cserver
start_precmd=start_precmd
diff --git a/japanese/FreeWnn-server/files/kwnn.sh.in b/japanese/FreeWnn-server/files/kwnn.sh.in
index eeae088659e4..fe7c4faa51b8 100644
--- a/japanese/FreeWnn-server/files/kwnn.sh.in
+++ b/japanese/FreeWnn-server/files/kwnn.sh.in
@@ -9,7 +9,7 @@
. /etc/rc.subr
name=kwnn
-rcvar=`set_rcvar`
+rcvar=kwnn_enable
command=%%PREFIX%%/bin/kWnn4/kserver
procname=%%PREFIX%%/bin/kWnn4/kserver
start_precmd=start_precmd
diff --git a/japanese/FreeWnn-server/files/twnn.sh.in b/japanese/FreeWnn-server/files/twnn.sh.in
index 753d0b857023..88b91c9a7212 100644
--- a/japanese/FreeWnn-server/files/twnn.sh.in
+++ b/japanese/FreeWnn-server/files/twnn.sh.in
@@ -9,7 +9,7 @@
. /etc/rc.subr
name=twnn
-rcvar=`set_rcvar`
+rcvar=twnn_enable
command=%%PREFIX%%/bin/cWnn4/tserver
procname=%%PREFIX%%/bin/cWnn4/tserver
start_precmd=start_precmd
diff --git a/japanese/FreeWnn-server/files/wnn.sh.in b/japanese/FreeWnn-server/files/wnn.sh.in
index 1a76d02351d3..1656fd9f4da4 100644
--- a/japanese/FreeWnn-server/files/wnn.sh.in
+++ b/japanese/FreeWnn-server/files/wnn.sh.in
@@ -9,7 +9,7 @@
. /etc/rc.subr
name=wnn
-rcvar=`set_rcvar`
+rcvar=wnn_enable
command=%%PREFIX%%/bin/Wnn4/jserver
procname=%%PREFIX%%/bin/Wnn4/jserver
start_precmd=start_precmd
diff --git a/japanese/canna-server/files/canna.sh.in b/japanese/canna-server/files/canna.sh.in
index 158d6c80638d..db9b91097fb9 100644
--- a/japanese/canna-server/files/canna.sh.in
+++ b/japanese/canna-server/files/canna.sh.in
@@ -25,7 +25,7 @@ canna_flags=${canna_flags:-"-u bin"} # Flags to canna program
. /etc/rc.subr
name="canna"
-rcvar=`set_rcvar`
+rcvar=canna_enable
command="%%PREFIX%%/sbin/cannaserver"
start_precmd="canna_start_precmd"
stop_cmd="canna_stop_cmd"
diff --git a/japanese/ebnetd/files/ebnetd.sh b/japanese/ebnetd/files/ebnetd.sh
index c3cd2f516883..ae55580e3f26 100644
--- a/japanese/ebnetd/files/ebnetd.sh
+++ b/japanese/ebnetd/files/ebnetd.sh
@@ -27,7 +27,7 @@
# ebnetd
name=ebnetd
-rcvar=`set_rcvar`
+rcvar=ebnetd_enable
command="%%PREFIX%%/sbin/${name}"
pidfile="/var/run/ebnetd/ebnd.pid"
required_dirs="/var/run/ebnetd"
@@ -44,7 +44,7 @@ run_rc_command "$1"
# ndtpd
name=ndtpd
-rcvar=`set_rcvar`
+rcvar=ndtpd_enable
command="%%PREFIX%%/sbin/${name}"
pidfile="/var/run/ebnetd/${name}.pid"
required_dirs="/var/run/ebnetd"
@@ -61,7 +61,7 @@ run_rc_command "$1"
# ebhttpd
name=ebhttpd
-rcvar=`set_rcvar`
+rcvar=ebhttpd_enable
command="%%PREFIX%%/sbin/${name}"
pidfile="/var/run/ebnetd/${name}.pid"
required_dirs="/var/run/ebnetd"
diff --git a/japanese/esecanna/files/esecanna.in b/japanese/esecanna/files/esecanna.in
index 6306ecbfbe97..a88d1d491a68 100644
--- a/japanese/esecanna/files/esecanna.in
+++ b/japanese/esecanna/files/esecanna.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name=esecanna
-rcvar=`set_rcvar`
+rcvar=esecanna_enable
esecannaserver=%%PREFIX%%/sbin/esecannaserver
diff --git a/japanese/multiskkserv/files/multiskkserv.in b/japanese/multiskkserv/files/multiskkserv.in
index 93740cdcc30f..e0c3a3235325 100644
--- a/japanese/multiskkserv/files/multiskkserv.in
+++ b/japanese/multiskkserv/files/multiskkserv.in
@@ -17,7 +17,7 @@
. /etc/rc.subr
name=multiskkserv
-rcvar=`set_rcvar`
+rcvar=multiskkserv_enable
command=%%PREFIX%%/sbin/multiskkserv
diff --git a/japanese/p5-Mail-SpamAssassin/files/sa-spamd.sh.in b/japanese/p5-Mail-SpamAssassin/files/sa-spamd.sh.in
index ce42c0a390fd..5398ea6fa7e7 100644
--- a/japanese/p5-Mail-SpamAssassin/files/sa-spamd.sh.in
+++ b/japanese/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/japanese/rskkserv/files/rskkserv.sh.in b/japanese/rskkserv/files/rskkserv.sh.in
index b9d1e9119f70..80b91210b540 100644
--- a/japanese/rskkserv/files/rskkserv.sh.in
+++ b/japanese/rskkserv/files/rskkserv.sh.in
@@ -15,7 +15,7 @@ rskkserv_flags=${rskkserv_flags:-""}
. /etc/rc.subr
name="rskkserv"
-rcvar=`set_rcvar`
+rcvar=rskkserv_enable
command="${prefix}/sbin/${name}"
command_interpreter="${prefix}/bin/ruby"
pidfile="/var/run/${name}.pid"
diff --git a/japanese/sj3-server/files/sj3.sh.in b/japanese/sj3-server/files/sj3.sh.in
index 3753bf726c56..6d005045c50d 100644
--- a/japanese/sj3-server/files/sj3.sh.in
+++ b/japanese/sj3-server/files/sj3.sh.in
@@ -21,7 +21,7 @@ sj3_enable=${sj3_enable:-"NO"} # Enable sj3
. /etc/rc.subr
name="sj3"
-rcvar=`set_rcvar`
+rcvar=sj3_enable
command="%%PREFIX%%/sbin/sj3serv"
start_precmd="sj3serv_precmd"
diff --git a/japanese/skkserv/files/skkserv.sh.in b/japanese/skkserv/files/skkserv.sh.in
index cf7e2aba557b..f2bbe584a817 100644
--- a/japanese/skkserv/files/skkserv.sh.in
+++ b/japanese/skkserv/files/skkserv.sh.in
@@ -9,7 +9,7 @@
. /etc/rc.subr
name=skkserv
-rcvar=`set_rcvar`
+rcvar=skkserv_enable
command=%%PREFIX%%/sbin/skkserv
: ${skkserv_flags:="-a 127.0.0.1 -u skkserv"}
diff --git a/japanese/tiarra/files/tiarra.in b/japanese/tiarra/files/tiarra.in
index 816c3678d3db..4707de6b611d 100644
--- a/japanese/tiarra/files/tiarra.in
+++ b/japanese/tiarra/files/tiarra.in
@@ -8,19 +8,17 @@
# BEFORE: LOGIN
# KEYWORD: shutdown
-prefix=%%PREFIX%%
+. /etc/rc.subr
+
name="tiarra"
+rcvar=tiarra_enable
+
+load_rc_config $name
tiarra_enable=${tiarra_enable:-"NO"}
tiarra_flags=${tiarra_flags:-"--quiet"}
tiarra_user=${tiarra_user:-"%%TIARRA_USER%%"}
-tiarra_chdir=${tiarra_chdir:-"${prefix}/${name}"}
-
-. /etc/rc.subr
-
-rcvar=`set_rcvar`
-
-load_rc_config $name
+tiarra_chdir=${tiarra_chdir:-"%%PREFIX%%/${name}"}
command="${tiarra_chdir}/${name}"
command_interpreter="/usr/bin/perl"
diff --git a/java/avis/files/avisd.in b/java/avis/files/avisd.in
index 2b1c9f0671e3..8cb62221619b 100644
--- a/java/avis/files/avisd.in
+++ b/java/avis/files/avisd.in
@@ -24,7 +24,7 @@
. /etc/rc.subr
name="avisd"
-rcvar=`set_rcvar`
+rcvar=avisd_enable
command=%%PREFIX%%/sbin/avisd
command_interpreter=/bin/sh
diff --git a/java/jboss5/files/jboss5.sh.in b/java/jboss5/files/jboss5.sh.in
index 2f8bc2aa62f0..d497027a5323 100644
--- a/java/jboss5/files/jboss5.sh.in
+++ b/java/jboss5/files/jboss5.sh.in
@@ -21,7 +21,7 @@
%%APP_SHORTNAME%%_logdir="%%LOG_DIR%%"
name="%%APP_SHORTNAME%%"
-rcvar=`set_rcvar`
+rcvar=%%APP_SHORTNAME%%_enable
load_rc_config $name
diff --git a/lang/erlang/files/epmd.sh.in b/lang/erlang/files/epmd.sh.in
index 7782174bb965..acf9c58443bd 100644
--- a/lang/erlang/files/epmd.sh.in
+++ b/lang/erlang/files/epmd.sh.in
@@ -15,7 +15,7 @@ epmd_enable=${epmd_enable:-"NO"}
. /etc/rc.subr
name=epmd
-rcvar=`set_rcvar`
+rcvar=epmd_enable
procname=%%PREFIX%%/bin/epmd
start_cmd="%%PREFIX%%/bin/epmd -daemon"
diff --git a/lang/erlang14/files/epmd.sh.in b/lang/erlang14/files/epmd.sh.in
index 7782174bb965..acf9c58443bd 100644
--- a/lang/erlang14/files/epmd.sh.in
+++ b/lang/erlang14/files/epmd.sh.in
@@ -15,7 +15,7 @@ epmd_enable=${epmd_enable:-"NO"}
. /etc/rc.subr
name=epmd
-rcvar=`set_rcvar`
+rcvar=epmd_enable
procname=%%PREFIX%%/bin/epmd
start_cmd="%%PREFIX%%/bin/epmd -daemon"
diff --git a/lang/php5/files/php-fpm.in b/lang/php5/files/php-fpm.in
index af61d9364ca0..55e2ac992408 100644
--- a/lang/php5/files/php-fpm.in
+++ b/lang/php5/files/php-fpm.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name="php_fpm"
-rcvar=`set_rcvar`
+rcvar=php_fpm_enable
load_rc_config "$name"
diff --git a/lang/php52/files/php-fpm.in b/lang/php52/files/php-fpm.in
index 4bf983f035d6..ffa3234405ec 100644
--- a/lang/php52/files/php-fpm.in
+++ b/lang/php52/files/php-fpm.in
@@ -17,7 +17,7 @@
. /etc/rc.subr
name="php_fpm"
-rcvar=`set_rcvar`
+rcvar=php_fpm_enable
extra_commands="reload logrotate"
diff --git a/lang/php53/files/php-fpm.in b/lang/php53/files/php-fpm.in
index af61d9364ca0..55e2ac992408 100644
--- a/lang/php53/files/php-fpm.in
+++ b/lang/php53/files/php-fpm.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name="php_fpm"
-rcvar=`set_rcvar`
+rcvar=php_fpm_enable
load_rc_config "$name"
diff --git a/lang/rexx-regina/files/rxstack.in b/lang/rexx-regina/files/rxstack.in
index 7b9a9b7a4642..58d2341e34b3 100644
--- a/lang/rexx-regina/files/rxstack.in
+++ b/lang/rexx-regina/files/rxstack.in
@@ -17,7 +17,7 @@
. /etc/rc.subr
name="rxstack"
-rcvar=`set_rcvar`
+rcvar=rxstack_enable
command=%%PREFIX%%/bin/${name}
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
diff --git a/misc/dahdi-kmod/files/dahdi.in b/misc/dahdi-kmod/files/dahdi.in
index 471a627e167f..7c192566cd76 100644
--- a/misc/dahdi-kmod/files/dahdi.in
+++ b/misc/dahdi-kmod/files/dahdi.in
@@ -34,7 +34,7 @@
. /etc/rc.subr
name="dahdi"
-rcvar=`set_rcvar`
+rcvar=dahdi_enable
start_cmd="dahdi_start"
stop_cmd="dahdi_stop"
diff --git a/misc/dnetc/files/dnetc.sh.in b/misc/dnetc/files/dnetc.sh.in
index 9ffaee657249..25d083b6a0ae 100644
--- a/misc/dnetc/files/dnetc.sh.in
+++ b/misc/dnetc/files/dnetc.sh.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name="dnetc"
-rcvar=`set_rcvar`
+rcvar=dnetc_enable
load_rc_config $name
diff --git a/misc/e2fsprogs-libuuid/files/uuidd.in b/misc/e2fsprogs-libuuid/files/uuidd.in
index 2178770dd6a8..0becd42f67b0 100644
--- a/misc/e2fsprogs-libuuid/files/uuidd.in
+++ b/misc/e2fsprogs-libuuid/files/uuidd.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name="uuidd"
-rcvar=`set_rcvar`
+rcvar=uuidd_enable
command="%%PREFIX%%/sbin/uuidd"
procname="${command}"
diff --git a/misc/proxyper/files/proxyper.in b/misc/proxyper/files/proxyper.in
index 547585fc83eb..90667a32b351 100644
--- a/misc/proxyper/files/proxyper.in
+++ b/misc/proxyper/files/proxyper.in
@@ -14,7 +14,7 @@ user="nobody"
. /etc/rc.subr
name="proxyper"
-rcvar=`set_rcvar`
+rcvar=proxyper_enable
pidfile=${dir}/rc5desproxy.pid
required_files=${dir}/${name}.ini
diff --git a/misc/upclient/files/upclient.sh.in b/misc/upclient/files/upclient.sh.in
index 6cef94df2b5f..0f18a952fd37 100644
--- a/misc/upclient/files/upclient.sh.in
+++ b/misc/upclient/files/upclient.sh.in
@@ -34,7 +34,7 @@ upclient_enable="${upclient_enable-NO}"
. /etc/rc.subr
name=upclient
-rcvar=$(set_rcvar)
+rcvar=upclient_enable
# private
configfile=%%PREFIX%%/etc/${name}.conf
diff --git a/misc/yaunc/files/yaunc.sh.in b/misc/yaunc/files/yaunc.sh.in
index 6643e13dbe21..6282064c6191 100644
--- a/misc/yaunc/files/yaunc.sh.in
+++ b/misc/yaunc/files/yaunc.sh.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name="yaunc"
-rcvar=${name}_enable
+rcvar=yaunc_enable
command=%%PREFIX%%/bin/${name}
diff --git a/multimedia/ffmpeg-devel/files/ffserver.in b/multimedia/ffmpeg-devel/files/ffserver.in
index c7aefb7edaa2..770913641f0b 100644
--- a/multimedia/ffmpeg-devel/files/ffserver.in
+++ b/multimedia/ffmpeg-devel/files/ffserver.in
@@ -17,7 +17,7 @@ ffserver_enable="${ffserver_enable-NO}"
. /etc/rc.subr
name=ffserver
-rcvar=`set_rcvar`
+rcvar=ffserver_enable
command="%%PREFIX%%/bin/${name} &"
required_files=%%PREFIX%%/etc/ffserver.conf
diff --git a/multimedia/ffmpeg/files/ffserver.in b/multimedia/ffmpeg/files/ffserver.in
index c7aefb7edaa2..770913641f0b 100644
--- a/multimedia/ffmpeg/files/ffserver.in
+++ b/multimedia/ffmpeg/files/ffserver.in
@@ -17,7 +17,7 @@ ffserver_enable="${ffserver_enable-NO}"
. /etc/rc.subr
name=ffserver
-rcvar=`set_rcvar`
+rcvar=ffserver_enable
command="%%PREFIX%%/bin/${name} &"
required_files=%%PREFIX%%/etc/ffserver.conf
diff --git a/multimedia/freevo/files/freevo-rcsubr.in b/multimedia/freevo/files/freevo-rcsubr.in
index 8e82488e3e94..4edbf452306b 100644
--- a/multimedia/freevo/files/freevo-rcsubr.in
+++ b/multimedia/freevo/files/freevo-rcsubr.in
@@ -1,5 +1,7 @@
#!/bin/sh
+# $FreeBSD$
+#
# PROVIDE: freevo
# REQUIRE: DAEMON
# KEYWORD: shutdown
@@ -14,7 +16,7 @@
. /etc/rc.subr
name=freevo
-rcvar=`set_rcvar`
+rcvar=freevo_enable
load_rc_config $name
: ${freevo_enable="NO"}
@@ -36,7 +38,7 @@ fast*) freevo_cmd=`expr "$1" : 'fast\(.*\)'` ;;
esac
name=freevo_recordserver
-rcvar=${name}_enable
+rcvar=freevo_recordserver_enable
eval ${name}_user=${freevo_user}
eval ${name}_group=${freevo_group}
pidfile=/var/run/freevo/recordserver-${freevo_uid}.pid
@@ -44,7 +46,7 @@ command_args="recordserver ${freevo_cmd}"
run_rc_command "$1"
name=freevo_webserver
-rcvar=${name}_enable
+rcvar=freevo_webserver_enable
eval ${name}_user=${freevo_user}
eval ${name}_group=${freevo_group}
pidfile=/var/run/freevo/webserver-${freevo_uid}.pid
@@ -52,10 +54,9 @@ command_args="webserver ${freevo_cmd}"
run_rc_command "$1"
name=freevo_gui
-rcvar=${name}_enable
+rcvar=freevo_gui_enable
eval ${name}_user=${freevo_user}
eval ${name}_group=${freevo_group}
pidfile=/var/run/freevo/freevo-${freevo_uid}.pid
command_args="${freevo_cmd}"
run_rc_command "$1"
-
diff --git a/multimedia/freevo/files/freevo.in b/multimedia/freevo/files/freevo.in
index 5d4f37ab9ba3..dfb0b072e701 100644
--- a/multimedia/freevo/files/freevo.in
+++ b/multimedia/freevo/files/freevo.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name=freevo
-rcvar=`set_rcvar`
+rcvar=freevo_enable
load_rc_config ${name}
: ${freevo_enable:="NO"}
diff --git a/multimedia/mythtv/files/mythbackend.in b/multimedia/mythtv/files/mythbackend.in
index 6ddc1cfff746..b4f855276cfa 100644
--- a/multimedia/mythtv/files/mythbackend.in
+++ b/multimedia/mythtv/files/mythbackend.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name="mythbackend"
-rcvar=`set_rcvar`
+rcvar=mythbackend_enable
command="%%PREFIX%%/bin/${name}"
load_rc_config $name
diff --git a/multimedia/ptx-kmod/files/ptx.sh.in b/multimedia/ptx-kmod/files/ptx.sh.in
index 38232601639d..498196bf256c 100644
--- a/multimedia/ptx-kmod/files/ptx.sh.in
+++ b/multimedia/ptx-kmod/files/ptx.sh.in
@@ -8,7 +8,7 @@
. /etc/rc.subr
name="ptx"
-rcvar=`set_rcvar`
+rcvar=ptx_enable
start_cmd="ptx_start"
stop_cmd="ptx_stop"
diff --git a/multimedia/vdr/files/vdr.in b/multimedia/vdr/files/vdr.in
index b86f4609563e..cf963cba649f 100644
--- a/multimedia/vdr/files/vdr.in
+++ b/multimedia/vdr/files/vdr.in
@@ -22,7 +22,7 @@
. /etc/rc.subr
name=vdr
-rcvar=`set_rcvar`
+rcvar=vdr_enable
command="%%PREFIX%%/bin/vdr"
command_args="-d"
diff --git a/multimedia/webcamd/files/webcamd.in b/multimedia/webcamd/files/webcamd.in
index 11414484ff99..e02205b1e7a5 100644
--- a/multimedia/webcamd/files/webcamd.in
+++ b/multimedia/webcamd/files/webcamd.in
@@ -15,7 +15,7 @@ hald_enable=${hald_enable-"NO"}
. /etc/rc.subr
name=webcamd
-rcvar=`set_rcvar`
+rcvar=webcamd_enable
command=%%PREFIX%%/sbin/webcamd
command_args="-B -U webcamd -G webcamd"
diff --git a/multimedia/zoneminder/files/zoneminder.in b/multimedia/zoneminder/files/zoneminder.in
index f0d4f5008446..d1708642b9c2 100644
--- a/multimedia/zoneminder/files/zoneminder.in
+++ b/multimedia/zoneminder/files/zoneminder.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name="zoneminder"
-rcvar=${name}_enable
+rcvar=zoneminder_enable
load_rc_config "$name"
: ${zoneminder_enable="NO"}
diff --git a/net-im/ejabberd/files/ejabberd.in b/net-im/ejabberd/files/ejabberd.in
index 15819d384263..816b7ae88648 100644
--- a/net-im/ejabberd/files/ejabberd.in
+++ b/net-im/ejabberd/files/ejabberd.in
@@ -20,7 +20,7 @@ ejabberd_epmd_address=${ejabberd_epmd_address-"127.0.0.1"}
. /etc/rc.subr
name="ejabberd"
-rcvar=`set_rcvar`
+rcvar=ejabberd_enable
reload_cmd="ejabberd_reload"
restart_cmd="ejabberd_reload"
diff --git a/net-im/imspector/files/imspector.in b/net-im/imspector/files/imspector.in
index acd7fbe4f991..412e1dde1870 100644
--- a/net-im/imspector/files/imspector.in
+++ b/net-im/imspector/files/imspector.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name="imspector"
-rcvar=${name}_enable
+rcvar=imspector_enable
command=%%PREFIX%%/sbin/${name}
diff --git a/net-im/iserverd/files/iserverd.in b/net-im/iserverd/files/iserverd.in
index 03ab57f68033..157ace8c7766 100644
--- a/net-im/iserverd/files/iserverd.in
+++ b/net-im/iserverd/files/iserverd.in
@@ -19,7 +19,7 @@ load_rc_config $name
iserverd_enable=${iserverd_enable:-"NO"}
iserverd_user=iserv
-rcvar=`set_rcvar`
+rcvar=iserverd_enable
command=%%PREFIX%%/bin/iserverd
command_args="-o"
diff --git a/net-im/jabber-pyaim/files/jabber-pyaim-transport.sh.in b/net-im/jabber-pyaim/files/jabber-pyaim-transport.sh.in
index 80940eb87482..462bf4cd076f 100644
--- a/net-im/jabber-pyaim/files/jabber-pyaim-transport.sh.in
+++ b/net-im/jabber-pyaim/files/jabber-pyaim-transport.sh.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name="jabber_pyaim"
-rcvar=`set_rcvar`
+rcvar=jabber_pyaim_enable
load_rc_config $name
diff --git a/net-im/jabber-pyicq/files/jabber-pyicq-transport.sh.in b/net-im/jabber-pyicq/files/jabber-pyicq-transport.sh.in
index b3ec5ab96571..f632d68bd6b9 100644
--- a/net-im/jabber-pyicq/files/jabber-pyicq-transport.sh.in
+++ b/net-im/jabber-pyicq/files/jabber-pyicq-transport.sh.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name="jabber_pyicq"
-rcvar=`set_rcvar`
+rcvar=jabber_pyicq_enable
load_rc_config $name
diff --git a/net-im/jabber-pymsn/files/jabber-pymsn-transport.sh.in b/net-im/jabber-pymsn/files/jabber-pymsn-transport.sh.in
index decb3fb949f3..622be158185d 100644
--- a/net-im/jabber-pymsn/files/jabber-pymsn-transport.sh.in
+++ b/net-im/jabber-pymsn/files/jabber-pymsn-transport.sh.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name="jabber_pymsn"
-rcvar=`set_rcvar`
+rcvar=jabber_pymsn_enable
load_rc_config $name
diff --git a/net-im/jabber/files/jabber.in b/net-im/jabber/files/jabber.in
index 76ce3ea2c8c7..a9e0f92e1b61 100644
--- a/net-im/jabber/files/jabber.in
+++ b/net-im/jabber/files/jabber.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name="jabber"
-rcvar=`set_rcvar`
+rcvar=jabber_enable
load_rc_config $name
diff --git a/net-im/jabberd/files/jabberd.in b/net-im/jabberd/files/jabberd.in
index 7afd08dff668..bf139204f5f1 100644
--- a/net-im/jabberd/files/jabberd.in
+++ b/net-im/jabberd/files/jabberd.in
@@ -20,7 +20,7 @@ jabberd_user=${jabberd_user-"%%JABBER_USER%%"}
. /etc/rc.subr
name="jabberd"
-rcvar=`set_rcvar`
+rcvar=jabberd_enable
command_interpreter="%%PERL%%"
command="%%PREFIX%%/bin/jabberd"
command_args="-b"
diff --git a/net-im/jggtrans/files/jggtrans.sh.in b/net-im/jggtrans/files/jggtrans.sh.in
index e605d289e9d8..2db822352d75 100644
--- a/net-im/jggtrans/files/jggtrans.sh.in
+++ b/net-im/jggtrans/files/jggtrans.sh.in
@@ -13,7 +13,7 @@
. /etc/rc.subr
name="jggtrans"
-rcvar=`set_rcvar`
+rcvar=jggtrans_enable
load_rc_config $name
diff --git a/net-im/mu-conference/files/mu-conference.in b/net-im/mu-conference/files/mu-conference.in
index e7a18f178e49..433182ec482a 100644
--- a/net-im/mu-conference/files/mu-conference.in
+++ b/net-im/mu-conference/files/mu-conference.in
@@ -22,7 +22,7 @@
. /etc/rc.subr
name="mu_conference"
-rcvar=`set_rcvar`
+rcvar=mu_conference_enable
command="%%PREFIX%%/bin/mu-conference"
diff --git a/net-im/openfire-devel/files/openfire.in b/net-im/openfire-devel/files/openfire.in
index e8457e382b7d..118bb35fe4b3 100644
--- a/net-im/openfire-devel/files/openfire.in
+++ b/net-im/openfire-devel/files/openfire.in
@@ -24,7 +24,7 @@
. /etc/rc.subr
name="openfire"
-rcvar=${name}_enable
+rcvar=openfire_enable
load_rc_config $name
# Set defaults
diff --git a/net-im/openfire/files/openfire.in b/net-im/openfire/files/openfire.in
index e8457e382b7d..118bb35fe4b3 100644
--- a/net-im/openfire/files/openfire.in
+++ b/net-im/openfire/files/openfire.in
@@ -24,7 +24,7 @@
. /etc/rc.subr
name="openfire"
-rcvar=${name}_enable
+rcvar=openfire_enable
load_rc_config $name
# Set defaults
diff --git a/net-im/prosody/files/prosody.in b/net-im/prosody/files/prosody.in
index 3c14232335ce..e336d1eca09c 100644
--- a/net-im/prosody/files/prosody.in
+++ b/net-im/prosody/files/prosody.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name="prosody"
-rcvar=`set_rcvar`
+rcvar=prosody_enable
pidfile="%%PREFIX%%/var/lib/prosody/prosody.pid"
command="%%PREFIX%%/bin/prosodyctl"
diff --git a/net-im/py-punjab/files/punjab.sh.in b/net-im/py-punjab/files/punjab.sh.in
index 78477b78f9fe..d41f04dc8bbc 100644
--- a/net-im/py-punjab/files/punjab.sh.in
+++ b/net-im/py-punjab/files/punjab.sh.in
@@ -8,7 +8,7 @@
. /etc/rc.subr
name="punjab"
-rcvar=`set_rcvar`
+rcvar=punjab_enable
command="%%PREFIX%%/bin/twistd"
load_rc_config $name
diff --git a/net-im/py-xmpppy-yahoo/files/xmpppy_yahoo.in b/net-im/py-xmpppy-yahoo/files/xmpppy_yahoo.in
index 033e9d564773..8638b52dd4da 100644
--- a/net-im/py-xmpppy-yahoo/files/xmpppy_yahoo.in
+++ b/net-im/py-xmpppy-yahoo/files/xmpppy_yahoo.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name="xmpppy_yahoo"
-rcvar=`set_rcvar`
+rcvar=xmpppy_yahoo_enable
load_rc_config $name
diff --git a/net-im/zephyr/files/zhm.in b/net-im/zephyr/files/zhm.in
index 82cc5009ee67..c374a9c85b21 100644
--- a/net-im/zephyr/files/zhm.in
+++ b/net-im/zephyr/files/zhm.in
@@ -7,7 +7,7 @@
. /etc/rc.subr
name="zhm"
-rcvar="zhm_enable"
+rcvar=zhm_enable
start_cmd="zhm_start"
stop_postcmd="zhm_postcmd"
start_precmd="zhm_precmd"
diff --git a/net-mgmt/argus-monitor/files/argusd.in b/net-mgmt/argus-monitor/files/argusd.in
index 1b6cd1f22ad0..d44f9425b538 100644
--- a/net-mgmt/argus-monitor/files/argusd.in
+++ b/net-mgmt/argus-monitor/files/argusd.in
@@ -12,7 +12,7 @@
. /etc/rc.subr
name="argusd"
-rcvar=${name}_enable
+rcvar=argusd_enable
command=%%PREFIX%%/sbin/${name}
# pidfile=/var/run/${name}.pid
diff --git a/net-mgmt/argus3/files/argus.in b/net-mgmt/argus3/files/argus.in
index 0f22c6531ec9..8582909e2816 100644
--- a/net-mgmt/argus3/files/argus.in
+++ b/net-mgmt/argus3/files/argus.in
@@ -6,7 +6,7 @@
. /etc/rc.subr
name="argus"
-rcvar=`set_rcvar`
+rcvar=argus_enable
load_rc_config $name
diff --git a/net-mgmt/arpwatch/files/arpwatch.sh.in b/net-mgmt/arpwatch/files/arpwatch.sh.in
index 35633939c65f..c2d51e145366 100644
--- a/net-mgmt/arpwatch/files/arpwatch.sh.in
+++ b/net-mgmt/arpwatch/files/arpwatch.sh.in
@@ -16,7 +16,7 @@ arpwatch_dir=${arpwatch_dir:-"%%PREFIX%%/arpwatch/"}
. /etc/rc.subr
name=arpwatch
-rcvar=`set_rcvar`
+rcvar=arpwatch_enable
required_dirs=${arpwatch_dir}
load_rc_config ${name}
diff --git a/net-mgmt/bigsister/files/bigsister.sh.in b/net-mgmt/bigsister/files/bigsister.sh.in
index 2232b7060733..4cff1d36d64d 100644
--- a/net-mgmt/bigsister/files/bigsister.sh.in
+++ b/net-mgmt/bigsister/files/bigsister.sh.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name="bigsister"
-rcvar=`set_rcvar`
+rcvar=bigsister_enable
start_cmd=bs_start
stop_cmd=bs_stop
diff --git a/net-mgmt/cdpd/files/cdpd.in b/net-mgmt/cdpd/files/cdpd.in
index 408dfe544a49..7dbe67ee8b5e 100644
--- a/net-mgmt/cdpd/files/cdpd.in
+++ b/net-mgmt/cdpd/files/cdpd.in
@@ -23,7 +23,7 @@
. /etc/rc.subr
name=cdpd
-rcvar=`set_rcvar`
+rcvar=cdpd_enable
command=%%PREFIX%%/sbin/$name
diff --git a/net-mgmt/chillispot/files/chillispot.in b/net-mgmt/chillispot/files/chillispot.in
index 64e6f54439a9..da4f4f5b21ec 100644
--- a/net-mgmt/chillispot/files/chillispot.in
+++ b/net-mgmt/chillispot/files/chillispot.in
@@ -8,7 +8,7 @@
. /etc/rc.subr
name="chillispot"
-rcvar=${name}_enable
+rcvar=chillispot_enable
command="%%PREFIX%%/sbin/chilli"
pidfile=/var/run/chilli.pid
diff --git a/net-mgmt/choparp/files/choparp.sh.in b/net-mgmt/choparp/files/choparp.sh.in
index 7377ec1565ea..ba8d8e4bb2d5 100644
--- a/net-mgmt/choparp/files/choparp.sh.in
+++ b/net-mgmt/choparp/files/choparp.sh.in
@@ -13,7 +13,7 @@ choparp_network=${choparp_network-}
. /etc/rc.subr
name="choparp"
-rcvar=`set_rcvar`
+rcvar=choparp_enable
start_precmd="choparp_precmd"
restart_precmd="choparp_precmd"
diff --git a/net-mgmt/collectd/files/collectd.in b/net-mgmt/collectd/files/collectd.in
index 71791883f3cb..9495f2dc4756 100644
--- a/net-mgmt/collectd/files/collectd.in
+++ b/net-mgmt/collectd/files/collectd.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name="collectd"
-rcvar=${name}_enable
+rcvar=collectd_enable
command=%%PREFIX%%/sbin/${name}
diff --git a/net-mgmt/collectd/files/collectdmon.in b/net-mgmt/collectd/files/collectdmon.in
index 09afc7129d37..3418f979b9cf 100644
--- a/net-mgmt/collectd/files/collectdmon.in
+++ b/net-mgmt/collectd/files/collectdmon.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name="collectdmon"
-rcvar=${name}_enable
+rcvar=collectdmon_enable
command=%%PREFIX%%/sbin/${name}
diff --git a/net-mgmt/collectd5/files/collectd.in b/net-mgmt/collectd5/files/collectd.in
index 71791883f3cb..9495f2dc4756 100644
--- a/net-mgmt/collectd5/files/collectd.in
+++ b/net-mgmt/collectd5/files/collectd.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name="collectd"
-rcvar=${name}_enable
+rcvar=collectd_enable
command=%%PREFIX%%/sbin/${name}
diff --git a/net-mgmt/collectd5/files/collectdmon.in b/net-mgmt/collectd5/files/collectdmon.in
index 09afc7129d37..3418f979b9cf 100644
--- a/net-mgmt/collectd5/files/collectdmon.in
+++ b/net-mgmt/collectd5/files/collectdmon.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name="collectdmon"
-rcvar=${name}_enable
+rcvar=collectdmon_enable
command=%%PREFIX%%/sbin/${name}
diff --git a/net-mgmt/darkstat/files/darkstat.in b/net-mgmt/darkstat/files/darkstat.in
index 4669d541dee8..f68d50d61164 100644
--- a/net-mgmt/darkstat/files/darkstat.in
+++ b/net-mgmt/darkstat/files/darkstat.in
@@ -32,7 +32,7 @@
. /etc/rc.subr
name=darkstat
-rcvar=`set_rcvar`
+rcvar=darkstat_enable
command=%%PREFIX%%/sbin/$name
start_precmd=darkstat_prestart
diff --git a/net-mgmt/flow-tools-ng/files/flow_capture.in b/net-mgmt/flow-tools-ng/files/flow_capture.in
index d378c6c7fc59..cdca15248732 100644
--- a/net-mgmt/flow-tools-ng/files/flow_capture.in
+++ b/net-mgmt/flow-tools-ng/files/flow_capture.in
@@ -44,7 +44,7 @@
. /etc/rc.subr
name="flow_capture"
-rcvar=`set_rcvar`
+rcvar=flow_capture_enable
setup_profile_vars()
{
diff --git a/net-mgmt/flow-tools-ng/files/flow_fanout.in b/net-mgmt/flow-tools-ng/files/flow_fanout.in
index 0cc17b058e6b..9d3e7d34f95e 100644
--- a/net-mgmt/flow-tools-ng/files/flow_fanout.in
+++ b/net-mgmt/flow-tools-ng/files/flow_fanout.in
@@ -41,7 +41,7 @@
. /etc/rc.subr
name="flow_fanout"
-rcvar=`set_rcvar`
+rcvar=flow_fanout_enable
setup_profile_vars()
{
diff --git a/net-mgmt/flow-tools/files/flow_capture.in b/net-mgmt/flow-tools/files/flow_capture.in
index 856695d6fedf..c4b8c62879ff 100644
--- a/net-mgmt/flow-tools/files/flow_capture.in
+++ b/net-mgmt/flow-tools/files/flow_capture.in
@@ -44,7 +44,7 @@
. /etc/rc.subr
name="flow_capture"
-rcvar=`set_rcvar`
+rcvar=flow_capture_enable
setup_profile_vars()
{
diff --git a/net-mgmt/flow-tools/files/flow_fanout.in b/net-mgmt/flow-tools/files/flow_fanout.in
index 1d9ec7ff1116..ba668968af3a 100644
--- a/net-mgmt/flow-tools/files/flow_fanout.in
+++ b/net-mgmt/flow-tools/files/flow_fanout.in
@@ -41,7 +41,7 @@
. /etc/rc.subr
name="flow_fanout"
-rcvar=`set_rcvar`
+rcvar=flow_fanout_enable
setup_profile_vars()
{
diff --git a/net-mgmt/flowd/files/flowd.in b/net-mgmt/flowd/files/flowd.in
index 1cc6999333e2..28d9de7d6fc9 100644
--- a/net-mgmt/flowd/files/flowd.in
+++ b/net-mgmt/flowd/files/flowd.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name="flowd"
-rcvar=${name}_enable
+rcvar=flowd_enable
load_rc_config ${name}
: ${flowd_enable="NO"}
diff --git a/net-mgmt/fprobe/files/fprobe.sh.in b/net-mgmt/fprobe/files/fprobe.sh.in
index 9175b0270ad6..b2cff48f2b11 100644
--- a/net-mgmt/fprobe/files/fprobe.sh.in
+++ b/net-mgmt/fprobe/files/fprobe.sh.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name="%%NAME%%"
-rcvar=`set_rcvar`
+rcvar=%%NAME%%_enable
command="%%PREFIX%%/sbin/fprobe"
command_args="-i lo0 127.0.0.1:2055"
diff --git a/net-mgmt/icinga/files/icinga.in b/net-mgmt/icinga/files/icinga.in
index 7703a68061b3..53d73f45cbcf 100644
--- a/net-mgmt/icinga/files/icinga.in
+++ b/net-mgmt/icinga/files/icinga.in
@@ -21,7 +21,7 @@
. /etc/rc.subr
name="icinga"
-rcvar=`set_rcvar`
+rcvar=icinga_enable
command="%%PREFIX%%/bin/icinga"
command_args="-d"
diff --git a/net-mgmt/ipacctd/files/ipacctd.sh.in b/net-mgmt/ipacctd/files/ipacctd.sh.in
index d85aeb3bc665..c0113cb314b6 100644
--- a/net-mgmt/ipacctd/files/ipacctd.sh.in
+++ b/net-mgmt/ipacctd/files/ipacctd.sh.in
@@ -31,7 +31,7 @@
. /etc/rc.subr
name="ipacctd"
-rcvar=`set_rcvar`
+rcvar=ipacctd_enable
command="%%PREFIX%%/sbin/ipacctd"
diff --git a/net-mgmt/ipcad/files/ipcad.in b/net-mgmt/ipcad/files/ipcad.in
index 771229817c81..8dbe149d54a1 100644
--- a/net-mgmt/ipcad/files/ipcad.in
+++ b/net-mgmt/ipcad/files/ipcad.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name="ipcad"
-rcvar=${name}_enable
+rcvar=ipcad_enable
load_rc_config ${name}
diff --git a/net-mgmt/macroscope/files/macroscope.in b/net-mgmt/macroscope/files/macroscope.in
index 4b6e4ad3cf65..d204279af0ad 100644
--- a/net-mgmt/macroscope/files/macroscope.in
+++ b/net-mgmt/macroscope/files/macroscope.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name="macroscope"
-rcvar=$(set_rcvar)
+rcvar=macroscope_enable
start_precmd()
{
diff --git a/net-mgmt/mrtg/files/mrtg_daemon.in b/net-mgmt/mrtg/files/mrtg_daemon.in
index 3f229d35bff9..a0174c491392 100644
--- a/net-mgmt/mrtg/files/mrtg_daemon.in
+++ b/net-mgmt/mrtg/files/mrtg_daemon.in
@@ -11,7 +11,7 @@
name="mrtg_daemon"
-rcvar=`set_rcvar`
+rcvar=mrtg_daemon_enable
load_rc_config $name
diff --git a/net-mgmt/nagios-devel/files/nagios.sh.in b/net-mgmt/nagios-devel/files/nagios.sh.in
index 107b0fe29542..a7e9215f25f7 100644
--- a/net-mgmt/nagios-devel/files/nagios.sh.in
+++ b/net-mgmt/nagios-devel/files/nagios.sh.in
@@ -21,7 +21,7 @@
. /etc/rc.subr
name="nagios"
-rcvar=`set_rcvar`
+rcvar=nagios_enable
command="%%PREFIX%%/bin/nagios"
command_args="-d"
diff --git a/net-mgmt/nagios/files/nagios.in b/net-mgmt/nagios/files/nagios.in
index 9559ea4a125b..229f9d8d86fd 100644
--- a/net-mgmt/nagios/files/nagios.in
+++ b/net-mgmt/nagios/files/nagios.in
@@ -20,7 +20,7 @@
. /etc/rc.subr
name="nagios"
-rcvar=`set_rcvar`
+rcvar=nagios_enable
command="%%PREFIX%%/bin/nagios"
command_args="-d"
diff --git a/net-mgmt/nagiosgrapher/files/nagiosgrapher.in b/net-mgmt/nagiosgrapher/files/nagiosgrapher.in
index 124473057083..3ec61d3a3f17 100644
--- a/net-mgmt/nagiosgrapher/files/nagiosgrapher.in
+++ b/net-mgmt/nagiosgrapher/files/nagiosgrapher.in
@@ -2,7 +2,6 @@
#
# $FreeBSD$
#
-
# PROVIDE: %%NAME%%
# REQUIRE: NETWORKING SERVERS
# BEFORE: DAEMON
@@ -10,21 +9,21 @@
# Add the following line to /etc/rc.conf to enable `%%NAME%%':
#
-#%%NAME%%_enable="YES"
+# %%NAME%%_enable="YES"
. /etc/rc.subr
name="%%NAME%%"
-: ${%%NAME%%_user="nagios"}
-rcvar=`set_rcvar`
+rcvar=%%NAME%%_enable
pidfile="/var/spool/nagios/nagios_grapher/$name.pid"
command="%%PREFIX%%/libexec/nagios/contrib/$name"
command_interpreter="/usr/bin/perl"
-# read configuration and set defaults
load_rc_config $name
+
: ${%%NAME%%_enable="NO"}
+: ${%%NAME%%_user="nagios"}
run_rc_command "$1"
diff --git a/net-mgmt/nagircbot/files/nagircbot.in b/net-mgmt/nagircbot/files/nagircbot.in
index 97de954872c2..7dde53cf398b 100644
--- a/net-mgmt/nagircbot/files/nagircbot.in
+++ b/net-mgmt/nagircbot/files/nagircbot.in
@@ -17,7 +17,7 @@
. /etc/rc.subr
name=nagircbot
-rcvar=`set_rcvar`
+rcvar=nagircbot_enable
pidfile=/var/run/nagios/${name}.pid
command=%%PREFIX%%/bin/nagircbot
diff --git a/net-mgmt/ndoutils/files/ndo2db.in b/net-mgmt/ndoutils/files/ndo2db.in
index ff0859b80be6..29790a767768 100644
--- a/net-mgmt/ndoutils/files/ndo2db.in
+++ b/net-mgmt/ndoutils/files/ndo2db.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name="ndo2db"
-rcvar=${name}_enable
+rcvar=ndo2db_enable
command="%%PREFIX%%/bin/ndo2db-3x"
required_files="${ndo2db_configfile}"
diff --git a/net-mgmt/ndpmon/files/ndpmonitor.in b/net-mgmt/ndpmon/files/ndpmonitor.in
index b0c240b78de2..970f9b22f858 100644
--- a/net-mgmt/ndpmon/files/ndpmonitor.in
+++ b/net-mgmt/ndpmon/files/ndpmonitor.in
@@ -10,7 +10,7 @@
. /etc/rc.subr
name="ndpmonitor"
-rcvar=`set_rcvar`
+rcvar=ndpmonitor_enable
command="%%PREFIX%%/sbin/ndpmon"
required_files=%%ETCDIR%%/config_ndpmon.xml
diff --git a/net-mgmt/nefu/files/nefu.in b/net-mgmt/nefu/files/nefu.in
index 23fc82b8351b..ea9a068305d6 100644
--- a/net-mgmt/nefu/files/nefu.in
+++ b/net-mgmt/nefu/files/nefu.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name="nefu"
-rcvar=`set_rcvar`
+rcvar=nefu_enable
command=%%PREFIX%%/bin/${name}
load_rc_config $name
diff --git a/net-mgmt/net-snmp/files/snmpd.sh.in b/net-mgmt/net-snmp/files/snmpd.sh.in
index 4975e310305e..7ebddd272f70 100644
--- a/net-mgmt/net-snmp/files/snmpd.sh.in
+++ b/net-mgmt/net-snmp/files/snmpd.sh.in
@@ -28,7 +28,7 @@ if [ ! -z "$net_snmpd_enable" ]; then
fi
name=snmpd
-rcvar=`set_rcvar`
+rcvar=snmpd_enable
command=%%PREFIX%%/sbin/${name}
pidfile=${snmpd_pidfile}
diff --git a/net-mgmt/net-snmp/files/snmptrapd.sh.in b/net-mgmt/net-snmp/files/snmptrapd.sh.in
index ba6f84411f03..ac77e1c1fa49 100644
--- a/net-mgmt/net-snmp/files/snmptrapd.sh.in
+++ b/net-mgmt/net-snmp/files/snmptrapd.sh.in
@@ -25,7 +25,7 @@ if [ ! -z "$net_snmptrapd_enable" ]; then
fi
name=snmptrapd
-rcvar=`set_rcvar`
+rcvar=snmptrapd_enable
command=%%PREFIX%%/sbin/${name}
pidfile=/var/run/${name}.pid
diff --git a/net-mgmt/netams/files/netams.in b/net-mgmt/netams/files/netams.in
index 3ca6f439d46e..1fb21430fcfc 100644
--- a/net-mgmt/netams/files/netams.in
+++ b/net-mgmt/netams/files/netams.in
@@ -22,7 +22,7 @@
. /etc/rc.subr
name="netams"
-rcvar=`set_rcvar`
+rcvar=netams_enable
command="%%PREFIX%%/libexec/netams"
load_rc_config $name
diff --git a/net-mgmt/netdisco/files/netdisco.in b/net-mgmt/netdisco/files/netdisco.in
index 1b599fe01699..3694c0d1bfc9 100644
--- a/net-mgmt/netdisco/files/netdisco.in
+++ b/net-mgmt/netdisco/files/netdisco.in
@@ -7,7 +7,7 @@
. /etc/rc.subr
name="netdisco"
-rcvar=`set_rcvar`
+rcvar=netdisco_enable
load_rc_config $name
diff --git a/net-mgmt/netmond/files/netmond.sh.in b/net-mgmt/netmond/files/netmond.sh.in
index bc2b71943345..ba4de7333433 100644
--- a/net-mgmt/netmond/files/netmond.sh.in
+++ b/net-mgmt/netmond/files/netmond.sh.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name="netmond"
-rcvar=`set_rcvar`
+rcvar=netmond_enable
command="%%PREFIX%%/sbin/${name}"
pidfile="/var/run/${name}.pid"
diff --git a/net-mgmt/netustad/files/netustad.in b/net-mgmt/netustad/files/netustad.in
index 7d7c768a8b94..27287489e071 100644
--- a/net-mgmt/netustad/files/netustad.in
+++ b/net-mgmt/netustad/files/netustad.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name="netustad"
-rcvar=${name}_enable
+rcvar=netustad_enable
command=%%PREFIX%%/sbin/${name}
diff --git a/net-mgmt/netxms/files/netxmsd.in b/net-mgmt/netxms/files/netxmsd.in
index a66a9f6c6096..241909e78ef6 100644
--- a/net-mgmt/netxms/files/netxmsd.in
+++ b/net-mgmt/netxms/files/netxmsd.in
@@ -17,7 +17,7 @@
. /etc/rc.subr
name="netxmsd"
-rcvar=${name}_enable
+rcvar=netxmsd_enable
load_rc_config $name
diff --git a/net-mgmt/netxms/files/nxagentd.in b/net-mgmt/netxms/files/nxagentd.in
index 3ae91f7f7f06..54df991d295b 100644
--- a/net-mgmt/netxms/files/nxagentd.in
+++ b/net-mgmt/netxms/files/nxagentd.in
@@ -17,7 +17,7 @@
name="nxagentd"
nxagentd_user="netxms"
-rcvar=${name}_enable
+rcvar=nxagentd_enable
load_rc_config $name
diff --git a/net-mgmt/netxms/files/nxhttpd.in b/net-mgmt/netxms/files/nxhttpd.in
index 8696422d34bd..262770a775c0 100644
--- a/net-mgmt/netxms/files/nxhttpd.in
+++ b/net-mgmt/netxms/files/nxhttpd.in
@@ -17,7 +17,7 @@
name="nxhttpd"
nxhttpd_user="netxms"
-rcvar=${name}_enable
+rcvar=nxhttpd_enable
load_rc_config $name
diff --git a/net-mgmt/nfsen/files/nfsen.in b/net-mgmt/nfsen/files/nfsen.in
index 4d027aec91f9..1b0fb10bd634 100644
--- a/net-mgmt/nfsen/files/nfsen.in
+++ b/net-mgmt/nfsen/files/nfsen.in
@@ -12,7 +12,7 @@ nfsen_enable=${nfsen_enable-"NO"}
. /etc/rc.subr
name="nfsen"
-rcvar=`set_rcvar`
+rcvar=nfsen_enable
load_rc_config $name
command="%%PREFIX%%/bin/nfsen"
start_cmd="%%PREFIX%%/bin/nfsen start"
diff --git a/net-mgmt/ng_ipacct/files/ng_ipacct.sh.in b/net-mgmt/ng_ipacct/files/ng_ipacct.sh.in
index 608d6a2eda55..572f354bb8b8 100644
--- a/net-mgmt/ng_ipacct/files/ng_ipacct.sh.in
+++ b/net-mgmt/ng_ipacct/files/ng_ipacct.sh.in
@@ -26,7 +26,7 @@
. /etc/rc.subr
name="ng_ipacct"
-rcvar=`set_rcvar`
+rcvar=ng_ipacct_enable
# for debugging purpose you can append flag "-d" to these cmds
# or even use dumb stubs.
diff --git a/net-mgmt/noc/files/noc.sh.in b/net-mgmt/noc/files/noc.sh.in
index 765f22b0a811..dad6a3fc9c02 100644
--- a/net-mgmt/noc/files/noc.sh.in
+++ b/net-mgmt/noc/files/noc.sh.in
@@ -17,7 +17,7 @@
. /etc/rc.subr
name="noc"
-rcvar=`set_rcvar`
+rcvar=noc_enable
# set defaults
diff --git a/net-mgmt/nrpe2/files/nrpe2.in b/net-mgmt/nrpe2/files/nrpe2.in
index acca5bf89b8b..ec291bc00acc 100644
--- a/net-mgmt/nrpe2/files/nrpe2.in
+++ b/net-mgmt/nrpe2/files/nrpe2.in
@@ -19,7 +19,7 @@
. /etc/rc.subr
name="nrpe2"
-rcvar=`set_rcvar`
+rcvar=nrpe2_enable
command="%%PREFIX%%/sbin/nrpe2"
command_args="-d"
diff --git a/net-mgmt/nsca/files/nsca.in b/net-mgmt/nsca/files/nsca.in
index 3d62bdd95ad2..85ec90541548 100644
--- a/net-mgmt/nsca/files/nsca.in
+++ b/net-mgmt/nsca/files/nsca.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name="nsca"
-rcvar=`set_rcvar`
+rcvar=nsca_enable
command="%%PREFIX%%/sbin/nsca"
pidfile="/var/run/nsca.pid"
diff --git a/net-mgmt/openlldp/files/lldpd.in b/net-mgmt/openlldp/files/lldpd.in
index 263a3c3db2ca..d99cd863c02f 100644
--- a/net-mgmt/openlldp/files/lldpd.in
+++ b/net-mgmt/openlldp/files/lldpd.in
@@ -19,7 +19,7 @@
. /etc/rc.subr
name=lldpd
-rcvar=`set_rcvar`
+rcvar=lldpd_enable
command=%%PREFIX%%/sbin/$name
command_args=">/dev/null 2>/dev/null &"
diff --git a/net-mgmt/openvmps/files/vpmsd.in b/net-mgmt/openvmps/files/vpmsd.in
index 99b19fdb021f..49da8c8cacb1 100644
--- a/net-mgmt/openvmps/files/vpmsd.in
+++ b/net-mgmt/openvmps/files/vpmsd.in
@@ -21,7 +21,7 @@
. /etc/rc.subr
name="vmpsd"
-rcvar=`set_rcvar`
+rcvar=vmpsd_enable
command="%%PREFIX%%/sbin/${name}"
load_rc_config $name
diff --git a/net-mgmt/ourmon/files/ourmon.in b/net-mgmt/ourmon/files/ourmon.in
index 492806ba2ddd..a9db0ba4ddd8 100644
--- a/net-mgmt/ourmon/files/ourmon.in
+++ b/net-mgmt/ourmon/files/ourmon.in
@@ -19,7 +19,7 @@
. /etc/rc.subr
name="ourmon"
-rcvar=${name}_enable
+rcvar=ourmon_enable
command="%%PREFIX%%/mrourmon/bin/ourmon"
load_rc_config $name
diff --git a/net-mgmt/pftabled/files/pftabled.in b/net-mgmt/pftabled/files/pftabled.in
index c22438c53e29..d3c0700b548f 100644
--- a/net-mgmt/pftabled/files/pftabled.in
+++ b/net-mgmt/pftabled/files/pftabled.in
@@ -17,7 +17,7 @@
. /etc/rc.subr
name="pftabled"
-rcvar=${name}_enable
+rcvar=pftabled_enable
load_rc_config $name
diff --git a/net-mgmt/pmacct/files/pmacctd.in b/net-mgmt/pmacct/files/pmacctd.in
index fddb1b0428d6..17a749a3d866 100644
--- a/net-mgmt/pmacct/files/pmacctd.in
+++ b/net-mgmt/pmacct/files/pmacctd.in
@@ -23,7 +23,7 @@
. /etc/rc.subr
name=pmacctd
-rcvar=`set_rcvar`
+rcvar=pmacctd_enable
command=%%PREFIX%%/$name
diff --git a/net-mgmt/pnp/files/npcd.sh.in b/net-mgmt/pnp/files/npcd.sh.in
index c089dceb9c08..32ead7ca6718 100644
--- a/net-mgmt/pnp/files/npcd.sh.in
+++ b/net-mgmt/pnp/files/npcd.sh.in
@@ -19,7 +19,7 @@
. /etc/rc.subr
name="npcd"
-rcvar=`set_rcvar`
+rcvar=npcd_enable
command="%%PREFIX%%/bin/npcd"
command_args="-d"
diff --git a/net-mgmt/ramond/files/ramon.in b/net-mgmt/ramond/files/ramon.in
index 810bfe2a8ced..5aeabb93b0ad 100644
--- a/net-mgmt/ramond/files/ramon.in
+++ b/net-mgmt/ramond/files/ramon.in
@@ -9,7 +9,7 @@
. /etc/rc.subr
name="ramon"
-rcvar=`set_rcvar`
+rcvar=ramon_enable
command="%%PREFIX%%/sbin/ramond"
required_files=%%PREFIX%%/etc/ramond.conf
diff --git a/net-mgmt/rotorouter/files/rotorouter.in b/net-mgmt/rotorouter/files/rotorouter.in
index 231d36293558..198e426d2f6b 100644
--- a/net-mgmt/rotorouter/files/rotorouter.in
+++ b/net-mgmt/rotorouter/files/rotorouter.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name=rotorouter
-rcvar=${name}_enable
+rcvar=rotorouter_enable
command=%%PREFIX%%/sbin/${name}
command_args='&'
diff --git a/net-mgmt/rrdbot/files/rrdbot.in b/net-mgmt/rrdbot/files/rrdbot.in
index 26353198d76c..8c7b18d3d55e 100644
--- a/net-mgmt/rrdbot/files/rrdbot.in
+++ b/net-mgmt/rrdbot/files/rrdbot.in
@@ -20,7 +20,7 @@
. /etc/rc.subr
name="rrdbot"
-rcvar=`set_rcvar`
+rcvar=rrdbot_enable
load_rc_config $name
diff --git a/net-mgmt/send/files/patch-sendd-os-sendd b/net-mgmt/send/files/patch-sendd-os-sendd
index 026b50774365..bf8a8a6920fe 100644
--- a/net-mgmt/send/files/patch-sendd-os-sendd
+++ b/net-mgmt/send/files/patch-sendd-os-sendd
@@ -3,7 +3,7 @@
@@ -37,8 +37,8 @@
name="sendd"
- rcvar=`set_rcvar`
+ rcvar=sendd_enable
-command="/usr/local/sbin/${name}"
-required_files="/usr/local/etc/${name}.conf"
+command="%%PREFIX%%/sbin/${name}"
diff --git a/net-mgmt/smokeping/files/smokeping.in b/net-mgmt/smokeping/files/smokeping.in
index 281f79b19c1e..486652f113a1 100644
--- a/net-mgmt/smokeping/files/smokeping.in
+++ b/net-mgmt/smokeping/files/smokeping.in
@@ -23,7 +23,7 @@ smokeping_group=${smokeping_group-"%%GROUPS%%"}
. /etc/rc.subr
name="smokeping"
-rcvar=`set_rcvar`
+rcvar=smokeping_enable
load_rc_config $name
command="/usr/local/bin/smokeping"
command_args="--logfile=${smokeping_logfile}"
diff --git a/net-mgmt/snmptt/files/snmptt.sh.in b/net-mgmt/snmptt/files/snmptt.sh.in
index 183c7d40dbcb..61860e7dbd18 100644
--- a/net-mgmt/snmptt/files/snmptt.sh.in
+++ b/net-mgmt/snmptt/files/snmptt.sh.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name=snmptt
-rcvar=`set_rcvar`
+rcvar=snmptt_enable
command=%%PREFIX%%/sbin/${name}
command_args=">/dev/null --daemon"
diff --git a/net-mgmt/softflowd/files/softflowd.in b/net-mgmt/softflowd/files/softflowd.in
index 8473007d17c8..33020e7d1e49 100644
--- a/net-mgmt/softflowd/files/softflowd.in
+++ b/net-mgmt/softflowd/files/softflowd.in
@@ -22,7 +22,7 @@
. /etc/rc.subr
name=softflowd
-rcvar=`set_rcvar`
+rcvar=softflowd_enable
start_precmd="softflowd_precommand $@"
stop_precmd="softflowd_precommand $@"
diff --git a/net-mgmt/torrus/files/torrus_collector.in b/net-mgmt/torrus/files/torrus_collector.in
index 17ee0c3b79a2..3fa69ba0cd31 100644
--- a/net-mgmt/torrus/files/torrus_collector.in
+++ b/net-mgmt/torrus/files/torrus_collector.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name="torrus_collector"
-rcvar=${name}_enable
+rcvar=torrus_collector_enable
load_rc_config ${name}
diff --git a/net-mgmt/torrus/files/torrus_monitor.in b/net-mgmt/torrus/files/torrus_monitor.in
index 124ecf1f95e4..a4e211d3c76a 100644
--- a/net-mgmt/torrus/files/torrus_monitor.in
+++ b/net-mgmt/torrus/files/torrus_monitor.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name="torrus_monitor"
-rcvar=${name}_enable
+rcvar=torrus_monitor_enable
load_rc_config ${name}
diff --git a/net-mgmt/xymon-client/files/xymon-client.sh.in b/net-mgmt/xymon-client/files/xymon-client.sh.in
index 3e466318f607..0503b9a9b11a 100644
--- a/net-mgmt/xymon-client/files/xymon-client.sh.in
+++ b/net-mgmt/xymon-client/files/xymon-client.sh.in
@@ -9,7 +9,7 @@
. /etc/rc.subr
name="xymon_client"
-rcvar=`set_rcvar`
+rcvar=xymon_client_enable
load_rc_config "$name"
: ${xymon_client_enable:="NO"}
diff --git a/net-mgmt/xymon-server/files/xymon-server.sh.in b/net-mgmt/xymon-server/files/xymon-server.sh.in
index 2c7318412262..dda00a5e8d44 100644
--- a/net-mgmt/xymon-server/files/xymon-server.sh.in
+++ b/net-mgmt/xymon-server/files/xymon-server.sh.in
@@ -9,7 +9,7 @@
. /etc/rc.subr
name="xymon_server"
-rcvar=`set_rcvar`
+rcvar=xymon_server_enable
load_rc_config "$name"
: ${xymon_server_enable:="NO"}
diff --git a/net-mgmt/zabbix-server/files/zabbix_agentd.in b/net-mgmt/zabbix-server/files/zabbix_agentd.in
index eacfffddb0c7..4af7fa72f13f 100644
--- a/net-mgmt/zabbix-server/files/zabbix_agentd.in
+++ b/net-mgmt/zabbix-server/files/zabbix_agentd.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name="zabbix_agentd"
-rcvar=${name}_enable
+rcvar=zabbix_agentd_enable
command="%%PREFIX%%/sbin/${name}"
required_files="%%ETCDIR%%/${name}.conf"
diff --git a/net-mgmt/zabbix-server/files/zabbix_proxy.in b/net-mgmt/zabbix-server/files/zabbix_proxy.in
index c997126b98a9..58898c6ecd3a 100644
--- a/net-mgmt/zabbix-server/files/zabbix_proxy.in
+++ b/net-mgmt/zabbix-server/files/zabbix_proxy.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name="zabbix_proxy"
-rcvar=${name}_enable
+rcvar=zabbix_proxy_enable
command="%%PREFIX%%/sbin/${name}"
required_files="%%ETCDIR%%/${name}.conf"
diff --git a/net-mgmt/zabbix-server/files/zabbix_server.in b/net-mgmt/zabbix-server/files/zabbix_server.in
index 4f4bb8d2c0c4..4e381a6ff894 100644
--- a/net-mgmt/zabbix-server/files/zabbix_server.in
+++ b/net-mgmt/zabbix-server/files/zabbix_server.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name="zabbix_server"
-rcvar=${name}_enable
+rcvar=zabbix_server_enable
command="%%PREFIX%%/sbin/${name}"
required_files="%%ETCDIR%%/${name}.conf"
diff --git a/net-mgmt/zabbix2-server/files/zabbix_agentd.in b/net-mgmt/zabbix2-server/files/zabbix_agentd.in
index eacfffddb0c7..4af7fa72f13f 100644
--- a/net-mgmt/zabbix2-server/files/zabbix_agentd.in
+++ b/net-mgmt/zabbix2-server/files/zabbix_agentd.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name="zabbix_agentd"
-rcvar=${name}_enable
+rcvar=zabbix_agentd_enable
command="%%PREFIX%%/sbin/${name}"
required_files="%%ETCDIR%%/${name}.conf"
diff --git a/net-mgmt/zabbix2-server/files/zabbix_proxy.in b/net-mgmt/zabbix2-server/files/zabbix_proxy.in
index c997126b98a9..58898c6ecd3a 100644
--- a/net-mgmt/zabbix2-server/files/zabbix_proxy.in
+++ b/net-mgmt/zabbix2-server/files/zabbix_proxy.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name="zabbix_proxy"
-rcvar=${name}_enable
+rcvar=zabbix_proxy_enable
command="%%PREFIX%%/sbin/${name}"
required_files="%%ETCDIR%%/${name}.conf"
diff --git a/net-mgmt/zabbix2-server/files/zabbix_server.in b/net-mgmt/zabbix2-server/files/zabbix_server.in
index 4f4bb8d2c0c4..4e381a6ff894 100644
--- a/net-mgmt/zabbix2-server/files/zabbix_server.in
+++ b/net-mgmt/zabbix2-server/files/zabbix_server.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name="zabbix_server"
-rcvar=${name}_enable
+rcvar=zabbix_server_enable
command="%%PREFIX%%/sbin/${name}"
required_files="%%ETCDIR%%/${name}.conf"
diff --git a/net-mgmt/zenoss/files/zenoss.in b/net-mgmt/zenoss/files/zenoss.in
index 3852a10c84a7..b54af8d38773 100644
--- a/net-mgmt/zenoss/files/zenoss.in
+++ b/net-mgmt/zenoss/files/zenoss.in
@@ -19,7 +19,7 @@ load_rc_config zenoss
zenoss_enable=${zenoss_enable:-"NO"}
name=zenoss
-rcvar=`set_rcvar`
+rcvar=zenoss_enable
extra_commands="init"
start_cmd="zenoss_command start"
diff --git a/net-p2p/amule-devel/files/amuled.sh.in b/net-p2p/amule-devel/files/amuled.sh.in
index d3dae43db169..2ed3fa8d8548 100644
--- a/net-p2p/amule-devel/files/amuled.sh.in
+++ b/net-p2p/amule-devel/files/amuled.sh.in
@@ -21,7 +21,7 @@
. /etc/rc.subr
name="amuled"
-rcvar=`set_rcvar`
+rcvar=amuled_enable
load_rc_config $name
diff --git a/net-p2p/amule/files/amuled.sh.in b/net-p2p/amule/files/amuled.sh.in
index d3dae43db169..2ed3fa8d8548 100644
--- a/net-p2p/amule/files/amuled.sh.in
+++ b/net-p2p/amule/files/amuled.sh.in
@@ -21,7 +21,7 @@
. /etc/rc.subr
name="amuled"
-rcvar=`set_rcvar`
+rcvar=amuled_enable
load_rc_config $name
diff --git a/net-p2p/bnbt/files/bnbt.sh.in b/net-p2p/bnbt/files/bnbt.sh.in
index cbdc3b3d77f6..f8bde3c225cb 100644
--- a/net-p2p/bnbt/files/bnbt.sh.in
+++ b/net-p2p/bnbt/files/bnbt.sh.in
@@ -19,7 +19,7 @@
. /etc/rc.subr
name="bnbt"
-rcvar=`set_rcvar`
+rcvar=bnbt_enable
# path to your executable, might be libxec, bin, sbin, ...
command="%%PREFIX%%/bin/$name"
diff --git a/net-p2p/deluge/files/deluged.in b/net-p2p/deluge/files/deluged.in
index a85ce4646562..67c505852f3c 100644
--- a/net-p2p/deluge/files/deluged.in
+++ b/net-p2p/deluge/files/deluged.in
@@ -31,7 +31,7 @@
. /etc/rc.subr
name="deluged"
-rcvar=${name}_enable
+rcvar=deluged_enable
command=%%PREFIX%%/bin/${name}
command_interpreter=%%PYTHON_CMD%%
diff --git a/net-p2p/i2p/files/i2p.sh.in b/net-p2p/i2p/files/i2p.sh.in
index 58161b0e8ca4..ffc192912fe7 100644
--- a/net-p2p/i2p/files/i2p.sh.in
+++ b/net-p2p/i2p/files/i2p.sh.in
@@ -17,7 +17,7 @@
. /etc/rc.subr
name="i2p"
-rcvar=`set_rcvar`
+rcvar=i2p_enable
command="%%PREFIX%%/sbin/i2prouter"
extra_commands="install uninstall update"
diff --git a/net-p2p/mldonkey/files/mlnet.in b/net-p2p/mldonkey/files/mlnet.in
index 71a961417124..ea201b3cc92b 100644
--- a/net-p2p/mldonkey/files/mlnet.in
+++ b/net-p2p/mldonkey/files/mlnet.in
@@ -19,7 +19,7 @@
. /etc/rc.subr
name="mlnet"
-rcvar=`set_rcvar`
+rcvar=mlnet_enable
command="%%PREFIX%%/bin/${name}"
procname="%%PREFIX%%/bin/${name}-real"
diff --git a/net-p2p/py-bittornado/files/bttrack.in b/net-p2p/py-bittornado/files/bttrack.in
index a702107672f3..154aec0a5ec6 100644
--- a/net-p2p/py-bittornado/files/bttrack.in
+++ b/net-p2p/py-bittornado/files/bttrack.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name=bttrack
-rcvar=`set_rcvar`
+rcvar=bttrack_enable
command=%%PREFIX%%/bin/${name}.py
command_args="&"
diff --git a/net-p2p/transmission-cli/files/transmission.in b/net-p2p/transmission-cli/files/transmission.in
index 3fe976163862..def430c8b88b 100644
--- a/net-p2p/transmission-cli/files/transmission.in
+++ b/net-p2p/transmission-cli/files/transmission.in
@@ -25,7 +25,7 @@
. /etc/rc.subr
name="transmission"
-rcvar=${name}_enable
+rcvar=transmission_enable
command=%%PREFIX%%/bin/transmission-daemon
diff --git a/net-p2p/uhub/files/uhub.sh.in b/net-p2p/uhub/files/uhub.sh.in
index f4abad5a2de6..7a06bcfefaf2 100644
--- a/net-p2p/uhub/files/uhub.sh.in
+++ b/net-p2p/uhub/files/uhub.sh.in
@@ -17,7 +17,7 @@
. /etc/rc.subr
name="uhub"
-rcvar=`set_rcvar`
+rcvar=uhub_enable
load_rc_config $name
diff --git a/net-p2p/verlihub/files/verlihub.in b/net-p2p/verlihub/files/verlihub.in
index 4508f969b91f..faf64b878aaa 100644
--- a/net-p2p/verlihub/files/verlihub.in
+++ b/net-p2p/verlihub/files/verlihub.in
@@ -13,7 +13,7 @@
. /etc/rc.subr
name="verlihub"
-rcvar=${name}_enable
+rcvar=verlihub_enable
command=%%PREFIX%%/bin/${name}
pidfile=/var/run/${name}.pid
diff --git a/net/3proxy/files/3proxy.sh.in b/net/3proxy/files/3proxy.sh.in
index 44935f6f9187..ab286f94cc37 100644
--- a/net/3proxy/files/3proxy.sh.in
+++ b/net/3proxy/files/3proxy.sh.in
@@ -19,7 +19,7 @@ threeproxy_flags=${threeproxy_flags-"%%PREFIX%%/etc/3proxy.cfg"}
. /etc/rc.subr
name="threeproxy"
-rcvar=`set_rcvar`
+rcvar=threeproxy_enable
command="%%PREFIX%%/bin/3proxy"
load_rc_config $name
diff --git a/net/DarwinStreamingServer/files/darwin_streaming_server.sh.in b/net/DarwinStreamingServer/files/darwin_streaming_server.sh.in
index 7d7cd295de95..42996a6a9f45 100644
--- a/net/DarwinStreamingServer/files/darwin_streaming_server.sh.in
+++ b/net/DarwinStreamingServer/files/darwin_streaming_server.sh.in
@@ -10,7 +10,7 @@ darwin_streaming_server_enable=${darwin_streaming_server_enable-"NO"}
. /etc/rc.subr
name=darwin_streaming_server
-rcvar=`set_rcvar`
+rcvar=darwin_streaming_server_enable
command=%%PREFIX%%/sbin/DarwinStreamingServer
load_rc_config ${name}
diff --git a/net/DarwinStreamingServer/files/streamingadminserver.sh.in b/net/DarwinStreamingServer/files/streamingadminserver.sh.in
index f708d61878ac..dde54db34b9c 100644
--- a/net/DarwinStreamingServer/files/streamingadminserver.sh.in
+++ b/net/DarwinStreamingServer/files/streamingadminserver.sh.in
@@ -10,7 +10,7 @@ streamingadminserver_enable=${streamingadminserver_enable-"NO"}
. /etc/rc.subr
name=streamingadminserver
-rcvar=`set_rcvar`
+rcvar=streamingadminserver_enable
command=%%PREFIX%%/sbin/${name}.pl
command_interpreter=%%PERL%%
diff --git a/net/activemq/files/activemq.in b/net/activemq/files/activemq.in
index d332c90df164..072f131efde8 100644
--- a/net/activemq/files/activemq.in
+++ b/net/activemq/files/activemq.in
@@ -30,7 +30,7 @@
. /etc/rc.subr
name="activemq"
-rcvar=${name}_enable
+rcvar=activemq_enable
load_rc_config $name
# Set defaults
diff --git a/net/aoe/files/aoe.in b/net/aoe/files/aoe.in
index 714a9dc71a98..154f5bc99421 100644
--- a/net/aoe/files/aoe.in
+++ b/net/aoe/files/aoe.in
@@ -10,7 +10,7 @@
. /etc/rc.subr
name="aoe"
-rcvar="`set_rcvar`"
+rcvar=aoe_enable
start_cmd="aoe_start"
stop_cmd=":"
diff --git a/net/apinger/files/apinger.in b/net/apinger/files/apinger.in
index 970a389df625..f284f64dc4f7 100644
--- a/net/apinger/files/apinger.in
+++ b/net/apinger/files/apinger.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name="apinger"
-rcvar=${name}_enable
+rcvar=apinger_enable
command=%%PREFIX%%/sbin/${name}
pidfile=/var/run/${name}.pid
diff --git a/net/asterisk/files/asterisk.sh.in b/net/asterisk/files/asterisk.sh.in
index d8bdac9e3ba6..a612850c5603 100644
--- a/net/asterisk/files/asterisk.sh.in
+++ b/net/asterisk/files/asterisk.sh.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name=asterisk
-rcvar=`set_rcvar`
+rcvar=asterisk_enable
extra_commands="reload"
diff --git a/net/asterisk10/files/asterisk.sh.in b/net/asterisk10/files/asterisk.sh.in
index d8bdac9e3ba6..a612850c5603 100644
--- a/net/asterisk10/files/asterisk.sh.in
+++ b/net/asterisk10/files/asterisk.sh.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name=asterisk
-rcvar=`set_rcvar`
+rcvar=asterisk_enable
extra_commands="reload"
diff --git a/net/asterisk14/files/asterisk.sh.in b/net/asterisk14/files/asterisk.sh.in
index ca5941068460..36992dc45267 100644
--- a/net/asterisk14/files/asterisk.sh.in
+++ b/net/asterisk14/files/asterisk.sh.in
@@ -20,7 +20,7 @@ asterisk_shutdown () {
}
name=asterisk
-rcvar=`set_rcvar`
+rcvar=asterisk_enable
command=%%PREFIX%%/sbin/asterisk
diff --git a/net/asterisk16/files/asterisk.sh.in b/net/asterisk16/files/asterisk.sh.in
index 949852163145..be2d32d87d6c 100644
--- a/net/asterisk16/files/asterisk.sh.in
+++ b/net/asterisk16/files/asterisk.sh.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name=asterisk
-rcvar=`set_rcvar`
+rcvar=asterisk_enable
extra_commands="reload"
diff --git a/net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in b/net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in
index b50a9e87591b..60f5ce6b09d0 100644
--- a/net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in
+++ b/net/avahi-app/files/patch-initscript_freebsd_avahi-daemon.sh.in
@@ -14,4 +14,4 @@
+avahi_daemon_enable=${avahi_daemon_enable-${gnome_enable}}
name=avahi_daemon
- rcvar=`set_rcvar`
+ rcvar=avahi_daemon_enable
diff --git a/net/avahi-app/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in b/net/avahi-app/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in
index 71c4343a1faa..d823b670e23c 100644
--- a/net/avahi-app/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in
+++ b/net/avahi-app/files/patch-initscript_freebsd_avahi-dnsconfd.sh.in
@@ -14,4 +14,4 @@
+avahi_dnsconfd_enable=${avahi_dnsconfd_enable-${gnome_enable}}
name=avahi_dnsconfd
- rcvar=`set_rcvar`
+ rcvar=avahi_dnsconfd_enable
diff --git a/net/balance/files/balance.sh.in b/net/balance/files/balance.sh.in
index 0f4f906f0ae9..5f80783f5ffb 100644
--- a/net/balance/files/balance.sh.in
+++ b/net/balance/files/balance.sh.in
@@ -23,7 +23,7 @@
. /etc/rc.subr
name=balance
-rcvar=`set_rcvar`
+rcvar=balance_enable
command=%%PREFIX%%/bin/balance
start_cmd=start_cmd
diff --git a/net/beanstalkd/files/beanstalkd.in b/net/beanstalkd/files/beanstalkd.in
index 8aefd49ac49d..e01e1778818b 100644
--- a/net/beanstalkd/files/beanstalkd.in
+++ b/net/beanstalkd/files/beanstalkd.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name="beanstalkd"
-rcvar=${name}_enable
+rcvar=beanstalkd_enable
load_rc_config ${name}
diff --git a/net/bfilter/files/bfilter.sh.in b/net/bfilter/files/bfilter.sh.in
index 4d438d423a57..b54c7f3bf192 100644
--- a/net/bfilter/files/bfilter.sh.in
+++ b/net/bfilter/files/bfilter.sh.in
@@ -13,7 +13,7 @@
. /etc/rc.subr
name=bfilter
-rcvar=`set_rcvar`
+rcvar=bfilter_enable
command=%%PREFIX%%/bin/${name}
sig_stop=KILL
diff --git a/net/binkd/files/binkd.sh.in b/net/binkd/files/binkd.sh.in
index aa618118af53..7d709ebe466c 100644
--- a/net/binkd/files/binkd.sh.in
+++ b/net/binkd/files/binkd.sh.in
@@ -23,7 +23,7 @@ binkd_pidfile=${binkd_pidfile:-"/var/run/binkd/binkd.pid"}
load_rc_config binkd
name="binkd"
-rcvar=`set_rcvar`
+rcvar=binkd_enable
command="%%PREFIX%%/sbin/binkd"
command_args="${binkd_config}"
required_files="${binkd_config}"
diff --git a/net/bird-devel/files/bird.in b/net/bird-devel/files/bird.in
index 68dc9bd27141..a222f77f3cfd 100644
--- a/net/bird-devel/files/bird.in
+++ b/net/bird-devel/files/bird.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name="bird"
-rcvar=${name}_enable
+rcvar=bird_enable
command=%%PREFIX%%/sbin/${name}
diff --git a/net/bird/files/bird.in b/net/bird/files/bird.in
index 68dc9bd27141..a222f77f3cfd 100644
--- a/net/bird/files/bird.in
+++ b/net/bird/files/bird.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name="bird"
-rcvar=${name}_enable
+rcvar=bird_enable
command=%%PREFIX%%/sbin/${name}
diff --git a/net/bird6/files/bird6.in b/net/bird6/files/bird6.in
index 58b2b4f4d554..4650516a9e5f 100644
--- a/net/bird6/files/bird6.in
+++ b/net/bird6/files/bird6.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name="bird6"
-rcvar=${name}_enable
+rcvar=bird6_enable
command=%%PREFIX%%/sbin/${name}
diff --git a/net/bld/files/bld.in b/net/bld/files/bld.in
index a2a342de64ec..e8805d4739e9 100644
--- a/net/bld/files/bld.in
+++ b/net/bld/files/bld.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name="bld"
-rcvar=${name}_enable
+rcvar=bld_enable
load_rc_config $name
diff --git a/net/boinc-client/files/boinc.sh.in b/net/boinc-client/files/boinc.sh.in
index 9950b8485d10..63f444d03b85 100644
--- a/net/boinc-client/files/boinc.sh.in
+++ b/net/boinc-client/files/boinc.sh.in
@@ -9,7 +9,7 @@
. /etc/rc.subr
name="boinc"
-rcvar=`set_rcvar`
+rcvar=boinc_enable
boinc_user=%%BOINC_USER%%
boinc_home=%%BOINC_HOME%%
diff --git a/net/bounce/files/bounce.in b/net/bounce/files/bounce.in
index e8e8448bfde4..6d28475a3141 100644
--- a/net/bounce/files/bounce.in
+++ b/net/bounce/files/bounce.in
@@ -17,7 +17,7 @@
. /etc/rc.subr
name="bounce"
-rcvar=${name}_enable
+rcvar=bounce_enable
load_rc_config $name
diff --git a/net/callweaver/files/callweaver.in b/net/callweaver/files/callweaver.in
index e1ef480a62c8..cc0caf2da61c 100644
--- a/net/callweaver/files/callweaver.in
+++ b/net/callweaver/files/callweaver.in
@@ -15,7 +15,7 @@ stop_precmd=callweaver_shutdown
sig_stop=KILL
name=callweaver
-rcvar=`set_rcvar`
+rcvar=callweaver_enable
command=%%PREFIX%%/sbin/${name}
pidfile=${callweaver_pidfile:-"/var/run/${name}.pid"}
diff --git a/net/ccxstream/files/ccxstream.in b/net/ccxstream/files/ccxstream.in
index 4365fdd83862..3b46f66098e6 100644
--- a/net/ccxstream/files/ccxstream.in
+++ b/net/ccxstream/files/ccxstream.in
@@ -29,7 +29,7 @@
. /etc/rc.subr
name="ccxstream"
-rcvar=`set_rcvar`
+rcvar=ccxstream_enable
command="%%PREFIX%%/sbin/ccxstream"
diff --git a/net/cnupm/files/cnupm.sh.in b/net/cnupm/files/cnupm.sh.in
index e479e225cd35..2a9a33852020 100644
--- a/net/cnupm/files/cnupm.sh.in
+++ b/net/cnupm/files/cnupm.sh.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name=cnupm
-rcvar=`set_rcvar`
+rcvar=cnupm_enable
command=%%PREFIX%%/sbin/cnupm
cnupm_flags="-ep -f inet -u cnupm"
diff --git a/net/crtmpserver/files/crtmpserver.in b/net/crtmpserver/files/crtmpserver.in
index a0b913fdb4e2..1495ae54e1f8 100644
--- a/net/crtmpserver/files/crtmpserver.in
+++ b/net/crtmpserver/files/crtmpserver.in
@@ -19,7 +19,7 @@
. /etc/rc.subr
name="crtmpserver"
-rcvar=${name}_enable
+rcvar=crtmpserver_enable
command=%%PREFIX%%/sbin/${name}
diff --git a/net/csync2/files/csync2.in b/net/csync2/files/csync2.in
index ca24293c32ea..85a100d1e94a 100644
--- a/net/csync2/files/csync2.in
+++ b/net/csync2/files/csync2.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name="csync2"
-rcvar=${name}_enable
+rcvar=csync2_enable
pidfile=/var/run/${name}.pid
command=%%PREFIX%%/sbin/csync2
diff --git a/net/cvsup-mirror/files/cvsupd.sh.in b/net/cvsup-mirror/files/cvsupd.sh.in
index 4c4049f96c7c..60d080b4b6ff 100644
--- a/net/cvsup-mirror/files/cvsupd.sh.in
+++ b/net/cvsup-mirror/files/cvsupd.sh.in
@@ -30,7 +30,7 @@
. /etc/rc.subr
name="cvsupd"
-rcvar=`set_rcvar`
+rcvar=cvsupd_enable
load_rc_config $name
diff --git a/net/cvsync/files/cvsyncd.in b/net/cvsync/files/cvsyncd.in
index d002408a71a9..e2879782fa91 100644
--- a/net/cvsync/files/cvsyncd.in
+++ b/net/cvsync/files/cvsyncd.in
@@ -12,7 +12,7 @@ cvsyncd_conffile=${cvsyncd_conffile-"%%PREFIX%%/etc/cvsyncd.conf"}
. /etc/rc.subr
name=cvsyncd
-rcvar=`set_rcvar`
+rcvar=cvsyncd_enable
command=%%PREFIX%%/bin/${name}
load_rc_config ${name}
diff --git a/net/daemonlogger/files/daemonlogger.sh.in b/net/daemonlogger/files/daemonlogger.sh.in
index 649668e29d33..77dc52d509cc 100644
--- a/net/daemonlogger/files/daemonlogger.sh.in
+++ b/net/daemonlogger/files/daemonlogger.sh.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name="daemonlogger"
-rcvar=`set_rcvar`
+rcvar=daemonlogger_enable
load_rc_config $name
diff --git a/net/dante/files/sockd.sh.in b/net/dante/files/sockd.sh.in
index b639cf700e35..078e49ea23e1 100644
--- a/net/dante/files/sockd.sh.in
+++ b/net/dante/files/sockd.sh.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name=sockd
-rcvar=`set_rcvar`
+rcvar=sockd_enable
command=%%PREFIX%%/sbin/sockd
pidfile=/var/run/sockd.pid
diff --git a/net/dbeacon/files/dbeacon.in b/net/dbeacon/files/dbeacon.in
index a9a3cb575b78..54388820fc7b 100644
--- a/net/dbeacon/files/dbeacon.in
+++ b/net/dbeacon/files/dbeacon.in
@@ -19,7 +19,7 @@ dbeacon_flags=${dbeacon_flags-""}
. /etc/rc.subr
name="dbeacon"
-rcvar=`set_rcvar`
+rcvar=dbeacon_enable
command="%%PREFIX%%/bin/${name}"
diff --git a/net/dhcp6/files/dhcp6c.sh.in b/net/dhcp6/files/dhcp6c.sh.in
index e88e376dd79c..1054a0995bac 100644
--- a/net/dhcp6/files/dhcp6c.sh.in
+++ b/net/dhcp6/files/dhcp6c.sh.in
@@ -26,7 +26,7 @@
. /etc/rc.subr
name="dhcp6c"
-rcvar=${name}_enable
+rcvar=dhcp6c_enable
command="%%PREFIX%%/sbin/${name}"
start_precmd="${name}_precmd"
diff --git a/net/dhcp6/files/dhcp6relay.sh.in b/net/dhcp6/files/dhcp6relay.sh.in
index 055fe6ebbe5d..849f825ba71d 100644
--- a/net/dhcp6/files/dhcp6relay.sh.in
+++ b/net/dhcp6/files/dhcp6relay.sh.in
@@ -23,7 +23,7 @@
. /etc/rc.subr
name="dhcp6relay"
-rcvar=${name}_enable
+rcvar=dhcp6relay_enable
command=%%PREFIX%%/sbin/${name}
start_precmd="${name}_precmd"
diff --git a/net/dhcp6/files/dhcp6s.sh.in b/net/dhcp6/files/dhcp6s.sh.in
index e399657f16c6..f13c74b47ef0 100644
--- a/net/dhcp6/files/dhcp6s.sh.in
+++ b/net/dhcp6/files/dhcp6s.sh.in
@@ -24,7 +24,7 @@
. /etc/rc.subr
name="dhcp6s"
-rcvar=${name}_enable
+rcvar=dhcp6s_enable
command=%%PREFIX%%/sbin/${name}
start_precmd="${name}_precmd"
diff --git a/net/dhcprelay/files/dhcprelay.in b/net/dhcprelay/files/dhcprelay.in
index b693b7297fbd..e5424e45e7a8 100644
--- a/net/dhcprelay/files/dhcprelay.in
+++ b/net/dhcprelay/files/dhcprelay.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name=dhcprelay
-rcvar=$(set_rcvar)
+rcvar=dhcprelay_enable
pidfile=/var/run/${name}.pid
command=%%PREFIX%%/bin/${name}
diff --git a/net/dhcprelya/files/dhcprelya.in b/net/dhcprelya/files/dhcprelya.in
index 45c770b6f000..463604c384d1 100644
--- a/net/dhcprelya/files/dhcprelya.in
+++ b/net/dhcprelya/files/dhcprelya.in
@@ -45,7 +45,7 @@ dhcprelya_postcmd() {
. /etc/rc.subr
name=dhcprelya
-rcvar=$(set_rcvar)
+rcvar=dhcprelya_enable
pidfile=/var/run/${name}.pid
command=%%PREFIX%%/sbin/${name}
diff --git a/net/dictd/files/dictd.in b/net/dictd/files/dictd.in
index 9187e00ec3f9..a05597044c3c 100644
--- a/net/dictd/files/dictd.in
+++ b/net/dictd/files/dictd.in
@@ -14,7 +14,7 @@ dictd_enable=${dictd_enable-"NO"}
. /etc/rc.subr
name=dictd
-rcvar=`set_rcvar`
+rcvar=dictd_enable
command=%%PREFIX%%/sbin/dictd
load_rc_config $name
diff --git a/net/dtcp/files/dtcpc.sh.in b/net/dtcp/files/dtcpc.sh.in
index 863b6893bdf5..0d7e32cdc0a9 100644
--- a/net/dtcp/files/dtcpc.sh.in
+++ b/net/dtcp/files/dtcpc.sh.in
@@ -24,7 +24,7 @@ dtcpc_flags=${dtcpc_flags:-"-t network -Dl"} # Flags to dtcpc program
. /etc/rc.subr
name="dtcpc"
-rcvar=`set_rcvar`
+rcvar=dtcpc_enable
command="%%PREFIX%%/sbin/${name}"
command_interpreter="%%RUBY%%"
pidfile="/var/run/${name}.pid"
diff --git a/net/dtcp/files/dtcps.sh.in b/net/dtcp/files/dtcps.sh.in
index 7bff3d9fc609..6f3693a985c9 100644
--- a/net/dtcp/files/dtcps.sh.in
+++ b/net/dtcp/files/dtcps.sh.in
@@ -36,7 +36,7 @@ dtcps_enable=${dtcps_enable:-"NO"} # Enable dtcps
. /etc/rc.subr
name="dtcps"
-rcvar=`set_rcvar`
+rcvar=dtcps_enable
command="%%PREFIX%%/sbin/${name}"
command_interpreter="%%RUBY%%"
pidfile="/var/run/${name}.pid"
diff --git a/net/dtcpclient/files/dtcpclient.sh.in b/net/dtcpclient/files/dtcpclient.sh.in
index 687bd954ae79..916c7873f498 100644
--- a/net/dtcpclient/files/dtcpclient.sh.in
+++ b/net/dtcpclient/files/dtcpclient.sh.in
@@ -24,7 +24,7 @@ dtcpclient_flags=${dtcpclient_flags:-"-t network -Dl"} # Flags to dtcpclient pro
. /etc/rc.subr
name="dtcpclient"
-rcvar=`set_rcvar`
+rcvar=dtcpclient_enable
command="%%PREFIX%%/sbin/${name}"
pidfile="/var/run/${name}.pid"
extra_commands="reload"
diff --git a/net/freenet6/files/freenet6.in b/net/freenet6/files/freenet6.in
index adee0df4bd5a..30846ce07342 100644
--- a/net/freenet6/files/freenet6.in
+++ b/net/freenet6/files/freenet6.in
@@ -22,7 +22,7 @@
. /etc/rc.subr
name=freenet6
-rcvar=`set_rcvar`
+rcvar=freenet6_enable
command=%%PREFIX%%/bin/gw6c
required_files=%%PREFIX%%/etc/freenet6/gw6c.conf
diff --git a/net/freeradius/files/radiusd.in b/net/freeradius/files/radiusd.in
index 86724eb68800..4a735a18c173 100644
--- a/net/freeradius/files/radiusd.in
+++ b/net/freeradius/files/radiusd.in
@@ -13,7 +13,7 @@
. /etc/rc.subr
name=radiusd
-rcvar=`set_rcvar`
+rcvar=radiusd_enable
load_rc_config $name
command=%%PREFIX%%/sbin/radiusd
diff --git a/net/freeradius2/files/radiusd.sh.in b/net/freeradius2/files/radiusd.sh.in
index 066993ebb965..bf65b812554c 100644
--- a/net/freeradius2/files/radiusd.sh.in
+++ b/net/freeradius2/files/radiusd.sh.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name=radiusd
-rcvar=`set_rcvar`
+rcvar=radiusd_enable
load_rc_config $name
command=%%PREFIX%%/sbin/radiusd
diff --git a/net/freeswitch-core/files/freeswitch.in b/net/freeswitch-core/files/freeswitch.in
index a3ab07dfd407..d38f868d57a9 100644
--- a/net/freeswitch-core/files/freeswitch.in
+++ b/net/freeswitch-core/files/freeswitch.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name=freeswitch
-rcvar=`set_rcvar`
+rcvar=freeswitch_enable
load_rc_config $name
diff --git a/net/frickin/files/frickin.sh.in b/net/frickin/files/frickin.sh.in
index abbc26a1d9e2..87776cac2678 100644
--- a/net/frickin/files/frickin.sh.in
+++ b/net/frickin/files/frickin.sh.in
@@ -25,7 +25,7 @@ frickin_conf=${frickin_conf-""}
name="frickin"
-rcvar=`set_rcvar`
+rcvar=frickin_enable
load_rc_config ${name}
diff --git a/net/gatekeeper/files/gnugk.sh.in b/net/gatekeeper/files/gnugk.sh.in
index 4747a64f3353..20ef2dfb4924 100644
--- a/net/gatekeeper/files/gnugk.sh.in
+++ b/net/gatekeeper/files/gnugk.sh.in
@@ -20,7 +20,7 @@
. /etc/rc.subr
name="gnugk"
-rcvar=`set_rcvar`
+rcvar=gnugk_enable
command="%%PREFIX%%/bin/${name}"
extra_commands="reload"
diff --git a/net/gateway6/files/gateway6.sh.in b/net/gateway6/files/gateway6.sh.in
index 165121004970..4718b6683798 100644
--- a/net/gateway6/files/gateway6.sh.in
+++ b/net/gateway6/files/gateway6.sh.in
@@ -23,7 +23,7 @@
. /etc/rc.subr
name="gateway6"
-rcvar=`set_rcvar`
+rcvar=gateway6_enable
command=%%PREFIX%%/bin/gw6c
required_files=%%PREFIX%%/etc/gw6c.conf
diff --git a/net/get_iplayer/files/get_iplayer.in b/net/get_iplayer/files/get_iplayer.in
index e20aac1646c1..af1f6f8f6782 100644
--- a/net/get_iplayer/files/get_iplayer.in
+++ b/net/get_iplayer/files/get_iplayer.in
@@ -28,7 +28,7 @@
. /etc/rc.subr
name="get_iplayer"
-rcvar=`set_rcvar`
+rcvar=get_iplayer_enable
load_rc_config $name
diff --git a/net/gnu-dico/files/dicod.sh.in b/net/gnu-dico/files/dicod.sh.in
index 612e7a0de7f5..3c849d9a08eb 100644
--- a/net/gnu-dico/files/dicod.sh.in
+++ b/net/gnu-dico/files/dicod.sh.in
@@ -13,7 +13,7 @@ dicod_enable=${dicod_enable-"NO"}
. %%RC_SUBR%%
name=dicod
-rcvar=`set_rcvar`
+rcvar=dicod_enable
command=%%PREFIX%%/sbin/dicod
load_rc_config $name
diff --git a/net/gnu-radius/files/radiusd.sh.in b/net/gnu-radius/files/radiusd.sh.in
index d37dc8f09f34..1035a2797a63 100644
--- a/net/gnu-radius/files/radiusd.sh.in
+++ b/net/gnu-radius/files/radiusd.sh.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name=radiusd
-rcvar=`set_rcvar`
+rcvar=radiusd_enable
command=%%PREFIX%%/sbin/radiusd
radiusd_config=${radiusd_config:-"%%PREFIX%%/etc/raddb/config"}
diff --git a/net/gogoc/files/gogoc.in b/net/gogoc/files/gogoc.in
index 14ebd3897313..35c2d107e398 100644
--- a/net/gogoc/files/gogoc.in
+++ b/net/gogoc/files/gogoc.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name="gogoc"
-rcvar=${name}_enable
+rcvar=gogoc_enable
command=%%LOCALBASE%%/bin/${name}
diff --git a/net/haproxy-devel/files/haproxy.in b/net/haproxy-devel/files/haproxy.in
index 8127c9adffe6..fc79f7868213 100644
--- a/net/haproxy-devel/files/haproxy.in
+++ b/net/haproxy-devel/files/haproxy.in
@@ -34,7 +34,7 @@
. /etc/rc.subr
name="haproxy"
-rcvar=`set_rcvar`
+rcvar=haproxy_enable
command="%%PREFIX%%/sbin/haproxy"
# Load Configs/Set Defaults
diff --git a/net/haproxy/files/haproxy.in b/net/haproxy/files/haproxy.in
index 8127c9adffe6..fc79f7868213 100644
--- a/net/haproxy/files/haproxy.in
+++ b/net/haproxy/files/haproxy.in
@@ -34,7 +34,7 @@
. /etc/rc.subr
name="haproxy"
-rcvar=`set_rcvar`
+rcvar=haproxy_enable
command="%%PREFIX%%/sbin/haproxy"
# Load Configs/Set Defaults
diff --git a/net/howl/files/mdnsresponder.in b/net/howl/files/mdnsresponder.in
index dc546b4a58d9..228ffee72ede 100644
--- a/net/howl/files/mdnsresponder.in
+++ b/net/howl/files/mdnsresponder.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name=mdnsresponder
-rcvar=`set_rcvar`
+rcvar=mdnsresponder_enable
command=%%PREFIX%%/bin/mDNSResponder
diff --git a/net/httpry/files/httpry.in b/net/httpry/files/httpry.in
index 14bf6f64fb18..b0e20837e8ae 100644
--- a/net/httpry/files/httpry.in
+++ b/net/httpry/files/httpry.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name=httpry
-rcvar=${name}_enable
+rcvar=httpry_enable
load_rc_config $name
diff --git a/net/iaxmodem/files/iaxmodem.in b/net/iaxmodem/files/iaxmodem.in
index 6b7685b829e7..23132dde266d 100644
--- a/net/iaxmodem/files/iaxmodem.in
+++ b/net/iaxmodem/files/iaxmodem.in
@@ -13,7 +13,7 @@
. /etc/rc.subr
name=iaxmodem
-rcvar=`set_rcvar`
+rcvar=iaxmodem_enable
command=%%PREFIX%%/sbin/iaxmodem
diff --git a/net/iet/files/ietd.in b/net/iet/files/ietd.in
index 019f6831afc2..af3dfa333da2 100644
--- a/net/iet/files/ietd.in
+++ b/net/iet/files/ietd.in
@@ -9,7 +9,7 @@
. /etc/rc.subr
name="ietd"
-rcvar=`set_rcvar`
+rcvar=ietd_enable
command=%%PREFIX%%/sbin/${name}
required_modules="%%PREFIX%%/modules/iet.ko:iet"
diff --git a/net/ifdepd/files/ifdepd.in b/net/ifdepd/files/ifdepd.in
index db5c00f8be2b..44644d6c084f 100644
--- a/net/ifdepd/files/ifdepd.in
+++ b/net/ifdepd/files/ifdepd.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name="ifdepd"
-rcvar=`set_rcvar`
+rcvar=ifdepd_enable
command="%%PREFIX%%/bin/ifdepd"
diff --git a/net/ifstated/files/ifstated.in b/net/ifstated/files/ifstated.in
index 8da538bef68f..6db7abf331b8 100644
--- a/net/ifstated/files/ifstated.in
+++ b/net/ifstated/files/ifstated.in
@@ -39,7 +39,7 @@
. /etc/rc.subr
name="ifstated"
-rcvar=`set_rcvar`
+rcvar=ifstated_enable
command="%%PREFIX%%/sbin/ifstated"
pidfile="/var/run/${name}.pid"
diff --git a/net/igmpproxy/files/igmpproxy.in b/net/igmpproxy/files/igmpproxy.in
index 68a5b878b9d7..843510d1ae6f 100644
--- a/net/igmpproxy/files/igmpproxy.in
+++ b/net/igmpproxy/files/igmpproxy.in
@@ -17,7 +17,7 @@
. /etc/rc.subr
name="igmpproxy"
-rcvar=`set_rcvar`
+rcvar=igmpproxy_enable
procname="%%PREFIX%%/sbin/${name}"
command=/usr/sbin/daemon
required_files="%%PREFIX%%/etc/igmpproxy.conf"
diff --git a/net/iodine/files/iodined.in b/net/iodine/files/iodined.in
index afaedc07fa9f..23d8eede3233 100644
--- a/net/iodine/files/iodined.in
+++ b/net/iodine/files/iodined.in
@@ -22,7 +22,7 @@
. /etc/rc.subr
name="iodined"
-rcvar=${name}_enable
+rcvar=iodined_enable
command=%%PREFIX%%/sbin/${name}
diff --git a/net/iplog/files/iplog.in b/net/iplog/files/iplog.in
index 6731648d650b..0fa85f8ffc9d 100644
--- a/net/iplog/files/iplog.in
+++ b/net/iplog/files/iplog.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name="iplog"
-rcvar=${name}_enable
+rcvar=iplog_enable
command=%%PREFIX%%/sbin/${name}
pidfile=/var/run/${name}/${name}.pid
diff --git a/net/ipw-firmware/files/ipw.sh.in b/net/ipw-firmware/files/ipw.sh.in
index 3240c6cf189b..7954a2e8f8a4 100644
--- a/net/ipw-firmware/files/ipw.sh.in
+++ b/net/ipw-firmware/files/ipw.sh.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name="%%DRIVERNAME%%"
-rcvar=`set_rcvar`
+rcvar=%%DRIVERNAME%%_enable
start_cmd="%%DRIVERNAME%%_start_cmd"
stop_cmd="%%DRIVERNAME%%_stop_cmd"
diff --git a/net/irrd/files/irrd.sh.in b/net/irrd/files/irrd.sh.in
index 1aa8552650d8..96dee7541f2c 100644
--- a/net/irrd/files/irrd.sh.in
+++ b/net/irrd/files/irrd.sh.in
@@ -20,7 +20,7 @@ irrd_flags="${irrd_flags:--u}" # Flags to imapd program
. /etc/rc.subr
name="irrd"
-rcvar=`set_rcvar`
+rcvar=irrd_enable
command="%%PREFIX%%/sbin/irrd"
required_files="%%PREFIX%%/etc/irrd.conf"
diff --git a/net/iscsi-target/files/iscsi_target.in b/net/iscsi-target/files/iscsi_target.in
index 95953f5e633b..fa7a64bc6671 100644
--- a/net/iscsi-target/files/iscsi_target.in
+++ b/net/iscsi-target/files/iscsi_target.in
@@ -6,7 +6,7 @@
. /etc/rc.subr
name="iscsi_target"
-rcvar=`set_rcvar`
+rcvar=iscsi_target_enable
command="%%PREFIX%%/bin/iscsi-target"
required_files="%%PREFIX%%/etc/iscsi/targets"
diff --git a/net/iwi-firmware/files/iwi.sh.in b/net/iwi-firmware/files/iwi.sh.in
index a861221f865f..5de1210e9c24 100644
--- a/net/iwi-firmware/files/iwi.sh.in
+++ b/net/iwi-firmware/files/iwi.sh.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name="%%DRIVERNAME%%"
-rcvar=`set_rcvar`
+rcvar=%%DRIVERNAME%%_enable
start_cmd="%%DRIVERNAME%%_start_cmd"
stop_cmd="%%DRIVERNAME%%_stop_cmd"
diff --git a/net/ladvd/files/ladvd.in b/net/ladvd/files/ladvd.in
index 1055b0f40baa..3d304ef6f4e5 100644
--- a/net/ladvd/files/ladvd.in
+++ b/net/ladvd/files/ladvd.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name=ladvd
-rcvar=`set_rcvar`
+rcvar=ladvd_enable
command=%%PREFIX%%/sbin/ladvd
load_rc_config ${name}
diff --git a/net/lanbrowsing/files/lisa.in b/net/lanbrowsing/files/lisa.in
index 3b077bd44e5c..b0a39dccc01d 100644
--- a/net/lanbrowsing/files/lisa.in
+++ b/net/lanbrowsing/files/lisa.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name="lisa"
-rcvar=`set_rcvar`
+rcvar=lisa_enable
command="%%PREFIX%%/bin/lisa"
diff --git a/net/linknx/files/linknx.in b/net/linknx/files/linknx.in
index be89e807a33e..3344c14ba60d 100644
--- a/net/linknx/files/linknx.in
+++ b/net/linknx/files/linknx.in
@@ -23,7 +23,7 @@
. /etc/rc.subr
name="linknx"
-rcvar=`set_rcvar`
+rcvar=linknx_enable
start_precmd="linknx_precmd"
diff --git a/net/linuxigd/files/linuxigd.in b/net/linuxigd/files/linuxigd.in
index 83630fc1ed18..e9821a6b176a 100644
--- a/net/linuxigd/files/linuxigd.in
+++ b/net/linuxigd/files/linuxigd.in
@@ -13,7 +13,7 @@
. /etc/rc.subr
name=linuxigd
-rcvar=`set_rcvar`
+rcvar=linuxigd_enable
load_rc_config $name
diff --git a/net/lvwimax/files/lvwimax.in b/net/lvwimax/files/lvwimax.in
index 6dc904cc7b7f..32727cddfce1 100644
--- a/net/lvwimax/files/lvwimax.in
+++ b/net/lvwimax/files/lvwimax.in
@@ -16,7 +16,7 @@ lvwimax_tap_dev="tap0"
. /etc/rc.subr
name=lvwimax
-rcvar=${name}_enable
+rcvar=lvwimax_enable
load_rc_config $name
diff --git a/net/mDNSResponder/files/mdnsd.in b/net/mDNSResponder/files/mdnsd.in
index 6011375d35a6..c17ea3f37f03 100644
--- a/net/mDNSResponder/files/mdnsd.in
+++ b/net/mDNSResponder/files/mdnsd.in
@@ -9,7 +9,7 @@
. /etc/rc.subr
name=mdnsd
-rcvar=`set_rcvar`
+rcvar=mdnsd_enable
load_rc_config $name
diff --git a/net/mediaproxy/files/mediaproxy.in b/net/mediaproxy/files/mediaproxy.in
index b63c7461e851..77aa1f0e469c 100644
--- a/net/mediaproxy/files/mediaproxy.in
+++ b/net/mediaproxy/files/mediaproxy.in
@@ -17,7 +17,7 @@
. /etc/rc.subr
name="mediaproxy"
-rcvar="${name}_enable"
+rcvar=mediaproxy_enable
load_rc_config $name
diff --git a/net/mediaproxy/files/proxydispatcher.in b/net/mediaproxy/files/proxydispatcher.in
index e5ea7a1684af..2b0b466d1c39 100644
--- a/net/mediaproxy/files/proxydispatcher.in
+++ b/net/mediaproxy/files/proxydispatcher.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name="proxydispatcher"
-rcvar="${name}_enable"
+rcvar=proxydispatcher_enable
load_rc_config $name
diff --git a/net/mediatomb/files/mediatomb.sh.in b/net/mediatomb/files/mediatomb.sh.in
index e9b3507e2621..31476a2f41cb 100644
--- a/net/mediatomb/files/mediatomb.sh.in
+++ b/net/mediatomb/files/mediatomb.sh.in
@@ -25,7 +25,7 @@ mediatomb_logfile=${mediatomb_logfile-"%%MEDIATOMB_DIR%%/mediatomb.log"}
mediatomb_pidfile=${mediatomb_pidfile-"%%MEDIATOMB_DIR%%/mediatomb.pid"}
name="mediatomb"
-rcvar=`set_rcvar`
+rcvar=mediatomb_enable
load_rc_config $name
diff --git a/net/minidlna/files/minidlna.sh.in b/net/minidlna/files/minidlna.sh.in
index 55b238ab432b..4b2ed5e40303 100644
--- a/net/minidlna/files/minidlna.sh.in
+++ b/net/minidlna/files/minidlna.sh.in
@@ -13,7 +13,7 @@
. /etc/rc.subr
name=minidlna
-rcvar=`set_rcvar`
+rcvar=minidlna_enable
command=%%PREFIX%%/sbin/minidlna
load_rc_config $name
diff --git a/net/minisapserver/files/sapserver.in b/net/minisapserver/files/sapserver.in
index 2c27d41cb052..95af94488ffb 100644
--- a/net/minisapserver/files/sapserver.in
+++ b/net/minisapserver/files/sapserver.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name=sapserver
-rcvar=${name}_enable
+rcvar=sapserver_enable
command=%%PREFIX%%/bin/${name}
required_files=%%PREFIX%%/etc/sap.cfg
diff --git a/net/minissdpd/files/minissdpd.in b/net/minissdpd/files/minissdpd.in
index cf59a39985e1..76e37732bb55 100644
--- a/net/minissdpd/files/minissdpd.in
+++ b/net/minissdpd/files/minissdpd.in
@@ -14,7 +14,7 @@
# minissdpd_flags="-i listen_addr"
name=minissdpd
-rcvar=`set_rcvar`
+rcvar=minissdpd_enable
load_rc_config $name
minissdpd_enable=${minissdpd_enable:-"NO"}
diff --git a/net/miniupnpd/files/miniupnpd.sh.in b/net/miniupnpd/files/miniupnpd.sh.in
index c9d40792cb69..f866faf0f9d6 100644
--- a/net/miniupnpd/files/miniupnpd.sh.in
+++ b/net/miniupnpd/files/miniupnpd.sh.in
@@ -13,7 +13,7 @@
# miniupnpd_flags="<set as needed>"
name=miniupnpd
-rcvar=`set_rcvar`
+rcvar=miniupnpd_enable
load_rc_config $name
miniupnpd_enable=${miniupnpd_enable:-"NO"}
diff --git a/net/miredo/files/miredo.in b/net/miredo/files/miredo.in
index ebdda40eced3..a4e1d9c77717 100644
--- a/net/miredo/files/miredo.in
+++ b/net/miredo/files/miredo.in
@@ -17,7 +17,7 @@ miredo_enable="${miredo_enable-NO}"
. /etc/rc.subr
name=miredo
-rcvar=`set_rcvar`
+rcvar=miredo_enable
command=%%PREFIX%%/sbin/${name}
required_files=%%PREFIX%%/etc/miredo/miredo.conf
diff --git a/net/miredo/files/miredo_server.in b/net/miredo/files/miredo_server.in
index ddc4c26e7e3b..605e82f25e2e 100644
--- a/net/miredo/files/miredo_server.in
+++ b/net/miredo/files/miredo_server.in
@@ -17,7 +17,7 @@ miredo_server_enable="${miredo_server_enable-NO}"
. /etc/rc.subr
name=miredo_server
-rcvar=`set_rcvar`
+rcvar=miredo_server_enable
command=%%PREFIX%%/sbin/${name}
required_files=%%PREFIX%%/etc/miredo/miredo-server.conf
diff --git a/net/mpd5/files/mpd5.sh.in b/net/mpd5/files/mpd5.sh.in
index 01297e920d80..5654f72f1842 100644
--- a/net/mpd5/files/mpd5.sh.in
+++ b/net/mpd5/files/mpd5.sh.in
@@ -1,13 +1,11 @@
#!/bin/sh
-#
+
# $FreeBSD$
#
-
# PROVIDE: mpd
# REQUIRE: SERVERS
# BEFORE: DAEMON
# KEYWORD: shutdown
-
#
# Add the following lines to /etc/rc.conf to enable mpd5:
# mpd_enable (bool): Set to "NO" by default.
@@ -16,12 +14,11 @@
# Extra flags passed to start command.
#
# See mpd5(8) for flags.
-#
. /etc/rc.subr
name="mpd5"
-rcvar=`set_rcvar mpd`
+rcvar=mpd_enable
load_rc_config ${name}
diff --git a/net/mrouted/files/mrouted.in b/net/mrouted/files/mrouted.in
index c39d5567c141..b32953082d97 100644
--- a/net/mrouted/files/mrouted.in
+++ b/net/mrouted/files/mrouted.in
@@ -11,7 +11,7 @@
. /etc/rc.subr
name="mrouted"
-rcvar=`set_rcvar`
+rcvar=mrouted_enable
command=%%PREFIX%%/sbin/${name}
pidfile="/var/run/${name}.pid"
required_files=%%PREFIX%%/etc/${name}.conf
diff --git a/net/nakenchat/files/nakenchat.in b/net/nakenchat/files/nakenchat.in
index 05d5562ce3c1..bda9d1bbf049 100644
--- a/net/nakenchat/files/nakenchat.in
+++ b/net/nakenchat/files/nakenchat.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name="nakenchat"
-rcvar=${name}_enable
+rcvar=nakenchat_enable
load_rc_config $name
diff --git a/net/ndisc6/files/rdnssd.in b/net/ndisc6/files/rdnssd.in
index 63bc70032dc9..802c49f860ed 100644
--- a/net/ndisc6/files/rdnssd.in
+++ b/net/ndisc6/files/rdnssd.in
@@ -12,7 +12,7 @@
. /etc/rc.subr
name=rdnssd
-rcvar=`set_rcvar`
+rcvar=rdnssd_enable
pidfile=/var/run/${name}.pid
command="%%PREFIX%%/sbin/${name}"
diff --git a/net/netatalk/files/netatalk.in b/net/netatalk/files/netatalk.in
index ae0f8a1e2fbf..4408a7eb85b2 100644
--- a/net/netatalk/files/netatalk.in
+++ b/net/netatalk/files/netatalk.in
@@ -31,7 +31,7 @@ timelord_enable=${timelord_enable-"NO"}
. /etc/rc.subr
name=netatalk
-rcvar=`set_rcvar`
+rcvar=netatalk_enable
hostname=`hostname -s`
start_cmd=netatalk_start
diff --git a/net/neubot/files/neubotd.in b/net/neubot/files/neubotd.in
index bdb4d0973f3c..a4614d54bc30 100644
--- a/net/neubot/files/neubotd.in
+++ b/net/neubot/files/neubotd.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name="neubotd"
-rcvar=`set_rcvar`
+rcvar=neubotd_enable
# read settings, set default values
load_rc_config "${name}"
diff --git a/net/nss-pam-ldapd/files/nslcd.in b/net/nss-pam-ldapd/files/nslcd.in
index 4cd4285d3fc1..ab316ef0dcbf 100644
--- a/net/nss-pam-ldapd/files/nslcd.in
+++ b/net/nss-pam-ldapd/files/nslcd.in
@@ -16,7 +16,7 @@ nslcd_enable=${nslcd_enable-"NO"}
. /etc/rc.subr
name=nslcd
-rcvar=$(set_rcvar)
+rcvar=nslcd_enable
start_postcmd="nslcd_poststart"
diff --git a/net/nstxd/files/nstxd.in b/net/nstxd/files/nstxd.in
index ea4c7c20deec..e04142bc2d4f 100644
--- a/net/nstxd/files/nstxd.in
+++ b/net/nstxd/files/nstxd.in
@@ -36,7 +36,7 @@
. /etc/rc.subr
name=nstxd
-rcvar=`set_rcvar`
+rcvar=nstxd_enable
command=%%PREFIX%%/sbin/nstxd
diff --git a/net/ntop/files/ntop.sh.in b/net/ntop/files/ntop.sh.in
index 1ef275577acc..bbedc786ffef 100644
--- a/net/ntop/files/ntop.sh.in
+++ b/net/ntop/files/ntop.sh.in
@@ -17,7 +17,7 @@
. /etc/rc.subr
name=ntop
-rcvar=${name}_enable
+rcvar=ntop_enable
load_rc_config $name
diff --git a/net/nylon/files/nylon.sh.in b/net/nylon/files/nylon.sh.in
index a3427da782ed..bec8209efc9c 100644
--- a/net/nylon/files/nylon.sh.in
+++ b/net/nylon/files/nylon.sh.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name=nylon
-rcvar=`set_rcvar`
+rcvar=nylon_enable
command=%%PREFIX%%/bin/nylon
diff --git a/net/olsrd/files/olsrd.sh.in b/net/olsrd/files/olsrd.sh.in
index 01bb1fc93271..fa3a2345a312 100644
--- a/net/olsrd/files/olsrd.sh.in
+++ b/net/olsrd/files/olsrd.sh.in
@@ -8,7 +8,7 @@
. /etc/rc.subr
name="olsrd"
-rcvar=`set_rcvar`
+rcvar=olsrd_enable
command=%%PREFIX%%/sbin/olsrd
command_args="-d 0"
diff --git a/net/onioncat/files/onioncat.in b/net/onioncat/files/onioncat.in
index 85e746d24f04..78c338cd975f 100644
--- a/net/onioncat/files/onioncat.in
+++ b/net/onioncat/files/onioncat.in
@@ -11,7 +11,7 @@
. /etc/rc.subr
name="onioncat"
-rcvar=${name}_enable
+rcvar=onioncat_enable
load_rc_config ${name}
diff --git a/net/openafs/files/afsd.in b/net/openafs/files/afsd.in
index efb67354aac8..e9d6b6923d43 100644
--- a/net/openafs/files/afsd.in
+++ b/net/openafs/files/afsd.in
@@ -28,7 +28,7 @@
. /etc/rc.subr
name="afsd"
-rcvar="afsd_enable"
+rcvar=afsd_enable
command="%%PREFIX%%/sbin/${name}"
command_args="-dynroot -fakestat-all -afsdb -memcache"
diff --git a/net/openbgpd/files/openbgpd.sh.in b/net/openbgpd/files/openbgpd.sh.in
index c6ee4649c2ae..a2d3d7e9316e 100644
--- a/net/openbgpd/files/openbgpd.sh.in
+++ b/net/openbgpd/files/openbgpd.sh.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name="openbgpd"
-rcvar=`set_rcvar`
+rcvar=openbgpd_enable
extra_commands="reload"
command="%%PREFIX%%/sbin/bgpd"
diff --git a/net/openldap23-server/files/slapd.sh.in b/net/openldap23-server/files/slapd.sh.in
index fe13fe0d2e2f..5ccee7aeec2b 100644
--- a/net/openldap23-server/files/slapd.sh.in
+++ b/net/openldap23-server/files/slapd.sh.in
@@ -27,7 +27,7 @@
. /etc/rc.subr
name="slapd"
-rcvar=`set_rcvar`
+rcvar=slapd_enable
command="%%PREFIX%%/libexec/slapd"
pidfile="%%LDAP_RUN_DIR%%/slapd.pid"
diff --git a/net/openldap23-server/files/slurpd.sh.in b/net/openldap23-server/files/slurpd.sh.in
index d9f1adbd253f..087ac22238d6 100644
--- a/net/openldap23-server/files/slurpd.sh.in
+++ b/net/openldap23-server/files/slurpd.sh.in
@@ -19,7 +19,7 @@
. /etc/rc.subr
name="slurpd"
-rcvar=`set_rcvar`
+rcvar=slurpd_enable
command="%%PREFIX%%/libexec/slurpd"
required_files="%%PREFIX%%/etc/openldap/slapd.conf"
diff --git a/net/openldap24-server/files/slapd.sh.in b/net/openldap24-server/files/slapd.sh.in
index 596a5e18276a..c04384a3bdfb 100644
--- a/net/openldap24-server/files/slapd.sh.in
+++ b/net/openldap24-server/files/slapd.sh.in
@@ -37,7 +37,7 @@
. /etc/rc.subr
name="slapd"
-rcvar=`set_rcvar`
+rcvar=slapd_enable
# read settings, set defaults
load_rc_config ${name}
diff --git a/net/openmq/files/imq.in b/net/openmq/files/imq.in
index b7e82f832717..3036f9b83c61 100644
--- a/net/openmq/files/imq.in
+++ b/net/openmq/files/imq.in
@@ -40,17 +40,18 @@
# imq_brokerlist="hostname1:7676,hostname2:7676"
# imq_memory="256m"
-name="imq"
. /etc/rc.subr
-# set defaults
+name="imq"
+rcvar=imq_enable
+
+load_rc_config $name
+
imq_enable=${imq_enable:-"NO"}
imq_data=${imq_data:-"/var/spool/imq"}
imq_vmargs=${imq_vmargs:-"-Xms150m -Xss128k -Xbatch -XX:MaxGCPauseMillis=5000"}
imq_memory=${imq_memory:-"256m"}
-rcvar=`set_rcvar`
-load_rc_config $name
pidfile=/var/run/imq.pid
start_cmd="${name}_start"
start_precmd="${name}_build_cmdline"
diff --git a/net/openntpd/files/openntpd.in b/net/openntpd/files/openntpd.in
index 9efbda6bc6ca..4c153aafd12d 100644
--- a/net/openntpd/files/openntpd.in
+++ b/net/openntpd/files/openntpd.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name=openntpd
-rcvar=`set_rcvar`
+rcvar=openntpd_enable
command=%%PREFIX%%/sbin/ntpd
required_files=%%PREFIX%%/etc/ntpd.conf
diff --git a/net/openospfd/files/openospfd.sh.in b/net/openospfd/files/openospfd.sh.in
index 94db2c749e6c..723e18db4b77 100644
--- a/net/openospfd/files/openospfd.sh.in
+++ b/net/openospfd/files/openospfd.sh.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name="openospfd"
-rcvar=`set_rcvar`
+rcvar=openospfd_enable
extra_commands="reload"
command="%%PREFIX%%/sbin/ospfd"
diff --git a/net/openradius/files/openradius.in b/net/openradius/files/openradius.in
index fb0698b09742..a9559d558ec3 100644
--- a/net/openradius/files/openradius.in
+++ b/net/openradius/files/openradius.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name="openradius"
-rcvar=`set_rcvar`
+rcvar=openradius_enable
load_rc_config ${name}
diff --git a/net/openslp/files/slpd.in b/net/openslp/files/slpd.in
index 3cf5c3d26ef0..e18f24ed3af8 100644
--- a/net/openslp/files/slpd.in
+++ b/net/openslp/files/slpd.in
@@ -17,7 +17,7 @@ slpd_flags=${slpd_flags-"-p /var/run/slpd.pid"}
. /etc/rc.subr
name=slpd
-rcvar=`set_rcvar`
+rcvar=slpd_enable
command=%%PREFIX%%/sbin/slpd
pidfile="/var/run/${name}.pid"
diff --git a/net/opentracker/files/opentracker.in b/net/opentracker/files/opentracker.in
index 5c1d83fc2059..dd3381f1af8d 100644
--- a/net/opentracker/files/opentracker.in
+++ b/net/opentracker/files/opentracker.in
@@ -13,7 +13,7 @@
. /etc/rc.subr
name="opentracker"
-rcvar=`set_rcvar`
+rcvar=opentracker_enable
load_rc_config $name
diff --git a/net/openvswitch/files/ovs-vswitchd.in b/net/openvswitch/files/ovs-vswitchd.in
index 0bd510ae7d99..0ef893fb0842 100644
--- a/net/openvswitch/files/ovs-vswitchd.in
+++ b/net/openvswitch/files/ovs-vswitchd.in
@@ -9,7 +9,7 @@
. /etc/rc.subr
name="ovs_vswitchd"
-rcvar=${name}_enable
+rcvar=ovs_vswitchd_enable
command="%%PREFIX%%/sbin/ovs-vswitchd"
pidfile="%%PREFIX%%/var/run/ovs-vswitchd.pid"
diff --git a/net/openvswitch/files/ovsdb-server.in b/net/openvswitch/files/ovsdb-server.in
index 2701f85dbc77..4191a93e912b 100644
--- a/net/openvswitch/files/ovsdb-server.in
+++ b/net/openvswitch/files/ovsdb-server.in
@@ -9,7 +9,7 @@
. /etc/rc.subr
name="ovsdb_server"
-rcvar=${name}_enable
+rcvar=ovsdb_server_enable
command="%%PREFIX%%/sbin/ovsdb-server"
pidfile="%%PREFIX%%/var/run/ovsdb-server.pid"
diff --git a/net/pen/files/pen.sh.in b/net/pen/files/pen.sh.in
index 49c0073ef25a..6f4986633097 100644
--- a/net/pen/files/pen.sh.in
+++ b/net/pen/files/pen.sh.in
@@ -17,7 +17,7 @@
. /etc/rc.subr
name=pen
-rcvar=`set_rcvar`
+rcvar=pen_enable
command=%%PREFIX%%/bin/pen
diff --git a/net/pfflowd/files/pfflowd.in b/net/pfflowd/files/pfflowd.in
index c706ae1f2060..0291ad12a1f8 100644
--- a/net/pfflowd/files/pfflowd.in
+++ b/net/pfflowd/files/pfflowd.in
@@ -17,7 +17,7 @@
. /etc/rc.subr
name=pfflowd
-rcvar=`set_rcvar`
+rcvar=pfflowd_enable
load_rc_config $name
diff --git a/net/poptop/files/pptpd.sh.in b/net/poptop/files/pptpd.sh.in
index 99fb4367f417..375b5f60d889 100644
--- a/net/poptop/files/pptpd.sh.in
+++ b/net/poptop/files/pptpd.sh.in
@@ -15,7 +15,7 @@ pptpd_enable=${pptpd_enable-"NO"}
. /etc/rc.subr
name=pptpd
-rcvar=`set_rcvar`
+rcvar=pptpd_enable
command=%%PREFIX%%/sbin/${name}
pidfile=/var/run/${name}.pid
diff --git a/net/ptpd/files/ptpd.in b/net/ptpd/files/ptpd.in
index 5cb1cbacb7fc..9def76832493 100644
--- a/net/ptpd/files/ptpd.in
+++ b/net/ptpd/files/ptpd.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name="ptpd"
-rcvar=`set_rcvar`
+rcvar=ptpd_enable
command="%%PREFIX%%/sbin/${name}"
diff --git a/net/ptpd2/files/ptpd2.in b/net/ptpd2/files/ptpd2.in
index 595ec358a7de..24223e862965 100644
--- a/net/ptpd2/files/ptpd2.in
+++ b/net/ptpd2/files/ptpd2.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name="ptpd2"
-rcvar=`set_rcvar`
+rcvar=ptpd2_enable
command="%%PREFIX%%/sbin/${name}"
diff --git a/net/pxe/files/pxe.sh.in b/net/pxe/files/pxe.sh.in
index db977e5bfa2e..133e3eafb797 100644
--- a/net/pxe/files/pxe.sh.in
+++ b/net/pxe/files/pxe.sh.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name=pxe
-rcvar=`set_rcvar`
+rcvar=pxe_enable
command="%%PREFIX%%/sbin/pxe"
required_files=%%PREFIX%%/etc/pxe.conf
diff --git a/net/qadsl/files/qadsl.sh.in b/net/qadsl/files/qadsl.sh.in
index 3b9643a3d032..e94442588979 100644
--- a/net/qadsl/files/qadsl.sh.in
+++ b/net/qadsl/files/qadsl.sh.in
@@ -25,7 +25,7 @@ qadsl_pidfile=${qadsl_pidfile-"/var/run/qadsl.pid"}
. /etc/rc.subr
name="qadsl"
-rcvar=`set_rcvar`
+rcvar=qadsl_enable
command=%%PREFIX%%/sbin/qadsl
load_rc_config $name
diff --git a/net/quagga-re/files/quagga.sh.in b/net/quagga-re/files/quagga.sh.in
index ceb71b62d1b2..92c4d41af2f3 100644
--- a/net/quagga-re/files/quagga.sh.in
+++ b/net/quagga-re/files/quagga.sh.in
@@ -28,7 +28,7 @@
. /etc/rc.subr
name="quagga"
-rcvar=`set_rcvar`
+rcvar=quagga_enable
start_postcmd=start_postcmd
stop_postcmd=stop_postcmd
diff --git a/net/quagga-re/files/watchquagga.sh.in b/net/quagga-re/files/watchquagga.sh.in
index cb0d1bf1e751..1b7870f4ebd5 100644
--- a/net/quagga-re/files/watchquagga.sh.in
+++ b/net/quagga-re/files/watchquagga.sh.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name="watchquagga"
-rcvar=`set_rcvar`
+rcvar=watchquagga_enable
stop_postcmd=stop_postcmd
diff --git a/net/quagga/files/quagga.sh.in b/net/quagga/files/quagga.sh.in
index ceb71b62d1b2..92c4d41af2f3 100644
--- a/net/quagga/files/quagga.sh.in
+++ b/net/quagga/files/quagga.sh.in
@@ -28,7 +28,7 @@
. /etc/rc.subr
name="quagga"
-rcvar=`set_rcvar`
+rcvar=quagga_enable
start_postcmd=start_postcmd
stop_postcmd=stop_postcmd
diff --git a/net/quagga/files/watchquagga.sh.in b/net/quagga/files/watchquagga.sh.in
index cb0d1bf1e751..1b7870f4ebd5 100644
--- a/net/quagga/files/watchquagga.sh.in
+++ b/net/quagga/files/watchquagga.sh.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name="watchquagga"
-rcvar=`set_rcvar`
+rcvar=watchquagga_enable
stop_postcmd=stop_postcmd
diff --git a/net/quoted/files/quoted.in b/net/quoted/files/quoted.in
index 569170fa80dd..140d7122e153 100644
--- a/net/quoted/files/quoted.in
+++ b/net/quoted/files/quoted.in
@@ -14,7 +14,7 @@ user="nobody"
. /etc/rc.subr
name="quoted"
-rcvar=`set_rcvar`
+rcvar=quoted_enable
command="%%PREFIX%%/bin/${name}"
command_args="-d -p:17"
command_plus_args="${command} ${command_args}"
diff --git a/net/rabbitmq/files/rabbitmq.in b/net/rabbitmq/files/rabbitmq.in
index 2ae33c8fa0f9..a24dd82a9c80 100644
--- a/net/rabbitmq/files/rabbitmq.in
+++ b/net/rabbitmq/files/rabbitmq.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name=rabbitmq
-rcvar=`set_rcvar`
+rcvar=rabbitmq_enable
load_rc_config $name
diff --git a/net/radiusd-cistron/files/radiusd-cistron.in b/net/radiusd-cistron/files/radiusd-cistron.in
index f597e403f7c8..bc1582c88c50 100644
--- a/net/radiusd-cistron/files/radiusd-cistron.in
+++ b/net/radiusd-cistron/files/radiusd-cistron.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name="radiusd"
-rcvar=${name}_enable
+rcvar=radiusd_enable
command=%%PREFIX%%/sbin/${name}
pidfile=/var/run/${name}.pid
diff --git a/net/radiusd-cistron/files/radrelay-cistron.in b/net/radiusd-cistron/files/radrelay-cistron.in
index 5a4faa5b4177..d7697208fd6c 100644
--- a/net/radiusd-cistron/files/radrelay-cistron.in
+++ b/net/radiusd-cistron/files/radrelay-cistron.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name="radrelay"
-rcvar=${name}_enable
+rcvar=radrelay_enable
command=%%PREFIX%%/sbin/${name}
pidfile=/var/run/${name}.pid
diff --git a/net/radsecproxy/files/radsecproxy.in b/net/radsecproxy/files/radsecproxy.in
index 26a347fe680c..6d46748765e7 100644
--- a/net/radsecproxy/files/radsecproxy.in
+++ b/net/radsecproxy/files/radsecproxy.in
@@ -13,7 +13,7 @@
. /etc/rc.subr
name="radsecproxy"
-rcvar=`set_rcvar`
+rcvar=radsecproxy_enable
: ${radsecproxy_enable:="NO"}
: ${radsecproxy_user:="nobody"}
diff --git a/net/radvd/files/radvd.in b/net/radvd/files/radvd.in
index 33cf3b54df6a..7b626140a996 100644
--- a/net/radvd/files/radvd.in
+++ b/net/radvd/files/radvd.in
@@ -12,7 +12,7 @@
. /etc/rc.subr
name=radvd
-rcvar=`set_rcvar`
+rcvar=radvd_enable
pidfile=/var/run/${name}.pid
command="%%PREFIX%%/sbin/${name}"
diff --git a/net/redir/files/redir.in b/net/redir/files/redir.in
index 240a317ef397..affe996f7efa 100644
--- a/net/redir/files/redir.in
+++ b/net/redir/files/redir.in
@@ -17,7 +17,7 @@
. /etc/rc.subr
name="redir"
-rcvar=${name}_enable
+rcvar=redir_enable
load_rc_config $name
diff --git a/net/relayd/files/relayd.in b/net/relayd/files/relayd.in
index a328b8876472..3fe6baacbefb 100644
--- a/net/relayd/files/relayd.in
+++ b/net/relayd/files/relayd.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name=relayd
-rcvar=${name}_enable
+rcvar=relayd_enable
load_rc_config $name
diff --git a/net/repeater/files/repeater.in b/net/repeater/files/repeater.in
index cbd21a75ec37..2252fa967eae 100644
--- a/net/repeater/files/repeater.in
+++ b/net/repeater/files/repeater.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name=repeater
-rcvar=`set_rcvar`
+rcvar=repeater_enable
load_rc_config $name
diff --git a/net/rinetd/files/rinetd.sh.in b/net/rinetd/files/rinetd.sh.in
index 41c41640e853..fdb1cc87295a 100644
--- a/net/rinetd/files/rinetd.sh.in
+++ b/net/rinetd/files/rinetd.sh.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name="rinetd"
-rcvar=`set_rcvar`
+rcvar=rinetd_enable
load_rc_config $name
diff --git a/net/ris/files/binlsrv.sh.in b/net/ris/files/binlsrv.sh.in
index ed8eaf34299b..5a36fb4179af 100644
--- a/net/ris/files/binlsrv.sh.in
+++ b/net/ris/files/binlsrv.sh.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name="binlsrv"
-rcvar=`set_rcvar`
+rcvar=binlsrv_enable
load_rc_config "${name}"
diff --git a/net/rsmb/files/rsmbd.in b/net/rsmb/files/rsmbd.in
index ed8c23189c05..2fb12ea92ad7 100644
--- a/net/rsmb/files/rsmbd.in
+++ b/net/rsmb/files/rsmbd.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name="rsmbd"
-rcvar=`set_rcvar`
+rcvar=rsmbd_enable
eval "${name}_installdir=\${${name}_installdir:-'%%PREFIX%%/libexec/rsmb'}"
eval "command=\${${name}_installdir}/broker"
diff --git a/net/rsync/files/rsyncd.sh.in b/net/rsync/files/rsyncd.sh.in
index 6f726b442a3c..395189e73243 100644
--- a/net/rsync/files/rsyncd.sh.in
+++ b/net/rsync/files/rsyncd.sh.in
@@ -19,7 +19,7 @@
. /etc/rc.subr
name="%%NAME%%"
-rcvar=`set_rcvar`
+rcvar=%%NAME%%_enable
command="%%PREFIX%%/bin/rsync"
command_args="--daemon"
diff --git a/net/rtg/files/rtgpoll.in b/net/rtg/files/rtgpoll.in
index 555b9cb133f5..02ee3ed7a9f6 100644
--- a/net/rtg/files/rtgpoll.in
+++ b/net/rtg/files/rtgpoll.in
@@ -19,7 +19,7 @@
. /etc/rc.subr
name="rtgpoll"
-rcvar=${name}_enable
+rcvar=rtgpoll_enable
command=%%PREFIX%%/bin/${name}
diff --git a/net/rwhoisd/files/rwhoisd.in b/net/rwhoisd/files/rwhoisd.in
index 61a541173a5c..f2c940fc01cd 100644
--- a/net/rwhoisd/files/rwhoisd.in
+++ b/net/rwhoisd/files/rwhoisd.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name="rwhoisd"
-rcvar=${name}_enable
+rcvar=rwhoisd_enable
command=%%PREFIX%%/sbin/${name}
pidfile=${rwhoisd_pidfile}
diff --git a/net/samba34/files/samba.in b/net/samba34/files/samba.in
index 58f8fbb0b7ec..77ad2ff2810e 100644
--- a/net/samba34/files/samba.in
+++ b/net/samba34/files/samba.in
@@ -27,10 +27,10 @@
. /etc/rc.subr
name="samba"
-rcvar=$(set_rcvar)
-set_rcvar ${rcvar} "NO" "Samba service" > /dev/null
+rcvar=samba_enable
+
# Defaults
-eval ${rcvar}=\${${rcvar}:=NO}
+samba_enable=${samba_enable:=NO}
samba_config_default="%%SAMBA_CONFDIR%%/%%SAMBA_CONFIG%%"
samba_config=${samba_config="${samba_config_default}"}
command_args=${samba_config:+-s "${samba_config}"}
@@ -54,17 +54,17 @@ fi
# XXX: Hack to enable check of the dependent variables
eval real_${rcvar}="\${${rcvar}:=NO}" ${rcvar}=YES
# nmbd
+rcvar=nmbd_enable
nmbd_enable=${nmbd_enable:=NO}
nmbd_flags=${nmbd_flags="-D"}
-set_rcvar nmbd_enable "NO" "nmb daemon" >/dev/null
# smbd
+rcvar=smbd_enable
smbd_enable=${smbd_enable:=NO}
smbd_flags=${smbd_flags="-D"}
-set_rcvar smbd_enable "NO" "smb daemon" >/dev/null
%%WINBIND%%# winbindd
+%%WINBIND%%rcvar=winbindd_enable
%%WINBIND%%winbindd_enable=${winbindd_enable:=NO}
%%WINBIND%%winbindd_flags=${winbindd_flags=''}
-%%WINBIND%%set_rcvar winbindd_enable "NO" "winbind daemon" >/dev/null
# Custom commands
extra_commands="reload status"
start_precmd="samba_start_precmd"
@@ -109,7 +109,7 @@ samba_start_precmd() {
samba_rcvar_cmd() {
local rcvar
- rcvar=$(set_rcvar ${name})
+ rcvar=${name}_enable
eval ${rcvar}=\${real_${rcvar}}
# Prevent recursive calling
unset "${rc_arg}_cmd" "${rc_arg}_precmd" "${rc_arg}_postcmd"
@@ -123,7 +123,7 @@ samba_reload_cmd() {
unset "${rc_arg}_cmd" "${rc_arg}_precmd" "${rc_arg}_postcmd"
# Apply to all daemons
for name in ${samba_daemons}; do
- rcvar=$(set_rcvar ${name})
+ rcvar=${name}_enable
command="%%PREFIX%%/sbin/${name}"
pidfile="%%SAMBA_RUNDIR%%/${name}${pid_extra}.pid"
# Daemon should be enabled and running
@@ -150,7 +150,7 @@ samba_cmd() {
result=0
# Apply to all daemons
for name in ${samba_daemons}; do
- rcvar=$(set_rcvar ${name})
+ rcvar=${name}_enable
# XXX
rcvars=''; v=''
command="%%PREFIX%%/sbin/${name}"
diff --git a/net/samba35/files/samba.in b/net/samba35/files/samba.in
index 58f8fbb0b7ec..77ad2ff2810e 100644
--- a/net/samba35/files/samba.in
+++ b/net/samba35/files/samba.in
@@ -27,10 +27,10 @@
. /etc/rc.subr
name="samba"
-rcvar=$(set_rcvar)
-set_rcvar ${rcvar} "NO" "Samba service" > /dev/null
+rcvar=samba_enable
+
# Defaults
-eval ${rcvar}=\${${rcvar}:=NO}
+samba_enable=${samba_enable:=NO}
samba_config_default="%%SAMBA_CONFDIR%%/%%SAMBA_CONFIG%%"
samba_config=${samba_config="${samba_config_default}"}
command_args=${samba_config:+-s "${samba_config}"}
@@ -54,17 +54,17 @@ fi
# XXX: Hack to enable check of the dependent variables
eval real_${rcvar}="\${${rcvar}:=NO}" ${rcvar}=YES
# nmbd
+rcvar=nmbd_enable
nmbd_enable=${nmbd_enable:=NO}
nmbd_flags=${nmbd_flags="-D"}
-set_rcvar nmbd_enable "NO" "nmb daemon" >/dev/null
# smbd
+rcvar=smbd_enable
smbd_enable=${smbd_enable:=NO}
smbd_flags=${smbd_flags="-D"}
-set_rcvar smbd_enable "NO" "smb daemon" >/dev/null
%%WINBIND%%# winbindd
+%%WINBIND%%rcvar=winbindd_enable
%%WINBIND%%winbindd_enable=${winbindd_enable:=NO}
%%WINBIND%%winbindd_flags=${winbindd_flags=''}
-%%WINBIND%%set_rcvar winbindd_enable "NO" "winbind daemon" >/dev/null
# Custom commands
extra_commands="reload status"
start_precmd="samba_start_precmd"
@@ -109,7 +109,7 @@ samba_start_precmd() {
samba_rcvar_cmd() {
local rcvar
- rcvar=$(set_rcvar ${name})
+ rcvar=${name}_enable
eval ${rcvar}=\${real_${rcvar}}
# Prevent recursive calling
unset "${rc_arg}_cmd" "${rc_arg}_precmd" "${rc_arg}_postcmd"
@@ -123,7 +123,7 @@ samba_reload_cmd() {
unset "${rc_arg}_cmd" "${rc_arg}_precmd" "${rc_arg}_postcmd"
# Apply to all daemons
for name in ${samba_daemons}; do
- rcvar=$(set_rcvar ${name})
+ rcvar=${name}_enable
command="%%PREFIX%%/sbin/${name}"
pidfile="%%SAMBA_RUNDIR%%/${name}${pid_extra}.pid"
# Daemon should be enabled and running
@@ -150,7 +150,7 @@ samba_cmd() {
result=0
# Apply to all daemons
for name in ${samba_daemons}; do
- rcvar=$(set_rcvar ${name})
+ rcvar=${name}_enable
# XXX
rcvars=''; v=''
command="%%PREFIX%%/sbin/${name}"
diff --git a/net/samba36/files/samba.in b/net/samba36/files/samba.in
index 58f8fbb0b7ec..77ad2ff2810e 100644
--- a/net/samba36/files/samba.in
+++ b/net/samba36/files/samba.in
@@ -27,10 +27,10 @@
. /etc/rc.subr
name="samba"
-rcvar=$(set_rcvar)
-set_rcvar ${rcvar} "NO" "Samba service" > /dev/null
+rcvar=samba_enable
+
# Defaults
-eval ${rcvar}=\${${rcvar}:=NO}
+samba_enable=${samba_enable:=NO}
samba_config_default="%%SAMBA_CONFDIR%%/%%SAMBA_CONFIG%%"
samba_config=${samba_config="${samba_config_default}"}
command_args=${samba_config:+-s "${samba_config}"}
@@ -54,17 +54,17 @@ fi
# XXX: Hack to enable check of the dependent variables
eval real_${rcvar}="\${${rcvar}:=NO}" ${rcvar}=YES
# nmbd
+rcvar=nmbd_enable
nmbd_enable=${nmbd_enable:=NO}
nmbd_flags=${nmbd_flags="-D"}
-set_rcvar nmbd_enable "NO" "nmb daemon" >/dev/null
# smbd
+rcvar=smbd_enable
smbd_enable=${smbd_enable:=NO}
smbd_flags=${smbd_flags="-D"}
-set_rcvar smbd_enable "NO" "smb daemon" >/dev/null
%%WINBIND%%# winbindd
+%%WINBIND%%rcvar=winbindd_enable
%%WINBIND%%winbindd_enable=${winbindd_enable:=NO}
%%WINBIND%%winbindd_flags=${winbindd_flags=''}
-%%WINBIND%%set_rcvar winbindd_enable "NO" "winbind daemon" >/dev/null
# Custom commands
extra_commands="reload status"
start_precmd="samba_start_precmd"
@@ -109,7 +109,7 @@ samba_start_precmd() {
samba_rcvar_cmd() {
local rcvar
- rcvar=$(set_rcvar ${name})
+ rcvar=${name}_enable
eval ${rcvar}=\${real_${rcvar}}
# Prevent recursive calling
unset "${rc_arg}_cmd" "${rc_arg}_precmd" "${rc_arg}_postcmd"
@@ -123,7 +123,7 @@ samba_reload_cmd() {
unset "${rc_arg}_cmd" "${rc_arg}_precmd" "${rc_arg}_postcmd"
# Apply to all daemons
for name in ${samba_daemons}; do
- rcvar=$(set_rcvar ${name})
+ rcvar=${name}_enable
command="%%PREFIX%%/sbin/${name}"
pidfile="%%SAMBA_RUNDIR%%/${name}${pid_extra}.pid"
# Daemon should be enabled and running
@@ -150,7 +150,7 @@ samba_cmd() {
result=0
# Apply to all daemons
for name in ${samba_daemons}; do
- rcvar=$(set_rcvar ${name})
+ rcvar=${name}_enable
# XXX
rcvars=''; v=''
command="%%PREFIX%%/sbin/${name}"
diff --git a/net/samba4-devel/files/samba4.in b/net/samba4-devel/files/samba4.in
index 5d7d74691ec4..33a67a55a508 100644
--- a/net/samba4-devel/files/samba4.in
+++ b/net/samba4-devel/files/samba4.in
@@ -20,7 +20,7 @@
. /etc/rc.subr
name="samba4"
-rcvar=$(set_rcvar)
+rcvar=samba4_enable
load_rc_config "${name}"
diff --git a/net/samba4wins/files/smbd4wins.in b/net/samba4wins/files/smbd4wins.in
index 7c34062883c7..68d813c9cdd3 100644
--- a/net/samba4wins/files/smbd4wins.in
+++ b/net/samba4wins/files/smbd4wins.in
@@ -17,7 +17,7 @@
. /etc/rc.subr
name="smbd4wins"
-rcvar=`set_rcvar`
+rcvar=smbd4wins_enable
command="%%PREFIX%%/sbin/${name}"
pidfile="%%S4W_RUNDIR%%/${name}.pid"
diff --git a/net/scribe/files/scribe.in b/net/scribe/files/scribe.in
index 696d9f6d3e11..06704887b293 100644
--- a/net/scribe/files/scribe.in
+++ b/net/scribe/files/scribe.in
@@ -10,7 +10,7 @@
. /etc/rc.subr
name="scribe"
-rcvar=`set_rcvar`
+rcvar=scribe_enable
pidfile="/var/run/${name}.pid"
command="%%PREFIX%%/bin/scribed"
diff --git a/net/sendfile/files/sendfiled.in b/net/sendfile/files/sendfiled.in
index 2218a411c77f..d44fd695e9ea 100644
--- a/net/sendfile/files/sendfiled.in
+++ b/net/sendfile/files/sendfiled.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name="sendfiled"
-rcvar=`set_rcvar`
+rcvar=sendfiled_enable
command="%%PREFIX%%/sbin/sendfiled"
command_args="-Q"
diff --git a/net/ser/files/ser.in b/net/ser/files/ser.in
index 6d0b429ab304..4c2471e4d7e0 100644
--- a/net/ser/files/ser.in
+++ b/net/ser/files/ser.in
@@ -13,7 +13,7 @@
. /etc/rc.subr
name="ser"
-rcvar=`set_rcvar`
+rcvar=ser_enable
command="%%PREFIX%%/sbin/${name}"
pidfile="/var/run/${name}.pid"
command_args="-P ${pidfile} > /dev/null"
diff --git a/net/serviio/files/serviio.in b/net/serviio/files/serviio.in
index 8418d5d67587..1581092a79ea 100644
--- a/net/serviio/files/serviio.in
+++ b/net/serviio/files/serviio.in
@@ -13,7 +13,7 @@
. /etc/rc.subr
name=serviio
-rcvar=`set_rcvar`
+rcvar=serviio_enable
command=%%PREFIX%%/sbin/serviiod
load_rc_config $name
diff --git a/net/sflowtool/files/sflowtool.in b/net/sflowtool/files/sflowtool.in
index 5eb1dcb369ee..6b89a443ae38 100644
--- a/net/sflowtool/files/sflowtool.in
+++ b/net/sflowtool/files/sflowtool.in
@@ -10,7 +10,7 @@
. /etc/rc.subr
name="sflowtool"
-rcvar=`set_rcvar`
+rcvar=sflowtool_enable
command="%%PREFIX%%/bin/sflowtool"
load_rc_config $name
diff --git a/net/silc-server/files/silcd.in b/net/silc-server/files/silcd.in
index 2af1718ad5f0..1e9caa32d08f 100644
--- a/net/silc-server/files/silcd.in
+++ b/net/silc-server/files/silcd.in
@@ -15,7 +15,7 @@ silcd_enable=${silcd_enable-"NO"}
. /etc/rc.subr
name=silcd
-rcvar=`set_rcvar`
+rcvar=silcd_enable
command=%%PREFIX%%/sbin/${name}
pidfile=/var/run/${name}.pid
diff --git a/net/siproxd/files/siproxd.sh.in b/net/siproxd/files/siproxd.sh.in
index a0b635d50269..c3f0cd38c733 100644
--- a/net/siproxd/files/siproxd.sh.in
+++ b/net/siproxd/files/siproxd.sh.in
@@ -20,7 +20,7 @@ siproxd_enable=${siproxd_enable:-"NO"} # Enable siproxd
. /etc/rc.subr
name="siproxd"
-rcvar=`set_rcvar`
+rcvar=siproxd_enable
command="%%PREFIX%%/sbin/${name}"
load_rc_config $name
diff --git a/net/sixxs-aiccu/files/sixxs-aiccu.in b/net/sixxs-aiccu/files/sixxs-aiccu.in
index 95e9ef809d8f..8b955e4fc55e 100644
--- a/net/sixxs-aiccu/files/sixxs-aiccu.in
+++ b/net/sixxs-aiccu/files/sixxs-aiccu.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name="sixxs_aiccu"
-rcvar=`set_rcvar`
+rcvar=sixxs_aiccu_enable
command="%%PREFIX%%/sbin/sixxs-aiccu"
diff --git a/net/socat/files/socat.in b/net/socat/files/socat.in
index 8802784c4a81..acdbad93bc51 100644
--- a/net/socat/files/socat.in
+++ b/net/socat/files/socat.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name="socat"
-rcvar=${name}_enable
+rcvar=socat_enable
command=%%PREFIX%%/bin/${name}
command_args="&"
diff --git a/net/socks5/files/socks5.sh.in b/net/socks5/files/socks5.sh.in
index 6a7db4ab715d..5f3226dcfccf 100644
--- a/net/socks5/files/socks5.sh.in
+++ b/net/socks5/files/socks5.sh.in
@@ -14,7 +14,7 @@ socks5_enable=${socks5_enable-"NO"}
. /etc/rc.subr
name=socks5
-rcvar=`set_rcvar`
+rcvar=socks5_enable
pidfile="/var/run/$name.pid-1080"
command=%%PREFIX%%/bin/socks5
diff --git a/net/splatd/files/splatd.sh.in b/net/splatd/files/splatd.sh.in
index 9431b322394c..cad9fd0e92b2 100644
--- a/net/splatd/files/splatd.sh.in
+++ b/net/splatd/files/splatd.sh.in
@@ -11,7 +11,7 @@
. /etc/rc.subr
name=splatd
-rcvar=`set_rcvar`
+rcvar=splatd_enable
command=%%PREFIX%%/sbin/splatd
command_interpreter="%%PYTHON_CMD%%"
diff --git a/net/spread/files/spread.sh.in b/net/spread/files/spread.sh.in
index 11663d40cbf5..f685ae3dabfc 100644
--- a/net/spread/files/spread.sh.in
+++ b/net/spread/files/spread.sh.in
@@ -19,7 +19,7 @@
. /etc/rc.subr
name=spread
-rcvar=`set_rcvar`
+rcvar=spread_enable
command="%%PREFIX%%/sbin/spread"
diff --git a/net/spread4/files/spread.sh.in b/net/spread4/files/spread.sh.in
index 4e010a6a8f1f..6e5b76fc4fac 100644
--- a/net/spread4/files/spread.sh.in
+++ b/net/spread4/files/spread.sh.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name=spread
-rcvar=`set_rcvar`
+rcvar=spread_enable
command="%%PREFIX%%/sbin/spread"
diff --git a/net/ss5/files/ss5.in b/net/ss5/files/ss5.in
index 6a79ed2958c1..9d1eb9b98bfe 100644
--- a/net/ss5/files/ss5.in
+++ b/net/ss5/files/ss5.in
@@ -13,7 +13,7 @@
. /etc/rc.subr
name="ss5"
-rcvar=${name}_enable
+rcvar=ss5_enable
pidfile="/var/run/ss5/ss5.pid"
command=%%PREFIX%%/sbin/${name}
diff --git a/net/sslh/files/sslh.in b/net/sslh/files/sslh.in
index 6ed10885808d..e56973fe9351 100644
--- a/net/sslh/files/sslh.in
+++ b/net/sslh/files/sslh.in
@@ -38,7 +38,7 @@ sslh_setfib() {
. /etc/rc.subr
name="sslh"
-rcvar=`set_rcvar`
+rcvar=sslh_enable
command="%%PREFIX%%/sbin/${name}"
start_precmd="sslh_setfib"
diff --git a/net/stone/files/stone.sh.in b/net/stone/files/stone.sh.in
index 68682a9d31aa..9910a5522198 100644
--- a/net/stone/files/stone.sh.in
+++ b/net/stone/files/stone.sh.in
@@ -19,7 +19,7 @@
. /etc/rc.subr
name="stone"
-rcvar=`set_rcvar`
+rcvar=stone_enable
command="%%PREFIX%%/bin/stone"
start_precmd="stone_precmd"
diff --git a/net/stund/files/stund.sh.in b/net/stund/files/stund.sh.in
index 759cba322719..56da993c33b2 100644
--- a/net/stund/files/stund.sh.in
+++ b/net/stund/files/stund.sh.in
@@ -16,7 +16,7 @@
name="stund"
command="%%PREFIX%%/sbin/stund"
-rcvar=`set_rcvar`
+rcvar=stund_enable
extra_commands="status"
pidfile="$stund_pidfile"
diff --git a/net/tac_plus-libradius/files/tac_plus.in b/net/tac_plus-libradius/files/tac_plus.in
index 16effd09a745..9001382dab53 100644
--- a/net/tac_plus-libradius/files/tac_plus.in
+++ b/net/tac_plus-libradius/files/tac_plus.in
@@ -20,7 +20,7 @@
. /etc/rc.subr
name="tac_plus"
-rcvar=`set_rcvar`
+rcvar=tac_plus_enable
command=%%PREFIX%%/sbin/tac_plus
pidfile=/var/run/tac_plus.pid
diff --git a/net/tac_plus4/files/tac_plus.in b/net/tac_plus4/files/tac_plus.in
index 102fad69a4c8..178792403918 100644
--- a/net/tac_plus4/files/tac_plus.in
+++ b/net/tac_plus4/files/tac_plus.in
@@ -21,7 +21,7 @@
. /etc/rc.subr
name=tac_plus
-rcvar=`set_rcvar`
+rcvar=tac_plus_enable
command="%%PREFIX%%/bin/tac_plus"
pidfile="/var/run/${name}.pid"
diff --git a/net/tcpproxy/files/tcpproxy.in b/net/tcpproxy/files/tcpproxy.in
index 567cda127ffd..04f9b681e70e 100644
--- a/net/tcpproxy/files/tcpproxy.in
+++ b/net/tcpproxy/files/tcpproxy.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name="tcpproxy"
-rcvar=${name}_enable
+rcvar=tcpproxy_enable
command=%%PREFIX%%/bin/${name}
pidfile=/var/run/${name}.pid
diff --git a/net/throttled/files/throttled.in b/net/throttled/files/throttled.in
index ab605bd98c1d..13d794bb3620 100644
--- a/net/throttled/files/throttled.in
+++ b/net/throttled/files/throttled.in
@@ -8,7 +8,7 @@
. /etc/rc.subr
name="throttled"
-rcvar=`set_rcvar`
+rcvar=throttled_enable
start_precmd="throttled_precmd"
command="%%PREFIX%%/sbin/throttled-startup"
diff --git a/net/traff/files/traff.in b/net/traff/files/traff.in
index 92075b716a2b..715d3fe0b382 100644
--- a/net/traff/files/traff.in
+++ b/net/traff/files/traff.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name=traff
-rcvar=`set_rcvar`
+rcvar=traff_enable
command=%%PREFIX%%/sbin/traff
diff --git a/net/ucarp/files/ucarp.in b/net/ucarp/files/ucarp.in
index aaa5bd8e30e3..2b28dad25683 100644
--- a/net/ucarp/files/ucarp.in
+++ b/net/ucarp/files/ucarp.in
@@ -42,7 +42,7 @@
. /etc/rc.subr
name="ucarp"
-rcvar=`set_rcvar`
+rcvar=ucarp_enable
load_rc_config $name
diff --git a/net/udpxy/files/udpxy.in b/net/udpxy/files/udpxy.in
index 3fa2055e2907..4dc359195c9a 100644
--- a/net/udpxy/files/udpxy.in
+++ b/net/udpxy/files/udpxy.in
@@ -21,7 +21,7 @@
. /etc/rc.subr
name="udpxy"
-rcvar=$(set_rcvar)
+rcvar=udpxy_enable
load_rc_config ${name}
diff --git a/net/ushare/files/patch-ushare b/net/ushare/files/patch-ushare
index 849a3f5a276a..1967b2f9291a 100644
--- a/net/ushare/files/patch-ushare
+++ b/net/ushare/files/patch-ushare
@@ -97,7 +97,7 @@
+. /etc/rc.subr
+
+name=ushare
-+rcvar=`set_rcvar`
++rcvar=ushare_enable
+
+command="/usr/local/bin/$name"
+command_args="--daemon"
diff --git a/net/vncreflector/files/vncreflector.sh.in b/net/vncreflector/files/vncreflector.sh.in
index b915790b2ef7..7b2725094713 100644
--- a/net/vncreflector/files/vncreflector.sh.in
+++ b/net/vncreflector/files/vncreflector.sh.in
@@ -30,7 +30,7 @@ vncreflector_addr=${vncreflector_addr-""}
. /etc/rc.subr
name="vncreflector"
-rcvar=`set_rcvar`
+rcvar=vncreflector_enable
start_cmd="vncreflector_start"
stop_cmd="vncreflector_stop"
command="%%PREFIX%%/bin/${name}"
diff --git a/net/vserver/files/vserver.in b/net/vserver/files/vserver.in
index 6b12b3b025ee..e57d4172b49f 100644
--- a/net/vserver/files/vserver.in
+++ b/net/vserver/files/vserver.in
@@ -24,7 +24,7 @@
. /etc/rc.subr
name=vserver
-rcvar=`set_rcvar`
+rcvar=vserver_enable
command=%%PREFIX%%/sbin/vserver
required_files=%%PREFIX%%/etc/vchat/user.db
diff --git a/net/vtun/files/vtunclient.in b/net/vtun/files/vtunclient.in
index a5dc348d3931..69dd253c95dc 100644
--- a/net/vtun/files/vtunclient.in
+++ b/net/vtun/files/vtunclient.in
@@ -29,7 +29,7 @@ vtunclient_enable=${vtunclient_enable:-"NO"}
. /etc/rc.subr
name=vtunclient
-rcvar=`set_rcvar`
+rcvar=vtunclient_enable
required_files="%%PREFIX%%/etc/vtund.conf"
command=%%PREFIX%%/sbin/vtund
diff --git a/net/vtun/files/vtund.in b/net/vtun/files/vtund.in
index d90f7c9adbec..c33947e19038 100644
--- a/net/vtun/files/vtund.in
+++ b/net/vtun/files/vtund.in
@@ -17,7 +17,7 @@ vtund_flags=${vtund_flags:-"-s"}
. /etc/rc.subr
name=vtund
-rcvar=`set_rcvar`
+rcvar=vtund_enable
required_files="%%PREFIX%%/etc/vtund.conf"
pidfile=/var/run/vtund.pid
diff --git a/net/widentd/files/widentd.sh.in b/net/widentd/files/widentd.sh.in
index d042c189ac16..efc4baf42ba9 100644
--- a/net/widentd/files/widentd.sh.in
+++ b/net/widentd/files/widentd.sh.in
@@ -29,7 +29,7 @@ widentd_enable=${widentd_enable-"NO"}
. /etc/rc.subr
name="widentd"
-rcvar=`set_rcvar`
+rcvar=widentd_enable
command="%%PREFIX%%/sbin/widentd"
load_rc_config $name
diff --git a/net/wired-tracker/files/trackerd.sh.in b/net/wired-tracker/files/trackerd.sh.in
index 124775cd21c6..e7c83b8e6924 100644
--- a/net/wired-tracker/files/trackerd.sh.in
+++ b/net/wired-tracker/files/trackerd.sh.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name="trackerd"
-rcvar=${name}_enable
+rcvar=trackerd_enable
pidfile=%%PREFIX%%/wired/trackerd.pid
command=%%PREFIX%%/sbin/${name}
diff --git a/net/wired/files/wired.sh.in b/net/wired/files/wired.sh.in
index 9a0f6297e3d2..a2ede8076392 100644
--- a/net/wired/files/wired.sh.in
+++ b/net/wired/files/wired.sh.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name="wired"
-rcvar=${name}_enable
+rcvar=wired_enable
pidfile=%%PREFIX%%/wired/wired.pid
command=%%PREFIX%%/sbin/${name}
diff --git a/net/wizd/files/wizd.sh.in b/net/wizd/files/wizd.sh.in
index f08878e842fc..4239fec4ba22 100644
--- a/net/wizd/files/wizd.sh.in
+++ b/net/wizd/files/wizd.sh.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name="wizd"
-rcvar=${name}_enable
+rcvar=wizd_enable
command="%%PREFIX%%/bin/$name"
command_args="-d"
diff --git a/net/wowzamediaserverpro/files/wowza.in b/net/wowzamediaserverpro/files/wowza.in
index f48cda306521..9d66af8d4d0e 100644
--- a/net/wowzamediaserverpro/files/wowza.in
+++ b/net/wowzamediaserverpro/files/wowza.in
@@ -75,7 +75,7 @@ wowza_stderr_log="${wowza_stderr_log:-"%%STDERR_LOG%%"}"
. /etc/rc.subr
name="wowza"
-rcvar=`set_rcvar`
+rcvar=wowza_enable
pidfile="/var/run/${name}.pid"
procname="java"
diff --git a/net/xboxproxy/files/xboxproxy.in b/net/xboxproxy/files/xboxproxy.in
index d7b2cb7dc076..e68859d947dd 100644
--- a/net/xboxproxy/files/xboxproxy.in
+++ b/net/xboxproxy/files/xboxproxy.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name="xboxproxy"
-rcvar="${name}_enable"
+rcvar=xboxproxy_enable
load_rc_config $name
diff --git a/net/xorp-devel/files/xorp.in b/net/xorp-devel/files/xorp.in
index 03b32a10034f..415885618540 100644
--- a/net/xorp-devel/files/xorp.in
+++ b/net/xorp-devel/files/xorp.in
@@ -19,7 +19,7 @@
. /etc/rc.subr
name="xorp"
-rcvar=`set_rcvar`
+rcvar=xorp_enable
load_rc_config $name
diff --git a/net/xorp/files/xorp.in b/net/xorp/files/xorp.in
index e2b89e2d43fd..8f037d3df567 100644
--- a/net/xorp/files/xorp.in
+++ b/net/xorp/files/xorp.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name="xorp"
-rcvar=`set_rcvar`
+rcvar=xorp_enable
load_rc_config $name
diff --git a/net/xrdp/files/xrdp.in b/net/xrdp/files/xrdp.in
index 9b74e5f6131c..83cd57e9583f 100644
--- a/net/xrdp/files/xrdp.in
+++ b/net/xrdp/files/xrdp.in
@@ -9,7 +9,7 @@
. /etc/rc.subr
name="xrdp"
-rcvar=`set_rcvar`
+rcvar=xrdp_enable
xrdp_daemons="xrdp xrdpsesman"
# Read settings and set default values.
@@ -42,7 +42,7 @@ xrdp_cmd() {
fi
# Apply to all the daemons.
for name in ${xrdp_daemons}; do
- rcvar=$(set_rcvar)
+ rcvar=${name}_enable
if [ "${name}" = "xrdpsesman" ]; then
command="%%PREFIX%%/sbin/xrdp-sesman"
pidfile="/var/run/xrdp-sesman.pid"
diff --git a/net/yate-devel/files/yate.sh.in b/net/yate-devel/files/yate.sh.in
index 0abacc71f21c..b599b0310d21 100644
--- a/net/yate-devel/files/yate.sh.in
+++ b/net/yate-devel/files/yate.sh.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name=yate
-rcvar=`set_rcvar`
+rcvar=yate_enable
command="%%PREFIX%%/sbin/yate"
pidfile="/var/run/${name}.pid"
diff --git a/net/yate/files/yate.sh.in b/net/yate/files/yate.sh.in
index b006182240bd..2d25b9aa4723 100644
--- a/net/yate/files/yate.sh.in
+++ b/net/yate/files/yate.sh.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name=yate
-rcvar=`set_rcvar`
+rcvar=yate_enable
command="%%PREFIX%%/bin/yate"
pidfile="/var/run/${name}.pid"
diff --git a/news/inn/files/innd.sh.in b/news/inn/files/innd.sh.in
index ef7b056ba982..a86073304c93 100644
--- a/news/inn/files/innd.sh.in
+++ b/news/inn/files/innd.sh.in
@@ -1,17 +1,17 @@
#!/bin/sh
+
+# $FreeBSD$
#
# PROVIDE: innd
# REQUIRE: DAEMON
# KEYWORD: shutdown
-#
-# $FreeBSD$
-#
. /etc/rc.subr
name=innd
+rcvar=innd_enable
-PREFIX=%%PREFIX%%
+load_rc_config ${name}
innd_enable=${innd_enable-"NO"}
innd_user=${innd_user-"news"}
@@ -19,13 +19,9 @@ innd_group=${innd_group-"news"}
required_files="%%DBDIR%%/history.dir"
-load_rc_config ${name}
-
start_cmd=${name}_start
stop_cmd=${name}_stop
-rcvar=`set_rcvar`
-
command=%%NEWSBASE%%/bin/rc.news
innd_start() {
@@ -36,5 +32,4 @@ innd_stop() {
su -fm ${innd_user} -c "${command} stop"
}
-load_rc_config ${name}
run_rc_command "$1"
diff --git a/news/newscache/files/newscache.sh.in b/news/newscache/files/newscache.sh.in
index c31162d85a8c..57830d8ad51d 100644
--- a/news/newscache/files/newscache.sh.in
+++ b/news/newscache/files/newscache.sh.in
@@ -15,7 +15,7 @@ newscache_enable=${newscache_enable-"NO"}
. /etc/rc.subr
name=newscache
-rcvar=`set_rcvar`
+rcvar=newscache_enable
command=%%PREFIX%%/sbin/${name}
pidfile=/var/run/${name}.pid
diff --git a/news/nntpcache/files/nntpcached.in b/news/nntpcache/files/nntpcached.in
index 42bb50cac535..dbec9bc1ff87 100644
--- a/news/nntpcache/files/nntpcached.in
+++ b/news/nntpcache/files/nntpcached.in
@@ -13,7 +13,7 @@
. /etc/rc.subr
name=nntpcached
-rcvar=`set_rcvar`
+rcvar=nntpcached_enable
load_rc_config $name
diff --git a/news/sabnzbdplus/files/sabnzbd.in b/news/sabnzbdplus/files/sabnzbd.in
index 98e37318111e..5e8a4016233b 100644
--- a/news/sabnzbdplus/files/sabnzbd.in
+++ b/news/sabnzbdplus/files/sabnzbd.in
@@ -23,7 +23,7 @@
. /etc/rc.subr
name="sabnzbd"
-rcvar=${name}_enable
+rcvar=sabnzbd_enable
load_rc_config ${name}
diff --git a/ports-mgmt/pkg_jail/files/pkg_jail b/ports-mgmt/pkg_jail/files/pkg_jail
index a4555e1683fa..0365914c6d39 100644
--- a/ports-mgmt/pkg_jail/files/pkg_jail
+++ b/ports-mgmt/pkg_jail/files/pkg_jail
@@ -23,7 +23,7 @@ then
fi
#
name="pkg_jail"
-rcvar=`set_rcvar`
+rcvar=pkg_jail_enable
init_cmd="pkg_jail_init"
start_cmd="pkg_jail_start"
shell_cmd="pkg_jail_shell"
diff --git a/print/acroreadwrapper/files/linux_adobe.sh.in b/print/acroreadwrapper/files/linux_adobe.sh.in
index 8928a90976da..c25abc45d281 100644
--- a/print/acroreadwrapper/files/linux_adobe.sh.in
+++ b/print/acroreadwrapper/files/linux_adobe.sh.in
@@ -8,7 +8,7 @@
. /etc/rc.subr
name="linux_adobe"
-rcvar=`set_rcvar`
+rcvar=linux_adobe_enable
start_cmd="linux_adobe_start"
stop_cmd="linux_adobe_stop"
diff --git a/print/cups-base/files/cupsd.in b/print/cups-base/files/cupsd.in
index ed277e498d87..81c2e8f1dadb 100644
--- a/print/cups-base/files/cupsd.in
+++ b/print/cups-base/files/cupsd.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name=cupsd
-rcvar=`set_rcvar`
+rcvar=cupsd_enable
start_precmd=${name}_prestart
diff --git a/print/pips800/files/ekpd.sh b/print/pips800/files/ekpd.sh
index b5628ef06531..f7accd50ed4f 100644
--- a/print/pips800/files/ekpd.sh
+++ b/print/pips800/files/ekpd.sh
@@ -21,7 +21,7 @@
. /etc/rc.subr
name="ekpd"
-rcvar=`set_rcvar`
+rcvar=ekpd_enable
command="%%PREFIX%%/libexec/pips/printer/ekpd"
start_precmd="ekpd_prestart"
diff --git a/print/pips800/files/pips.sh b/print/pips800/files/pips.sh
index 6c5ccca7145c..8355ead2146b 100644
--- a/print/pips800/files/pips.sh
+++ b/print/pips800/files/pips.sh
@@ -20,7 +20,7 @@ pips_enable=${pips_enable:-"YES"} # Enable pips
. /etc/rc.subr
name="pips"
-rcvar=`set_rcvar`
+rcvar=pips_enable
start_cmd="/sbin/ldconfig -m %%PREFIX%%/lib/pips"
stop_cmd=":"
diff --git a/security/amavisd-milter/files/amavisd-milter.sh.in b/security/amavisd-milter/files/amavisd-milter.sh.in
index 10b77a8ff515..546220cc1cf3 100644
--- a/security/amavisd-milter/files/amavisd-milter.sh.in
+++ b/security/amavisd-milter/files/amavisd-milter.sh.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name="amavisd_milter"
-rcvar=`set_rcvar`
+rcvar=amavisd_milter_enable
load_rc_config $name
diff --git a/security/amavisd-new/files/amavis-milter.sh.in b/security/amavisd-new/files/amavis-milter.sh.in
index 3763d470cc47..ec6136b96661 100644
--- a/security/amavisd-new/files/amavis-milter.sh.in
+++ b/security/amavisd-new/files/amavis-milter.sh.in
@@ -17,7 +17,7 @@
. /etc/rc.subr
name=amavis_milter
-rcvar=`set_rcvar`
+rcvar=amavis_milter_enable
command=%%PREFIX%%/sbin/amavis-milter
required_files=%%PREFIX%%/etc/amavisd.conf
diff --git a/security/amavisd-new/files/amavis-p0fanalyzer.sh.in b/security/amavisd-new/files/amavis-p0fanalyzer.sh.in
index 4ab419fa5c1b..d7009711bcfc 100644
--- a/security/amavisd-new/files/amavis-p0fanalyzer.sh.in
+++ b/security/amavisd-new/files/amavis-p0fanalyzer.sh.in
@@ -15,7 +15,7 @@ amavis_p0fanalyzer_flags="${amavis_p0fanalyzer_flags-2345}"
. /etc/rc.subr
name="amavis_p0fanalyzer"
-rcvar=`set_rcvar`
+rcvar=amavis_p0fanalyzer_enable
start_cmd=p0fanalyzer_start
stop_cmd=p0fanalyzer_stop
diff --git a/security/amavisd-new/files/amavisd-snmp.sh.in b/security/amavisd-new/files/amavisd-snmp.sh.in
index 60a174db49a7..0f724ae759f3 100644
--- a/security/amavisd-new/files/amavisd-snmp.sh.in
+++ b/security/amavisd-new/files/amavisd-snmp.sh.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name=amavisd_snmp
-rcvar=`set_rcvar`
+rcvar=amavisd_snmp_enable
command="%%PREFIX%%/sbin/amavisd-snmp-subagent"
command_interpreter="%%PERL%%"
diff --git a/security/amavisd-new/files/amavisd.sh.in b/security/amavisd-new/files/amavisd.sh.in
index c885608169d3..593d26982d81 100644
--- a/security/amavisd-new/files/amavisd.sh.in
+++ b/security/amavisd-new/files/amavisd.sh.in
@@ -17,7 +17,7 @@
. /etc/rc.subr
name=amavisd
-rcvar=`set_rcvar`
+rcvar=amavisd_enable
command=%%PREFIX%%/sbin/amavisd > /dev/null 2>&1
required_files=%%PREFIX%%/etc/amavisd.conf
diff --git a/security/arpCounterattack/files/arpCounterattack.in b/security/arpCounterattack/files/arpCounterattack.in
index 6594649d5b21..cb7fe9b9ec6a 100644
--- a/security/arpCounterattack/files/arpCounterattack.in
+++ b/security/arpCounterattack/files/arpCounterattack.in
@@ -19,7 +19,7 @@ arpcounterattack_pidfile="/var/run/arpCounterattack.pid"
. /etc/rc.subr
name="arpcounterattack"
-rcvar=`set_rcvar`
+rcvar=arpcounterattack_enable
command="%%PREFIX%%/sbin/arpCounterattack"
load_rc_config $name
diff --git a/security/barnyard2/files/barnyard2.sh.in b/security/barnyard2/files/barnyard2.sh.in
index ecaa513a9ef4..08a37f4b8030 100644
--- a/security/barnyard2/files/barnyard2.sh.in
+++ b/security/barnyard2/files/barnyard2.sh.in
@@ -23,7 +23,7 @@
. /etc/rc.subr
name="barnyard2"
-rcvar=`set_rcvar`
+rcvar=barnyard2_enable
# set some defaults
: ${barnyard2_enable="NO"}
: ${barnyard2_conf="%%PREFIX%%/etc/barnyard2.conf"}
diff --git a/security/blocksshd/files/blocksshd.in b/security/blocksshd/files/blocksshd.in
index 45f7a1a4eaed..ec27ea9275ca 100644
--- a/security/blocksshd/files/blocksshd.in
+++ b/security/blocksshd/files/blocksshd.in
@@ -9,7 +9,7 @@
. /etc/rc.subr
name="blocksshd"
-rcvar="`set_rcvar`"
+rcvar=blocksshd_enable
command="%%PREFIX%%/bin/${name}"
command_interpreter="/usr/bin/perl"
pidfile="/var/run/${name}.pid"
diff --git a/security/bruteblock/files/bruteblockd.sh.in b/security/bruteblock/files/bruteblockd.sh.in
index ab42438e7057..51de2ea73635 100644
--- a/security/bruteblock/files/bruteblockd.sh.in
+++ b/security/bruteblock/files/bruteblockd.sh.in
@@ -7,7 +7,7 @@
. /etc/rc.subr
name="bruteblockd"
-rcvar=`set_rcvar`
+rcvar=bruteblockd_enable
load_rc_config $name
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
diff --git a/security/clamav/files/clamav-clamd.in b/security/clamav/files/clamav-clamd.in
index 2ecc189102fd..7abcad137686 100644
--- a/security/clamav/files/clamav-clamd.in
+++ b/security/clamav/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/files/clamav-freshclam.in b/security/clamav/files/clamav-freshclam.in
index 86d7b8c71f9b..5d6a806994d5 100644
--- a/security/clamav/files/clamav-freshclam.in
+++ b/security/clamav/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/files/clamav-milter.in b/security/clamav/files/clamav-milter.in
index b4d58885a346..d8b2e11818bb 100644
--- a/security/clamav/files/clamav-milter.in
+++ b/security/clamav/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
diff --git a/security/clamsmtp/files/clamsmtpd.sh.in b/security/clamsmtp/files/clamsmtpd.sh.in
index 772461b33574..c5c93c5c1a9c 100644
--- a/security/clamsmtp/files/clamsmtpd.sh.in
+++ b/security/clamsmtp/files/clamsmtpd.sh.in
@@ -17,7 +17,7 @@
. /etc/rc.subr
name="clamsmtpd"
-rcvar=${name}_enable
+rcvar=clamsmtpd_enable
: ${clamsmtpd_enable="NO"}
: ${clamsmtpd_conf="%%PREFIX%%/etc/clamsmtpd.conf"}
diff --git a/security/courier-authlib/files/courier-authdaemond.sh.in b/security/courier-authlib/files/courier-authdaemond.sh.in
index 0fe8ffd7c0d2..6dc0304c5e4a 100644
--- a/security/courier-authlib/files/courier-authdaemond.sh.in
+++ b/security/courier-authlib/files/courier-authdaemond.sh.in
@@ -28,7 +28,7 @@ courier_authdaemond_enable=${courier_authdaemond_enable-"NO"} # Run courier-auth
. /etc/rc.subr
name="courier_authdaemond"
-rcvar=`set_rcvar`
+rcvar=courier_authdaemond_enable
command="${sbindir}/authdaemond"
procname="${sbindir}/courierlogger"
diff --git a/security/cyrus-sasl2-saslauthd/files/saslauthd.sh.in b/security/cyrus-sasl2-saslauthd/files/saslauthd.sh.in
index e0b619acf453..f5468ce36096 100644
--- a/security/cyrus-sasl2-saslauthd/files/saslauthd.sh.in
+++ b/security/cyrus-sasl2-saslauthd/files/saslauthd.sh.in
@@ -23,7 +23,7 @@ saslauthd_flags=${saslauthd_flags:-"-a pam"} # Flags to saslauthd program
. /etc/rc.subr
name="saslauthd"
-rcvar=`set_rcvar`
+rcvar=saslauthd_enable
command="%%PREFIX%%/sbin/${name}"
load_rc_config $name
diff --git a/security/denyhosts/files/denyhosts.in b/security/denyhosts/files/denyhosts.in
index c463c71d06de..f482617b86c9 100644
--- a/security/denyhosts/files/denyhosts.in
+++ b/security/denyhosts/files/denyhosts.in
@@ -9,7 +9,7 @@
. /etc/rc.subr
name="denyhosts"
-rcvar=${name}_enable
+rcvar=denyhosts_enable
command="%%PREFIX%%/bin/denyhosts.py"
command_interpreter="%%PYTHON%%"
diff --git a/security/distcache-devel/files/dc_server.sh.in b/security/distcache-devel/files/dc_server.sh.in
index 7647cefa6a55..6f2d02c72b6b 100644
--- a/security/distcache-devel/files/dc_server.sh.in
+++ b/security/distcache-devel/files/dc_server.sh.in
@@ -19,7 +19,7 @@
. /etc/rc.subr
name="%%NAME%%"
-rcvar=`set_rcvar`
+rcvar=%%NAME%%_enable
command="%%PREFIX%%/bin/dc_server"
command_args="-daemon -listen IP:9001 -user nobody -pidfile /var/run/$name.pid"
diff --git a/security/distcache/files/dc_server.sh.in b/security/distcache/files/dc_server.sh.in
index 7647cefa6a55..6f2d02c72b6b 100644
--- a/security/distcache/files/dc_server.sh.in
+++ b/security/distcache/files/dc_server.sh.in
@@ -19,7 +19,7 @@
. /etc/rc.subr
name="%%NAME%%"
-rcvar=`set_rcvar`
+rcvar=%%NAME%%_enable
command="%%PREFIX%%/bin/dc_server"
command_args="-daemon -listen IP:9001 -user nobody -pidfile /var/run/$name.pid"
diff --git a/security/doorman/files/doorman.sh.in b/security/doorman/files/doorman.sh.in
index 8d39304b496b..98e25a3d383b 100644
--- a/security/doorman/files/doorman.sh.in
+++ b/security/doorman/files/doorman.sh.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name="doorman"
-rcvar=`set_rcvar`
+rcvar=doorman_enable
[ -z "$doorman_enable" ] && doorman_enable="NO"
[ -z "$doorman_config" ] && doorman_config="%%PREFIX%%/etc/doormand/doormand.cf"
diff --git a/security/dradis/files/dradis.in b/security/dradis/files/dradis.in
index 6678d21f24d5..f2cb2a86159b 100644
--- a/security/dradis/files/dradis.in
+++ b/security/dradis/files/dradis.in
@@ -20,7 +20,7 @@
. /etc/rc.subr
name=dradis
-rcvar=`set_rcvar`
+rcvar=dradis_enable
dradis_enable=${dradis_enable-"NO"}
dradis_bindip=${dradis_bindip-"127.0.0.1"}
diff --git a/security/dropbear/files/dropbear.in b/security/dropbear/files/dropbear.in
index 40c479b703a3..3f5495794910 100644
--- a/security/dropbear/files/dropbear.in
+++ b/security/dropbear/files/dropbear.in
@@ -13,7 +13,7 @@
. /etc/rc.subr
name="dropbear"
-rcvar=`set_rcvar`
+rcvar=dropbear_enable
command="%%PREFIX%%/sbin/${name}"
keygen_cmd="dropbear_keygen"
start_precmd="dropbear_precmd"
diff --git a/security/expiretable/files/expiretable.in b/security/expiretable/files/expiretable.in
index ad5ee98139fd..18c8380bce3b 100644
--- a/security/expiretable/files/expiretable.in
+++ b/security/expiretable/files/expiretable.in
@@ -11,7 +11,7 @@
. /etc/rc.subr
name="expiretable"
-rcvar=`set_rcvar`
+rcvar=expiretable_enable
command="/usr/local/sbin/expiretable"
load_rc_config "$name"
diff --git a/security/hamachi/files/hamachi.sh.in b/security/hamachi/files/hamachi.sh.in
index d75540d09b57..99e6877c70bd 100644
--- a/security/hamachi/files/hamachi.sh.in
+++ b/security/hamachi/files/hamachi.sh.in
@@ -32,7 +32,7 @@
. /etc/rc.subr
name="hamachi"
-rcvar=`set_rcvar`
+rcvar=hamachi_enable
load_rc_config $name
diff --git a/security/ike/files/iked.in b/security/ike/files/iked.in
index 03ad7f80caf5..73d8f38cb025 100644
--- a/security/ike/files/iked.in
+++ b/security/ike/files/iked.in
@@ -21,7 +21,7 @@
iked_enable=${iked_enable:-"NO"}
name=iked
-rcvar=`set_rcvar`
+rcvar=iked_enable
load_rc_config $name
command=/usr/local/sbin/iked
command_args="-p /var/run/iked.pid > /dev/null"
diff --git a/security/ipguard/files/ipguard.in b/security/ipguard/files/ipguard.in
index d87894880fa8..1389943cfb75 100644
--- a/security/ipguard/files/ipguard.in
+++ b/security/ipguard/files/ipguard.in
@@ -13,7 +13,7 @@
. /etc/rc.subr
name=ipguard
-rcvar=`set_rcvar`
+rcvar=ipguard_enable
start_precmd=ipguard_precmd
command=%%PREFIX%%/sbin/${name}
diff --git a/security/ipsec-tools/files/racoon.sh.in b/security/ipsec-tools/files/racoon.sh.in
index 7d7c4bf9259e..1ab85061fcfa 100644
--- a/security/ipsec-tools/files/racoon.sh.in
+++ b/security/ipsec-tools/files/racoon.sh.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name="racoon"
-rcvar=`set_rcvar`
+rcvar=racoon_enable
load_rc_config $name
diff --git a/security/isakmpd/files/isakmpd.sh.in b/security/isakmpd/files/isakmpd.sh.in
index 3e0adbb29098..fb30d09d8c51 100644
--- a/security/isakmpd/files/isakmpd.sh.in
+++ b/security/isakmpd/files/isakmpd.sh.in
@@ -11,7 +11,7 @@
. /etc/rc.subr
name="isakmpd"
-rcvar=`set_rcvar`
+rcvar=isakmpd_enable
command="%%PREFIX%%/sbin/${name}"
extra_commands="reload"
diff --git a/security/knock/files/knockd.sh.in b/security/knock/files/knockd.sh.in
index 65b9e35b6cce..67e17f929a82 100644
--- a/security/knock/files/knockd.sh.in
+++ b/security/knock/files/knockd.sh.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name="knockd"
-rcvar=`set_rcvar`
+rcvar=knockd_enable
load_rc_config $name
diff --git a/security/maia/files/maiad.in b/security/maia/files/maiad.in
index e109e32e6080..dbbcb5397dd7 100644
--- a/security/maia/files/maiad.in
+++ b/security/maia/files/maiad.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name="maiad"
-rcvar=${name}_enable
+rcvar=maiad_enable
load_rc_config $name
diff --git a/security/nessus/files/nessusd.sh.in b/security/nessus/files/nessusd.sh.in
index 14c019e48ea5..10e0801a9637 100644
--- a/security/nessus/files/nessusd.sh.in
+++ b/security/nessus/files/nessusd.sh.in
@@ -22,7 +22,7 @@ nessusd_flags="-D" # Flags to nessusd program
. /etc/rc.subr
name="nessusd"
-rcvar=`set_rcvar`
+rcvar=nessusd_enable
command="%%PREFIX%%/sbin/nessusd"
pidfile="%%PREFIX%%/var/nessus/nessusd.pid"
required_files="%%PREFIX%%/etc/nessus/nessusd.conf"
diff --git a/security/oidentd/files/oidentd.in b/security/oidentd/files/oidentd.in
index aa236aca2a38..5a035a8fca9b 100644
--- a/security/oidentd/files/oidentd.in
+++ b/security/oidentd/files/oidentd.in
@@ -19,7 +19,7 @@
. /etc/rc.subr
name=oidentd
-rcvar=`set_rcvar`
+rcvar=oidentd_enable
command=%%PREFIX%%/sbin/${name}
diff --git a/security/opencryptoki/files/pkcsslotd.in b/security/opencryptoki/files/pkcsslotd.in
index ca0fb7744dc3..e931d6143280 100644
--- a/security/opencryptoki/files/pkcsslotd.in
+++ b/security/opencryptoki/files/pkcsslotd.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name=pkcsslotd
-rcvar=`set_rcvar`
+rcvar=pkcsslotd_enable
command=%%PREFIX%%/sbin/${name}
start_precmd=${name}_prestart
diff --git a/security/openct/files/openct.in b/security/openct/files/openct.in
index aaaa5b7ac191..5495a951f63f 100644
--- a/security/openct/files/openct.in
+++ b/security/openct/files/openct.in
@@ -17,7 +17,7 @@
. /etc/rc.subr
name="openct"
-rcvar=`set_rcvar`
+rcvar=openct_enable
load_rc_config $name
diff --git a/security/openssh-portable/files/openssh.in b/security/openssh-portable/files/openssh.in
index 4277b3984fed..1eb8a951a3e9 100644
--- a/security/openssh-portable/files/openssh.in
+++ b/security/openssh-portable/files/openssh.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name="openssh"
-rcvar=${name}_enable
+rcvar=openssh_enable
load_rc_config ${name}
diff --git a/security/openvas-server/files/openvasd.in b/security/openvas-server/files/openvasd.in
index 9b07a57e3a75..5685174ae73b 100644
--- a/security/openvas-server/files/openvasd.in
+++ b/security/openvas-server/files/openvasd.in
@@ -25,7 +25,7 @@ openvasd_flags="-D -q" # Flags to openvasd program
. /etc/rc.subr
name="openvasd"
-rcvar=`set_rcvar`
+rcvar=openvasd_enable
command="${prefix}/sbin/openvasd"
pidfile="/var/run/openvasd.pid"
required_files="${prefix}/etc/openvas/openvasd.conf"
diff --git a/security/openvpn-beta/files/openvpn.sh.in b/security/openvpn-beta/files/openvpn.sh.in
index a60af9ac9e21..124082b72687 100644
--- a/security/openvpn-beta/files/openvpn.sh.in
+++ b/security/openvpn-beta/files/openvpn.sh.in
@@ -73,7 +73,7 @@ case "$0" in
;;
esac
-rcvar=$(set_rcvar)
+rcvar=${name}_enable
openvpn_precmd()
{
diff --git a/security/openvpn-devel/files/openvpn.sh.in b/security/openvpn-devel/files/openvpn.sh.in
index a60af9ac9e21..124082b72687 100644
--- a/security/openvpn-devel/files/openvpn.sh.in
+++ b/security/openvpn-devel/files/openvpn.sh.in
@@ -73,7 +73,7 @@ case "$0" in
;;
esac
-rcvar=$(set_rcvar)
+rcvar=${name}_enable
openvpn_precmd()
{
diff --git a/security/openvpn/files/openvpn.sh.in b/security/openvpn/files/openvpn.sh.in
index d2539131a212..f4f1dbdbb7ad 100644
--- a/security/openvpn/files/openvpn.sh.in
+++ b/security/openvpn/files/openvpn.sh.in
@@ -76,8 +76,7 @@ case "$0" in
esac
name="${name##*/}"
-
-rcvar=$(set_rcvar)
+rcvar=${name}_enable
stop_postcmd()
{
diff --git a/security/openvpn20/files/openvpn.sh.in b/security/openvpn20/files/openvpn.sh.in
index d2539131a212..f4f1dbdbb7ad 100644
--- a/security/openvpn20/files/openvpn.sh.in
+++ b/security/openvpn20/files/openvpn.sh.in
@@ -76,8 +76,7 @@ case "$0" in
esac
name="${name##*/}"
-
-rcvar=$(set_rcvar)
+rcvar=${name}_enable
stop_postcmd()
{
diff --git a/security/ossec-hids-server/files/ossec-hids.in b/security/ossec-hids-server/files/ossec-hids.in
index 4f464fb6e9ff..bd6c7e96f360 100644
--- a/security/ossec-hids-server/files/ossec-hids.in
+++ b/security/ossec-hids-server/files/ossec-hids.in
@@ -8,7 +8,7 @@
. /etc/rc.subr
name="ossechids"
-rcvar=`set_rcvar`
+rcvar=ossechids_enable
load_rc_config $name
diff --git a/security/p5-openxpki-deployment/files/openxpki.sh.in b/security/p5-openxpki-deployment/files/openxpki.sh.in
index b79847e61488..acb2aa9cfd64 100644
--- a/security/p5-openxpki-deployment/files/openxpki.sh.in
+++ b/security/p5-openxpki-deployment/files/openxpki.sh.in
@@ -25,7 +25,7 @@ esac
. /etc/rc.subr
name="openxpki"
-rcvar=`set_rcvar`
+rcvar=openxpki_enable
command="%%PREFIX%%/bin/openxpkictl"
procname="openxpkid"
diff --git a/security/pks/files/pksd.sh.in b/security/pks/files/pksd.sh.in
index 9f520df6f97c..ff9a23a6f05e 100644
--- a/security/pks/files/pksd.sh.in
+++ b/security/pks/files/pksd.sh.in
@@ -9,7 +9,7 @@
. /etc/rc.subr
name="pksd"
-rcvar=`set_rcvar`
+rcvar=pksd_enable
command="%%PREFIX%%/sbin/pksd"
command_args="%%PREFIX%%/etc/${name}.conf &"
required_files="%%PREFIX%%/etc/${name}.conf"
diff --git a/security/prelude-lml/files/prelude-lml.sh.in b/security/prelude-lml/files/prelude-lml.sh.in
index 8622d418b11e..e0e5bf1f98fd 100644
--- a/security/prelude-lml/files/prelude-lml.sh.in
+++ b/security/prelude-lml/files/prelude-lml.sh.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name="prelude_lml"
-rcvar=${name}_enable
+rcvar=prelude_lml_enable
command=%%PREFIX%%/bin/prelude-lml
pidfile=/var/run/prelude-lml.pid
diff --git a/security/prelude-manager/files/prelude-manager.sh.in b/security/prelude-manager/files/prelude-manager.sh.in
index 14c862696e31..6f843826a8b5 100644
--- a/security/prelude-manager/files/prelude-manager.sh.in
+++ b/security/prelude-manager/files/prelude-manager.sh.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name="prelude_manager"
-rcvar=${name}_enable
+rcvar=prelude_manager_enable
command=%%PREFIX%%/bin/prelude-manager
pidfile=/var/run/prelude-manager.pid
diff --git a/security/prelude-pflogger/files/prelude-pflogger.in b/security/prelude-pflogger/files/prelude-pflogger.in
index cfd45b77843a..ef8f9e73e933 100644
--- a/security/prelude-pflogger/files/prelude-pflogger.in
+++ b/security/prelude-pflogger/files/prelude-pflogger.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name="prelude_pflogger"
-rcvar=${name}_enable
+rcvar=prelude_pflogger_enable
command=%%PREFIX%%/bin/prelude-pflogger
pidfile=/var/run/prelude-pflogger.pid
diff --git a/security/py-fail2ban/files/fail2ban.in b/security/py-fail2ban/files/fail2ban.in
index 5cbcf31bf95c..ebaa0f8dd7bf 100644
--- a/security/py-fail2ban/files/fail2ban.in
+++ b/security/py-fail2ban/files/fail2ban.in
@@ -14,7 +14,7 @@ fail2ban_pidfile=${fail2ban_pidfile-"/var/run/fail2ban/fail2ban.pid"}
. /etc/rc.subr
name="fail2ban"
-rcvar=`set_rcvar`
+rcvar=fail2ban_enable
pidfile="${fail2ban_pidfile}"
command="%%PREFIX%%/bin/fail2ban-server"
diff --git a/security/racoon2/files/patch-samples-rc.d-iked.in b/security/racoon2/files/patch-samples-rc.d-iked.in
index 0aedae7a2dcd..713bae1a5cdd 100644
--- a/security/racoon2/files/patch-samples-rc.d-iked.in
+++ b/security/racoon2/files/patch-samples-rc.d-iked.in
@@ -5,7 +5,7 @@
name="iked"
-rcvar=$name
-+rcvar=`set_rcvar`
++rcvar=iked_enable
command="@sbindir@/${name}"
extra_commands="reload"
-required_vars="spmd"
diff --git a/security/racoon2/files/patch-samples-rc.d-kinkd.in b/security/racoon2/files/patch-samples-rc.d-kinkd.in
index 7200054e53cf..1db90288a603 100644
--- a/security/racoon2/files/patch-samples-rc.d-kinkd.in
+++ b/security/racoon2/files/patch-samples-rc.d-kinkd.in
@@ -5,7 +5,7 @@
name="kinkd"
-rcvar=$name
-+rcvar=`set_rcvar`
++rcvar=kinkd_enable
command="@sbindir@/${name}"
extra_commands="reload"
-required_vars="spmd"
diff --git a/security/racoon2/files/patch-samples-rc.d-spmd.in b/security/racoon2/files/patch-samples-rc.d-spmd.in
index 7260892b5ef6..f4e962fba6d2 100644
--- a/security/racoon2/files/patch-samples-rc.d-spmd.in
+++ b/security/racoon2/files/patch-samples-rc.d-spmd.in
@@ -5,7 +5,7 @@
name="spmd"
-rcvar=$name
-+rcvar=`set_rcvar`
++rcvar=spmd_enable
command="@sbindir@/${name}"
extra_commands="reload"
pidfile="/var/run/${name}.pid"
diff --git a/security/sancp/files/sancp.in b/security/sancp/files/sancp.in
index 8e67d5e8e779..a5396fb77658 100644
--- a/security/sancp/files/sancp.in
+++ b/security/sancp/files/sancp.in
@@ -55,7 +55,7 @@
. /etc/rc.subr
name="sancp"
-rcvar=`set_rcvar`
+rcvar=sancp_enable
command="%%PREFIX%%/bin/sancp"
diff --git a/security/scanlogd/files/scanlogd.in b/security/scanlogd/files/scanlogd.in
index 9070a9b664e4..ff7a54fae128 100644
--- a/security/scanlogd/files/scanlogd.in
+++ b/security/scanlogd/files/scanlogd.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name="scanlogd"
-rcvar=`set_rcvar`
+rcvar=scanlogd_enable
command="%%PREFIX%%/bin/${name}"
load_rc_config $name
diff --git a/security/scannedonly/files/scannedonly.in b/security/scannedonly/files/scannedonly.in
index 744943d8c3e5..621a67bfc6b0 100644
--- a/security/scannedonly/files/scannedonly.in
+++ b/security/scannedonly/files/scannedonly.in
@@ -20,7 +20,7 @@
. /etc/rc.subr
name=scannedonly_clamav
-rcvar=`set_rcvar`
+rcvar=scannedonly_clamav_enable
command=%%PREFIX%%/sbin/scannedonlyd_clamav
pidfile=/var/run/scannedonlyd_clamav.pid
diff --git a/security/sfs/files/sfscd.in b/security/sfs/files/sfscd.in
index 939ac15074a5..972d4f590575 100644
--- a/security/sfs/files/sfscd.in
+++ b/security/sfs/files/sfscd.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name=sfscd
-rcvar=`set_rcvar`
+rcvar=sfscd_enable
command="%%PREFIX%%/sbin/${name}"
pidfile="/var/run/${name}.pid"
diff --git a/security/sfs/files/sfssd.in b/security/sfs/files/sfssd.in
index c17360201ad6..eb33547f3115 100644
--- a/security/sfs/files/sfssd.in
+++ b/security/sfs/files/sfssd.in
@@ -14,7 +14,7 @@
. /etc/rc.subr
name=sfssd
-rcvar=`set_rcvar`
+rcvar=sfssd_enable
command="%%PREFIX%%/sbin/${name}"
pidfile="/var/run/${name}.pid"
diff --git a/security/sguil-sensor/files/example_agent.sh.in b/security/sguil-sensor/files/example_agent.sh.in
index 58b94f114353..79b449745ea3 100644
--- a/security/sguil-sensor/files/example_agent.sh.in
+++ b/security/sguil-sensor/files/example_agent.sh.in
@@ -24,7 +24,7 @@ example_agent_conf=${example_agent_conf:-"%%PREFIX%%/etc/%%SGUILDIR%%/example_ag
example_agent_flags=${example_agent_flags:-"-D"}
name="example_agent"
-rcvar=`set_rcvar`
+rcvar=example_agent_enable
command="%%PREFIX%%/bin/%%SGUILDIR%%/example_agent.tcl"
command_args="-c ${example_agent_conf} ${example_agent_flags}"
procname="%%PREFIX%%/bin/tclsh8.4"
diff --git a/security/sguil-sensor/files/pads_agent.sh.in b/security/sguil-sensor/files/pads_agent.sh.in
index 02de467af839..757f03ee2e35 100644
--- a/security/sguil-sensor/files/pads_agent.sh.in
+++ b/security/sguil-sensor/files/pads_agent.sh.in
@@ -24,7 +24,7 @@ pads_agent_conf=${pads_agent_conf:-"%%PREFIX%%/etc/%%SGUILDIR%%/pads_agent.conf"
pads_agent_flags=${pads_agent_flags:-"-D"}
name="pads_agent"
-rcvar=`set_rcvar`
+rcvar=pads_agent_enable
command="%%PREFIX%%/bin/%%SGUILDIR%%/pads_agent.tcl"
command_args="-c ${pads_agent_conf} ${pads_agent_flags}"
procname="%%PREFIX%%/bin/tclsh8.4"
diff --git a/security/sguil-sensor/files/pcap_agent.sh.in b/security/sguil-sensor/files/pcap_agent.sh.in
index 2370ff7b0294..264c2ab4b865 100644
--- a/security/sguil-sensor/files/pcap_agent.sh.in
+++ b/security/sguil-sensor/files/pcap_agent.sh.in
@@ -24,7 +24,7 @@ pcap_agent_conf=${pcap_agent_conf:-"%%PREFIX%%/etc/%%SGUILDIR%%/pcap_agent.conf"
pcap_agent_flags=${pcap_agent_flags:-"-D"}
name="pcap_agent"
-rcvar=`set_rcvar`
+rcvar=pcap_agent_enable
command="%%PREFIX%%/bin/%%SGUILDIR%%/pcap_agent.tcl"
command_args="-c ${pcap_agent_conf} ${pcap_agent_flags}"
procname="%%PREFIX%%/bin/tclsh8.4"
diff --git a/security/sguil-sensor/files/sancp_agent.sh.in b/security/sguil-sensor/files/sancp_agent.sh.in
index 11e692a0420f..7b93fd4f6c39 100644
--- a/security/sguil-sensor/files/sancp_agent.sh.in
+++ b/security/sguil-sensor/files/sancp_agent.sh.in
@@ -24,7 +24,7 @@ sancp_agent_conf=${sancp_agent_conf:-"%%PREFIX%%/etc/%%SGUILDIR%%/sancp_agent.co
sancp_agent_flags=${sancp_agent_flags:-"-D"}
name="sancp_agent"
-rcvar=`set_rcvar`
+rcvar=sancp_agent_enable
command="%%PREFIX%%/bin/%%SGUILDIR%%/sancp_agent.tcl"
command_args="-c ${sancp_agent_conf} ${sancp_agent_flags}"
procname="%%PREFIX%%/bin/tclsh8.4"
diff --git a/security/sguil-sensor/files/snort_agent.sh.in b/security/sguil-sensor/files/snort_agent.sh.in
index 985af4a36f6b..154f738118f7 100644
--- a/security/sguil-sensor/files/snort_agent.sh.in
+++ b/security/sguil-sensor/files/snort_agent.sh.in
@@ -24,7 +24,7 @@ snort_agent_conf=${snort_agent_conf:-"%%PREFIX%%/etc/%%SGUILDIR%%/snort_agent.co
snort_agent_flags=${snort_agent_flags:-"-D"}
name="snort_agent"
-rcvar=`set_rcvar`
+rcvar=snort_agent_enable
command="%%PREFIX%%/bin/%%SGUILDIR%%/snort_agent.tcl"
command_args="-c ${snort_agent_conf} ${snort_agent_flags}"
procname="%%PREFIX%%/bin/tclsh8.4"
diff --git a/security/sguil-server/files/sguild.sh.in b/security/sguil-server/files/sguild.sh.in
index 692054241ace..10860b427017 100644
--- a/security/sguil-server/files/sguild.sh.in
+++ b/security/sguil-server/files/sguild.sh.in
@@ -41,7 +41,7 @@ sguild_flags=${sguild_flags:-"-D -P ${pid}"}
sguild_user=${sguild_user:-"sguil"}
name="sguild"
-rcvar=`set_rcvar`
+rcvar=sguild_enable
command="%%PREFIX%%/bin/${name}"
command_args="-c ${sguild_conf} ${sguild_flags}"
procname="%%TCLSH%%"
diff --git a/security/shibboleth2-sp/files/shibboleth-sp.in b/security/shibboleth2-sp/files/shibboleth-sp.in
index 6501467ece77..5a81e04202f5 100644
--- a/security/shibboleth2-sp/files/shibboleth-sp.in
+++ b/security/shibboleth2-sp/files/shibboleth-sp.in
@@ -9,7 +9,7 @@
. /etc/rc.subr
name="shibboleth_sp"
-rcvar=${name}_enable
+rcvar=shibboleth_sp_enable
command=${shibboleth_sp_program:-%%PREFIX%%/sbin/shibd}
pidfile="${shibboleth_sp_pidfile:-/var/run/${name}.pid}"
diff --git a/security/snort/files/snort.sh.in b/security/snort/files/snort.sh.in
index 6f7aef1045ed..41e272dec014 100644
--- a/security/snort/files/snort.sh.in
+++ b/security/snort/files/snort.sh.in
@@ -29,7 +29,7 @@
. /etc/rc.subr
name="snort"
-rcvar=`set_rcvar`
+rcvar=snort_enable
extra_commands=reload
command="%%PREFIX%%/bin/snort"
diff --git a/security/snortsam/files/snortsam.sh.in b/security/snortsam/files/snortsam.sh.in
index faee0c9274b5..27d709129c57 100644
--- a/security/snortsam/files/snortsam.sh.in
+++ b/security/snortsam/files/snortsam.sh.in
@@ -19,7 +19,7 @@
. /etc/rc.subr
name="snortsam"
-rcvar=`set_rcvar`
+rcvar=snortsam_enable
load_rc_config snortsam
# defaults
diff --git a/security/spybye/files/spybye.sh.in b/security/spybye/files/spybye.sh.in
index 1768f027369e..9c535e002be0 100644
--- a/security/spybye/files/spybye.sh.in
+++ b/security/spybye/files/spybye.sh.in
@@ -26,7 +26,7 @@
name="spybye"
load_rc_config ${name}
-rcvar=`set_rcvar`
+rcvar=spybye_enable
# set the defaults
: ${spybye_enable="NO"}
: ${spybye_flags="-x -p 8080 -l /var/log/spybye.log"}
diff --git a/security/sshblock/files/sshblock.in b/security/sshblock/files/sshblock.in
index 17941c4ec447..0da0d074fb97 100644
--- a/security/sshblock/files/sshblock.in
+++ b/security/sshblock/files/sshblock.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name="sshblock"
-rcvar=`set_rcvar`
+rcvar=sshblock_enable
command_interpreter=%%PERL%%
command="%%PREFIX%%/sbin/sshblock"
diff --git a/security/sssd/files/sssd.in b/security/sssd/files/sssd.in
index 23596ffb19a5..9123c92f9db7 100644
--- a/security/sssd/files/sssd.in
+++ b/security/sssd/files/sssd.in
@@ -18,7 +18,7 @@
. /etc/rc.subr
name="sssd"
-rcvar=`set_rcvar`
+rcvar=sssd_enable
command="%%PREFIX%%/sbin/$name"
sssd_flags="-D"
diff --git a/security/strongswan/files/strongswan.in b/security/strongswan/files/strongswan.in
index 3e3c16147c94..8f6bb47ce4aa 100644
--- a/security/strongswan/files/strongswan.in
+++ b/security/strongswan/files/strongswan.in
@@ -15,7 +15,7 @@
. /etc/rc.subr
name="strongswan"
-rcvar=`set_rcvar`
+rcvar=strongswan_enable
command="%%PREFIX%%/sbin/ipsec"
extra_commands="reload statusall"
diff --git a/security/stunnel/files/stunnel.in b/security/stunnel/files/stunnel.in
index d639588cd9aa..987b9861b38a 100644
--- a/security/stunnel/files/stunnel.in
+++ b/security/stunnel/files/stunnel.in
@@ -24,7 +24,7 @@
. /etc/rc.subr
name="stunnel"
-rcvar=`set_rcvar`
+rcvar=stunnel_enable
load_rc_config $name
diff --git a/security/suricata/files/suricata.in b/security/suricata/files/suricata.in
index 5174657beb11..582e117c65e5 100644
--- a/security/suricata/files/suricata.in
+++ b/security/suricata/files/suricata.in
@@ -22,7 +22,7 @@
. /etc/rc.subr
name="suricata"
-rcvar=`set_rcvar`
+rcvar=suricata_enable
command="%%PREFIX%%/bin/suricata"
diff --git a/security/swatch/files/swatch.in b/security/swatch/files/swatch.in
index a81590fcff24..038701a44ea7 100644
--- a/security/swatch/files/swatch.in
+++ b/security/swatch/files/swatch.in
@@ -20,7 +20,7 @@
. /etc/rc.subr
name=swatch
-rcvar=`set_rcvar`
+rcvar=swatch_enable
command=%%PREFIX%%/bin/swatch
procname=%%LOCALBASE%%/bin/perl
diff --git a/security/termlog/files/termlog.in b/security/termlog/files/termlog.in
index 3d194bdc865d..8f7946bdf8ac 100644
--- a/security/termlog/files/termlog.in
+++ b/security/termlog/files/termlog.in
@@ -8,7 +8,7 @@
load_rc_config termlog
name=termlog
-rcvar=`set_rcvar`
+rcvar=termlog_enable
command="/usr/local/bin/termlog"
diff --git a/security/tinc/files/tincd.sh.in b/security/tinc/files/tincd.sh.in
index 94a8d257729a..c4d72fb537af 100644
--- a/security/tinc/files/tincd.sh.in
+++ b/security/tinc/files/tincd.sh.in
@@ -18,7 +18,7 @@ tincd_enable=${tincd_enable:-"NO"}
. /etc/rc.subr
name="tincd"
-rcvar=`set_rcvar`
+rcvar=tincd_enable
command="%%PREFIX%%/sbin/tincd"
start_cmd="tincd_start"
stop_cmd="tincd_stop"
diff --git a/security/tor-devel/files/tor.in b/security/tor-devel/files/tor.in
index 8ed480b7d630..ac24b8ba4872 100644
--- a/security/tor-devel/files/tor.in
+++ b/security/tor-devel/files/tor.in
@@ -22,7 +22,7 @@
. /etc/rc.subr
name="tor"
-rcvar=${name}_enable
+rcvar=tor_enable
load_rc_config ${name}
diff --git a/security/tor/files/tor.in b/security/tor/files/tor.in
index 8ed480b7d630..ac24b8ba4872 100644
--- a/security/tor/files/tor.in
+++ b/security/tor/files/tor.in
@@ -22,7 +22,7 @@
. /etc/rc.subr
name="tor"
-rcvar=${name}_enable
+rcvar=tor_enable
load_rc_config ${name}
diff --git a/security/trousers/files/tcsd.in b/security/trousers/files/tcsd.in
index 388108738a3e..f9c3773da85b 100644
--- a/security/trousers/files/tcsd.in
+++ b/security/trousers/files/tcsd.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name=tcsd
-rcvar=`set_rcvar`
+rcvar=tcsd_enable
command="%%PREFIX%%/sbin/${name}"
required_files="%%PREFIX%%/etc/${name}.conf"
diff --git a/security/vpnc/files/vpnc.in b/security/vpnc/files/vpnc.in
index 7c02909915f0..464a013b21ef 100644
--- a/security/vpnc/files/vpnc.in
+++ b/security/vpnc/files/vpnc.in
@@ -24,7 +24,7 @@
. /etc/rc.subr
name="vpnc"
-rcvar=`set_rcvar`
+rcvar=vpnc_enable
command="%%PREFIX%%/sbin/$name"
diff --git a/security/xinetd/files/xinetd.in b/security/xinetd/files/xinetd.in
index 41f0241aa1fb..9e66788e2428 100644
--- a/security/xinetd/files/xinetd.in
+++ b/security/xinetd/files/xinetd.in
@@ -13,7 +13,7 @@
. /etc/rc.subr
name=xinetd
-rcvar=`set_rcvar`
+rcvar=xinetd_enable
command=%%PREFIX%%/sbin/xinetd > /dev/null 2>&1
pidfile=/var/run/xinetd.pid
diff --git a/shells/scponly/files/scponlyc.in b/shells/scponly/files/scponlyc.in
index 28aa5f59d378..f094135b0908 100644
--- a/shells/scponly/files/scponlyc.in
+++ b/shells/scponly/files/scponlyc.in
@@ -19,7 +19,7 @@ scponlyc_shells="${scponlyc_shells:-/etc/shells}"
scponlyc_passwd="${scponlyc_passwd:-/etc/passwd}"
name="scponlyc"
-rcvar=`set_rcvar`
+rcvar=scponlyc_enable
start_cmd="scponlyc_startcmd"
stop_cmd="scponlyc_stopcmd"
diff --git a/shells/wapsh/files/htshd.sh.in b/shells/wapsh/files/htshd.sh.in
index f42acdc68957..9e1fe1762196 100644
--- a/shells/wapsh/files/htshd.sh.in
+++ b/shells/wapsh/files/htshd.sh.in
@@ -7,7 +7,7 @@
. /etc/rc.subr
name="htshd"
-rcvar=`set_rcvar`
+rcvar=htshd_enable
load_rc_config $name
htshd_enable=${htshd_enable:-"NO"}
diff --git a/sysutils/3dm/files/3dm2.sh.in b/sysutils/3dm/files/3dm2.sh.in
index b6dde38fe688..93f0f65962dd 100644
--- a/sysutils/3dm/files/3dm2.sh.in
+++ b/sysutils/3dm/files/3dm2.sh.in
@@ -16,7 +16,7 @@
. /etc/rc.subr
name=twdm2
-rcvar=`set_rcvar`
+rcvar=twdm2_enable
start_precmd=twdm2_precmd
command="%%PREFIX%%/sbin/3dm2"
diff --git a/sysutils/915resolution/files/915resolution.sh.in b/sysutils/915resolution/files/915resolution.sh.in
index 4f643fc29208..4878ebfa6f07 100644
--- a/sysutils/915resolution/files/915resolution.sh.in
+++ b/sysutils/915resolution/files/915resolution.sh.in
@@ -23,7 +23,7 @@ i915resolution_height=${i915resolution_height:-"1080"} # the vertical resolutio
. /etc/rc.subr
name="i915resolution"
-rcvar=`set_rcvar`
+rcvar=i915resolution_enable
command="%%PREFIX%%/sbin/915resolution"
start_cmd="${name}_start"
stop_cmd