diff options
| author | Adam Weinberger <adamw@FreeBSD.org> | 2014-04-01 22:06:57 +0800 |
|---|---|---|
| committer | Adam Weinberger <adamw@FreeBSD.org> | 2014-04-01 22:06:57 +0800 |
| commit | 3efc22c772949807a40f00aa67ddcc209239617b (patch) | |
| tree | 7ce2d9514609d9e89bf72bf9deb1ef1d0dbfe030 /mail | |
| parent | 9c2226046df46d1d21da9e08578a79205fe588c6 (diff) | |
| download | freebsd-ports-gnome-3efc22c772949807a40f00aa67ddcc209239617b.tar.gz freebsd-ports-gnome-3efc22c772949807a40f00aa67ddcc209239617b.tar.zst freebsd-ports-gnome-3efc22c772949807a40f00aa67ddcc209239617b.zip | |
Partially revert r348415. There are many good scenarios where
preventing user-config file creation is a good thing. Recommend
one of those scenarios in the rc.d description.
PR: ports/187659
Submitted by: Lawrence "The Dreamer" Chen <beastie@tardisi.com>
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/spamassassin/Makefile | 2 | ||||
| -rw-r--r-- | mail/spamassassin/files/sa-spamd.in | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile index 93fc00d618b1..201da74bfcdf 100644 --- a/mail/spamassassin/Makefile +++ b/mail/spamassassin/Makefile @@ -3,7 +3,7 @@ PORTNAME= spamassassin PORTVERSION= 3.4.0 -PORTREVISION?= 7 # also bump japanese/spamassassin +PORTREVISION?= 8 # also bump japanese/spamassassin 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/spamassassin/files/sa-spamd.in b/mail/spamassassin/files/sa-spamd.in index bf2db2e201ba..eafb7646ae5f 100644 --- a/mail/spamassassin/files/sa-spamd.in +++ b/mail/spamassassin/files/sa-spamd.in @@ -22,6 +22,8 @@ # # spamd_flags="-Q" # +# and remove -c (auto-create user preference files). +# . /etc/rc.subr @@ -33,11 +35,11 @@ load_rc_config $name # Set defaults : ${spamd_enable:="NO"} -: ${spamd_flags="%%SQL_FLAG%% %%RUN_AS_USER%%"} +: ${spamd_flags="-c %%SQL_FLAG%% %%RUN_AS_USER%%"} pidfile=${spamd_pidfile:-"/var/run/${name}/${name}.pid"} command=%%PREFIX%%/bin/${name} -command_args="-c -d -r ${pidfile}" +command_args="-d -r ${pidfile}" required_dirs=%%PREFIX%%/share/spamassassin run_rc_command "$1" |