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.

1 files changed, 3 insertions, 9 deletions

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() {