39 files changed, 84 insertions, 126 deletions

diff --git a/net/cnupm/files/cnupm.sh.in b/net/cnupm/files/cnupm.sh.in
index 13072497faf2..09a188606f65 100644
--- a/net/cnupm/files/cnupm.sh.in
+++ b/net/cnupm/files/cnupm.sh.in
@@ -8,7 +8,7 @@
 #
 # cnupm_enable="YES"
 # cnupm_ifaces="rl0"	# Change this with your interface!
-# cnupm_flags=""		# Set this one to override default flags
+# cnupm_flags=""	# Set this one to override default flags
 #
 # See cnupm(8) for flags
 #
diff --git a/net/dhcp6/files/dhcp6c.sh.in b/net/dhcp6/files/dhcp6c.sh.in
index a37fc52c3363..ce786553db40 100644
--- a/net/dhcp6/files/dhcp6c.sh.in
+++ b/net/dhcp6/files/dhcp6c.sh.in
@@ -28,14 +28,13 @@
 name="dhcp6c"
 rcvar=${name}_enable
 
-prefix="%%PREFIX%%"
-command="${prefix}/sbin/${name}"
+command="%%PREFIX%%/sbin/${name}"
 start_precmd="${name}_precmd"
 
 load_rc_config $name
 
 : ${dhcp6c_enable="NO"}
-: ${dhcp6c_config="${prefix}/etc/${name}.conf"}
+: ${dhcp6c_config="%%PREFIX%%/etc/${name}.conf"}
 : ${dhcp6c_pidfile="/var/run/${name}.pid"}
 
 required_files="${dhcp6c_config}"
diff --git a/net/dhcp6/files/dhcp6relay.sh.in b/net/dhcp6/files/dhcp6relay.sh.in
index f548ac28367c..3dff743fb82d 100644
--- a/net/dhcp6/files/dhcp6relay.sh.in
+++ b/net/dhcp6/files/dhcp6relay.sh.in
@@ -25,8 +25,7 @@
 name="dhcp6relay"
 rcvar=${name}_enable
 
-prefix=%%PREFIX%%
-command=${prefix}/sbin/${name}
+command=%%PREFIX%%/sbin/${name}
 start_precmd="${name}_precmd"
 
 load_rc_config $name
diff --git a/net/dhcp6/files/dhcp6s.sh.in b/net/dhcp6/files/dhcp6s.sh.in
index f31a405d8651..da1bb167fa5e 100644
--- a/net/dhcp6/files/dhcp6s.sh.in
+++ b/net/dhcp6/files/dhcp6s.sh.in
@@ -26,14 +26,13 @@
 name="dhcp6s"
 rcvar=${name}_enable
 
-prefix=%%PREFIX%%
-command=${prefix}/sbin/${name}
+command=%%PREFIX%%/sbin/${name}
 start_precmd="${name}_precmd"
 
 load_rc_config $name
 
 : ${dhcp6s_enable="NO"}
-: ${dhcp6s_config="${prefix}/etc/${name}.conf"}
+: ${dhcp6s_config="%%PREFIX%%/etc/${name}.conf"}
 
 required_files=${dhcp6s_config}
 command_args="-c ${dhcp6s_config} ${dhcp6s_flags} ${dhcp6s_interface}"
diff --git a/net/dtcp/files/dtcpc.sh.in b/net/dtcp/files/dtcpc.sh.in
index ac4ad6ab6a58..512f2c575519 100644
--- a/net/dtcp/files/dtcpc.sh.in
+++ b/net/dtcp/files/dtcpc.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 dtcpc.sh to /etc/rc.d/dtcpc
-
-prefix=%%PREFIX%%
 
 # Define these dtcpc_* variables in one of these files:
 #	/etc/rc.conf
@@ -22,7 +16,7 @@ prefix=%%PREFIX%%
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 #
 dtcpc_enable=${dtcpc_enable:-"NO"}		# Enable dtcpc
-#dtcpc_program="${prefix}/sbin/dtcpc"		# Location of dtcpc
+#dtcpc_program="%%PREFIX%%/sbin/dtcpc"		# Location of dtcpc
 dtcpc_server=${dtcpc_server:-""}		# DTCP server name
 dtcpc_username=${dtcpc_username:-""}		# DTCP user name
 dtcpc_flags=${dtcpc_flags:-"-t network -Dl"}	# Flags to dtcpc program
@@ -31,7 +25,7 @@ dtcpc_flags=${dtcpc_flags:-"-t network -Dl"}	# Flags to dtcpc program
 
 name="dtcpc"
 rcvar=`set_rcvar`
-command="${prefix}/sbin/${name}"
+command="%%PREFIX%%/sbin/${name}"
 command_interpreter="%%RUBY%%"
 pidfile="/var/run/${name}.pid"
 extra_commands="reload"
diff --git a/net/dtcp/files/dtcps.sh.in b/net/dtcp/files/dtcps.sh.in
index f6bb60d651cf..cb92f3476c20 100644
--- a/net/dtcp/files/dtcps.sh.in
+++ b/net/dtcp/files/dtcps.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 dtcps.sh to /etc/rc.d/dtcps
-
-prefix=%%PREFIX%%
 
 # Define these dtcps_* variables in one of these files:
 #	/etc/rc.conf
@@ -22,10 +16,10 @@ prefix=%%PREFIX%%
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 #
 dtcps_enable=${dtcps_enable:-"NO"}		# Enable dtcps
-#dtcps_program="${prefix}/sbin/dtcps"		# Location of dtcps
-dtcps_tunif=${dtcps_tunif:-""}			# tunnel interface
-dtcps_prefix=${dtcps_prefix:-""}		# prefix for host tunnel type
-dtcps_flags=${dtcps_flags:-""}			# Flags to dtcps program
+# dtcps_program="%%PREFIX%%/sbin/dtcps"		# Location of dtcps
+# dtcps_tunif=${dtcps_tunif:-""}		# tunnel interface
+# dtcps_prefix=${dtcps_prefix:-""}		# prefix for host tunnel type
+# dtcps_flags=${dtcps_flags:-""}		# Flags to dtcps program
 
 # interface cloning example
 #dtcps_tunif='gif70'
@@ -43,7 +37,7 @@ dtcps_flags=${dtcps_flags:-""}			# Flags to dtcps program
 
 name="dtcps"
 rcvar=`set_rcvar`
-command="${prefix}/sbin/${name}"
+command="%%PREFIX%%/sbin/${name}"
 command_interpreter="%%RUBY%%"
 pidfile="/var/run/${name}.pid"
 start_precmd="dtcps_prestart"
diff --git a/net/dtcpclient/files/dtcpclient.sh.in b/net/dtcpclient/files/dtcpclient.sh.in
index 156923be85a1..1b90df11c581 100644
--- a/net/dtcpclient/files/dtcpclient.sh.in
+++ b/net/dtcpclient/files/dtcpclient.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 dtcpclient.sh to /etc/rc.d/dtcpclient
-
-prefix=%%PREFIX%%
 
 # Define these dtcpclient_* variables in one of these files:
 #	/etc/rc.conf
@@ -22,7 +16,7 @@ prefix=%%PREFIX%%
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 #
 dtcpclient_enable=${dtcpclient_enable:-"NO"}	# Enable dtcpclient
-#dtcpclient_program="${prefix}/sbin/dtcpclient"	# Location of dtcpclient
+#dtcpclient_program="%%PREFIX%%/sbin/dtcpclient" # Location of dtcpclient
 dtcpclient_server=${dtcpclient_server:-""}	# DTCP server name
 dtcpclient_username=${dtcpclient_username:-""}	# DTCP user name
 dtcpclient_flags=${dtcpclient_flags:-"-t network -Dl"}	# Flags to dtcpclient program
@@ -31,7 +25,7 @@ dtcpclient_flags=${dtcpclient_flags:-"-t network -Dl"}	# Flags to dtcpclient pro
 
 name="dtcpclient"
 rcvar=`set_rcvar`
-command="${prefix}/sbin/${name}"
+command="%%PREFIX%%/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 extra_commands="reload"
 
diff --git a/net/gateway6/files/gateway6.sh.in b/net/gateway6/files/gateway6.sh.in
index eb442d707211..2f3c53bcd5f1 100644
--- a/net/gateway6/files/gateway6.sh.in
+++ b/net/gateway6/files/gateway6.sh.in
@@ -29,6 +29,5 @@ required_files=%%PREFIX%%/etc/gw6c.conf
 load_rc_config $name
 
 : ${gateway6_enable="NO"}
-: ${gateway6_flags=""}
 
 run_rc_command "$1"
diff --git a/net/isc-dhcp30-server/files/isc-dhcrelay.in b/net/isc-dhcp30-server/files/isc-dhcrelay.in
index db10841ff32a..a98176731662 100644
--- a/net/isc-dhcp30-server/files/isc-dhcrelay.in
+++ b/net/isc-dhcp30-server/files/isc-dhcrelay.in
@@ -12,9 +12,9 @@
 
 # override these variables in /etc/rc.conf
 dhcrelay_enable=${dhcrelay_enable:-"NO"}
-dhcrelay_flags=${dhcrelay_flags:-}			# command option(s)
-dhcrelay_servers=${dhcrelay_servers:-}			# dhcrelay server(s)
-dhcrelay_ifaces=${dhcrelay_ifaces:-}			# ethernet interface(s)
+# dhcrelay_flags=${dhcrelay_flags:-}			# command option(s)
+# dhcrelay_servers=${dhcrelay_servers:-}		# dhcrelay server(s)
+# dhcrelay_ifaces=${dhcrelay_ifaces:-}			# ethernet interface(s)
 
 dhcrelay_precmd ()
 {
diff --git a/net/isc-dhcp31-server/files/isc-dhcpd.in b/net/isc-dhcp31-server/files/isc-dhcpd.in
index c1e482945ad2..b07255550367 100644
--- a/net/isc-dhcp31-server/files/isc-dhcpd.in
+++ b/net/isc-dhcp31-server/files/isc-dhcpd.in
@@ -22,9 +22,9 @@ load_rc_config ${name}
 
 # override these variables in /etc/rc.conf
 dhcpd_enable=${dhcpd_enable:-"NO"}
-dhcpd_flags=${dhcpd_flags:-} # -q -early_chroot		# command option(s)
+# dhcpd_flags=""		# -q -early_chroot	# command option(s)
+# dhcpd_ifaces=""					# ethernet interface(s)
 dhcpd_conf=${dhcpd_conf:-%%PREFIX%%/etc/${name}.conf}	# configuration file
-dhcpd_ifaces=${dhcpd_ifaces:-}				# ethernet interface(s)
 dhcpd_withumask=${dhcpd_withumask:-022}			# file creation mask
 
 dhcpd_chuser_enable=${dhcpd_chuser_enable:-"%%PARANOIA%%"}	# runs w/o privileges?
@@ -35,12 +35,12 @@ dhcpd_chroot_enable=${dhcpd_chroot_enable:-"NO"}	# runs chrooted?
 dhcpd_devfs_enable=${dhcpd_devfs_enable:-"YES"}		# devfs if available?
 dhcpd_makedev_enable=${dhcpd_makedev_enable:-"NO"}	# MAKEDEV instead of devfs?
 dhcpd_rootdir=${dhcpd_rootdir:-/var/db/${name}}		# directory to run in
-dhcpd_includedir=${dhcpd_includedir:-}			# directory for included config files
+# dhcpd_includedir=""			# directory for included config files
 
 # untested
 dhcpd_jail_enable=${dhcpd_jail_enable:-"NO"}		# runs imprisoned?
-dhcpd_hostname=${dhcpd_hostname:-}			# jail hostname
-dhcpd_ipaddress=${dhcpd_ipaddress:-}			# jail ip address
+# dhcpd_hostname=""					# jail hostname
+# dhcpd_ipaddress=""					# jail ip address
 
 safe_run ()	# rc command [args...]
 {
diff --git a/net/isc-dhcp31-server/files/isc-dhcrelay.in b/net/isc-dhcp31-server/files/isc-dhcrelay.in
index db10841ff32a..7e51d989c79e 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=${dhcrelay_flags:-}			# command option(s)
-dhcrelay_servers=${dhcrelay_servers:-}			# dhcrelay server(s)
-dhcrelay_ifaces=${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/mediatomb/files/mediatomb.sh.in b/net/mediatomb/files/mediatomb.sh.in
index 1ee812143875..66c4d2bac39f 100644
--- a/net/mediatomb/files/mediatomb.sh.in
+++ b/net/mediatomb/files/mediatomb.sh.in
@@ -16,13 +16,13 @@
 . %%RC_SUBR%%
 
 mediatomb_enable=${mediatomb_enable-"NO"}
+# mediatomb_flags="<set as needed>"
+# mediatomb_interface="<set as needed>"
 mediatomb_mtuser=${mediatomb_mtuser-"%%MEDIATOMB_USER%%"}
 mediatomb_mtgroup=${mediatomb_mtgroup-"%%MEDIATOMB_GROUP%%"}
 mediatomb_config=${mediatomb_config-"%%PREFIX%%/etc/mediatomb/config.xml"}
-mediatomb_flags=${mediatomb_flags-""}
 mediatomb_logfile=${mediatomb_logfile-"%%MEDIATOMB_DIR%%/mediatomb.log"}
 mediatomb_pidfile=${mediatomb_pidfile-"%%MEDIATOMB_DIR%%/mediatomb.pid"}
-mediatomb_interface=${mediatomb_interface-""}
 
 name="mediatomb"
 rcvar=`set_rcvar`
diff --git a/net/miniupnpd/files/miniupnpd.sh.in b/net/miniupnpd/files/miniupnpd.sh.in
index 8d5905528523..e2357ecddc32 100644
--- a/net/miniupnpd/files/miniupnpd.sh.in
+++ b/net/miniupnpd/files/miniupnpd.sh.in
@@ -8,14 +8,17 @@
 
 . %%RC_SUBR%%
 
-miniupnpd_enable=${miniupnpd_enable:-"NO"}
-miniupnpd_config=${miniupnpd_config:-"%%PREFIX%%/etc/miniupnpd.conf"}
-miniupnpd_flags=${miniupnpd_flags}
+# Add the following line to /etc/rc.conf to enable miniupnpd
+# miniupnpd_enable="YES"
+# miniupnpd_flags="<set as needed>"
 
 name=miniupnpd
 rcvar=`set_rcvar`
 load_rc_config $name
 
+miniupnpd_enable=${miniupnpd_enable:-"NO"}
+miniupnpd_config=${miniupnpd_config:-"%%PREFIX%%/etc/miniupnpd.conf"}
+
 command="%%PREFIX%%/sbin/miniupnpd"
 pidfile="/var/run/${name}.pid"
 command_args="-f $miniupnpd_config"
diff --git a/net/mpd/files/mpd.in b/net/mpd/files/mpd.in
index 2168bb71edda..dfebc3e3b2a5 100644
--- a/net/mpd/files/mpd.in
+++ b/net/mpd/files/mpd.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: /tmp/pcvs/ports/net/mpd/files/Attic/mpd.in,v 1.1 2007-01-10 06:47:24 vd Exp $
+# $FreeBSD: /tmp/pcvs/ports/net/mpd/files/Attic/mpd.in,v 1.2 2009-07-15 16:55:51 dougb Exp $
 #
 # PROVIDE: mpd
 # REQUIRE: NETWORKING syslogd
@@ -20,11 +20,10 @@ mpd_enable="${mpd_enable:-NO}"
 name=mpd
 rcvar=`set_rcvar`
 
-prefix=%%PREFIX%%
-procname=${prefix}/sbin/mpd
+procname=%%PREFIX%%/sbin/mpd
 pidfile=/var/run/mpd.pid
-required_files="${prefix}/etc/mpd/mpd.conf ${prefix}/etc/mpd/mpd.links"
-command="${prefix}/sbin/mpd"
+required_files="%%PREFIX%%/etc/mpd/mpd.conf %%PREFIX%%/etc/mpd/mpd.links"
+command="%%PREFIX%%/sbin/mpd"
 
 load_rc_config ${name}
 run_rc_command "$1"
diff --git a/net/openbgpd/files/openbgpd.sh.in b/net/openbgpd/files/openbgpd.sh.in
index 51e889b666e4..559b3a1ec2ba 100644
--- a/net/openbgpd/files/openbgpd.sh.in
+++ b/net/openbgpd/files/openbgpd.sh.in
@@ -8,12 +8,12 @@
 # BEFORE:  securelevel
 # KEYWORD: shutdown
 
-# Add the following line to /etc/rc.conf to enable `openbgpd':
+# Add the following lines to /etc/rc.conf to enable openbgpd:
 #
 # openbgpd_enable="YES"
+# openbgpd_flags="<set as needed>"
 #
 # See bgpd(8) for openbgpd_flags
-#
 
 . "%%RC_SUBR%%"
 
@@ -26,6 +26,5 @@ required_files="%%PREFIX%%/etc/bgpd.conf"
 
 load_rc_config "$name"
 : ${openbgpd_enable="NO"}
-: ${openbgpd_flags=""}
 
 run_rc_command "$1"
diff --git a/net/openldap23-server/files/slapd.sh.in b/net/openldap23-server/files/slapd.sh.in
index 341fcaee28d9..b101074ba5d9 100644
--- a/net/openldap23-server/files/slapd.sh.in
+++ b/net/openldap23-server/files/slapd.sh.in
@@ -97,11 +97,8 @@ load_rc_config $name
 if [ -n "${slapd_args+set}" ]; then
   warn "slapd_args is deprecated, use slapd_flags"
   : ${slapd_flags="$slapd_args"}
-else
-  : ${slapd_flags=""}
 fi
 : ${slapd_owner="ldap:ldap"}
-: ${slapd_sockets=""}
 : ${slapd_sockets_mode="666"}
 
 run_rc_command "$1"
diff --git a/net/openldap23-server/files/slurpd.sh.in b/net/openldap23-server/files/slurpd.sh.in
index ea5e5b0642b6..08d87e6d08ee 100644
--- a/net/openldap23-server/files/slurpd.sh.in
+++ b/net/openldap23-server/files/slurpd.sh.in
@@ -10,7 +10,8 @@
 
 # Add the following line to /etc/rc.conf to enable slurpd:
 #
-#slurpd_enable="YES"
+# slurpd_enable="YES"
+# slurpd_flags="<set as needed>"
 #
 # See slurpd(8) for more flags
 #
@@ -29,8 +30,6 @@ load_rc_config $name
 if [ -n "${slurpd_args+set}" ]; then
   warn "slurpd_args is deprecated, use slurpd_flags"
   : ${slurpd_flags="$slurpd_args"}
-else
-  : ${slurpd_flags=""}
 fi
 
 run_rc_command "$1"
diff --git a/net/openldap24-server/files/slapd.sh.in b/net/openldap24-server/files/slapd.sh.in
index 1af8eee71a5f..841fae65cd1e 100644
--- a/net/openldap24-server/files/slapd.sh.in
+++ b/net/openldap24-server/files/slapd.sh.in
@@ -106,11 +106,8 @@ load_rc_config $name
 if [ -n "${slapd_args+set}" ]; then
   warn "slapd_args is deprecated, use slapd_flags"
   : ${slapd_flags="$slapd_args"}
-else
-  : ${slapd_flags=""}
 fi
 : ${slapd_owner="ldap:ldap"}
-: ${slapd_sockets=""}
 : ${slapd_sockets_mode="666"}
 
 run_rc_command "$1"
diff --git a/net/openospfd/files/openospfd.sh.in b/net/openospfd/files/openospfd.sh.in
index b9a7c2606865..473e4bcede56 100644
--- a/net/openospfd/files/openospfd.sh.in
+++ b/net/openospfd/files/openospfd.sh.in
@@ -8,12 +8,12 @@
 # BEFORE:  securelevel
 # KEYWORD: shutdown
 
-# Add the following line to /etc/rc.conf to enable `openospfd':
+# Add the following lines to /etc/rc.conf to enable openospfd:
 #
 # openospfd_enable="YES"
+# openospfd_flags="<set as needed>"
 #
 # See ospfd(8) for openospfd_flags
-#
 
 . "%%RC_SUBR%%"
 
@@ -26,6 +26,5 @@ required_files="%%PREFIX%%/etc/ospfd.conf"
 
 load_rc_config "$name"
 : ${openospfd_enable="NO"}
-: ${openospfd_flags=""}
 
 run_rc_command "$1"
diff --git a/net/pen/files/pen.sh.in b/net/pen/files/pen.sh.in
index f99fc50be72d..6478f97f53e1 100644
--- a/net/pen/files/pen.sh.in
+++ b/net/pen/files/pen.sh.in
@@ -9,10 +9,10 @@
 # KEYWORD: shutdown
 
 #
-# Add the following line to /etc/rc.conf to enable pen:
+# Add the following lines to /etc/rc.conf to enable pen:
 #
 # pen_enable="YES"
-#
+# pen_flags="<set as needed>"
 
 . %%RC_SUBR%%
 
@@ -22,7 +22,6 @@ rcvar=`set_rcvar`
 command=%%PREFIX%%/bin/pen
 
 pen_enable=${pen_enable:-"NO"}
-pen_flags=${pen_flags:-""}
 
 load_rc_config $name
 run_rc_command "$1"
diff --git a/net/poptop/files/pptpd.sh.in b/net/poptop/files/pptpd.sh.in
index 6e108878f335..c9ac5ad63b54 100644
--- a/net/poptop/files/pptpd.sh.in
+++ b/net/poptop/files/pptpd.sh.in
@@ -5,13 +5,12 @@
 # PROVIDE: pptpd
 # REQUIRE: DAEMON
 #
-# Add the following line to /etc/rc.conf to enable pptpd:
+# Add the following lines to /etc/rc.conf to enable pptpd:
 #
 # pptpd_enable="YES"
-#
+# pptpd_flags="<set as needed>"
 
 pptpd_enable=${pptpd_enable-"NO"}
-pptpd_flags=${pptpd_flags-""}
 
 . %%RC_SUBR%%
 
diff --git a/net/quagga/files/watchquagga.sh.in b/net/quagga/files/watchquagga.sh.in
index be31f48c1f70..b5a53f492ca3 100644
--- a/net/quagga/files/watchquagga.sh.in
+++ b/net/quagga/files/watchquagga.sh.in
@@ -31,7 +31,6 @@ stop_postcmd()
 load_rc_config $name
 
 : ${watchquagga_enable="NO"}
-: ${watchquagga_flags=""}
 
 command=%%PREFIX%%/sbin/watchquagga
 pidfile=%%LOCALSTATE_DIR%%/watchquagga.pid
diff --git a/net/radvd/files/radvd.in b/net/radvd/files/radvd.in
index f96b27627744..288cd92275f1 100644
--- a/net/radvd/files/radvd.in
+++ b/net/radvd/files/radvd.in
@@ -13,11 +13,11 @@
 
 name=radvd
 rcvar=`set_rcvar`
-prefix=%%PREFIX%%
+
 pidfile=/var/run/${name}.pid
-command="${prefix}/sbin/${name}"
+command="%%PREFIX%%/sbin/${name}"
 command_args="-p ${pidfile}"
-required_files="${prefix}/etc/${name}.conf"
+required_files="%%PREFIX%%/etc/${name}.conf"
 
 load_rc_config $name
 : ${radvd_enable="NO"}
diff --git a/net/relayd/files/relayd.in b/net/relayd/files/relayd.in
index b2c6f85ec28b..c272c45be307 100644
--- a/net/relayd/files/relayd.in
+++ b/net/relayd/files/relayd.in
@@ -5,11 +5,10 @@
 # PROVIDE: relayd
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
-#
-# relayd_enable (bool):
-#
-# relayd_flags:
-#
+
+# Add the following lines to /etc/rc.conf to enable relayd:
+# relayd_enable="YES"
+# relayd_flags="<set as needed>"
 
 . %%RC_SUBR%%
 
@@ -19,9 +18,7 @@ rcvar=${name}_enable
 load_rc_config $name
 
 : ${relayd_enable="NO"}
-: ${relayd_flags=""}
 
 command="%%PREFIX%%/sbin/relayd"
-command_args="${relayd_flags}"
 
 run_rc_command "$1"
diff --git a/net/rinetd/files/rinetd.sh.in b/net/rinetd/files/rinetd.sh.in
index a306bed78dc0..71050e2044cf 100644
--- a/net/rinetd/files/rinetd.sh.in
+++ b/net/rinetd/files/rinetd.sh.in
@@ -20,7 +20,6 @@ rcvar=`set_rcvar`
 load_rc_config $name
 
 : ${rinetd_enable="NO"}
-: ${rinetd_flags=""}
 
 command="%%PREFIX%%/sbin/rinetd"
 pidfile="/var/run/rinetd.pid"
diff --git a/net/rp-pppoe/files/04pppoe-relay.sh.sample b/net/rp-pppoe/files/04pppoe-relay.sh.sample
index 1915d5c7b578..8a397dd5c92c 100644
--- a/net/rp-pppoe/files/04pppoe-relay.sh.sample
+++ b/net/rp-pppoe/files/04pppoe-relay.sh.sample
@@ -4,7 +4,7 @@
 (
 daemon=pppoe-relay
 daemon_path=/usr/local/sbin
-daemon_flags=
+#daemon_flags=
 
 case $1 in
     start)
diff --git a/net/rp-pppoe/files/04pppoe-server.sh.sample b/net/rp-pppoe/files/04pppoe-server.sh.sample
index 6195e84b9d8c..6ed429c200b0 100644
--- a/net/rp-pppoe/files/04pppoe-server.sh.sample
+++ b/net/rp-pppoe/files/04pppoe-server.sh.sample
@@ -4,7 +4,7 @@
 (
 daemon=pppoe-server
 daemon_path=/usr/local/sbin
-daemon_flags=
+#daemon_flags=
 
 case $1 in
     start)
diff --git a/net/rsync/files/rsyncd.sh.in b/net/rsync/files/rsyncd.sh.in
index 318c6293b887..c1fa52328605 100644
--- a/net/rsync/files/rsyncd.sh.in
+++ b/net/rsync/files/rsyncd.sh.in
@@ -8,9 +8,10 @@
 # BEFORE:  securelevel
 # KEYWORD: shutdown
 
-# Add the following line to /etc/rc.conf to enable `%%NAME%%':
+# Add the following lines to /etc/rc.conf to enable `%%NAME%%':
 #
-#%%NAME%%_enable="YES"
+# %%NAME%%_enable="YES"
+# %%NAME%%_flags="<set as needed>"
 #
 # See rsync(1) for %%NAME%%_flags
 #
@@ -28,6 +29,5 @@ required_files="%%PREFIX%%/etc/$name.conf"
 # read configuration and set defaults
 load_rc_config "$name"
 : ${%%NAME%%_enable="NO"}
-: ${%%NAME%%_flags=""}
 
 run_rc_command "$1"
diff --git a/net/sendfile/files/sendfiled.in b/net/sendfile/files/sendfiled.in
index 36a8bffce22e..51406ea5038b 100644
--- a/net/sendfile/files/sendfiled.in
+++ b/net/sendfile/files/sendfiled.in
@@ -8,12 +8,12 @@
 # BEFORE:  securelevel
 # KEYWORD: shutdown
 
-# Add the following line to /etc/rc.conf to enable `sendfiled':
+# Add the following lines to /etc/rc.conf to enable `sendfiled':
 #
-#sendfiled_enable="YES"
+# sendfiled_enable="YES"
+# sendfiled_flags="<set as needed>"
 #
 # See sendfiled(8) for sendfiled_flags
-#
 
 . %%RC_SUBR%%
 
@@ -27,6 +27,5 @@ required_files="%%PREFIX%%/etc/sendfile.cf"
 # read configuration and set defaults
 load_rc_config "$name"
 : ${sendfiled_enable="NO"}
-: ${sendfiled_flags=""}
 
 run_rc_command "$1"
diff --git a/net/ser/files/ser.in b/net/ser/files/ser.in
index 73c5f277ad77..bf087c80310a 100644
--- a/net/ser/files/ser.in
+++ b/net/ser/files/ser.in
@@ -5,8 +5,6 @@
 
 # PROVIDE: ser
 # REQUIRE: DAEMON mysql postgresql
-#
-prefix=%%PREFIX%%
 
 # Add the following lines to /etc/rc.conf to enable ser:
 #
@@ -16,7 +14,7 @@ prefix=%%PREFIX%%
 
 name="ser"
 rcvar=`set_rcvar`
-command="${prefix}/sbin/${name}"
+command="%%PREFIX%%/sbin/${name}"
 pidfile="/var/run/${name}.pid"
 command_args="-P ${pidfile} > /dev/null"
 
diff --git a/net/sflowtool/files/sflowtool.in b/net/sflowtool/files/sflowtool.in
index 0f83f2f43329..d4656a14eafd 100644
--- a/net/sflowtool/files/sflowtool.in
+++ b/net/sflowtool/files/sflowtool.in
@@ -3,6 +3,10 @@
 # PROVIDE: sflowtool
 # REQUIRE: DAEMON
 
+# Add the following line to /etc/rc.conf to enable sflowtool:
+# sflowtool_enable="YES"
+# sflowtool_flags="<set as needed>"
+
 .  %%RC_SUBR%%
 
 name="sflowtool"
@@ -12,7 +16,6 @@ command="%%PREFIX%%/bin/sflowtool"
 load_rc_config $name
 # Set defaults
 : ${sflowtool_enable="NO"}
-: ${sflowtool_flags=""}
 : ${sflowtool_pidfile="/var/run/${name}.pid"}
 
 start_cmd="/usr/sbin/daemon -f -p ${sflowtool_pidfile} ${command} ${sflowtool_flags}"
diff --git a/net/siproxd/files/siproxd.sh.in b/net/siproxd/files/siproxd.sh.in
index 6c31e25d6bea..f1959ce62468 100644
--- a/net/siproxd/files/siproxd.sh.in
+++ b/net/siproxd/files/siproxd.sh.in
@@ -5,21 +5,17 @@
 
 # PROVIDE: siproxd
 # REQUIRE: DAEMON
-#
-# NOTE for FreeBSD 5.0+:
-# If you want this script to start with the base rc scripts
-# move siproxd.sh to /etc/rc.d/siproxd
+
 # Define these siproxd_* variables in one of these files:
 #	/etc/rc.conf
 #	/etc/rc.conf.local
 #	/etc/rc.conf.d/siproxd
 #
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
-#
+# siproxd_enable="YES"
+# siproxd_flags=""		# Flags to siproxd program
 
 siproxd_enable=${siproxd_enable:-"NO"}	# Enable siproxd
-siproxd_flags=${siproxd_flags:-""}	# Flags to siproxd program
-#siproxd_program="%%PREFIX%%/sbin/siproxd"	# Location of siproxd
 
 . %%RC_SUBR%%
 
diff --git a/net/socat/files/socat.in b/net/socat/files/socat.in
index b3cd35c02e10..55694ca0bf06 100644
--- a/net/socat/files/socat.in
+++ b/net/socat/files/socat.in
@@ -9,6 +9,10 @@
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
+# Add the following lines to /etc/rc.conf to enable socat:
+# socat_enable="YES"
+# socat_flags="<set as needed>"
+
 . %%RC_SUBR%%
 
 name="socat"
@@ -20,6 +24,5 @@ command_args="&"
 load_rc_config $name
 
 : ${socat_enable="NO"}
-: ${socat_flags=""}
 
 run_rc_command "$1"
diff --git a/net/spread/files/spread.sh.in b/net/spread/files/spread.sh.in
index fc9fd9e85755..bff754f1d7aa 100644
--- a/net/spread/files/spread.sh.in
+++ b/net/spread/files/spread.sh.in
@@ -10,7 +10,8 @@
 #
 # Add the following lines to /etc/rc.conf to enable spread:
 #
-#spread_enable="YES"
+# spread_enable="YES"
+# spread_flags="<set as needed>"
 #
 # See spread(1) for flags
 #
@@ -28,7 +29,6 @@ required_files=%%PREFIX%%/etc/${name}.conf
 # set defaults
 
 spread_enable=${spread_enable:-"NO"}
-spread_flags=${spread_flags:-""}
 
 load_rc_config ${name}
 run_rc_command "$1"
diff --git a/net/spread4/files/spread.sh.in b/net/spread4/files/spread.sh.in
index fc9fd9e85755..cfac38f9f3fe 100644
--- a/net/spread4/files/spread.sh.in
+++ b/net/spread4/files/spread.sh.in
@@ -10,10 +10,10 @@
 #
 # Add the following lines to /etc/rc.conf to enable spread:
 #
-#spread_enable="YES"
+# spread_enable="YES"
+# spread_flags="<set as needed>"
 #
 # See spread(1) for flags
-#
 
 . %%RC_SUBR%%
 
@@ -28,7 +28,6 @@ required_files=%%PREFIX%%/etc/${name}.conf
 # set defaults
 
 spread_enable=${spread_enable:-"NO"}
-spread_flags=${spread_flags:-""}
 
 load_rc_config ${name}
 run_rc_command "$1"
diff --git a/net/vtun/files/vtunclient.in b/net/vtun/files/vtunclient.in
index 7679ac50724e..4592f139bed0 100644
--- a/net/vtun/files/vtunclient.in
+++ b/net/vtun/files/vtunclient.in
@@ -12,7 +12,6 @@
 #
 
 vtunclient_enable=${vtunclient_enable:-"NO"}
-vtunclient_flags=${vtunclient_flags:-""}
 
 . %%RC_SUBR%%
 
diff --git a/net/widentd/files/widentd.sh.in b/net/widentd/files/widentd.sh.in
index 069183d0e840..9f18826b00fb 100644
--- a/net/widentd/files/widentd.sh.in
+++ b/net/widentd/files/widentd.sh.in
@@ -7,8 +7,7 @@
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
 # KEYWORD: shutdown
-#
-prefix=%%PREFIX%%
+
 
 # Define these widentd_* variables in one of these files:
 #
@@ -31,7 +30,7 @@ widentd_enable=${widentd_enable-"NO"}
 
 name="widentd"
 rcvar=`set_rcvar`
-command="${prefix}/sbin/widentd"
+command="%%PREFIX%%/sbin/widentd"
 
 load_rc_config $name
 
diff --git a/net/wizd/files/wizd.sh.in b/net/wizd/files/wizd.sh.in
index ff8027991446..7d19b8ca39d5 100644
--- a/net/wizd/files/wizd.sh.in
+++ b/net/wizd/files/wizd.sh.in
@@ -25,6 +25,5 @@ required_files="%%PREFIX%%/etc/$name.conf"
 load_rc_config $name
 
 : ${wizd_enable="NO"}
-: ${wizd_flags=""}
 
 run_rc_command "$1"
diff --git a/net/xorp/files/xorp.in b/net/xorp/files/xorp.in
index f20eb6b7f9ff..3a164ae082ee 100644
--- a/net/xorp/files/xorp.in
+++ b/net/xorp/files/xorp.in
@@ -11,9 +11,9 @@
 
 # Add the following lines to /etc/rc.conf to enable xorp:
 #
-#xorp_enable="YES"
-#xorp_config_boot="%%PREFIX%%/etc/xorp.conf.sample"
-#
+# xorp_enable="YES"
+# xorp_flags="<set as needed>"
+# xorp_config_boot="%%PREFIX%%/etc/xorp.conf.sample"
 
 . %%RC_SUBR%%
 
@@ -24,7 +24,6 @@ load_rc_config $name
 
 : ${xorp_enable="NO"}
 : ${xorp_config_boot="%%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}