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 /security/amavisd-new | |
| 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 'security/amavisd-new')
| -rw-r--r-- | security/amavisd-new/files/amavis-milter.sh.in | 2 | ||||
| -rw-r--r-- | security/amavisd-new/files/amavis-p0fanalyzer.sh.in | 2 | ||||
| -rw-r--r-- | security/amavisd-new/files/amavisd-snmp.sh.in | 2 | ||||
| -rw-r--r-- | security/amavisd-new/files/amavisd.sh.in | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/security/amavisd-new/files/amavis-milter.sh.in b/security/amavisd-new/files/amavis-milter.sh.in index 3763d470cc47..ec6136b96661 100644 --- a/security/amavisd-new/files/amavis-milter.sh.in +++ b/security/amavisd-new/files/amavis-milter.sh.in @@ -17,7 +17,7 @@ . /etc/rc.subr name=amavis_milter -rcvar=`set_rcvar` +rcvar=amavis_milter_enable command=%%PREFIX%%/sbin/amavis-milter required_files=%%PREFIX%%/etc/amavisd.conf diff --git a/security/amavisd-new/files/amavis-p0fanalyzer.sh.in b/security/amavisd-new/files/amavis-p0fanalyzer.sh.in index 4ab419fa5c1b..d7009711bcfc 100644 --- a/security/amavisd-new/files/amavis-p0fanalyzer.sh.in +++ b/security/amavisd-new/files/amavis-p0fanalyzer.sh.in @@ -15,7 +15,7 @@ amavis_p0fanalyzer_flags="${amavis_p0fanalyzer_flags-2345}" . /etc/rc.subr name="amavis_p0fanalyzer" -rcvar=`set_rcvar` +rcvar=amavis_p0fanalyzer_enable start_cmd=p0fanalyzer_start stop_cmd=p0fanalyzer_stop diff --git a/security/amavisd-new/files/amavisd-snmp.sh.in b/security/amavisd-new/files/amavisd-snmp.sh.in index 60a174db49a7..0f724ae759f3 100644 --- a/security/amavisd-new/files/amavisd-snmp.sh.in +++ b/security/amavisd-new/files/amavisd-snmp.sh.in @@ -16,7 +16,7 @@ . /etc/rc.subr name=amavisd_snmp -rcvar=`set_rcvar` +rcvar=amavisd_snmp_enable command="%%PREFIX%%/sbin/amavisd-snmp-subagent" command_interpreter="%%PERL%%" diff --git a/security/amavisd-new/files/amavisd.sh.in b/security/amavisd-new/files/amavisd.sh.in index c885608169d3..593d26982d81 100644 --- a/security/amavisd-new/files/amavisd.sh.in +++ b/security/amavisd-new/files/amavisd.sh.in @@ -17,7 +17,7 @@ . /etc/rc.subr name=amavisd -rcvar=`set_rcvar` +rcvar=amavisd_enable command=%%PREFIX%%/sbin/amavisd > /dev/null 2>&1 required_files=%%PREFIX%%/etc/amavisd.conf |