update to SpamAssassin 3.01

from maintainer Ben Lovett <ben at tilderoot.com>

mail/p5-Mail-SpamAssassin/Makefile

@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.30 2004/08/06 01:39:09 ian Exp $
+# $OpenBSD: Makefile,v 1.31 2004/10/31 08:44:44 sturm Exp $
 
 COMMENT=		"mailfilter to identify and mark spam"
 
-DISTNAME=		Mail-SpamAssassin-2.64
+DISTNAME=		Mail-SpamAssassin-3.0.1
 PKGNAME=		p5-${DISTNAME}
 CATEGORIES=		mail perl5
 
@@ -10,25 +10,25 @@ MAINTAINER=		Ben Lovett <ben@tilderoot.com>
 
 HOMEPAGE=		http://spamassassin.apache.org/
 
-# Artistic License
+# Apache Software License (v2)
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=		http://old.spamassassin.org/released/ \
-			${MASTER_SITE_PERL_CPAN:=Mail/}
+MASTER_SITES=		${MASTER_SITE_APACHE:=spamassassin/}
 
-BUILD_DEPENDS=		:p5-HTML-Parser-*:www/p5-HTML-Parser
+BUILD_DEPENDS=		:p5-HTML-Parser-*:www/p5-HTML-Parser \
+			:p5-Digest-SHA1-*:security/p5-Digest-SHA1
 RUN_DEPENDS=		:p5-Net-DNS-*:net/p5-Net-DNS \
 			:p5-HTML-Parser-*:www/p5-HTML-Parser
 
 MAKE_ENV+=		CC="${CC}"
 
 CONFIGURE_STYLE=	perl
-CONFIGURE_ARGS+=	RUN_RAZOR_TESTS="no" \
+CONFIGURE_ARGS+=	RUN_NET_TESTS="no" \
 			SYSCONFDIR=${SYSCONFDIR} \
-			CONTACT_ADDRESS="the administrator of that system"
+			CONTACT_ADDRESS="the administrator of this system"
 
 CONFDIR=		${SYSCONFDIR}/mail/spamassassin
 RULES_DIR=		${PREFIX}/share/spamassassin
@@ -37,14 +37,14 @@ SAMPLE_CONFDIR=		${PREFIX}/share/examples/SpamAssassin
 SUBST_VARS=		CONFDIR SAMPLE_CONFDIR
 
 FAKE_FLAGS=		${DESTDIRNAME}=${WRKINST} \
-			PKG_DEF_RULES_DIR=${WRKINST}${RULES_DIR} \
-			PKG_LOCAL_RULES_DIR=${WRKINST}${SAMPLE_CONFDIR}
+			DEFRULESDIR=${WRKINST}${RULES_DIR} \
+			LOCALRULESDIR=${WRKINST}${SAMPLE_CONFDIR}
 
 # regress insists on creating files in $HOME
 PORTHOME=		${WRKDIR}/temp-home
 
 FAQS=	${FILESDIR}/OpenBSD-SpamAssassin-mini-howto.html
-DOCS=	README procmailrc.example \
+DOCS=	README UPGRADE LICENSE procmailrc.example \
 	sample-nonspam.txt sample-spam.txt
 LOCALCF=	rules/local.cf
 
@@ -57,7 +57,7 @@ post-install:
 	${INSTALL_DATA} ${FAQS} ${PREFIX}/share/doc/SpamAssassin
 	cd ${WRKSRC} && ${INSTALL_DATA} ${LOCALCF} ${SAMPLE_CONFDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/SpamAssassin
-	cd ${WRKSRC} && pod2man --section=1 spamd/spamc.pod > \
+	cd ${WRKSRC} && pod2man --section=1 spamc/spamc.pod > \
 	    ${PREFIX}/man/man1/spamc.1
 	cd ${WRKSRC} && pod2man --section=8 spamd/spamd > \
 	    ${PREFIX}/man/man8/spamd.8

mail/p5-Mail-SpamAssassin/distinfo

@@ -1,3 +1,3 @@
-MD5 (Mail-SpamAssassin-2.64.tar.gz) = a82a9dab95462d102e253edb99091fdd
-RMD160 (Mail-SpamAssassin-2.64.tar.gz) = 524d2705a1de6e946664cd211514ac0671542917
-SHA1 (Mail-SpamAssassin-2.64.tar.gz) = 7d5776a7c462c849bc48f12a48ed82dc929ac06f
+MD5 (Mail-SpamAssassin-3.0.1.tar.gz) = 759e0486b07c4a03aa340d4a04e1d849
+RMD160 (Mail-SpamAssassin-3.0.1.tar.gz) = e18f993d88a9c332f526b4bf0b7e5c7031a8bba8
+SHA1 (Mail-SpamAssassin-3.0.1.tar.gz) = a3aebae1bf3c97830e540c42dc64791787d966c9

mail/p5-Mail-SpamAssassin/files/OpenBSD-SpamAssassin-mini-howto.html

@@ -20,7 +20,7 @@ If you do not want to use procmail please check the
 <ul><pre>
 :0fw
 * < 256000
-| spamc -p 4321 -f
+| spamc -p 4321
 
 :0e
 {
@@ -44,7 +44,7 @@ described in:<code><b> man Mail::SpamAssassin::Conf</b></code>
 <p><b>Much more info:</b><br>
 
 This is just a mini-HOWTO to get you up and running if you are in a hurry.
-Please go to <A HREF="http://spamassassin.org">spamassassin.org</A> for further
+Please go to <A HREF="http://spamassassin.apache.org">spamassassin.apache.org</A> for further
 information.
 
 </BODY></HTML>

mail/p5-Mail-SpamAssassin/patches/patch-Makefile_PL

@@ -1,7 +1,55 @@
-$OpenBSD: patch-Makefile_PL,v 1.1 2003/12/27 04:17:01 brad Exp $
---- Makefile.PL.orig	Thu Nov 13 11:55:46 2003
-+++ Makefile.PL	Thu Nov 13 11:55:55 2003
-@@ -760,7 +760,7 @@
+$OpenBSD: patch-Makefile_PL,v 1.2 2004/10/31 08:44:44 sturm Exp $
+--- Makefile.PL.orig	Fri Aug 27 09:37:35 2004
++++ Makefile.PL	Sun Oct  3 10:47:17 2004
+@@ -356,15 +356,15 @@ else {
+ }
+ $makefile{'macro'}{'RUN_NET_TESTS'} = yesno($opt{'run_net_tests'});
+ 
+-if (HAS_DBI) {
+-  $opt{'run_awl_sql_tests'} = prompt(
+-    "Run SQL-based Auto-whitelist tests during 'make test' (additional\n".
+-    "information required) (y/n)", "n");
+-  print "\n";
++# if (HAS_DBI) {
++#   $opt{'run_awl_sql_tests'} = prompt(
++#     "Run SQL-based Auto-whitelist tests during 'make test' (additional\n".
++#     "information required) (y/n)", "n");
++#   print "\n";
++# 
++#   $opt{'run_awl_sql_tests'} = bool($opt{'run_awl_sql_tests'});
++# }
+ 
+-  $opt{'run_awl_sql_tests'} = bool($opt{'run_awl_sql_tests'});
+-}
+-
+ if ($opt{'run_awl_sql_tests'}) {
+   my $user_awl_dsn = prompt("SQL AWL DSN (user_awl_dsn): ", "dbi:mysql:spamassassin:localhost");
+   my $user_awl_sql_username = prompt("SQL AWL DB username (user_awl_sql_username): ", "");
+@@ -386,15 +386,15 @@ else {
+   unlink("t/sql_based_whitelist.cf");
+ }
+ 
+-if (HAS_DBI) {
+-  $opt{'run_bayes_sql_tests'} = prompt(
+-    "Run Bayes SQL storage tests during 'make test' (additional\n".
+-    "information required)? (y/n)", 'n');
+-  print "\n";
++# if (HAS_DBI) {
++#   $opt{'run_bayes_sql_tests'} = prompt(
++#     "Run Bayes SQL storage tests during 'make test' (additional\n".
++#     "information required)? (y/n)", 'n');
++#   print "\n";
++# 
++#   $opt{'run_bayes_sql_tests'} = bool($opt{'run_bayes_sql_tests'});
++# }
+ 
+-  $opt{'run_bayes_sql_tests'} = bool($opt{'run_bayes_sql_tests'});
+-}
+-
+ if ($opt{'run_bayes_sql_tests'}) {
+   my $bayes_sql_dsn = prompt("Bayes SQL DSN (bayes_sql_dsn): ", "dbi:mysql:spamassassin:localhost");
+   my $bayes_sql_username = prompt("Bayes SQL DB username (bayes_sql_username): ", "");
+@@ -855,7 +855,7 @@ sub MY::install {
  
    foreach (@code) {
      # Add our install targets as a dependency to all top-level install targets
@@ -10,15 +58,18 @@ $OpenBSD: patch-Makefile_PL,v 1.1 2003/12/27 04:17:01 brad Exp $
  
      # Now do the DESTDIR hack, if necessary.
      next if !$mm_needs_destdir;
-@@ -962,11 +962,6 @@
- 
- spamd/binaries.mk: spamd/configure
- 	cd spamd; ./configure --prefix="$(I_PREFIX)" --sysconfdir="$(I_SYSCONFDIR)" --datadir="$(I_DATADIR)" --enable-ssl="$(ENABLE_SSL)"
+@@ -1118,14 +1118,6 @@ qmail/qmail-spamc$(EXE_EXT): spamc/qmail
+ 	$(MKPATH) qmail
+ 	$(MAKE_SPAMC_OLD)
+ 	$(CHMOD) $(PERM_RWX) $@
+-
 -
 -conf__install:
 -	-$(MKPATH) $(B_CONFDIR)
 -	$(PERL) -MFile::Spec -MFile::Copy \
 -	  -e "copy(q{rules/local.cf}, q{$(B_CONFDIR)/local.cf}) unless -f q{$(B_CONFDIR)/local.cf};"
+-	$(PERL) -MFile::Spec -MFile::Copy \
+-	  -e "copy(q{rules/init.pre}, q{$(B_CONFDIR)/init.pre}) unless -f q{$(B_CONFDIR)/init.pre};"
  
  data__install:
  	-$(MKPATH) $(B_DATADIR)

mail/p5-Mail-SpamAssassin/patches/patch-lib_Mail_SpamAssassin_pm

@@ -1,10 +1,10 @@
---- lib/Mail/SpamAssassin.pm.orig	2003-05-20 08:05:55.000000000 +0200
-+++ lib/Mail/SpamAssassin.pm	2003-07-31 22:58:06.000000000 +0200
-@@ -142,6 +142,7 @@ $HOME_URL = "http://spamassassin.org/";
-         '/etc/mail/spamassassin/user_prefs.template',
-         '/usr/local/share/spamassassin/user_prefs.template',
-         '/usr/share/spamassassin/user_prefs.template',
-+        './rules/user_prefs.template',
+--- lib/Mail/SpamAssassin.pm.orig	Tue Sep 21 15:05:27 2004
++++ lib/Mail/SpamAssassin.pm	Sun Oct  3 10:46:22 2004
+@@ -150,6 +150,7 @@ $HOME_URL = "http://spamassassin.apache.
+   '/etc/mail/spamassassin/user_prefs.template',
+   '/usr/local/share/spamassassin/user_prefs.template',
+   '/usr/share/spamassassin/user_prefs.template',
++  './rules/user_prefs.template',
  );
  
  @default_userprefs_path = (

mail/p5-Mail-SpamAssassin/patches/patch-spamc_spamc_pod

@@ -0,0 +1,12 @@
+$OpenBSD: patch-spamc_spamc_pod,v 1.1 2004/10/31 08:44:44 sturm Exp $
+--- spamc/spamc.pod.orig	Mon Sep 13 16:34:05 2004
++++ spamc/spamc.pod	Sun Oct  3 10:46:22 2004
+@@ -185,7 +185,7 @@ unmodified and an exit code of C<0> will
+ 
+ =head1 SEE ALSO
+ 
+-spamd(1)
++spamd(8)
+ spamassassin(1)
+ Mail::SpamAssassin(3)
+ 

mail/p5-Mail-SpamAssassin/patches/patch-spamd_spamc_pod

@@ -1,12 +0,0 @@
-$OpenBSD: patch-spamd_spamc_pod,v 1.2 2003/05/23 23:36:31 brad Exp $
---- spamd/spamc.pod.orig	Mon May 12 15:15:36 2003
-+++ spamd/spamc.pod	Thu May 22 09:31:18 2003
-@@ -150,7 +150,7 @@ distribution for more details.
- 
- =head1 SEE ALSO
- 
--spamd(1)
-+spamd(8)
- spamassassin(1)
- Mail::SpamAssassin(3)
- 

mail/p5-Mail-SpamAssassin/pkg/DESCR

@@ -46,3 +46,7 @@ for further installation instructions.
 
 Or if you are in a hurry you can read:
 ${PREFIX}/share/doc/SpamAssassin/OpenBSD-SpamAssassin-mini-howto.html
+
+The SpamAssassin Wiki is available at <http://wiki.apache.org/spamassassin>
+and contains up-to-date information on configuring SpamAssassin, and using
+some of the more advanced features of it.

mail/p5-Mail-SpamAssassin/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.13 2004/09/15 09:09:44 espie Exp $
+@comment $OpenBSD: PLIST,v 1.14 2004/10/31 08:44:44 sturm Exp $
 bin/sa-learn
 bin/spamassassin
 bin/spamc
@@ -7,58 +7,91 @@ ${P5SITE}/Mail/
 ${P5SITE}/Mail/SpamAssassin/
 ${P5SITE}/Mail/SpamAssassin.pm
 ${P5SITE}/Mail/SpamAssassin/ArchiveIterator.pm
-${P5SITE}/Mail/SpamAssassin/AuditMessage.pm
 ${P5SITE}/Mail/SpamAssassin/AutoWhitelist.pm
 ${P5SITE}/Mail/SpamAssassin/Bayes.pm
+${P5SITE}/Mail/SpamAssassin/BayesStore/
 ${P5SITE}/Mail/SpamAssassin/BayesStore.pm
-${P5SITE}/Mail/SpamAssassin/CmdLearn.pm
+${P5SITE}/Mail/SpamAssassin/BayesStore/DBM.pm
+${P5SITE}/Mail/SpamAssassin/BayesStore/SQL.pm
+${P5SITE}/Mail/SpamAssassin/Conf/
 ${P5SITE}/Mail/SpamAssassin/Conf.pm
-${P5SITE}/Mail/SpamAssassin/ConfSourceSQL.pm
+${P5SITE}/Mail/SpamAssassin/Conf/LDAP.pm
+${P5SITE}/Mail/SpamAssassin/Conf/Parser.pm
+${P5SITE}/Mail/SpamAssassin/Conf/SQL.pm
+${P5SITE}/Mail/SpamAssassin/Constants.pm
 ${P5SITE}/Mail/SpamAssassin/DBBasedAddrList.pm
 ${P5SITE}/Mail/SpamAssassin/Dns.pm
-${P5SITE}/Mail/SpamAssassin/EncappedMIME.pm
-${P5SITE}/Mail/SpamAssassin/EncappedMessage.pm
 ${P5SITE}/Mail/SpamAssassin/EvalTests.pm
 ${P5SITE}/Mail/SpamAssassin/HTML.pm
 ${P5SITE}/Mail/SpamAssassin/Locales.pm
+${P5SITE}/Mail/SpamAssassin/Locker/
 ${P5SITE}/Mail/SpamAssassin/Locker.pm
+${P5SITE}/Mail/SpamAssassin/Locker/Flock.pm
+${P5SITE}/Mail/SpamAssassin/Locker/UnixNFSSafe.pm
+${P5SITE}/Mail/SpamAssassin/Locker/Win32.pm
 ${P5SITE}/Mail/SpamAssassin/MailingList.pm
+${P5SITE}/Mail/SpamAssassin/Message/
 ${P5SITE}/Mail/SpamAssassin/Message.pm
+${P5SITE}/Mail/SpamAssassin/Message/Metadata/
+${P5SITE}/Mail/SpamAssassin/Message/Metadata.pm
+${P5SITE}/Mail/SpamAssassin/Message/Metadata/Received.pm
+${P5SITE}/Mail/SpamAssassin/Message/Node.pm
 ${P5SITE}/Mail/SpamAssassin/NetSet.pm
-${P5SITE}/Mail/SpamAssassin/NoMailAudit.pm
 ${P5SITE}/Mail/SpamAssassin/PerMsgLearner.pm
 ${P5SITE}/Mail/SpamAssassin/PerMsgStatus.pm
 ${P5SITE}/Mail/SpamAssassin/PersistentAddrList.pm
-${P5SITE}/Mail/SpamAssassin/PhraseFreqs.pm
-${P5SITE}/Mail/SpamAssassin/Received.pm
-${P5SITE}/Mail/SpamAssassin/Replier.pm
+${P5SITE}/Mail/SpamAssassin/Plugin/
+${P5SITE}/Mail/SpamAssassin/Plugin.pm
+${P5SITE}/Mail/SpamAssassin/Plugin/Hashcash.pm
+${P5SITE}/Mail/SpamAssassin/Plugin/RelayCountry.pm
+${P5SITE}/Mail/SpamAssassin/Plugin/SPF.pm
+${P5SITE}/Mail/SpamAssassin/Plugin/Test.pm
+${P5SITE}/Mail/SpamAssassin/Plugin/URIDNSBL.pm
+${P5SITE}/Mail/SpamAssassin/PluginHandler.pm
 ${P5SITE}/Mail/SpamAssassin/Reporter.pm
-${P5SITE}/Mail/SpamAssassin/SHA1.pm
+${P5SITE}/Mail/SpamAssassin/SQLBasedAddrList.pm
 ${P5SITE}/Mail/SpamAssassin/TextCat.pm
-${P5SITE}/Mail/SpamAssassin/UnixLocker.pm
+${P5SITE}/Mail/SpamAssassin/Util/
 ${P5SITE}/Mail/SpamAssassin/Util.pm
-${P5SITE}/Mail/SpamAssassin/Win32Locker.pm
+${P5SITE}/Mail/SpamAssassin/Util/RegistrarBoundaries.pm
 @man man/man1/sa-learn.1
 @man man/man1/spamassassin.1
 @man man/man1/spamc.1
 @man man/man1/spamd.1
 @man man/man3p/Mail::SpamAssassin.3p
+@man man/man3p/Mail::SpamAssassin::ArchiveIterator.3p
 @man man/man3p/Mail::SpamAssassin::AutoWhitelist.3p
 @man man/man3p/Mail::SpamAssassin::Bayes.3p
+@man man/man3p/Mail::SpamAssassin::BayesStore.3p
+@man man/man3p/Mail::SpamAssassin::BayesStore::SQL.3p
 @man man/man3p/Mail::SpamAssassin::Conf.3p
-@man man/man3p/Mail::SpamAssassin::ConfSourceSQL.3p
+@man man/man3p/Mail::SpamAssassin::Conf::LDAP.3p
+@man man/man3p/Mail::SpamAssassin::Conf::Parser.3p
+@man man/man3p/Mail::SpamAssassin::Conf::SQL.3p
+@man man/man3p/Mail::SpamAssassin::Message.3p
+@man man/man3p/Mail::SpamAssassin::Message::Metadata.3p
+@man man/man3p/Mail::SpamAssassin::Message::Node.3p
 @man man/man3p/Mail::SpamAssassin::PerMsgLearner.3p
 @man man/man3p/Mail::SpamAssassin::PerMsgStatus.3p
 @man man/man3p/Mail::SpamAssassin::PersistentAddrList.3p
+@man man/man3p/Mail::SpamAssassin::Plugin.3p
+@man man/man3p/Mail::SpamAssassin::Plugin::Hashcash.3p
+@man man/man3p/Mail::SpamAssassin::Plugin::RelayCountry.3p
+@man man/man3p/Mail::SpamAssassin::Plugin::SPF.3p
+@man man/man3p/Mail::SpamAssassin::Plugin::URIDNSBL.3p
+@man man/man3p/Mail::SpamAssassin::PluginHandler.3p
+@man man/man3p/Mail::SpamAssassin::SQLBasedAddrList.3p
 @man man/man8/spamd.8
 share/doc/SpamAssassin/
 share/doc/SpamAssassin/OpenBSD-SpamAssassin-mini-howto.html
+share/doc/SpamAssassin/LICENSE
 share/doc/SpamAssassin/README
+share/doc/SpamAssassin/UPGRADE
 share/doc/SpamAssassin/procmailrc.example
 share/doc/SpamAssassin/sample-nonspam.txt
 share/doc/SpamAssassin/sample-spam.txt
+@sample ${CONFDIR}/
 share/examples/SpamAssassin/
-@sample ${CONFDIR}
 share/examples/SpamAssassin/local.cf
 @sample ${CONFDIR}/local.cf
 share/spamassassin/
@@ -67,6 +100,7 @@ share/spamassassin/20_anti_ratware.cf
 share/spamassassin/20_body_tests.cf
 share/spamassassin/20_compensate.cf
 share/spamassassin/20_dnsbl_tests.cf
+share/spamassassin/20_drugs.cf
 share/spamassassin/20_fake_helo_tests.cf
 share/spamassassin/20_head_tests.cf
 share/spamassassin/20_html_tests.cf
@@ -77,15 +111,13 @@ share/spamassassin/20_ratware.cf
 share/spamassassin/20_uri_tests.cf
 share/spamassassin/23_bayes.cf
 share/spamassassin/25_body_tests_es.cf
-share/spamassassin/25_body_tests_pl.cf
-share/spamassassin/25_head_tests_es.cf
-share/spamassassin/25_head_tests_pl.cf
+share/spamassassin/25_hashcash.cf
+share/spamassassin/25_spf.cf
+share/spamassassin/25_uribl.cf
 share/spamassassin/30_text_de.cf
-share/spamassassin/30_text_es.cf
 share/spamassassin/30_text_fr.cf
-share/spamassassin/30_text_it.cf
+share/spamassassin/30_text_nl.cf
 share/spamassassin/30_text_pl.cf
-share/spamassassin/30_text_sk.cf
 share/spamassassin/50_scores.cf
 share/spamassassin/60_whitelist.cf
 share/spamassassin/languages