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

18 files changed, 24 insertions, 31 deletions

diff --git a/net/dhcprelay/files/dhcprelay.in b/net/dhcprelay/files/dhcprelay.in
index 456cf0ea18a8..b693b7297fbd 100644
--- a/net/dhcprelay/files/dhcprelay.in
+++ b/net/dhcprelay/files/dhcprelay.in
@@ -9,8 +9,8 @@
 #
 # dhcprelay_enable="YES"
 #
-# dhcprelay_server=""	# dhcprelay server(s)
-# dhcprelay_ifaces=""	# ethernet interface(s)
+# dhcprelay_server	dhcprelay server(s)
+# dhcprelay_ifaces	ethernet interface(s)
 
 . /etc/rc.subr
 
diff --git a/net/ifstated/files/ifstated.in b/net/ifstated/files/ifstated.in
index b141c550f61e..8da538bef68f 100644
--- a/net/ifstated/files/ifstated.in
+++ b/net/ifstated/files/ifstated.in
@@ -48,8 +48,6 @@ command_args="-p \"${pidfile}\""
 load_rc_config $name
 
 : ${ifstated_enable:="NO"}
-: ${ifstated_flags:=""}
-: ${ifstated_profiles:=""}
 
 if [ -n "$2" ]
 then
diff --git a/net/iodine/files/iodined.in b/net/iodine/files/iodined.in
index bf9c6008fc70..afaedc07fa9f 100644
--- a/net/iodine/files/iodined.in
+++ b/net/iodine/files/iodined.in
@@ -29,8 +29,6 @@ command=%%PREFIX%%/sbin/${name}
 load_rc_config $name
 
 : ${iodined_enable="NO"}
-: ${iodined_password=""}
-: ${iodined_domain=""}
 : ${iodined_addr="172.16.0.1"}
 : ${iodined_flags="-u _iodined -t /var/empty"}
 
diff --git a/net/isc-dhcp31-server/files/isc-dhcrelay.in b/net/isc-dhcp31-server/files/isc-dhcrelay.in
index 950ff5eecf5b..faa26e0d402b 100644
--- a/net/isc-dhcp31-server/files/isc-dhcrelay.in
+++ b/net/isc-dhcp31-server/files/isc-dhcrelay.in
@@ -12,9 +12,9 @@
 
 # override these variables in /etc/rc.conf
 dhcrelay_enable=${dhcrelay_enable:-"NO"}
-# dhcrelay_flags=""			# command option(s)
-# dhcrelay_servers=""			# dhcrelay server(s)
-# dhcrelay_ifaces=""			# ethernet interface(s)
+# dhcrelay_flags			# command option(s)
+# dhcrelay_servers			# dhcrelay server(s)
+# dhcrelay_ifaces			# ethernet interface(s)
 
 dhcrelay_precmd ()
 {
diff --git a/net/linknx/files/linknx.in b/net/linknx/files/linknx.in
index 1c1e3fee97c9..be89e807a33e 100644
--- a/net/linknx/files/linknx.in
+++ b/net/linknx/files/linknx.in
@@ -29,7 +29,6 @@ start_precmd="linknx_precmd"
 
 : ${linknx_enable:="NO"}
 : ${linknx_console:="/var/log/linknx.log"}
-: ${linknx_config:=""}
 : ${linknx_pidfile:="/var/run/linknx.pid"}
 : ${linknx_flags:="--pid-file=${linknx_pidfile}"}
 
diff --git a/net/lvwimax/files/lvwimax.in b/net/lvwimax/files/lvwimax.in
index be612c2fec71..6dc904cc7b7f 100644
--- a/net/lvwimax/files/lvwimax.in
+++ b/net/lvwimax/files/lvwimax.in
@@ -24,7 +24,6 @@ lvwimax_enable=${lvwimax_enable-"NO"}
 lvwimax_mac_address=${lvwimax_mac_address-"00:00:00:00:00:00"}
 
 command=%%PREFIX%%/sbin/${name}
-command_args=""
 
 start_precmd="lvwimax_prestart"
 start_postcmd="lvwimax_poststart"
diff --git a/net/mediaproxy/files/mediaproxy.sh.in b/net/mediaproxy/files/mediaproxy.sh.in
index e20cf1646aec..002b29e3a1e9 100644
--- a/net/mediaproxy/files/mediaproxy.sh.in
+++ b/net/mediaproxy/files/mediaproxy.sh.in
@@ -1,4 +1,6 @@
 #!/bin/sh
+
+# $FreeBSD$
 #
 # mediaproxy   starts and stops the SER MediaProxy server
 
diff --git a/net/openldap24-server/files/slapd.sh.in b/net/openldap24-server/files/slapd.sh.in
index babab884cb10..596a5e18276a 100644
--- a/net/openldap24-server/files/slapd.sh.in
+++ b/net/openldap24-server/files/slapd.sh.in
@@ -50,7 +50,6 @@ fi
 : ${slapd_owner="ldap:ldap"}
 : ${slapd_sockets_mode="666"}
 : ${slapd_cn_config="NO"}
-: ${slapd_krb5_ktname=""}
 
 command="%%PREFIX%%/libexec/slapd"
 pidfile="%%LDAP_RUN_DIR%%/slapd.pid"
diff --git a/net/quagga/files/quagga.sh.in b/net/quagga/files/quagga.sh.in
index 7e6cc3de2350..ceb71b62d1b2 100644
--- a/net/quagga/files/quagga.sh.in
+++ b/net/quagga/files/quagga.sh.in
@@ -1,6 +1,7 @@
 #!/bin/sh
-#
 
+# $FreeBSD$
+#
 # PROVIDE: quagga
 # REQUIRE: netif routing 
 # KEYWORD: nojail
@@ -81,8 +82,6 @@ load_rc_config $name
 : ${quagga_enable="NO"}
 : ${quagga_flags="-d"}
 : ${quagga_daemons="zebra ripd ripngd ospfd ospf6d bgpd isisd"}
-: ${quagga_extralibs_path=""}
-: ${quagga_wait_for=""}
 
 quagga_cmd=$1
 
diff --git a/net/quagga/files/watchquagga.sh.in b/net/quagga/files/watchquagga.sh.in
index d8b04e06fc92..cb0d1bf1e751 100644
--- a/net/quagga/files/watchquagga.sh.in
+++ b/net/quagga/files/watchquagga.sh.in
@@ -1,15 +1,15 @@
 #!/bin/sh
-#
 
+# $FreeBSD$
+#
 # PROVIDE: watchquagga
 # REQUIRE: NETWORKING quagga
-
 #
 # Add the following line to /etc/rc.conf to enable quagga:
-#watchquagga_enable="YES"
+# watchquagga_enable="YES"
 #
 # You may also wish to use the following variables to fine-tune startup:
-#watchquagga_flags=""
+# watchquagga_flags
 #
 #
 
diff --git a/net/scribe/files/scribe.in b/net/scribe/files/scribe.in
index a65ba65ae460..8acd455aceba 100644
--- a/net/scribe/files/scribe.in
+++ b/net/scribe/files/scribe.in
@@ -18,7 +18,6 @@ stop_postcmd=scribe_cleanup
 
 load_rc_config "$name"
 : ${scribe_enable="NO"}
-: ${scribe_flags=""}
 
 scribe_start()
 {
diff --git a/net/siproxd/files/siproxd.sh.in b/net/siproxd/files/siproxd.sh.in
index 7ba06f5c4d93..a0b635d50269 100644
--- a/net/siproxd/files/siproxd.sh.in
+++ b/net/siproxd/files/siproxd.sh.in
@@ -13,7 +13,7 @@
 #
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 # siproxd_enable="YES"
-# siproxd_flags=""		# Flags to siproxd program
+# siproxd_flags	Flags to siproxd program
 
 siproxd_enable=${siproxd_enable:-"NO"}	# Enable siproxd
 
diff --git a/net/spread/files/spread.sh.in b/net/spread/files/spread.sh.in
index a523e293e2bd..11663d40cbf5 100644
--- a/net/spread/files/spread.sh.in
+++ b/net/spread/files/spread.sh.in
@@ -22,7 +22,7 @@ name=spread
 rcvar=`set_rcvar`
 
 command="%%PREFIX%%/sbin/spread"
-command_args=""
+
 pidfile=/var/run/${name}.pid
 required_files=%%PREFIX%%/etc/${name}.conf
 
diff --git a/net/spread4/files/spread.sh.in b/net/spread4/files/spread.sh.in
index dda54b6ac049..4e010a6a8f1f 100644
--- a/net/spread4/files/spread.sh.in
+++ b/net/spread4/files/spread.sh.in
@@ -21,7 +21,7 @@ name=spread
 rcvar=`set_rcvar`
 
 command="%%PREFIX%%/sbin/spread"
-command_args=""
+
 pidfile=/var/run/${name}.pid
 required_files=%%PREFIX%%/etc/${name}.conf
 
diff --git a/net/sslh/files/sslh.in b/net/sslh/files/sslh.in
index 5af38892522d..6ed10885808d 100644
--- a/net/sslh/files/sslh.in
+++ b/net/sslh/files/sslh.in
@@ -21,7 +21,7 @@
 # sslh_sshtimeout="2"
 # sslh_listening="0.0.0.0:8443"	
 # sslh_uid="nobody"
-# sslh_flags=""
+# sslh_flags
 
 sslh_setfib() {
 	sysctl net.fibs >/dev/null 2>&1 || return 0
diff --git a/net/wired-tracker/files/trackerd.sh.in b/net/wired-tracker/files/trackerd.sh.in
index bf60acf05b0c..124775cd21c6 100644
--- a/net/wired-tracker/files/trackerd.sh.in
+++ b/net/wired-tracker/files/trackerd.sh.in
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# $FreeBSD$
+#
 # PROVIDE: trackerd
 # REQUIRE: 
 #
@@ -22,6 +24,4 @@ load_rc_config $name
 
 : ${trackerd_enable="NO"}
 
-command_args=""
-
 run_rc_command "$1"
diff --git a/net/wired/files/wired.sh.in b/net/wired/files/wired.sh.in
index cd85bb39a5b7..9a0f6297e3d2 100644
--- a/net/wired/files/wired.sh.in
+++ b/net/wired/files/wired.sh.in
@@ -1,5 +1,7 @@
 #!/bin/sh
 
+# $FreeBSD$
+#
 # PROVIDE: wired
 # REQUIRE: 
 #
@@ -22,6 +24,4 @@ load_rc_config $name
 
 : ${wired_enable="NO"}
 
-command_args=""
-
 run_rc_command "$1"
diff --git a/net/xorp-devel/files/xorp.in b/net/xorp-devel/files/xorp.in
index 1f4fcce39586..03b32a10034f 100644
--- a/net/xorp-devel/files/xorp.in
+++ b/net/xorp-devel/files/xorp.in
@@ -11,9 +11,10 @@
 
 # Add the following lines to /etc/rc.conf to enable xorp:
 #
-#xorp_enable="YES"
-#xorp_conf="%%PREFIX%%/etc/xorp.conf.sample"
+# xorp_enable="YES"
+# xorp_conf="%%PREFIX%%/etc/xorp.conf.sample"
 #
+# xorp_flags	(Set as needed)
 
 . /etc/rc.subr
 
@@ -24,7 +25,6 @@ load_rc_config $name
 
 : ${xorp_enable="NO"}
 : ${xorp_conf="%%PREFIX%%/etc/xorp.conf"}
-: ${xorp_flags=""}
 : ${xorp_rtrmgr_pidfile="/var/run/xorp_rtrmgr.pid"}
 : ${xorp_rtrmgr_logfile="/var/log/xorp_rtrmgr.log"}
 : ${xorp_rtrmgr_poll_enable=true}