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.

2 files changed, 7 insertions, 19 deletions

diff --git a/net/dtcp/files/dtcpc.sh.in b/net/dtcp/files/dtcpc.sh.in
index ac4ad6ab6a5..512f2c57551 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 f6bb60d651c..cb92f3476c2 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"