aboutsummaryrefslogtreecommitdiff
path: root/mail/milter-regex
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2009-07-15 16:56:10 +0000
committerDoug Barton <dougb@FreeBSD.org>2009-07-15 16:56:10 +0000
commit0175383f0a1f8b78ed514778532f0467a8ccc6dc (patch)
tree4c98b621f22bb861a40c6493c6ed7517f295f7f3 /mail/milter-regex
parente6246d1055202098dd1df8f2a827665d39dddde8 (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
Diffstat (limited to 'mail/milter-regex')
-rw-r--r--mail/milter-regex/files/milterregex.sh.in13
1 files changed, 3 insertions, 10 deletions
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() {