Add SpamAssassin development port. This is version 2.50, which includes

Bayesian filtering.

15 files changed, 539 insertions, 0 deletions

diff --git a/mail/Makefile b/mail/Makefile
index 3e37f2feb8a3..7da4ff7dc2e0 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -170,6 +170,7 @@
     SUBDIR += p5-Mail-Sender
     SUBDIR += p5-Mail-Sendmail
     SUBDIR += p5-Mail-SpamAssassin
+    SUBDIR += p5-Mail-SpamAssassin-devel
     SUBDIR += p5-Mail-Spool
     SUBDIR += p5-Mail-Tools
     SUBDIR += p5-Mail-Verify
diff --git a/mail/p5-Mail-SpamAssassin-devel/Makefile b/mail/p5-Mail-SpamAssassin-devel/Makefile
new file mode 100644
index 000000000000..75508c18b0ba
--- /dev/null
+++ b/mail/p5-Mail-SpamAssassin-devel/Makefile
@@ -0,0 +1,63 @@
+# New ports collection makefile for:	p5-Mail-SpamAssassin-devel
+# Date created:				Dec 5 2002
+# Whom:					Brian Fundakowski Feldman
+#
+# $FreeBSD$
+#
+
+PORTNAME=	Mail-SpamAssassin
+PORTVERSION=	2.50
+CATEGORIES=	mail perl5
+MASTER_SITES=	http://spamassassin.org/devel/ \
+		${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	Mail
+PKGNAMEPREFIX=	p5-
+
+MAINTAINER=	dougb@FreeBSD.org
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS \
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools
+RUN_DEPENDS=	${BUILD_DEPENDS} \
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
+		razor-client:${PORTSDIR}/mail/razor-agents
+
+PODPARSER=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser
+RUN_DEPENDS+=	${PODPARSER}
+BUILD_DEPENDS+=	${PODPARSER}
+
+PERL_CONFIGURE=	yes
+CONFIGURE_ARGS+=	SYSCONFDIR="${PREFIX}/etc" RUN_RAZOR1_TESTS="no" \
+			RUN_RAZOR2_TESTS="no"
+
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3=		Mail::SpamAssassin.3 Mail::SpamAssassin::PerMsgStatus.3 \
+		Mail::SpamAssassin::Conf.3 \
+		Mail::SpamAssassin::PersistentAddrList.3 \
+		Mail::SpamAssassin::PerMsgLearner.3 \
+		Mail::SpamAssassin::Bayes.3 \
+		Mail::SpamAssassin::BayesStore.3
+MAN1PREFIX=	${PREFIX}
+MAN1=		spamd.1 spamassassin.1 spamc.1 sa-learn-nonspam.1 \
+		sa-learn-spam.1 sa-learn-rebuild.1 sa-forget.1
+
+DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+EXAMPLESDIR=	${PREFIX}/share/examples//${PKGNAMEPREFIX}${PORTNAME}
+
+post-patch:
+	@${FIND} ${WRKSRC} -name \*.orig -delete
+
+post-install:
+	@strip ${PREFIX}/bin/spamc
+	${INSTALL_SCRIPT} ${FILESDIR}/spamd.sh ${PREFIX}/etc/rc.d/spamd.sh-dist
+
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/sql/README ${DOCSDIR}/README.sql
+	cd ${WRKSRC} ; ${INSTALL_DATA} \
+	    BUGS COPYRIGHT Changes README TRADEMARK procmailrc.example sample* \
+	    spamd/README* sql/spamassassin.sql \
+	    ${DOCSDIR}
+.endif
+
+.include <bsd.port.mk>
diff --git a/mail/p5-Mail-SpamAssassin-devel/distinfo b/mail/p5-Mail-SpamAssassin-devel/distinfo
new file mode 100644
index 000000000000..10667db38d7a
--- /dev/null
+++ b/mail/p5-Mail-SpamAssassin-devel/distinfo
@@ -0,0 +1 @@
+MD5 (Mail-SpamAssassin-2.50.tar.gz) = 0b693ea51431fd099caf9054bbf43214
diff --git a/mail/p5-Mail-SpamAssassin-devel/files/patch-use_dcc-option b/mail/p5-Mail-SpamAssassin-devel/files/patch-use_dcc-option
new file mode 100644
index 000000000000..e806dcd0567c
--- /dev/null
+++ b/mail/p5-Mail-SpamAssassin-devel/files/patch-use_dcc-option
@@ -0,0 +1,93 @@
+diff -ur ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/Conf.pm ./lib/Mail/SpamAssassin/Conf.pm
+--- ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/Conf.pm	Fri Oct  4 05:54:15 2002
++++ ./lib/Mail/SpamAssassin/Conf.pm	Thu Oct 17 22:12:05 2002
+@@ -144,6 +144,9 @@
+   $self->{user_rules_to_compile} = 0;
+   $self->{fold_headers} = 1;
+ 
++  # Added by FreeBSD ports
++  $self->{use_dcc} = 1;
++
+   $self->{dcc_path} = undef; # Browse PATH
+   $self->{dcc_body_max} = 999999;
+   $self->{dcc_fuz1_max} = 999999;
+@@ -763,6 +766,16 @@
+ 
+     if (/^rbl[-_]timeout\s+(\d+)$/) {
+       $self->{rbl_timeout} = $1+0; next;
++    }
++
++=item use_dcc { 0 | 1 }   (default: 1)
++
++Should we use dccproc, or not.
++
++=cut
++
++    if (/^use[-_]dcc\s+(\d+)$/) {
++      $self->{use_dcc} = $1+0; next;
+     }
+ 
+ =item ok_locales xx [ yy zz ... ]		(default: all)
+diff -ur ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/Dns.pm ./lib/Mail/SpamAssassin/Dns.pm
+--- ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/Dns.pm	Fri Oct  4 05:54:16 2002
++++ ./lib/Mail/SpamAssassin/Dns.pm	Thu Oct 17 22:12:51 2002
+@@ -449,6 +449,9 @@
+ sub is_dcc_available {
+   my ($self) = @_;
+ 
++  # Added by FreeBSD ports
++  return 0 unless $self->{conf}->{use_dcc};
++
+   if ($self->{main}->{local_tests_only}) {
+     dbg ("local tests only, ignoring DCC");
+     return 0;
+@@ -476,6 +479,10 @@
+ 
+ sub dcc_lookup {
+   my ($self, $fulltext) = @_;
++
++  # Added by FreeBSD ports
++  return 0 unless $self->{conf}->{use_dcc};
++
+   my $response = undef;
+   my %count;
+   my $left;
+diff -ur ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/EvalTests.pm ./lib/Mail/SpamAssassin/EvalTests.pm
+--- ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/EvalTests.pm	Fri Oct  4 05:54:16 2002
++++ ./lib/Mail/SpamAssassin/EvalTests.pm	Thu Oct 17 22:10:46 2002
+@@ -2026,6 +2026,9 @@
+ sub check_dcc {
+   my ($self, $fulltext) = @_;
+ 
++  # Added by FreeBSD ports
++  return 0 unless $self->{conf}->{use_dcc};
++
+   return 0 unless ($self->is_dcc_available());
+   return 0 if ($self->{already_checked_dcc});
+ 
+diff -ur ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/Reporter.pm ./lib/Mail/SpamAssassin/Reporter.pm
+--- ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/Reporter.pm	Mon Oct 14 09:44:35 2002
++++ ./lib/Mail/SpamAssassin/Reporter.pm	Thu Oct 17 22:13:19 2002
+@@ -238,6 +238,9 @@
+ sub is_dcc_available {
+   my ($self) = @_;
+ 
++  # Added by FreeBSD ports
++  return 0 unless $self->{conf}->{use_dcc};
++
+   if ($self->{main}->{local_tests_only}) {
+     dbg ("local tests only, ignoring DCC");
+     return 0;
+diff -ur ../Mail-SpamAssassin-2.43/rules/10_misc.cf ./rules/10_misc.cf
+--- ../Mail-SpamAssassin-2.43/rules/10_misc.cf	Thu Sep 26 03:50:25 2002
++++ ./rules/10_misc.cf	Thu Oct 17 22:10:46 2002
+@@ -107,6 +107,9 @@
+ # test, so it is set to "all" so the test will not be used by default.
+ ok_languages            all
+ 
++# Added by FreeBSD ports
++use_dcc			0
++
+ # Some common prefs settings can be set here, to take effect site-wide
+ # unless the user override them. See the .prefs file for explanations.
+ 
diff --git a/mail/p5-Mail-SpamAssassin-devel/files/spamd.sh b/mail/p5-Mail-SpamAssassin-devel/files/spamd.sh
new file mode 100644
index 000000000000..b56cddfaadb5
--- /dev/null
+++ b/mail/p5-Mail-SpamAssassin-devel/files/spamd.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
+    echo "$0: Cannot determine the PREFIX" >&2
+    exit 1
+fi
+
+case "$1" in
+start)
+	[ -x ${PREFIX}/bin/spamd ] && ${PREFIX}/bin/spamd -a -c -d && echo -n ' spamd'
+	;;
+stop)
+	;;
+*)
+	echo "Usage: `basename $0` {start|stop}" >&2
+	;;
+esac
+
+exit 0
diff --git a/mail/p5-Mail-SpamAssassin-devel/pkg-comment b/mail/p5-Mail-SpamAssassin-devel/pkg-comment
new file mode 100644
index 000000000000..c8bcf6aae117
--- /dev/null
+++ b/mail/p5-Mail-SpamAssassin-devel/pkg-comment
@@ -0,0 +1 @@
+A mail filter for identifying SPAM
diff --git a/mail/p5-Mail-SpamAssassin-devel/pkg-descr b/mail/p5-Mail-SpamAssassin-devel/pkg-descr
new file mode 100644
index 000000000000..86d93a1b0a15
--- /dev/null
+++ b/mail/p5-Mail-SpamAssassin-devel/pkg-descr
@@ -0,0 +1,11 @@
+SpamAssassin is a mail filter which attempts to identify spam using text
+analysis and several internet-based realtime blacklists.
+
+Using its rule base, it uses a wide range of heuristic tests on mail
+headers and body text to identify "spam", also known as unsolicited
+commercial email.
+
+Once identified, the mail can then be optionally tagged as spam for later
+filtering using the user's own mail user-agent application.
+
+WWW:	http://spamassassin.org/
diff --git a/mail/p5-Mail-SpamAssassin-devel/pkg-plist b/mail/p5-Mail-SpamAssassin-devel/pkg-plist
new file mode 100644
index 000000000000..24deb2114ddf
--- /dev/null
+++ b/mail/p5-Mail-SpamAssassin-devel/pkg-plist
@@ -0,0 +1,81 @@
+bin/sa-learn-nonspam
+bin/spamd
+bin/sa-learn-rebuild
+bin/sa-forget
+bin/sa-learn-spam
+bin/spamc
+bin/spamassassin
+etc/rc.d/spamd.sh-dist
+etc/mail/spamassassin/local.cf
+@dirrm etc/mail/spamassassin
+@dirrm etc/mail
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Conf.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Replier.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Bayes.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/ConfSourceSQL.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/DBBasedAddrList.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/PerMsgStatus.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Reporter.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/SHA1.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/AuditMessage.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/HTML.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/MailingList.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/ArchiveIterator.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/CmdLearn.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/ExposedMessage.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/PerMsgLearner.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/EncappedMIME.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/BayesStore.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/NoMailAudit.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/AutoWhitelist.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/PersistentAddrList.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Dns.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/PhraseFreqs.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/TextCat.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/EncappedMessage.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Message.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/EvalTests.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Locales.pm
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail
+%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README.sql
+%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/BUGS
+%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/COPYRIGHT
+%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/Changes
+%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README
+%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/TRADEMARK
+%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/procmailrc.example
+%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/sample-nonspam.txt
+%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/sample-spam.txt
+%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README.spamd
+%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README.spamd-vpopmail
+%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/spamassassin.sql
+@dirrm %%PORTDOCS%%share/doc/p5-Mail-SpamAssassin
+share/spamassassin/10_misc.cf
+share/spamassassin/20_anti_ratware.cf
+share/spamassassin/20_body_tests.cf
+share/spamassassin/20_compensate.cf
+share/spamassassin/20_head_tests.cf
+share/spamassassin/20_meta_tests.cf
+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/30_text_de.cf
+share/spamassassin/30_text_es.cf
+share/spamassassin/30_text_fr.cf
+share/spamassassin/30_text_pl.cf
+share/spamassassin/40_spam_phrases.cf
+share/spamassassin/50_scores.cf
+share/spamassassin/60_whitelist.cf
+share/spamassassin/user_prefs.template
+share/spamassassin/triplets.txt
+share/spamassassin/languages
+@dirrm share/spamassassin
diff --git a/mail/p5-Mail-SpamAssassin-snapshot/Makefile b/mail/p5-Mail-SpamAssassin-snapshot/Makefile
new file mode 100644
index 000000000000..75508c18b0ba
--- /dev/null
+++ b/mail/p5-Mail-SpamAssassin-snapshot/Makefile
@@ -0,0 +1,63 @@
+# New ports collection makefile for:	p5-Mail-SpamAssassin-devel
+# Date created:				Dec 5 2002
+# Whom:					Brian Fundakowski Feldman
+#
+# $FreeBSD$
+#
+
+PORTNAME=	Mail-SpamAssassin
+PORTVERSION=	2.50
+CATEGORIES=	mail perl5
+MASTER_SITES=	http://spamassassin.org/devel/ \
+		${MASTER_SITE_PERL_CPAN}
+MASTER_SITE_SUBDIR=	Mail
+PKGNAMEPREFIX=	p5-
+
+MAINTAINER=	dougb@FreeBSD.org
+
+BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/DNS.pm:${PORTSDIR}/net/p5-Net-DNS \
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools
+RUN_DEPENDS=	${BUILD_DEPENDS} \
+		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
+		razor-client:${PORTSDIR}/mail/razor-agents
+
+PODPARSER=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Usage.pm:${PORTSDIR}/textproc/p5-PodParser
+RUN_DEPENDS+=	${PODPARSER}
+BUILD_DEPENDS+=	${PODPARSER}
+
+PERL_CONFIGURE=	yes
+CONFIGURE_ARGS+=	SYSCONFDIR="${PREFIX}/etc" RUN_RAZOR1_TESTS="no" \
+			RUN_RAZOR2_TESTS="no"
+
+MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3=		Mail::SpamAssassin.3 Mail::SpamAssassin::PerMsgStatus.3 \
+		Mail::SpamAssassin::Conf.3 \
+		Mail::SpamAssassin::PersistentAddrList.3 \
+		Mail::SpamAssassin::PerMsgLearner.3 \
+		Mail::SpamAssassin::Bayes.3 \
+		Mail::SpamAssassin::BayesStore.3
+MAN1PREFIX=	${PREFIX}
+MAN1=		spamd.1 spamassassin.1 spamc.1 sa-learn-nonspam.1 \
+		sa-learn-spam.1 sa-learn-rebuild.1 sa-forget.1
+
+DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
+EXAMPLESDIR=	${PREFIX}/share/examples//${PKGNAMEPREFIX}${PORTNAME}
+
+post-patch:
+	@${FIND} ${WRKSRC} -name \*.orig -delete
+
+post-install:
+	@strip ${PREFIX}/bin/spamc
+	${INSTALL_SCRIPT} ${FILESDIR}/spamd.sh ${PREFIX}/etc/rc.d/spamd.sh-dist
+
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/sql/README ${DOCSDIR}/README.sql
+	cd ${WRKSRC} ; ${INSTALL_DATA} \
+	    BUGS COPYRIGHT Changes README TRADEMARK procmailrc.example sample* \
+	    spamd/README* sql/spamassassin.sql \
+	    ${DOCSDIR}
+.endif
+
+.include <bsd.port.mk>
diff --git a/mail/p5-Mail-SpamAssassin-snapshot/distinfo b/mail/p5-Mail-SpamAssassin-snapshot/distinfo
new file mode 100644
index 000000000000..10667db38d7a
--- /dev/null
+++ b/mail/p5-Mail-SpamAssassin-snapshot/distinfo
@@ -0,0 +1 @@
+MD5 (Mail-SpamAssassin-2.50.tar.gz) = 0b693ea51431fd099caf9054bbf43214
diff --git a/mail/p5-Mail-SpamAssassin-snapshot/files/patch-use_dcc-option b/mail/p5-Mail-SpamAssassin-snapshot/files/patch-use_dcc-option
new file mode 100644
index 000000000000..e806dcd0567c
--- /dev/null
+++ b/mail/p5-Mail-SpamAssassin-snapshot/files/patch-use_dcc-option
@@ -0,0 +1,93 @@
+diff -ur ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/Conf.pm ./lib/Mail/SpamAssassin/Conf.pm
+--- ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/Conf.pm	Fri Oct  4 05:54:15 2002
++++ ./lib/Mail/SpamAssassin/Conf.pm	Thu Oct 17 22:12:05 2002
+@@ -144,6 +144,9 @@
+   $self->{user_rules_to_compile} = 0;
+   $self->{fold_headers} = 1;
+ 
++  # Added by FreeBSD ports
++  $self->{use_dcc} = 1;
++
+   $self->{dcc_path} = undef; # Browse PATH
+   $self->{dcc_body_max} = 999999;
+   $self->{dcc_fuz1_max} = 999999;
+@@ -763,6 +766,16 @@
+ 
+     if (/^rbl[-_]timeout\s+(\d+)$/) {
+       $self->{rbl_timeout} = $1+0; next;
++    }
++
++=item use_dcc { 0 | 1 }   (default: 1)
++
++Should we use dccproc, or not.
++
++=cut
++
++    if (/^use[-_]dcc\s+(\d+)$/) {
++      $self->{use_dcc} = $1+0; next;
+     }
+ 
+ =item ok_locales xx [ yy zz ... ]		(default: all)
+diff -ur ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/Dns.pm ./lib/Mail/SpamAssassin/Dns.pm
+--- ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/Dns.pm	Fri Oct  4 05:54:16 2002
++++ ./lib/Mail/SpamAssassin/Dns.pm	Thu Oct 17 22:12:51 2002
+@@ -449,6 +449,9 @@
+ sub is_dcc_available {
+   my ($self) = @_;
+ 
++  # Added by FreeBSD ports
++  return 0 unless $self->{conf}->{use_dcc};
++
+   if ($self->{main}->{local_tests_only}) {
+     dbg ("local tests only, ignoring DCC");
+     return 0;
+@@ -476,6 +479,10 @@
+ 
+ sub dcc_lookup {
+   my ($self, $fulltext) = @_;
++
++  # Added by FreeBSD ports
++  return 0 unless $self->{conf}->{use_dcc};
++
+   my $response = undef;
+   my %count;
+   my $left;
+diff -ur ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/EvalTests.pm ./lib/Mail/SpamAssassin/EvalTests.pm
+--- ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/EvalTests.pm	Fri Oct  4 05:54:16 2002
++++ ./lib/Mail/SpamAssassin/EvalTests.pm	Thu Oct 17 22:10:46 2002
+@@ -2026,6 +2026,9 @@
+ sub check_dcc {
+   my ($self, $fulltext) = @_;
+ 
++  # Added by FreeBSD ports
++  return 0 unless $self->{conf}->{use_dcc};
++
+   return 0 unless ($self->is_dcc_available());
+   return 0 if ($self->{already_checked_dcc});
+ 
+diff -ur ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/Reporter.pm ./lib/Mail/SpamAssassin/Reporter.pm
+--- ../Mail-SpamAssassin-2.43/lib/Mail/SpamAssassin/Reporter.pm	Mon Oct 14 09:44:35 2002
++++ ./lib/Mail/SpamAssassin/Reporter.pm	Thu Oct 17 22:13:19 2002
+@@ -238,6 +238,9 @@
+ sub is_dcc_available {
+   my ($self) = @_;
+ 
++  # Added by FreeBSD ports
++  return 0 unless $self->{conf}->{use_dcc};
++
+   if ($self->{main}->{local_tests_only}) {
+     dbg ("local tests only, ignoring DCC");
+     return 0;
+diff -ur ../Mail-SpamAssassin-2.43/rules/10_misc.cf ./rules/10_misc.cf
+--- ../Mail-SpamAssassin-2.43/rules/10_misc.cf	Thu Sep 26 03:50:25 2002
++++ ./rules/10_misc.cf	Thu Oct 17 22:10:46 2002
+@@ -107,6 +107,9 @@
+ # test, so it is set to "all" so the test will not be used by default.
+ ok_languages            all
+ 
++# Added by FreeBSD ports
++use_dcc			0
++
+ # Some common prefs settings can be set here, to take effect site-wide
+ # unless the user override them. See the .prefs file for explanations.
+ 
diff --git a/mail/p5-Mail-SpamAssassin-snapshot/files/spamd.sh b/mail/p5-Mail-SpamAssassin-snapshot/files/spamd.sh
new file mode 100644
index 000000000000..b56cddfaadb5
--- /dev/null
+++ b/mail/p5-Mail-SpamAssassin-snapshot/files/spamd.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
+    echo "$0: Cannot determine the PREFIX" >&2
+    exit 1
+fi
+
+case "$1" in
+start)
+	[ -x ${PREFIX}/bin/spamd ] && ${PREFIX}/bin/spamd -a -c -d && echo -n ' spamd'
+	;;
+stop)
+	;;
+*)
+	echo "Usage: `basename $0` {start|stop}" >&2
+	;;
+esac
+
+exit 0
diff --git a/mail/p5-Mail-SpamAssassin-snapshot/pkg-comment b/mail/p5-Mail-SpamAssassin-snapshot/pkg-comment
new file mode 100644
index 000000000000..c8bcf6aae117
--- /dev/null
+++ b/mail/p5-Mail-SpamAssassin-snapshot/pkg-comment
@@ -0,0 +1 @@
+A mail filter for identifying SPAM
diff --git a/mail/p5-Mail-SpamAssassin-snapshot/pkg-descr b/mail/p5-Mail-SpamAssassin-snapshot/pkg-descr
new file mode 100644
index 000000000000..86d93a1b0a15
--- /dev/null
+++ b/mail/p5-Mail-SpamAssassin-snapshot/pkg-descr
@@ -0,0 +1,11 @@
+SpamAssassin is a mail filter which attempts to identify spam using text
+analysis and several internet-based realtime blacklists.
+
+Using its rule base, it uses a wide range of heuristic tests on mail
+headers and body text to identify "spam", also known as unsolicited
+commercial email.
+
+Once identified, the mail can then be optionally tagged as spam for later
+filtering using the user's own mail user-agent application.
+
+WWW:	http://spamassassin.org/
diff --git a/mail/p5-Mail-SpamAssassin-snapshot/pkg-plist b/mail/p5-Mail-SpamAssassin-snapshot/pkg-plist
new file mode 100644
index 000000000000..24deb2114ddf
--- /dev/null
+++ b/mail/p5-Mail-SpamAssassin-snapshot/pkg-plist
@@ -0,0 +1,81 @@
+bin/sa-learn-nonspam
+bin/spamd
+bin/sa-learn-rebuild
+bin/sa-forget
+bin/sa-learn-spam
+bin/spamc
+bin/spamassassin
+etc/rc.d/spamd.sh-dist
+etc/mail/spamassassin/local.cf
+@dirrm etc/mail/spamassassin
+@dirrm etc/mail
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail/SpamAssassin
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Mail
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Conf.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Replier.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Bayes.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/ConfSourceSQL.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/DBBasedAddrList.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/PerMsgStatus.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Reporter.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/SHA1.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/AuditMessage.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/HTML.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/MailingList.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/ArchiveIterator.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/CmdLearn.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/ExposedMessage.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/PerMsgLearner.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/EncappedMIME.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/BayesStore.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/NoMailAudit.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/AutoWhitelist.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/PersistentAddrList.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Dns.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/PhraseFreqs.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/TextCat.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/EncappedMessage.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Message.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/EvalTests.pm
+lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin/Locales.pm
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail/SpamAssassin
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/Mail
+%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README.sql
+%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/BUGS
+%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/COPYRIGHT
+%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/Changes
+%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README
+%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/TRADEMARK
+%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/procmailrc.example
+%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/sample-nonspam.txt
+%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/sample-spam.txt
+%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README.spamd
+%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/README.spamd-vpopmail
+%%PORTDOCS%%share/doc/p5-Mail-SpamAssassin/spamassassin.sql
+@dirrm %%PORTDOCS%%share/doc/p5-Mail-SpamAssassin
+share/spamassassin/10_misc.cf
+share/spamassassin/20_anti_ratware.cf
+share/spamassassin/20_body_tests.cf
+share/spamassassin/20_compensate.cf
+share/spamassassin/20_head_tests.cf
+share/spamassassin/20_meta_tests.cf
+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/30_text_de.cf
+share/spamassassin/30_text_es.cf
+share/spamassassin/30_text_fr.cf
+share/spamassassin/30_text_pl.cf
+share/spamassassin/40_spam_phrases.cf
+share/spamassassin/50_scores.cf
+share/spamassassin/60_whitelist.cf
+share/spamassassin/user_prefs.template
+share/spamassassin/triplets.txt
+share/spamassassin/languages
+@dirrm share/spamassassin