aboutsummaryrefslogtreecommitdiff
path: root/comms
diff options
context:
space:
mode:
authorDoug Barton <dougb@FreeBSD.org>2009-07-15 16:56:10 +0000
committerDoug Barton <dougb@FreeBSD.org>2009-07-15 16:56:10 +0000
commit0175383f0a1f8b78ed514778532f0467a8ccc6dc (patch)
tree4c98b621f22bb861a40c6493c6ed7517f295f7f3 /comms
parente6246d1055202098dd1df8f2a827665d39dddde8 (diff)
downloadports-0175383f0a1f8b78ed514778532f0467a8ccc6dc.tar.gz
ports-0175383f0a1f8b78ed514778532f0467a8ccc6dc.zip
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.
Notes
Notes: svn path=/head/; revision=237892
Diffstat (limited to 'comms')
-rw-r--r--comms/lirc/files/lircd.sh.in8
-rw-r--r--comms/qpage/files/qpage.in2
-rw-r--r--comms/ser2net/files/ser2net.in5
-rw-r--r--comms/thebridge/files/tbd.in4
4 files changed, 9 insertions, 10 deletions
diff --git a/comms/lirc/files/lircd.sh.in b/comms/lirc/files/lircd.sh.in
index fd282eb70b65..cf53297778d2 100644
--- a/comms/lirc/files/lircd.sh.in
+++ b/comms/lirc/files/lircd.sh.in
@@ -19,13 +19,11 @@ load_rc_config ${name}
: ${lircd_enable="NO"}
: ${lircd_device="/dev/lirc0"}
-
-prefix=%%PREFIX%%
-procname=${prefix}/sbin/lircd
+procname=%%PREFIX%%/sbin/lircd
pidfile=/var/run/lircd.pid
-lircd_config="${prefix}/etc/lircd.conf"
+lircd_config="%%PREFIX%%/etc/lircd.conf"
required_files=${lircd_config}
-command="${prefix}/sbin/lircd"
+command="%%PREFIX%%/sbin/lircd"
command_args="-d ${lircd_device} ${lircd_config}"
run_rc_command "$1"
diff --git a/comms/qpage/files/qpage.in b/comms/qpage/files/qpage.in
index 9d9800d70fa3..038e681d4f72 100644
--- a/comms/qpage/files/qpage.in
+++ b/comms/qpage/files/qpage.in
@@ -26,8 +26,6 @@ load_rc_config $name
: ${qpage_enable="NO"}
: ${qpage_queue_interval="10"}
-: ${qpage_cfg_file=""}
-: ${qpage_flags=""}
stop_cmd=${name}_stop
extra_commands="reload"
diff --git a/comms/ser2net/files/ser2net.in b/comms/ser2net/files/ser2net.in
index b722015fc4a9..8aa7c28284a9 100644
--- a/comms/ser2net/files/ser2net.in
+++ b/comms/ser2net/files/ser2net.in
@@ -8,6 +8,10 @@
# BEFORE: LOGIN
# KEYWORD: shutdown
+# Add the following lines to /etc/rc.conf to enable ser2net:
+# ser2net_enable="YES"
+# ser2net_flags="<set as needed>"
+
. %%RC_SUBR%%
name="ser2net"
@@ -16,7 +20,6 @@ command="%%PREFIX%%/sbin/ser2net"
load_rc_config $name
: ${ser2net_enable="NO"}
-: ${ser2net_flags=""}
: ${ser2net_pidfile="/var/run/ser2net.pid"}
start_cmd="/usr/sbin/daemon -p ${ser2net_pidfile} $command $rc_flags $command_args"
diff --git a/comms/thebridge/files/tbd.in b/comms/thebridge/files/tbd.in
index 975181e26d1b..395ca6aed405 100644
--- a/comms/thebridge/files/tbd.in
+++ b/comms/thebridge/files/tbd.in
@@ -9,13 +9,13 @@
# KEYWORD: shutdown
#
-# Add the following line to /etc/rc.conf to enable tbd:
+# Add the following lines to /etc/rc.conf to enable tbd:
#
# tbd_enable="YES"
+# tbd_flags="<set as needed>"
#
tbd_enable=${tbd_enable-"NO"}
-tbd_flags=${tbd_flags-""}
. %%RC_SUBR%%