summaryrefslogtreecommitdiff
path: root/irc
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 /irc
parent- Chase security/gpgme update. (diff)
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 'irc')
-rw-r--r--irc/bitlbee-otr/files/bitlbee.in5
-rw-r--r--irc/bitlbee/files/bitlbee.in5
-rw-r--r--irc/bopm/files/bopm.in1
-rw-r--r--irc/inspircd/files/inspircd.sh.in2
-rw-r--r--irc/ircd-rusnet/files/ircd.sh.sample2
-rw-r--r--irc/ngircd/files/ngircd.in3
6 files changed, 11 insertions, 7 deletions
diff --git a/irc/bitlbee-otr/files/bitlbee.in b/irc/bitlbee-otr/files/bitlbee.in
index a5e9d9b6c7dd..17499e50eea8 100644
--- a/irc/bitlbee-otr/files/bitlbee.in
+++ b/irc/bitlbee-otr/files/bitlbee.in
@@ -6,6 +6,10 @@
# REQUIRE: DAEMON
# KEYWORD: shutdown
+# Add the following lines to /etc/rc.conf to enable bitlbee:
+# bitlbee_enable="YES"
+# bitlbee_flags="<set as needed>"
+
. %%RC_SUBR%%
name="bitlbee"
@@ -16,7 +20,6 @@ load_rc_config $name
: ${bitlbee_enable="NO"}
: ${bitlbee_user="%%BITLBEEUSER%%"}
: ${bitlbee_config="%%PREFIX%%/etc/bitlbee/bitlbee.conf"}
-: ${bitlbee_flags=""}
required_files="${bitlbee_config}"
command="%%PREFIX%%/sbin/bitlbee"
diff --git a/irc/bitlbee/files/bitlbee.in b/irc/bitlbee/files/bitlbee.in
index a5e9d9b6c7dd..17499e50eea8 100644
--- a/irc/bitlbee/files/bitlbee.in
+++ b/irc/bitlbee/files/bitlbee.in
@@ -6,6 +6,10 @@
# REQUIRE: DAEMON
# KEYWORD: shutdown
+# Add the following lines to /etc/rc.conf to enable bitlbee:
+# bitlbee_enable="YES"
+# bitlbee_flags="<set as needed>"
+
. %%RC_SUBR%%
name="bitlbee"
@@ -16,7 +20,6 @@ load_rc_config $name
: ${bitlbee_enable="NO"}
: ${bitlbee_user="%%BITLBEEUSER%%"}
: ${bitlbee_config="%%PREFIX%%/etc/bitlbee/bitlbee.conf"}
-: ${bitlbee_flags=""}
required_files="${bitlbee_config}"
command="%%PREFIX%%/sbin/bitlbee"
diff --git a/irc/bopm/files/bopm.in b/irc/bopm/files/bopm.in
index 96bc4fb8c14c..64afa18c4ccc 100644
--- a/irc/bopm/files/bopm.in
+++ b/irc/bopm/files/bopm.in
@@ -22,7 +22,6 @@ load_rc_config $name
: ${bopm_enable="NO"}
: ${bopm_config="%%PREFIX%%/etc/bopm.conf"}
-: ${bopm_flags=""}
bopm_user="bopm"
pidfile="%%LOGDIR%%/bopm.pid"
diff --git a/irc/inspircd/files/inspircd.sh.in b/irc/inspircd/files/inspircd.sh.in
index 10ba22a2efe6..bbaf6d20ba53 100644
--- a/irc/inspircd/files/inspircd.sh.in
+++ b/irc/inspircd/files/inspircd.sh.in
@@ -12,6 +12,7 @@
# %%PORTNAME%%_enable="YES"
#
# Other rc.conf variables:
+# %%PORTNAME%%_flags="<set as needed>"
#
# %%PORTNAME%%_config="%%ETCDIR%%/%%PORTNAME%%.conf"
# -- path to config file
@@ -35,7 +36,6 @@ load_rc_config ${name}
: ${%%PORTNAME%%_enable="NO"}
: ${%%PORTNAME%%_config="%%ETCDIR%%/%%PORTNAME%%.conf"}
: ${%%PORTNAME%%_pidfile="%%INSPIRCD_RUN%%/%%PORTNAME%%.pid"}
-: ${%%PORTNAME%%_flags=""}
: ${%%PORTNAME%%_user="%%INSPIRCD_USR%%"}
: ${%%PORTNAME%%_group="%%INSPIRCD_GRP%%"}
: ${%%PORTNAME%%_logfile="%%INSPIRCD_LOG%%"}
diff --git a/irc/ircd-rusnet/files/ircd.sh.sample b/irc/ircd-rusnet/files/ircd.sh.sample
index 8c65064a4fe4..047f424e6d72 100644
--- a/irc/ircd-rusnet/files/ircd.sh.sample
+++ b/irc/ircd-rusnet/files/ircd.sh.sample
@@ -5,7 +5,7 @@ PATH=/bin:/usr/bin
daemon=ircd
daemon_path=/usr/local/sbin
daemon_pid=/var/run/ircd/$daemon.pid
-daemon_flags=
+#daemon_flags=
case $1 in
start)
diff --git a/irc/ngircd/files/ngircd.in b/irc/ngircd/files/ngircd.in
index 8dfb916b0de4..a79e843150f5 100644
--- a/irc/ngircd/files/ngircd.in
+++ b/irc/ngircd/files/ngircd.in
@@ -24,10 +24,9 @@ load_rc_config $name
: ${ngircd_enable="NO"}
: ${ngircd_conf="%%PREFIX%%/etc/ngircd.conf"}
-: ${ngircd_flags=""}
required_files="${ngircd_conf}"
command=%%PREFIX%%/sbin/ngircd
-command_args="-f ${ngircd_conf} ${ngircd_flags}"
+command_args="-f ${ngircd_conf}"
run_rc_command "$1"