Remove painful examples of foo="", with particular prejudice against

constructions that parse out to [ -z "$foo" ] && foo=""

These are bad examples that get copied and pasted into new code, so the
hope is that with less bad examples there will be less need for me to
bring this up in review.

In a few of these files all that were changed were comments so that next
time I search for these patterns I won't trip on the file for no reason.

In a few places, add $FreeBSD$

No functional changes, so no PORTREVISION bumps

25 files changed, 23 insertions, 43 deletions

diff --git a/www/amphetadesk/files/amphetadesk.in b/www/amphetadesk/files/amphetadesk.in
index f01468475c21..af525de0ee7b 100644
--- a/www/amphetadesk/files/amphetadesk.in
+++ b/www/amphetadesk/files/amphetadesk.in
@@ -12,8 +12,8 @@
 # Add the following lines to /etc/rc.conf to enable amphetadesk:
 #
 #amphetadesk_enable="YES"
-#amphetadesk_user=""
-#amphetadesk_pidfile=""
+#amphetadesk_user=
+#amphetadesk_pidfile=
 #
 
 . /etc/rc.subr
@@ -25,7 +25,6 @@ procname="%%PERL%%"
 
 load_rc_config "${name}"
 : ${amphetadesk_enable="NO"}
-: ${amphetadesk_user=""}
 
 if [ -n "${amphetadesk_user}" ]; then
   eval realpath ~${amphetadesk_user} >/dev/null 2>&1 &&
diff --git a/www/apache13-modssl/files/apache.in b/www/apache13-modssl/files/apache.in
index 82eaf7e75982..d971e1d8c573 100644
--- a/www/apache13-modssl/files/apache.in
+++ b/www/apache13-modssl/files/apache.in
@@ -42,7 +42,6 @@ pidfile="${_pidprefix}.pid"
 required_files=%%PREFIX%%/etc/apache/httpd.conf
 
 [ -z "$apache_enable" ]       && apache_enable="NO"
-[ -z "$apache_profiles" ]     && apache_profiles=""
 [ -z "$apache_flags" ]        && apache_flags="-DSSL"
 [ -z "$apachelimits_enable" ] && apachelimits_enable="NO"
 [ -z "$apachelimits_args" ]   && apachelimits_args="-e -C daemon"
diff --git a/www/cntlm/files/cntlm.in b/www/cntlm/files/cntlm.in
index b0de641e59c3..6dc19f6c7d93 100644
--- a/www/cntlm/files/cntlm.in
+++ b/www/cntlm/files/cntlm.in
@@ -21,7 +21,6 @@ load_rc_config $name
 
 : ${cntlm_enable="NO"}
 : ${cntlm_config="%%{PREFIX}/etc/cntlm.conf"}
-: ${cntlm_flags=""}
 : ${cntlm_user="nobody"}
 
 pidfile=/var/run/${name}.pid
diff --git a/www/fcgiwrap/files/fcgiwrap.in b/www/fcgiwrap/files/fcgiwrap.in
index 39bc2084701d..f3d9fb1f1472 100644
--- a/www/fcgiwrap/files/fcgiwrap.in
+++ b/www/fcgiwrap/files/fcgiwrap.in
@@ -19,7 +19,7 @@
 # this could also be:
 # - tcp:[ipv4_addr]:port (for ipv4)
 # - tcp6:[ipv6_addr]:port (for ipv6)
-# fcgiwrap_flags=""
+# fcgiwrap_flags=
 # Use fcgiwrap_user to run fcgiwrap as user
 
 fcgiwrap_setfib() {
diff --git a/www/httptunnel/files/htc.in b/www/httptunnel/files/htc.in
index 9dc0c434ee03..bfd0a1a0ee17 100644
--- a/www/httptunnel/files/htc.in
+++ b/www/httptunnel/files/htc.in
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# $FreeBSD$
+#
 # PROVIDE: htc
 # REQUIRE: LOGIN
 #
@@ -47,12 +49,6 @@ load_rc_config $name
 : ${htc_enable="NO"}
 : ${htc_user="httptunnel"}
 
-: ${htc_port=""}
-: ${htc_forward=""}
-: ${htc_device=""}
-
-: ${htc_proxy=""}
-: ${htc_proxyauth=""}
 : ${htc_proxybuffer="1K"}
 : ${htc_browser="Mozilla/4.7 [en] (X11; I; Linux 2.2.12 i386)"}
 : ${htc_flags="-S"}
diff --git a/www/httptunnel/files/hts.in b/www/httptunnel/files/hts.in
index 7dcbb1dcc47c..2ccae4627ab7 100644
--- a/www/httptunnel/files/hts.in
+++ b/www/httptunnel/files/hts.in
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# $FreeBSD$
+#
 # PROVIDE: hts
 # REQUIRE: LOGIN
 #
@@ -41,8 +43,6 @@ load_rc_config $name
 : ${hts_user="httptunnel"}
 
 : ${hts_port="8888"}
-: ${hts_device=""}
-: ${hts_forward=""}
 
 [ -n "$hts_device" ] && command_args="-d $hts_device"
 [ -n "$hts_forward" ] && command_args="-F $hts_forward"
diff --git a/www/hudson/files/hudson.sh.in b/www/hudson/files/hudson.sh.in
index 225b06ac4735..67e3d2b12022 100644
--- a/www/hudson/files/hudson.sh.in
+++ b/www/hudson/files/hudson.sh.in
@@ -52,7 +52,6 @@ load_rc_config "${name}"
 : ${hudson_home="%%HUDSON_HOME%%"}
 : ${hudson_args="--webroot=${hudson_home}/war --httpListenAddress=127.0.0.1 --httpPort=8180 --ajp13ListenAddress=127.0.0.1 --ajp13Port=8009 --prefix=/hudson"}
 : ${hudson_java_home="%%JAVA_HOME%%"}
-: ${hudson_java_opts=""}
 : ${hudson_user="%%HUDSON_USER%%"}
 : ${hudson_group="%%HUDSON_GROUP%%"}
 
diff --git a/www/lighttpd/files/lighttpd.sh.in b/www/lighttpd/files/lighttpd.sh.in
index 6f12a3ef2a35..193c0c9f7920 100644
--- a/www/lighttpd/files/lighttpd.sh.in
+++ b/www/lighttpd/files/lighttpd.sh.in
@@ -34,9 +34,7 @@ rcvar=`set_rcvar`
 load_rc_config $name
 
 : ${lighttpd_enable="NO"}
-: ${lighttpd_conf=""}
 : ${lighttpd_pidfile="/var/run/${name}.pid"}
-: ${lighttpd_instances=""}
 
 # Compatibility for old configuration file location
 deprecated_conf=
diff --git a/www/shellinabox/files/shellinaboxd.in b/www/shellinabox/files/shellinaboxd.in
index 7f35e7149ae5..5e00b709ff63 100644
--- a/www/shellinabox/files/shellinaboxd.in
+++ b/www/shellinabox/files/shellinaboxd.in
@@ -20,9 +20,9 @@
 # shellinaboxd_group="%%GROUPS%%"
 # shellinaboxd_port="4200"
 # shellinaboxd_certdir="%%ETCDIR%%"
-# shellinaboxd_certfile=""
+# shellinaboxd_certfile=
 # 	Example: shellinaboxd_certfile="/your/cert.pem"
-# shellinaboxd_flags=""
+# shellinaboxd_flags=
 
 shellinaboxd_setfib() {
 	sysctl net.fibs >/dev/null 2>&1 || return 0
diff --git a/www/spawn-fcgi/files/spawn-fcgi.sh.in b/www/spawn-fcgi/files/spawn-fcgi.sh.in
index 34177b4bac4d..414f2502b80b 100644
--- a/www/spawn-fcgi/files/spawn-fcgi.sh.in
+++ b/www/spawn-fcgi/files/spawn-fcgi.sh.in
@@ -1,10 +1,19 @@
 #!/bin/sh
-#
 
+# $FreeBSD$
+#
 # PROVIDE: spawn_fcgi
 # REQUIRE: %%REQUIRE%%
 # BEFORE:  LOGIN
 # KEYWORD: shutdown
+#
+# Optional settings:
+#
+# spawn_fcgi_app_args
+# spawn_fcgi_chroot_dir
+# spawn_fcgi_bindsocket
+# spawn_fcgi_web_server_addrs
+# spawn_fcgi_allowed_env
 
 . /etc/rc.subr
 
@@ -15,19 +24,14 @@ load_rc_config $name
 
 : ${spawn_fcgi_enable="NO"}
 : ${spawn_fcgi_app="%%LOCALBASE%%/bin/php-cgi"}
-: ${spawn_fcgi_app_args=""}
 : ${spawn_fcgi_pidfile="/var/run/spawn-fcgi.pid"}
 : ${spawn_fcgi_username="www"}
 : ${spawn_fcgi_groupname="www"}
-: ${spawn_fcgi_chroot_dir=""}
 : ${spawn_fcgi_bindaddr="127.0.0.1"}
 : ${spawn_fcgi_bindport="9000"}
-: ${spawn_fcgi_bindsocket=""}
 : ${spawn_fcgi_bindsocket_mode="0777"}
 : ${spawn_fcgi_children="5"}
 : ${spawn_fcgi_max_requests="1000"}
-: ${spawn_fcgi_web_server_addrs=""}
-: ${spawn_fcgi_allowed_env=""}
 : ${spawn_fcgi_path_env="/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin"}
 
 if [ -z "${spawn_fcgi_bindsocket}" ]; then
diff --git a/www/varnish/files/varnishd.in b/www/varnish/files/varnishd.in
index 93c070424252..e238fbef7831 100644
--- a/www/varnish/files/varnishd.in
+++ b/www/varnish/files/varnishd.in
@@ -64,7 +64,6 @@ load_rc_config ${name}
 : ${varnishd_listen:=":80"}
 : ${varnishd_admin:="localhost:81"}
 : ${varnishd_backend:="localhost:8080"}
-: ${varnishd_config:=""}
 : ${varnishd_storage:="file,/tmp,50%"}
 : ${varnishd_hash:="classic,16383"}
 : ${varnishd_user:="www"}
diff --git a/www/varnish2/files/varnishd.in b/www/varnish2/files/varnishd.in
index 93c070424252..e238fbef7831 100644
--- a/www/varnish2/files/varnishd.in
+++ b/www/varnish2/files/varnishd.in
@@ -64,7 +64,6 @@ load_rc_config ${name}
 : ${varnishd_listen:=":80"}
 : ${varnishd_admin:="localhost:81"}
 : ${varnishd_backend:="localhost:8080"}
-: ${varnishd_config:=""}
 : ${varnishd_storage:="file,/tmp,50%"}
 : ${varnishd_hash:="classic,16383"}
 : ${varnishd_user:="www"}
diff --git a/www/webredirect/files/webredirect.sh.in b/www/webredirect/files/webredirect.sh.in
index 999662cd71b8..eb21675e3c73 100644
--- a/www/webredirect/files/webredirect.sh.in
+++ b/www/webredirect/files/webredirect.sh.in
@@ -1,14 +1,14 @@
 #!/bin/sh
 
+# $FreeBSD$
+#
 # PROVIDE: webredirect
 # REQUIRE: DAEMON
-
 #
 # Add the following lines to /etc/rc.conf to enable webredirect:
 #
-# webredirect_enable="YES"    # YES or NO (default)
-# webredirect_flags=""        # webredirect command line flags
-#
+# webredirect_enable="YES"	# YES or NO (default)
+# webredirect_flags		# webredirect command line flags
 
 . /etc/rc.subr
 
diff --git a/www/zope210/files/zeo210.in b/www/zope210/files/zeo210.in
index 41ba08849538..b654a3f9f733 100644
--- a/www/zope210/files/zeo210.in
+++ b/www/zope210/files/zeo210.in
@@ -57,7 +57,6 @@ restart_cmd="zeo210_restart"
 load_rc_config $name
 
 : ${zeo210_enable="NO"}
-: ${zeo210_instances=""}
 
 cmd="$1"
 [ $# -gt 0 ] && shift
diff --git a/www/zope210/files/zope210.in b/www/zope210/files/zope210.in
index 1ff69995c10d..149781d585df 100644
--- a/www/zope210/files/zope210.in
+++ b/www/zope210/files/zope210.in
@@ -56,7 +56,6 @@ restart_cmd="zope210_restart"
 load_rc_config $name
 
 : ${zope210_enable="NO"}
-: ${zope210_instances=""}
 
 cmd="$1"
 [ $# -gt 0 ] && shift
diff --git a/www/zope211/files/zeo211.in b/www/zope211/files/zeo211.in
index 1e1396dd9462..6d8d5938d6ab 100644
--- a/www/zope211/files/zeo211.in
+++ b/www/zope211/files/zeo211.in
@@ -57,7 +57,6 @@ restart_cmd="zeo211_restart"
 load_rc_config $name
 
 : ${zeo211_enable="NO"}
-: ${zeo211_instances=""}
 
 cmd="$1"
 [ $# -gt 0 ] && shift
diff --git a/www/zope211/files/zope211.in b/www/zope211/files/zope211.in
index cb099a835395..dc32d8614e3c 100644
--- a/www/zope211/files/zope211.in
+++ b/www/zope211/files/zope211.in
@@ -55,7 +55,6 @@ restart_cmd="zope211_restart"
 load_rc_config $name
 
 : ${zope211_enable="NO"}
-: ${zope211_instances=""}
 
 cmd="$1"
 [ $# -gt 0 ] && shift
diff --git a/www/zope213/files/zeo211.in b/www/zope213/files/zeo211.in
index 1e1396dd9462..6d8d5938d6ab 100644
--- a/www/zope213/files/zeo211.in
+++ b/www/zope213/files/zeo211.in
@@ -57,7 +57,6 @@ restart_cmd="zeo211_restart"
 load_rc_config $name
 
 : ${zeo211_enable="NO"}
-: ${zeo211_instances=""}
 
 cmd="$1"
 [ $# -gt 0 ] && shift
diff --git a/www/zope213/files/zope211.in b/www/zope213/files/zope211.in
index cb099a835395..dc32d8614e3c 100644
--- a/www/zope213/files/zope211.in
+++ b/www/zope213/files/zope211.in
@@ -55,7 +55,6 @@ restart_cmd="zope211_restart"
 load_rc_config $name
 
 : ${zope211_enable="NO"}
-: ${zope211_instances=""}
 
 cmd="$1"
 [ $# -gt 0 ] && shift
diff --git a/www/zope28/files/zeo28.sh.in b/www/zope28/files/zeo28.sh.in
index 4f033edf6e77..4346c034d714 100644
--- a/www/zope28/files/zeo28.sh.in
+++ b/www/zope28/files/zeo28.sh.in
@@ -57,7 +57,6 @@ restart_cmd="zeo28_restart"
 load_rc_config $name
 
 : ${zeo28_enable="NO"}
-: ${zeo28_instances=""}
 
 cmd="$1"
 [ $# -gt 0 ] && shift
diff --git a/www/zope28/files/zope28.sh.in b/www/zope28/files/zope28.sh.in
index adb1c1a7ccbc..f9a127eaddcb 100644
--- a/www/zope28/files/zope28.sh.in
+++ b/www/zope28/files/zope28.sh.in
@@ -56,7 +56,6 @@ restart_cmd="zope28_restart"
 load_rc_config $name
 
 : ${zope28_enable="NO"}
-: ${zope28_instances=""}
 
 cmd="$1"
 [ $# -gt 0 ] && shift
diff --git a/www/zope29/files/zeo29.sh.in b/www/zope29/files/zeo29.sh.in
index 9c5510a0a770..c96f0c63e3e8 100644
--- a/www/zope29/files/zeo29.sh.in
+++ b/www/zope29/files/zeo29.sh.in
@@ -57,7 +57,6 @@ restart_cmd="zeo29_restart"
 load_rc_config $name
 
 : ${zeo29_enable="NO"}
-: ${zeo29_instances=""}
 
 cmd="$1"
 [ $# -gt 0 ] && shift
diff --git a/www/zope29/files/zope29.sh.in b/www/zope29/files/zope29.sh.in
index 3245091c712d..23d3e62f334b 100644
--- a/www/zope29/files/zope29.sh.in
+++ b/www/zope29/files/zope29.sh.in
@@ -56,7 +56,6 @@ restart_cmd="zope29_restart"
 load_rc_config $name
 
 : ${zope29_enable="NO"}
-: ${zope29_instances=""}
 
 cmd="$1"
 [ $# -gt 0 ] && shift
diff --git a/www/zope3/files/zeo3.sh.in b/www/zope3/files/zeo3.sh.in
index 9dbb591a7088..74bc669e2b33 100644
--- a/www/zope3/files/zeo3.sh.in
+++ b/www/zope3/files/zeo3.sh.in
@@ -56,7 +56,6 @@ restart_cmd="zeo3_restart"
 load_rc_config $name
 
 : ${zeo3_enable="NO"}
-: ${zeo3_instances=""}
 
 cmd="$1"
 [ $# -gt 0 ] && shift
diff --git a/www/zope3/files/zope3.sh.in b/www/zope3/files/zope3.sh.in
index a9c11851cbca..a54a1d1268b3 100644
--- a/www/zope3/files/zope3.sh.in
+++ b/www/zope3/files/zope3.sh.in
@@ -56,7 +56,6 @@ restart_cmd="zope3_restart"
 load_rc_config $name
 
 : ${zope3_enable="NO"}
-: ${zope3_instances=""}
 
 cmd="$1"
 [ $# -gt 0 ] && shift