Date: Fri, 13 Mar 2015 17:52:47 +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: r381227 - head/mail/spamassassin Message-ID: <201503131752.t2DHqlNC018322@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adamw Date: Fri Mar 13 17:52:46 2015 New Revision: 381227 URL: https://svnweb.freebsd.org/changeset/ports/381227 QAT: https://qat.redports.org/buildarchive/r381227/ Log: Allow depending on gpg2 instead of gpg1. Inspired by: PR: 197837 Submitted by: bogus19@veggiechinese.net Modified: head/mail/spamassassin/Makefile Modified: head/mail/spamassassin/Makefile ============================================================================== --- head/mail/spamassassin/Makefile Fri Mar 13 17:37:20 2015 (r381226) +++ head/mail/spamassassin/Makefile Fri Mar 13 17:52:46 2015 (r381227) @@ -46,19 +46,25 @@ CONFIGURE_ARGS= SYSCONFDIR="${PREFIX}/et LOCALSTATEDIR="${DBDIR}/spamassassin" \ BUILD_SPAMC=yes -OPTIONS_DEFINE= AS_ROOT GNUPG SSL UPDATE_AND_COMPILE -OPTIONS_GROUP= DATABASE PLUGINS +OPTIONS_DEFINE= AS_ROOT SSL UPDATE_AND_COMPILE +OPTIONS_GROUP= DATABASE GPG PLUGINS OPTIONS_GROUP_DATABASE= MYSQL PGSQL OPTIONS_GROUP_PLUGINS= DCC DKIM PYZOR RAZOR RELAY_COUNTRY SPF_QUERY +OPTIONS_SINGLE= GPG +OPTIONS_SINGLE_GPG= GNUPG_NONE GNUPG GNUPG2 OPTIONS_DEFAULT= AS_ROOT GNUPG SSL UPDATE_AND_COMPILE AS_ROOT_DESC= Run spamd as root (recommended) -GNUPG_DESC= Install GnuPG (for sa-update, optional) 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 +GPG_DESC= GnuPG (for sa-update, optional) +GNUPG_NONE_DESC= Do not use GnuPG +GNUPG_DESC= GnuPG 1 (security/gnupg1) +GNUPG2_DESC= GnuPG 2 (security/gnupg) + PLUGINS_DESC= Optional SpamAssassin plugins DCC_DESC= DCC digest list support (mail/dcc-dccd) DKIM_DESC= Verify DKIM records (mail/p5-Mail-DKIM) @@ -77,6 +83,7 @@ DKIM_RUN_DEPENDS= p5-IO-Socket-SSL>=0:${ p5-Mail-DKIM>=0.37:${PORTSDIR}/mail/p5-Mail-DKIM \ p5-Crypt-OpenSSL-RSA>=0.26_1:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA GNUPG_RUN_DEPENDS= gnupg1>=1.4.7:${PORTSDIR}/security/gnupg1 +GNUPG2_RUN_DEPENDS= gpg2:${PORTSDIR}/security/gnupg MYSQL_RUN_DEPENDS= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql PGSQL_RUN_DEPENDS= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg PYZOR_RUN_DEPENDS= pyzor:${PORTSDIR}/mail/pyzor
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503131752.t2DHqlNC018322>