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 /mail/spamilter | |
parent | e6246d1055202098dd1df8f2a827665d39dddde8 (diff) | |
download | ports-0175383f0a1f8b78ed514778532f0467a8ccc6dc.tar.gz ports-0175383f0a1f8b78ed514778532f0467a8ccc6dc.zip |
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
Diffstat (limited to 'mail/spamilter')
-rw-r--r-- | mail/spamilter/files/spamilter.sh.in | 12 |
1 files changed, 3 insertions, 9 deletions
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 |