#1, gnupg seems to be gnupg not gnupg1
#2, SpamAssassin has supported DKIM in addition to DomainKeys for a 
while now, and (finally) DKIM.pm is in ports.
This patch adds DKIM and fixes gnupg type.

Fix: patch:

 diff -bBru Makefile.orig Makefile


PORTNAME=      Mail-SpamAssassin
 PORTVERSION=   3.1.7
-PORTREVISION=  3
+PORTREVISION=  4
 CATEGORIES=    mail perl5
 MASTER_SITES=  ${MASTER_SITE_APACHE:S/$/:apache/} 
${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
 MASTER_SITE_SUBDIR=    spamassassin/source/:apache Mail/:cpan
@@ -23,7 +23,7 @@
 RUN_DEPENDS=   ${BUILD_DEPENDS} \
                ${SITE_PERL}/Bundle/LWP.pm:${PORTSDIR}/www/p5-libwww \
                
${SITE_PERL}/Archive/Tar.pm:${PORTSDIR}/archivers/p5-Archive-Tar \
-               gpgv:${PORTSDIR}/security/gnupg1
+               gpgv:${PORTSDIR}/security/gnupg

 PERL_CONFIGURE=        yes
 CONFIGURE_ARGS=        SYSCONFDIR="${PREFIX}/etc" \
@@ -35,6 +35,7 @@

 OPTIONS=       AS_ROOT "Run spamd as root (recommended)" on \
                DOMAINKEYS "DomainKeys support" off \
+               DKIM "DomainKeys Identified Mail" off \
                SSL "Build with SSL support for spamd/spamc" on \
                MYSQL "Add MySQL support" off \
                PGSQL "Add PostreSQL support" off \
@@ -72,7 +73,11 @@
 RUN_DEPENDS+=  razor-agents>=2.81:${PORTSDIR}/mail/razor-agents
 .endif

-.if defined(WITH_DOMAINKEYS)
+.if defined(WITH_DKIM)
+RUN_DEPENDS+=  ${SITE_PERL}/Mail/DKIM.pm:${PORTSDIR}/mail/p5-Mail-DKIM
+.endif
+
+.if defined(WITH_DOMAINKEYS) || defined(WITH_DKIM)
 RUN_DEPENDS+=  
p5-Mail-DomainKeys>=0.80:${PORTSDIR}/mail/p5-Mail-DomainKeys
 .endif

@@ -179,7 +184,10 @@
 .if defined(WITH_RAZOR)
        ${REINPLACE_CMD} -e '/Razor2/s/^#loadplugin/loadplugin/' 
${WRKSRC}/rules/v312.pre
 .endif
-.if defined(WITH_DOMAINKEYS)
+.if defined(WITH_DKIM)
+       ${REINPLACE_CMD} -e '/DKIM/s/^#loadplugin/loadplugin/' 
${WRKSRC}/rules/v312.pre
+.endif
+.if defined(WITH_DOMAINKEYS) || defined(WITH_DKIM)
        ${REINPLACE_CMD} -e '/DomainKeys/s/^#loadplugin/loadplugin/' 
${WRKSRC}/rules/v312.pre
 .endif
 .if defined(WITH_RELAY_COUNTRY)--Esf24QKX6FpUeGHFd6EXC7ZhLchEHykzFqGqRwbDoX7KtS3I
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

--- Makefile.orig       Thu Dec 21 21:51:12 2006
+++ Makefile    Mon Dec 25 09:16:08 2006
@@ -7,7 +7,7 @@
How-To-Repeat: NA