- If there is no gnupg installed, install 2.x. If there is, use it. [1]

- DKIM plugin and Mail::DKIM do not need Mail::DomainKeys [2]
- Fix sa-learn with stdin [3]
  https://issues.apache.org/SpamAssassin/show_bug.cgi?id=5336
- Bump PORTREVISON

PR:		ports/109434 [1]
Submitted by:	Michele Possamai <possamai at xs4all.nl> [1],
		Mark Martinec (amavisd-new writer) [2], takefu [3]
Approved by:	Michael Scheidell <scheidell at secnap.net> (maintainer)

2 files changed, 29 insertions, 4 deletions

diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile
index 9ca507ebaab3..fbb69059c94f 100644
--- a/mail/p5-Mail-SpamAssassin/Makefile
+++ b/mail/p5-Mail-SpamAssassin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Mail-SpamAssassin
 PORTVERSION=	3.1.8
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
 MASTER_SITE_SUBDIR=	spamassassin/source/:apache Mail/:cpan
@@ -61,7 +62,7 @@ CONFIGURE_ARGS+=	ENABLE_SSL=no
 .endif
 
 .if !defined(WITHOUT_GNUPG)
-RUN_DEPENDS+=	gpgv:${PORTSDIR}/security/gnupg1
+RUN_DEPENDS+=	gnupg>=1.4.1:${PORTSDIR}/security/gnupg
 .endif
 
 .if defined(WITH_MYSQL)
@@ -80,7 +81,7 @@ RUN_DEPENDS+=	razor-agents>=2.81:${PORTSDIR}/mail/razor-agents
 RUN_DEPENDS+=	${SITE_PERL}/Mail/DKIM.pm:${PORTSDIR}/mail/p5-Mail-DKIM
 .endif
 
-.if defined(WITH_DOMAINKEYS) || defined(WITH_DKIM)
+.if defined(WITH_DOMAINKEYS)
 RUN_DEPENDS+=	p5-Mail-DomainKeys>=0.80:${PORTSDIR}/mail/p5-Mail-DomainKeys
 .endif
 
@@ -184,14 +185,24 @@ post-patch:
 		-e 's#B_CONFDIR)/v312.pre#B_CONFDIR)/v312.pre.sample#g' \
 		-e 's/require DBI/0/' \
 		${WRKSRC}/Makefile.PL
+# I cant' seem to get these to work, patches or suggestions welcome
 .if defined(WITH_RAZOR)
 	${REINPLACE_CMD} -e '/Razor2/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v312.pre
 .endif
 .if defined(WITH_DOMAINKEYS)
-	${REINPLACE_CMD} -e '/DomainKeys/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v312.pre
+	${REINPLACE_CMD} -e '/DomainKeys/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v310.pre
 .endif
 .if defined(WITH_RELAY_COUNTRY)
-	${REINPLACE_CMD} -e '/RelayCountry/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/init.pre
+	${REINPLACE_CMD} -e '/RelayCountry/s/^# ?loadplugin/loadplugin/' ${WRKSRC}/rules/init.pre
+.endif
+.if defined(WITH_DKIM)
+	${REINPLACE_CMD} -e '/DKIM/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v312.pre
+.endif
+.if !defined(WITH_SPF_QUERY)
+	${REINPLACE_CMD} -e '/SPF/s/^loadplugin/#loadplugin/' ${WRKSRC}/rules/init.pre
+.endif
+.if defined(WITH_DCC)
+	${REINPLACE_CMD} -e '/DCC/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v310.pre
 .endif
 
 pre-install:
diff --git a/mail/p5-Mail-SpamAssassin/files/patch-sa-learn-raw b/mail/p5-Mail-SpamAssassin/files/patch-sa-learn-raw
new file mode 100644
index 000000000000..e8c2bb9aa1ac
--- /dev/null
+++ b/mail/p5-Mail-SpamAssassin/files/patch-sa-learn-raw
@@ -0,0 +1,14 @@
+--- sa-learn.raw	(revision 507745)
++++ sa-learn.raw	(working copy)
+@@ -402,7 +402,10 @@
+ 
+     # make sure the target list is in the normal AI format
+     if ($targets[$elem] !~ /^[^:]*:[a-z]+:/) {
+-      $targets[$elem] = target($targets[$elem]);
++      my $item = splice @targets, $elem, 1;
++      $elem--; # go back to this element again
++      target($item); # add back to the list
++      next;
+     }
+   }
+