5 files changed, 9 insertions, 60 deletions

diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile
index 42083b81673b..1907d2dde349 100644
--- a/mail/p5-Mail-SpamAssassin/Makefile
+++ b/mail/p5-Mail-SpamAssassin/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	Mail-SpamAssassin
-PORTVERSION=	3.2.3
+PORTVERSION=	3.2.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
diff --git a/mail/p5-Mail-SpamAssassin/distinfo b/mail/p5-Mail-SpamAssassin/distinfo
index eedfbdfbe1de..3140e8c6fbec 100644
--- a/mail/p5-Mail-SpamAssassin/distinfo
+++ b/mail/p5-Mail-SpamAssassin/distinfo
@@ -1,3 +1,3 @@
-MD5 (Mail-SpamAssassin-3.2.3.tar.gz) = 2e356b70b9458b44a828c19f6e816521
-SHA256 (Mail-SpamAssassin-3.2.3.tar.gz) = 2bf7635555dea4912512a32c7c567094ef264770b86029c49f653e97352efad8
-SIZE (Mail-SpamAssassin-3.2.3.tar.gz) = 1202082
+MD5 (Mail-SpamAssassin-3.2.4.tar.gz) = 81ec227d4d63aba08563ee868af9fbeb
+SHA256 (Mail-SpamAssassin-3.2.4.tar.gz) = 20f9c64d75210da5018d21585f6474868966cf1c09cb68d9fb0a3635aa17dccb
+SIZE (Mail-SpamAssassin-3.2.4.tar.gz) = 1219161
diff --git a/mail/p5-Mail-SpamAssassin/files/patch-ImageInfo.pm b/mail/p5-Mail-SpamAssassin/files/patch-ImageInfo.pm
deleted file mode 100644
index 482a3c0b001d..000000000000
--- a/mail/p5-Mail-SpamAssassin/files/patch-ImageInfo.pm
+++ /dev/null
@@ -1,56 +0,0 @@
---- lib/Mail/SpamAssassin/Plugin/ImageInfo.pm.orig	2007-08-08 05:19:14.000000000 -0800
-+++ lib/Mail/SpamAssassin/Plugin/ImageInfo.pm	2007-08-11 12:20:22.000000000 -0800
-@@ -49,6 +49,11 @@
- #     body LARGE_IMAGE_AREA  eval:pixel_coverage('all',150000)
- #     body SMALL_GIF_AREA  eval:pixel_coverage('gif',1,40000)
- #
-+#  image_name_regex() examples
-+#
-+#     body CG_DOUBLEDOT_GIF  eval:image_name_regex('/^\w{2,9}\.\.gif$/i') # catches double dot gifs  abcd..gif
-+#
-+#
- #  See the ruleset for ways to meta image_count() 
- #  and pixel_coverage() together.  
- #
-@@ -80,6 +85,7 @@
-   $self->register_eval_rule ("image_size_exact");
-   $self->register_eval_rule ("image_size_range");
-   $self->register_eval_rule ("image_named");
-+  $self->register_eval_rule ("image_name_regex");
-   $self->register_eval_rule ("image_to_text_ratio");
- 
-   return $self;
-@@ -275,6 +281,33 @@
- }
- 
- # -----------------------------------------
-+sub image_name_regex {
-+  my ($self,$pms,$body,$re) = @_;
-+  return unless (defined $re);
-+
-+  # make sure we have image data read in.
-+  if (!exists $pms->{'imageinfo'}) {
-+    $self->_get_images($pms);
-+  }
-+
-+  return 0 unless (exists $pms->{'imageinfo'}->{"names_all"});
-+
-+  my $hit = 0;
-+  foreach my $name (keys %{$pms->{'imageinfo'}->{"names_all"}}) {
-+    dbg("imageinfo: checking image named $name against regex $re");
-+    my $eval = 'if (q{'.$name.'} =~  ' . $re . ') {  $hit = 1; } ';
-+    eval $eval;
-+    dbg("imageinfo: error in regex $re - $@") if $@;
-+    if ($hit) {
-+      dbg("imageinfo: image_name_regex hit on $name");
-+      return 1;
-+    }
-+  }
-+  return 0;
-+
-+   }
-+
-+# -----------------------------------------
- 
- sub image_to_text_ratio {
-   my ($self,$pms,$body,$type,$min,$max) = @_;
diff --git a/mail/p5-Mail-SpamAssassin/pkg-deinstall b/mail/p5-Mail-SpamAssassin/pkg-deinstall
index 494e9402eb30..fb8983183880 100644
--- a/mail/p5-Mail-SpamAssassin/pkg-deinstall
+++ b/mail/p5-Mail-SpamAssassin/pkg-deinstall
@@ -4,6 +4,10 @@ if [ "$2" != "POST-DEINSTALL" ]; then
     exit 0
 fi
 
+if [ -d /var/db/spamassassin ]; then
+        echo "To delete /var/db/spamassassin, use 'rm -rf /var/db/spamassassin'"
+fi
+
 USER=spamd
 
 if pw usershow "${USER}" 2>/dev/null 1>&2; then
diff --git a/mail/p5-Mail-SpamAssassin/pkg-plist b/mail/p5-Mail-SpamAssassin/pkg-plist
index bab87e10fba2..adf42ae57964 100644
--- a/mail/p5-Mail-SpamAssassin/pkg-plist
+++ b/mail/p5-Mail-SpamAssassin/pkg-plist
@@ -172,6 +172,7 @@ etc/mail/spamassassin/v320.pre.sample
 @unexec rm -rf /var/lib/spamassassin/2* || true
 @unexec rmdir /var/lib/spamassassin 2>/dev/null  || true
 @unexec rmdir /var/lib 2>/dev/null || true
+@unexec rmdir /var/db/spamassassin || true
 @dirrm %%DATADIR%%
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail