Rename pkgsrc/mail/p5-Mail-Spamassassin to pkgsrc/mail/spamassassin.

12 files changed, 9 insertions, 137 deletions

diff --git a/mail/Makefile b/mail/Makefile
index 8ed6a848306..3bd05aaee31 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.141 2002/08/25 22:44:19 hubertf Exp $
+# $NetBSD: Makefile,v 1.142 2002/08/26 16:03:08 hubertf Exp $
 #
 
 COMMENT=	Electronic mail utilities
@@ -73,7 +73,6 @@ SUBDIR+=	p5-Mail-Audit
 SUBDIR+=	p5-Mail-IMAPClient
 SUBDIR+=	p5-Mail-ListDetector
 SUBDIR+=	p5-Mail-Sendmail
-SUBDIR+=	p5-Mail-SpamAssassin
 SUBDIR+=	p5-MailTools
 SUBDIR+=	p5-Sendmail-AccessDB
 SUBDIR+=	p5-razor-agents
@@ -100,6 +99,7 @@ SUBDIR+=	sendmail
 SUBDIR+=	sendmail88
 SUBDIR+=	smtpfeed
 SUBDIR+=	solid-pop3d
+SUBDIR+=	spamassassin
 SUBDIR+=	spruce
 SUBDIR+=	squirrelmail
 SUBDIR+=	sqwebmail
diff --git a/mail/p5-Mail-SpamAssassin/DESCR b/mail/p5-Mail-SpamAssassin/DESCR
deleted file mode 100644
index 3d60fec1ee9..00000000000
--- a/mail/p5-Mail-SpamAssassin/DESCR
+++ /dev/null
@@ -1,22 +0,0 @@
-SpamAssassin is a mail filter to identify spam.
-
-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.
-
-The spam-identification tactics used include header analysis, text
-analysis, blacklists and Razor.
-
-Once identified, the mail can then be optionally tagged as spam for
-later filtering using the user's own mail user-agent application.
-
-SpamAssassin requires very little configuration; you do not need to
-continually update it with details of your mail accounts, mailing list
-memberships, etc. It accomplishes filtering without this knowledge, as
-much as possible.
-
-The distribution provides a command line tool to perform filtering,
-along with Mail::SpamAssassin, a set of perl modules which implement a
-Mail::Audit plugin, allowing SpamAssassin to be used in a Mail::Audit
-filter, or (possibly at some point) in a spam-protection proxy POP/IMAP
-server.
diff --git a/mail/p5-Mail-SpamAssassin/MESSAGE b/mail/p5-Mail-SpamAssassin/MESSAGE
deleted file mode 100644
index 2269b5e8b60..00000000000
--- a/mail/p5-Mail-SpamAssassin/MESSAGE
+++ /dev/null
@@ -1,13 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.5 2002/08/03 22:29:03 jlam Exp $
-
-The default directory for site-wide config files for SpamAssassin on
-NetBSD has changed from
-
-	/etc/mail/spamassassin
-to
-	${PKG_SYSCONFDIR}/spamassassin
-
-If you have old config files, please move them to the new location.
-
-===========================================================================
diff --git a/mail/p5-Mail-SpamAssassin/Makefile b/mail/p5-Mail-SpamAssassin/Makefile
deleted file mode 100644
index 2041b0fba7f..00000000000
--- a/mail/p5-Mail-SpamAssassin/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-# $NetBSD: Makefile,v 1.9 2002/07/23 02:07:07 wiz Exp $
-
-DISTNAME=	Mail-SpamAssassin-2.31
-PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	3
-SVR4_PKGNAME=	p5msa
-CATEGORIES=	mail
-#MASTER_SITES=	http://spamassassin.taint.org/released/
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Mail/}
-
-MAINTAINER=	packages@netbsd.org
-HOMEPAGE=	http://www.spamassassin.org/
-COMMENT=	mail filter to identify spam
-
-DEPENDS+=	p5-Net-DNS-[0-9]*:../../net/p5-Net-DNS
-DEPENDS+=	p5-Time-HiRes-[0-9]*:../../time/p5-Time-HiRes
-
-USE_BUILDLINK_ONLY=	YES
-PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Mail/SpamAssassin/.packlist
-
-post-patch:
-	@(cd ${WRKSRC};							\
-	for f in README Makefile.PL lib/Mail/SpamAssassin/Conf.pm ; do \
-		${SED} -e "s,/usr/share,${PREFIX}/share," \
-		       -e "s,/etc/mail,${PKG_SYSCONFBASE},g" $$f > $$f.fixed && \
-		${MV} $$f.fixed $$f;					\
-	done)
-
-do-configure:
-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
-
-post-install:
-.for d in spamassassin spamassassin/sql spamassassin/spamd
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/$d
-.endfor
-.for f in README procmailrc.example sample-nonspam.txt sample-spam.txt \
-    sql/README sql/spamassassin.sql spamd/README.spamd
-	${INSTALL_DATA} ${WRKSRC}/$f ${PREFIX}/share/doc/spamassassin/$f
-.endfor
-
-.include "../../lang/perl5/buildlink.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/p5-Mail-SpamAssassin/PLIST b/mail/p5-Mail-SpamAssassin/PLIST
deleted file mode 100644
index e622f5c98b7..00000000000
--- a/mail/p5-Mail-SpamAssassin/PLIST
+++ /dev/null
@@ -1,34 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2002/07/03 14:02:39 lukem Exp $
-@comment bin/spamassassin
-@comment bin/spamc
-@comment bin/spamd
-@comment bin/spamproxyd
-share/doc/spamassassin/README
-share/doc/spamassassin/procmailrc.example
-share/doc/spamassassin/sample-nonspam.txt
-share/doc/spamassassin/sample-spam.txt
-share/doc/spamassassin/spamd/README.spamd
-share/doc/spamassassin/sql/README
-share/doc/spamassassin/sql/spamassassin.sql
-share/spamassassin/10_misc.cf
-share/spamassassin/20_body_tests.cf
-share/spamassassin/20_head_tests.cf
-share/spamassassin/20_uri_tests.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/languages
-share/spamassassin/triplets.txt
-share/spamassassin/user_prefs.template
-@dirrm share/doc/spamassassin/spamd
-@dirrm share/doc/spamassassin/sql
-@dirrm share/doc/spamassassin
-@dirrm share/spamassassin
diff --git a/mail/p5-Mail-SpamAssassin/distinfo b/mail/p5-Mail-SpamAssassin/distinfo
deleted file mode 100644
index 23f193f0e54..00000000000
--- a/mail/p5-Mail-SpamAssassin/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD: distinfo,v 1.7 2002/07/23 02:07:07 wiz Exp $
-
-SHA1 (Mail-SpamAssassin-2.31.tar.gz) = d43295b0e3e49c60e8f91f7f7645a40db04965f1
-Size (Mail-SpamAssassin-2.31.tar.gz) = 370237 bytes
-SHA1 (patch-aa) = 79a9f8589d6a99979bd2ff5dc56aff7ff9654ac7
diff --git a/mail/p5-Mail-SpamAssassin/patches/patch-aa b/mail/p5-Mail-SpamAssassin/patches/patch-aa
deleted file mode 100644
index cd3d7b0e010..00000000000
--- a/mail/p5-Mail-SpamAssassin/patches/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2002/07/23 02:07:08 wiz Exp $
-
---- rules/local.cf.orig	Wed Dec 19 06:20:44 2001
-+++ rules/local.cf
-@@ -1,3 +1,3 @@
--# Add your own customisations to this file.  See 'man Mail::SpamAssassin::Conf'
--# for details of what can be tweaked.
-+# Add your own customisations to this file.  See
-+# 'perldoc Mail::SpamAssassin::Conf' for details of what can be tweaked.
- # 
diff --git a/mail/spamassassin/MESSAGE b/mail/spamassassin/MESSAGE
index 338978de232..544839f944c 100644
--- a/mail/spamassassin/MESSAGE
+++ b/mail/spamassassin/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.1.1.1 2002/08/26 15:54:28 hubertf Exp $
+$NetBSD: MESSAGE,v 1.2 2002/08/26 16:00:52 hubertf Exp $
 
 The default directory for site-wide config files for SpamAssassin on
 NetBSD has changed from
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 0631b809dd2..ff5b9201ab3 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2002/08/26 15:55:58 hubertf Exp $
+# $NetBSD: Makefile,v 1.4 2002/08/26 16:00:52 hubertf Exp $
 
 DISTNAME=	Mail-SpamAssassin-2.31
-PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	3
-SVR4_PKGNAME=	p5msa
+PKGNAME=	spamassassin-2.31
+SVR4_PKGNAME=	sa
 CATEGORIES=	mail
-#MASTER_SITES=	http://spamassassin.taint.org/released/
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Mail/}
 
 MAINTAINER=	packages@netbsd.org
diff --git a/mail/spamassassin/PLIST b/mail/spamassassin/PLIST
index 0bd106c5d27..c3a1cfa3839 100644
--- a/mail/spamassassin/PLIST
+++ b/mail/spamassassin/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2002/08/26 15:55:58 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/08/26 16:00:52 hubertf Exp $
 @comment bin/spamassassin
 @comment bin/spamc
 @comment bin/spamd
diff --git a/mail/spamassassin/distinfo b/mail/spamassassin/distinfo
index 2afd6d9efe3..1d416f875c7 100644
--- a/mail/spamassassin/distinfo
+++ b/mail/spamassassin/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/08/26 15:55:58 hubertf Exp $
+$NetBSD: distinfo,v 1.4 2002/08/26 16:00:52 hubertf Exp $
 
 SHA1 (Mail-SpamAssassin-2.31.tar.gz) = d43295b0e3e49c60e8f91f7f7645a40db04965f1
 Size (Mail-SpamAssassin-2.31.tar.gz) = 370237 bytes
diff --git a/mail/spamassassin/patches/patch-aa b/mail/spamassassin/patches/patch-aa
index bb6975953b2..5e616c5479f 100644
--- a/mail/spamassassin/patches/patch-aa
+++ b/mail/spamassassin/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/08/26 15:54:29 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2002/08/26 16:01:33 hubertf Exp $
 
 --- rules/local.cf.orig	Wed Dec 19 06:20:44 2001
 +++ rules/local.cf