diff options
author | Adam Weinberger <adamw@FreeBSD.org> | 2014-07-01 21:04:19 +0000 |
---|---|---|
committer | Adam Weinberger <adamw@FreeBSD.org> | 2014-07-01 21:04:19 +0000 |
commit | 0a91dea7544ade6cf3fab2745a46f08ddb49bd75 (patch) | |
tree | cf7d08d5042bb974c25aa3df4742cf6dc8d0f8e4 /mail | |
parent | 88f47cd926b971cf0bc70ff55ce6c0594af575de (diff) | |
download | ports-0a91dea7544ade6cf3fab2745a46f08ddb49bd75.tar.gz ports-0a91dea7544ade6cf3fab2745a46f08ddb49bd75.zip |
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
Notes
Notes:
svn path=/head/; revision=360092
Diffstat (limited to 'mail')
-rw-r--r-- | mail/spamassassin/Makefile | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile index 388a34f1cbdc..44c01bfaed8d 100644 --- a/mail/spamassassin/Makefile +++ b/mail/spamassassin/Makefile @@ -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: |