diff options
| author | edwin <edwin@FreeBSD.org> | 2006-01-04 06:35:12 +0000 |
|---|---|---|
| committer | edwin <edwin@FreeBSD.org> | 2006-01-04 06:35:12 +0000 |
| commit | 7d6398d43b6ecb1f9c0217b5c7cc3db7b7e2fadc (patch) | |
| tree | 8dd78af8c628276ae7abc7804207d72eae1663c5 /mail | |
| parent | 1191d04c13bf429e79e2c2f89b389f849c44e494 (diff) | |
| download | FreeBSD-ports-7d6398d43b6ecb1f9c0217b5c7cc3db7b7e2fadc.zip FreeBSD-ports-7d6398d43b6ecb1f9c0217b5c7cc3db7b7e2fadc.tar.gz | |
[patch] mail/p5-Mail-SpamAssassin - properly set pidfile in rc.d script
- PID file name in rc.d scripts must be set to "pidfile" variable,
not to "<name>_pidfile" variable.
- Placing -r (and -d too) options to command_args is more suitable because
they mustn't be overwrited by spamd_flags
PR: ports/90625
Submitted by: Petr Rehor <prehor@gmail.com>
Approved by: maintainer timeout
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/p5-Mail-SpamAssassin/Makefile | 2 | ||||
| -rw-r--r-- | mail/p5-Mail-SpamAssassin/files/spamd.sh | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile index bd1ba1c..27f4901 100644 --- a/mail/p5-Mail-SpamAssassin/Makefile +++ b/mail/p5-Mail-SpamAssassin/Makefile @@ -7,7 +7,7 @@ PORTNAME= Mail-SpamAssassin PORTVERSION= 3.1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= mail perl5 MASTER_SITES= ${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/} MASTER_SITE_SUBDIR= spamassassin/source/:apache Mail/:cpan diff --git a/mail/p5-Mail-SpamAssassin/files/spamd.sh b/mail/p5-Mail-SpamAssassin/files/spamd.sh index 01f99c7..6207db4 100644 --- a/mail/p5-Mail-SpamAssassin/files/spamd.sh +++ b/mail/p5-Mail-SpamAssassin/files/spamd.sh @@ -21,7 +21,15 @@ name=spamd rcvar=`set_rcvar` +load_rc_config $name + +# Set defaults +: ${spamd_enable:="NO"} +: ${spamd_flags="-c %%SQL_FLAG%% %%RUN_AS_USER%%"} + +pidfile=${spamd_pidfile:-"/var/run/spamd/spamd.pid"} command=%%PREFIX%%/bin/spamd +command_args="-d -r ${pidfile}" required_dirs=%%PREFIX%%/share/spamassassin stop_postcmd=stop_postcmd @@ -31,11 +39,4 @@ stop_postcmd() rm -f $pidfile } -# set defaults - -spamd_enable=${spamd_enable:-"NO"} -spamd_pidfile=${spamd_pidfile:-"/var/run/spamd/spamd.pid"} -spamd_flags=${spamd_flags:-"-c -d %%SQL_FLAG%% -r ${spamd_pidfile} %%RUN_AS_USER%%"} - -load_rc_config $name run_rc_command "$1" |
