ports/141776: Update port: japanese/p5-Mail-SpamAssassin

[TAOKA Fumiyoshi]

>Number:         141776
>Category:       ports
>Synopsis:       Update port: japanese/p5-Mail-SpamAssassin
>Confidential:   no
>Severity:       critical
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 19 16:10:09 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     TAOKA Fumiyoshi
>Release:        
>Organization:
>Environment:
>Description:
	Sync with mail/p5-Mail-SpamAssassin 3.2.5_4.
>How-To-Repeat:
>Fix:

diff --exclude CVS -uNr p5-Mail-SpamAssassin.orig/Makefile p5-Mail-SpamAssassin/Makefile
--- p5-Mail-SpamAssassin.orig/Makefile	2009-07-23 01:26:45.000000000 +0900
+++ p5-Mail-SpamAssassin/Makefile	2009-12-20 00:37:28.000000000 +0900
@@ -7,7 +7,7 @@
 
 PORTNAME=	Mail-SpamAssassin
 PORTVERSION=	3.2.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	japanese mail perl5
 MASTER_SITES=	${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/} \
 		${PATCH_SITES}
@@ -107,7 +107,7 @@
 .endif
 
 .if defined(WITH_DKIM)
-RUN_DEPENDS+=	p5-Mail-DKIM>=0.33:${PORTSDIR}/mail/p5-Mail-DKIM
+RUN_DEPENDS+=	p5-Mail-DKIM>=0.34:${PORTSDIR}/mail/p5-Mail-DKIM
 RUN_DEPENDS+=	${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL
 RUN_DEPENDS+=	p5-Crypt-OpenSSL-RSA>=0.24:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA
 .endif
@@ -222,7 +222,9 @@
 		-e 's#B_CONFDIR)/v320.pre#B_CONFDIR)/v320.pre.sample#g' \
 		-e 's/require DBI/0/' \
 		${WRKSRC}/Makefile.PL
-	@${REINPLACE_CMD} -e '/^CC =/d' ${WRKSRC}/spamc/Makefile.in
+	@${REINPLACE_CMD} -e '/^CC =/d; \
+		s|@SSLCFLAGS@|& $${CFLAGS}|g' ${WRKSRC}/spamc/Makefile.in
+
 
 .if defined(WITH_RAZOR)
 	${REINPLACE_CMD} -e '/Razor2/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v312.pre
diff --exclude CVS -uNr p5-Mail-SpamAssassin.orig/files/patch-spamassassin.raw p5-Mail-SpamAssassin/files/patch-spamassassin.raw
--- p5-Mail-SpamAssassin.orig/files/patch-spamassassin.raw	1970-01-01 09:00:00.000000000 +0900
+++ p5-Mail-SpamAssassin/files/patch-spamassassin.raw	2009-12-20 00:42:32.000000000 +0900
@@ -0,0 +1,12 @@
+--- spamassassin.raw.orig       2009-05-14 20:48:01.000000000 -0500
++++ spamassassin.raw    2009-05-14 20:48:19.000000000 -0500
+@@ -530,7 +530,7 @@
+     $mail->finish();      # bug 5626: remove temp files etc.
+     $mail = undef;
+   }
+-  exit 0;
++  exit 15;
+ }
+
+ # ---------------------------------------------------------------------------
+
diff --exclude CVS -uNr p5-Mail-SpamAssassin.orig/pkg-install p5-Mail-SpamAssassin/pkg-install
--- p5-Mail-SpamAssassin.orig/pkg-install	2009-05-31 08:24:02.000000000 +0900
+++ p5-Mail-SpamAssassin/pkg-install	2009-12-20 00:43:45.000000000 +0900
@@ -39,7 +39,7 @@
    fi
    grep '^load.*Rule2XSBody' ${PKG_PREFIX}/etc/mail/spamassassin/v320.pre > /dev/null
    if [ $? -eq 0 ];then
-     if yesno "Do you with to compile rules with re2c (will take a long time)" "N";then
+     if yesno "Do you wish to compile rules with re2c (will take a long time)" "N";then
        ${PKG_PREFIX}/bin/sa-compile
      fi
    fi
>Release-Note:
>Audit-Trail:
>Unformatted: