summaryrefslogtreecommitdiff
path: root/net-im
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 /net-im
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 'net-im')
-rw-r--r--net-im/iserverd/files/iserverd.in3
-rw-r--r--net-im/jabberd/files/jabberd.in5
2 files changed, 3 insertions, 5 deletions
diff --git a/net-im/iserverd/files/iserverd.in b/net-im/iserverd/files/iserverd.in
index 22d49beaa808..3285c0e2fc62 100644
--- a/net-im/iserverd/files/iserverd.in
+++ b/net-im/iserverd/files/iserverd.in
@@ -10,7 +10,6 @@
#
name=iserverd
-prefix=%%PREFIX%%
. %%RC_SUBR%%
@@ -21,7 +20,7 @@ iserverd_enable=${iserverd_enable:-"NO"}
iserverd_user=iserv
rcvar=`set_rcvar`
-command=${prefix}/bin/iserverd
+command=%%PREFIX%%/bin/iserverd
command_args="-o"
pidfile="/var/run/iserverd/iserverd.pid"
diff --git a/net-im/jabberd/files/jabberd.in b/net-im/jabberd/files/jabberd.in
index 6526adc8c992..f826631078a0 100644
--- a/net-im/jabberd/files/jabberd.in
+++ b/net-im/jabberd/files/jabberd.in
@@ -5,8 +5,7 @@
# PROVIDE: jabberd
# REQUIRE: %%REQUIRE%%
# KEYWORD: shutdown
-#
-prefix=%%PREFIX%%
+
# Define these jabberd_* variables in one of these files:
# /etc/rc.conf
@@ -23,7 +22,7 @@ jabberd_user=${jabberd_user-"%%JABBER_USER%%"}
name="jabberd"
rcvar=`set_rcvar`
command_interpreter="%%PERL%%"
-command="${prefix}/bin/jabberd"
+command="%%PREFIX%%/bin/jabberd"
command_args="-b"
stop_postcmd=jabberd_post_stopcmd