Date: Tue, 1 Jul 2014 21:04:19 +0000 (UTC) From: Adam Weinberger <adamw@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360092 - head/mail/spamassassin Message-ID: <201407012104.s61L4JXl099325@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407012104.s61L4JXl099325>