From owner-svn-ports-all@FreeBSD.ORG  Tue Apr  1 14:06:58 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id EA404C09;
 Tue,  1 Apr 2014 14:06:58 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id BCB00848;
 Tue,  1 Apr 2014 14:06:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s31E6w6G006578;
 Tue, 1 Apr 2014 14:06:58 GMT (envelope-from adamw@svn.freebsd.org)
Received: (from adamw@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s31E6wH1006575;
 Tue, 1 Apr 2014 14:06:58 GMT (envelope-from adamw@svn.freebsd.org)
Message-Id: <201404011406.s31E6wH1006575@svn.freebsd.org>
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Tue, 1 Apr 2014 14:06:58 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r349854 - in head: japanese/spamassassin
 mail/spamassassin mail/spamassassin/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Apr 2014 14:06:59 -0000

Author: adamw
Date: Tue Apr  1 14:06:57 2014
New Revision: 349854
URL: http://svnweb.freebsd.org/changeset/ports/349854
QAT: https://qat.redports.org/buildarchive/r349854/

Log:
  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>

Modified:
  head/japanese/spamassassin/Makefile
  head/mail/spamassassin/Makefile
  head/mail/spamassassin/files/sa-spamd.in

Modified: head/japanese/spamassassin/Makefile
==============================================================================
--- head/japanese/spamassassin/Makefile	Tue Apr  1 13:17:18 2014	(r349853)
+++ head/japanese/spamassassin/Makefile	Tue Apr  1 14:06:57 2014	(r349854)
@@ -1,7 +1,7 @@
 # Created by: TAOKA Fumiyoshi
 # $FreeBSD$
 
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	japanese mail perl5
 PKGNAMEPREFIX=	ja-
 

Modified: head/mail/spamassassin/Makefile
==============================================================================
--- head/mail/spamassassin/Makefile	Tue Apr  1 13:17:18 2014	(r349853)
+++ head/mail/spamassassin/Makefile	Tue Apr  1 14:06:57 2014	(r349854)
@@ -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

Modified: head/mail/spamassassin/files/sa-spamd.in
==============================================================================
--- head/mail/spamassassin/files/sa-spamd.in	Tue Apr  1 13:17:18 2014	(r349853)
+++ head/mail/spamassassin/files/sa-spamd.in	Tue Apr  1 14:06:57 2014	(r349854)
@@ -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"