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.

23 files changed, 27 insertions, 47 deletions

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%%