diff options
| author | Doug Barton <dougb@FreeBSD.org> | 2012-01-14 08:57:23 +0000 |
|---|---|---|
| committer | Doug Barton <dougb@FreeBSD.org> | 2012-01-14 08:57:23 +0000 |
| commit | 83eb2c37009874672764765ec3bf3b59286c7391 (patch) | |
| tree | a956ace1a4a1e10876d4c36f12af02bc9df6cb29 /net | |
| parent | 3c1484f2613137d7eaba8577f6d580c5532ac912 (diff) | |
| download | ports-83eb2c37009874672764765ec3bf3b59286c7391.tar.gz ports-83eb2c37009874672764765ec3bf3b59286c7391.zip | |
Notes
Diffstat (limited to 'net')
178 files changed, 208 insertions, 210 deletions
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" |