Bug 107191 - add DKIM, fix gnupg typo
add DKIM, fix gnupg typo
Status: Closed FIXED
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s)
Latest
Any Any
: Normal Affects Only Me
Assigned To: perl
:
Depends on:
Blocks:
  Show dependency treegraph
 
Reported: 2006-12-25 15:00 UTC by scheidell
Modified: 2006-12-25 17:00 UTC (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description scheidell 2006-12-25 15:00:32 UTC
#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
Comment 1 Erwin Lansing freebsd_committer 2006-12-25 15:16:22 UTC
Responsible Changed
From-To: freebsd-ports-bugs->perl

Over to maitnainers.
Comment 2 dfilter freebsd_committer 2006-12-25 16:52:11 UTC
erwin       2006-12-25 16:52:05 UTC

  FreeBSD ports repository

  Modified files:
    mail/p5-Mail-SpamAssassin Makefile 
  Log:
  Add support for DKIM in addition to DomainKeys.
  
  PR:             107191
  Submitted by:   Michael Scheidell <scheidell@secnap.net>
  
  Revision  Changes    Path
  1.103     +6 -1      ports/mail/p5-Mail-SpamAssassin/Makefile
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
Comment 3 Erwin Lansing freebsd_committer 2006-12-25 16:52:21 UTC
State Changed
From-To: open->closed

I committed the DKIM part, thanks! 

gnupg1 is not a typo, there are two ports, security/gnupg 
and security/gnupg1.  Are you sure it works with the newer 
version of GnuPG to use that instead of gnupg1?