Update SpamAssassin to 3.4.0, and take maintainership.

As part of this upgrade, the SPAMC option has been removed. First
and foremost, it was a NO-OP as spamc/spamd was being built anyway.
A number of other OPTIONS and dependencies have been cleaned up as
well.

I am also taking maintainership of p5-Mail-SpamAssassin-Alt, and I
intend to deprecate it unless I hear otherwise.

The patch/plist for japanese/p5-M-SA is no longer versioned. It'll
make future updates cleaner.

PR:		ports/186756
The patch is a collaborative effort between myself and
Takefu <takefu@airport.fm>

4 files changed, 42 insertions, 86 deletions

diff --git a/japanese/p5-Mail-SpamAssassin/Makefile b/japanese/p5-Mail-SpamAssassin/Makefile
index d6656a475e37..0286a0cd8cfe 100644
--- a/japanese/p5-Mail-SpamAssassin/Makefile
+++ b/japanese/p5-Mail-SpamAssassin/Makefile
@@ -1,7 +1,7 @@
 # Created by: TAOKA Fumiyoshi
 # $FreeBSD$
 
-PORTREVISION=	5
+PORTREVISION=	0
 CATEGORIES=	japanese mail perl5
 PKGNAMEPREFIX=	ja-p5-
 
@@ -10,13 +10,13 @@ COMMENT=	SpamAssassin with patches to handle multibyte character
 
 LICENSE=	APACHE20
 
-MASTERDIR=	${.CURDIR}/../../mail/p5-Mail-SpamAssassin
+MASTERDIR=	${.CURDIR}/../p5-Mail-SpamAssassin
 
-RUN_DEPENDS+=	ja-p5-MeCab>=0.98:${PORTSDIR}/japanese/p5-MeCab
+BUILD_DEPENDS=	ja-p5-MeCab>=0.98:${PORTSDIR}/japanese/p5-MeCab
 
 CONFLICTS=	p5-Mail-SpamAssassin-[0-9]*
 
-EXTRA_PATCHES=	${.CURDIR}/files/spamassassin-3.3.2-ja-1.patch
+EXTRA_PATCHES=	${.CURDIR}/files/spamassassin-ja.patch
 
 PKGMESSAGE=	${.CURDIR}/pkg-message
 PLIST=		${WRKDIR}/pkg-plist
@@ -30,6 +30,6 @@ pre-install:
 	@${CAT} ${PKGDIR}/pkg-plist >> ${PLIST}
 
 post-install::
-	@${CP} ${.CURDIR}/files/${TOKENIZER_PRE} ${STAGEDIR}${ETCDIR}/${TOKENIZER_PRE}.sample
+	${INSTALL_DATA} ${.CURDIR}/files/${TOKENIZER_PRE} ${STAGEDIR}${ETCDIR}/${TOKENIZER_PRE}.sample
 
 .include "${MASTERDIR}/Makefile"
diff --git a/japanese/p5-Mail-SpamAssassin/files/spamassassin-3.3.2-ja-1.patch b/japanese/p5-Mail-SpamAssassin/files/spamassassin-ja.patch
index 9ce06cfe2d9f..3544abe3555d 100644
--- a/japanese/p5-Mail-SpamAssassin/files/spamassassin-3.3.2-ja-1.patch
+++ b/japanese/p5-Mail-SpamAssassin/files/spamassassin-ja.patch
@@ -1,8 +1,7 @@
-diff -uNr lib/Mail/SpamAssassin/HTML.pm lib/Mail/SpamAssassin/HTML.pm
---- lib/Mail/SpamAssassin/HTML.pm	2011-06-07 08:59:17.000000000 +0900
-+++ lib/Mail/SpamAssassin/HTML.pm	2011-07-14 22:35:46.000000000 +0900
-@@ -84,7 +84,7 @@
- $ok_attributes{span}{$_} = 1 for qw( style );
+--- lib/Mail/SpamAssassin/HTML.pm.orig	2014-02-07 17:36:28.000000000 +0900
++++ lib/Mail/SpamAssassin/HTML.pm	2014-03-04 11:18:44.000000000 +0900
+@@ -86,7 +86,7 @@
+ $ok_attributes{div}{$_} = 1 for qw( style );
  
  sub new {
 -  my ($class) = @_;
@@ -10,7 +9,7 @@ diff -uNr lib/Mail/SpamAssassin/HTML.pm lib/Mail/SpamAssassin/HTML.pm
    my $self = $class->SUPER::new(
  		api_version => 3,
  		handlers => [
-@@ -97,6 +97,7 @@
+@@ -99,6 +99,7 @@
  			declaration => ["html_declaration", "self,text"],
  		],
  		marked_sections => 1);
@@ -18,7 +17,7 @@ diff -uNr lib/Mail/SpamAssassin/HTML.pm lib/Mail/SpamAssassin/HTML.pm
  
    $self;
  }
-@@ -672,7 +673,14 @@
+@@ -681,7 +682,14 @@
      }
    }
    else {
@@ -34,9 +33,8 @@ diff -uNr lib/Mail/SpamAssassin/HTML.pm lib/Mail/SpamAssassin/HTML.pm
      # trim leading whitespace if previous element was whitespace 
      # and current element is not invisible
      if (@{ $self->{text} } && !$display{invisible} &&
-diff -uNr lib/Mail/SpamAssassin/Message/Node.pm lib/Mail/SpamAssassin/Message/Node.pm
---- lib/Mail/SpamAssassin/Message/Node.pm	2011-06-07 08:59:17.000000000 +0900
-+++ lib/Mail/SpamAssassin/Message/Node.pm	2011-07-14 22:35:46.000000000 +0900
+--- lib/Mail/SpamAssassin/Message/Node.pm.orig	2014-02-07 17:36:23.000000000 +0900
++++ lib/Mail/SpamAssassin/Message/Node.pm	2014-03-04 11:22:38.000000000 +0900
 @@ -42,6 +42,7 @@
  use Mail::SpamAssassin::Constants qw(:sa);
  use Mail::SpamAssassin::HTML;
@@ -45,7 +43,7 @@ diff -uNr lib/Mail/SpamAssassin/Message/Node.pm lib/Mail/SpamAssassin/Message/No
  
  =item new()
  
-@@ -387,27 +388,10 @@
+@@ -385,27 +386,10 @@
  
  sub _normalize {
    my ($self, $data, $charset) = @_;
@@ -76,7 +74,7 @@ diff -uNr lib/Mail/SpamAssassin/Message/Node.pm lib/Mail/SpamAssassin/Message/No
  }
  
  =item rendered()
-@@ -430,8 +414,12 @@
+@@ -428,8 +412,12 @@
      # text/x-aol is ignored here, but looks like text/html ...
      return(undef,undef) unless ( $self->{'type'} =~ /^text\/(?:plain|html)$/i );
  
@@ -90,7 +88,7 @@ diff -uNr lib/Mail/SpamAssassin/Message/Node.pm lib/Mail/SpamAssassin/Message/No
  
      # render text/html always, or any other text|text/plain part as text/html
      # based on a heuristic which simulates a certain common mail client
-@@ -441,7 +429,7 @@
+@@ -439,7 +427,7 @@
      {
        $self->{rendered_type} = 'text/html';
  
@@ -99,10 +97,9 @@ diff -uNr lib/Mail/SpamAssassin/Message/Node.pm lib/Mail/SpamAssassin/Message/No
        $html->parse($text);				# parse+render text
        $self->{rendered} = $html->get_rendered_text();
        $self->{visible_rendered} = $html->get_rendered_text(invisible => 0);
-diff -uNr lib/Mail/SpamAssassin/Message.pm lib/Mail/SpamAssassin/Message.pm
---- lib/Mail/SpamAssassin/Message.pm	2011-06-07 08:59:17.000000000 +0900
-+++ lib/Mail/SpamAssassin/Message.pm	2011-07-14 22:35:46.000000000 +0900
-@@ -559,6 +559,8 @@
+--- lib/Mail/SpamAssassin/Message.pm.orig	2014-02-07 17:36:28.000000000 +0900
++++ lib/Mail/SpamAssassin/Message.pm	2014-03-04 11:27:31.000000000 +0900
+@@ -604,6 +604,8 @@
    delete $self->{'pristine_headers'};
    delete $self->{'line_ending'};
    delete $self->{'missing_head_body_separator'};
@@ -111,7 +108,7 @@ diff -uNr lib/Mail/SpamAssassin/Message.pm lib/Mail/SpamAssassin/Message.pm
  
    my @toclean = ( $self );
  
-@@ -585,6 +587,8 @@
+@@ -630,6 +632,8 @@
      delete $part->{'invisible_rendered'};
      delete $part->{'type'};
      delete $part->{'rendered_type'};
@@ -120,7 +117,7 @@ diff -uNr lib/Mail/SpamAssassin/Message.pm lib/Mail/SpamAssassin/Message.pm
  
      # if there are children nodes, add them to the queue of nodes to clean up
      if (exists $part->{'body_parts'}) {
-@@ -1014,7 +1018,14 @@
+@@ -1085,7 +1089,14 @@
  
    # whitespace handling (warning: small changes have large effects!)
    $text =~ s/\n+\s*\n+/\f/gs;		# double newlines => form feed
@@ -136,7 +133,7 @@ diff -uNr lib/Mail/SpamAssassin/Message.pm lib/Mail/SpamAssassin/Message.pm
    $text =~ tr/\f/\n/;			# form feeds => newline
    
    # warn "message: $text";
-@@ -1071,7 +1082,14 @@
+@@ -1142,7 +1153,14 @@
  
    # whitespace handling (warning: small changes have large effects!)
    $text =~ s/\n+\s*\n+/\f/gs;		# double newlines => form feed
@@ -152,7 +149,7 @@ diff -uNr lib/Mail/SpamAssassin/Message.pm lib/Mail/SpamAssassin/Message.pm
    $text =~ tr/\f/\n/;			# form feeds => newline
  
    my @textary = split_into_array_of_short_lines ($text);
-@@ -1122,7 +1140,14 @@
+@@ -1193,7 +1211,14 @@
  
    # whitespace handling (warning: small changes have large effects!)
    $text =~ s/\n+\s*\n+/\f/gs;		# double newlines => form feed
@@ -168,7 +165,7 @@ diff -uNr lib/Mail/SpamAssassin/Message.pm lib/Mail/SpamAssassin/Message.pm
    $text =~ tr/\f/\n/;			# form feeds => newline
  
    my @textary = split_into_array_of_short_lines ($text);
-@@ -1198,6 +1223,28 @@
+@@ -1269,6 +1294,28 @@
  
  # ---------------------------------------------------------------------------
  
@@ -197,18 +194,17 @@ diff -uNr lib/Mail/SpamAssassin/Message.pm lib/Mail/SpamAssassin/Message.pm
  1;
  
  =back
-diff -uNr lib/Mail/SpamAssassin/PerMsgStatus.pm lib/Mail/SpamAssassin/PerMsgStatus.pm
---- lib/Mail/SpamAssassin/PerMsgStatus.pm	2011-06-07 08:59:17.000000000 +0900
-+++ lib/Mail/SpamAssassin/PerMsgStatus.pm	2011-07-14 22:35:46.000000000 +0900
+--- lib/Mail/SpamAssassin/PerMsgStatus.pm.orig	2014-02-07 17:36:28.000000000 +0900
++++ lib/Mail/SpamAssassin/PerMsgStatus.pm	2014-03-04 11:30:25.000000000 +0900
 @@ -53,6 +53,7 @@
  use warnings;
  use re 'taint';
  
 +use Encode;
+ use Errno qw(ENOENT);
  use Time::HiRes qw(time);
  
- use Mail::SpamAssassin::Constants qw(:sa);
-@@ -733,19 +734,41 @@
+@@ -996,19 +997,41 @@
  
    # the report charset
    my $report_charset = "; charset=iso-8859-1";
@@ -255,9 +251,8 @@ diff -uNr lib/Mail/SpamAssassin/PerMsgStatus.pm lib/Mail/SpamAssassin/PerMsgStat
    }
  
    # get original headers, "pristine" if we can do it
-diff -uNr lib/Mail/SpamAssassin/Plugin/Bayes.pm lib/Mail/SpamAssassin/Plugin/Bayes.pm
---- lib/Mail/SpamAssassin/Plugin/Bayes.pm	2011-06-07 08:59:17.000000000 +0900
-+++ lib/Mail/SpamAssassin/Plugin/Bayes.pm	2011-07-14 22:35:46.000000000 +0900
+--- lib/Mail/SpamAssassin/Plugin/Bayes.pm.orig	2014-02-07 17:36:27.000000000 +0900
++++ lib/Mail/SpamAssassin/Plugin/Bayes.pm	2014-03-04 11:34:46.000000000 +0900
 @@ -223,6 +223,15 @@
  # will require a longer token than English ones.)
  use constant MAX_TOKEN_LENGTH => 15;
@@ -274,7 +269,7 @@ diff -uNr lib/Mail/SpamAssassin/Plugin/Bayes.pm lib/Mail/SpamAssassin/Plugin/Bay
  ###########################################################################
  
  sub new {
-@@ -983,9 +992,28 @@
+@@ -1039,9 +1048,28 @@
    $msgdata->{bayes_token_body} = $msg->{msg}->get_visible_rendered_body_text_array();
    $msgdata->{bayes_token_inviz} = $msg->{msg}->get_invisible_rendered_body_text_array();
    @{$msgdata->{bayes_token_uris}} = $msg->get_uri_list();
@@ -303,7 +298,7 @@ diff -uNr lib/Mail/SpamAssassin/Plugin/Bayes.pm lib/Mail/SpamAssassin/Plugin/Bay
  ###########################################################################
  
  # The calling functions expect a uniq'ed array of tokens ...
-@@ -1039,7 +1067,7 @@
+@@ -1095,7 +1123,7 @@
    # include quotes, .'s and -'s for URIs, and [$,]'s for Nigerian-scam strings,
    # and ISO-8859-15 alphas.  Do not split on @'s; better results keeping it.
    # Some useful tokens: "$31,000,000" "www.clock-speed.net" "f*ck" "Hits!"
@@ -312,7 +307,7 @@ diff -uNr lib/Mail/SpamAssassin/Plugin/Bayes.pm lib/Mail/SpamAssassin/Plugin/Bay
  
    # DO split on "..." or "--" or "---"; common formatting error resulting in
    # hapaxes.  Keep the separator itself as a token, though, as long ones can
-@@ -1068,6 +1096,11 @@
+@@ -1124,6 +1152,11 @@
      #
      next if ( defined $magic_re && $token =~ /$magic_re/ );
  
@@ -324,7 +319,7 @@ diff -uNr lib/Mail/SpamAssassin/Plugin/Bayes.pm lib/Mail/SpamAssassin/Plugin/Bay
      # *do* keep 3-byte tokens; there's some solid signs in there
      my $len = length($token);
  
-@@ -1096,14 +1129,16 @@
+@@ -1152,14 +1185,16 @@
      # the domain ".net" appeared in the To header.
      #
      if ($len > MAX_TOKEN_LENGTH && $token !~ /\*/) {
@@ -349,8 +344,8 @@ diff -uNr lib/Mail/SpamAssassin/Plugin/Bayes.pm lib/Mail/SpamAssassin/Plugin/Bay
        }
  
        if (($region == 0 && HDRS_TOKENIZE_LONG_TOKENS_AS_SKIPS)
-diff -uNr lib/Mail/SpamAssassin/Plugin/Tokenizer/MeCab.pm lib/Mail/SpamAssassin/Plugin/Tokenizer/MeCab.pm
---- lib/Mail/SpamAssassin/Plugin/Tokenizer/MeCab.pm	1970-01-01 09:00:00.000000000 +0900
+diff -uNr /dev/null lib/Mail/SpamAssassin/Plugin/Tokenizer/MeCab.pm
+--- /dev/null	1970-01-01 09:00:00.000000000 +0900
 +++ lib/Mail/SpamAssassin/Plugin/Tokenizer/MeCab.pm	2011-07-14 22:29:19.000000000 +0900
 @@ -0,0 +1,84 @@
 +# <@LICENSE>
@@ -437,8 +432,8 @@ diff -uNr lib/Mail/SpamAssassin/Plugin/Tokenizer/MeCab.pm lib/Mail/SpamAssassin/
 +
 +1;
 +
-diff -uNr lib/Mail/SpamAssassin/Plugin/Tokenizer/SimpleJA.pm lib/Mail/SpamAssassin/Plugin/Tokenizer/SimpleJA.pm
---- lib/Mail/SpamAssassin/Plugin/Tokenizer/SimpleJA.pm	1970-01-01 09:00:00.000000000 +0900
+diff -uNr /dev/null lib/Mail/SpamAssassin/Plugin/Tokenizer/SimpleJA.pm
+--- /dev/null	1970-01-01 09:00:00.000000000 +0900
 +++ lib/Mail/SpamAssassin/Plugin/Tokenizer/SimpleJA.pm	2011-07-14 22:29:19.000000000 +0900
 @@ -0,0 +1,111 @@
 +# <@LICENSE>
@@ -552,8 +547,8 @@ diff -uNr lib/Mail/SpamAssassin/Plugin/Tokenizer/SimpleJA.pm lib/Mail/SpamAssass
 +
 +1;
 +
-diff -uNr lib/Mail/SpamAssassin/Plugin/Tokenizer.pm lib/Mail/SpamAssassin/Plugin/Tokenizer.pm
---- lib/Mail/SpamAssassin/Plugin/Tokenizer.pm	1970-01-01 09:00:00.000000000 +0900
+diff -uNr /dev/null lib/Mail/SpamAssassin/Plugin/Tokenizer.pm
+--- /dev/null	1970-01-01 09:00:00.000000000 +0900
 +++ lib/Mail/SpamAssassin/Plugin/Tokenizer.pm	2011-07-14 22:35:46.000000000 +0900
 @@ -0,0 +1,115 @@
 +# <@LICENSE>
@@ -671,8 +666,8 @@ diff -uNr lib/Mail/SpamAssassin/Plugin/Tokenizer.pm lib/Mail/SpamAssassin/Plugin
 +
 +1;
 +
-diff -uNr lib/Mail/SpamAssassin/Util/Charset.pm lib/Mail/SpamAssassin/Util/Charset.pm
---- lib/Mail/SpamAssassin/Util/Charset.pm	1970-01-01 09:00:00.000000000 +0900
+diff -uNr /dev/null lib/Mail/SpamAssassin/Util/Charset.pm
+--- /dev/null	1970-01-01 09:00:00.000000000 +0900
 +++ lib/Mail/SpamAssassin/Util/Charset.pm	2011-07-14 22:29:19.000000000 +0900
 @@ -0,0 +1,471 @@
 +# <@LICENSE>
diff --git a/japanese/p5-Mail-SpamAssassin/files/spamassassin-3.3.2-ja-1.plist b/japanese/p5-Mail-SpamAssassin/files/spamassassin-ja.plist
index 1292bbb2d733..1292bbb2d733 100644
--- a/japanese/p5-Mail-SpamAssassin/files/spamassassin-3.3.2-ja-1.plist
+++ b/japanese/p5-Mail-SpamAssassin/files/spamassassin-ja.plist
diff --git a/japanese/p5-Mail-SpamAssassin/pkg-message b/japanese/p5-Mail-SpamAssassin/pkg-message
index 2ba532e27974..49cea24cb5a8 100644
--- a/japanese/p5-Mail-SpamAssassin/pkg-message
+++ b/japanese/p5-Mail-SpamAssassin/pkg-message
@@ -1,42 +1,3 @@
-*************************************************************************
-*	    _  _____ _____ _____ _   _ _____ ___ ___  _   _ 		*
-*	   / \|_   _|_   _| ____| \ | |_   _|_ _/ _ \| \ | |		*
-*	  / _ \ | |   | | |  _| |  \| | | |  | | | | |  \| |		*
-*	 / ___ \| |   | | | |___| |\  | | |  | | |_| | |\  |		*
-*	/_/   \_\_|   |_| |_____|_| \_| |_| |___\___/|_| \_|		*
-*									*
-*	See PREFIX/share/doc/p5-Mail-SpamAssassin/INSTALL,		*
-*	and PREFIX/share/doc/p5-Mail-SpamAssassin/UPGRADE,		*
-*	or http://spamassassin.org/dist/INSTALL and			*
-*	http://spamassassin.org/dist/UPGRADE BEFORE enabling		*
-*	this version of SpamAssassin for important information		*
-*	regarding changes in this version.				*
-*									*
-*	SpamAssassin may require additional configuration in		*
-*	PREFIX/etc/mail/spamassassin/init.pre depending on		*
-*	the options you have installed.	 Otherwise, annoying		*
-*	(but harmless) error messages may result.  Read the		*
-*	files listed above.						*
-*									*
-*************************************************************************
-You may wish to run sa-update now to obtain the latest rules.
-
-NOTE:  FREEBSD users: If you are updating from a version prior to 3.20.
-sa-update now places state files in /var/db/spamassassin and not 
-/var/lib/spamassassin.  This is to be consistant with Freebsd file
-directory conventions.
-
-If you run sa-compile, you will notice that files are in 
-/var/db/spamassassin/compiled/<perlversion>/<version> instead of
-/var/db/spamassassin/compiled/<version>.
-No attempts have been made to move old versions over. You must recompile.
-
-If you are running with spamd, you must add the following to rc.conf:
-spamd_enable="YES"
-
-Security Note:  If you did NOT deselected AS_ROOT, spamd will be running
-as root. To change this, also add this to rc.conf:
-spamd_flags="-u spamd -H /var/spool/spamd"
 
 ************************************************************************
 For Japanese users, see documents in