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 /www | |
parent | 3c1484f2613137d7eaba8577f6d580c5532ac912 (diff) | |
download | ports-83eb2c37009874672764765ec3bf3b59286c7391.tar.gz ports-83eb2c37009874672764765ec3bf3b59286c7391.zip |
Notes
Diffstat (limited to 'www')
94 files changed, 141 insertions, 126 deletions
diff --git a/www/abyssws/files/abyssws.sh.in b/www/abyssws/files/abyssws.sh.in index c2fffe9d8af6..58b2ee5916f7 100644 --- a/www/abyssws/files/abyssws.sh.in +++ b/www/abyssws/files/abyssws.sh.in @@ -16,7 +16,7 @@ . /etc/rc.subr name=abyssws -rcvar=${name}_enable +rcvar=abyssws_enable command="%%PREFIX%%/lib/abyssws/abyssws" command_args="-d >/dev/null" diff --git a/www/amphetadesk/files/amphetadesk.in b/www/amphetadesk/files/amphetadesk.in index af525de0ee7b..2885abe7fb96 100644 --- a/www/amphetadesk/files/amphetadesk.in +++ b/www/amphetadesk/files/amphetadesk.in @@ -19,7 +19,7 @@ . /etc/rc.subr name="amphetadesk" -rcvar=`set_rcvar` +rcvar=amphetadesk_enable command="%%PREFIX%%/bin/AmphetaDesk" procname="%%PERL%%" diff --git a/www/anyterm/files/anytermd.in b/www/anyterm/files/anytermd.in index 127cdd173307..67ca34e19817 100644 --- a/www/anyterm/files/anytermd.in +++ b/www/anyterm/files/anytermd.in @@ -22,7 +22,7 @@ . /etc/rc.subr name=anytermd -rcvar=`set_rcvar` +rcvar=anytermd_enable load_rc_config $name diff --git a/www/aolserver/files/aolserver.in b/www/aolserver/files/aolserver.in index 467e100aec6e..408b33629b27 100644 --- a/www/aolserver/files/aolserver.in +++ b/www/aolserver/files/aolserver.in @@ -1,8 +1,10 @@ #! /bin/sh -# + +# $FreeBSD$ # # PROVIDE: aolserver # REQUIRE: DAEMON NETWORKING SERVERS +# KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable aolserver: # @@ -13,8 +15,10 @@ . /etc/rc.subr name=aolserver +rcvar=aolserver_enable load_rc_config ${name} + : ${aolserver_enable="NO"} : ${aolserver_user="%%AOLSERVERUSER%%"} : ${aolserver_group="%%AOLSERVERGROUP%%"} @@ -24,7 +28,6 @@ load_rc_config ${name} : ${aolserver_prog=${aolserver_home}/bin/nsd} : ${aolserver_pidfile=/var/run/aolserver.pid} -rcvar=`set_rcvar` pidfile=${aolserver_pidfile} start_postcmd="start_postcmd" stop_postcmd="stop_postcmd" diff --git a/www/apache20/files/apache2.in b/www/apache20/files/apache2.in index 0b767a7fc1cf..d6309468c26f 100644 --- a/www/apache20/files/apache2.in +++ b/www/apache20/files/apache2.in @@ -27,7 +27,7 @@ . /etc/rc.subr name="apache2" -rcvar=`set_rcvar` +rcvar=apache2_enable start_precmd="apache2_precmd" restart_precmd="apache2_checkconfig" diff --git a/www/apache22/files/apache22.in b/www/apache22/files/apache22.in index a324238caf9f..0c9b5f149e79 100644 --- a/www/apache22/files/apache22.in +++ b/www/apache22/files/apache22.in @@ -28,7 +28,7 @@ . /etc/rc.subr name="apache22" -rcvar=`set_rcvar` +rcvar=apache22_enable start_precmd="apache22_prestart" restart_precmd="apache22_checkconfig" diff --git a/www/apache22/files/htcacheclean.in b/www/apache22/files/htcacheclean.in index b86bdd2cb32e..656f75365cfb 100644 --- a/www/apache22/files/htcacheclean.in +++ b/www/apache22/files/htcacheclean.in @@ -1,10 +1,8 @@ #!/bin/sh -# -# -# +# $FreeBSD$ +# # PROVIDE: htcacheclean - # # Configuration settings for htcacheclean in /etc/rc.conf # @@ -33,20 +31,20 @@ . /etc/rc.subr +name="htcacheclean" +rcvar=htcacheclean_enable + +load_rc_config "${name}" + htcacheclean_enable="${htcacheclean_enable:-"NO"}" htcacheclean_cache="${htcacheclean_cache:-"%%PREFIX%%/www/proxy"}" htcacheclean_cachelimit="${htcacheclean_cachelimit:-"512M"}" htcacheclean_interval="${htcacheclean_interval:-"60"}" htcacheclean_args="${htcacheclean_args:-"-t -n -i"}" - -name="htcacheclean" -rcvar=`set_rcvar` - start_precmd="htc_check" restart_precmd="htc_check" restart_reload="htc_check" -load_rc_config "${name}" command="%%PREFIX%%/sbin/htcacheclean" flags="-p${htcacheclean_cache} -d${htcacheclean_interval} -l${htcacheclean_cachelimit} ${htcacheclean_args}" diff --git a/www/bigbluebutton/files/openoffice.in b/www/bigbluebutton/files/openoffice.in index 1bec33245d7a..fc259c0c0d5d 100644 --- a/www/bigbluebutton/files/openoffice.in +++ b/www/bigbluebutton/files/openoffice.in @@ -28,7 +28,7 @@ . /etc/rc.subr name="openoffice" -rcvar=${name}_enable +rcvar=openoffice_enable load_rc_config $name : ${openoffice_enable:=NO} diff --git a/www/bozohttpd/files/bozohttpd.in b/www/bozohttpd/files/bozohttpd.in index de6410249b39..40ef97d84630 100644 --- a/www/bozohttpd/files/bozohttpd.in +++ b/www/bozohttpd/files/bozohttpd.in @@ -18,7 +18,7 @@ . /etc/rc.subr name="bozohttpd" -rcvar=`set_rcvar` +rcvar=bozohttpd_enable load_rc_config $name diff --git a/www/c-icap/files/c_icap.in b/www/c-icap/files/c_icap.in index 45ee2ec5e1fb..0628f4f0cc4a 100644 --- a/www/c-icap/files/c_icap.in +++ b/www/c-icap/files/c_icap.in @@ -19,7 +19,7 @@ . /etc/rc.subr name="c_icap" -rcvar=`set_rcvar` +rcvar=c_icap_enable command="%%PREFIX%%/bin/c-icap" pidfile="%%RUN_DIR%%/c-icap.pid" diff --git a/www/cacheboy15-devel/files/squid.in b/www/cacheboy15-devel/files/squid.in index 04b472e9a483..8a2313116a94 100644 --- a/www/cacheboy15-devel/files/squid.in +++ b/www/cacheboy15-devel/files/squid.in @@ -27,7 +27,7 @@ squid_stop() { . /etc/rc.subr name=squid -rcvar=${name}_enable +rcvar=squid_enable command=%%PREFIX%%/sbin/squid extra_commands=reload diff --git a/www/cacheboy16/files/squid.in b/www/cacheboy16/files/squid.in index 04b472e9a483..8a2313116a94 100644 --- a/www/cacheboy16/files/squid.in +++ b/www/cacheboy16/files/squid.in @@ -27,7 +27,7 @@ squid_stop() { . /etc/rc.subr name=squid -rcvar=${name}_enable +rcvar=squid_enable command=%%PREFIX%%/sbin/squid extra_commands=reload diff --git a/www/cblog/files/cblog.in b/www/cblog/files/cblog.in index 7b05c4a246ee..94accfc99908 100644 --- a/www/cblog/files/cblog.in +++ b/www/cblog/files/cblog.in @@ -41,7 +41,7 @@ cblog_precmd() { . /etc/rc.subr name="cblog" -rcvar=`set_rcvar` +rcvar=cblog_enable command="%%PREFIX%%/libexec/cblog.fcgi" start_precmd="cblog_precmd" diff --git a/www/cherokee/files/cherokee.sh.in b/www/cherokee/files/cherokee.sh.in index 706575d2f8bc..04973fca397c 100644 --- a/www/cherokee/files/cherokee.sh.in +++ b/www/cherokee/files/cherokee.sh.in @@ -17,7 +17,7 @@ . /etc/rc.subr name="cherokee" -rcvar=`set_rcvar` +rcvar=cherokee_enable load_rc_config $name diff --git a/www/cntlm/files/cntlm.in b/www/cntlm/files/cntlm.in index 6dc19f6c7d93..5e0f19cdaaa2 100644 --- a/www/cntlm/files/cntlm.in +++ b/www/cntlm/files/cntlm.in @@ -15,7 +15,7 @@ . /etc/rc.subr name="cntlm" -rcvar=${name}_enable +rcvar=cntlm_enable load_rc_config $name diff --git a/www/cocoon/files/cocoon.sh.in b/www/cocoon/files/cocoon.sh.in index 4e2c8348b772..7e292e0e6f32 100644 --- a/www/cocoon/files/cocoon.sh.in +++ b/www/cocoon/files/cocoon.sh.in @@ -16,7 +16,7 @@ . /etc/rc.subr name=%%APP_NAME%% -rcvar=`set_rcvar` +rcvar=%%APP_NAME%%_enable command="%%PREFIX%%/sbin/%%APP_NAME%%ctl" command_args="start" diff --git a/www/dansguardian-devel/files/dansguardian.in b/www/dansguardian-devel/files/dansguardian.in index d4c7c8b2c3cd..857a5b27cdd7 100644 --- a/www/dansguardian-devel/files/dansguardian.in +++ b/www/dansguardian-devel/files/dansguardian.in @@ -21,7 +21,7 @@ dansguardian_pidfile=${dansguardian_pidfile:-"/var/run/dansguardian.pid"} . /etc/rc.subr name="dansguardian" -rcvar=${name}_enable +rcvar=dansguardian_enable command="%%PREFIX%%/sbin/${name}" load_rc_config $name diff --git a/www/dansguardian/files/dansguardian.in b/www/dansguardian/files/dansguardian.in index d4c7c8b2c3cd..857a5b27cdd7 100644 --- a/www/dansguardian/files/dansguardian.in +++ b/www/dansguardian/files/dansguardian.in @@ -21,7 +21,7 @@ dansguardian_pidfile=${dansguardian_pidfile:-"/var/run/dansguardian.pid"} . /etc/rc.subr name="dansguardian" -rcvar=${name}_enable +rcvar=dansguardian_enable command="%%PREFIX%%/sbin/${name}" load_rc_config $name diff --git a/www/dhttpd/files/dhttpd.sh.in b/www/dhttpd/files/dhttpd.sh.in index 4fd034ee343f..d633d6f852b1 100644 --- a/www/dhttpd/files/dhttpd.sh.in +++ b/www/dhttpd/files/dhttpd.sh.in @@ -14,7 +14,7 @@ . /etc/rc.subr name="dhttpd" -rcvar=`set_rcvar` +rcvar=dhttpd_enable load_rc_config $name diff --git a/www/elog/files/elogd.in b/www/elog/files/elogd.in index 76884c7bc29f..c01b45c1679c 100644 --- a/www/elog/files/elogd.in +++ b/www/elog/files/elogd.in @@ -15,7 +15,7 @@ . /etc/rc.subr name="elogd" -rcvar=${name}_enable +rcvar=elogd_enable command=%%PREFIX%%/sbin/${name} pidfile=/var/run/${name}.pid diff --git a/www/fcgiwrap/files/fcgiwrap.in b/www/fcgiwrap/files/fcgiwrap.in index f3d9fb1f1472..cbbe791ccb5d 100644 --- a/www/fcgiwrap/files/fcgiwrap.in +++ b/www/fcgiwrap/files/fcgiwrap.in @@ -7,7 +7,6 @@ # PROVIDE: fcgiwrap # REQUIRE: LOGIN # KEYWORD: shutdown - # # Add the following to /etc/rc.conf[.local] to enable this service # @@ -22,6 +21,11 @@ # fcgiwrap_flags= # Use fcgiwrap_user to run fcgiwrap as user +. /etc/rc.subr + +name="fcgiwrap" +rcvar=fcgiwrap_enable + fcgiwrap_setfib() { sysctl net.fibs >/dev/null 2>&1 || return 0 @@ -49,11 +53,7 @@ fcgiwrap_cleansocket() { rm -f $pidfile } -. /etc/rc.subr - pidfile="/var/run/fcgiwrap/fcgiwrap.pid" -name="fcgiwrap" -rcvar=`set_rcvar` procname="%%PREFIX%%/sbin/${name}" command="/usr/sbin/daemon" diff --git a/www/gatling/files/gatling.in b/www/gatling/files/gatling.in index 48609e1a26da..3e28cbbe0173 100644 --- a/www/gatling/files/gatling.in +++ b/www/gatling/files/gatling.in @@ -27,7 +27,7 @@ check_user() { . /etc/rc.subr name=gatling -rcvar=`set_rcvar` +rcvar=gatling_enable load_rc_config ${name} diff --git a/www/geronimo/files/geronimo2.sh.in b/www/geronimo/files/geronimo2.sh.in index 29d1ffe70e73..32f32f7c9011 100644 --- a/www/geronimo/files/geronimo2.sh.in +++ b/www/geronimo/files/geronimo2.sh.in @@ -65,7 +65,7 @@ geronimo%%GERONIMO_VERSION%%_stop_timeout="${geronimo%%GERONIMO_VERSION%%_stop_t . /etc/rc.subr name="geronimo%%GERONIMO_VERSION%%" -rcvar=`set_rcvar` +rcvar=geronimo%%GERONIMO_VERSION%%_enable pidfile="%%PID_FILE%%" JAVA_HOME=%%JAVA_HOME%% diff --git a/www/havp/files/havp.in b/www/havp/files/havp.in index 02510cf1649a..d4757808d85b 100644 --- a/www/havp/files/havp.in +++ b/www/havp/files/havp.in @@ -18,7 +18,7 @@ . /etc/rc.subr name="havp" -rcvar=`set_rcvar` +rcvar=havp_enable command="%%PREFIX%%/sbin/$name" pidfile="%%RUN_DIR%%/${name}.pid" diff --git a/www/helma/files/helma.in b/www/helma/files/helma.in index bb1d5211336f..b083804e22ea 100644 --- a/www/helma/files/helma.in +++ b/www/helma/files/helma.in @@ -14,7 +14,7 @@ . /etc/rc.subr name="helma" -rcvar=`set_rcvar` +rcvar=helma_enable pidfile="/var/run/${name}.pid" load_rc_config $name diff --git a/www/hiawatha/files/hiawatha.in b/www/hiawatha/files/hiawatha.in index f489195f1a6f..c8d5f565f281 100644 --- a/www/hiawatha/files/hiawatha.in +++ b/www/hiawatha/files/hiawatha.in @@ -14,7 +14,7 @@ . /etc/rc.subr name="hiawatha" -rcvar=`set_rcvar` +rcvar=hiawatha_enable load_rc_config $name diff --git a/www/hiawatha/files/php-fcgi.in b/www/hiawatha/files/php-fcgi.in index 5207d244f773..2e12f94b7e56 100644 --- a/www/hiawatha/files/php-fcgi.in +++ b/www/hiawatha/files/php-fcgi.in @@ -14,7 +14,7 @@ . /etc/rc.subr name="php_fcgi" -rcvar=`set_rcvar` +rcvar=php_fcgi_enable load_rc_config $name diff --git a/www/httptunnel/files/htc.in b/www/httptunnel/files/htc.in index bfd0a1a0ee17..03117092b511 100644 --- a/www/httptunnel/files/htc.in +++ b/www/httptunnel/files/htc.in @@ -26,7 +26,7 @@ . /etc/rc.subr name="htc" -rcvar=${name}_enable +rcvar=htc_enable command=%%PREFIX%%/bin/${name} diff --git a/www/httptunnel/files/hts.in b/www/httptunnel/files/hts.in index 2ccae4627ab7..00959c3a72f2 100644 --- a/www/httptunnel/files/hts.in +++ b/www/httptunnel/files/hts.in @@ -20,7 +20,7 @@ . /etc/rc.subr name="hts" -rcvar=${name}_enable +rcvar=hts_enable command=%%PREFIX%%/bin/${name} diff --git a/www/hudson/files/hudson.sh.in b/www/hudson/files/hudson.sh.in index 67e3d2b12022..c67bd3704c35 100644 --- a/www/hudson/files/hudson.sh.in +++ b/www/hudson/files/hudson.sh.in @@ -44,7 +44,7 @@ hudson_log_file=/var/log/hudson.log . /etc/rc.subr name="hudson" -rcvar=`set_rcvar` +rcvar=hudson_enable load_rc_config "${name}" diff --git a/www/hydra/files/hydra.sh.in b/www/hydra/files/hydra.sh.in index d45805860474..08c2f90e4f94 100644 --- a/www/hydra/files/hydra.sh.in +++ b/www/hydra/files/hydra.sh.in @@ -14,7 +14,7 @@ hydra_enable=${hydra_enable-"NO"} load_rc_config hydra name=hydra -rcvar=`set_rcvar` +rcvar=hydra_enable command=%%PREFIX%%/bin/${name} diff --git a/www/interchange/files/interchange.sh.in b/www/interchange/files/interchange.sh.in index 070c83cb1d20..8ee4fed72957 100644 --- a/www/interchange/files/interchange.sh.in +++ b/www/interchange/files/interchange.sh.in @@ -21,7 +21,7 @@ . /etc/rc.subr name="interchange" -rcvar=`set_rcvar` +rcvar=interchange_enable interchange_enable=${interchange_enable:-"NO"} interchange_config=${interchange_config:-"%%PREFIX%%/interchange/interchange.cfg"} diff --git a/www/jetty/files/jetty.in b/www/jetty/files/jetty.in index fcbb91485593..549022a68ee7 100644 --- a/www/jetty/files/jetty.in +++ b/www/jetty/files/jetty.in @@ -16,7 +16,7 @@ . /etc/rc.subr name=%%APP_NAME%% -rcvar=`set_rcvar` +rcvar=%%APP_NAME%%_enable command="%%PREFIX%%/sbin/%%APP_NAME%%ctl" command_args="start" diff --git a/www/kannel/files/kannel.in b/www/kannel/files/kannel.in index 8c3c2feb3a61..55eb348558b3 100644 --- a/www/kannel/files/kannel.in +++ b/www/kannel/files/kannel.in @@ -1,4 +1,7 @@ #!/bin/sh + +# $FreeBSD$ +# # PROVIDE: kannel_smsbox kannel_wapbox kannel_bearerbox # REQUIRE: NETWORKING SERVERS # BEFORE: LOGIN @@ -7,7 +10,8 @@ . /etc/rc.subr name=kannel -rcvar=`set_rcvar` +rcvar=kannel_enable + command="%%PREFIX%%/sbin/run_kannel_box" extra_commands="reload" sig_reload=SIGUSR1 @@ -33,7 +37,7 @@ fi # bearerbox name=kannel_bearerbox -rcvar=`set_rcvar` +rcvar=kannel_bearerbox_enable pidfile=/var/run/kannel/${name}.pid # Defaults kannel_bearerbox_user=${kannel_bearerbox_user:-"${kannel_user}"} @@ -48,7 +52,7 @@ _rc_restart_done=false # smsbox name=kannel_smsbox -rcvar=`set_rcvar` +rcvar=kannel_smsbox_enable pidfile=/var/run/kannel/${name}.pid # Defaults kannel_smsbox_user=${kannel_smsbox_user:-"${kannel_user}"} @@ -63,7 +67,7 @@ _rc_restart_done=false # wapbox name=kannel_wapbox -rcvar=`set_rcvar` +rcvar=kannel_wapbox_enable pidfile=/var/run/kannel/${name}.pid # Defaults kannel_wapbox_user=${kannel_wapbox_user:-"${kannel_user}"} diff --git a/www/lighttpd/files/lighttpd.sh.in b/www/lighttpd/files/lighttpd.sh.in index 193c0c9f7920..aa86640603c1 100644 --- a/www/lighttpd/files/lighttpd.sh.in +++ b/www/lighttpd/files/lighttpd.sh.in @@ -29,7 +29,7 @@ . /etc/rc.subr name="lighttpd" -rcvar=`set_rcvar` +rcvar=lighttpd_enable load_rc_config $name diff --git a/www/lusca-head/files/squid.in b/www/lusca-head/files/squid.in index 04b472e9a483..8a2313116a94 100644 --- a/www/lusca-head/files/squid.in +++ b/www/lusca-head/files/squid.in @@ -27,7 +27,7 @@ squid_stop() { . /etc/rc.subr name=squid -rcvar=${name}_enable +rcvar=squid_enable command=%%PREFIX%%/sbin/squid extra_commands=reload diff --git a/www/mohawk/files/mohawk.in b/www/mohawk/files/mohawk.in index 01ce79c2e958..81e50de93f82 100644 --- a/www/mohawk/files/mohawk.in +++ b/www/mohawk/files/mohawk.in @@ -14,7 +14,7 @@ . /etc/rc.subr name="mohawk" -rcvar=`set_rcvar` +rcvar=mohawk_enable load_rc_config $name diff --git a/www/monast/files/monast.in b/www/monast/files/monast.in index 853bd48d72d9..bc5a1c486b4b 100644 --- a/www/monast/files/monast.in +++ b/www/monast/files/monast.in @@ -14,7 +14,7 @@ . /etc/rc.subr name=monast -rcvar=${name}_enable +rcvar=monast_enable command="%%PREFIX%%/monast/monast.py" pidfile="/var/run/${name}.pid" diff --git a/www/nginx-devel/files/nginx.sh.in b/www/nginx-devel/files/nginx.sh.in index 7e6d0d19c869..61b6914955df 100644 --- a/www/nginx-devel/files/nginx.sh.in +++ b/www/nginx-devel/files/nginx.sh.in @@ -22,7 +22,7 @@ . /etc/rc.subr name="nginx" -rcvar=`set_rcvar` +rcvar=nginx_enable start_precmd="nginx_precmd" restart_precmd="nginx_checkconfig" diff --git a/www/nginx/files/nginx.sh.in b/www/nginx/files/nginx.sh.in index 7e6d0d19c869..61b6914955df 100644 --- a/www/nginx/files/nginx.sh.in +++ b/www/nginx/files/nginx.sh.in @@ -22,7 +22,7 @@ . /etc/rc.subr name="nginx" -rcvar=`set_rcvar` +rcvar=nginx_enable start_precmd="nginx_precmd" restart_precmd="nginx_checkconfig" diff --git a/www/nostromo/files/nostromo.sh.in b/www/nostromo/files/nostromo.sh.in index 65dd114f31e5..455aa54234b0 100644 --- a/www/nostromo/files/nostromo.sh.in +++ b/www/nostromo/files/nostromo.sh.in @@ -16,7 +16,7 @@ . /etc/rc.subr name=nostromo -rcvar=`set_rcvar` +rcvar=nostromo_enable command=/usr/local/sbin/nhttpd diff --git a/www/oops/files/oops.in b/www/oops/files/oops.in index 285d1fdf246f..9168a424df50 100644 --- a/www/oops/files/oops.in +++ b/www/oops/files/oops.in @@ -9,7 +9,7 @@ . /etc/rc.subr name="oops" -rcvar=`set_rcvar` +rcvar=oops_enable command="%%PREFIX%%/sbin/oopsctl" procname="%%PREFIX%%/sbin/oops" diff --git a/www/openacs/files/dotlrn.in b/www/openacs/files/dotlrn.in index 8def4dc4d3bb..ffc7ec120485 100644 --- a/www/openacs/files/dotlrn.in +++ b/www/openacs/files/dotlrn.in @@ -1,8 +1,10 @@ #! /bin/sh -# + +# $FreeBSD$ # # PROVIDE: dotlrn # REQUIRE: DAEMON NETWORKING SERVERS +# KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable dotlrn: # @@ -13,8 +15,10 @@ . /etc/rc.subr name=dotlrn +rcvar=dotlrn_enable load_rc_config ${name} + : ${dotlrn_enable="NO"} : ${dotlrn_user="%%OPENACS_USER%%"} : ${dotlrn_group="%%OPENACS_GROUP%%"} @@ -23,7 +27,6 @@ load_rc_config ${name} : ${dotlrn_prog=%%AOLSERVERBASE%%/bin/nsd} : ${dotlrn_pidfile=/var/run/dotlrn.pid} -rcvar=`set_rcvar` pidfile=${dotlrn_pidfile} start_postcmd="start_postcmd" stop_postcmd="stop_postcmd" diff --git a/www/openacs/files/openacs.in b/www/openacs/files/openacs.in index 1960dadfd812..61b2b83a4199 100644 --- a/www/openacs/files/openacs.in +++ b/www/openacs/files/openacs.in @@ -1,8 +1,10 @@ #! /bin/sh -# + +# $FreeBSD$ # # PROVIDE: openacs # REQUIRE: DAEMON NETWORKING SERVERS +# KEYWORD: shutdown # # Add the following line to /etc/rc.conf to enable openacs: # @@ -13,8 +15,10 @@ . /etc/rc.subr name=openacs +rcvar=openacs_enable load_rc_config ${name} + : ${openacs_enable="NO"} : ${openacs_user="%%OPENACS_USER%%"} : ${openacs_group="%%OPENACS_GROUP%%"} @@ -23,7 +27,6 @@ load_rc_config ${name} : ${openacs_prog=%%AOLSERVERBASE%%/bin/nsd} : ${openacs_pidfile=/var/run/openacs.pid} -rcvar=`set_rcvar` pidfile=${openacs_pidfile} start_postcmd="start_postcmd" stop_postcmd="stop_postcmd" diff --git a/www/p5-FCGI-Spawn/files/fcgi_spawn.in b/www/p5-FCGI-Spawn/files/fcgi_spawn.in index 7f03472b05d3..0b1866f026f3 100644 --- a/www/p5-FCGI-Spawn/files/fcgi_spawn.in +++ b/www/p5-FCGI-Spawn/files/fcgi_spawn.in @@ -7,7 +7,7 @@ . /etc/rc.subr name="fcgi_spawn" -rcvar=${name}_enable +rcvar=fcgi_spawn_enable fcgi_spawn_enable=${fcgi_spawn_enable:-"NO"} pidfile=${fcgi_spawn_pid:-"/var/run/${name}.pid"} diff --git a/www/p5-Starman/files/starman.in b/www/p5-Starman/files/starman.in index a1381fe74df0..82f13746ff4d 100644 --- a/www/p5-Starman/files/starman.in +++ b/www/p5-Starman/files/starman.in @@ -26,7 +26,7 @@ . /etc/rc.subr name=starman -rcvar=`set_rcvar` +rcvar=starman_enable command="%%PREFIX%%/bin/${name}" load_rc_config $name diff --git a/www/polipo/files/polipo.sh.in b/www/polipo/files/polipo.sh.in index ffab21d06e56..b4b41f040786 100644 --- a/www/polipo/files/polipo.sh.in +++ b/www/polipo/files/polipo.sh.in @@ -12,7 +12,7 @@ . /etc/rc.subr name=polipo -rcvar=`set_rcvar` +rcvar=polipo_enable polipo_enable=${polipo_enable:-"NO"} polipo_user=%%USER%% diff --git a/www/pound/files/pound.sh.in b/www/pound/files/pound.sh.in index a6aca3b58cbb..23b6fa84dd5d 100644 --- a/www/pound/files/pound.sh.in +++ b/www/pound/files/pound.sh.in @@ -17,7 +17,7 @@ . /etc/rc.subr name="%%NAME%%" -rcvar=`set_rcvar` +rcvar=%%NAME%%_enable command="%%PREFIX%%/sbin/$name" pidfile="/var/run/$name.pid" diff --git a/www/privoxy/files/privoxy.in b/www/privoxy/files/privoxy.in index dfa9e3b9582b..02632cb92419 100644 --- a/www/privoxy/files/privoxy.in +++ b/www/privoxy/files/privoxy.in @@ -25,7 +25,7 @@ . /etc/rc.subr name="privoxy" -rcvar=${name}_enable +rcvar=privoxy_enable load_rc_config ${name} : ${privoxy_enable="NO"} diff --git a/www/red5/files/red5.in b/www/red5/files/red5.in index 2d2c6209ba90..772f7bf2e423 100644 --- a/www/red5/files/red5.in +++ b/www/red5/files/red5.in @@ -49,7 +49,7 @@ . /etc/rc.subr name="red5" -rcvar=`set_rcvar` +rcvar=red5_enable pidfile="/var/run/red5.pid" java_command="%%LOCALBASE%%/bin/java" diff --git a/www/redmine/files/redmine.in b/www/redmine/files/redmine.in index 8f4da36647f9..d9a2cf7b675d 100644 --- a/www/redmine/files/redmine.in +++ b/www/redmine/files/redmine.in @@ -18,7 +18,7 @@ . /etc/rc.subr name="redmine" -rcvar=`set_rcvar` +rcvar=redmine_enable command=%%RUBY_NAME%% pidfile="%%WWWDIR%%/tmp/pids/thin.pid" diff --git a/www/resin2/files/resin.sh.in b/www/resin2/files/resin.sh.in index fcbb91485593..549022a68ee7 100644 --- a/www/resin2/files/resin.sh.in +++ b/www/resin2/files/resin.sh.in @@ -16,7 +16,7 @@ . /etc/rc.subr name=%%APP_NAME%% -rcvar=`set_rcvar` +rcvar=%%APP_NAME%%_enable command="%%PREFIX%%/sbin/%%APP_NAME%%ctl" command_args="start" diff --git a/www/resin3/files/resin.sh.in b/www/resin3/files/resin.sh.in index fcbb91485593..549022a68ee7 100644 --- a/www/resin3/files/resin.sh.in +++ b/www/resin3/files/resin.sh.in @@ -16,7 +16,7 @@ . /etc/rc.subr name=%%APP_NAME%% -rcvar=`set_rcvar` +rcvar=%%APP_NAME%%_enable command="%%PREFIX%%/sbin/%%APP_NAME%%ctl" command_args="start" diff --git a/www/ruby-cruisecontrolrb/files/cruisecontrolrb.in b/www/ruby-cruisecontrolrb/files/cruisecontrolrb.in index 578797b89ec9..02f7e4b37a4d 100644 --- a/www/ruby-cruisecontrolrb/files/cruisecontrolrb.in +++ b/www/ruby-cruisecontrolrb/files/cruisecontrolrb.in @@ -15,7 +15,7 @@ . /etc/rc.subr name=cruisecontrolrb -rcvar=${name}_enable +rcvar=cruisecontrolrb_enable homedir="%%PREFIX%%/www/${name}" pidfile="${homedir}/tmp/pids/mongrel.pid" diff --git a/www/rubygem-mongrel_cluster/files/mongrel_cluster.in b/www/rubygem-mongrel_cluster/files/mongrel_cluster.in index 4d330f16a3c5..cfaeea182fc0 100644 --- a/www/rubygem-mongrel_cluster/files/mongrel_cluster.in +++ b/www/rubygem-mongrel_cluster/files/mongrel_cluster.in @@ -17,7 +17,7 @@ . /etc/rc.subr name=mongrel_cluster -rcvar=${name}_enable +rcvar=mongrel_cluster_enable command="%%PREFIX%%/bin/mongrel_cluster_ctl" diff --git a/www/sams/files/sams.sh.in b/www/sams/files/sams.sh.in index 9d776508937b..b81357358601 100644 --- a/www/sams/files/sams.sh.in +++ b/www/sams/files/sams.sh.in @@ -21,7 +21,7 @@ sams_pidfile=${sams_pidfile-"/var/run/samsdaemon.pid"} . /etc/rc.subr name="sams" -rcvar=`set_rcvar` +rcvar=sams_enable command="%%PREFIX%%/bin/samsdaemon" load_rc_config $name diff --git a/www/shellinabox/files/shellinaboxd.in b/www/shellinabox/files/shellinaboxd.in index 8e8e9f48c266..1cff58c7ae9a 100644 --- a/www/shellinabox/files/shellinaboxd.in +++ b/www/shellinabox/files/shellinaboxd.in @@ -39,7 +39,7 @@ shellinaboxd_setfib() { . /etc/rc.subr name="shellinaboxd" -rcvar=`set_rcvar` +rcvar=shellinaboxd_enable command="%%PREFIX%%/bin/${name}" start_precmd="shellinaboxd_setfib" diff --git a/www/spawn-fcgi/files/spawn-fcgi.sh.in b/www/spawn-fcgi/files/spawn-fcgi.sh.in index 414f2502b80b..75bd8939ab4b 100644 --- a/www/spawn-fcgi/files/spawn-fcgi.sh.in +++ b/www/spawn-fcgi/files/spawn-fcgi.sh.in @@ -18,7 +18,7 @@ . /etc/rc.subr name="spawn_fcgi" -rcvar=`set_rcvar` +rcvar=spawn_fcgi_enable load_rc_config $name diff --git a/www/spreadlogd/files/spreadlogd.sh.in b/www/spreadlogd/files/spreadlogd.sh.in index 0b8f88bf3c86..76608c06e870 100644 --- a/www/spreadlogd/files/spreadlogd.sh.in +++ b/www/spreadlogd/files/spreadlogd.sh.in @@ -16,7 +16,7 @@ . /etc/rc.subr name=spreadlogd -rcvar=`set_rcvar` +rcvar=spreadlogd_enable command="%%PREFIX%%/sbin/spreadlogd" pidfile=/var/run/${name}.pid diff --git a/www/squid/files/squid.in b/www/squid/files/squid.in index 25ae857ae28e..499f79de6eea 100644 --- a/www/squid/files/squid.in +++ b/www/squid/files/squid.in @@ -62,7 +62,7 @@ squid_stop() { . /etc/rc.subr name=squid -rcvar=${name}_enable +rcvar=squid_enable command=%%PREFIX%%/sbin/squid extra_commands=reload diff --git a/www/squid31/files/squid.in b/www/squid31/files/squid.in index d21b439fa85d..a6e0b637107a 100644 --- a/www/squid31/files/squid.in +++ b/www/squid31/files/squid.in @@ -62,7 +62,7 @@ squid_stop() { . /etc/rc.subr name=squid -rcvar=${name}_enable +rcvar=squid_enable command=%%PREFIX%%/sbin/squid extra_commands=reload diff --git a/www/tclhttpd/files/tclhttpd.sh.in b/www/tclhttpd/files/tclhttpd.sh.in index ac3efd8704cb..c63303ba6b03 100644 --- a/www/tclhttpd/files/tclhttpd.sh.in +++ b/www/tclhttpd/files/tclhttpd.sh.in @@ -23,7 +23,7 @@ . /etc/rc.subr name="tclhttpd" -rcvar=`set_rcvar` +rcvar=tclhttpd_enable load_rc_config $name diff --git a/www/thttpd/files/thttpd.sh.in b/www/thttpd/files/thttpd.sh.in index 1299aa5f58f4..2c9b10880b49 100644 --- a/www/thttpd/files/thttpd.sh.in +++ b/www/thttpd/files/thttpd.sh.in @@ -16,7 +16,7 @@ . /etc/rc.subr name=thttpd -rcvar=`set_rcvar` +rcvar=thttpd_enable command=%%PREFIX%%/sbin/thttpd diff --git a/www/thundercache/files/thundercache.in b/www/thundercache/files/thundercache.in index 57e30146278b..ed6074a0bfc8 100644 --- a/www/thundercache/files/thundercache.in +++ b/www/thundercache/files/thundercache.in @@ -15,7 +15,7 @@ . /etc/rc.subr name="thundercache" -rcvar=`set_rcvar` +rcvar=thundercache_enable command="%%PREFIX%%/thunder/sbin/thunder" required_files="%%PREFIX%%/thunder/etc/thunder.conf" diff --git a/www/tinyproxy/files/tinyproxy.sh.in b/www/tinyproxy/files/tinyproxy.sh.in index c4adc6a8e7a5..3a0e5a3866b1 100644 --- a/www/tinyproxy/files/tinyproxy.sh.in +++ b/www/tinyproxy/files/tinyproxy.sh.in @@ -13,7 +13,7 @@ . /etc/rc.subr name="tinyproxy" -rcvar=`set_rcvar` +rcvar=tinyproxy_enable load_rc_config $name diff --git a/www/tomcat55/files/tomcat55.sh.in b/www/tomcat55/files/tomcat55.sh.in index e8f514f4e117..1c06fee2b69a 100644 --- a/www/tomcat55/files/tomcat55.sh.in +++ b/www/tomcat55/files/tomcat55.sh.in @@ -76,7 +76,7 @@ tomcat%%TOMCAT_VERSION%%_stop_timeout="${tomcat%%TOMCAT_VERSION%%_stop_timeout:- . /etc/rc.subr name="tomcat%%TOMCAT_VERSION%%" -rcvar=`set_rcvar` +rcvar=tomcat%%TOMCAT_VERSION%%_enable pidfile="%%PID_FILE%%" load_rc_config "${name}" diff --git a/www/tomcat6/files/tomcat6.sh.in b/www/tomcat6/files/tomcat6.sh.in index a1f1178a4b5d..8c5edf09b622 100644 --- a/www/tomcat6/files/tomcat6.sh.in +++ b/www/tomcat6/files/tomcat6.sh.in @@ -66,7 +66,7 @@ tomcat%%TOMCAT_VERSION%%_stop_timeout="${tomcat%%TOMCAT_VERSION%%_stop_timeout:- . /etc/rc.subr name="tomcat%%TOMCAT_VERSION%%" -rcvar=`set_rcvar` +rcvar=tomcat%%TOMCAT_VERSION%%_enable pidfile="/var/run/%%APP_SHORTNAME%%.pid" load_rc_config "${name}" diff --git a/www/tomcat7/files/tomcat7.in b/www/tomcat7/files/tomcat7.in index 3ff0ef97249c..b904de41e612 100644 --- a/www/tomcat7/files/tomcat7.in +++ b/www/tomcat7/files/tomcat7.in @@ -62,7 +62,7 @@ tomcat7_stop_timeout="${tomcat7_stop_timeout:-"10"}" . /etc/rc.subr name="tomcat7" -rcvar=`set_rcvar` +rcvar=tomcat7_enable pidfile="/var/run/tomcat7.pid" load_rc_config "${name}" diff --git a/www/trac/files/tracd.in b/www/trac/files/tracd.in index 89573033dcb8..27756822a86a 100644 --- a/www/trac/files/tracd.in +++ b/www/trac/files/tracd.in @@ -30,7 +30,7 @@ . /etc/rc.subr name="tracd" -rcvar="${name}_enable" +rcvar=tracd_enable tracd_enable=${tracd_enable:-"NO"} tracd_listen=${tracd_listen:-"0.0.0.0"} diff --git a/www/transproxy/files/tproxy.in b/www/transproxy/files/tproxy.in index 951fb430d498..093051ae6a6d 100644 --- a/www/transproxy/files/tproxy.in +++ b/www/transproxy/files/tproxy.in @@ -54,7 +54,7 @@ . /etc/rc.subr name="tproxy" -rcvar=`set_rcvar` +rcvar=tproxy_enable command="%%PREFIX%%/sbin/$name" procname="%%PREFIX%%/sbin/$name" diff --git a/www/tt-rss/files/ttrssd.in b/www/tt-rss/files/ttrssd.in index 6df63991e987..0f674ad6aa33 100644 --- a/www/tt-rss/files/ttrssd.in +++ b/www/tt-rss/files/ttrssd.in @@ -15,7 +15,7 @@ . /etc/rc.subr name="ttrssd" -rcvar=`set_rcvar` +rcvar=ttrssd_enable # read settings, set default values load_rc_config "${name}" diff --git a/www/twms/files/twms.in b/www/twms/files/twms.in index d6b8120713a6..c36c31a2c6e6 100644 --- a/www/twms/files/twms.in +++ b/www/twms/files/twms.in @@ -10,7 +10,7 @@ . /etc/rc.subr name=twms -rcvar=`set_rcvar` +rcvar=twms_enable twms_enable=${twms_enable:-"NO"} twms_user=%%USER%% diff --git a/www/uwsgi/files/uwsgi.in b/www/uwsgi/files/uwsgi.in index 9b869142e47e..1af04d9c906e 100644 --- a/www/uwsgi/files/uwsgi.in +++ b/www/uwsgi/files/uwsgi.in @@ -35,7 +35,7 @@ . /etc/rc.subr name="uwsgi" -rcvar=`set_rcvar` +rcvar=uwsgi_enable load_rc_config $name diff --git a/www/varnish/files/varnishd.in b/www/varnish/files/varnishd.in index e238fbef7831..61512f1ce8e3 100644 --- a/www/varnish/files/varnishd.in +++ b/www/varnish/files/varnishd.in @@ -53,7 +53,7 @@ . /etc/rc.subr name="varnishd" -rcvar=`set_rcvar` +rcvar=varnishd_enable command="%%PREFIX%%/sbin/${name}" diff --git a/www/varnish/files/varnishlog.in b/www/varnish/files/varnishlog.in index 4a0f64c8a668..c7b298059097 100644 --- a/www/varnish/files/varnishlog.in +++ b/www/varnish/files/varnishlog.in @@ -34,7 +34,7 @@ . /etc/rc.subr name="varnishlog" -rcvar=`set_rcvar` +rcvar=varnishlog_enable command="%%PREFIX%%/bin/${name}" diff --git a/www/varnish/files/varnishncsa.in b/www/varnish/files/varnishncsa.in index ba3d3760ffc5..73950ccc5f16 100644 --- a/www/varnish/files/varnishncsa.in +++ b/www/varnish/files/varnishncsa.in @@ -34,7 +34,7 @@ . /etc/rc.subr name="varnishncsa" -rcvar=`set_rcvar` +rcvar=varnishncsa_enable command="%%PREFIX%%/bin/${name}" diff --git a/www/varnish2/files/varnishd.in b/www/varnish2/files/varnishd.in index e238fbef7831..61512f1ce8e3 100644 --- a/www/varnish2/files/varnishd.in +++ b/www/varnish2/files/varnishd.in @@ -53,7 +53,7 @@ . /etc/rc.subr name="varnishd" -rcvar=`set_rcvar` +rcvar=varnishd_enable command="%%PREFIX%%/sbin/${name}" diff --git a/www/varnish2/files/varnishlog.in b/www/varnish2/files/varnishlog.in index 4a0f64c8a668..c7b298059097 100644 --- a/www/varnish2/files/varnishlog.in +++ b/www/varnish2/files/varnishlog.in @@ -34,7 +34,7 @@ . /etc/rc.subr name="varnishlog" -rcvar=`set_rcvar` +rcvar=varnishlog_enable command="%%PREFIX%%/bin/${name}" diff --git a/www/varnish2/files/varnishncsa.in b/www/varnish2/files/varnishncsa.in index ba3d3760ffc5..73950ccc5f16 100644 --- a/www/varnish2/files/varnishncsa.in +++ b/www/varnish2/files/varnishncsa.in @@ -34,7 +34,7 @@ . /etc/rc.subr name="varnishncsa" -rcvar=`set_rcvar` +rcvar=varnishncsa_enable command="%%PREFIX%%/bin/${name}" diff --git a/www/vdradmin-am/files/vdradmind.in b/www/vdradmin-am/files/vdradmind.in index 42f462fda7b7..72fbdf2ede36 100644 --- a/www/vdradmin-am/files/vdradmind.in +++ b/www/vdradmin-am/files/vdradmind.in @@ -13,7 +13,7 @@ . /etc/rc.subr name=vdradmind -rcvar=`set_rcvar` +rcvar=vdradmind_enable command="%%PREFIX%%/bin/vdradmind" pidfile="/var/run/vdradmin-am/${name}.pid" diff --git a/www/webfs/files/webfsd.in b/www/webfs/files/webfsd.in index f5f6250fa30d..21157e414f42 100644 --- a/www/webfs/files/webfsd.in +++ b/www/webfs/files/webfsd.in @@ -16,7 +16,7 @@ . /etc/rc.subr name="webfsd" -rcvar=`set_rcvar` +rcvar=webfsd_enable load_rc_config $name diff --git a/www/webobjects/files/JavaMonitor.sh.in b/www/webobjects/files/JavaMonitor.sh.in index 4801c93d9bf5..a3b9cdcba75a 100644 --- a/www/webobjects/files/JavaMonitor.sh.in +++ b/www/webobjects/files/JavaMonitor.sh.in @@ -1,17 +1,25 @@ #!/bin/sh + # $FreeBSD$ +# # PROVIDE: JavaMonitor # REQUIRE: NETWORKING SERVERS # BEFORE: DAEMON # KEYWORD: shutdown - +# # Define these JavaMonitor_* variables in one of these files: # /etc/rc.conf # /etc/rc.conf.local # # DO NOT CHANGE THESE DEFAULT VALUES HERE -# + +. /etc/rc.subr + name="JavaMonitor" +rcvar=JavaMonitor_enable + +load_rc_config "$name" +load_rc_config NEXT JavaMonitor_enable="${JavaMonitor_enable-"NO"}" JavaMonitor_user="${JavaMonitor_user-%%USER%%}" @@ -20,12 +28,6 @@ JavaMonitor_pidfile="${JavaMonitor_pidfile:-/var/run/webobjects/${name}.pid}" JavaMonitor_logfile="${JavaMonitor_logfile:-/var/log/webobjects/${name}.log}" NEXT_ROOT="${NEXT_ROOT-%%PREFIX%%/%%NEXT_ROOT%%}" -. /etc/rc.subr -rcvar=`set_rcvar` - -load_rc_config "$name" -load_rc_config NEXT - pidfile="${JavaMonitor_pidfile}" logfile="${JavaMonitor_logfile}" runuser="${JavaMonitor_user}" diff --git a/www/webobjects/files/wotaskd.sh.in b/www/webobjects/files/wotaskd.sh.in index cee2a604357b..e6afe23937b8 100644 --- a/www/webobjects/files/wotaskd.sh.in +++ b/www/webobjects/files/wotaskd.sh.in @@ -1,17 +1,25 @@ #!/bin/sh + # $FreeBSD$ +# # PROVIDE: wotaskd # REQUIRE: NETWORKING SERVERS # BEFORE: DAEMON # KEYWORD: shutdown - +# # Define these wotaskd_* variables in one of these files: # /etc/rc.conf # /etc/rc.conf.local # # DO NOT CHANGE THESE DEFAULT VALUES HERE -# + +. /etc/rc.subr + name="wotaskd" +rcvar=wotaskd_enable + +load_rc_config "$name" +load_rc_config NEXT wotaskd_enable="${wotaskd_enable-"NO"}" wotaskd_user="${wotaskd_user-%%USER%%}" @@ -19,12 +27,6 @@ wotaskd_pidfile="${wotaskd_pidfile:-/var/run/webobjects/${name}.pid}" wotaskd_logfile="${wotaskd_logfile:-/var/log/webobjects/${name}.log}" NEXT_ROOT="${NEXT_ROOT-%%PREFIX%%/%%NEXT_ROOT%%}" -. /etc/rc.subr -rcvar=`set_rcvar` - -load_rc_config "$name" -load_rc_config NEXT - pidfile="${wotaskd_pidfile}" logfile="${wotaskd_logfile}" runuser="${wotaskd_user}" diff --git a/www/www6to4/files/www6to4.in b/www/www6to4/files/www6to4.in index 0a2dbcdabeed..00520f11c24b 100644 --- a/www/www6to4/files/www6to4.in +++ b/www/www6to4/files/www6to4.in @@ -12,7 +12,7 @@ . /etc/rc.subr name=www6to4 -rcvar=`set_rcvar` +rcvar=www6to4_enable command=%%PREFIX%%/sbin/www6to4 WWW6TO4DIR=%%PREFIX%%/etc/www6to4 diff --git a/www/wwwoffle/files/wwwoffled.sh.in b/www/wwwoffle/files/wwwoffled.sh.in index 05c857d2d323..53b60daf1068 100644 --- a/www/wwwoffle/files/wwwoffled.sh.in +++ b/www/wwwoffle/files/wwwoffled.sh.in @@ -21,7 +21,7 @@ wwwoffled_conffile="%%PREFIX%%/etc/wwwoffle.conf" . /etc/rc.subr name="wwwoffled" -rcvar=`set_rcvar` +rcvar=wwwoffled_enable command="%%PREFIX%%/sbin/wwwoffled" extra_commands="reload" diff --git a/www/wyvern/files/wyvern.in b/www/wyvern/files/wyvern.in index 087b509496ca..400263705008 100644 --- a/www/wyvern/files/wyvern.in +++ b/www/wyvern/files/wyvern.in @@ -20,7 +20,7 @@ wyvern_enable=${wyvern_enable:-"NO"} # Enable wyvern . /etc/rc.subr name="wyvern" -rcvar=`set_rcvar` +rcvar=wyvern_enable command="%%PREFIX%%/sbin/wyvern" pidfile="/var/run/wyvern.pid" required_files="%%PREFIX%%/wyvern/conf/wyvern.conf" diff --git a/www/xshttpd-devel/files/xshttpd.sh.in b/www/xshttpd-devel/files/xshttpd.sh.in index e2c539ad8a17..975fece0691a 100644 --- a/www/xshttpd-devel/files/xshttpd.sh.in +++ b/www/xshttpd-devel/files/xshttpd.sh.in @@ -17,7 +17,7 @@ . /etc/rc.subr name="xshttpd" -rcvar=`set_rcvar` +rcvar=xshttpd_enable load_rc_config $name diff --git a/www/xshttpd/files/xshttpd.sh.in b/www/xshttpd/files/xshttpd.sh.in index 0e204b864016..93687f7fad47 100644 --- a/www/xshttpd/files/xshttpd.sh.in +++ b/www/xshttpd/files/xshttpd.sh.in @@ -17,7 +17,7 @@ . /etc/rc.subr name="xshttpd" -rcvar=`set_rcvar` +rcvar=xshttpd_enable load_rc_config $name diff --git a/www/zerowait-httpd/files/0W-httpd.in b/www/zerowait-httpd/files/0W-httpd.in index 5a45c4b3013a..eb5d2db98467 100644 --- a/www/zerowait-httpd/files/0W-httpd.in +++ b/www/zerowait-httpd/files/0W-httpd.in @@ -15,7 +15,7 @@ . /etc/rc.subr name="zerowait" -rcvar=`set_rcvar` +rcvar=zerowait_enable command="%%PREFIX%%/sbin/0W-httpd" args="-c %%PREFIX%%/etc/0W-httpd/httpd.conf" required_files="%%PREFIX%%/etc/0W-httpd/httpd.conf" diff --git a/www/zope/files/zeo.in b/www/zope/files/zeo.in index 87a37fa25154..6ed954fd6032 100644 --- a/www/zope/files/zeo.in +++ b/www/zope/files/zeo.in @@ -21,7 +21,7 @@ zeo_instances=${zeo_instances:-""} # List of instancehome dirs . /etc/rc.subr name="zeo" -rcvar=`set_rcvar` +rcvar=zeo_enable load_rc_config $name extra_commands="status" diff --git a/www/zope/files/zope.in b/www/zope/files/zope.in index 1e54792c409d..99414f2d0b3d 100644 --- a/www/zope/files/zope.in +++ b/www/zope/files/zope.in @@ -21,7 +21,7 @@ zope_instances=${zope_instances:-""} # List of instancehome dirs . /etc/rc.subr name="zope" -rcvar=`set_rcvar` +rcvar=zope_enable load_rc_config $name extra_commands="status" diff --git a/www/zope211/files/zeo211.in b/www/zope211/files/zeo211.in index 6d8d5938d6ab..0bdbb7e75cf9 100644 --- a/www/zope211/files/zeo211.in +++ b/www/zope211/files/zeo211.in @@ -24,7 +24,7 @@ . /etc/rc.subr name="zeo211" -rcvar=`set_rcvar` +rcvar=zeo211_enable zeo211ctl () { for instance in $zeo211_instances; do diff --git a/www/zope211/files/zope211.in b/www/zope211/files/zope211.in index dc32d8614e3c..4d561a6ceec3 100644 --- a/www/zope211/files/zope211.in +++ b/www/zope211/files/zope211.in @@ -22,7 +22,7 @@ . /etc/rc.subr name="zope211" -rcvar=`set_rcvar` +rcvar=zope211_enable zope211ctl () { for instance in $zope211_instances; do diff --git a/www/zope213/files/zope213.in b/www/zope213/files/zope213.in index 5a4680776c06..afeaf449f5df 100644 --- a/www/zope213/files/zope213.in +++ b/www/zope213/files/zope213.in @@ -22,7 +22,7 @@ . /etc/rc.subr name="zope213" -rcvar=`set_rcvar` +rcvar=zope213_enable load_rc_config $name |