summaryrefslogtreecommitdiff
path: root/audio
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 /audio
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 'audio')
-rw-r--r--audio/ices0/files/ices0.sh.in8
-rw-r--r--audio/slimserver/files/slimserver.sh.in4
-rw-r--r--audio/squeezeboxserver/files/squeezecenter.sh.in4
-rw-r--r--audio/squeezecenter/files/squeezecenter.sh.in4
-rw-r--r--audio/ventrilo-server/files/ventrilo-server.sh.in4
5 files changed, 10 insertions, 14 deletions
diff --git a/audio/ices0/files/ices0.sh.in b/audio/ices0/files/ices0.sh.in
index 3b3b10322d9c..ce3bad45a8ae 100644
--- a/audio/ices0/files/ices0.sh.in
+++ b/audio/ices0/files/ices0.sh.in
@@ -8,11 +8,10 @@
# BEFORE: login
# KEYWORD: shutdown
-# Add the following line to /etc/rc.conf to enable `ices0':
-#
-#ices0_enable="YES"
-#ices0_flags=""
+# Add the following lines to /etc/rc.conf to enable ices0:
#
+# ices0_enable="YES"
+# ices0_flags="<set as needed>"
. "/etc/rc.subr"
@@ -26,6 +25,5 @@ required_files="%%PREFIX%%/etc/ices.conf"
# read configuration and set defaults
load_rc_config "$name"
: ${ices0_enable="NO"}
-: ${ices0_flags=""}
run_rc_command "$1"
diff --git a/audio/slimserver/files/slimserver.sh.in b/audio/slimserver/files/slimserver.sh.in
index fac1e2b47eac..4ba3c651a9a7 100644
--- a/audio/slimserver/files/slimserver.sh.in
+++ b/audio/slimserver/files/slimserver.sh.in
@@ -10,7 +10,8 @@
#
# Add the following lines to /etc/rc.conf to enable slimserver:
#
-#slimserver_enable="YES"
+# slimserver_enable="YES"
+# slimserver_flags="<set as needed>"
#
. %%RC_SUBR%%
@@ -73,6 +74,5 @@ slimserver_poststop()
load_rc_config ${name}
slimserver_enable=${slimserver_enable:-"NO"}
-slimserver_flags=${slimserver_flags:-""}
run_rc_command "$1"
diff --git a/audio/squeezeboxserver/files/squeezecenter.sh.in b/audio/squeezeboxserver/files/squeezecenter.sh.in
index 8fa09a51fc4f..bc06b8a348b8 100644
--- a/audio/squeezeboxserver/files/squeezecenter.sh.in
+++ b/audio/squeezeboxserver/files/squeezecenter.sh.in
@@ -10,7 +10,8 @@
#
# Add the following lines to /etc/rc.conf to enable %%PORTNAME%%:
#
-#%%PORTNAME%%_enable="YES"
+# %%PORTNAME%%_enable="YES"
+# %%PORTNAME%%_flags="<set as needed>"
#
. %%RC_SUBR%%
@@ -72,6 +73,5 @@ command_args="--daemon --prefsfile=${conffile} --pidfile=${pidfile}"
load_rc_config ${name}
%%PORTNAME%%_enable=${%%PORTNAME%%_enable:-"NO"}
-%%PORTNAME%%_flags=${%%PORTNAME%%_flags:-""}
run_rc_command "$1"
diff --git a/audio/squeezecenter/files/squeezecenter.sh.in b/audio/squeezecenter/files/squeezecenter.sh.in
index 8fa09a51fc4f..bc06b8a348b8 100644
--- a/audio/squeezecenter/files/squeezecenter.sh.in
+++ b/audio/squeezecenter/files/squeezecenter.sh.in
@@ -10,7 +10,8 @@
#
# Add the following lines to /etc/rc.conf to enable %%PORTNAME%%:
#
-#%%PORTNAME%%_enable="YES"
+# %%PORTNAME%%_enable="YES"
+# %%PORTNAME%%_flags="<set as needed>"
#
. %%RC_SUBR%%
@@ -72,6 +73,5 @@ command_args="--daemon --prefsfile=${conffile} --pidfile=${pidfile}"
load_rc_config ${name}
%%PORTNAME%%_enable=${%%PORTNAME%%_enable:-"NO"}
-%%PORTNAME%%_flags=${%%PORTNAME%%_flags:-""}
run_rc_command "$1"
diff --git a/audio/ventrilo-server/files/ventrilo-server.sh.in b/audio/ventrilo-server/files/ventrilo-server.sh.in
index de565ccd1085..9240390397bb 100644
--- a/audio/ventrilo-server/files/ventrilo-server.sh.in
+++ b/audio/ventrilo-server/files/ventrilo-server.sh.in
@@ -8,10 +8,8 @@
. %%RC_SUBR%%
-prefix=%%PREFIX%%
-
name=ventrilo
-homedir="${prefix}/ventrilo-server"
+homedir="%%PREFIX%%/ventrilo-server"
pidfile="${homedir}/ventrilo_srv.pid"
ventrilo_user=${name}
command="${homedir}/ventrilo_srv"