- Update to 3.2.3

- Add CONFLICTS with p5-Mail-SpamAssassin

PR:		ports/119369
Submitted by:	TAOKA Fumiyoshi <fmysh at iijmio-mail.jp> (maintainer)

3 files changed, 56 insertions, 14 deletions

diff --git a/japanese/p5-Mail-SpamAssassin/files/patch-sa-compile.raw b/japanese/p5-Mail-SpamAssassin/files/patch-sa-compile.raw
new file mode 100644
index 000000000000..0d9c125767a4
--- /dev/null
+++ b/japanese/p5-Mail-SpamAssassin/files/patch-sa-compile.raw
@@ -0,0 +1,29 @@
+--- sa-compile.raw.orig	2007-08-08 05:19:47.000000000 -0800
++++ sa-compile.raw	2007-08-11 12:31:07.000000000 -0800
+@@ -659,9 +659,9 @@
+   -p prefs, --prefspath=file, --prefs-file=file
+                                 Set user preferences file
+   --siteconfigpath=path         Path for site configs
+-                                (default: /etc/mail/spamassassin)
++                               (default: @@LOCAL_RULES_DIR@@)
+   --updatedir=path              Directory to place updates
+-                      (default: /var/lib/spamassassin/compiled/<version>)
++                      (default: @@LOCAL_STATE_DIR@@/compiled/<version>)
+   --cf='config line'            Additional line of configuration
+   -D, --debug [area=n,...]	Print debugging messages
+   -V, --version			Print version
+@@ -708,12 +708,12 @@
+ =item B<-C> I<path>, B<--configpath>=I<path>, B<--config-file>=I<path>
+ 
+ Use the specified path for locating the distributed configuration files.
+-Ignore the default directories (usually C</usr/share/spamassassin> or similar).
++Ignore the default directories (usually C<@@DEF_RULES_DIR@@> or similar).
+ 
+ =item B<--siteconfigpath>=I<path>
+ 
+ Use the specified path for locating site-specific configuration files.  Ignore
+-the default directories (usually C</etc/mail/spamassassin> or similar).
++the default directories (usually C<@@LOCAL_RULES_DIR@@> or similar).
+ 
+ =item B<--updatedir>
+ 
diff --git a/japanese/p5-Mail-SpamAssassin/files/patch-sa-learn-raw b/japanese/p5-Mail-SpamAssassin/files/patch-sa-learn-raw
index e8c2bb9aa1ac..e69de29bb2d1 100644
--- a/japanese/p5-Mail-SpamAssassin/files/patch-sa-learn-raw
+++ b/japanese/p5-Mail-SpamAssassin/files/patch-sa-learn-raw
@@ -1,14 +0,0 @@
---- sa-learn.raw	(revision 507745)
-+++ sa-learn.raw	(working copy)
-@@ -402,7 +402,10 @@
- 
-     # make sure the target list is in the normal AI format
-     if ($targets[$elem] !~ /^[^:]*:[a-z]+:/) {
--      $targets[$elem] = target($targets[$elem]);
-+      my $item = splice @targets, $elem, 1;
-+      $elem--; # go back to this element again
-+      target($item); # add back to the list
-+      next;
-     }
-   }
-
diff --git a/japanese/p5-Mail-SpamAssassin/files/patch-sa-learn.raw b/japanese/p5-Mail-SpamAssassin/files/patch-sa-learn.raw
new file mode 100644
index 000000000000..635cc317adc9
--- /dev/null
+++ b/japanese/p5-Mail-SpamAssassin/files/patch-sa-learn.raw
@@ -0,0 +1,27 @@
+--- sa-learn.raw.orig	Wed Aug  8 06:19:47 2007
++++ sa-learn.raw	Mon Aug 20 19:05:06 2007
+@@ -101,6 +101,7 @@ GetOptions(
+   'local|L'              => \$opt{'local'},
+   'no-sync|nosync'       => \$opt{'nosync'},
+   'showdots'             => \$opt{'showdots'},
++  'quiet|q'              => \$opt{'quiet'},
+   'progress'             => \$opt{'progress'},
+   'use-ignores'          => \$opt{'use-ignores'},
+   'no-rebuild|norebuild' => sub { $opt{'nosync'} = 1; warn "The --no-rebuild option has been deprecated.  Please use --no-sync instead.\n" },
+@@ -433,7 +434,7 @@ eval {
+   $progress->final() if ($opt{progress} && $progress);
+ 
+   my $phrase = defined $forget ? "Forgot" : "Learned";
+-  print "$phrase tokens from $learnedcount message(s) ($messagecount message(s) examined)\n";
++  print "$phrase tokens from $learnedcount message(s) ($messagecount message(s) examined)\n" if (!$opt{quiet});
+ 
+   # If we needed to make a tempfile, go delete it.
+   if ( defined $tempfile ) {
+@@ -601,6 +602,7 @@ Options:
+                        (default: /etc/mail/spamassassin)
+  --cf='config line'    Additional line of configuration
+  -D, --debug [area=n,...]  Print debugging messages
++ -q, --quiet           Reduce amount of information printed out
+  -V, --version         Print version
+  -h, --help            Print usage message
+