diff options
| author | Adam Weinberger <adamw@FreeBSD.org> | 2016-11-07 00:59:19 +0000 |
|---|---|---|
| committer | Adam Weinberger <adamw@FreeBSD.org> | 2016-11-07 00:59:19 +0000 |
| commit | 270ceb1c435ad3ebf798890426b7c68e90d33316 (patch) | |
| tree | 7c035733a51e9dfb78a4ba1226990f64be4f4aab /mail/spamassassin/Makefile | |
| parent | 85a13471515be1d05d6a3c9658f1fac72e24a59b (diff) | |
| download | ports-270ceb1c435ad3ebf798890426b7c68e90d33316.tar.gz ports-270ceb1c435ad3ebf798890426b7c68e90d33316.zip | |
Follow up to r425497. sa-update isn't the problem, it's sa-update in
the plist. Remove the UPDATE_ON_INSTALL option entirely, and just add
a blurb to the pkg-message instructing people to run sa-update and
sa-compile manually.
Thanks to Matthew Fuller for prodding a better solution.
Notes
Notes:
svn path=/head/; revision=425590
Diffstat (limited to 'mail/spamassassin/Makefile')
| -rw-r--r-- | mail/spamassassin/Makefile | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile index 88e6da23e000..93c7b0dc3bbd 100644 --- a/mail/spamassassin/Makefile +++ b/mail/spamassassin/Makefile @@ -3,7 +3,7 @@ PORTNAME= spamassassin PORTVERSION= 3.4.1 -PORTREVISION?= 8 # also bump japanese/spamassassin +PORTREVISION?= 9 # also bump japanese/spamassassin CATEGORIES?= mail perl5 MASTER_SITES= APACHE/spamassassin/source CPAN/Mail DISTNAME= Mail-SpamAssassin-${PORTVERSION} @@ -46,7 +46,7 @@ CONFIGURE_ARGS= SYSCONFDIR="${PREFIX}/etc" \ LOCALSTATEDIR="${DBDIR}/spamassassin" \ BUILD_SPAMC=yes -OPTIONS_DEFINE= AS_ROOT SSL UPDATE_AND_COMPILE +OPTIONS_DEFINE= AS_ROOT SSL OPTIONS_GROUP= DATABASE GPG PLUGINS OPTIONS_GROUP_DATABASE= MYSQL PGSQL OPTIONS_GROUP_PLUGINS= DCC DKIM PYZOR RAZOR RELAY_COUNTRY SPF_QUERY @@ -56,7 +56,6 @@ OPTIONS_DEFAULT= AS_ROOT GNUPG SSL UPDATE_AND_COMPILE AS_ROOT_DESC= Run spamd as root (recommended) SSL_DESC= Build spamd/spamc with SSL support -UPDATE_AND_COMPILE_DESC=Download and compile rulesets (recommended) DATABASE_DESC= Optional user-config/bayes database backends @@ -105,7 +104,6 @@ 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 DOCSSQL= README README.awl README.bayes awl_mysql.sql awl_pg.sql bayes_mysql.sql bayes_pg.sql userpref_mysql.sql userpref_pg.sql @@ -130,12 +128,6 @@ SUB_LIST+= SQL_FLAG="-Q" SUB_LIST+= SQL_FLAG="" .endif -.if ${PORT_OPTIONS:MUPDATE_AND_COMPILE} && empty(PACKAGE_BUILDING) && empty(BATCH) -PLIST_SUB+= UPDATE_ON_INSTALL="yes" -.else -PLIST_SUB+= UPDATE_ON_INSTALL="no" -.endif - post-patch:: ${REINPLACE_CMD} -e 's,B_CONFDIR)/local.cf,B_CONFDIR)/local.cf.sample,g' \ -e 's,B_CONFDIR)/init.pre,B_CONFDIR)/init.pre.sample,g' \ @@ -150,7 +142,7 @@ post-patch:: ${REINPLACE_CMD} -e '/^CC =/d; \ s|@SSLCFLAGS@|& $${CFLAGS}|g' ${WRKSRC}/spamc/Makefile.in -.for var in ${OPTIONS_GROUP_PLUGINS} UPDATE_AND_COMPILE +.for var in ${OPTIONS_GROUP_PLUGINS} . if ${PORT_OPTIONS:M${var}} ${REINPLACE_CMD} -e '/${${var}_INITVAR}/s/^\#.*loadplugin/loadplugin/' ${WRKSRC}/rules/*.pre . else |