diff options
| author | dougb <dougb@FreeBSD.org> | 2012-01-14 16:57:23 +0800 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2012-01-14 16:57:23 +0800 |
| commit | 4500e6f95eef76996051b447f00584b31e4abedf (patch) | |
| tree | aa85e69ac86658b87b78e09ff440d65dc0ff7518 /multimedia/freevo | |
| parent | 9b5808c5a6c860e753267e93e9516b3301002f03 (diff) | |
| download | freebsd-ports-gnome-4500e6f95eef76996051b447f00584b31e4abedf.tar.gz freebsd-ports-gnome-4500e6f95eef76996051b447f00584b31e4abedf.tar.zst freebsd-ports-gnome-4500e6f95eef76996051b447f00584b31e4abedf.zip | |
In the rc.d scripts, change assignments to rcvar to use the
literal name_enable wherever possible, and ${name}_enable
when it's not, to prepare for the demise of set_rcvar().
In cases where I had to hand-edit unusual instances also
modify formatting slightly to be more uniform (and in
some cases, correct). This includes adding some $FreeBSD$
tags, and most importantly moving rcvar= to right after
name= so it's clear that one is derived from the other.
Diffstat (limited to 'multimedia/freevo')
| -rw-r--r-- | multimedia/freevo/files/freevo-rcsubr.in | 11 | ||||
| -rw-r--r-- | multimedia/freevo/files/freevo.in | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/multimedia/freevo/files/freevo-rcsubr.in b/multimedia/freevo/files/freevo-rcsubr.in index 8e82488e3e94..4edbf452306b 100644 --- a/multimedia/freevo/files/freevo-rcsubr.in +++ b/multimedia/freevo/files/freevo-rcsubr.in @@ -1,5 +1,7 @@ #!/bin/sh +# $FreeBSD$ +# # PROVIDE: freevo # REQUIRE: DAEMON # KEYWORD: shutdown @@ -14,7 +16,7 @@ . /etc/rc.subr name=freevo -rcvar=`set_rcvar` +rcvar=freevo_enable load_rc_config $name : ${freevo_enable="NO"} @@ -36,7 +38,7 @@ fast*) freevo_cmd=`expr "$1" : 'fast\(.*\)'` ;; esac name=freevo_recordserver -rcvar=${name}_enable +rcvar=freevo_recordserver_enable eval ${name}_user=${freevo_user} eval ${name}_group=${freevo_group} pidfile=/var/run/freevo/recordserver-${freevo_uid}.pid @@ -44,7 +46,7 @@ command_args="recordserver ${freevo_cmd}" run_rc_command "$1" name=freevo_webserver -rcvar=${name}_enable +rcvar=freevo_webserver_enable eval ${name}_user=${freevo_user} eval ${name}_group=${freevo_group} pidfile=/var/run/freevo/webserver-${freevo_uid}.pid @@ -52,10 +54,9 @@ command_args="webserver ${freevo_cmd}" run_rc_command "$1" name=freevo_gui -rcvar=${name}_enable +rcvar=freevo_gui_enable eval ${name}_user=${freevo_user} eval ${name}_group=${freevo_group} pidfile=/var/run/freevo/freevo-${freevo_uid}.pid command_args="${freevo_cmd}" run_rc_command "$1" - diff --git a/multimedia/freevo/files/freevo.in b/multimedia/freevo/files/freevo.in index 5d4f37ab9ba3..dfb0b072e701 100644 --- a/multimedia/freevo/files/freevo.in +++ b/multimedia/freevo/files/freevo.in @@ -16,7 +16,7 @@ . /etc/rc.subr name=freevo -rcvar=`set_rcvar` +rcvar=freevo_enable load_rc_config ${name} : ${freevo_enable:="NO"} |