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.

19 files changed, 32 insertions, 32 deletions

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