- Update to 3.3.1

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

9 files changed, 140 insertions, 199 deletions

diff --git a/japanese/p5-Mail-SpamAssassin/Makefile b/japanese/p5-Mail-SpamAssassin/Makefile
index efc66a26278f..674b0130b907 100644
--- a/japanese/p5-Mail-SpamAssassin/Makefile
+++ b/japanese/p5-Mail-SpamAssassin/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	Mail-SpamAssassin
-PORTVERSION=	3.2.5
-PORTREVISION=	4
+PORTVERSION=	3.3.1
 CATEGORIES=	japanese mail perl5
 MASTER_SITES=	${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/} \
 		${PATCH_SITES}
@@ -18,30 +17,34 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:apache,cpan \
 DIST_SUBDIR=	ja-spamassassin
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-PATCH_SITES=	http://spamassassin.jp/download/sa${PORTVERSION:R}/:JA
+PATCH_SITES=	http://spamassassin.emaillab.jp/pub/ja-patch/sa${PORTVERSION:R}/:JA
 PATCHFILES=	spamassassin-${PORTVERSION}-ja-${PATCHLEVEL}.patch:JA
-PATCHLEVEL=	test1
+PATCHLEVEL=	1
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	fmysh@iijmio-mail.jp
 COMMENT=	SpamAssassin with Japanese tokenizer
 
-BUILD_DEPENDS=	p5-Net-DNS>=0.63:${PORTSDIR}/dns/p5-Net-DNS \
+BUILD_DEPENDS=	p5-NetAddr-IP>=4.00.7:${PORTSDIR}/net-mgmt/p5-NetAddr-IP \
+		p5-Archive-Tar>=1.23:${PORTSDIR}/archivers/p5-Archive-Tar \
+		p5-Net-DNS>=0.63:${PORTSDIR}/dns/p5-Net-DNS \
+		p5-Compress-Zlib>=2.04:${PORTSDIR}/archivers/p5-Compress-Zlib \
 		p5-IO-Zlib>=1.04:${PORTSDIR}/archivers/p5-IO-Zlib \
 		p5-HTML-Parser>=3.43:${PORTSDIR}/www/p5-HTML-Parser \
 		p5-IO-Compress-Zlib>=2.04:${PORTSDIR}/archivers/p5-IO-Compress-Zlib \
-		p5-Compress-Zlib>=2.04:${PORTSDIR}/archivers/p5-Compress-Zlib \
-		${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools \
-		p5-Digest-SHA1>=2.11:${PORTSDIR}/security/p5-Digest-SHA1
+		p5-Test-Harness>=3.16:${PORTSDIR}/devel/p5-Test-Harness \
+		${SITE_PERL}/Bundle/LWP.pm:${PORTSDIR}/www/p5-libwww \
+		${SITE_PERL}/${PERL_ARCH}/Encode/Detect.pm:${PORTSDIR}/converters/p5-Encode-Detect \
+		${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools
 
 RUN_DEPENDS=	${BUILD_DEPENDS} \
-		${SITE_PERL}/Bundle/LWP.pm:${PORTSDIR}/www/p5-libwww \
-		p5-Archive-Tar>=1.23:${PORTSDIR}/archivers/p5-Archive-Tar \
-		${SITE_PERL}/mach/Encode/Detect.pm:${PORTSDIR}/converters/p5-Encode-Detect
+		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
+		ja-p5-MeCab>=0.98:${PORTSDIR}/japanese/p5-MeCab
 
 CONFLICTS=	p5-Mail-SpamAssassin-[0-9]*
 
 PERL_CONFIGURE=	yes
+USE_PERL5_RUN=	5.8.8+
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	SYSCONFDIR="${PREFIX}/etc" \
 	       	CONTACT_ADDRESS="${CONTACT_ADDRESS}" \
@@ -53,14 +56,15 @@ CONTACT_ADDRESS?=	The administrator of that system
 OPTIONS=	AS_ROOT "Run spamd as root (recommended)" on \
 		SPAMC "Build spamd/spamc (not for amavisd)" on \
 		SACOMPILE "sa-compile" off \
-		DKIM "DKIM/DomainKeys Identified Mail" off \
+		DKIM "DKIM/DomainKeys Identified Mail" on \
 		SSL "Build with SSL support for spamd/spamc" on \
 		GNUPG "Install GnuPG (for sa-update)" on \
 		MYSQL "Add MySQL support" off \
 		PGSQL "Add PostreSQL support" off \
 		RAZOR "Add Vipul's Razor support" on \
 		SPF_QUERY "Add SPF query support" off \
-		RELAY_COUNTRY "Relay country support" off
+		RELAY_COUNTRY "Relay country support" off \
+		DCC "Add DCC support (see LICENSE)" off
 
 .if !defined(WITHOUT_SSL)
 USE_OPENSSL=	yes
@@ -77,8 +81,10 @@ WITHOUT_SSL=1
 .endif
 
 .if defined(WITH_SPF_QUERY)
-RUN_DEPENDS+=	p5-NetAddr-IP>=4.00.7:${PORTSDIR}/net-mgmt/p5-NetAddr-IP
-RUN_DEPENDS+=	${SITE_PERL}/Mail/SPF.pm:${PORTSDIR}/mail/p5-Mail-SPF
+BUILD_DEPENDS+=	${SITE_PERL}/Mail/SPF.pm:${PORTSDIR}/mail/p5-Mail-SPF
+.endif
+.if !defined(WITHOUT_IPV6)
+RUN_DEPENDS+=	${SITE_PERL}/IO/Socket/INET6.pm:${PORTSDIR}/net/p5-IO-Socket-INET6
 .endif
 
 .if !defined(WITHOUT_SSL)
@@ -107,12 +113,19 @@ RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-P
 
 .if defined(WITH_RAZOR)
 RUN_DEPENDS+=	razor-agents>=2.84:${PORTSDIR}/mail/razor-agents
+.else
+.if !defined(WITH_DKIM)
+.if   ${PERL_LEVEL} < 501000
+BUILD_DEPENDS+=	p5-Digest-SHA1>=2.11:${PORTSDIR}/security/p5-Digest-SHA1
+.endif
+.endif
 .endif
 
 .if defined(WITH_DKIM)
-RUN_DEPENDS+=	p5-Mail-DKIM>=0.34:${PORTSDIR}/mail/p5-Mail-DKIM
-RUN_DEPENDS+=	${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL
-RUN_DEPENDS+=	p5-Crypt-OpenSSL-RSA>=0.24:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA
+BUILD_DEPENDS+=	${SITE_PERL}/IO/Socket/SSL.pm:${PORTSDIR}/security/p5-IO-Socket-SSL
+BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Digest/SHA.pm:${PORTSDIR}/security/p5-Digest-SHA
+BUILD_DEPENDS+=	p5-Mail-DKIM>=0.37:${PORTSDIR}/mail/p5-Mail-DKIM
+BUILD_DEPENDS+=	p5-Crypt-OpenSSL-RSA>=0.24:${PORTSDIR}/security/p5-Crypt-OpenSSL-RSA
 .endif
 
 .if defined(WITH_SACOMPILE)
@@ -123,6 +136,10 @@ RUN_DEPENDS+=	re2c>=.12.0:${PORTSDIR}/devel/re2c
 RUN_DEPENDS+=	${SITE_PERL}/IP/Country/Fast.pm:${PORTSDIR}/net/p5-IP-Country
 .endif
 
+.if defined(WITH_DCC)
+RUN_DEPENDS+=	dcc-dccd>=1.3.111:${PORTSDIR}/mail/dcc-dccd
+.endif
+
 MAN3=		Mail::SpamAssassin.3 \
 		Mail::SpamAssassin::AICache.3 \
 		Mail::SpamAssassin::ArchiveIterator.3 \
@@ -130,6 +147,7 @@ MAN3=		Mail::SpamAssassin.3 \
 		Mail::SpamAssassin::AutoWhitelist.3 \
 		Mail::SpamAssassin::Bayes.3 \
 		Mail::SpamAssassin::BayesStore.3 \
+		Mail::SpamAssassin::BayesStore::BDB.3 \
 		Mail::SpamAssassin::BayesStore::MySQL.3 \
 		Mail::SpamAssassin::BayesStore::PgSQL.3 \
 		Mail::SpamAssassin::BayesStore::SQL.3 \
@@ -155,18 +173,20 @@ MAN3=		Mail::SpamAssassin.3 \
 		Mail::SpamAssassin::Plugin::AccessDB.3 \
 		Mail::SpamAssassin::Plugin::AntiVirus.3 \
 		Mail::SpamAssassin::Plugin::AutoLearnThreshold.3 \
+		Mail::SpamAssassin::Plugin::Bayes.3 \
 		Mail::SpamAssassin::Plugin::BodyRuleBaseExtractor.3 \
 		Mail::SpamAssassin::Plugin::Check.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 \
 		Mail::SpamAssassin::Plugin::OneLineBodyRuleType.3 \
+		Mail::SpamAssassin::Plugin::PhishTag.3 \
 		Mail::SpamAssassin::Plugin::Pyzor.3 \
 		Mail::SpamAssassin::Plugin::Razor2.3 \
 		Mail::SpamAssassin::Plugin::RelayCountry.3 \
 		Mail::SpamAssassin::Plugin::ReplaceTags.3 \
+		Mail::SpamAssassin::Plugin::Reuse.3 \
 		Mail::SpamAssassin::Plugin::Rule2XSBody.3 \
 		Mail::SpamAssassin::Plugin::SPF.3 \
 		Mail::SpamAssassin::Plugin::Shortcircuit.3 \
@@ -223,6 +243,7 @@ post-patch:
 		-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#B_CONFDIR)/v320.pre#B_CONFDIR)/v320.pre.sample#g' \
+		-e 's#B_CONFDIR)/v330.pre#B_CONFDIR)/v330.pre.sample#g' \
 		-e 's/require DBI/0/' \
 		${WRKSRC}/Makefile.PL
 	@${REINPLACE_CMD} -e '/^CC =/d; \
@@ -234,8 +255,8 @@ post-patch:
 .if defined(WITH_RELAY_COUNTRY)
 	${REINPLACE_CMD} -e '/RelayCountry/s/^# ?loadplugin/loadplugin/' ${WRKSRC}/rules/init.pre
 .endif
-.if defined(WITH_DKIM)
-	${REINPLACE_CMD} -e '/DKIM/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v312.pre
+.if !defined(WITH_DKIM)
+	${REINPLACE_CMD} -e '/DKIM/s/^loadplugin/#loadplugin/' ${WRKSRC}/rules/v312.pre
 .endif
 .if !defined(WITH_SPF_QUERY)
 	${REINPLACE_CMD} -e '/SPF/s/^loadplugin/#loadplugin/' ${WRKSRC}/rules/init.pre
@@ -243,10 +264,16 @@ post-patch:
 .if defined(WITH_DCC)
 	${REINPLACE_CMD} -e '/DCC/s/^#loadplugin/loadplugin/' ${WRKSRC}/rules/v310.pre
 .endif
+.if !defined(WITH_AWL)
+	${REINPLACE_CMD} -e '/AWL/s/^loadplugin/#loadplugin/' ${WRKSRC}/rules/v310.pre
+.endif
 .if defined(WITH_SACOMPILE)
 	${REINPLACE_CMD} -e '/Rule2XSBody/s/^# loadplugin/loadplugin/' ${WRKSRC}/rules/v320.pre
 .endif
 
+pre-install:
+	@${MKDIR}  ${DATADIR}
+
 post-build:
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} spamc/libspamc.so)
 .if !defined(WITHOUT_SSL)
@@ -279,7 +306,10 @@ post-install:
 	@[ -f ${PREFIX}/etc/mail/spamassassin/v320.pre ] || \
 		${CP} ${PREFIX}/etc/mail/spamassassin/v320.pre.sample \
 			${PREFIX}/etc/mail/spamassassin/v320.pre
-	@PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} POST-INSTALL
+	@PKG_PREFIX=${PREFIX} BATCH=${BATCH} SU_CMD="${SU_CMD}" ${SH} ${PKGDIR}/pkg-install ${PKGNAME} POST-INSTALL
+	@[ -f ${PREFIX}/etc/mail/spamassassin/v330.pre ] || \
+		${CP} ${PREFIX}/etc/mail/spamassassin/v330.pre.sample \
+			${PREFIX}/etc/mail/spamassassin/v330.pre
 
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${TOKENIZER_PRE} ${PREFIX}/etc/mail/spamassassin/${TOKENIZER_PRE}.sample
 	@[ -f ${PREFIX}/etc/mail/spamassassin/${TOKENIZER_PRE} ] || \
diff --git a/japanese/p5-Mail-SpamAssassin/distinfo b/japanese/p5-Mail-SpamAssassin/distinfo
index 07cf603da85b..f2b8d75143af 100644
--- a/japanese/p5-Mail-SpamAssassin/distinfo
+++ b/japanese/p5-Mail-SpamAssassin/distinfo
@@ -1,12 +1,12 @@
-MD5 (ja-spamassassin/Mail-SpamAssassin-3.2.5.tar.gz) = 7fdc1651d0371c4a7f95ac9ae6f828a6
-SHA256 (ja-spamassassin/Mail-SpamAssassin-3.2.5.tar.gz) = 105e18448d7ee2e576ceaca23b129da5e4a3c7dfccec73b6a3babb75d9c0b4f7
-SIZE (ja-spamassassin/Mail-SpamAssassin-3.2.5.tar.gz) = 1223706
+MD5 (ja-spamassassin/Mail-SpamAssassin-3.3.1.tar.gz) = 5a93f81fda315411560ff5da099382d2
+SHA256 (ja-spamassassin/Mail-SpamAssassin-3.3.1.tar.gz) = a11ca187150d5a8fc2904c4a50f29d3ff739294fa714aaab127ba692d65410ad
+SIZE (ja-spamassassin/Mail-SpamAssassin-3.3.1.tar.gz) = 1196842
 MD5 (ja-spamassassin/tokenizer.pre) = e8e787b76ab94805c7472a90f860cc0a
 SHA256 (ja-spamassassin/tokenizer.pre) = 9f8e30a8449fd13d571427ea30a252b4b275f153bde5345c50427a7aee3c90e0
 SIZE (ja-spamassassin/tokenizer.pre) = 163
-MD5 (ja-spamassassin/spamassassin-3.2.5-ja-test1.txt) = 06fa85a3b3a43119093dd9654d1b9029
-SHA256 (ja-spamassassin/spamassassin-3.2.5-ja-test1.txt) = b205d0be4a417c3dc1f51008a3ba1b2af6fe319d5cd351bc6a44b9b8fe12b1d2
-SIZE (ja-spamassassin/spamassassin-3.2.5-ja-test1.txt) = 9233
-MD5 (ja-spamassassin/spamassassin-3.2.5-ja-test1.patch) = 7821101be1c8aeab76e99cd042579741
-SHA256 (ja-spamassassin/spamassassin-3.2.5-ja-test1.patch) = d1a603474294cb4f6e06cae9a8ef6f00d1141feaf974e11e8f7ec2975d793c65
-SIZE (ja-spamassassin/spamassassin-3.2.5-ja-test1.patch) = 33451
+MD5 (ja-spamassassin/spamassassin-3.3.1-ja-1.txt) = 8bc5f94dcae6cd7c083fa2ce8ea8f75c
+SHA256 (ja-spamassassin/spamassassin-3.3.1-ja-1.txt) = 8342ed8b783f0eae867df9749b8c2ef35d7d5bee00bc240624bab57cc5a03070
+SIZE (ja-spamassassin/spamassassin-3.3.1-ja-1.txt) = 7163
+MD5 (ja-spamassassin/spamassassin-3.3.1-ja-1.patch) = ff49e2eb9808ed0377b56f8d26acbb1b
+SHA256 (ja-spamassassin/spamassassin-3.3.1-ja-1.patch) = 39dd21525076b86134b421a99cbbe151feba66da7381003d4743044c852ee2d5
+SIZE (ja-spamassassin/spamassassin-3.3.1-ja-1.patch) = 33740
diff --git a/japanese/p5-Mail-SpamAssassin/files/patch-bayes.pm b/japanese/p5-Mail-SpamAssassin/files/patch-bayes.pm
deleted file mode 100644
index 2835b4e5b3e5..000000000000
--- a/japanese/p5-Mail-SpamAssassin/files/patch-bayes.pm
+++ /dev/null
@@ -1,10 +0,0 @@
---- Bayes.pm.orig      2008-06-10 05:20:22.000000000 -0400
-+++ lib/Mail/SpamAssassin/Bayes.pm     2008-08-22 03:23:38.000000000 -0400
-@@ -145,6 +145,7 @@
- # hapaxen they generate.
- $MARK_PRESENCE_ONLY_HDRS = qr{(?: X-Face
-   |X-(?:Gnu-?PG|PGP|GPG)(?:-Key)?-Fingerprint
-+  |D(?:KIM|omainKey)-Signature
- )}ix;
- 
- # tweaks tested as of Nov 18 2002 by jm: see SpamAssassin-devel list archives
diff --git a/japanese/p5-Mail-SpamAssassin/files/patch-sa-compile.raw b/japanese/p5-Mail-SpamAssassin/files/patch-sa-compile.raw
deleted file mode 100644
index 5ed046abc2e1..000000000000
--- a/japanese/p5-Mail-SpamAssassin/files/patch-sa-compile.raw
+++ /dev/null
@@ -1,29 +0,0 @@
---- sa-compile.raw.orig        Tue Jun 10 05:21:07 2008
-+++ sa-compile.raw     Thu Jun 12 17:28:56 2008
-@@ -682,9 +682,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/<perlversion>/<version>)
-+                      (default: @@LOCAL_STATE_DIR@@/compiled/<perlversion>/<version>)
-   --cf='config line'            Additional line of configuration
-   -D, --debug [area=n,...]	Print debugging messages
-   -V, --version			Print version
-@ -735,12 +735,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-spamassassin.raw b/japanese/p5-Mail-SpamAssassin/files/patch-spamassassin.raw
deleted file mode 100644
index c2300b8d4a04..000000000000
--- a/japanese/p5-Mail-SpamAssassin/files/patch-spamassassin.raw
+++ /dev/null
@@ -1,12 +0,0 @@
---- spamassassin.raw.orig       2009-05-14 20:48:01.000000000 -0500
-+++ spamassassin.raw    2009-05-14 20:48:19.000000000 -0500
-@@ -530,7 +530,7 @@
-     $mail->finish();      # bug 5626: remove temp files etc.
-     $mail = undef;
-   }
--  exit 0;
-+  exit 15;
- }
-
- # ---------------------------------------------------------------------------
-
diff --git a/japanese/p5-Mail-SpamAssassin/files/patch-spamd_spamd.raw b/japanese/p5-Mail-SpamAssassin/files/patch-spamd_spamd.raw
deleted file mode 100644
index 414efc7b2141..000000000000
--- a/japanese/p5-Mail-SpamAssassin/files/patch-spamd_spamd.raw
+++ /dev/null
@@ -1,11 +0,0 @@
---- spamd/spamd.raw.orig	2008-04-24 09:50:46.000000000 +0200
-+++ spamd/spamd.raw	2008-04-24 09:52:55.000000000 +0200
-@@ -2075,7 +2075,7 @@
-   if ( $opt{'user-config'} ) {
-     my $prefsfrom = $username;  # the one passed, NOT $opt{username}
- 
--    if ($prefsfrom eq $suidto) {
-+    if ($prefsfrom eq $suidto || $opt{'vpopmail'}) {
-       $userdir = $suiddir;      # reuse the already-looked-up info
-     } else {
-       $userdir = (getpwnam($prefsfrom))[7];
diff --git a/japanese/p5-Mail-SpamAssassin/pkg-install b/japanese/p5-Mail-SpamAssassin/pkg-install
index 92b3dabfe6fa..e38982ab4edd 100644
--- a/japanese/p5-Mail-SpamAssassin/pkg-install
+++ b/japanese/p5-Mail-SpamAssassin/pkg-install
@@ -1,6 +1,12 @@
 #!/bin/sh
 PKG_PREFIX=${PKG_PREFIX:-/usr/local}
+USER=spamd
+GROUP=${USER}
+UID=58
+GID=${UID}
+HOME=/var/spool/${USER}
 
+if [ "$2" = "POST-INSTALL" ];then
 ask() {
         local question default answer
 
@@ -26,59 +32,58 @@ yesno() {
                 echo "Please answer yes or no."
         done
 }
-
-if [ "$2" = "POST-INSTALL" ];then
-
-   if yesno "Do you wish to run sa-update to fetch new rules" "N";then
-       ${PKG_PREFIX}/bin/sa-update
-       if [ $? -eq 4 ];then
-          # rc=4 means host not found, might be old mirrors.
-          rm -rf /var/db/spamassassin/3*/updates_spamassassin_org/MIRRORED.BY
-          ${PKG_PREFIX}/bin/sa-update
+    if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
+    	if pw groupadd ${GROUP} -g ${GID}; then
+    		echo "Added group \"${GROUP}\"."
+    	else
+    		echo "Adding group \"${GROUP}\" failed..."
+    		exit 1
+    	fi
+    fi
+    
+    if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
+    	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
+    		-s "/sbin/nologin" -d "${HOME}" \
+    		-c "SpamAssassin user"; \
+    	then
+    		echo "Added user \"${USER}\"."
+    		mkdir ${HOME} && chown ${USER}:${GROUP} ${HOME}
+    	else
+    		echo "Adding user \"${USER}\" failed..."
+    		exit 1
+    	fi
+    fi
+    
+    # Create pid directory
+    mkdir /var/run/spamd 2> /dev/null && chown ${USER}:${GROUP} /var/run/spamd
+    /usr/bin/su root -c "${PKG_PREFIX}/bin/spamassassin -x -L --lint"
+    
+    if [ ${?} -eq 255 ];then
+        echo "***********************************************"
+        echo "*__        ___    ____  _   _ ___ _   _  ____ *"
+        echo "*\ \      / / \  |  _ \| \ | |_ _| \ | |/ ___|*"
+        echo "* \ \ /\ / / _ \ | |_) |  \| || ||  \| | |  _ *"
+        echo "*  \ V  V / ___ \|  _ <| |\  || || |\  | |_| |*"
+        echo "*   \_/\_/_/   \_\_| \_\_| \_|___|_| \_|\____|*"
+        echo "*                                             *"
+        echo "*You must install rules before starting spamd!*"
+        echo "***********************************************"
+        if [ -z "${PACKAGE_BUILDING}" -a -z "${BATCH}" ]; then
+           if yesno "Do you wish to run sa-update to fetch new rules" "N";then
+              ${PKG_PREFIX}/bin/sa-update || true
+	   else
+              echo ""
+           fi
+           /usr/bin/su root -c  "${PKG_PREFIX}/bin/spamassassin -x -L --lint"
+           if [ ${?} -eq 0 ] && grep '^load.*Rule2XSBody' ${PKG_PREFIX}/etc/mail/spamassassin/v320.pre > /dev/null ;then
+              if yesno "Do you wish to compile rules with re2c (will take a long time)" "N";then
+                ${PKG_PREFIX}/bin/sa-compile || true
+        fi
+    fi
        fi
-   fi
-   grep '^load.*Rule2XSBody' ${PKG_PREFIX}/etc/mail/spamassassin/v320.pre > /dev/null
-   if [ $? -eq 0 ];then
-     if yesno "Do you wish to compile rules with re2c (will take a long time)" "N";then
-       ${PKG_PREFIX}/bin/sa-compile
-     fi
-   fi
-   exit 0
-fi  # post-install
-
-if [ "$2" != "PRE-INSTALL" ]; then
+    fi
+    
     exit 0
-fi
-
-USER=spamd
-GROUP=${USER}
-UID=58
-GID=${UID}
-HOME=/var/spool/${USER}
-
-if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
-	if pw groupadd ${GROUP} -g ${GID}; then
-		echo "Added group \"${GROUP}\"."
-	else
-		echo "Adding group \"${GROUP}\" failed..."
-		exit 1
-	fi
-fi
-
-if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
-	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-		-s "/sbin/nologin" -d "${HOME}" \
-		-c "SpamAssassin user"; \
-	then
-		echo "Added user \"${USER}\"."
-		mkdir ${HOME} && chown ${USER}:${GROUP} ${HOME}
-	else
-		echo "Adding user \"${USER}\" failed..."
-		exit 1
-	fi
-fi
-
-# Create pid directory
-mkdir /var/run/spamd 2> /dev/null && chown ${USER}:${GROUP} /var/run/spamd
+fi  # post-install
 
 exit 0
diff --git a/japanese/p5-Mail-SpamAssassin/pkg-message b/japanese/p5-Mail-SpamAssassin/pkg-message
index c6fb46ac9044..01153919b024 100644
--- a/japanese/p5-Mail-SpamAssassin/pkg-message
+++ b/japanese/p5-Mail-SpamAssassin/pkg-message
@@ -21,10 +21,15 @@
 *************************************************************************
 You may wish to run sa-update now to obtain the latest rules.
 
-NOTE:  FREEBSD users: If you are updating to 3.20 you will find
-that sa-update now places state files in /var/db/spamassassin
-and not the default /var/lib/spamassassin.  This is to be consistant
-with Freebsd file directory conventions
+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"
@@ -33,6 +38,7 @@ 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 document in
 PREFIX/share/doc/ja-p5-Mail-SpamAssassin/
 
@@ -40,4 +46,5 @@ Tokenizer::MeCab uses UTF-8 encoding.  You may have to manually
 (re)install the following ports with the build options for UTF-8:
 	japanese/mecab		WITH_CHARSET=utf-8
 	japanese/mecab-ipadic	WITH_CHARSET=utf-8
-	japanese/p5-Text-MeCab	ENCODING=utf-8
+	japanese/p5-MeCab
+************************************************************************
diff --git a/japanese/p5-Mail-SpamAssassin/pkg-plist b/japanese/p5-Mail-SpamAssassin/pkg-plist
index f8b1e26bd16b..3d8c3e2ce7c7 100644
--- a/japanese/p5-Mail-SpamAssassin/pkg-plist
+++ b/japanese/p5-Mail-SpamAssassin/pkg-plist
@@ -1,5 +1,7 @@
 @unexec %D/etc/rc.d/sa-spamd.sh stop > /dev/null 2>&1 || true
 @unexec %D/etc/rc.d/sa-spamd stop > /dev/null 2>&1 || true
+bin/sa-awl
+bin/sa-check_spamd
 bin/sa-compile
 bin/sa-learn
 bin/sa-update
@@ -23,6 +25,9 @@ etc/mail/spamassassin/v312.pre.sample
 @unexec if cmp -s %B/v320.pre.sample %B/v320.pre; then rm -f %B/v320.pre; fi
 etc/mail/spamassassin/v320.pre.sample
 @exec [ -f %B/v320.pre ] || cp %B/%f %B/v320.pre
+@unexec if cmp -s %B/v330.pre.sample %B/v330.pre; then rm -f %B/v330.pre;fi
+etc/mail/spamassassin/v330.pre.sample
+@exec [ -f %B/v330.pre ] || cp %B/%f %B/v330.pre
 include/libspamc.h
 lib/libspamc.so
 lib/libspamc.so.0
@@ -37,6 +42,7 @@ lib/libspamc.so.0
 %%SITE_PERL%%/Mail/SpamAssassin/Bayes/CombineChi.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Bayes/CombineNaiveBayes.pm
 %%SITE_PERL%%/Mail/SpamAssassin/BayesStore.pm
+%%SITE_PERL%%/Mail/SpamAssassin/BayesStore/BDB.pm
 %%SITE_PERL%%/Mail/SpamAssassin/BayesStore/DBM.pm
 %%SITE_PERL%%/Mail/SpamAssassin/BayesStore/MySQL.pm
 %%SITE_PERL%%/Mail/SpamAssassin/BayesStore/PgSQL.pm
@@ -83,7 +89,7 @@ lib/libspamc.so.0
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/DCC.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/DKIM.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/DNSEval.pm
-%%SITE_PERL%%/Mail/SpamAssassin/Plugin/DomainKeys.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/FreeMail.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/HTMLEval.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/HTTPSMismatch.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Hashcash.pm
@@ -92,11 +98,13 @@ lib/libspamc.so.0
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/MIMEEval.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/MIMEHeader.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/OneLineBodyRuleType.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/PhishTag.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Pyzor.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Razor2.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/RelayCountry.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/RelayEval.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/ReplaceTags.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Plugin/Reuse.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Rule2XSBody.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/SPF.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Plugin/Shortcircuit.pm
@@ -123,57 +131,10 @@ lib/libspamc.so.0
 %%SITE_PERL%%/Mail/SpamAssassin/Util/DependencyInfo.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Util/Progress.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Util/RegistrarBoundaries.pm
+%%SITE_PERL%%/Mail/SpamAssassin/Util/ScopedTimer.pm
 %%SITE_PERL%%/Mail/SpamAssassin/Util/TieOneStringHash.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin/.packlist
 %%SITE_PERL%%/spamassassin-run.pod
-%%DATADIR%%/10_default_prefs.cf
-%%DATADIR%%/20_advance_fee.cf
-%%DATADIR%%/20_body_tests.cf
-%%DATADIR%%/20_compensate.cf
-%%DATADIR%%/20_dnsbl_tests.cf
-%%DATADIR%%/20_drugs.cf
-%%DATADIR%%/20_dynrdns.cf
-%%DATADIR%%/20_fake_helo_tests.cf
-%%DATADIR%%/20_head_tests.cf
-%%DATADIR%%/20_html_tests.cf
-%%DATADIR%%/20_imageinfo.cf
-%%DATADIR%%/20_meta_tests.cf
-%%DATADIR%%/20_net_tests.cf
-%%DATADIR%%/20_phrases.cf
-%%DATADIR%%/20_porn.cf
-%%DATADIR%%/20_ratware.cf
-%%DATADIR%%/20_uri_tests.cf
-%%DATADIR%%/20_vbounce.cf
-%%DATADIR%%/23_bayes.cf
-%%DATADIR%%/25_accessdb.cf
-%%DATADIR%%/25_antivirus.cf
-%%DATADIR%%/25_asn.cf
-%%DATADIR%%/25_dcc.cf
-%%DATADIR%%/25_dkim.cf
-%%DATADIR%%/25_domainkeys.cf
-%%DATADIR%%/25_hashcash.cf
-%%DATADIR%%/25_pyzor.cf
-%%DATADIR%%/25_razor2.cf
-%%DATADIR%%/25_replace.cf
-%%DATADIR%%/25_spf.cf
-%%DATADIR%%/25_textcat.cf
-%%DATADIR%%/25_uribl.cf
-%%DATADIR%%/30_text_de.cf
-%%DATADIR%%/30_text_fr.cf
-%%DATADIR%%/30_text_it.cf
-%%DATADIR%%/30_text_nl.cf
-%%DATADIR%%/30_text_pl.cf
-%%DATADIR%%/30_text_pt_br.cf
-%%DATADIR%%/50_scores.cf
-%%DATADIR%%/60_awl.cf
-%%DATADIR%%/60_shortcircuit.cf
-%%DATADIR%%/60_whitelist.cf
-%%DATADIR%%/60_whitelist_dk.cf
-%%DATADIR%%/60_whitelist_dkim.cf
-%%DATADIR%%/60_whitelist_spf.cf
-%%DATADIR%%/60_whitelist_subject.cf
-%%DATADIR%%/72_active.cf
-%%DATADIR%%/72_removed.cf
 %%DATADIR%%/languages
 %%DATADIR%%/sa-update-pubkey.txt
 %%DATADIR%%/user_prefs.template