svn commit: r451792 - head/mail/spamassassin

[Niclas Zeising]

Author: zeising
Date: Wed Oct 11 19:56:07 2017
New Revision: 451792
URL: https://svnweb.freebsd.org/changeset/ports/451792

Log:
  Add missing dependency on p5-IP-Country when the nondefault option
  RELAY_COUNTRY is enabled [0]
  
  While here, carbage collect the UPDATE_AND_COMPILE option from
  OPTIONS_DEFUALT, this was most likely missed in r425590
  
  Don't bump portrevision, since this dependency is nut pulled in by default.
  
  PR:		222649 [0]
  Reported by:	Max Kostikov <max at kostikov.co> [0]

Modified:
  head/mail/spamassassin/Makefile

Modified: head/mail/spamassassin/Makefile
==============================================================================
--- head/mail/spamassassin/Makefile	Wed Oct 11 19:50:32 2017	(r451791)
+++ head/mail/spamassassin/Makefile	Wed Oct 11 19:56:07 2017	(r451792)
@@ -55,7 +55,7 @@ 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 DKIM GNUPG SSL UPDATE_AND_COMPILE SPF_QUERY
+OPTIONS_DEFAULT=	AS_ROOT DKIM GNUPG SSL SPF_QUERY
 
 AS_ROOT_DESC=		Run spamd as root (recommended)
 
@@ -91,7 +91,8 @@ MYSQL_RUN_DEPENDS=	p5-DBD-mysql>=0:databases/p5-DBD-my
 PGSQL_RUN_DEPENDS=	p5-DBD-Pg>=0:databases/p5-DBD-Pg
 PYZOR_RUN_DEPENDS=	pyzor:mail/pyzor
 RAZOR_RUN_DEPENDS=	razor-agents>=2.84:mail/razor-agents
-RELAY_COUNTRY_RUN_DEPENDS=	p5-Geo-IP>=0:net/p5-Geo-IP
+RELAY_COUNTRY_RUN_DEPENDS=	p5-Geo-IP>=0:net/p5-Geo-IP \
+			p5-IP-Country>=0:net/p5-IP-Country
 SPF_QUERY_RUN_DEPENDS=	p5-Mail-SPF>=0:mail/p5-Mail-SPF
 
 SSL_USES=		ssl