diff options
| author | Doug Barton <dougb@FreeBSD.org> | 2009-07-15 16:56:10 +0000 |
|---|---|---|
| committer | Doug Barton <dougb@FreeBSD.org> | 2009-07-15 16:56:10 +0000 |
| commit | 0175383f0a1f8b78ed514778532f0467a8ccc6dc (patch) | |
| tree | 4c98b621f22bb861a40c6493c6ed7517f295f7f3 | |
| parent | - Chase security/gpgme update. (diff) | |
Fix a few "bad example" problems in the rc.d scripts that have been
propogated by copy and paste.
1. Primarily the "empty variable" default assignment, which is mostly
${name}_flags="", but fix a few others as well.
2. Where they are not already documented, add the existence of the _flags
(or other deleted empties) option to the comments, and in some cases add
comments from scratch.
3. Replace things that look like:
prefix=%%PREFIX%%
command=${prefix}/sbin/foo
to just use %%PREFIX%%. In many cases the $prefix variable is only used
once, and in some cases it is not used at all.
4. In a few cases remove ${name}_flags from command_args
5. Remove a long-stale comment about putting the port's rc.d script in
/etc/rc.d (which is no longer necessary).
No PORTREVISION bumps because all of these changes are noops.
Notes
Notes:
svn path=/head/; revision=237892
229 files changed, 392 insertions, 608 deletions
diff --git a/audio/ices0/files/ices0.sh.in b/audio/ices0/files/ices0.sh.in index 3b3b10322d9c..ce3bad45a8ae 100644 --- a/audio/ices0/files/ices0.sh.in +++ b/audio/ices0/files/ices0.sh.in @@ -8,11 +8,10 @@ # BEFORE: login # KEYWORD: shutdown -# Add the following line to /etc/rc.conf to enable `ices0': -# -#ices0_enable="YES" -#ices0_flags="" +# Add the following lines to /etc/rc.conf to enable ices0: # +# ices0_enable="YES" +# ices0_flags="<set as needed>" . "/etc/rc.subr" @@ -26,6 +25,5 @@ required_files="%%PREFIX%%/etc/ices.conf" # read configuration and set defaults load_rc_config "$name" : ${ices0_enable="NO"} -: ${ices0_flags=""} run_rc_command "$1" diff --git a/audio/slimserver/files/slimserver.sh.in b/audio/slimserver/files/slimserver.sh.in index fac1e2b47eac..4ba3c651a9a7 100644 --- a/audio/slimserver/files/slimserver.sh.in +++ b/audio/slimserver/files/slimserver.sh.in @@ -10,7 +10,8 @@ # # Add the following lines to /etc/rc.conf to enable slimserver: # -#slimserver_enable="YES" +# slimserver_enable="YES" +# slimserver_flags="<set as needed>" # . %%RC_SUBR%% @@ -73,6 +74,5 @@ slimserver_poststop() load_rc_config ${name} slimserver_enable=${slimserver_enable:-"NO"} -slimserver_flags=${slimserver_flags:-""} run_rc_command "$1" diff --git a/audio/squeezeboxserver/files/squeezecenter.sh.in b/audio/squeezeboxserver/files/squeezecenter.sh.in index 8fa09a51fc4f..bc06b8a348b8 100644 --- a/audio/squeezeboxserver/files/squeezecenter.sh.in +++ b/audio/squeezeboxserver/files/squeezecenter.sh.in @@ -10,7 +10,8 @@ # # Add the following lines to /etc/rc.conf to enable %%PORTNAME%%: # -#%%PORTNAME%%_enable="YES" +# %%PORTNAME%%_enable="YES" +# %%PORTNAME%%_flags="<set as needed>" # . %%RC_SUBR%% @@ -72,6 +73,5 @@ command_args="--daemon --prefsfile=${conffile} --pidfile=${pidfile}" load_rc_config ${name} %%PORTNAME%%_enable=${%%PORTNAME%%_enable:-"NO"} -%%PORTNAME%%_flags=${%%PORTNAME%%_flags:-""} run_rc_command "$1" diff --git a/audio/squeezecenter/files/squeezecenter.sh.in b/audio/squeezecenter/files/squeezecenter.sh.in index 8fa09a51fc4f..bc06b8a348b8 100644 --- a/audio/squeezecenter/files/squeezecenter.sh.in +++ b/audio/squeezecenter/files/squeezecenter.sh.in @@ -10,7 +10,8 @@ # # Add the following lines to /etc/rc.conf to enable %%PORTNAME%%: # -#%%PORTNAME%%_enable="YES" +# %%PORTNAME%%_enable="YES" +# %%PORTNAME%%_flags="<set as needed>" # . %%RC_SUBR%% @@ -72,6 +73,5 @@ command_args="--daemon --prefsfile=${conffile} --pidfile=${pidfile}" load_rc_config ${name} %%PORTNAME%%_enable=${%%PORTNAME%%_enable:-"NO"} -%%PORTNAME%%_flags=${%%PORTNAME%%_flags:-""} run_rc_command "$1" diff --git a/audio/ventrilo-server/files/ventrilo-server.sh.in b/audio/ventrilo-server/files/ventrilo-server.sh.in index de565ccd1085..9240390397bb 100644 --- a/audio/ventrilo-server/files/ventrilo-server.sh.in +++ b/audio/ventrilo-server/files/ventrilo-server.sh.in @@ -8,10 +8,8 @@ . %%RC_SUBR%% -prefix=%%PREFIX%% - name=ventrilo -homedir="${prefix}/ventrilo-server" +homedir="%%PREFIX%%/ventrilo-server" pidfile="${homedir}/ventrilo_srv.pid" ventrilo_user=${name} command="${homedir}/ventrilo_srv" diff --git a/comms/lirc/files/lircd.sh.in b/comms/lirc/files/lircd.sh.in index fd282eb70b65..cf53297778d2 100644 --- a/comms/lirc/files/lircd.sh.in +++ b/comms/lirc/files/lircd.sh.in @@ -19,13 +19,11 @@ load_rc_config ${name} : ${lircd_enable="NO"} : ${lircd_device="/dev/lirc0"} - -prefix=%%PREFIX%% -procname=${prefix}/sbin/lircd +procname=%%PREFIX%%/sbin/lircd pidfile=/var/run/lircd.pid -lircd_config="${prefix}/etc/lircd.conf" +lircd_config="%%PREFIX%%/etc/lircd.conf" required_files=${lircd_config} -command="${prefix}/sbin/lircd" +command="%%PREFIX%%/sbin/lircd" command_args="-d ${lircd_device} ${lircd_config}" run_rc_command "$1" diff --git a/comms/qpage/files/qpage.in b/comms/qpage/files/qpage.in index 9d9800d70fa3..038e681d4f72 100644 --- a/comms/qpage/files/qpage.in +++ b/comms/qpage/files/qpage.in @@ -26,8 +26,6 @@ load_rc_config $name : ${qpage_enable="NO"} : ${qpage_queue_interval="10"} -: ${qpage_cfg_file=""} -: ${qpage_flags=""} stop_cmd=${name}_stop extra_commands="reload" diff --git a/comms/ser2net/files/ser2net.in b/comms/ser2net/files/ser2net.in index b722015fc4a9..8aa7c28284a9 100644 --- a/comms/ser2net/files/ser2net.in +++ b/comms/ser2net/files/ser2net.in @@ -8,6 +8,10 @@ # BEFORE: LOGIN # KEYWORD: shutdown +# Add the following lines to /etc/rc.conf to enable ser2net: +# ser2net_enable="YES" +# ser2net_flags="<set as needed>" + . %%RC_SUBR%% name="ser2net" @@ -16,7 +20,6 @@ command="%%PREFIX%%/sbin/ser2net" load_rc_config $name : ${ser2net_enable="NO"} -: ${ser2net_flags=""} : ${ser2net_pidfile="/var/run/ser2net.pid"} start_cmd="/usr/sbin/daemon -p ${ser2net_pidfile} $command $rc_flags $command_args" diff --git a/comms/thebridge/files/tbd.in b/comms/thebridge/files/tbd.in index 975181e26d1b..395ca6aed405 100644 --- a/comms/thebridge/files/tbd.in +++ b/comms/thebridge/files/tbd.in @@ -9,13 +9,13 @@ # KEYWORD: shutdown # -# Add the following line to /etc/rc.conf to enable tbd: +# Add the following lines to /etc/rc.conf to enable tbd: # # tbd_enable="YES" +# tbd_flags="<set as needed>" # tbd_enable=${tbd_enable-"NO"} -tbd_flags=${tbd_flags-""} . %%RC_SUBR%% diff --git a/databases/pgbouncer/files/pgbouncer.sh.in b/databases/pgbouncer/files/pgbouncer.sh.in index a42f9465e411..cd0f609fb3f9 100644 --- a/databases/pgbouncer/files/pgbouncer.sh.in +++ b/databases/pgbouncer/files/pgbouncer.sh.in @@ -8,9 +8,10 @@ # BEFORE: securelevel # KEYWORD: shutdown -# Add the following line to /etc/rc.conf to enable `pgbouncer': +# Add the following lines to /etc/rc.conf to enable pgbouncer: # -#pgbouncer_enable="YES" +# pgbouncer_enable="YES" +# pgbouncer_flags="<set as needed>" # . "%%RC_SUBR%%" @@ -30,6 +31,5 @@ required_files="${config_file}" load_rc_config "$name" : ${pgbouncer_enable="NO"} : ${pgbouncer_user="%%PGBOUNCER_USER%%"} -: ${pgbouncer_flags=""} run_rc_command "$1" diff --git a/databases/postgresql73-server/files/postgresql.in b/databases/postgresql73-server/files/postgresql.in index 1b3b4226acdf..6d8dcd21f154 100644 --- a/databases/postgresql73-server/files/postgresql.in +++ b/databases/postgresql73-server/files/postgresql.in @@ -23,8 +23,7 @@ # # For postmaster startup options, edit ${postgresql_data}/postgresql.conf -prefix=%%PREFIX%% -command=${prefix}/bin/pg_ctl +command=%%PREFIX%%/bin/pg_ctl . %%RC_SUBR%% @@ -58,7 +57,7 @@ postgresql_command() postgresql_initdb() { - su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}" + su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}" } run_rc_command "$1" diff --git a/databases/postgresql74-server/files/postgresql.in b/databases/postgresql74-server/files/postgresql.in index 1b3b4226acdf..6d8dcd21f154 100644 --- a/databases/postgresql74-server/files/postgresql.in +++ b/databases/postgresql74-server/files/postgresql.in @@ -23,8 +23,7 @@ # # For postmaster startup options, edit ${postgresql_data}/postgresql.conf -prefix=%%PREFIX%% -command=${prefix}/bin/pg_ctl +command=%%PREFIX%%/bin/pg_ctl . %%RC_SUBR%% @@ -58,7 +57,7 @@ postgresql_command() postgresql_initdb() { - su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}" + su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}" } run_rc_command "$1" diff --git a/databases/postgresql80-server/files/postgresql.in b/databases/postgresql80-server/files/postgresql.in index 1b3b4226acdf..6d8dcd21f154 100644 --- a/databases/postgresql80-server/files/postgresql.in +++ b/databases/postgresql80-server/files/postgresql.in @@ -23,8 +23,7 @@ # # For postmaster startup options, edit ${postgresql_data}/postgresql.conf -prefix=%%PREFIX%% -command=${prefix}/bin/pg_ctl +command=%%PREFIX%%/bin/pg_ctl . %%RC_SUBR%% @@ -58,7 +57,7 @@ postgresql_command() postgresql_initdb() { - su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}" + su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}" } run_rc_command "$1" diff --git a/databases/postgresql81-server/files/postgresql.in b/databases/postgresql81-server/files/postgresql.in index 1b3b4226acdf..6d8dcd21f154 100644 --- a/databases/postgresql81-server/files/postgresql.in +++ b/databases/postgresql81-server/files/postgresql.in @@ -23,8 +23,7 @@ # # For postmaster startup options, edit ${postgresql_data}/postgresql.conf -prefix=%%PREFIX%% -command=${prefix}/bin/pg_ctl +command=%%PREFIX%%/bin/pg_ctl . %%RC_SUBR%% @@ -58,7 +57,7 @@ postgresql_command() postgresql_initdb() { - su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}" + su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}" } run_rc_command "$1" diff --git a/databases/postgresql82-server/files/postgresql.in b/databases/postgresql82-server/files/postgresql.in index 1b3b4226acdf..6d8dcd21f154 100644 --- a/databases/postgresql82-server/files/postgresql.in +++ b/databases/postgresql82-server/files/postgresql.in @@ -23,8 +23,7 @@ # # For postmaster startup options, edit ${postgresql_data}/postgresql.conf -prefix=%%PREFIX%% -command=${prefix}/bin/pg_ctl +command=%%PREFIX%%/bin/pg_ctl . %%RC_SUBR%% @@ -58,7 +57,7 @@ postgresql_command() postgresql_initdb() { - su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}" + su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}" } run_rc_command "$1" diff --git a/databases/postgresql83-server/files/postgresql.in b/databases/postgresql83-server/files/postgresql.in index 1b3b4226acdf..6d8dcd21f154 100644 --- a/databases/postgresql83-server/files/postgresql.in +++ b/databases/postgresql83-server/files/postgresql.in @@ -23,8 +23,7 @@ # # For postmaster startup options, edit ${postgresql_data}/postgresql.conf -prefix=%%PREFIX%% -command=${prefix}/bin/pg_ctl +command=%%PREFIX%%/bin/pg_ctl . %%RC_SUBR%% @@ -58,7 +57,7 @@ postgresql_command() postgresql_initdb() { - su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}" + su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}" } run_rc_command "$1" diff --git a/databases/postgresql84-server/files/postgresql.in b/databases/postgresql84-server/files/postgresql.in index 1b3b4226acdf..6d8dcd21f154 100644 --- a/databases/postgresql84-server/files/postgresql.in +++ b/databases/postgresql84-server/files/postgresql.in @@ -23,8 +23,7 @@ # # For postmaster startup options, edit ${postgresql_data}/postgresql.conf -prefix=%%PREFIX%% -command=${prefix}/bin/pg_ctl +command=%%PREFIX%%/bin/pg_ctl . %%RC_SUBR%% @@ -58,7 +57,7 @@ postgresql_command() postgresql_initdb() { - su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}" + su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}" } run_rc_command "$1" diff --git a/databases/postgresql90-server/files/postgresql.in b/databases/postgresql90-server/files/postgresql.in index 1b3b4226acdf..6d8dcd21f154 100644 --- a/databases/postgresql90-server/files/postgresql.in +++ b/databases/postgresql90-server/files/postgresql.in @@ -23,8 +23,7 @@ # # For postmaster startup options, edit ${postgresql_data}/postgresql.conf -prefix=%%PREFIX%% -command=${prefix}/bin/pg_ctl +command=%%PREFIX%%/bin/pg_ctl . %%RC_SUBR%% @@ -58,7 +57,7 @@ postgresql_command() postgresql_initdb() { - su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}" + su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}" } run_rc_command "$1" diff --git a/databases/postgresql91-server/files/postgresql.in b/databases/postgresql91-server/files/postgresql.in index 1b3b4226acdf..6d8dcd21f154 100644 --- a/databases/postgresql91-server/files/postgresql.in +++ b/databases/postgresql91-server/files/postgresql.in @@ -23,8 +23,7 @@ # # For postmaster startup options, edit ${postgresql_data}/postgresql.conf -prefix=%%PREFIX%% -command=${prefix}/bin/pg_ctl +command=%%PREFIX%%/bin/pg_ctl . %%RC_SUBR%% @@ -58,7 +57,7 @@ postgresql_command() postgresql_initdb() { - su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}" + su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}" } run_rc_command "$1" diff --git a/databases/postgresql92-server/files/postgresql.in b/databases/postgresql92-server/files/postgresql.in index 1b3b4226acdf..6d8dcd21f154 100644 --- a/databases/postgresql92-server/files/postgresql.in +++ b/databases/postgresql92-server/files/postgresql.in @@ -23,8 +23,7 @@ # # For postmaster startup options, edit ${postgresql_data}/postgresql.conf -prefix=%%PREFIX%% -command=${prefix}/bin/pg_ctl +command=%%PREFIX%%/bin/pg_ctl . %%RC_SUBR%% @@ -58,7 +57,7 @@ postgresql_command() postgresql_initdb() { - su -l -c ${postgresql_class} ${postgresql_user} -c "exec ${prefix}/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}" + su -l -c ${postgresql_class} ${postgresql_user} -c "exec %%PREFIX%%/bin/initdb ${postgresql_initdb_flags} -D ${postgresql_data}" } run_rc_command "$1" diff --git a/databases/virtuoso/files/virtuoso.sh.in b/databases/virtuoso/files/virtuoso.sh.in index 84e68a3527af..559107af8f7b 100644 --- a/databases/virtuoso/files/virtuoso.sh.in +++ b/databases/virtuoso/files/virtuoso.sh.in @@ -11,15 +11,14 @@ # virtuoso_enable="YES" # # optional # virtuoso_config="%%PREFIX%%/virtuoso/db/virtuoso.ini" -# virtuoso_flags="" +# virtuoso_flags="<set as needed>" # # This scripts takes one of the following commands: # # start stop restart reload status # -prefix=%%PREFIX%% -command=${prefix}/bin/virtuoso +command=%%PREFIX%%/bin/virtuoso . %%RC_SUBR%% @@ -27,7 +26,6 @@ load_rc_config virtuoso # set defaults virtuoso_enable=${virtuoso_enable:-"NO"} -virtuoso_flags=${virtuoso_flags:-""} virtuoso_user=virtuoso eval virtuoso_config=${virtuoso_config:-"~${virtuoso_user}/db/virtuoso.ini"} virtuoso_class=${virtuoso_class:-"default"} diff --git a/dns/dns_balance/files/dns_balance.sh.in b/dns/dns_balance/files/dns_balance.sh.in index 1dbe5dd7f01f..e7add698b4bb 100644 --- a/dns/dns_balance/files/dns_balance.sh.in +++ b/dns/dns_balance/files/dns_balance.sh.in @@ -5,6 +5,10 @@ # PROVIDE: dns_balance # REQUIRE: DAEMON +# Add the following line to /etc/rc.conf to enable dns_balance +# dns_balance_enable="YES" +# dns_balance_flags="<set as needed>" + . %%RC_SUBR%% name=dns_balance @@ -14,7 +18,6 @@ load_rc_config ${name} : ${dns_balance_enable="NO"} : ${dns_balance_logfile="/var/log/${name}.log"} : ${dns_balance_pidfile="/var/log/${name}.pid"} -: ${dns_balance_flags=""} command="%%PREFIX%%/sbin/${name}" command_args="-l ${dns_balance_logfile} -p ${dns_balance_pidfile}" diff --git a/dns/nsd2/files/nsd.sh.in b/dns/nsd2/files/nsd.sh.in index da99a593d964..b8e2881047e0 100644 --- a/dns/nsd2/files/nsd.sh.in +++ b/dns/nsd2/files/nsd.sh.in @@ -5,27 +5,25 @@ # PROVIDE: nsd # REQUIRE: DAEMON # -# Add the following line to /etc/rc.conf to enable nsd: +# Add the following lines to /etc/rc.conf to enable nsd: # # nsd_enable="YES" -# +# nsd_flags="<set as needed>" + . %%RC_SUBR%% name=nsd rcvar=`set_rcvar` -prefix=%%PREFIX%% - required_files=%%NSDDIR%%/nsd.zones -command=/usr/local/sbin/${name} +command=%%PREFIX%%/sbin/${name} pidfile=/var/run/${name}.pid # set defaults nsd_enable=${nsd_enable:-"NO"} -nsd_flags=${nsd_flags:-""} load_rc_config ${name} run_rc_command "$1" diff --git a/dns/powerdns-devel/files/pdns-devel.in b/dns/powerdns-devel/files/pdns-devel.in index f53389a7fdac..54037e068a59 100644 --- a/dns/powerdns-devel/files/pdns-devel.in +++ b/dns/powerdns-devel/files/pdns-devel.in @@ -10,7 +10,8 @@ # # Add the following lines to /etc/rc.conf to enable powerdns: # -#pdns_enable="YES" +# pdns_enable="YES" +# pdns_flags="<set as needed>" # # See pdns_server(8) for flags. # @@ -26,7 +27,6 @@ command=%%PREFIX%%/sbin/pdns_server pdns_enable=${pdns_enable:-"NO"} pdns_conf=${pdns_conf:-"%%PREFIX%%/etc/pdns/pdns.conf"} -pdns_flags=${pdns_flags:-""} load_rc_config ${name} diff --git a/dns/powerdns-recursor/files/pdns-recursor.in b/dns/powerdns-recursor/files/pdns-recursor.in index c08c4fd4210b..f828e180a28c 100644 --- a/dns/powerdns-recursor/files/pdns-recursor.in +++ b/dns/powerdns-recursor/files/pdns-recursor.in @@ -11,7 +11,8 @@ # # Add the following lines to /etc/rc.conf to enable pdns_recursor: # -#pdns_recursor_enable="YES" +# pdns_recursor_enable="YES" +# pdns_recursor_flags="<set as needed>" # # See pdns_recursor(8) for flags. # @@ -27,7 +28,6 @@ command=%%PREFIX%%/sbin/pdns_recursor pdns_recursor_enable=${pdns_recursor_enable:-"NO"} pdns_recursor_conf=${pdns_recursor_conf:-"%%PREFIX%%/etc/pdns/recursor.conf"} -pdns_recursor_flags=${pdns_recursor_flags:-""} load_rc_config ${name} diff --git a/dns/powerdns/files/pdns.in b/dns/powerdns/files/pdns.in index 714ff93eba67..65260e2dbf34 100644 --- a/dns/powerdns/files/pdns.in +++ b/dns/powerdns/files/pdns.in @@ -10,7 +10,8 @@ # # Add the following lines to /etc/rc.conf to enable powerdns: # -#pdns_enable="YES" +# pdns_enable="YES" +# pdns_flags="<set as needed>" # # See pdns_server(8) for flags. # @@ -26,7 +27,6 @@ command=%%PREFIX%%/sbin/pdns_server pdns_enable=${pdns_enable:-"NO"} pdns_conf=${pdns_conf:-"%%PREFIX%%/etc/pdns/pdns.conf"} -pdns_flags=${pdns_flags:-""} load_rc_config ${name} diff --git a/dns/totd/files/totd.in b/dns/totd/files/totd.in index 287f20207e9f..9710c6477f38 100644 --- a/dns/totd/files/totd.in +++ b/dns/totd/files/totd.in @@ -6,12 +6,6 @@ # PROVIDE: totd # REQUIRE: SERVERS # BEFORE: DAEMON -# -# NOTE for FreeBSD 5.0+: -# If you want this script to start with the base rc scripts -# move totd.sh to /etc/rc.d/totd - -prefix=%%PREFIX%% # Define these totd_* variables in one of these files: # /etc/rc.conf @@ -21,16 +15,15 @@ prefix=%%PREFIX%% # DO NOT CHANGE THESE DEFAULT VALUES HERE # totd_enable=${totd_enable:-"NO"} # Enable totd -#totd_program="${prefix}/sbin/totd" # Location of totd -totd_flags=${totd_flags:-""} # Flags to totd program +# totd_flags="<set as needed>" . %%RC_SUBR%% name="totd" rcvar=`set_rcvar` -command="${prefix}/sbin/${name}" +command="%%PREFIX%%/sbin/${name}" pidfile="/var/run/${name}.pid" -required_files="${prefix}/etc/${name}.conf" +required_files="%%PREFIX%%/etc/${name}.conf" load_rc_config $name run_rc_command "$1" diff --git a/ftp/bsdftpd-ssl/files/bsdftpd-ssl.in b/ftp/bsdftpd-ssl/files/bsdftpd-ssl.in index 8d5961475b92..b7eebbd26cc7 100644 --- a/ftp/bsdftpd-ssl/files/bsdftpd-ssl.in +++ b/ftp/bsdftpd-ssl/files/bsdftpd-ssl.in @@ -12,6 +12,7 @@ # "-p" options will be added automatically, you should not specify them. Please # see the examples and the ftpd-ssl(8) man page for more information. # +# bsdftpd_ssl_flags="<set as needed>" . %%RC_SUBR%% @@ -26,7 +27,6 @@ stop_postcmd="rm -f /var/run/ftpd.pid" # Set defaults bsdftpd_ssl_enable=${bsdftpd_ssl_enable:-"NO"} -bsdftpd_ssl_flags=${bsdftpd_ssl_flags:-""} # Run the daemon diff --git a/ftp/frox/files/frox.sh.in b/ftp/frox/files/frox.sh.in index b2ce5678859e..fc4152072c92 100644 --- a/ftp/frox/files/frox.sh.in +++ b/ftp/frox/files/frox.sh.in @@ -10,7 +10,8 @@ # # Add the following lines to /etc/rc.conf to enable frox: # -#frox_enable="YES" +# frox_enable="YES" +# frox_flags="<set as needed>" # # See frox(8) for flags # @@ -34,7 +35,6 @@ stop_postcmd() # set defaults frox_enable=${frox_enable:-"NO"} -frox_flags=${frox_flags:-""} load_rc_config $name run_rc_command "$1" diff --git a/ftp/ftpsesame/files/ftpsesame.sh.in b/ftp/ftpsesame/files/ftpsesame.sh.in index 7ada9aebe0d6..4fc8c9971f26 100644 --- a/ftp/ftpsesame/files/ftpsesame.sh.in +++ b/ftp/ftpsesame/files/ftpsesame.sh.in @@ -39,8 +39,6 @@ stop_postcmd() # set defaults ftpsesame_enable=${ftpsesame_enable:-"NO"} -ftpsesame_interface=${ftpsesame_interface-""} -ftpsesame_flags=${ftpsesame_flags-""} load_rc_config $name command_args=${ftpsesame_interface:+"-i ${ftpsesame_interface}"} diff --git a/ftp/moftpd/files/moftpd.in b/ftp/moftpd/files/moftpd.in index 6379b96c1879..49c2a706e1d2 100644 --- a/ftp/moftpd/files/moftpd.in +++ b/ftp/moftpd/files/moftpd.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/ftp/moftpd/files/Attic/moftpd.in,v 1.1 2008-12-26 04:32:41 pgollucci Exp $ +# $FreeBSD: /tmp/pcvs/ports/ftp/moftpd/files/Attic/moftpd.in,v 1.2 2009-07-15 16:55:42 dougb Exp $ # # PROVIDE: moftpd @@ -31,7 +31,6 @@ required_files=%%PREFIX%%/etc/moftpd.conf load_rc_config $name [ -z "$moftpd_enable" ] && moftpd_enable="NO" -[ -z "$moftpd_flags" ] && moftpd_flags="" [ -z "$moftpdlimits_enable" ] && moftpdlimits_enable="NO" [ -z "$moftpdlimits_args" ] && moftpdlimits_args="-e -C daemon" diff --git a/ftp/proftpd-devel/files/proftpd.sh.in b/ftp/proftpd-devel/files/proftpd.sh.in index 5e72d10cfb88..362a2d37f6a0 100644 --- a/ftp/proftpd-devel/files/proftpd.sh.in +++ b/ftp/proftpd-devel/files/proftpd.sh.in @@ -11,7 +11,8 @@ # # Add the following lines to /etc/rc.conf to enable proftpd: # -#proftpd_enable="YES" +# proftpd_enable="YES" +# proftpd_flags="<set as needed>" # # See proftpd(8) for flags # @@ -35,7 +36,6 @@ stop_postcmd() # set defaults proftpd_enable=${proftpd_enable:-"NO"} -proftpd_flags=${proftpd_flags:-""} extra_commands="reload" diff --git a/ftp/proftpd/files/proftpd.sh.in b/ftp/proftpd/files/proftpd.sh.in index 5e72d10cfb88..362a2d37f6a0 100644 --- a/ftp/proftpd/files/proftpd.sh.in +++ b/ftp/proftpd/files/proftpd.sh.in @@ -11,7 +11,8 @@ # # Add the following lines to /etc/rc.conf to enable proftpd: # -#proftpd_enable="YES" +# proftpd_enable="YES" +# proftpd_flags="<set as needed>" # # See proftpd(8) for flags # @@ -35,7 +36,6 @@ stop_postcmd() # set defaults proftpd_enable=${proftpd_enable:-"NO"} -proftpd_flags=${proftpd_flags:-""} extra_commands="reload" diff --git a/ftp/vsftpd-ext/files/vsftpd.sh.in b/ftp/vsftpd-ext/files/vsftpd.sh.in index 3ce7bb15982f..53d137b67a4b 100644 --- a/ftp/vsftpd-ext/files/vsftpd.sh.in +++ b/ftp/vsftpd-ext/files/vsftpd.sh.in @@ -27,7 +27,6 @@ rcvar=`set_rcvar` load_rc_config "$name" : ${vsftpd_enable:="NO"} -: ${vsftpd_flags:=""} command="%%PREFIX%%/libexec/$name" required_files="%%PREFIX%%/etc/$name.conf" diff --git a/ftp/vsftpd/files/vsftpd.sh.in b/ftp/vsftpd/files/vsftpd.sh.in index 3ce7bb15982f..53d137b67a4b 100644 --- a/ftp/vsftpd/files/vsftpd.sh.in +++ b/ftp/vsftpd/files/vsftpd.sh.in @@ -27,7 +27,6 @@ rcvar=`set_rcvar` load_rc_config "$name" : ${vsftpd_enable:="NO"} -: ${vsftpd_flags:=""} command="%%PREFIX%%/libexec/$name" required_files="%%PREFIX%%/etc/$name.conf" diff --git a/ftp/wzdftpd/files/wzdftpd.sh.in b/ftp/wzdftpd/files/wzdftpd.sh.in index 25a14fc945ec..ca4dc35cb034 100644 --- a/ftp/wzdftpd/files/wzdftpd.sh.in +++ b/ftp/wzdftpd/files/wzdftpd.sh.in @@ -9,18 +9,18 @@ # KEYWORD: shutdown # -prefix=%%PREFIX%% +# Add the following lines to /etc/rc.conf to enable wzdftpd +# wzdftpd_enable="YES" +# wzdftpd_flags="<set as needed>" wzdftpd_enable=${wzdftpd_enable:-"NO"} # Enable wzdftpd -wzdftpd_program="${prefix}/sbin/wzdftpd" # Location of wzdftpd -wzdftpd_flags=${wzdftpd_flags:-""} # Flags to wzdftpd . %%RC_SUBR%% name="wzdftpd" rcvar=`set_rcvar` -command="${prefix}/sbin/${name}" -required_files="${prefix}/etc/wzd.cfg" +command="%%PREFIX%%/sbin/${name}" +required_files="%%PREFIX%%/etc/wzd.cfg" load_rc_config $name run_rc_command "$1" diff --git a/games/pvpgn/files/bnetd.sh.in b/games/pvpgn/files/bnetd.sh.in index b285620ee6f7..38f5d1e1152a 100644 --- a/games/pvpgn/files/bnetd.sh.in +++ b/games/pvpgn/files/bnetd.sh.in @@ -12,6 +12,7 @@ # Add the following lines to /etc/rc.conf to enable bnetd: # # bnetd_enable="YES" +# bnetd_flags="<set as needed>" # # See bnetd(1) for flags # @@ -35,6 +36,5 @@ stop_postcmd() load_rc_config $name : ${bnetd_enable="NO"} -: ${bnetd_flags=""} run_rc_command "$1" diff --git a/irc/bitlbee-otr/files/bitlbee.in b/irc/bitlbee-otr/files/bitlbee.in index a5e9d9b6c7dd..17499e50eea8 100644 --- a/irc/bitlbee-otr/files/bitlbee.in +++ b/irc/bitlbee-otr/files/bitlbee.in @@ -6,6 +6,10 @@ # REQUIRE: DAEMON # KEYWORD: shutdown +# Add the following lines to /etc/rc.conf to enable bitlbee: +# bitlbee_enable="YES" +# bitlbee_flags="<set as needed>" + . %%RC_SUBR%% name="bitlbee" @@ -16,7 +20,6 @@ load_rc_config $name : ${bitlbee_enable="NO"} : ${bitlbee_user="%%BITLBEEUSER%%"} : ${bitlbee_config="%%PREFIX%%/etc/bitlbee/bitlbee.conf"} -: ${bitlbee_flags=""} required_files="${bitlbee_config}" command="%%PREFIX%%/sbin/bitlbee" diff --git a/irc/bitlbee/files/bitlbee.in b/irc/bitlbee/files/bitlbee.in index a5e9d9b6c7dd..17499e50eea8 100644 --- a/irc/bitlbee/files/bitlbee.in +++ b/irc/bitlbee/files/bitlbee.in @@ -6,6 +6,10 @@ # REQUIRE: DAEMON # KEYWORD: shutdown +# Add the following lines to /etc/rc.conf to enable bitlbee: +# bitlbee_enable="YES" +# bitlbee_flags="<set as needed>" + . %%RC_SUBR%% name="bitlbee" @@ -16,7 +20,6 @@ load_rc_config $name : ${bitlbee_enable="NO"} : ${bitlbee_user="%%BITLBEEUSER%%"} : ${bitlbee_config="%%PREFIX%%/etc/bitlbee/bitlbee.conf"} -: ${bitlbee_flags=""} required_files="${bitlbee_config}" command="%%PREFIX%%/sbin/bitlbee" diff --git a/irc/bopm/files/bopm.in b/irc/bopm/files/bopm.in index 96bc4fb8c14c..64afa18c4ccc 100644 --- a/irc/bopm/files/bopm.in +++ b/irc/bopm/files/bopm.in @@ -22,7 +22,6 @@ load_rc_config $name : ${bopm_enable="NO"} : ${bopm_config="%%PREFIX%%/etc/bopm.conf"} -: ${bopm_flags=""} bopm_user="bopm" pidfile="%%LOGDIR%%/bopm.pid" diff --git a/irc/inspircd/files/inspircd.sh.in b/irc/inspircd/files/inspircd.sh.in index 10ba22a2efe6..bbaf6d20ba53 100644 --- a/irc/inspircd/files/inspircd.sh.in +++ b/irc/inspircd/files/inspircd.sh.in @@ -12,6 +12,7 @@ # %%PORTNAME%%_enable="YES" # # Other rc.conf variables: +# %%PORTNAME%%_flags="<set as needed>" # # %%PORTNAME%%_config="%%ETCDIR%%/%%PORTNAME%%.conf" # -- path to config file @@ -35,7 +36,6 @@ load_rc_config ${name} : ${%%PORTNAME%%_enable="NO"} : ${%%PORTNAME%%_config="%%ETCDIR%%/%%PORTNAME%%.conf"} : ${%%PORTNAME%%_pidfile="%%INSPIRCD_RUN%%/%%PORTNAME%%.pid"} -: ${%%PORTNAME%%_flags=""} : ${%%PORTNAME%%_user="%%INSPIRCD_USR%%"} : ${%%PORTNAME%%_group="%%INSPIRCD_GRP%%"} : ${%%PORTNAME%%_logfile="%%INSPIRCD_LOG%%"} diff --git a/irc/ircd-rusnet/files/ircd.sh.sample b/irc/ircd-rusnet/files/ircd.sh.sample index 8c65064a4fe4..047f424e6d72 100644 --- a/irc/ircd-rusnet/files/ircd.sh.sample +++ b/irc/ircd-rusnet/files/ircd.sh.sample @@ -5,7 +5,7 @@ PATH=/bin:/usr/bin daemon=ircd daemon_path=/usr/local/sbin daemon_pid=/var/run/ircd/$daemon.pid -daemon_flags= +#daemon_flags= case $1 in start) diff --git a/irc/ngircd/files/ngircd.in b/irc/ngircd/files/ngircd.in index 8dfb916b0de4..a79e843150f5 100644 --- a/irc/ngircd/files/ngircd.in +++ b/irc/ngircd/files/ngircd.in @@ -24,10 +24,9 @@ load_rc_config $name : ${ngircd_enable="NO"} : ${ngircd_conf="%%PREFIX%%/etc/ngircd.conf"} -: ${ngircd_flags=""} required_files="${ngircd_conf}" command=%%PREFIX%%/sbin/ngircd -command_args="-f ${ngircd_conf} ${ngircd_flags}" +command_args="-f ${ngircd_conf}" run_rc_command "$1" diff --git a/lang/erlang/files/epmd.sh.in b/lang/erlang/files/epmd.sh.in index ea57aa23cdc0..6658c7c8f226 100644 --- a/lang/erlang/files/epmd.sh.in +++ b/lang/erlang/files/epmd.sh.in @@ -17,10 +17,9 @@ epmd_enable=${epmd_enable:-"NO"} name=epmd rcvar=`set_rcvar` -prefix=%%PREFIX%% -procname=${prefix}/bin/epmd -start_cmd="${prefix}/bin/epmd -daemon" -stop_cmd="${prefix}/bin/epmd -kill >/dev/null" +procname=%%PREFIX%%/bin/epmd +start_cmd="%%PREFIX%%/bin/epmd -daemon" +stop_cmd="%%PREFIX%%/bin/epmd -kill >/dev/null" load_rc_config ${name} run_rc_command "$1" diff --git a/lang/erlang14/files/epmd.sh.in b/lang/erlang14/files/epmd.sh.in index ea57aa23cdc0..6658c7c8f226 100644 --- a/lang/erlang14/files/epmd.sh.in +++ b/lang/erlang14/files/epmd.sh.in @@ -17,10 +17,9 @@ epmd_enable=${epmd_enable:-"NO"} name=epmd rcvar=`set_rcvar` -prefix=%%PREFIX%% -procname=${prefix}/bin/epmd -start_cmd="${prefix}/bin/epmd -daemon" -stop_cmd="${prefix}/bin/epmd -kill >/dev/null" +procname=%%PREFIX%%/bin/epmd +start_cmd="%%PREFIX%%/bin/epmd -daemon" +stop_cmd="%%PREFIX%%/bin/epmd -kill >/dev/null" load_rc_config ${name} run_rc_command "$1" diff --git a/mail/antivirus-milter/files/antivirus-milter.sh.in b/mail/antivirus-milter/files/antivirus-milter.sh.in index 8d89715ebb31..cee33194de97 100644 --- a/mail/antivirus-milter/files/antivirus-milter.sh.in +++ b/mail/antivirus-milter/files/antivirus-milter.sh.in @@ -10,8 +10,6 @@ # KEYWORD: shutdown # -prefix=%%PREFIX%% - # Define these antivirus_* variables in one of these files: # /etc/rc.conf # /etc/rc.conf.local @@ -22,14 +20,14 @@ prefix=%%PREFIX%% antivirus_enable=${antivirus_enable:-"NO"} # Enable antivirus-milter antivirus_pidfile=${antivirus_pidfile:-"%%ANTIVIRUS%%/run/antivirus.pid"} # Path to pidfile antivirus_socket=${antivirus_socket:-"%%ANTIVIRUS%%/antivirus.sock"} # Path to socket -antivirus_flags=${antivirus_flags:-""} # Flags to antivirus +#antivirus_flags=${antivirus_flags:-""} # Flags to antivirus . /etc/rc.subr name="antivirus" rcvar=`set_rcvar` -command="${prefix}/libexec/antivirus" -required_files="${prefix}/etc/antivirus.conf" +command="%%PREFIX%%/libexec/antivirus" +required_files="%%PREFIX%%/etc/antivirus.conf" start_precmd="antivirus_prestart" stop_postcmd="antivirus_poststop" @@ -47,5 +45,3 @@ pidfile="${antivirus_pidfile}" command_args="-p local:${antivirus_socket} ${antivirus_flags}" run_rc_command "$1" - -# eof diff --git a/mail/batv-milter/files/milter-batv.sh.in b/mail/batv-milter/files/milter-batv.sh.in index feb81e986357..e9af1bd7ca76 100644 --- a/mail/batv-milter/files/milter-batv.sh.in +++ b/mail/batv-milter/files/milter-batv.sh.in @@ -57,7 +57,6 @@ load_rc_config $name : ${milterbatv_key=""} # Options other than above can be set with $milterbatv_flags. # see batv-milter documentation for detail. -: ${milterbatv_flags=""} if [ -n "$2" ]; then profile="$2" diff --git a/mail/courier/files/courier.sh.in b/mail/courier/files/courier.sh.in index a2ec2e2f7fa4..703fa7abd17a 100644 --- a/mail/courier/files/courier.sh.in +++ b/mail/courier/files/courier.sh.in @@ -11,10 +11,6 @@ # REQUIRE: LOGIN courier_authdaemond # BEFORE: securelevel # KEYWORD: shutdown -# -# NOTE for FreeBSD 5.0+: -# If you want this script to start with the base rc scripts -# move courier.sh to /etc/rc.d/courier prefix="%%PREFIX%%" exec_prefix="${prefix}" diff --git a/mail/cyrus-imapd2/files/imapd.sh.in b/mail/cyrus-imapd2/files/imapd.sh.in index b8dd83bd4a01..489c6301d6c4 100644 --- a/mail/cyrus-imapd2/files/imapd.sh.in +++ b/mail/cyrus-imapd2/files/imapd.sh.in @@ -7,12 +7,6 @@ # REQUIRE: DAEMON # BEFORE: mail # KEYWORD: shutdown -# -# NOTE for FreeBSD 5.0+: -# If you want this script to start with the base rc scripts -# move imapd.sh to /etc/rc.d/cyrus_imapd - -prefix=%%PREFIX%% # Define these cyrus_imapd_* variables in one of these files: # /etc/rc.conf @@ -22,16 +16,16 @@ prefix=%%PREFIX%% # DO NOT CHANGE THESE DEFAULT VALUES HERE # [ -z "$cyrus_imapd_enable" ] && cyrus_imapd_enable="NO" # Enable imapd -#cyrus_imapd_program="${prefix}/cyrus/bin/master" # Location of imapd +#cyrus_imapd_program="%%PREFIX%%/cyrus/bin/master" # Location of imapd [ -z "$cyrus_imapd_flags" ] && cyrus_imapd_flags="-d" # Flags to imapd program . %%RC_SUBR%% name="cyrus_imapd" rcvar=`set_rcvar` -command="${prefix}/cyrus/bin/master" +command="%%PREFIX%%/cyrus/bin/master" pidfile="/var/run/cyrus-master.pid" -required_files="${prefix}/etc/cyrus.conf ${prefix}/etc/imapd.conf" +required_files="%%PREFIX%%/etc/cyrus.conf %%PREFIX%%/etc/imapd.conf" stop_postcmd="cyrus_imapd_poststop" cyrus_imapd_poststop() { diff --git a/mail/cyrus-imapd22/files/imapd.sh.in b/mail/cyrus-imapd22/files/imapd.sh.in index b8dd83bd4a01..489c6301d6c4 100644 --- a/mail/cyrus-imapd22/files/imapd.sh.in +++ b/mail/cyrus-imapd22/files/imapd.sh.in @@ -7,12 +7,6 @@ # REQUIRE: DAEMON # BEFORE: mail # KEYWORD: shutdown -# -# NOTE for FreeBSD 5.0+: -# If you want this script to start with the base rc scripts -# move imapd.sh to /etc/rc.d/cyrus_imapd - -prefix=%%PREFIX%% # Define these cyrus_imapd_* variables in one of these files: # /etc/rc.conf @@ -22,16 +16,16 @@ prefix=%%PREFIX%% # DO NOT CHANGE THESE DEFAULT VALUES HERE # [ -z "$cyrus_imapd_enable" ] && cyrus_imapd_enable="NO" # Enable imapd -#cyrus_imapd_program="${prefix}/cyrus/bin/master" # Location of imapd +#cyrus_imapd_program="%%PREFIX%%/cyrus/bin/master" # Location of imapd [ -z "$cyrus_imapd_flags" ] && cyrus_imapd_flags="-d" # Flags to imapd program . %%RC_SUBR%% name="cyrus_imapd" rcvar=`set_rcvar` -command="${prefix}/cyrus/bin/master" +command="%%PREFIX%%/cyrus/bin/master" pidfile="/var/run/cyrus-master.pid" -required_files="${prefix}/etc/cyrus.conf ${prefix}/etc/imapd.conf" +required_files="%%PREFIX%%/etc/cyrus.conf %%PREFIX%%/etc/imapd.conf" stop_postcmd="cyrus_imapd_poststop" cyrus_imapd_poststop() { diff --git a/mail/cyrus-imapd23/files/imapd.sh.in b/mail/cyrus-imapd23/files/imapd.sh.in index b8dd83bd4a01..489c6301d6c4 100644 --- a/mail/cyrus-imapd23/files/imapd.sh.in +++ b/mail/cyrus-imapd23/files/imapd.sh.in @@ -7,12 +7,6 @@ # REQUIRE: DAEMON # BEFORE: mail # KEYWORD: shutdown -# -# NOTE for FreeBSD 5.0+: -# If you want this script to start with the base rc scripts -# move imapd.sh to /etc/rc.d/cyrus_imapd - -prefix=%%PREFIX%% # Define these cyrus_imapd_* variables in one of these files: # /etc/rc.conf @@ -22,16 +16,16 @@ prefix=%%PREFIX%% # DO NOT CHANGE THESE DEFAULT VALUES HERE # [ -z "$cyrus_imapd_enable" ] && cyrus_imapd_enable="NO" # Enable imapd -#cyrus_imapd_program="${prefix}/cyrus/bin/master" # Location of imapd +#cyrus_imapd_program="%%PREFIX%%/cyrus/bin/master" # Location of imapd [ -z "$cyrus_imapd_flags" ] && cyrus_imapd_flags="-d" # Flags to imapd program . %%RC_SUBR%% name="cyrus_imapd" rcvar=`set_rcvar` -command="${prefix}/cyrus/bin/master" +command="%%PREFIX%%/cyrus/bin/master" pidfile="/var/run/cyrus-master.pid" -required_files="${prefix}/etc/cyrus.conf ${prefix}/etc/imapd.conf" +required_files="%%PREFIX%%/etc/cyrus.conf %%PREFIX%%/etc/imapd.conf" stop_postcmd="cyrus_imapd_poststop" cyrus_imapd_poststop() { diff --git a/mail/cyrus-imapd24/files/imapd.sh.in b/mail/cyrus-imapd24/files/imapd.sh.in index b8dd83bd4a01..489c6301d6c4 100644 --- a/mail/cyrus-imapd24/files/imapd.sh.in +++ b/mail/cyrus-imapd24/files/imapd.sh.in @@ -7,12 +7,6 @@ # REQUIRE: DAEMON # BEFORE: mail # KEYWORD: shutdown -# -# NOTE for FreeBSD 5.0+: -# If you want this script to start with the base rc scripts -# move imapd.sh to /etc/rc.d/cyrus_imapd - -prefix=%%PREFIX%% # Define these cyrus_imapd_* variables in one of these files: # /etc/rc.conf @@ -22,16 +16,16 @@ prefix=%%PREFIX%% # DO NOT CHANGE THESE DEFAULT VALUES HERE # [ -z "$cyrus_imapd_enable" ] && cyrus_imapd_enable="NO" # Enable imapd -#cyrus_imapd_program="${prefix}/cyrus/bin/master" # Location of imapd +#cyrus_imapd_program="%%PREFIX%%/cyrus/bin/master" # Location of imapd [ -z "$cyrus_imapd_flags" ] && cyrus_imapd_flags="-d" # Flags to imapd program . %%RC_SUBR%% name="cyrus_imapd" rcvar=`set_rcvar` -command="${prefix}/cyrus/bin/master" +command="%%PREFIX%%/cyrus/bin/master" pidfile="/var/run/cyrus-master.pid" -required_files="${prefix}/etc/cyrus.conf ${prefix}/etc/imapd.conf" +required_files="%%PREFIX%%/etc/cyrus.conf %%PREFIX%%/etc/imapd.conf" stop_postcmd="cyrus_imapd_poststop" cyrus_imapd_poststop() { diff --git a/mail/dbmail/files/dbmail-imapd.sh.in b/mail/dbmail/files/dbmail-imapd.sh.in index 82505e96d9b0..dce54a82f917 100644 --- a/mail/dbmail/files/dbmail-imapd.sh.in +++ b/mail/dbmail/files/dbmail-imapd.sh.in @@ -10,7 +10,8 @@ # # Add the following lines to /etc/rc.conf to enable dbmail-imapd: # -#dbmail_imapd_enable="YES" +# dbmail_imapd_enable="YES" +# dbmail_imapd_flags="<set as needed>" # # See dbmail-imapd(8) for flags # @@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf # read settings, set default values load_rc_config "$name" : ${dbmail_imapd_enable="NO"} -: ${dbmail_imapd_flags=""} run_rc_command "$1" diff --git a/mail/dbmail/files/dbmail-lmtpd.sh.in b/mail/dbmail/files/dbmail-lmtpd.sh.in index f1133f43a70e..e62355064847 100644 --- a/mail/dbmail/files/dbmail-lmtpd.sh.in +++ b/mail/dbmail/files/dbmail-lmtpd.sh.in @@ -10,7 +10,8 @@ # # Add the following lines to /etc/rc.conf to enable dbmail-lmtpd: # -#dbmail_lmtpd_enable="YES" +# dbmail_lmtpd_enable="YES" +# dbmail_lmtpd_flags="<set as needed>" # # See dbmail-lmtpd(8) for flags # @@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf # read settings, set default values load_rc_config "$name" : ${dbmail_lmtpd_enable="NO"} -: ${dbmail_lmtpd_flags=""} run_rc_command "$1" diff --git a/mail/dbmail/files/dbmail-pop3d.sh.in b/mail/dbmail/files/dbmail-pop3d.sh.in index d787f6a668e7..8df206a0edec 100644 --- a/mail/dbmail/files/dbmail-pop3d.sh.in +++ b/mail/dbmail/files/dbmail-pop3d.sh.in @@ -10,7 +10,8 @@ # # Add the following lines to /etc/rc.conf to enable dbmail-pop3d: # -#dbmail_pop3d_enable="YES" +# dbmail_pop3d_enable="YES" +# dbmail_pop3d_flags="<set as needed>" # # See dbmail-pop3d(8) for flags # @@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf # read settings, set default values load_rc_config "$name" : ${dbmail_pop3d_enable="NO"} -: ${dbmail_pop3d_flags=""} run_rc_command "$1" diff --git a/mail/dbmail/files/dbmail-timsieved.sh.in b/mail/dbmail/files/dbmail-timsieved.sh.in index 26b5888cba6d..63a2d5b97cda 100644 --- a/mail/dbmail/files/dbmail-timsieved.sh.in +++ b/mail/dbmail/files/dbmail-timsieved.sh.in @@ -10,7 +10,8 @@ # # Add the following lines to /etc/rc.conf to enable dbmail-timsieved: # -#dbmail_timsieved_enable="YES" +# dbmail_timsieved_enable="YES" +# dbmail_timsieved_flags="<set as needed>" # # See dbmail-timsieved(8) for flags # @@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf # read settings, set default values load_rc_config "$name" : ${dbmail_timsieved_enable="NO"} -: ${dbmail_timsieved_flags=""} run_rc_command "$1" diff --git a/mail/dbmail20/files/dbmail-imapd.sh.in b/mail/dbmail20/files/dbmail-imapd.sh.in index 82505e96d9b0..dce54a82f917 100644 --- a/mail/dbmail20/files/dbmail-imapd.sh.in +++ b/mail/dbmail20/files/dbmail-imapd.sh.in @@ -10,7 +10,8 @@ # # Add the following lines to /etc/rc.conf to enable dbmail-imapd: # -#dbmail_imapd_enable="YES" +# dbmail_imapd_enable="YES" +# dbmail_imapd_flags="<set as needed>" # # See dbmail-imapd(8) for flags # @@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf # read settings, set default values load_rc_config "$name" : ${dbmail_imapd_enable="NO"} -: ${dbmail_imapd_flags=""} run_rc_command "$1" diff --git a/mail/dbmail20/files/dbmail-lmtpd.sh.in b/mail/dbmail20/files/dbmail-lmtpd.sh.in index f1133f43a70e..e62355064847 100644 --- a/mail/dbmail20/files/dbmail-lmtpd.sh.in +++ b/mail/dbmail20/files/dbmail-lmtpd.sh.in @@ -10,7 +10,8 @@ # # Add the following lines to /etc/rc.conf to enable dbmail-lmtpd: # -#dbmail_lmtpd_enable="YES" +# dbmail_lmtpd_enable="YES" +# dbmail_lmtpd_flags="<set as needed>" # # See dbmail-lmtpd(8) for flags # @@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf # read settings, set default values load_rc_config "$name" : ${dbmail_lmtpd_enable="NO"} -: ${dbmail_lmtpd_flags=""} run_rc_command "$1" diff --git a/mail/dbmail20/files/dbmail-pop3d.sh.in b/mail/dbmail20/files/dbmail-pop3d.sh.in index d787f6a668e7..8df206a0edec 100644 --- a/mail/dbmail20/files/dbmail-pop3d.sh.in +++ b/mail/dbmail20/files/dbmail-pop3d.sh.in @@ -10,7 +10,8 @@ # # Add the following lines to /etc/rc.conf to enable dbmail-pop3d: # -#dbmail_pop3d_enable="YES" +# dbmail_pop3d_enable="YES" +# dbmail_pop3d_flags="<set as needed>" # # See dbmail-pop3d(8) for flags # @@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf # read settings, set default values load_rc_config "$name" : ${dbmail_pop3d_enable="NO"} -: ${dbmail_pop3d_flags=""} run_rc_command "$1" diff --git a/mail/dbmail21/files/dbmail-imapd.sh.in b/mail/dbmail21/files/dbmail-imapd.sh.in index 82505e96d9b0..dce54a82f917 100644 --- a/mail/dbmail21/files/dbmail-imapd.sh.in +++ b/mail/dbmail21/files/dbmail-imapd.sh.in @@ -10,7 +10,8 @@ # # Add the following lines to /etc/rc.conf to enable dbmail-imapd: # -#dbmail_imapd_enable="YES" +# dbmail_imapd_enable="YES" +# dbmail_imapd_flags="<set as needed>" # # See dbmail-imapd(8) for flags # @@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf # read settings, set default values load_rc_config "$name" : ${dbmail_imapd_enable="NO"} -: ${dbmail_imapd_flags=""} run_rc_command "$1" diff --git a/mail/dbmail21/files/dbmail-lmtpd.sh.in b/mail/dbmail21/files/dbmail-lmtpd.sh.in index f1133f43a70e..e62355064847 100644 --- a/mail/dbmail21/files/dbmail-lmtpd.sh.in +++ b/mail/dbmail21/files/dbmail-lmtpd.sh.in @@ -10,7 +10,8 @@ # # Add the following lines to /etc/rc.conf to enable dbmail-lmtpd: # -#dbmail_lmtpd_enable="YES" +# dbmail_lmtpd_enable="YES" +# dbmail_lmtpd_flags="<set as needed>" # # See dbmail-lmtpd(8) for flags # @@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf # read settings, set default values load_rc_config "$name" : ${dbmail_lmtpd_enable="NO"} -: ${dbmail_lmtpd_flags=""} run_rc_command "$1" diff --git a/mail/dbmail21/files/dbmail-pop3d.sh.in b/mail/dbmail21/files/dbmail-pop3d.sh.in index 21bc97377b8b..132177736ce5 100644 --- a/mail/dbmail21/files/dbmail-pop3d.sh.in +++ b/mail/dbmail21/files/dbmail-pop3d.sh.in @@ -10,7 +10,8 @@ # # Add the following lines to /etc/rc.conf to enable dbmail-pop3d: # -#dbmail_pop3d_enable="YES" +# dbmail_pop3d_enable="YES" +# dbmail_pop3d_flags="<set as needed>" # # See dbmail-pop3d(8) for flags # @@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf # read settings, set default values load_rc_config "$name" : ${dbmail_pop3d_enable="NO"} -: ${dbmail_pop3d_flags=""} run_rc_command "$1" diff --git a/mail/dbmail21/files/dbmail-timsieved.sh.in b/mail/dbmail21/files/dbmail-timsieved.sh.in index 26b5888cba6d..63a2d5b97cda 100644 --- a/mail/dbmail21/files/dbmail-timsieved.sh.in +++ b/mail/dbmail21/files/dbmail-timsieved.sh.in @@ -10,7 +10,8 @@ # # Add the following lines to /etc/rc.conf to enable dbmail-timsieved: # -#dbmail_timsieved_enable="YES" +# dbmail_timsieved_enable="YES" +# dbmail_timsieved_flags="<set as needed>" # # See dbmail-timsieved(8) for flags # @@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf # read settings, set default values load_rc_config "$name" : ${dbmail_timsieved_enable="NO"} -: ${dbmail_timsieved_flags=""} run_rc_command "$1" diff --git a/mail/dbmail22/files/dbmail-imapd.sh.in b/mail/dbmail22/files/dbmail-imapd.sh.in index 82505e96d9b0..dce54a82f917 100644 --- a/mail/dbmail22/files/dbmail-imapd.sh.in +++ b/mail/dbmail22/files/dbmail-imapd.sh.in @@ -10,7 +10,8 @@ # # Add the following lines to /etc/rc.conf to enable dbmail-imapd: # -#dbmail_imapd_enable="YES" +# dbmail_imapd_enable="YES" +# dbmail_imapd_flags="<set as needed>" # # See dbmail-imapd(8) for flags # @@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf # read settings, set default values load_rc_config "$name" : ${dbmail_imapd_enable="NO"} -: ${dbmail_imapd_flags=""} run_rc_command "$1" diff --git a/mail/dbmail22/files/dbmail-lmtpd.sh.in b/mail/dbmail22/files/dbmail-lmtpd.sh.in index f1133f43a70e..e62355064847 100644 --- a/mail/dbmail22/files/dbmail-lmtpd.sh.in +++ b/mail/dbmail22/files/dbmail-lmtpd.sh.in @@ -10,7 +10,8 @@ # # Add the following lines to /etc/rc.conf to enable dbmail-lmtpd: # -#dbmail_lmtpd_enable="YES" +# dbmail_lmtpd_enable="YES" +# dbmail_lmtpd_flags="<set as needed>" # # See dbmail-lmtpd(8) for flags # @@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf # read settings, set default values load_rc_config "$name" : ${dbmail_lmtpd_enable="NO"} -: ${dbmail_lmtpd_flags=""} run_rc_command "$1" diff --git a/mail/dbmail22/files/dbmail-pop3d.sh.in b/mail/dbmail22/files/dbmail-pop3d.sh.in index d787f6a668e7..8df206a0edec 100644 --- a/mail/dbmail22/files/dbmail-pop3d.sh.in +++ b/mail/dbmail22/files/dbmail-pop3d.sh.in @@ -10,7 +10,8 @@ # # Add the following lines to /etc/rc.conf to enable dbmail-pop3d: # -#dbmail_pop3d_enable="YES" +# dbmail_pop3d_enable="YES" +# dbmail_pop3d_flags="<set as needed>" # # See dbmail-pop3d(8) for flags # @@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf # read settings, set default values load_rc_config "$name" : ${dbmail_pop3d_enable="NO"} -: ${dbmail_pop3d_flags=""} run_rc_command "$1" diff --git a/mail/dbmail22/files/dbmail-timsieved.sh.in b/mail/dbmail22/files/dbmail-timsieved.sh.in index 26b5888cba6d..63a2d5b97cda 100644 --- a/mail/dbmail22/files/dbmail-timsieved.sh.in +++ b/mail/dbmail22/files/dbmail-timsieved.sh.in @@ -10,7 +10,8 @@ # # Add the following lines to /etc/rc.conf to enable dbmail-timsieved: # -#dbmail_timsieved_enable="YES" +# dbmail_timsieved_enable="YES" +# dbmail_timsieved_flags="<set as needed>" # # See dbmail-timsieved(8) for flags # @@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf # read settings, set default values load_rc_config "$name" : ${dbmail_timsieved_enable="NO"} -: ${dbmail_timsieved_flags=""} run_rc_command "$1" diff --git a/mail/dbmail23/files/dbmail-imapd.sh.in b/mail/dbmail23/files/dbmail-imapd.sh.in index 82505e96d9b0..dce54a82f917 100644 --- a/mail/dbmail23/files/dbmail-imapd.sh.in +++ b/mail/dbmail23/files/dbmail-imapd.sh.in @@ -10,7 +10,8 @@ # # Add the following lines to /etc/rc.conf to enable dbmail-imapd: # -#dbmail_imapd_enable="YES" +# dbmail_imapd_enable="YES" +# dbmail_imapd_flags="<set as needed>" # # See dbmail-imapd(8) for flags # @@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf # read settings, set default values load_rc_config "$name" : ${dbmail_imapd_enable="NO"} -: ${dbmail_imapd_flags=""} run_rc_command "$1" diff --git a/mail/dbmail23/files/dbmail-lmtpd.sh.in b/mail/dbmail23/files/dbmail-lmtpd.sh.in index f1133f43a70e..e62355064847 100644 --- a/mail/dbmail23/files/dbmail-lmtpd.sh.in +++ b/mail/dbmail23/files/dbmail-lmtpd.sh.in @@ -10,7 +10,8 @@ # # Add the following lines to /etc/rc.conf to enable dbmail-lmtpd: # -#dbmail_lmtpd_enable="YES" +# dbmail_lmtpd_enable="YES" +# dbmail_lmtpd_flags="<set as needed>" # # See dbmail-lmtpd(8) for flags # @@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf # read settings, set default values load_rc_config "$name" : ${dbmail_lmtpd_enable="NO"} -: ${dbmail_lmtpd_flags=""} run_rc_command "$1" diff --git a/mail/dbmail23/files/dbmail-pop3d.sh.in b/mail/dbmail23/files/dbmail-pop3d.sh.in index d787f6a668e7..8df206a0edec 100644 --- a/mail/dbmail23/files/dbmail-pop3d.sh.in +++ b/mail/dbmail23/files/dbmail-pop3d.sh.in @@ -10,7 +10,8 @@ # # Add the following lines to /etc/rc.conf to enable dbmail-pop3d: # -#dbmail_pop3d_enable="YES" +# dbmail_pop3d_enable="YES" +# dbmail_pop3d_flags="<set as needed>" # # See dbmail-pop3d(8) for flags # @@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf # read settings, set default values load_rc_config "$name" : ${dbmail_pop3d_enable="NO"} -: ${dbmail_pop3d_flags=""} run_rc_command "$1" diff --git a/mail/dbmail23/files/dbmail-timsieved.sh.in b/mail/dbmail23/files/dbmail-timsieved.sh.in index 26b5888cba6d..63a2d5b97cda 100644 --- a/mail/dbmail23/files/dbmail-timsieved.sh.in +++ b/mail/dbmail23/files/dbmail-timsieved.sh.in @@ -10,7 +10,8 @@ # # Add the following lines to /etc/rc.conf to enable dbmail-timsieved: # -#dbmail_timsieved_enable="YES" +# dbmail_timsieved_enable="YES" +# dbmail_timsieved_flags="<set as needed>" # # See dbmail-timsieved(8) for flags # @@ -27,6 +28,5 @@ required_files=%%PREFIX%%/etc/dbmail.conf # read settings, set default values load_rc_config "$name" : ${dbmail_timsieved_enable="NO"} -: ${dbmail_timsieved_flags=""} run_rc_command "$1" diff --git a/mail/dkim-milter/files/milter-dkim.sh.in b/mail/dkim-milter/files/milter-dkim.sh.in index b1e7d077b554..8e1dee427f4a 100644 --- a/mail/dkim-milter/files/milter-dkim.sh.in +++ b/mail/dkim-milter/files/milter-dkim.sh.in @@ -59,7 +59,6 @@ load_rc_config $name : ${milterdkim_alg=""} # Options other than above can be set with $milterdkim_flags. # see dkim-milter documentation for detail. -: ${milterdkim_flags=""} if [ -n "$2" ]; then profile="$2" diff --git a/mail/drac/files/dracd.sh.in b/mail/drac/files/dracd.sh.in index 341c90cf6aca..e7e1eeceb65e 100644 --- a/mail/drac/files/dracd.sh.in +++ b/mail/drac/files/dracd.sh.in @@ -22,7 +22,6 @@ command="%%PREFIX%%/sbin/rpc.dracd" load_rc_config $name : ${dracd_enable="NO"} -: ${dracd_flags=""} required_files="%%PREFIX%%/etc/dracd.allow" diff --git a/mail/mailscanner-devel/files/mta.in b/mail/mailscanner-devel/files/mta.in index fb3f433cbff7..7f24a03b9d01 100644 --- a/mail/mailscanner-devel/files/mta.in +++ b/mail/mailscanner-devel/files/mta.in @@ -69,7 +69,6 @@ load_rc_config $name : ${mta_enable="NO"} : ${mta_type="sendmail"} -: ${mta_flags=""} case "${mta_type}" in diff --git a/mail/mailscanner/files/mta.in b/mail/mailscanner/files/mta.in index fb3f433cbff7..7f24a03b9d01 100644 --- a/mail/mailscanner/files/mta.in +++ b/mail/mailscanner/files/mta.in @@ -69,7 +69,6 @@ load_rc_config $name : ${mta_enable="NO"} : ${mta_type="sendmail"} -: ${mta_flags=""} case "${mta_type}" in diff --git a/mail/milter-regex/files/milterregex.sh.in b/mail/milter-regex/files/milterregex.sh.in index 969e4cb6a0b1..74d0a72f25cf 100644 --- a/mail/milter-regex/files/milterregex.sh.in +++ b/mail/milter-regex/files/milterregex.sh.in @@ -8,13 +8,7 @@ # REQUIRE: DAEMON # BEFORE: mail # KEYWORD: shutdown -# -# NOTE for FreeBSD 5.0 through 6.0: -# If you want this script to start with the base rc scripts -# move milterregex to /etc/rc.d/milterregex -# Not necessary for 6.1+ -prefix=%%PREFIX%% spooldir=%%SPOOLDIR%% # Define these milterregex_* variables in one of these files: @@ -25,16 +19,15 @@ spooldir=%%SPOOLDIR%% # DO NOT CHANGE THESE DEFAULT VALUES HERE # [ -z "$milterregex_enable" ] && milterregex_enable="NO" # Enable milter-regex -#milterregex_program="${prefix}/libexec/milter-regex" # Location of milter-regex -[ -z "$milterregex_flags" ] && milterregex_flags="" # Flags to milter-regex program +# milterregex_flags="" # Flags to milter-regex program . /etc/rc.subr name="milterregex" rcvar=`set_rcvar` -command="${prefix}/libexec/milter-regex" +command="%%PREFIX%%/libexec/milter-regex" pidfile="${spooldir}/milter-regex.pid" -required_files="${prefix}/etc/milter-regex.conf" +required_files="%%PREFIX%%/etc/milter-regex.conf" stop_postcmd="milterregex_poststop" milterregex_poststop() { diff --git a/mail/noattach/files/noattach.sh.in b/mail/noattach/files/noattach.sh.in index 5bccc1f557b7..4e32b95f33aa 100644 --- a/mail/noattach/files/noattach.sh.in +++ b/mail/noattach/files/noattach.sh.in @@ -10,8 +10,6 @@ # KEYWORD: shutdown # -prefix=%%PREFIX%% - # Define these noattach_* variables in one of these files: # /etc/rc.conf # /etc/rc.conf.local @@ -22,14 +20,14 @@ prefix=%%PREFIX%% noattach_enable=${noattach_enable:-"NO"} # Enable noattach noattach_pidfile=${noattach_pidfile:-"/var/run/noattach.pid"} # Path to pidfile noattach_socket=${noattach_socket:-"/var/run/noattach"} # Path to socket -noattach_flags=${noattach_flags:-""} # Flags to noattach +# noattach_flags="" # Flags to noattach . /etc/rc.subr name="noattach" rcvar=`set_rcvar` -command="${prefix}/libexec/${name}" -required_files="${prefix}/etc/noattach.patterns" +command="%%PREFIX%%/libexec/${name}" +required_files="%%PREFIX%%/etc/noattach.patterns" start_precmd="noattach_prestart" stop_postcmd="noattach_poststop" reload_cmd="noattach_reload" @@ -52,5 +50,3 @@ pidfile="${noattach_pidfile}" command_args="-p local:${noattach_socket} ${noattach_flags}" run_rc_command "$1" - -# eof diff --git a/mail/perdition/files/perdition.imap4.in b/mail/perdition/files/perdition.imap4.in index 2b02deb2a823..ecf021ef9f3b 100644 --- a/mail/perdition/files/perdition.imap4.in +++ b/mail/perdition/files/perdition.imap4.in @@ -9,12 +9,12 @@ # Add the following line to /etc/rc.conf to enable perdition.imap4 # # perdition_imap4_enable="YES" +# perdition_imap4_flags="<set as needed>" # # See perdition(8) for flags # perdition_imap4_enable=${perdition_imap4_enable-"NO"} -perdition_imap4_flags=${perdition_imap4_flags-""} . %%RC_SUBR%% diff --git a/mail/perdition/files/perdition.imap4s.in b/mail/perdition/files/perdition.imap4s.in index 6a03483202ff..dce3c92fd9e5 100644 --- a/mail/perdition/files/perdition.imap4s.in +++ b/mail/perdition/files/perdition.imap4s.in @@ -9,12 +9,12 @@ # Add the following line to /etc/rc.conf to enable perdition.imap4s # # perdition_imap4s_enable="YES" +# perdition_imap4s_flags="<set as needed>" # # See perdition(8) for flags # perdition_imap4s_enable=${perdition_imap4s_enable-"NO"} -perdition_imap4s_flags=${perdition_imap4s_flags-""} . %%RC_SUBR%% diff --git a/mail/perdition/files/perdition.imaps.in b/mail/perdition/files/perdition.imaps.in index 79413b5d5308..9ff3d9bbabe6 100644 --- a/mail/perdition/files/perdition.imaps.in +++ b/mail/perdition/files/perdition.imaps.in @@ -9,12 +9,12 @@ # Add the following line to /etc/rc.conf to enable perdition.imaps # # perdition_imaps_enable="YES" +# perdition_imaps_flags="<set as needed>" # # See perdition(8) for flags # perdition_imaps_enable=${perdition_imaps_enable-"NO"} -perdition_imaps_flags=${perdition_imaps_flags-""} . %%RC_SUBR%% diff --git a/mail/perdition/files/perdition.in b/mail/perdition/files/perdition.in index 86cc85822640..0243270943b1 100644 --- a/mail/perdition/files/perdition.in +++ b/mail/perdition/files/perdition.in @@ -6,15 +6,15 @@ # REQUIRE: DAEMON # KEYWORD: shutdown # -# Add the following line to /etc/rc.conf to enable perdition +# Add the following lines to /etc/rc.conf to enable perdition # # perdition_enable="YES" +# perdition_flags="<set as needed>" # # See perdition(8) for flags # perdition_enable=${perdition_enable-"NO"} -perdition_flags=${perdition_flags-""} . %%RC_SUBR%% diff --git a/mail/perdition/files/perdition.pop3.in b/mail/perdition/files/perdition.pop3.in index c22af3346900..1f73c25fe5a1 100644 --- a/mail/perdition/files/perdition.pop3.in +++ b/mail/perdition/files/perdition.pop3.in @@ -6,15 +6,15 @@ # REQUIRE: DAEMON # KEYWORD: shutdown # -# Add the following line to /etc/rc.conf to enable perdition.pop3 +# Add the following lines to /etc/rc.conf to enable perdition.pop3 # # perdition_pop3_enable="YES" +# perdition_pop3_flags="<set as needed>" # # See perdition(8) for flags # perdition_pop3_enable=${perdition_pop3_enable-"NO"} -perdition_pop3_flags=${perdition_pop3_flags-""} . %%RC_SUBR%% diff --git a/mail/perdition/files/perdition.pop3s.in b/mail/perdition/files/perdition.pop3s.in index 78e41a1802c4..26f3cbd1d5ff 100644 --- a/mail/perdition/files/perdition.pop3s.in +++ b/mail/perdition/files/perdition.pop3s.in @@ -6,15 +6,15 @@ # REQUIRE: DAEMON # KEYWORD: shutdown # -# Add the following line to /etc/rc.conf to enable perdition.pop3s +# Add the following lines to /etc/rc.conf to enable perdition.pop3s # # perdition_pop3s_enable="YES" +# perdition_pop3s_flags="<set as needed>" # # See perdition(8) for flags # perdition_pop3s_enable=${perdition_pop3s_enable-"NO"} -perdition_pop3s_flags=${perdition_pop3s_flags-""} . %%RC_SUBR%% diff --git a/mail/postfix-current/files/postfix.sh.in b/mail/postfix-current/files/postfix.sh.in index 2b07d6c85c1d..c0065f1d4b9c 100644 --- a/mail/postfix-current/files/postfix.sh.in +++ b/mail/postfix-current/files/postfix.sh.in @@ -28,7 +28,6 @@ load_rc_config $name : ${postfix_enable="NO"} : ${postfix_pidfile="/var/spool/postfix/pid/master.pid"} : ${postfix_procname="%%PREFIX%%/libexec/postfix/master"} -: ${postfix_flags=""} start_cmd=${name}_start stop_cmd=${name}_stop diff --git a/mail/postfix23/files/postfix.sh.in b/mail/postfix23/files/postfix.sh.in index 2b07d6c85c1d..c0065f1d4b9c 100644 --- a/mail/postfix23/files/postfix.sh.in +++ b/mail/postfix23/files/postfix.sh.in @@ -28,7 +28,6 @@ load_rc_config $name : ${postfix_enable="NO"} : ${postfix_pidfile="/var/spool/postfix/pid/master.pid"} : ${postfix_procname="%%PREFIX%%/libexec/postfix/master"} -: ${postfix_flags=""} start_cmd=${name}_start stop_cmd=${name}_stop diff --git a/mail/postfix24/files/postfix.sh.in b/mail/postfix24/files/postfix.sh.in index 2b07d6c85c1d..c0065f1d4b9c 100644 --- a/mail/postfix24/files/postfix.sh.in +++ b/mail/postfix24/files/postfix.sh.in @@ -28,7 +28,6 @@ load_rc_config $name : ${postfix_enable="NO"} : ${postfix_pidfile="/var/spool/postfix/pid/master.pid"} : ${postfix_procname="%%PREFIX%%/libexec/postfix/master"} -: ${postfix_flags=""} start_cmd=${name}_start stop_cmd=${name}_stop diff --git a/mail/py-apolicy/files/apolicyd.in b/mail/py-apolicy/files/apolicyd.in index 07cf41bc9648..bcd1f480387a 100644 --- a/mail/py-apolicy/files/apolicyd.in +++ b/mail/py-apolicy/files/apolicyd.in @@ -6,22 +6,21 @@ # PROVIDE: apolicyd # REQUIRE: TWISTD # KEYWORD: shutdown -# -prefix=%%PREFIX%% + # Define these apolicyd_* variables in one of these files: # /etc/rc.conf # /etc/rc.conf.local # # DO NOT CHANGE THESE DEFAULT VALUES HERE -# + . %%RC_SUBR%% name="apolicyd" rcvar=`set_rcvar` -command="%%LOCALBASE%%/bin/twistd" +command="%%PREFIX%%/bin/twistd" pidfile="/var/run/apolicyd.pid" logfile="/var/log/apolicyd.log" diff --git a/mail/py-ppolicy/files/ppolicyd.sh.in b/mail/py-ppolicy/files/ppolicyd.sh.in index d234961fb03d..c1592221b35f 100644 --- a/mail/py-ppolicy/files/ppolicyd.sh.in +++ b/mail/py-ppolicy/files/ppolicyd.sh.in @@ -6,15 +6,12 @@ # PROVIDE: ppolicyd # REQUIRE: TWISTD # KEYWORD: shutdown -# -prefix=%%PREFIX%% # Define these ppolicyd_* variables in one of these files: # /etc/rc.conf # /etc/rc.conf.local # # DO NOT CHANGE THESE DEFAULT VALUES HERE -# . %%RC_SUBR%% diff --git a/mail/rbl-milter/files/rblmilter.sh.in b/mail/rbl-milter/files/rblmilter.sh.in index f09d159393b8..d5918b855cd4 100644 --- a/mail/rbl-milter/files/rblmilter.sh.in +++ b/mail/rbl-milter/files/rblmilter.sh.in @@ -10,8 +10,6 @@ # KEYWORD: shutdown # -prefix=%%PREFIX%% - # Define these rblmilter_* variables in one of these files: # /etc/rc.conf # /etc/rc.conf.local @@ -27,7 +25,7 @@ rblmilter_flags=${rblmilter_flags:-"-l -r -d relays.ordb.org"} # Flags to rblmil name="rblmilter" rcvar=`set_rcvar` -command="${prefix}/sbin/rbl-milter" +command="%%PREFIX%%/sbin/rbl-milter" start_precmd="rblmilter_prestart" stop_postcmd="rblmilter_poststop" extra_commands="reload" diff --git a/mail/spamd/files/obspamd.in b/mail/spamd/files/obspamd.in index eac1fb373e5a..21ab92820d4d 100644 --- a/mail/spamd/files/obspamd.in +++ b/mail/spamd/files/obspamd.in @@ -19,7 +19,6 @@ # DO NOT CHANGE THESE DEFAULT VALUES HERE # obspamd_enable=${obspamd_enable:-"NO"} -obspamd_flags=${obspamd_flags:-""} . %%RC_SUBR%% diff --git a/mail/spamd/files/obspamlogd.in b/mail/spamd/files/obspamlogd.in index 53fb60a3be99..89b4b2b8648c 100644 --- a/mail/spamd/files/obspamlogd.in +++ b/mail/spamd/files/obspamlogd.in @@ -19,7 +19,6 @@ # DO NOT CHANGE THESE DEFAULT VALUES HERE # obspamlogd_enable=${obspamlogd_enable:-"NO"} -obspamlogd_flags=${obspamlogd_flags:-""} . %%RC_SUBR%% diff --git a/mail/spamilter/files/spamilter.sh.in b/mail/spamilter/files/spamilter.sh.in index d1247ce5ea33..0a1cde8fd371 100644 --- a/mail/spamilter/files/spamilter.sh.in +++ b/mail/spamilter/files/spamilter.sh.in @@ -10,8 +10,6 @@ # KEYWORD: shutdown # -prefix=%%PREFIX%% - # Define these spamilter_* variables in one of these files: # /etc/rc.conf # /etc/rc.conf.local @@ -20,15 +18,15 @@ prefix=%%PREFIX%% # DO NOT CHANGE THESE DEFAULT VALUES HERE # spamilter_enable=${spamilter_enable:-"NO"} # Enable spamilter-milter -spamilter_flags=${spamilter_flags:-""} # Flags to spamilter +# spamilter_flags="" # Flags to spamilter . /etc/rc.subr name="spamilter" rcvar=`set_rcvar` -command="${prefix}/bin/spamilter" +command="%%PREFIX%%/bin/spamilter" pidfile="/tmp/Spamilter.pid" -required_files="${prefix}/etc/spamilter.rc" +required_files="%%PREFIX%%/etc/spamilter.rc" start_precmd="spamilter_prestart" stop_postcmd="spamilter_poststop" @@ -42,8 +40,4 @@ spamilter_poststop() { load_rc_config $name -command_args="${spamilter_flags}" - run_rc_command "$1" - -# eof diff --git a/mail/spampd/files/spampd.in b/mail/spampd/files/spampd.in index a56add6ec45f..974d78a6c44b 100644 --- a/mail/spampd/files/spampd.in +++ b/mail/spampd/files/spampd.in @@ -23,7 +23,7 @@ rcvar=`set_rcvar` load_rc_config $name command="%%PREFIX%%/sbin/$name" -command_args="${spampd_flags} --pid=${spampd_pidfile}" +command_args="--pid=${spampd_pidfile}" pidfile="${spampd_pidfile}" sig_stop="-KILL" stop_cmd="stop_cmd" diff --git a/mail/vbsfilter/files/vbsfilter.sh.in b/mail/vbsfilter/files/vbsfilter.sh.in index 72c1685f342e..5183e486cf56 100644 --- a/mail/vbsfilter/files/vbsfilter.sh.in +++ b/mail/vbsfilter/files/vbsfilter.sh.in @@ -10,8 +10,6 @@ # KEYWORD: shutdown # -prefix=%%PREFIX%% - # Define these vbsfilter_* variables in one of these files: # /etc/rc.conf # /etc/rc.conf.local @@ -21,13 +19,13 @@ prefix=%%PREFIX%% # vbsfilter_enable=${vbsfilter_enable:-"NO"} # Enable vbsfilter-milter vbsfilter_socket=${vbsfilter_socket:-"/var/run/vbsfilter"} # Path to socket -vbsfilter_flags=${vbsfilter_flags:-""} # Flags to vbsfilter +# vbsfilter_flags="" # Flags to vbsfilter . /etc/rc.subr name="vbsfilter" rcvar=`set_rcvar` -command="${prefix}/libexec/vbsfilter" +command="%%PREFIX%%/libexec/vbsfilter" procname="${command}" start_precmd="vbsfilter_prestart" stop_postcmd="vbsfilter_poststop" @@ -42,7 +40,7 @@ vbsfilter_poststop() { load_rc_config $name -command_args="-p local:${vbsfilter_socket} ${vbsfilter_flags}" +command_args="-p local:${vbsfilter_socket}" run_rc_command "$1" diff --git a/misc/upclient/files/upclient.sh.in b/misc/upclient/files/upclient.sh.in index 07de990f6193..43f005c08722 100644 --- a/misc/upclient/files/upclient.sh.in +++ b/misc/upclient/files/upclient.sh.in @@ -5,10 +5,10 @@ # PROVIDE: upclient # REQUIRE: DAEMON # -# Add the following line to /etc/rc.conf to enable upclient: +# Add the following lines to /etc/rc.conf to enable upclient: # # upclient_enable="YES" -# +# upclient_flags="<set as needed>" upclient_precmd () { @@ -30,7 +30,6 @@ upclient_precmd () } upclient_enable="${upclient_enable-NO}" -upclient_flags= . %%RC_SUBR%% diff --git a/net-im/iserverd/files/iserverd.in b/net-im/iserverd/files/iserverd.in index 22d49beaa808..3285c0e2fc62 100644 --- a/net-im/iserverd/files/iserverd.in +++ b/net-im/iserverd/files/iserverd.in @@ -10,7 +10,6 @@ # name=iserverd -prefix=%%PREFIX%% . %%RC_SUBR%% @@ -21,7 +20,7 @@ iserverd_enable=${iserverd_enable:-"NO"} iserverd_user=iserv rcvar=`set_rcvar` -command=${prefix}/bin/iserverd +command=%%PREFIX%%/bin/iserverd command_args="-o" pidfile="/var/run/iserverd/iserverd.pid" diff --git a/net-im/jabberd/files/jabberd.in b/net-im/jabberd/files/jabberd.in index 6526adc8c992..f826631078a0 100644 --- a/net-im/jabberd/files/jabberd.in +++ b/net-im/jabberd/files/jabberd.in @@ -5,8 +5,7 @@ # PROVIDE: jabberd # REQUIRE: %%REQUIRE%% # KEYWORD: shutdown -# -prefix=%%PREFIX%% + # Define these jabberd_* variables in one of these files: # /etc/rc.conf @@ -23,7 +22,7 @@ jabberd_user=${jabberd_user-"%%JABBER_USER%%"} name="jabberd" rcvar=`set_rcvar` command_interpreter="%%PERL%%" -command="${prefix}/bin/jabberd" +command="%%PREFIX%%/bin/jabberd" command_args="-b" stop_postcmd=jabberd_post_stopcmd diff --git a/net-mgmt/collectd/files/collectd.in b/net-mgmt/collectd/files/collectd.in index 0dd6c3f38847..90abfad43a4d 100644 --- a/net-mgmt/collectd/files/collectd.in +++ b/net-mgmt/collectd/files/collectd.in @@ -22,6 +22,5 @@ command=%%PREFIX%%/sbin/${name} load_rc_config $name : ${collectd_enable="NO"} -: ${collectd_flags=""} run_rc_command "$1" diff --git a/net-mgmt/collectd5/files/collectd.in b/net-mgmt/collectd5/files/collectd.in index 0dd6c3f38847..90abfad43a4d 100644 --- a/net-mgmt/collectd5/files/collectd.in +++ b/net-mgmt/collectd5/files/collectd.in @@ -22,6 +22,5 @@ command=%%PREFIX%%/sbin/${name} load_rc_config $name : ${collectd_enable="NO"} -: ${collectd_flags=""} run_rc_command "$1" diff --git a/net-mgmt/darkstat/files/darkstat.in b/net-mgmt/darkstat/files/darkstat.in index 616992b82dfc..704618f495e1 100644 --- a/net-mgmt/darkstat/files/darkstat.in +++ b/net-mgmt/darkstat/files/darkstat.in @@ -42,7 +42,6 @@ load_rc_config $name : ${darkstat_dir="/var/run/darkstat"} : ${darkstat_pidname="darkstat.pid"} : ${darkstat_dropuser="nobody"} -: ${darkstat_flags=""} pidfile="${darkstat_dir}/${darkstat_pidname}" darkstat_prestart() diff --git a/net-mgmt/flow-tools-ng/files/flow_fanout.in b/net-mgmt/flow-tools-ng/files/flow_fanout.in index 1d1369989fd9..1d9ec7ff1116 100644 --- a/net-mgmt/flow-tools-ng/files/flow_fanout.in +++ b/net-mgmt/flow-tools-ng/files/flow_fanout.in @@ -83,7 +83,6 @@ load_rc_config $name : ${flow_fanout_pid="%%FLOW_CAPTURE_PIDDIR%%/flow-fanout.pid"} : ${flow_fanout_user="flowtools"} : ${flow_fanout_group="flowtools"} -: ${flow_fanout_flags=""} pidfile="${flow_fanout_pid}.${flow_fanout_port}" diff --git a/net-mgmt/flow-tools/files/flow_fanout.in b/net-mgmt/flow-tools/files/flow_fanout.in index 1d1369989fd9..1d9ec7ff1116 100644 --- a/net-mgmt/flow-tools/files/flow_fanout.in +++ b/net-mgmt/flow-tools/files/flow_fanout.in @@ -83,7 +83,6 @@ load_rc_config $name : ${flow_fanout_pid="%%FLOW_CAPTURE_PIDDIR%%/flow-fanout.pid"} : ${flow_fanout_user="flowtools"} : ${flow_fanout_group="flowtools"} -: ${flow_fanout_flags=""} pidfile="${flow_fanout_pid}.${flow_fanout_port}" diff --git a/net-mgmt/ipacctd/files/ipacctd.sh.in b/net-mgmt/ipacctd/files/ipacctd.sh.in index 09ab801da009..e48a21cc7075 100644 --- a/net-mgmt/ipacctd/files/ipacctd.sh.in +++ b/net-mgmt/ipacctd/files/ipacctd.sh.in @@ -113,7 +113,5 @@ status_cmd() load_rc_config $name : ${ipacctd_enable="NO"} -: ${ipacctd_rules=""} -: ${ipacctd_flags=""} run_rc_command "$1" diff --git a/net-mgmt/ipcad/files/ipcad.in b/net-mgmt/ipcad/files/ipcad.in index 0e459f0ca7f3..6285dfd85881 100644 --- a/net-mgmt/ipcad/files/ipcad.in +++ b/net-mgmt/ipcad/files/ipcad.in @@ -11,7 +11,7 @@ # Default is "NO". # ipcad_conf (file): Set local of config file. # Default is "%%PREFIX%%/etc/ipcad.conf". -# +# ipcad_flags="<set as needed>" . %%RC_SUBR%% @@ -22,7 +22,6 @@ load_rc_config ${name} : ${ipcad_enable="NO"} : ${ipcad_conf="%%PREFIX%%/etc/ipcad.conf"} -: ${ipcad_flags=""} required_files="${ipcad_conf}" command=%%PREFIX%%/bin/ipcad diff --git a/net-mgmt/macroscope/files/macroscope.in b/net-mgmt/macroscope/files/macroscope.in index ffb0f9879b16..82f0f66c56f7 100644 --- a/net-mgmt/macroscope/files/macroscope.in +++ b/net-mgmt/macroscope/files/macroscope.in @@ -20,8 +20,6 @@ name="macroscope" rcvar=$(set_rcvar) -prefix="%%PREFIX%%" - start_precmd() { return 0 diff --git a/net-mgmt/nagios-devel/files/nagios.sh.in b/net-mgmt/nagios-devel/files/nagios.sh.in index 52232e296618..719db899652a 100644 --- a/net-mgmt/nagios-devel/files/nagios.sh.in +++ b/net-mgmt/nagios-devel/files/nagios.sh.in @@ -34,7 +34,6 @@ reload_precmd="nagios_checkconfig" sig_reload=HUP [ -z "${nagios_enable}" ] && nagios_enable="NO" -[ -z "${nagios_flags}" ] && nagios_flags="" [ -z "${nagios_configfile}" ] && nagios_configfile="%%PREFIX%%/etc/nagios/nagios.cfg" load_rc_config "${name}" diff --git a/net-mgmt/nagios/files/nagios.in b/net-mgmt/nagios/files/nagios.in index e1afec9ced54..33356a0ee3fa 100644 --- a/net-mgmt/nagios/files/nagios.in +++ b/net-mgmt/nagios/files/nagios.in @@ -34,7 +34,6 @@ reload_precmd="nagios_checkconfig" sig_reload=HUP [ -z "${nagios_enable}" ] && nagios_enable="NO" -[ -z "${nagios_flags}" ] && nagios_flags="" [ -z "${nagios_configfile}" ] && nagios_configfile="%%PREFIX%%/etc/nagios/nagios.cfg" load_rc_config "${name}" diff --git a/net-mgmt/nagios2/files/nagios.in b/net-mgmt/nagios2/files/nagios.in index 05939dd03523..fc7176bc030a 100644 --- a/net-mgmt/nagios2/files/nagios.in +++ b/net-mgmt/nagios2/files/nagios.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/net-mgmt/nagios2/files/Attic/nagios.in,v 1.1 2008-09-03 00:30:56 pgollucci Exp $ +# $FreeBSD: /tmp/pcvs/ports/net-mgmt/nagios2/files/Attic/nagios.in,v 1.2 2009-07-15 16:55:58 dougb Exp $ # # PROVIDE: nagios @@ -34,7 +34,6 @@ reload_precmd="nagios_checkconfig" sig_reload=HUP [ -z "${nagios_enable}" ] && nagios_enable="NO" -[ -z "${nagios_flags}" ] && nagios_flags="" [ -z "${nagios_configfile}" ] && nagios_configfile="%%PREFIX%%/etc/nagios/nagios.cfg" load_rc_config "${name}" diff --git a/net-mgmt/nagircbot/files/nagircbot.in b/net-mgmt/nagircbot/files/nagircbot.in index 940d69b0e383..0590d93d34b7 100644 --- a/net-mgmt/nagircbot/files/nagircbot.in +++ b/net-mgmt/nagircbot/files/nagircbot.in @@ -9,6 +9,7 @@ # Add the following lines to /etc/rc.conf to enable nagircbot: # # nagircbot_enable="YES" +# nagircbot_flags="<set as needed>" # # You must configure at least some flags to make it connect to a server. See -h. # @@ -25,7 +26,6 @@ command_args="-P $pidfile -z nagios" # set defaults nagircbot_enable=${nagircbot_enable:-"NO"} -nagircbot_flags=${nagircbot_flags:-""} load_rc_config ${name} run_rc_command "$1" diff --git a/net-mgmt/net-snmp-devel/files/snmpd.sh.in b/net-mgmt/net-snmp-devel/files/snmpd.sh.in index 0af14f41a7b0..6c17673ec5fe 100644 --- a/net-mgmt/net-snmp-devel/files/snmpd.sh.in +++ b/net-mgmt/net-snmp-devel/files/snmpd.sh.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/net-mgmt/net-snmp-devel/files/Attic/snmpd.sh.in,v 1.7 2007-10-27 07:20:34 kuriyama Exp $ +# $FreeBSD: /tmp/pcvs/ports/net-mgmt/net-snmp-devel/files/Attic/snmpd.sh.in,v 1.8 2009-07-15 16:55:58 dougb Exp $ # # PROVIDE: snmpd # REQUIRE: DAEMON @@ -8,10 +8,10 @@ # Add the following line to /etc/rc.conf to enable snmpd: # # snmpd_enable="YES" +# snmpd_flags="<set as needed>" # snmpd_enable=${snmpd_enable-"NO"} -snmpd_flags=${snmpd_flags-""} snmpd_pidfile=${snmpd_pidfile-"/var/run/snmpd.pid"} snmpd_conffile=${snmpd_conffile-""} snmpd_flush_cache=${snmpd_flush_cache-"NO"} diff --git a/net-mgmt/net-snmp/files/snmpd.sh.in b/net-mgmt/net-snmp/files/snmpd.sh.in index 9b7403fff268..8c72326f3e60 100644 --- a/net-mgmt/net-snmp/files/snmpd.sh.in +++ b/net-mgmt/net-snmp/files/snmpd.sh.in @@ -8,10 +8,10 @@ # Add the following line to /etc/rc.conf to enable snmpd: # # snmpd_enable="YES" +# snmpd_flags="<set as needed>" # snmpd_enable=${snmpd_enable-"NO"} -snmpd_flags=${snmpd_flags-""} snmpd_pidfile=${snmpd_pidfile-"/var/run/snmpd.pid"} snmpd_conffile=${snmpd_conffile-""} snmpd_flush_cache=${snmpd_flush_cache-"NO"} diff --git a/net-mgmt/ng_ipacct/files/ng_ipacct.sh.in b/net-mgmt/ng_ipacct/files/ng_ipacct.sh.in index 9683fcd976c0..585a985d3b9d 100644 --- a/net-mgmt/ng_ipacct/files/ng_ipacct.sh.in +++ b/net-mgmt/ng_ipacct/files/ng_ipacct.sh.in @@ -18,7 +18,8 @@ # # Add the following line to enable `ng_ipacct': # -#ng_ipacct_enable="YES" +# ng_ipacct_enable="YES" +# ng_ipacct_flags="<set as needed>" # # See %%PREFIX%%/etc/ng_ipacct.conf for futher reference. @@ -189,6 +190,5 @@ fi load_rc_config $name : ${ng_ipacct_enable="NO"} -: ${ng_ipacct_flags=""} run_rc_command "$1" diff --git a/net-mgmt/nrpe2/files/nrpe2.in b/net-mgmt/nrpe2/files/nrpe2.in index 8cde7252158b..ba500160fe10 100644 --- a/net-mgmt/nrpe2/files/nrpe2.in +++ b/net-mgmt/nrpe2/files/nrpe2.in @@ -28,7 +28,6 @@ extra_commands="reload" sig_reload=HUP [ -z "${nrpe2_enable}" ] && nrpe2_enable="NO" -[ -z "${nrpe2_flags}" ] && nrpe2_flags="" [ -z "${nrpe2_configfile}" ] && nrpe2_configfile="%%PREFIX%%/etc/nrpe.cfg" [ -z "${nrpe2_pidfile}" ] && nrpe2_pidfile="%%NAGIOSDIR%%/nrpe2.pid" diff --git a/net-mgmt/openlldp/files/lldpd.in b/net-mgmt/openlldp/files/lldpd.in index 3c003a699300..81320ebe5e2b 100644 --- a/net-mgmt/openlldp/files/lldpd.in +++ b/net-mgmt/openlldp/files/lldpd.in @@ -27,7 +27,6 @@ command_args=">/dev/null 2>/dev/null &" # set defaults lldpd_enable=${lldpd_enable:-"NO"} -lldpd_flags=${lldpd_flags:-""} load_rc_config $name run_rc_command "$1" diff --git a/net-mgmt/openvmps/files/vmpsd.sh b/net-mgmt/openvmps/files/vmpsd.sh index 131bcd845d28..d11753110e01 100644 --- a/net-mgmt/openvmps/files/vmpsd.sh +++ b/net-mgmt/openvmps/files/vmpsd.sh @@ -6,12 +6,6 @@ # PROVIDE: vmpsd # REQUIRE: DAEMON # KEYWORD: shutdown -# -# NOTE for FreeBSD 5.0+: -# If you want this script to start with the base rc scripts -# move imapd.sh to /etc/rc.d/vmpsd - -prefix=%%PREFIX%% # Define these vmpsd_* variables in one of these files: # /etc/rc.conf @@ -21,14 +15,14 @@ prefix=%%PREFIX%% # DO NOT CHANGE THESE DEFAULT VALUES HERE # [ -z "$vmpsd_enable" ] && vmpsd_enable="NO" # Enable vmpsd -#vmpsd_program="${prefix}/sbin/vmpsd" # Location of vmpsd +#vmpsd_program="%%PREFIX%%/sbin/vmpsd" # Location of vmpsd [ -z "$vmpsd_flags" ] && vmpsd_flags="-f /usr/local/etc/vmps.db" # Flags to vmpsd program . %%RC_SUBR%% name="vmpsd" rcvar=`set_rcvar` -command="${prefix}/sbin/${name}" +command="%%PREFIX%%/sbin/${name}" load_rc_config $name run_rc_command "$1" diff --git a/net-mgmt/pnp/files/npcd.sh.in b/net-mgmt/pnp/files/npcd.sh.in index 94369f3b572f..f58cda03e4de 100644 --- a/net-mgmt/pnp/files/npcd.sh.in +++ b/net-mgmt/pnp/files/npcd.sh.in @@ -26,7 +26,6 @@ command_args="-d" pidfile=/var/run/${name}.pid : ${npcd_enable="NO"} -: ${npcd_flags=""} : ${npcd_configfile:="%%PREFIX%%/etc/pnp/npcd.cfg"} load_rc_config "${name}" diff --git a/net-mgmt/rrdbot/files/rrdbot.in b/net-mgmt/rrdbot/files/rrdbot.in index 07e586852360..8562d7d4f25b 100644 --- a/net-mgmt/rrdbot/files/rrdbot.in +++ b/net-mgmt/rrdbot/files/rrdbot.in @@ -26,11 +26,10 @@ load_rc_config $name : ${rrdbot_enable="NO"} : ${rrdbot_pidfile="/var/run/rrdbotd.pid"} -: ${rrdbot_flags=""} pidfile="${rrdbot_pidfile}" command="%%PREFIX%%/sbin/rrdbotd" -command_args="-p ${rrdbot_pidfile} ${rrdbot_flags}" +command_args="-p ${rrdbot_pidfile}" run_rc_command "$1" diff --git a/net-mgmt/smokeping/files/smokeping.in b/net-mgmt/smokeping/files/smokeping.in index d0691abe442e..a6504a5ddd8d 100644 --- a/net-mgmt/smokeping/files/smokeping.in +++ b/net-mgmt/smokeping/files/smokeping.in @@ -12,8 +12,9 @@ # # DO NOT CHANGE THESE DEFAULT VALUES HERE # +# smokeping_flags="<set as needed>" + smokeping_enable=${smokeping_enable-"NO"} -smokeping_flags=${smokeping_flags-""} smokeping_pidfile=${smokeping_pidfile-"%%PREFIX%%/var/smokeping/smokeping.pid"} smokeping_logfile=${smokeping_logfile-"/var/log/smokeping.log"} smokeping_user=${smokeping_user-"%%USER%%"} diff --git a/net-mgmt/snmptt/files/snmptt.sh.in b/net-mgmt/snmptt/files/snmptt.sh.in index 45596202bba5..d34b6dee0d5e 100644 --- a/net-mgmt/snmptt/files/snmptt.sh.in +++ b/net-mgmt/snmptt/files/snmptt.sh.in @@ -9,7 +9,8 @@ # # Add the following lines to /etc/rc.conf to enable snmptt: # -#snmptt_enable="YES" +# snmptt_enable="YES" +# snmptt_flags="<set as needed>" # # See snmptt documentation for flags. # @@ -31,7 +32,6 @@ required_files=%%PREFIX%%/etc/snmp/${name}.ini # set defaults snmptt_enable=${snmptt_enable:-"NO"} -snmptt_flags=${snmptt_flags:-""} stop_postcmd=stop_postcmd diff --git a/net-p2p/bnbt/files/bnbt.sh.in b/net-p2p/bnbt/files/bnbt.sh.in index 250c9202fdcd..6ece8d189e51 100644 --- a/net-p2p/bnbt/files/bnbt.sh.in +++ b/net-p2p/bnbt/files/bnbt.sh.in @@ -10,7 +10,8 @@ # Add the following line to /etc/rc.conf to enable `bnbt': # -#bnbt_enable="YES" +# bnbt_enable="YES" +# bnbt_flags="<set as needed>" # # See bnbt(1) for bnbt_flags # @@ -33,6 +34,5 @@ required_dirs="/var/log/$name" # read settings, set default values load_rc_config "$name" : ${bnbt_enable="NO"} -: ${bnbt_flags=""} run_rc_command "$1" diff --git a/net-p2p/gift/files/giftd.sh b/net-p2p/gift/files/giftd.sh index f83a7a7dede8..dd5d98f1c844 100644 --- a/net-p2p/gift/files/giftd.sh +++ b/net-p2p/gift/files/giftd.sh @@ -16,8 +16,8 @@ giftd_enable="${giftd_enable-NO}" giftd_flags="-d -q" -giftd_user="" -giftd_local_dir="" +# giftd_user="" +# giftd_local_dir="" . "%%RC_SUBR%%" diff --git a/net-p2p/mldonkey/files/mlnet.in b/net-p2p/mldonkey/files/mlnet.in index 7a11c52e343f..513a84eecfd0 100644 --- a/net-p2p/mldonkey/files/mlnet.in +++ b/net-p2p/mldonkey/files/mlnet.in @@ -27,8 +27,6 @@ procname="%%PREFIX%%/bin/${name}-real" load_rc_config "${name}" : ${mlnet_enable="NO"} : ${mlnet_user="$(whoami)"} -: ${mlnet_flags=""} -: ${mlnet_logfile=""} pidfile="$(eval echo ~${mlnet_user}/.mldonkey/$(basename ${procname}).pid)" required_dirs="$(eval echo ~${mlnet_user})" diff --git a/net/cnupm/files/cnupm.sh.in b/net/cnupm/files/cnupm.sh.in index 13072497faf2..09a188606f65 100644 --- a/net/cnupm/files/cnupm.sh.in +++ b/net/cnupm/files/cnupm.sh.in @@ -8,7 +8,7 @@ # # cnupm_enable="YES" # cnupm_ifaces="rl0" # Change this with your interface! -# cnupm_flags="" # Set this one to override default flags +# cnupm_flags="" # Set this one to override default flags # # See cnupm(8) for flags # diff --git a/net/dhcp6/files/dhcp6c.sh.in b/net/dhcp6/files/dhcp6c.sh.in index a37fc52c3363..ce786553db40 100644 --- a/net/dhcp6/files/dhcp6c.sh.in +++ b/net/dhcp6/files/dhcp6c.sh.in @@ -28,14 +28,13 @@ name="dhcp6c" rcvar=${name}_enable -prefix="%%PREFIX%%" -command="${prefix}/sbin/${name}" +command="%%PREFIX%%/sbin/${name}" start_precmd="${name}_precmd" load_rc_config $name : ${dhcp6c_enable="NO"} -: ${dhcp6c_config="${prefix}/etc/${name}.conf"} +: ${dhcp6c_config="%%PREFIX%%/etc/${name}.conf"} : ${dhcp6c_pidfile="/var/run/${name}.pid"} required_files="${dhcp6c_config}" diff --git a/net/dhcp6/files/dhcp6relay.sh.in b/net/dhcp6/files/dhcp6relay.sh.in index f548ac28367c..3dff743fb82d 100644 --- a/net/dhcp6/files/dhcp6relay.sh.in +++ b/net/dhcp6/files/dhcp6relay.sh.in @@ -25,8 +25,7 @@ name="dhcp6relay" rcvar=${name}_enable -prefix=%%PREFIX%% -command=${prefix}/sbin/${name} +command=%%PREFIX%%/sbin/${name} start_precmd="${name}_precmd" load_rc_config $name diff --git a/net/dhcp6/files/dhcp6s.sh.in b/net/dhcp6/files/dhcp6s.sh.in index f31a405d8651..da1bb167fa5e 100644 --- a/net/dhcp6/files/dhcp6s.sh.in +++ b/net/dhcp6/files/dhcp6s.sh.in @@ -26,14 +26,13 @@ name="dhcp6s" rcvar=${name}_enable -prefix=%%PREFIX%% -command=${prefix}/sbin/${name} +command=%%PREFIX%%/sbin/${name} start_precmd="${name}_precmd" load_rc_config $name : ${dhcp6s_enable="NO"} -: ${dhcp6s_config="${prefix}/etc/${name}.conf"} +: ${dhcp6s_config="%%PREFIX%%/etc/${name}.conf"} required_files=${dhcp6s_config} command_args="-c ${dhcp6s_config} ${dhcp6s_flags} ${dhcp6s_interface}" diff --git a/net/dtcp/files/dtcpc.sh.in b/net/dtcp/files/dtcpc.sh.in index ac4ad6ab6a58..512f2c575519 100644 --- a/net/dtcp/files/dtcpc.sh.in +++ b/net/dtcp/files/dtcpc.sh.in @@ -7,12 +7,6 @@ # REQUIRE: DAEMON # BEFORE: LOGIN # KEYWORD: shutdown -# -# NOTE for FreeBSD 5.0+: -# If you want this script to start with the base rc scripts -# move dtcpc.sh to /etc/rc.d/dtcpc - -prefix=%%PREFIX%% # Define these dtcpc_* variables in one of these files: # /etc/rc.conf @@ -22,7 +16,7 @@ prefix=%%PREFIX%% # DO NOT CHANGE THESE DEFAULT VALUES HERE # dtcpc_enable=${dtcpc_enable:-"NO"} # Enable dtcpc -#dtcpc_program="${prefix}/sbin/dtcpc" # Location of dtcpc +#dtcpc_program="%%PREFIX%%/sbin/dtcpc" # Location of dtcpc dtcpc_server=${dtcpc_server:-""} # DTCP server name dtcpc_username=${dtcpc_username:-""} # DTCP user name dtcpc_flags=${dtcpc_flags:-"-t network -Dl"} # Flags to dtcpc program @@ -31,7 +25,7 @@ dtcpc_flags=${dtcpc_flags:-"-t network -Dl"} # Flags to dtcpc program name="dtcpc" rcvar=`set_rcvar` -command="${prefix}/sbin/${name}" +command="%%PREFIX%%/sbin/${name}" command_interpreter="%%RUBY%%" pidfile="/var/run/${name}.pid" extra_commands="reload" diff --git a/net/dtcp/files/dtcps.sh.in b/net/dtcp/files/dtcps.sh.in index f6bb60d651cf..cb92f3476c20 100644 --- a/net/dtcp/files/dtcps.sh.in +++ b/net/dtcp/files/dtcps.sh.in @@ -7,12 +7,6 @@ # REQUIRE: DAEMON # BEFORE: LOGIN # KEYWORD: shutdown -# -# NOTE for FreeBSD 5.0+: -# If you want this script to start with the base rc scripts -# move dtcps.sh to /etc/rc.d/dtcps - -prefix=%%PREFIX%% # Define these dtcps_* variables in one of these files: # /etc/rc.conf @@ -22,10 +16,10 @@ prefix=%%PREFIX%% # DO NOT CHANGE THESE DEFAULT VALUES HERE # dtcps_enable=${dtcps_enable:-"NO"} # Enable dtcps -#dtcps_program="${prefix}/sbin/dtcps" # Location of dtcps -dtcps_tunif=${dtcps_tunif:-""} # tunnel interface -dtcps_prefix=${dtcps_prefix:-""} # prefix for host tunnel type -dtcps_flags=${dtcps_flags:-""} # Flags to dtcps program +# dtcps_program="%%PREFIX%%/sbin/dtcps" # Location of dtcps +# dtcps_tunif=${dtcps_tunif:-""} # tunnel interface +# dtcps_prefix=${dtcps_prefix:-""} # prefix for host tunnel type +# dtcps_flags=${dtcps_flags:-""} # Flags to dtcps program # interface cloning example #dtcps_tunif='gif70' @@ -43,7 +37,7 @@ dtcps_flags=${dtcps_flags:-""} # Flags to dtcps program name="dtcps" rcvar=`set_rcvar` -command="${prefix}/sbin/${name}" +command="%%PREFIX%%/sbin/${name}" command_interpreter="%%RUBY%%" pidfile="/var/run/${name}.pid" start_precmd="dtcps_prestart" diff --git a/net/dtcpclient/files/dtcpclient.sh.in b/net/dtcpclient/files/dtcpclient.sh.in index 156923be85a1..1b90df11c581 100644 --- a/net/dtcpclient/files/dtcpclient.sh.in +++ b/net/dtcpclient/files/dtcpclient.sh.in @@ -7,12 +7,6 @@ # REQUIRE: DAEMON # BEFORE: LOGIN # KEYWORD: shutdown -# -# NOTE for FreeBSD 5.0+: -# If you want this script to start with the base rc scripts -# move dtcpclient.sh to /etc/rc.d/dtcpclient - -prefix=%%PREFIX%% # Define these dtcpclient_* variables in one of these files: # /etc/rc.conf @@ -22,7 +16,7 @@ prefix=%%PREFIX%% # DO NOT CHANGE THESE DEFAULT VALUES HERE # dtcpclient_enable=${dtcpclient_enable:-"NO"} # Enable dtcpclient -#dtcpclient_program="${prefix}/sbin/dtcpclient" # Location of dtcpclient +#dtcpclient_program="%%PREFIX%%/sbin/dtcpclient" # Location of dtcpclient dtcpclient_server=${dtcpclient_server:-""} # DTCP server name dtcpclient_username=${dtcpclient_username:-""} # DTCP user name dtcpclient_flags=${dtcpclient_flags:-"-t network -Dl"} # Flags to dtcpclient program @@ -31,7 +25,7 @@ dtcpclient_flags=${dtcpclient_flags:-"-t network -Dl"} # Flags to dtcpclient pro name="dtcpclient" rcvar=`set_rcvar` -command="${prefix}/sbin/${name}" +command="%%PREFIX%%/sbin/${name}" pidfile="/var/run/${name}.pid" extra_commands="reload" diff --git a/net/gateway6/files/gateway6.sh.in b/net/gateway6/files/gateway6.sh.in index eb442d707211..2f3c53bcd5f1 100644 --- a/net/gateway6/files/gateway6.sh.in +++ b/net/gateway6/files/gateway6.sh.in @@ -29,6 +29,5 @@ required_files=%%PREFIX%%/etc/gw6c.conf load_rc_config $name : ${gateway6_enable="NO"} -: ${gateway6_flags=""} run_rc_command "$1" diff --git a/net/isc-dhcp30-server/files/isc-dhcrelay.in b/net/isc-dhcp30-server/files/isc-dhcrelay.in index db10841ff32a..a98176731662 100644 --- a/net/isc-dhcp30-server/files/isc-dhcrelay.in +++ b/net/isc-dhcp30-server/files/isc-dhcrelay.in @@ -12,9 +12,9 @@ # override these variables in /etc/rc.conf dhcrelay_enable=${dhcrelay_enable:-"NO"} -dhcrelay_flags=${dhcrelay_flags:-} # command option(s) -dhcrelay_servers=${dhcrelay_servers:-} # dhcrelay server(s) -dhcrelay_ifaces=${dhcrelay_ifaces:-} # ethernet interface(s) +# dhcrelay_flags=${dhcrelay_flags:-} # command option(s) +# dhcrelay_servers=${dhcrelay_servers:-} # dhcrelay server(s) +# dhcrelay_ifaces=${dhcrelay_ifaces:-} # ethernet interface(s) dhcrelay_precmd () { diff --git a/net/isc-dhcp31-server/files/isc-dhcpd.in b/net/isc-dhcp31-server/files/isc-dhcpd.in index c1e482945ad2..b07255550367 100644 --- a/net/isc-dhcp31-server/files/isc-dhcpd.in +++ b/net/isc-dhcp31-server/files/isc-dhcpd.in @@ -22,9 +22,9 @@ load_rc_config ${name} # override these variables in /etc/rc.conf dhcpd_enable=${dhcpd_enable:-"NO"} -dhcpd_flags=${dhcpd_flags:-} # -q -early_chroot # command option(s) +# dhcpd_flags="" # -q -early_chroot # command option(s) +# dhcpd_ifaces="" # ethernet interface(s) dhcpd_conf=${dhcpd_conf:-%%PREFIX%%/etc/${name}.conf} # configuration file -dhcpd_ifaces=${dhcpd_ifaces:-} # ethernet interface(s) dhcpd_withumask=${dhcpd_withumask:-022} # file creation mask dhcpd_chuser_enable=${dhcpd_chuser_enable:-"%%PARANOIA%%"} # runs w/o privileges? @@ -35,12 +35,12 @@ dhcpd_chroot_enable=${dhcpd_chroot_enable:-"NO"} # runs chrooted? dhcpd_devfs_enable=${dhcpd_devfs_enable:-"YES"} # devfs if available? dhcpd_makedev_enable=${dhcpd_makedev_enable:-"NO"} # MAKEDEV instead of devfs? dhcpd_rootdir=${dhcpd_rootdir:-/var/db/${name}} # directory to run in -dhcpd_includedir=${dhcpd_includedir:-} # directory for included config files +# dhcpd_includedir="" # directory for included config files # untested dhcpd_jail_enable=${dhcpd_jail_enable:-"NO"} # runs imprisoned? -dhcpd_hostname=${dhcpd_hostname:-} # jail hostname -dhcpd_ipaddress=${dhcpd_ipaddress:-} # jail ip address +# dhcpd_hostname="" # jail hostname +# dhcpd_ipaddress="" # jail ip address safe_run () # rc command [args...] { diff --git a/net/isc-dhcp31-server/files/isc-dhcrelay.in b/net/isc-dhcp31-server/files/isc-dhcrelay.in index db10841ff32a..7e51d989c79e 100644 --- a/net/isc-dhcp31-server/files/isc-dhcrelay.in +++ b/net/isc-dhcp31-server/files/isc-dhcrelay.in @@ -12,9 +12,9 @@ # override these variables in /etc/rc.conf dhcrelay_enable=${dhcrelay_enable:-"NO"} -dhcrelay_flags=${dhcrelay_flags:-} # command option(s) -dhcrelay_servers=${dhcrelay_servers:-} # dhcrelay server(s) -dhcrelay_ifaces=${dhcrelay_ifaces:-} # ethernet interface(s) +# dhcrelay_flags="" # command option(s) +# dhcrelay_servers="" # dhcrelay server(s) +# dhcrelay_ifaces="" # ethernet interface(s) dhcrelay_precmd () { diff --git a/net/mediatomb/files/mediatomb.sh.in b/net/mediatomb/files/mediatomb.sh.in index 1ee812143875..66c4d2bac39f 100644 --- a/net/mediatomb/files/mediatomb.sh.in +++ b/net/mediatomb/files/mediatomb.sh.in @@ -16,13 +16,13 @@ . %%RC_SUBR%% mediatomb_enable=${mediatomb_enable-"NO"} +# mediatomb_flags="<set as needed>" +# mediatomb_interface="<set as needed>" mediatomb_mtuser=${mediatomb_mtuser-"%%MEDIATOMB_USER%%"} mediatomb_mtgroup=${mediatomb_mtgroup-"%%MEDIATOMB_GROUP%%"} mediatomb_config=${mediatomb_config-"%%PREFIX%%/etc/mediatomb/config.xml"} -mediatomb_flags=${mediatomb_flags-""} mediatomb_logfile=${mediatomb_logfile-"%%MEDIATOMB_DIR%%/mediatomb.log"} mediatomb_pidfile=${mediatomb_pidfile-"%%MEDIATOMB_DIR%%/mediatomb.pid"} -mediatomb_interface=${mediatomb_interface-""} name="mediatomb" rcvar=`set_rcvar` diff --git a/net/miniupnpd/files/miniupnpd.sh.in b/net/miniupnpd/files/miniupnpd.sh.in index 8d5905528523..e2357ecddc32 100644 --- a/net/miniupnpd/files/miniupnpd.sh.in +++ b/net/miniupnpd/files/miniupnpd.sh.in @@ -8,14 +8,17 @@ . %%RC_SUBR%% -miniupnpd_enable=${miniupnpd_enable:-"NO"} -miniupnpd_config=${miniupnpd_config:-"%%PREFIX%%/etc/miniupnpd.conf"} -miniupnpd_flags=${miniupnpd_flags} +# Add the following line to /etc/rc.conf to enable miniupnpd +# miniupnpd_enable="YES" +# miniupnpd_flags="<set as needed>" name=miniupnpd rcvar=`set_rcvar` load_rc_config $name +miniupnpd_enable=${miniupnpd_enable:-"NO"} +miniupnpd_config=${miniupnpd_config:-"%%PREFIX%%/etc/miniupnpd.conf"} + command="%%PREFIX%%/sbin/miniupnpd" pidfile="/var/run/${name}.pid" command_args="-f $miniupnpd_config" diff --git a/net/mpd/files/mpd.in b/net/mpd/files/mpd.in index 2168bb71edda..dfebc3e3b2a5 100644 --- a/net/mpd/files/mpd.in +++ b/net/mpd/files/mpd.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/net/mpd/files/Attic/mpd.in,v 1.1 2007-01-10 06:47:24 vd Exp $ +# $FreeBSD: /tmp/pcvs/ports/net/mpd/files/Attic/mpd.in,v 1.2 2009-07-15 16:55:51 dougb Exp $ # # PROVIDE: mpd # REQUIRE: NETWORKING syslogd @@ -20,11 +20,10 @@ mpd_enable="${mpd_enable:-NO}" name=mpd rcvar=`set_rcvar` -prefix=%%PREFIX%% -procname=${prefix}/sbin/mpd +procname=%%PREFIX%%/sbin/mpd pidfile=/var/run/mpd.pid -required_files="${prefix}/etc/mpd/mpd.conf ${prefix}/etc/mpd/mpd.links" -command="${prefix}/sbin/mpd" +required_files="%%PREFIX%%/etc/mpd/mpd.conf %%PREFIX%%/etc/mpd/mpd.links" +command="%%PREFIX%%/sbin/mpd" load_rc_config ${name} run_rc_command "$1" diff --git a/net/openbgpd/files/openbgpd.sh.in b/net/openbgpd/files/openbgpd.sh.in index 51e889b666e4..559b3a1ec2ba 100644 --- a/net/openbgpd/files/openbgpd.sh.in +++ b/net/openbgpd/files/openbgpd.sh.in @@ -8,12 +8,12 @@ # BEFORE: securelevel # KEYWORD: shutdown -# Add the following line to /etc/rc.conf to enable `openbgpd': +# Add the following lines to /etc/rc.conf to enable openbgpd: # # openbgpd_enable="YES" +# openbgpd_flags="<set as needed>" # # See bgpd(8) for openbgpd_flags -# . "%%RC_SUBR%%" @@ -26,6 +26,5 @@ required_files="%%PREFIX%%/etc/bgpd.conf" load_rc_config "$name" : ${openbgpd_enable="NO"} -: ${openbgpd_flags=""} run_rc_command "$1" diff --git a/net/openldap23-server/files/slapd.sh.in b/net/openldap23-server/files/slapd.sh.in index 341fcaee28d9..b101074ba5d9 100644 --- a/net/openldap23-server/files/slapd.sh.in +++ b/net/openldap23-server/files/slapd.sh.in @@ -97,11 +97,8 @@ load_rc_config $name if [ -n "${slapd_args+set}" ]; then warn "slapd_args is deprecated, use slapd_flags" : ${slapd_flags="$slapd_args"} -else - : ${slapd_flags=""} fi : ${slapd_owner="ldap:ldap"} -: ${slapd_sockets=""} : ${slapd_sockets_mode="666"} run_rc_command "$1" diff --git a/net/openldap23-server/files/slurpd.sh.in b/net/openldap23-server/files/slurpd.sh.in index ea5e5b0642b6..08d87e6d08ee 100644 --- a/net/openldap23-server/files/slurpd.sh.in +++ b/net/openldap23-server/files/slurpd.sh.in @@ -10,7 +10,8 @@ # Add the following line to /etc/rc.conf to enable slurpd: # -#slurpd_enable="YES" +# slurpd_enable="YES" +# slurpd_flags="<set as needed>" # # See slurpd(8) for more flags # @@ -29,8 +30,6 @@ load_rc_config $name if [ -n "${slurpd_args+set}" ]; then warn "slurpd_args is deprecated, use slurpd_flags" : ${slurpd_flags="$slurpd_args"} -else - : ${slurpd_flags=""} fi run_rc_command "$1" diff --git a/net/openldap24-server/files/slapd.sh.in b/net/openldap24-server/files/slapd.sh.in index 1af8eee71a5f..841fae65cd1e 100644 --- a/net/openldap24-server/files/slapd.sh.in +++ b/net/openldap24-server/files/slapd.sh.in @@ -106,11 +106,8 @@ load_rc_config $name if [ -n "${slapd_args+set}" ]; then warn "slapd_args is deprecated, use slapd_flags" : ${slapd_flags="$slapd_args"} -else - : ${slapd_flags=""} fi : ${slapd_owner="ldap:ldap"} -: ${slapd_sockets=""} : ${slapd_sockets_mode="666"} run_rc_command "$1" diff --git a/net/openospfd/files/openospfd.sh.in b/net/openospfd/files/openospfd.sh.in index b9a7c2606865..473e4bcede56 100644 --- a/net/openospfd/files/openospfd.sh.in +++ b/net/openospfd/files/openospfd.sh.in @@ -8,12 +8,12 @@ # BEFORE: securelevel # KEYWORD: shutdown -# Add the following line to /etc/rc.conf to enable `openospfd': +# Add the following lines to /etc/rc.conf to enable openospfd: # # openospfd_enable="YES" +# openospfd_flags="<set as needed>" # # See ospfd(8) for openospfd_flags -# . "%%RC_SUBR%%" @@ -26,6 +26,5 @@ required_files="%%PREFIX%%/etc/ospfd.conf" load_rc_config "$name" : ${openospfd_enable="NO"} -: ${openospfd_flags=""} run_rc_command "$1" diff --git a/net/pen/files/pen.sh.in b/net/pen/files/pen.sh.in index f99fc50be72d..6478f97f53e1 100644 --- a/net/pen/files/pen.sh.in +++ b/net/pen/files/pen.sh.in @@ -9,10 +9,10 @@ # KEYWORD: shutdown # -# Add the following line to /etc/rc.conf to enable pen: +# Add the following lines to /etc/rc.conf to enable pen: # # pen_enable="YES" -# +# pen_flags="<set as needed>" . %%RC_SUBR%% @@ -22,7 +22,6 @@ rcvar=`set_rcvar` command=%%PREFIX%%/bin/pen pen_enable=${pen_enable:-"NO"} -pen_flags=${pen_flags:-""} load_rc_config $name run_rc_command "$1" diff --git a/net/poptop/files/pptpd.sh.in b/net/poptop/files/pptpd.sh.in index 6e108878f335..c9ac5ad63b54 100644 --- a/net/poptop/files/pptpd.sh.in +++ b/net/poptop/files/pptpd.sh.in @@ -5,13 +5,12 @@ # PROVIDE: pptpd # REQUIRE: DAEMON # -# Add the following line to /etc/rc.conf to enable pptpd: +# Add the following lines to /etc/rc.conf to enable pptpd: # # pptpd_enable="YES" -# +# pptpd_flags="<set as needed>" pptpd_enable=${pptpd_enable-"NO"} -pptpd_flags=${pptpd_flags-""} . %%RC_SUBR%% diff --git a/net/quagga/files/watchquagga.sh.in b/net/quagga/files/watchquagga.sh.in index be31f48c1f70..b5a53f492ca3 100644 --- a/net/quagga/files/watchquagga.sh.in +++ b/net/quagga/files/watchquagga.sh.in @@ -31,7 +31,6 @@ stop_postcmd() load_rc_config $name : ${watchquagga_enable="NO"} -: ${watchquagga_flags=""} command=%%PREFIX%%/sbin/watchquagga pidfile=%%LOCALSTATE_DIR%%/watchquagga.pid diff --git a/net/radvd/files/radvd.in b/net/radvd/files/radvd.in index f96b27627744..288cd92275f1 100644 --- a/net/radvd/files/radvd.in +++ b/net/radvd/files/radvd.in @@ -13,11 +13,11 @@ name=radvd rcvar=`set_rcvar` -prefix=%%PREFIX%% + pidfile=/var/run/${name}.pid -command="${prefix}/sbin/${name}" +command="%%PREFIX%%/sbin/${name}" command_args="-p ${pidfile}" -required_files="${prefix}/etc/${name}.conf" +required_files="%%PREFIX%%/etc/${name}.conf" load_rc_config $name : ${radvd_enable="NO"} diff --git a/net/relayd/files/relayd.in b/net/relayd/files/relayd.in index b2c6f85ec28b..c272c45be307 100644 --- a/net/relayd/files/relayd.in +++ b/net/relayd/files/relayd.in @@ -5,11 +5,10 @@ # PROVIDE: relayd # REQUIRE: LOGIN # KEYWORD: shutdown -# -# relayd_enable (bool): -# -# relayd_flags: -# + +# Add the following lines to /etc/rc.conf to enable relayd: +# relayd_enable="YES" +# relayd_flags="<set as needed>" . %%RC_SUBR%% @@ -19,9 +18,7 @@ rcvar=${name}_enable load_rc_config $name : ${relayd_enable="NO"} -: ${relayd_flags=""} command="%%PREFIX%%/sbin/relayd" -command_args="${relayd_flags}" run_rc_command "$1" diff --git a/net/rinetd/files/rinetd.sh.in b/net/rinetd/files/rinetd.sh.in index a306bed78dc0..71050e2044cf 100644 --- a/net/rinetd/files/rinetd.sh.in +++ b/net/rinetd/files/rinetd.sh.in @@ -20,7 +20,6 @@ rcvar=`set_rcvar` load_rc_config $name : ${rinetd_enable="NO"} -: ${rinetd_flags=""} command="%%PREFIX%%/sbin/rinetd" pidfile="/var/run/rinetd.pid" diff --git a/net/rp-pppoe/files/04pppoe-relay.sh.sample b/net/rp-pppoe/files/04pppoe-relay.sh.sample index 1915d5c7b578..8a397dd5c92c 100644 --- a/net/rp-pppoe/files/04pppoe-relay.sh.sample +++ b/net/rp-pppoe/files/04pppoe-relay.sh.sample @@ -4,7 +4,7 @@ ( daemon=pppoe-relay daemon_path=/usr/local/sbin -daemon_flags= +#daemon_flags= case $1 in start) diff --git a/net/rp-pppoe/files/04pppoe-server.sh.sample b/net/rp-pppoe/files/04pppoe-server.sh.sample index 6195e84b9d8c..6ed429c200b0 100644 --- a/net/rp-pppoe/files/04pppoe-server.sh.sample +++ b/net/rp-pppoe/files/04pppoe-server.sh.sample @@ -4,7 +4,7 @@ ( daemon=pppoe-server daemon_path=/usr/local/sbin -daemon_flags= +#daemon_flags= case $1 in start) diff --git a/net/rsync/files/rsyncd.sh.in b/net/rsync/files/rsyncd.sh.in index 318c6293b887..c1fa52328605 100644 --- a/net/rsync/files/rsyncd.sh.in +++ b/net/rsync/files/rsyncd.sh.in @@ -8,9 +8,10 @@ # BEFORE: securelevel # KEYWORD: shutdown -# Add the following line to /etc/rc.conf to enable `%%NAME%%': +# Add the following lines to /etc/rc.conf to enable `%%NAME%%': # -#%%NAME%%_enable="YES" +# %%NAME%%_enable="YES" +# %%NAME%%_flags="<set as needed>" # # See rsync(1) for %%NAME%%_flags # @@ -28,6 +29,5 @@ required_files="%%PREFIX%%/etc/$name.conf" # read configuration and set defaults load_rc_config "$name" : ${%%NAME%%_enable="NO"} -: ${%%NAME%%_flags=""} run_rc_command "$1" diff --git a/net/sendfile/files/sendfiled.in b/net/sendfile/files/sendfiled.in index 36a8bffce22e..51406ea5038b 100644 --- a/net/sendfile/files/sendfiled.in +++ b/net/sendfile/files/sendfiled.in @@ -8,12 +8,12 @@ # BEFORE: securelevel # KEYWORD: shutdown -# Add the following line to /etc/rc.conf to enable `sendfiled': +# Add the following lines to /etc/rc.conf to enable `sendfiled': # -#sendfiled_enable="YES" +# sendfiled_enable="YES" +# sendfiled_flags="<set as needed>" # # See sendfiled(8) for sendfiled_flags -# . %%RC_SUBR%% @@ -27,6 +27,5 @@ required_files="%%PREFIX%%/etc/sendfile.cf" # read configuration and set defaults load_rc_config "$name" : ${sendfiled_enable="NO"} -: ${sendfiled_flags=""} run_rc_command "$1" diff --git a/net/ser/files/ser.in b/net/ser/files/ser.in index 73c5f277ad77..bf087c80310a 100644 --- a/net/ser/files/ser.in +++ b/net/ser/files/ser.in @@ -5,8 +5,6 @@ # PROVIDE: ser # REQUIRE: DAEMON mysql postgresql -# -prefix=%%PREFIX%% # Add the following lines to /etc/rc.conf to enable ser: # @@ -16,7 +14,7 @@ prefix=%%PREFIX%% name="ser" rcvar=`set_rcvar` -command="${prefix}/sbin/${name}" +command="%%PREFIX%%/sbin/${name}" pidfile="/var/run/${name}.pid" command_args="-P ${pidfile} > /dev/null" diff --git a/net/sflowtool/files/sflowtool.in b/net/sflowtool/files/sflowtool.in index 0f83f2f43329..d4656a14eafd 100644 --- a/net/sflowtool/files/sflowtool.in +++ b/net/sflowtool/files/sflowtool.in @@ -3,6 +3,10 @@ # PROVIDE: sflowtool # REQUIRE: DAEMON +# Add the following line to /etc/rc.conf to enable sflowtool: +# sflowtool_enable="YES" +# sflowtool_flags="<set as needed>" + . %%RC_SUBR%% name="sflowtool" @@ -12,7 +16,6 @@ command="%%PREFIX%%/bin/sflowtool" load_rc_config $name # Set defaults : ${sflowtool_enable="NO"} -: ${sflowtool_flags=""} : ${sflowtool_pidfile="/var/run/${name}.pid"} start_cmd="/usr/sbin/daemon -f -p ${sflowtool_pidfile} ${command} ${sflowtool_flags}" diff --git a/net/siproxd/files/siproxd.sh.in b/net/siproxd/files/siproxd.sh.in index 6c31e25d6bea..f1959ce62468 100644 --- a/net/siproxd/files/siproxd.sh.in +++ b/net/siproxd/files/siproxd.sh.in @@ -5,21 +5,17 @@ # PROVIDE: siproxd # REQUIRE: DAEMON -# -# NOTE for FreeBSD 5.0+: -# If you want this script to start with the base rc scripts -# move siproxd.sh to /etc/rc.d/siproxd + # Define these siproxd_* variables in one of these files: # /etc/rc.conf # /etc/rc.conf.local # /etc/rc.conf.d/siproxd # # DO NOT CHANGE THESE DEFAULT VALUES HERE -# +# siproxd_enable="YES" +# siproxd_flags="" # Flags to siproxd program siproxd_enable=${siproxd_enable:-"NO"} # Enable siproxd -siproxd_flags=${siproxd_flags:-""} # Flags to siproxd program -#siproxd_program="%%PREFIX%%/sbin/siproxd" # Location of siproxd . %%RC_SUBR%% diff --git a/net/socat/files/socat.in b/net/socat/files/socat.in index b3cd35c02e10..55694ca0bf06 100644 --- a/net/socat/files/socat.in +++ b/net/socat/files/socat.in @@ -9,6 +9,10 @@ # REQUIRE: LOGIN # KEYWORD: shutdown +# Add the following lines to /etc/rc.conf to enable socat: +# socat_enable="YES" +# socat_flags="<set as needed>" + . %%RC_SUBR%% name="socat" @@ -20,6 +24,5 @@ command_args="&" load_rc_config $name : ${socat_enable="NO"} -: ${socat_flags=""} run_rc_command "$1" diff --git a/net/spread/files/spread.sh.in b/net/spread/files/spread.sh.in index fc9fd9e85755..bff754f1d7aa 100644 --- a/net/spread/files/spread.sh.in +++ b/net/spread/files/spread.sh.in @@ -10,7 +10,8 @@ # # Add the following lines to /etc/rc.conf to enable spread: # -#spread_enable="YES" +# spread_enable="YES" +# spread_flags="<set as needed>" # # See spread(1) for flags # @@ -28,7 +29,6 @@ required_files=%%PREFIX%%/etc/${name}.conf # set defaults spread_enable=${spread_enable:-"NO"} -spread_flags=${spread_flags:-""} load_rc_config ${name} run_rc_command "$1" diff --git a/net/spread4/files/spread.sh.in b/net/spread4/files/spread.sh.in index fc9fd9e85755..cfac38f9f3fe 100644 --- a/net/spread4/files/spread.sh.in +++ b/net/spread4/files/spread.sh.in @@ -10,10 +10,10 @@ # # Add the following lines to /etc/rc.conf to enable spread: # -#spread_enable="YES" +# spread_enable="YES" +# spread_flags="<set as needed>" # # See spread(1) for flags -# . %%RC_SUBR%% @@ -28,7 +28,6 @@ required_files=%%PREFIX%%/etc/${name}.conf # set defaults spread_enable=${spread_enable:-"NO"} -spread_flags=${spread_flags:-""} load_rc_config ${name} run_rc_command "$1" diff --git a/net/vtun/files/vtunclient.in b/net/vtun/files/vtunclient.in index 7679ac50724e..4592f139bed0 100644 --- a/net/vtun/files/vtunclient.in +++ b/net/vtun/files/vtunclient.in @@ -12,7 +12,6 @@ # vtunclient_enable=${vtunclient_enable:-"NO"} -vtunclient_flags=${vtunclient_flags:-""} . %%RC_SUBR%% diff --git a/net/widentd/files/widentd.sh.in b/net/widentd/files/widentd.sh.in index 069183d0e840..9f18826b00fb 100644 --- a/net/widentd/files/widentd.sh.in +++ b/net/widentd/files/widentd.sh.in @@ -7,8 +7,7 @@ # REQUIRE: DAEMON # BEFORE: LOGIN # KEYWORD: shutdown -# -prefix=%%PREFIX%% + # Define these widentd_* variables in one of these files: # @@ -31,7 +30,7 @@ widentd_enable=${widentd_enable-"NO"} name="widentd" rcvar=`set_rcvar` -command="${prefix}/sbin/widentd" +command="%%PREFIX%%/sbin/widentd" load_rc_config $name diff --git a/net/wizd/files/wizd.sh.in b/net/wizd/files/wizd.sh.in index ff8027991446..7d19b8ca39d5 100644 --- a/net/wizd/files/wizd.sh.in +++ b/net/wizd/files/wizd.sh.in @@ -25,6 +25,5 @@ required_files="%%PREFIX%%/etc/$name.conf" load_rc_config $name : ${wizd_enable="NO"} -: ${wizd_flags=""} run_rc_command "$1" diff --git a/net/xorp/files/xorp.in b/net/xorp/files/xorp.in index f20eb6b7f9ff..3a164ae082ee 100644 --- a/net/xorp/files/xorp.in +++ b/net/xorp/files/xorp.in @@ -11,9 +11,9 @@ # Add the following lines to /etc/rc.conf to enable xorp: # -#xorp_enable="YES" -#xorp_config_boot="%%PREFIX%%/etc/xorp.conf.sample" -# +# xorp_enable="YES" +# xorp_flags="<set as needed>" +# xorp_config_boot="%%PREFIX%%/etc/xorp.conf.sample" . %%RC_SUBR%% @@ -24,7 +24,6 @@ load_rc_config $name : ${xorp_enable="NO"} : ${xorp_config_boot="%%PREFIX%%/etc/xorp.conf"} -: ${xorp_flags=""} : ${xorp_rtrmgr_pidfile="/var/run/xorp_rtrmgr.pid"} : ${xorp_rtrmgr_logfile="/var/log/xorp_rtrmgr.log"} : ${xorp_rtrmgr_poll_enable=true} diff --git a/news/newscache/files/newscache.sh.in b/news/newscache/files/newscache.sh.in index 80c1006af70f..e6c4ce56094c 100644 --- a/news/newscache/files/newscache.sh.in +++ b/news/newscache/files/newscache.sh.in @@ -5,12 +5,12 @@ # PROVIDE: newscache # REQUIRE: DAEMON # -# Add the following line to /etc/rc.conf to enable newscache: +# Add the following lines to /etc/rc.conf to enable newscache: # # newscache_enable="YES" -# +# newscache_flags="<set as needed>" + newscache_enable=${newscache_enable-"NO"} -newscache_flags=${newscache_flags-""} . %%RC_SUBR%% diff --git a/print/pips800/files/ekpd.sh b/print/pips800/files/ekpd.sh index 0d5a0cf7ff81..890c26dfd49d 100644 --- a/print/pips800/files/ekpd.sh +++ b/print/pips800/files/ekpd.sh @@ -15,8 +15,8 @@ # # DO NOT CHANGE THESE DEFAULT VALUES HERE # -ekpd_enable=${ekpd_enable:-"NO"} # Enable ekpd -ekpd_flags=${ekpd_flags:-""} # Flags to ekpd program +# ekpd_enable="YES" +# ekpd_flags="" # Flags to ekpd program . %%RC_SUBR%% @@ -35,4 +35,5 @@ ekpd_prestart() { } load_rc_config $name +ekpd_enable=${ekpd_enable:-"NO"} run_rc_command "$1" diff --git a/security/amavisd-milter/files/amavisd-milter.sh.in b/security/amavisd-milter/files/amavisd-milter.sh.in index a0cfeeeccd35..d5be3ef19d62 100644 --- a/security/amavisd-milter/files/amavisd-milter.sh.in +++ b/security/amavisd-milter/files/amavisd-milter.sh.in @@ -11,7 +11,8 @@ # # Add the following lines to /etc/rc.conf to enable amavisd-milter: # -#amavisd_milter_enable="YES" +# amavisd_milter_enable="YES" +# amavisd_milter_flags="<set as needed>" # . %%RC_SUBR%% @@ -23,7 +24,6 @@ load_rc_config $name # Set defaults : ${amavisd_milter_enable:="NO"} -: ${amavisd_milter_flags=""} : ${amavisd_milter_user="%%AMAVISUSER%%"} pidfile="${amavisd_milter_pidfile:-%%AMAVISDIR%%/amavisd-milter.pid}" diff --git a/security/clamav-devel/files/clamav-clamd.in b/security/clamav-devel/files/clamav-clamd.in index 4d292e61578d..3aded5ca811b 100644 --- a/security/clamav-devel/files/clamav-clamd.in +++ b/security/clamav-devel/files/clamav-clamd.in @@ -11,7 +11,8 @@ # # Add the following lines to /etc/rc.conf to enable clamd: # -#clamav_clamd_enable="YES" +# clamav_clamd_enable="YES" +# clamav_clamd_flags="<set as needed>" # # See clamd(8) for flags # @@ -28,7 +29,6 @@ required_files=%%PREFIX%%/etc/clamd.conf # read settings, set default values load_rc_config "$name" : ${clamav_clamd_enable="NO"} -: ${clamav_clamd_flags=""} : ${clamav_clamd_socket="%%CLAMAV_CLAMD_SOCKET%%"} start_precmd=clamav_clamd_precmd diff --git a/security/clamav-devel/files/clamav-freshclam.in b/security/clamav-devel/files/clamav-freshclam.in index 77a6053c2e87..4721d2e60ed9 100644 --- a/security/clamav-devel/files/clamav-freshclam.in +++ b/security/clamav-devel/files/clamav-freshclam.in @@ -11,7 +11,8 @@ # # Add the following lines to /etc/rc.conf to enable the freshclam daemon: # -#clamav_freshclam_enable="YES" +# clamav_freshclam_enable="YES" +# clamav_freshclam_flags="<set as needed>" # # See freshclam(1) for flags # @@ -30,6 +31,5 @@ required_files=%%PREFIX%%/etc/freshclam.conf # read settings, set default values load_rc_config "$name" : ${clamav_freshclam_enable="NO"} -: ${clamav_freshclam_flags=""} run_rc_command "$1" diff --git a/security/clamav/files/clamav-clamd.in b/security/clamav/files/clamav-clamd.in index a5194e8e26f3..0bc40b5fc874 100644 --- a/security/clamav/files/clamav-clamd.in +++ b/security/clamav/files/clamav-clamd.in @@ -11,7 +11,8 @@ # # Add the following lines to /etc/rc.conf to enable clamd: # -#clamav_clamd_enable="YES" +# clamav_clamd_enable="YES" +# clamav_clamd_flags="<set as needed>" # # See clamd(8) for flags # @@ -28,7 +29,6 @@ required_files=%%PREFIX%%/etc/clamd.conf # read settings, set default values load_rc_config "$name" : ${clamav_clamd_enable="NO"} -: ${clamav_clamd_flags=""} : ${clamav_clamd_socket="%%CLAMAV_CLAMD_SOCKET%%"} start_precmd=clamav_clamd_precmd diff --git a/security/clamav/files/clamav-freshclam.in b/security/clamav/files/clamav-freshclam.in index 77a6053c2e87..4721d2e60ed9 100644 --- a/security/clamav/files/clamav-freshclam.in +++ b/security/clamav/files/clamav-freshclam.in @@ -11,7 +11,8 @@ # # Add the following lines to /etc/rc.conf to enable the freshclam daemon: # -#clamav_freshclam_enable="YES" +# clamav_freshclam_enable="YES" +# clamav_freshclam_flags="<set as needed>" # # See freshclam(1) for flags # @@ -30,6 +31,5 @@ required_files=%%PREFIX%%/etc/freshclam.conf # read settings, set default values load_rc_config "$name" : ${clamav_freshclam_enable="NO"} -: ${clamav_freshclam_flags=""} run_rc_command "$1" diff --git a/security/cyrus-sasl2-saslauthd/files/saslauthd.sh.in b/security/cyrus-sasl2-saslauthd/files/saslauthd.sh.in index 56170d27d1eb..892795cb6eb9 100644 --- a/security/cyrus-sasl2-saslauthd/files/saslauthd.sh.in +++ b/security/cyrus-sasl2-saslauthd/files/saslauthd.sh.in @@ -7,12 +7,6 @@ # REQUIRE: DAEMON # BEFORE: mail imap # KEYWORD: shutdown -# -# NOTE for FreeBSD 5.0+: -# If you want this script to start with the base rc scripts -# move saslauthd.sh to /etc/rc.d/saslauthd - -prefix=%%PREFIX%% # Define these saslauthd_* variables in one of these files: # /etc/rc.conf @@ -24,13 +18,13 @@ prefix=%%PREFIX%% saslauthd_enable=${saslauthd_enable:-"NO"} # Enable saslauthd saslauthd_flags=${saslauthd_flags:-"-a pam"} # Flags to saslauthd program #saslauthd_runpath="%%SASLAUTHD_RUNPATH%%" # Working directory -#saslauthd_program="${prefix}/sbin/saslauthd" # Location of saslauthd +#saslauthd_program="%%PREFIX%%/sbin/saslauthd" # Location of saslauthd . %%RC_SUBR%% name="saslauthd" rcvar=`set_rcvar` -command="${prefix}/sbin/${name}" +command="%%PREFIX%%/sbin/${name}" load_rc_config $name diff --git a/security/distcache-devel/files/dc_server.sh.in b/security/distcache-devel/files/dc_server.sh.in index 386685537931..ac3caa9147a6 100644 --- a/security/distcache-devel/files/dc_server.sh.in +++ b/security/distcache-devel/files/dc_server.sh.in @@ -10,7 +10,8 @@ # Add the following line to /etc/rc.conf to enable `%%NAME%%': # -#%%NAME%%_enable="YES" +# %%NAME%%_enable="YES" +# %%NAME%%_flags="<set as needed>" # # See %%NAME%%(1) # @@ -27,6 +28,5 @@ pidfile="/var/run/$name.pid" # read configuration and set defaults load_rc_config "$name" : ${%%NAME%%_enable="NO"} -: ${%%NAME%%_flags=""} run_rc_command "$1" diff --git a/security/distcache/files/dc_server.sh.in b/security/distcache/files/dc_server.sh.in index 386685537931..ac3caa9147a6 100644 --- a/security/distcache/files/dc_server.sh.in +++ b/security/distcache/files/dc_server.sh.in @@ -10,7 +10,8 @@ # Add the following line to /etc/rc.conf to enable `%%NAME%%': # -#%%NAME%%_enable="YES" +# %%NAME%%_enable="YES" +# %%NAME%%_flags="<set as needed>" # # See %%NAME%%(1) # @@ -27,6 +28,5 @@ pidfile="/var/run/$name.pid" # read configuration and set defaults load_rc_config "$name" : ${%%NAME%%_enable="NO"} -: ${%%NAME%%_flags=""} run_rc_command "$1" diff --git a/security/expiretable/files/expiretable.in b/security/expiretable/files/expiretable.in index 8f10aa4711a3..ad5ee98139fd 100644 --- a/security/expiretable/files/expiretable.in +++ b/security/expiretable/files/expiretable.in @@ -16,6 +16,5 @@ command="/usr/local/sbin/expiretable" load_rc_config "$name" expiretable_enable=${expiretable_enable-"NO"} -expiretable_flags=${expiretable_flags-""} run_rc_command "$1" diff --git a/security/f-protd/files/fprotd.sh.in b/security/f-protd/files/fprotd.sh.in index 5d8d3957ee4b..9d0c306a81b6 100644 --- a/security/f-protd/files/fprotd.sh.in +++ b/security/f-protd/files/fprotd.sh.in @@ -11,14 +11,12 @@ # fprotd_enable="YES" # -prefix=%%PREFIX%% - . /etc/rc.subr name=fprotd rcvar=`set_rcvar` start_precmd="fprotd_precmd" -command="${prefix}/f-prot/f-protd" +command="%%PREFIX%%/f-prot/f-protd" command_args="> /dev/null 2>&1" required_files="/etc/f-prot.conf" @@ -26,7 +24,7 @@ required_files="/etc/f-prot.conf" load_rc_config ${name} : ${fprotd_enable=NO} -: ${fprotd_virus_defs=${prefix}/f-prot} +: ${fprotd_virus_defs=%%PREFIX%%/f-prot} fprotd_precmd() { diff --git a/security/f-protd/files/fprotd_scanmail.sh.in b/security/f-protd/files/fprotd_scanmail.sh.in index dc9fc183b711..887aaffef574 100644 --- a/security/f-protd/files/fprotd_scanmail.sh.in +++ b/security/f-protd/files/fprotd_scanmail.sh.in @@ -11,14 +11,12 @@ # fprotd_scanmail_enable="YES" # -prefix=%%PREFIX%% - . /etc/rc.subr name=fprotd_scanmail rcvar=`set_rcvar` pidfile="/var/run/scanmail.pid" -command="${prefix}/f-prot/tools/scan-mail.pl" +command="%%PREFIX%%/f-prot/tools/scan-mail.pl" command_args="> /dev/null 2>&1" command_interpreter="/usr/bin/perl" diff --git a/security/ipsec-tools/files/racoon.sh.in b/security/ipsec-tools/files/racoon.sh.in index 8bbe2e826c6f..387342453394 100644 --- a/security/ipsec-tools/files/racoon.sh.in +++ b/security/ipsec-tools/files/racoon.sh.in @@ -7,12 +7,6 @@ # REQUIRE: DAEMON # BEFORE: LOGIN # KEYWORD: shutdown -# -# NOTE for FreeBSD 5.0+: -# If you want this script to start with the base rc scripts -# move racoon.sh to /etc/rc.d/racoon - -prefix=%%PREFIX%% # Define these racoon_* variables in one of these files: # /etc/rc.conf @@ -22,7 +16,6 @@ prefix=%%PREFIX%% # DO NOT CHANGE THESE DEFAULT VALUES HERE # [ -z "$racoon_enable" ] && racoon_enable="NO" # Disable by default -#racoon_program="${prefix}/sbin/racoon" # Location of racoon #racoon_flags="" # Flags to racoon program racoon_create_dirs=NO # Create $required_dirs (for # /var mfs)? @@ -31,10 +24,10 @@ racoon_create_dirs=NO # Create $required_dirs (for name="racoon" rcvar=`set_rcvar` -command="${prefix}/sbin/${name}" +command="%%PREFIX%%/sbin/${name}" pidfile="/var/run/${name}.pid" socketfile="%%STATEDIR%%/${name}.sock" -required_files="${prefix}/etc/${name}/${name}.conf" +required_files="%%PREFIX%%/etc/${name}/${name}.conf" required_dirs="%%STATEDIR%%" start_precmd="racoon_cleanup" stop_postcmd="racoon_cleanup" diff --git a/security/nessus/files/nessusd.sh.in b/security/nessus/files/nessusd.sh.in index 63352c04c38d..0dc28842a5ac 100644 --- a/security/nessus/files/nessusd.sh.in +++ b/security/nessus/files/nessusd.sh.in @@ -7,12 +7,6 @@ # REQUIRE: DAEMON # BEFORE: LOGIN # KEYWORD: shutdown -# -# NOTE for FreeBSD 5.0+: -# If you want this script to start with the base rc scripts -# move nessusd.sh to /etc/rc.d/nessusd - -prefix=%%PREFIX%% # Define these nessusd_* variables in one of these files: # /etc/rc.conf @@ -22,22 +16,22 @@ prefix=%%PREFIX%% # DO NOT CHANGE THESE DEFAULT VALUES HERE # [ -z "$nessusd_enable" ] && nessusd_enable="NO" # Disable nessusd -#nessusd_program="${prefix}/sbin/nessusd" # Location of nessusd +#nessusd_program="%%PREFIX%%/sbin/nessusd" # Location of nessusd nessusd_flags="-D" # Flags to nessusd program . %%RC_SUBR%% name="nessusd" rcvar=`set_rcvar` -command="${prefix}/sbin/nessusd" -pidfile="${prefix}/var/nessus/nessusd.pid" -required_files="${prefix}/etc/nessus/nessusd.conf" +command="%%PREFIX%%/sbin/nessusd" +pidfile="%%PREFIX%%/var/nessus/nessusd.pid" +required_files="%%PREFIX%%/etc/nessus/nessusd.conf" start_precmd="nessus_check_certificate" nessus_check_certificate() { - if [ ! -f ${prefix}/var/CA/serverkey.pem ]; then - ${prefix}/sbin/nessus-mkcert + if [ ! -f %%PREFIX%%/var/CA/serverkey.pem ]; then + %%PREFIX%%/sbin/nessus-mkcert fi } diff --git a/security/oidentd/files/oidentd.in b/security/oidentd/files/oidentd.in index ac8e5cb0f1a9..5dede140ea43 100644 --- a/security/oidentd/files/oidentd.in +++ b/security/oidentd/files/oidentd.in @@ -10,7 +10,8 @@ # # Add the following lines to /etc/rc.conf to enable oidentd: # -#oidentd_enable="YES" +# oidentd_enable="YES" +# oidentd_flags="<set as needed>" # # See oidentd(8) for flags. # @@ -26,7 +27,6 @@ command=%%PREFIX%%/sbin/${name} oidentd_enable=${oidentd_enable:-"NO"} oidentd_conf=${oidentd_conf:-"%%PREFIX%%/etc/${name}.conf"} -oidentd_flags=${oidentd_flags:-""} oidentd_precmd () { diff --git a/security/openvas-server/files/openvasd.in b/security/openvas-server/files/openvasd.in index ab5db47cf775..f3773c741b1b 100644 --- a/security/openvas-server/files/openvasd.in +++ b/security/openvas-server/files/openvasd.in @@ -9,8 +9,6 @@ # KEYWORD: shutdown # -prefix=%%PREFIX%% - # Define these openvasd_* variables in one of these files: # /etc/rc.conf # /etc/rc.conf.local @@ -19,16 +17,16 @@ prefix=%%PREFIX%% # DO NOT CHANGE THESE DEFAULT VALUES HERE # [ -z "$openvasd_enable" ] && openvasd_enable="NO" # Disable openvasd -#openvasd_program="${prefix}/sbin/openvasd" # Location of openvasd +#openvasd_program="%%PREFIX%%/sbin/openvasd" # Location of openvasd openvasd_flags="-D -q" # Flags to openvasd program . %%RC_SUBR%% name="openvasd" rcvar=`set_rcvar` -command="${prefix}/sbin/openvasd" +command="%%PREFIX%%/sbin/openvasd" pidfile="/var/run/openvasd.pid" -required_files="${prefix}/etc/openvas/openvasd.conf" +required_files="%%PREFIX%%/etc/openvas/openvasd.conf" load_rc_config $name run_rc_command "$1" diff --git a/security/openvpn-devel/files/openvpn.sh.in b/security/openvpn-devel/files/openvpn.sh.in index 84da0a29b940..ca66486c06ab 100644 --- a/security/openvpn-devel/files/openvpn.sh.in +++ b/security/openvpn-devel/files/openvpn.sh.in @@ -75,8 +75,6 @@ esac rcvar=$(set_rcvar) -prefix="%%PREFIX%%" - openvpn_precmd() { for i in $interfaces ; do @@ -118,8 +116,8 @@ load_rc_config ${name} eval ": \${${name}_enable:=\"NO\"}" eval ": \${${name}_flags:=\"\"}" eval ": \${${name}_if:=\"\"}" -eval ": \${${name}_configfile:=\"${prefix}/etc/openvpn/${name}.conf\"}" -eval ": \${${name}_dir:=\"${prefix}/etc/openvpn\"}" +eval ": \${${name}_configfile:=\"%%PREFIX%%/etc/openvpn/${name}.conf\"}" +eval ": \${${name}_dir:=\"%%PREFIX%%/etc/openvpn\"}" configfile="$(eval echo \${${name}_configfile})" dir="$(eval echo \${${name}_dir})" diff --git a/security/openvpn/files/openvpn.sh.in b/security/openvpn/files/openvpn.sh.in index 84da0a29b940..ca66486c06ab 100644 --- a/security/openvpn/files/openvpn.sh.in +++ b/security/openvpn/files/openvpn.sh.in @@ -75,8 +75,6 @@ esac rcvar=$(set_rcvar) -prefix="%%PREFIX%%" - openvpn_precmd() { for i in $interfaces ; do @@ -118,8 +116,8 @@ load_rc_config ${name} eval ": \${${name}_enable:=\"NO\"}" eval ": \${${name}_flags:=\"\"}" eval ": \${${name}_if:=\"\"}" -eval ": \${${name}_configfile:=\"${prefix}/etc/openvpn/${name}.conf\"}" -eval ": \${${name}_dir:=\"${prefix}/etc/openvpn\"}" +eval ": \${${name}_configfile:=\"%%PREFIX%%/etc/openvpn/${name}.conf\"}" +eval ": \${${name}_dir:=\"%%PREFIX%%/etc/openvpn\"}" configfile="$(eval echo \${${name}_configfile})" dir="$(eval echo \${${name}_dir})" diff --git a/security/openvpn20/files/openvpn.sh.in b/security/openvpn20/files/openvpn.sh.in index 84da0a29b940..ca66486c06ab 100644 --- a/security/openvpn20/files/openvpn.sh.in +++ b/security/openvpn20/files/openvpn.sh.in @@ -75,8 +75,6 @@ esac rcvar=$(set_rcvar) -prefix="%%PREFIX%%" - openvpn_precmd() { for i in $interfaces ; do @@ -118,8 +116,8 @@ load_rc_config ${name} eval ": \${${name}_enable:=\"NO\"}" eval ": \${${name}_flags:=\"\"}" eval ": \${${name}_if:=\"\"}" -eval ": \${${name}_configfile:=\"${prefix}/etc/openvpn/${name}.conf\"}" -eval ": \${${name}_dir:=\"${prefix}/etc/openvpn\"}" +eval ": \${${name}_configfile:=\"%%PREFIX%%/etc/openvpn/${name}.conf\"}" +eval ": \${${name}_dir:=\"%%PREFIX%%/etc/openvpn\"}" configfile="$(eval echo \${${name}_configfile})" dir="$(eval echo \${${name}_dir})" diff --git a/security/p5-openxpki-deployment/files/openxpki.sh.in b/security/p5-openxpki-deployment/files/openxpki.sh.in index ce34bcabb088..e168d5389f54 100644 --- a/security/p5-openxpki-deployment/files/openxpki.sh.in +++ b/security/p5-openxpki-deployment/files/openxpki.sh.in @@ -13,7 +13,7 @@ # DO NOT CHANGE THESE DEFAULT VALUES HERE # openxpki_enable="${openxpki_enable-NO}" -openxpki_flags="" +# openxpki_flags="" openxpki_pidfile="%%PREFIX%%/var/openxpki/openxpki.pid" case "$1" in diff --git a/security/py-fail2ban/files/fail2ban.in b/security/py-fail2ban/files/fail2ban.in index 15ccb1f04463..6573a90eb2c6 100644 --- a/security/py-fail2ban/files/fail2ban.in +++ b/security/py-fail2ban/files/fail2ban.in @@ -4,8 +4,11 @@ # REQUIRE: DAEMON # KEYWORD: shutdown +# Add the following lines to /etc/rc.conf to enable fail2ban: +# fail2ban_enable="YES" +# fail2ban_flags="<set as needed>" + fail2ban_enable=${fail2ban_enable-"NO"} -fail2ban_flags=${fail2ban_flags-""} fail2ban_pidfile=${fail2ban_pidfile-"/var/run/fail2ban/fail2ban.pid"} . %%RC_SUBR%% diff --git a/security/scanlogd/files/scanlogd.sh b/security/scanlogd/files/scanlogd.sh index ef14beba888b..532249fcfcb3 100644 --- a/security/scanlogd/files/scanlogd.sh +++ b/security/scanlogd/files/scanlogd.sh @@ -7,19 +7,18 @@ # REQUIRE: DAEMON # BEFORE: LOGIN # KEYWORD: shutdown -# -prefix=%%PREFIX%% +# Add the following lines to /etc/rc.conf to enable scanlogd: +# scanlogd_enable="YES" +# scanlogd_flags="<set as needed>" scanlogd_enable=${scanlogd_enable:-"NO"} # Enable scanlogd -scanlogd_program="${prefix}/bin/scanlogd" # Location of scanlogd -scanlogd_flags=${scanlogd_flags:-""} # Flags to scanlogd . %%RC_SUBR%% name="scanlogd" rcvar=`set_rcvar` -command="${prefix}/bin/${name}" +command="%%PREFIX%%/bin/${name}" required_files="" load_rc_config $name diff --git a/security/snortsam/files/snortsam.sh.in b/security/snortsam/files/snortsam.sh.in index 3f15c079042f..946e951f153a 100644 --- a/security/snortsam/files/snortsam.sh.in +++ b/security/snortsam/files/snortsam.sh.in @@ -26,8 +26,6 @@ load_rc_config $name [ -z "$snortsam_enable" ] && snortsam_enable="NO" [ -z "$snortsam_conf" ] && snortsam_conf="%%PREFIX%%/etc/snortsam/snortsam.conf" -[ -z "$snortsam_flags" ] && snortsam_flags="" - [ -n "$snortsam_conf" ] && snortsam_flags="$snortsam_flags $snortsam_conf" run_rc_command "$1" diff --git a/security/sshblock/files/sshblock.in b/security/sshblock/files/sshblock.in index d3d8cb7ae222..4e83ebca00e8 100644 --- a/security/sshblock/files/sshblock.in +++ b/security/sshblock/files/sshblock.in @@ -22,6 +22,5 @@ command="%%PREFIX%%/sbin/sshblock" load_rc_config $name : ${sshblock_enable="NO"} -: ${sshblock_flags=""} run_rc_command "$1" diff --git a/sysutils/cfengine/files/cfexecd.in b/sysutils/cfengine/files/cfexecd.in index a892216ff80e..1e61a94d7834 100644 --- a/sysutils/cfengine/files/cfexecd.in +++ b/sysutils/cfengine/files/cfexecd.in @@ -25,6 +25,5 @@ command="%%PREFIX%%/sbin/${name}" load_rc_config $name : ${cfexecd_enable="NO"} -: ${cfexecd_flags=""} run_rc_command "$1" diff --git a/sysutils/cfengine/files/cfservd.in b/sysutils/cfengine/files/cfservd.in index caa8300fd181..fac8a83a1745 100644 --- a/sysutils/cfengine/files/cfservd.in +++ b/sysutils/cfengine/files/cfservd.in @@ -25,6 +25,5 @@ command="%%PREFIX%%/sbin/${name}" load_rc_config $name : ${cfservd_enable="NO"} -: ${cfservd_flags=""} run_rc_command "$1" diff --git a/sysutils/cfengine3-legacy/files/cf-execd.in b/sysutils/cfengine3-legacy/files/cf-execd.in index 064c4d842e88..08de22a6942c 100644 --- a/sysutils/cfengine3-legacy/files/cf-execd.in +++ b/sysutils/cfengine3-legacy/files/cf-execd.in @@ -25,6 +25,5 @@ command="%%PREFIX%%/sbin/${name}" load_rc_config $name : ${cf-execd_enable="NO"} -: ${cf-execd_flags=""} run_rc_command "$1" diff --git a/sysutils/cfengine3-legacy/files/cf-serverd.in b/sysutils/cfengine3-legacy/files/cf-serverd.in index 3f3cd7a5b46a..486208804e8b 100644 --- a/sysutils/cfengine3-legacy/files/cf-serverd.in +++ b/sysutils/cfengine3-legacy/files/cf-serverd.in @@ -25,6 +25,5 @@ command="%%PREFIX%%/sbin/${name}" load_rc_config $name : ${cf-serverd_enable="NO"} -: ${cf-serverd_flags=""} run_rc_command "$1" diff --git a/sysutils/cfengine3/files/cf-execd.in b/sysutils/cfengine3/files/cf-execd.in index 064c4d842e88..08de22a6942c 100644 --- a/sysutils/cfengine3/files/cf-execd.in +++ b/sysutils/cfengine3/files/cf-execd.in @@ -25,6 +25,5 @@ command="%%PREFIX%%/sbin/${name}" load_rc_config $name : ${cf-execd_enable="NO"} -: ${cf-execd_flags=""} run_rc_command "$1" diff --git a/sysutils/cfengine3/files/cf-serverd.in b/sysutils/cfengine3/files/cf-serverd.in index 3f3cd7a5b46a..486208804e8b 100644 --- a/sysutils/cfengine3/files/cf-serverd.in +++ b/sysutils/cfengine3/files/cf-serverd.in @@ -25,6 +25,5 @@ command="%%PREFIX%%/sbin/${name}" load_rc_config $name : ${cf-serverd_enable="NO"} -: ${cf-serverd_flags=""} run_rc_command "$1" diff --git a/sysutils/cpupowerd/files/cpupowerd.in b/sysutils/cpupowerd/files/cpupowerd.in index 7d3bdac74285..81c5daf1c2a9 100644 --- a/sysutils/cpupowerd/files/cpupowerd.in +++ b/sysutils/cpupowerd/files/cpupowerd.in @@ -27,7 +27,6 @@ load_rc_config $name # set default : ${cpupowerd_enable="NO"} : ${cpupowerd_config="%%PREFIX%%/etc/cpupowerd.conf"} -: ${cpupowerd_flags=""} command_args="-d -c ${cpupowerd_config} ${cpupowerd_flags}" diff --git a/sysutils/doinkd/files/doinkd.in b/sysutils/doinkd/files/doinkd.in index 7f6a13dfa1c6..f9eab3896c1c 100644 --- a/sysutils/doinkd/files/doinkd.in +++ b/sysutils/doinkd/files/doinkd.in @@ -11,7 +11,8 @@ # # Add the following lines to /etc/rc.conf to enable idled: # -#idled_enable="YES" +# idled_enable="YES" +# idled_flags="<set as needed>" # # See idled(8) for flags # @@ -27,7 +28,6 @@ required_files=%%PREFIX%%/etc/idled.cf # set defaults idled_enable=${idled_enable:-"NO"} -idled_flags=${idled_flags:-""} load_rc_config $name run_rc_command "$1" diff --git a/sysutils/doinkd/files/idled.in b/sysutils/doinkd/files/idled.in index d9df48775a34..3bd4ce105bae 100644 --- a/sysutils/doinkd/files/idled.in +++ b/sysutils/doinkd/files/idled.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/sysutils/doinkd/files/Attic/idled.in,v 1.1 2009-07-15 05:09:46 pgollucci Exp $ +# $FreeBSD: /tmp/pcvs/ports/sysutils/doinkd/files/Attic/idled.in,v 1.2 2009-07-15 16:56:06 dougb Exp $ # # PROVIDE: idled @@ -11,7 +11,8 @@ # # Add the following lines to /etc/rc.conf to enable idled: # -#idled_enable="YES" +# idled_enable="YES" +# idled_flags="<set as needed>" # # See idled(8) for flags # @@ -27,7 +28,6 @@ required_files=%%PREFIX%%/etc/idled.cf # set defaults idled_enable=${idled_enable:-"NO"} -idled_flags=${idled_flags:-""} load_rc_config $name run_rc_command "$1" diff --git a/sysutils/fvcool/files/fvcool.sh.in b/sysutils/fvcool/files/fvcool.sh.in index e33398997d47..3085d82fe53c 100644 --- a/sysutils/fvcool/files/fvcool.sh.in +++ b/sysutils/fvcool/files/fvcool.sh.in @@ -9,11 +9,11 @@ # Add the following line to /etc/rc.conf to enable `%%PORTNAME%%': # -#%%PORTNAME%%_enable="YES" +# %%PORTNAME%%_enable="YES" # # Other rc.conf variables: # -# %%PORTNAME%%_flags Set to "-v" for verbose mode. +# %%PORTNAME%%_flags Set to "-v" for verbose mode. # . %%RC_SUBR%% @@ -43,6 +43,5 @@ status_cmd() load_rc_config "$name" : ${%%PORTNAME%%_enable="NO"} -: ${%%PORTNAME%%_flags=""} run_rc_command "$1" diff --git a/sysutils/ganglia-monitor-core/files/ganglia.sh.in b/sysutils/ganglia-monitor-core/files/ganglia.sh.in index f1790eb369a7..fa223863a5af 100644 --- a/sysutils/ganglia-monitor-core/files/ganglia.sh.in +++ b/sysutils/ganglia-monitor-core/files/ganglia.sh.in @@ -18,7 +18,7 @@ gmetasnap_enable="${gmetasnap_enable-NO}" gmetasnap_rrddir="/var/db/ganglia/rrds" gmetasnap_snapdir="/var/db/ganglia/snaps" gmetasnap_snapname="snap" -gmetasnap_flags="" +# gmetasnap_flags="" gmetasnap_command="%%PREFIX%%/sbin/gmetasnap" ### gmond ### diff --git a/sysutils/gkrellm2/files/gkrellmd.sh.in b/sysutils/gkrellm2/files/gkrellmd.sh.in index 0bb39d28a454..c222220886e8 100644 --- a/sysutils/gkrellm2/files/gkrellmd.sh.in +++ b/sysutils/gkrellm2/files/gkrellmd.sh.in @@ -7,12 +7,6 @@ # REQUIRE: DAEMON # BEFORE: LOGIN # KEYWORD: shutdown -# -# NOTE for FreeBSD 5.0+: -# If you want this script to start with the base rc scripts -# move gkrellmd.sh to /etc/rc.d/gkrellmd - -prefix=%%PREFIX%% # Define these gkrellmd_* variables in one of these files: # /etc/rc.conf @@ -22,15 +16,15 @@ prefix=%%PREFIX%% # DO NOT CHANGE THESE DEFAULT VALUES HERE # gkrellmd_enable=${gkrellmd_enable:-"NO"} # Enable gkrellmd -#gkrellmd_program="${prefix}/sbin/gkrellmd" # Location of gkrellmd +#gkrellmd_program="%%PREFIX%%/sbin/gkrellmd" # Location of gkrellmd gkrellmd_flags=${gkrellmd_flags:-"-d"} # Flags to gkrellmd . %%RC_SUBR%% name="gkrellmd" rcvar=`set_rcvar` -command="${prefix}/sbin/${name}" -required_files="${prefix}/etc/${name}.conf" +command="%%PREFIX%%/sbin/${name}" +required_files="%%PREFIX%%/etc/${name}.conf" load_rc_config $name run_rc_command "$1" diff --git a/sysutils/hal/files/hald.in b/sysutils/hal/files/hald.in index 4e8b7e7e66e1..9ccdbc16e6d1 100644 --- a/sysutils/hal/files/hald.in +++ b/sysutils/hal/files/hald.in @@ -9,13 +9,12 @@ # Add the following line to /etc/rc.conf to enable the HAL daemon: # # hald_enable="YES" -# +# hald_flags="<set as needed>" . %%RC_SUBR%% . %%GNOME_SUBR%% hald_enable=${hald_enable-${gnome_enable}} -hald_flags=${hald_flags-""} name=hald rcvar=`set_rcvar` diff --git a/sysutils/healthd/files/healthd.in b/sysutils/healthd/files/healthd.in index 16dc089af802..d0882e57017f 100644 --- a/sysutils/healthd/files/healthd.in +++ b/sysutils/healthd/files/healthd.in @@ -31,6 +31,5 @@ required_files=%%PREFIX%%/etc/${name}.conf load_rc_config ${name} healthd_enable=${healthd_enable:-"NO"} -healthd_flags=${healthd_flags:-""} run_rc_command "$1" diff --git a/sysutils/idled/files/idled.in b/sysutils/idled/files/idled.in index 91aa8e9c69d0..c344c4d81bf0 100644 --- a/sysutils/idled/files/idled.in +++ b/sysutils/idled/files/idled.in @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: /tmp/pcvs/ports/sysutils/idled/files/Attic/idled.in,v 1.1 2009-07-15 05:09:46 pgollucci Exp $ +# $FreeBSD: /tmp/pcvs/ports/sysutils/idled/files/Attic/idled.in,v 1.2 2009-07-15 16:56:06 dougb Exp $ # # PROVIDE: idled @@ -11,7 +11,8 @@ # # Add the following lines to /etc/rc.conf to enable idled: # -#idled_enable="YES" +# idled_enable="YES" +# idled_flags="<set as needed>" # # See idled(8) for flags # @@ -27,7 +28,6 @@ required_files=%%PREFIX%%/etc/idled.cf # set defaults idled_enable=${idled_enable:-"NO"} -idled_flags=${idled_flags:-""} load_rc_config $name run_rc_command "$1" diff --git a/sysutils/lookupd/files/lookupd.in b/sysutils/lookupd/files/lookupd.in index 2921067eab7e..3902835e8e0c 100644 --- a/sysutils/lookupd/files/lookupd.in +++ b/sysutils/lookupd/files/lookupd.in @@ -11,9 +11,9 @@ # Add the following lines to /etc/rc.conf to enable lookupd: # # lookupd_enable="YES" +# lookupd_flags="<set as needed>" # # See lookupd(8) for flags -# . %%RC_SUBR%% @@ -24,7 +24,6 @@ command=%%PREFIX%%/sbin/lookupd lookupd_enable=${lookupd_enable:-"NO"} lookupd_pidfile=${lookupd_pidfile:-"/var/run/lookupd.pid"} -lookupd_flags=${lookupd_flags:-""} load_rc_config $name run_rc_command "$1" diff --git a/sysutils/mbmon/files/mbmon.sh.in b/sysutils/mbmon/files/mbmon.sh.in index c07f77d2cca9..dbd8190db89d 100644 --- a/sysutils/mbmon/files/mbmon.sh.in +++ b/sysutils/mbmon/files/mbmon.sh.in @@ -8,9 +8,10 @@ # BEFORE: securelevel # KEYWORD: shutdown -# Add the following line to /etc/rc.conf to enable the mbmon daemon: +# Add the following lines to /etc/rc.conf to enable the mbmon daemon: # -# mbmon_enable="YES" +# mbmon_enable="YES" +# mbmon_flags="<set as needed>" # # See mbmon(1) for mbmon_flags # Set mbmon_port to the TCP port to listen to, default is 12999 @@ -23,7 +24,6 @@ rcvar=`set_rcvar` # read configuration and set defaults load_rc_config "$name" : ${mbmon_enable="NO"} -: ${mbmon_flags=""} : ${mbmon_port="12999"} command="%%PREFIX%%/bin/${name}" diff --git a/sysutils/msyslog/files/msyslogd.sh.in b/sysutils/msyslog/files/msyslogd.sh.in index 74aa3305f232..6fedbf875657 100644 --- a/sysutils/msyslog/files/msyslogd.sh.in +++ b/sysutils/msyslog/files/msyslogd.sh.in @@ -47,6 +47,5 @@ stop_postcmd() # read settings, set default values load_rc_config $name : ${msyslogd_enable="NO"} -: ${msyslogd_flags=""} run_rc_command "$1" diff --git a/sysutils/nagios-statd/files/nagiosstatd.sh.in b/sysutils/nagios-statd/files/nagiosstatd.sh.in index 228caeaa4df7..6b8ef5037c38 100644 --- a/sysutils/nagios-statd/files/nagiosstatd.sh.in +++ b/sysutils/nagios-statd/files/nagiosstatd.sh.in @@ -10,10 +10,9 @@ # Add the following lines to /etc/rc.conf.local or /etc/rc.conf to enable nagiosstatd: # nagiosstatd_enable (bool): Set to "NO" by default. # Set it to "YES" to enable nagiosstatd -# +# nagiosstatd_flags="<set as needed>" nagiosstatd_enable=${nagiosstatd_enable-"NO"} -nagiosstatd_flags=${nagiosstatd_flags-""} nagiosstatd_pidfile=${nagiosstatd_pidfile-"/var/run/nagiosstatd.pid"} . %%RC_SUBR%% diff --git a/sysutils/powerman/files/powerman.sh.in b/sysutils/powerman/files/powerman.sh.in index 0cfb27c7b7d3..e20ebbc130d4 100644 --- a/sysutils/powerman/files/powerman.sh.in +++ b/sysutils/powerman/files/powerman.sh.in @@ -13,8 +13,10 @@ # # DO NOT CHANGE THESE DEFAULT VALUES HERE # +# powermand_enable="YES" +# powermand_flags="<set as needed>" + powermand_enable=${powermand_enable:-"NO"} -powermand_flags=${powermand_flags:-""} . %%RC_SUBR%% diff --git a/sysutils/usermin/files/usermin.sh.in b/sysutils/usermin/files/usermin.sh.in index 3444c57a33b8..03b6ec208999 100644 --- a/sysutils/usermin/files/usermin.sh.in +++ b/sysutils/usermin/files/usermin.sh.in @@ -17,11 +17,10 @@ usermin_enable=${usermin_enable:-"NO"} name=usermin rcvar=`set_rcvar` -prefix=%%PREFIX%% procname=%%PERL5%% pidfile=/var/log/usermin/miniserv.pid -required_dirs=${prefix}/etc/usermin -command=${prefix}/etc/usermin/start +required_dirs=%%PREFIX%%/etc/usermin +command=%%PREFIX%%/etc/usermin/start load_rc_config ${name} run_rc_command "$1" diff --git a/sysutils/webmin/files/webmin.sh.in b/sysutils/webmin/files/webmin.sh.in index ceee0a155169..21a043bd73d7 100644 --- a/sysutils/webmin/files/webmin.sh.in +++ b/sysutils/webmin/files/webmin.sh.in @@ -17,11 +17,10 @@ webmin_enable=${webmin_enable:-"NO"} name=webmin rcvar=`set_rcvar` -prefix=%%PREFIX%% procname=%%PERL5%% pidfile=/var/log/webmin/miniserv.pid -required_dirs=${prefix}/etc/webmin -command=${prefix}/etc/webmin/start +required_dirs=%%PREFIX%%/etc/webmin +command=%%PREFIX%%/etc/webmin/start load_rc_config ${name} run_rc_command "$1" diff --git a/sysutils/xsi/files/xsi.in b/sysutils/xsi/files/xsi.in index 7fb5f04ac755..c135fa97457f 100644 --- a/sysutils/xsi/files/xsi.in +++ b/sysutils/xsi/files/xsi.in @@ -13,7 +13,6 @@ # xsi_enable=${xsi_enable-"NO"} -xsi_flags=${xsi_flags-""} . %%RC_SUBR%% diff --git a/textproc/iiimf-server/files/iiimd.sh.in b/textproc/iiimf-server/files/iiimd.sh.in index 9f631bff35c1..415fb1e3c9a1 100644 --- a/textproc/iiimf-server/files/iiimd.sh.in +++ b/textproc/iiimf-server/files/iiimd.sh.in @@ -6,15 +6,13 @@ # REQUIRE: DAEMON # KEYWORD: shutdown -prefix=%%PREFIX%% - iiimd_enable=${iiimd_enable:-"NO"} . %%RC_SUBR%% name="iiimd" rcvar=`set_rcvar` -command="${prefix}/bin/iiimd" +command="%%PREFIX%%/bin/iiimd" load_rc_config $name command_args="> /dev/null 2>&1 &" diff --git a/www/apache13+ipv6/files/apache.in b/www/apache13+ipv6/files/apache.in index 1bea1411b8be..9d3448811c47 100644 --- a/www/apache13+ipv6/files/apache.in +++ b/www/apache13+ipv6/files/apache.in @@ -12,8 +12,10 @@ # # DO NOT CHANGE THESE DEFAULT VALUES HERE # +# apache_enable="YES" +# apache_flags="<set as needed>" + apache_enable=${apache_enable-"NO"} -apache_flags=${apache_flags-""} apache_pidfile=${apache_pidfile-"/var/run/httpd.pid"} . %%RC_SUBR%% diff --git a/www/apache13-modperl/files/apache.in b/www/apache13-modperl/files/apache.in index 1dcf95bb3866..8cf65bc56260 100644 --- a/www/apache13-modperl/files/apache.in +++ b/www/apache13-modperl/files/apache.in @@ -13,8 +13,10 @@ # # DO NOT CHANGE THESE DEFAULT VALUES HERE # +# apache_enable="YES" +# apache_flags="<set as needed>" + apache_enable="${apache_enable-NO}" -apache_flags="${apache_flags=''}" apache_pidfile="${apache_pidfile='/var/run/httpd.pid'}" . %%RC_SUBR%% diff --git a/www/apache13-ssl/files/apache.in b/www/apache13-ssl/files/apache.in index 18ff258e3ee2..171848e4879a 100644 --- a/www/apache13-ssl/files/apache.in +++ b/www/apache13-ssl/files/apache.in @@ -36,7 +36,6 @@ required_files=%%PREFIX%%/etc/apache/httpsd.conf load_rc_config $name [ -z "$apache_enable" ] && apache_enable="NO" -[ -z "$apache_flags" ] && apache_flags="" [ -z "$apachelimits_enable" ] && apachelimits_enable="NO" [ -z "$apachelimits_args" ] && apachelimits_args="-e -C daemon" diff --git a/www/apache13/files/apache.in b/www/apache13/files/apache.in index 1bea1411b8be..7bed9127803d 100644 --- a/www/apache13/files/apache.in +++ b/www/apache13/files/apache.in @@ -12,8 +12,10 @@ # # DO NOT CHANGE THESE DEFAULT VALUES HERE # +# apache_enable="YES" +# apache_flags="<set as needed>" + apache_enable=${apache_enable-"NO"} -apache_flags=${apache_flags-""} apache_pidfile=${apache_pidfile-"/var/run/httpd.pid"} . %%RC_SUBR%% diff --git a/www/apache20/files/apache2.sh.in b/www/apache20/files/apache2.sh.in index 9bdda2d30e16..9585d38f1c24 100644 --- a/www/apache20/files/apache2.sh.in +++ b/www/apache20/files/apache2.sh.in @@ -42,8 +42,6 @@ required_files=%%PREFIX%%/etc/apache2/httpd.conf [ -z "$apache2_enable" ] && apache2_enable="NO" [ -z "${apache2ssl_enable}" ] && apache2ssl_enable="NO" -[ -z "$apache2_profiles" ] && apache2_profiles="" -[ -z "$apache2_flags" ] && apache2_flags="" [ -z "$apache2limits_enable" ] && apache2limits_enable="NO" [ -z "$apache2limits_args" ] && apache2limits_args="-e -C daemon" diff --git a/www/apache22/files/apache22.in b/www/apache22/files/apache22.in index d71bb49f58e2..811390bcd2d6 100644 --- a/www/apache22/files/apache22.in +++ b/www/apache22/files/apache22.in @@ -43,8 +43,6 @@ pidfile="${_pidprefix}.pid" required_files=%%PREFIX%%/etc/apache22/httpd.conf [ -z "$apache22_enable" ] && apache22_enable="NO" -[ -z "$apache22_profiles" ] && apache22_profiles="" -[ -z "$apache22_flags" ] && apache22_flags="" [ -z "$apache22limits_enable" ] && apache22limits_enable="NO" [ -z "$apache22limits_args" ] && apache22limits_args="-e -C daemon" [ -z "$apache22_http_accept_enable" ] && apache22_http_accept_enable="NO" diff --git a/www/c-icap/files/c_icap.in b/www/c-icap/files/c_icap.in index 2911b0ec7692..77af2a32aa77 100644 --- a/www/c-icap/files/c_icap.in +++ b/www/c-icap/files/c_icap.in @@ -11,6 +11,7 @@ # Add the following lines to /etc/rc.conf to enable c-icap: # # c_icap_enable="YES" +# c_icap_flags="<set as needed>" # # See '%%PREFIX%%/bin/c-icap --help' for flags # @@ -30,6 +31,5 @@ stop_postcmd="rm -f $pidfile" # read settings, set default values load_rc_config "$name" : ${c_icap_enable="NO"} -: ${c_icap_flags=""} run_rc_command "$1" diff --git a/www/dansguardian-devel/files/dansguardian.in b/www/dansguardian-devel/files/dansguardian.in index e2a47a9f3405..7799aae92111 100644 --- a/www/dansguardian-devel/files/dansguardian.in +++ b/www/dansguardian-devel/files/dansguardian.in @@ -11,8 +11,11 @@ # /etc/rc.conf.d/dansguardian # # DO NOT CHANGE THESE DEFAULT VALUES HERE +# +# dansguardian_enable="YES" +# dansguardian_flags="<set as needed>" + dansguardian_enable=${dansguardian_enable:-"NO"} -dansguardian_flags=${dansguardian_flags:-""} dansguardian_pidfile=${dansguardian_pidfile:-"/var/run/dansguardian.pid"} . %%RC_SUBR%% diff --git a/www/dansguardian/files/dansguardian.in b/www/dansguardian/files/dansguardian.in index e2a47a9f3405..7799aae92111 100644 --- a/www/dansguardian/files/dansguardian.in +++ b/www/dansguardian/files/dansguardian.in @@ -11,8 +11,11 @@ # /etc/rc.conf.d/dansguardian # # DO NOT CHANGE THESE DEFAULT VALUES HERE +# +# dansguardian_enable="YES" +# dansguardian_flags="<set as needed>" + dansguardian_enable=${dansguardian_enable:-"NO"} -dansguardian_flags=${dansguardian_flags:-""} dansguardian_pidfile=${dansguardian_pidfile:-"/var/run/dansguardian.pid"} . %%RC_SUBR%% diff --git a/www/havp/files/havp.in b/www/havp/files/havp.in index 69285a88a9ed..082a94a38d7f 100644 --- a/www/havp/files/havp.in +++ b/www/havp/files/havp.in @@ -11,9 +11,9 @@ # Add the following lines to /etc/rc.conf to enable c-icap: # # havp_enable="YES" +# havp_flags="<set as needed>" # # See '%%PREFIX%%/sbin/havp --help' for flags -# . %%RC_SUBR%% @@ -28,6 +28,5 @@ required_files="%%PREFIX%%/etc/havp/blacklist %%PREFIX%%/etc/havp/havp.config %% # read settings, set default values load_rc_config "$name" : ${havp_enable="NO"} -: ${havp_flags=""} run_rc_command "$1" diff --git a/www/nginx-devel/files/nginx.sh.in b/www/nginx-devel/files/nginx.sh.in index b8e8e79c82f4..68159e9c4d3c 100644 --- a/www/nginx-devel/files/nginx.sh.in +++ b/www/nginx-devel/files/nginx.sh.in @@ -37,8 +37,6 @@ pidfile="${_pidprefix}.pid" required_files=%%PREFIX%%/etc/nginx/nginx.conf [ -z "$nginx_enable" ] && nginx_enable="NO" -[ -z "$nginx_profiles" ] && nginx_profiles="" -[ -z "$nginx_flags" ] && nginx_flags="" [ -z "$nginxlimits_enable" ] && nginxlimits_enable="NO" [ -z "$nginxlimits_args" ] && nginxlimits_args="-e -U %%WWWOWN%%" diff --git a/www/nginx/files/nginx.sh.in b/www/nginx/files/nginx.sh.in index b8e8e79c82f4..68159e9c4d3c 100644 --- a/www/nginx/files/nginx.sh.in +++ b/www/nginx/files/nginx.sh.in @@ -37,8 +37,6 @@ pidfile="${_pidprefix}.pid" required_files=%%PREFIX%%/etc/nginx/nginx.conf [ -z "$nginx_enable" ] && nginx_enable="NO" -[ -z "$nginx_profiles" ] && nginx_profiles="" -[ -z "$nginx_flags" ] && nginx_flags="" [ -z "$nginxlimits_enable" ] && nginxlimits_enable="NO" [ -z "$nginxlimits_args" ] && nginxlimits_args="-e -U %%WWWOWN%%" diff --git a/www/polipo/files/polipo.sh.in b/www/polipo/files/polipo.sh.in index 7fc03e8991d1..bac1e5b5b2bb 100644 --- a/www/polipo/files/polipo.sh.in +++ b/www/polipo/files/polipo.sh.in @@ -5,12 +5,16 @@ # REQUIRE: NETWORK # KEYWORD: shutdown +# Add the following lines to /etc/rc.conf to enable polipo: +# polipo_enable="YES" +# polipo_flags="<set as needed>" + . %%RC_SUBR%% name=polipo rcvar=`set_rcvar` + polipo_enable=${polipo_enable:-"NO"} -polipo_flags=${polipo_flags:-""} polipo_user=%%USER%% polipo_group=%%GROUP%% pidfile=%%PPIDFILE%% diff --git a/www/privoxy/files/privoxy.in b/www/privoxy/files/privoxy.in index 7ebe77cdf1f5..bd986656dd4a 100644 --- a/www/privoxy/files/privoxy.in +++ b/www/privoxy/files/privoxy.in @@ -30,7 +30,6 @@ load_rc_config ${name} : ${privoxy_enable="NO"} : ${privoxy_config="%%PREFIX%%/etc/privoxy/config"} -: ${privoxy_flags=""} : ${privoxy_user="privoxy"} : ${privoxy_pidfile="/var/run/privoxy/privoxy.pid"} diff --git a/www/sams/files/sams.sh.in b/www/sams/files/sams.sh.in index 05146b5fa584..809f61136b1e 100644 --- a/www/sams/files/sams.sh.in +++ b/www/sams/files/sams.sh.in @@ -12,8 +12,10 @@ # # DO NOT CHANGE THESE DEFAULT VALUES HERE # +# sams_enable="YES" +# sams_flags="<set as needed>" + sams_enable=${sams_enable-"NO"} -sams_flags=${sams_flags-""} sams_pidfile=${sams_pidfile-"/var/run/samsdaemon.pid"} . %%RC_SUBR%% diff --git a/www/spreadlogd/files/spreadlogd.sh.in b/www/spreadlogd/files/spreadlogd.sh.in index 24ec9a475ec0..e9643f7722db 100644 --- a/www/spreadlogd/files/spreadlogd.sh.in +++ b/www/spreadlogd/files/spreadlogd.sh.in @@ -10,9 +10,8 @@ # # Add the following lines to /etc/rc.conf to enable spread: # -#spreadlogd_enable="YES" -# -# +# spreadlogd_enable="YES" +# spreadlogd_flags="<set as needed>" . %%RC_SUBR%% @@ -20,14 +19,13 @@ name=spreadlogd rcvar=`set_rcvar` command="%%PREFIX%%/sbin/spreadlogd" -command_args="" pidfile=/var/run/${name}.pid required_files=%%PREFIX%%/etc/${name}.conf +load_rc_config ${name} + # set defaults spreadlogd_enable=${spreadlogd_enable:-"NO"} -spreadlogd_flags=${spreadlogd_flags:-""} -load_rc_config ${name} run_rc_command "$1" diff --git a/www/tclhttpd/files/tclhttpd.sh.in b/www/tclhttpd/files/tclhttpd.sh.in index 70f415371b2c..b464887f7acb 100644 --- a/www/tclhttpd/files/tclhttpd.sh.in +++ b/www/tclhttpd/files/tclhttpd.sh.in @@ -28,7 +28,6 @@ rcvar=`set_rcvar` load_rc_config $name : ${tclhttpd_enable="NO"} -: ${tclhttpd_flags=""} : ${tclhttpd_stdout_log="/var/log/tclhttpd-stdout.log"} : ${tclhttpd_stderr_log="/var/log/tclhttpd-stderr.log"} diff --git a/www/zope/files/zeo.sh b/www/zope/files/zeo.sh index ccd02604fc90..f56d186831fe 100644 --- a/www/zope/files/zeo.sh +++ b/www/zope/files/zeo.sh @@ -7,8 +7,6 @@ # REQUIRE: DAEMON # BEFORE: zope # KEYWORD: shutdown -# -prefix=%%PREFIX%% # Define these zope_* variables in one of these files: # /etc/rc.conf diff --git a/www/zope/files/zope.sh b/www/zope/files/zope.sh index 56f3ab038e84..39f096b4a3b0 100644 --- a/www/zope/files/zope.sh +++ b/www/zope/files/zope.sh @@ -1,14 +1,12 @@ #!/bin/sh # Start or stop zope -# $FreeBSD: /tmp/pcvs/ports/www/zope/files/Attic/zope.sh,v 1.7 2006-02-20 20:47:50 dougb Exp $ +# $FreeBSD: /tmp/pcvs/ports/www/zope/files/Attic/zope.sh,v 1.8 2009-07-15 16:56:10 dougb Exp $ # PROVIDE: zope # REQUIRE: DAEMON # BEFORE: LOGIN # KEYWORD: shutdown -# -prefix=%%PREFIX%% # Define these zope_* variables in one of these files: # /etc/rc.conf |