Index: head/mail/p5-Mail-SpamAssassin/Makefile
===================================================================
--- head/mail/p5-Mail-SpamAssassin/Makefile	(revision 55471)
+++ head/mail/p5-Mail-SpamAssassin/Makefile	(revision 55472)
@@ -1,51 +1,51 @@
 # New ports collection makefile for:	p5-Mail-SpamAssassin
 # Date created:				Nov 26 2001
 # Whom:					Anthony Kim
 #
 # $FreeBSD$
 #
 
 PORTNAME=	Mail-SpamAssassin
 PORTVERSION=	2.01
-PORTREVISION=   7
+PORTREVISION=   8
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Mail
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS
 RUN_DEPENDS=	${BUILD_DEPENDS} \
 		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Razor/Client.pm:${PORTSDIR}/mail/razor-agents
 
 PERL_CONFIGURE=	yes
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Mail::SpamAssassin.3 Mail::SpamAssassin::PerMsgStatus.3 \
 		Mail::SpamAssassin::Conf.3 \
 		Mail::SpamAssassin::PersistentAddrList.3 \
 		Mail::SpamAssassin::SMTP::SmartHost.3
 MAN1PREFIX=	${PREFIX}
 MAN1=		spamd.1 spamassassin.1 spamc.1
 
 post-patch:
 	@find ${WRKSRC} -type f -name "*.orig" -exec rm -f "{}" ";"
 
 post-install:
 	strip ${PREFIX}/bin/spamc
 	cd ${FILESDIR}; \
 		${INSTALL_DATA} spamd.sh \
 		${PREFIX}/etc/rc.d/spamd.sh-dist
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/sample-nonspam.txt ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/sample-spam.txt ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/spamd/README ${DOCSDIR}/spamd.README
 	${INSTALL_DATA} ${WRKSRC}/spamproxy/README ${DOCSDIR}/spamproxy.README
 	${INSTALL_DATA} ${WRKSRC}/sql/README ${DOCSDIR}/sql.README
 	${INSTALL_DATA} ${WRKSRC}/sql/spamassassin.sql ${DOCSDIR}/spamassassin.sql
 	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/mail/p5-Mail-SpamAssassin/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.11
\ No newline at end of property
+1.12
\ No newline at end of property
Index: head/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::EvalTests.pm
===================================================================
--- head/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::EvalTests.pm	(revision 55471)
+++ head/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::EvalTests.pm	(revision 55472)
@@ -1,21 +1,30 @@
---- lib/Mail/SpamAssassin/EvalTests.pm.bak	Fri Jan 25 07:36:02 2002
-+++ lib/Mail/SpamAssassin/EvalTests.pm	Tue Feb 26 19:17:43 2002
+--- lib/Mail/SpamAssassin/EvalTests.pm.orig	Fri Jan 25 07:36:02 2002
++++ lib/Mail/SpamAssassin/EvalTests.pm	Sun Mar  3 13:02:37 2002
+@@ -115,7 +115,7 @@
+   my $rcvd = $self->get ('Received');
+   $rcvd =~ s/\s+/ /gs;		# just spaces, simplify the regexp
+ 
+-  my $ip = $self->get ('X-Originating-Ip');
++  my $ip = $self->get ('X-Originating-IP');
+   if ($ip =~ /\d+\.\d+\.\d+\.\d+/) { $ip = 1; } else { $ip = 0; }
+ 
+   # Hotmail formats its received headers like this:
 @@ -688,10 +688,17 @@
  
  sub check_for_faraway_charset_in_headers {
    my ($self) = @_;
 +  my $hdr;
  
    my @locales = $self->get_my_locales();
    for my $h (qw(From Subject)) {
 -    my $hdr = $self->get($h);
 +# Can't use just get() because it un-mime header
 +    my @hdrs = $self->{msg}->get_header ($h);
 +    if ($#hdrs >= 0) {
 +      $hdr = join (" ", @hdrs);
 +    } else {
 +      $hdr = '';
 +    }
      while ($hdr =~ /=\?(.+?)\?.\?.*?\?=/g) {
        Mail::SpamAssassin::Locales::is_charset_ok_for_locales($1, @locales)
  	  or return 1;

Property changes on: head/mail/p5-Mail-SpamAssassin/files/patch-lib-Mail-SpamAssassin::EvalTests.pm
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property