Here's a fix for the SpamAssassin port.  The included diff adds the
config files init.pre and v310.pre to the package.  Both files are
required for a smooth transition from SpamAssassin 3.0 to 3.1.

Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- Makefile    9 Oct 2005 09:05:43 -0000       1.35
+++ Makefile    17 Dec 2005 16:36:28 -0000
@@ -3,7 +3,7 @@
 COMMENT=               "mailfilter to identify and mark spam"
 
 DISTNAME=              Mail-SpamAssassin-3.1.0
-PKGNAME=               p5-${DISTNAME}
+PKGNAME=               p5-${DISTNAME}p0
 CATEGORIES=            mail perl5
 
 MAINTAINER=            Ben Lovett <[EMAIL PROTECTED]>
@@ -55,7 +55,7 @@
 FAQ=   OpenBSD-SpamAssassin-mini-howto.html
 DOCS=  README UPGRADE LICENSE procmailrc.example \
        sample-nonspam.txt sample-spam.txt
-LOCALCF=       rules/local.cf
+LOCALCF=       rules/local.cf rules/init.pre rules/v310.pre
 
 post-patch:
        @perl -pi -e "[EMAIL PROTECTED]@[EMAIL PROTECTED]@#${CONFDIR}#" 
${WRKSRC}/rules/*
Index: patches/patch-rules_init_pre
===================================================================
RCS file: patches/patch-rules_init_pre
diff -N patches/patch-rules_init_pre
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-rules_init_pre        17 Dec 2005 16:36:28 -0000
@@ -0,0 +1,9 @@
+--- rules/init.pre.orig        Fri Aug 12 02:38:50 2005
++++ rules/init.pre     Thu Dec  1 11:37:58 2005
+@@ -25,5 +25,5 @@
+ 
+ # SPF - perform SPF verification.
+ #
+-loadplugin Mail::SpamAssassin::Plugin::SPF
++#loadplugin Mail::SpamAssassin::Plugin::SPF
+ 
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/pkg/PLIST,v
retrieving revision 1.16
diff -u -r1.16 PLIST
--- pkg/PLIST   9 Oct 2005 09:05:43 -0000       1.16
+++ pkg/PLIST   17 Dec 2005 16:36:28 -0000
@@ -152,6 +152,10 @@
 share/examples/SpamAssassin/
 share/examples/SpamAssassin/local.cf
 @sample ${CONFDIR}/local.cf
+share/examples/SpamAssassin/init.pre
[EMAIL PROTECTED] ${CONFDIR}/init.pre
+share/examples/SpamAssassin/v310.pre
[EMAIL PROTECTED] ${CONFDIR}/v310.pre
 share/spamassassin/
 share/spamassassin/10_misc.cf
 share/spamassassin/20_advance_fee.cf

Reply via email to