diff options
-rw-r--r-- | japanese/spamassassin/Makefile | 2 | ||||
-rw-r--r-- | mail/spamassassin/Makefile | 2 | ||||
-rw-r--r-- | mail/spamassassin/files/sa-spamd.in | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/japanese/spamassassin/Makefile b/japanese/spamassassin/Makefile index f28260747214..b7dd23b1e305 100644 --- a/japanese/spamassassin/Makefile +++ b/japanese/spamassassin/Makefile @@ -1,7 +1,7 @@ # Created by: TAOKA Fumiyoshi # $FreeBSD$ -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= japanese mail perl5 PKGNAMEPREFIX= ja- 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" |