ports/97983: upgrade mail/p5-Mail-SpamAssassin to 3.1.2

[Larry Rosenman]

On Sat, 27 May 2006, Anton Berezin wrote:
> I am getting quite a bit of test failures.  Also, it appears that the
> packing list is not quite correct:
I get no failures at all on a make test (6.1-STABLE, current ports tree).
>

I still don't know how to fix portlint for the OpenSSL issue.


Updated diff, to fix plist:

===> Viewing diff with more
diff -ruN --exclude=CVS /usr/ports/mail/p5-Mail-SpamAssassin/Makefile /usr/home/ler/ports/mail/p5-Mail-SpamAssassin/Makefile
--- /usr/ports/mail/p5-Mail-SpamAssassin/Makefile	Tue May  2 08:36:02 2006
+++ /usr/home/ler/ports/mail/p5-Mail-SpamAssassin/Makefile	Sat May 27 07:53:37 2006
@@ -6,8 +6,7 @@
  #

  PORTNAME=	Mail-SpamAssassin
-PORTVERSION=	3.1.1
-PORTREVISION=	4
+PORTVERSION=	3.1.2
  CATEGORIES=	mail perl5
  MASTER_SITES=	${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
  MASTER_SITE_SUBDIR=	spamassassin/source/:apache Mail/:cpan
@@ -119,6 +118,7 @@
  		Mail::SpamAssassin::Plugin::AntiVirus.3 \
  		Mail::SpamAssassin::Plugin::AutoLearnThreshold.3 \
  		Mail::SpamAssassin::Plugin::DCC.3 \
+		Mail::SpamAssassin::Plugin::DKIM.3 \
  		Mail::SpamAssassin::Plugin::DomainKeys.3 \
  		Mail::SpamAssassin::Plugin::Hashcash.3 \
  		Mail::SpamAssassin::Plugin::MIMEHeader.3 \
@@ -171,6 +171,7 @@
  	@${REINPLACE_CMD} -e 's#B_CONFDIR)/local.cf#B_CONFDIR)/local.cf.sample#g' \
  		-e 's#B_CONFDIR)/init.pre#B_CONFDIR)/init.pre.sample#g' \
  		-e 's#B_CONFDIR)/v310.pre#B_CONFDIR)/v310.pre.sample#g' \
+		-e 's#B_CONFDIR)/v312.pre#B_CONFDIR)/v312.pre.sample#g' \
  		-e 's/require DBI/0/' \
  		${WRKSRC}/Makefile.PL
  .if defined(WITH_RAZOR)
diff -ruN --exclude=CVS /usr/ports/mail/p5-Mail-SpamAssassin/distinfo /usr/home/ler/ports/mail/p5-Mail-SpamAssassin/distinfo
--- /usr/ports/mail/p5-Mail-SpamAssassin/distinfo	Sun Mar 12 20:53:20 2006
+++ /usr/home/ler/ports/mail/p5-Mail-SpamAssassin/distinfo	Fri May 26 09:08:17 2006
@@ -1,3 +1,3 @@
-MD5 (Mail-SpamAssassin-3.1.1.tar.gz) = f7844cbc149de3d7b09a4310f4ab6739
-SHA256 (Mail-SpamAssassin-3.1.1.tar.gz) = e4284c445f8fed11bc82b3900dc4b75eec0d632768c894bf186c3b7e1de63797
-SIZE (Mail-SpamAssassin-3.1.1.tar.gz) = 1129275
+MD5 (Mail-SpamAssassin-3.1.2.tar.gz) = f255d8e887ea7961939d40b184e82054
+SHA256 (Mail-SpamAssassin-3.1.2.tar.gz) = 8d1c698f6d1b316a9230eb95298ed36231b7399f7c1875fcb72374e1554c1b38
+SIZE (Mail-SpamAssassin-3.1.2.tar.gz) = 1134784
diff -ruN --exclude=CVS /usr/ports/mail/p5-Mail-SpamAssassin/pkg-plist /usr/home/ler/ports/mail/p5-Mail-SpamAssassin/pkg-plist
--- /usr/ports/mail/p5-Mail-SpamAssassin/pkg-plist	Fri Apr  7 14:05:38 2006
+++ /usr/home/ler/ports/mail/p5-Mail-SpamAssassin/pkg-plist	Sat May 27 07:58:43 2006
@@ -12,6 +12,9 @@
  @unexec if cmp -s %B/v310.pre.sample %B/v310.pre; then rm -f %B/v310.pre; fi
  etc/mail/spamassassin/v310.pre.sample
  @exec [ -f %B/v310.pre ] || cp %B/%f %B/v310.pre
+ at unexec if cmp -s %B/v312.pre.sample %B/v312.pre; then rm -f %B/v312.pre; fi
+etc/mail/spamassassin/v312.pre.sample
+ at exec [ -f %B/v312.pre ] || cp %B/%f %B/v312.pre
  %%SITE_PERL%%/Mail/SpamAssassin.pm
  %%SITE_PERL%%/Mail/SpamAssassin/ArchiveIterator.pm
  %%SITE_PERL%%/Mail/SpamAssassin/AutoWhitelist.pm
@@ -59,6 +62,7 @@
  %%SITE_PERL%%/Mail/SpamAssassin/Plugin/AntiVirus.pm
  %%SITE_PERL%%/Mail/SpamAssassin/Plugin/AutoLearnThreshold.pm
  %%SITE_PERL%%/Mail/SpamAssassin/Plugin/DCC.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/DKIM.pm
  %%SITE_PERL%%/Mail/SpamAssassin/Plugin/DomainKeys.pm
  %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Hashcash.pm
  %%SITE_PERL%%/Mail/SpamAssassin/Plugin/MIMEHeader.pm
@@ -106,6 +110,7 @@
  %%DATADIR%%/25_body_tests_es.cf
  %%DATADIR%%/25_body_tests_pl.cf
  %%DATADIR%%/25_dcc.cf
+%%DATADIR%%/25_dkim.cf
  %%DATADIR%%/25_domainkeys.cf
  %%DATADIR%%/25_hashcash.cf
  %%DATADIR%%/25_pyzor.cf
@@ -123,6 +128,7 @@
  %%DATADIR%%/50_scores.cf
  %%DATADIR%%/60_awl.cf
  %%DATADIR%%/60_whitelist.cf
+%%DATADIR%%/60_whitelist_dkim.cf
  %%DATADIR%%/60_whitelist_spf.cf
  %%DATADIR%%/60_whitelist_subject.cf
  %%DATADIR%%/languages
@@ -130,7 +136,6 @@
  %%DATADIR%%/sa-update-pubkey.txt
  %%DATADIR%%/user_prefs.template
  %%TOOLS%%%%DATADIR%%/tools/README.speedtest
-%%TOOLS%%%%DATADIR%%/tools/bayes_dump_to_trusted_networks
  %%TOOLS%%%%DATADIR%%/tools/check_whitelist
  %%TOOLS%%%%DATADIR%%/tools/convert_awl_dbm_to_sql
  %%TOOLS%%%%DATADIR%%/tools/desc_length.pl
===> Done
-- 
Larry Rosenman                     http://www.lerctr.org/~ler
Phone: +1 512-248-2683                 E-Mail: ler at lerctr.org
US Mail: 430 Valona Loop, Round Rock, TX 78681-3893