ports/159365: [patch] mail/p5-Mail-SpamAssassin: fix WITH_AWL option, add option WITHOUT_FREEMAIL

[Jason Helfman]

>Number:         159365
>Category:       ports
>Synopsis:       [patch] mail/p5-Mail-SpamAssassin: fix WITH_AWL option, add option WITHOUT_FREEMAIL
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 01 21:20:09 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Jason Helfman
>Release:        FreeBSD 8.2-RELEASE i386
>Organization:
Experts Exchange, LLC.
>Environment:
System: FreeBSD eggman.experts-exchange.com 8.2-RELEASE FreeBSD 8.2-RELEASE #0: Fri Feb 18 02:24:46 UTC 2011 root at almeida.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
AWL is not defined by default in the rules, so sed syntax needs to change. (WITH_AWL)
Added a new option to disable a rule in v330. (WITHOUT_FREEMAIL)
Builds and patches as expected cleanly in Tinderbox, and results are clean in resulting package.

>How-To-Repeat:
	
>Fix:

Index: p5-Mail-SpamAssassin/Makefile
===================================================================
RCS file: /home/jhelfman/ncvs/ports/mail/p5-Mail-SpamAssassin/Makefile,v
retrieving revision 1.140
diff -u -r1.140 Makefile
--- p5-Mail-SpamAssassin/Makefile	12 Jul 2011 02:10:30 -0000	1.140
+++ p5-Mail-SpamAssassin/Makefile	1 Aug 2011 21:06:33 -0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	Mail-SpamAssassin
 PORTVERSION=	3.3.2
+PORTREVISION=	1
 CATEGORIES=	mail perl5
 MASTER_SITES=	${MASTER_SITE_APACHE:S/$/:apache/} ${MASTER_SITE_PERL_CPAN:S/$/:cpan/}
 MASTER_SITE_SUBDIR=	spamassassin/source/:apache Mail/:cpan
@@ -261,12 +262,15 @@
 .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
+.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
+.if defined(WITHOUT_FREEMAIL)
+	${REINPLACE_CMD} -e '/FreeMail/s/^loadplugin/#loadplugin/' ${WRKSRC}/rules/v330.pre
+.endif
 
 pre-install:
 	@${MKDIR}  ${DATADIR}
>Release-Note:
>Audit-Trail:
>Unformatted: