From owner-svn-ports-head@FreeBSD.ORG  Tue Jul  1 21:04:19 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 94D7D800;
 Tue,  1 Jul 2014 21:04:19 +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 816842E6F;
 Tue,  1 Jul 2014 21:04:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s61L4JlF099326;
 Tue, 1 Jul 2014 21:04:19 GMT (envelope-from adamw@svn.freebsd.org)
Received: (from adamw@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s61L4JXl099325;
 Tue, 1 Jul 2014 21:04:19 GMT (envelope-from adamw@svn.freebsd.org)
Message-Id: <201407012104.s61L4JXl099325@svn.freebsd.org>
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Tue, 1 Jul 2014 21:04:19 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r360092 - head/mail/spamassassin
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 01 Jul 2014 21:04:19 -0000

Author: adamw
Date: Tue Jul  1 21:04:19 2014
New Revision: 360092
URL: http://svnweb.freebsd.org/changeset/ports/360092
QAT: https://qat.redports.org/buildarchive/r360092/

Log:
  Don't activate code that requires pre-compiled rules if the
  UPDATE_AND_COMPILE option is off. It can still be activated
  later for people who do it themselves.
  
  Submitted by:	Herbert J. Skuhra

Modified:
  head/mail/spamassassin/Makefile

Modified: head/mail/spamassassin/Makefile
==============================================================================
--- head/mail/spamassassin/Makefile	Tue Jul  1 20:59:23 2014	(r360091)
+++ head/mail/spamassassin/Makefile	Tue Jul  1 21:04:19 2014	(r360092)
@@ -93,6 +93,7 @@ PYZOR_INITVAR=		Pyzor
 RAZOR_INITVAR=		Razor2
 RELAY_COUNTRY_INITVAR=	RelayCountry
 SPF_QUERY_INITVAR=	SPF
+UPDATE_AND_COMPILE_INITVAR=	Rule2XSBody
 
 DOCS=		CREDITS Changes INSTALL NOTICE PACKAGING README TRADEMARK UPGRADE USAGE procmailrc.example 3.4.0-RELEASE-NOTES.txt
 DOCSSQL=	README README.awl README.bayes awl_mysql.sql awl_pg.sql bayes_mysql.sql bayes_pg.sql userpref_mysql.sql userpref_pg.sql
@@ -146,7 +147,7 @@ post-patch::
 	${REINPLACE_CMD} -e '/^CC =/d; \
 		s|@SSLCFLAGS@|& $${CFLAGS}|g' ${WRKSRC}/spamc/Makefile.in
 
-.for var in ${OPTIONS_GROUP_PLUGINS}
+.for var in ${OPTIONS_GROUP_PLUGINS} UPDATE_AND_COMPILE
 .  if ${PORT_OPTIONS:M${var}}
 	${REINPLACE_CMD} -e '/${${var}_INITVAR}/s/^\#.*loadplugin/loadplugin/' ${WRKSRC}/rules/*.pre
 .  else
@@ -154,9 +155,6 @@ post-patch::
 .  endif
 .endfor
 
-	# load pre-compiled rules
-	${REINPLACE_CMD} -e '/Rule2XSBody/s/^\# loadplugin/loadplugin/' ${WRKSRC}/rules/v320.pre
-
 	${FIND} ${WRKSRC} -name '*.orig' -or -name '*.bak' | ${XARGS} ${RM}
 
 pre-su-install: