ports/81112: mail/p5-Mail-SpamAssassin update -- make Razor support optional

[Jeremy Chadwick]

>Number:         81112
>Category:       ports
>Synopsis:       mail/p5-Mail-SpamAssassin update -- make Razor support optional
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 16 16:00:17 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Jeremy Chadwick
>Release:        FreeBSD 4.11-STABLE i386
>Organization:
Parodius Networking
>Environment:
System: FreeBSD pentarou.parodius.com 4.11-STABLE FreeBSD 4.11-STABLE #0: Thu May 12 04:37:52 PDT 2005 root at pentarou.parodius.com:/usr/obj/usr/src/sys/PENTAROU i386
>Description:
	I've never understood why Razor support was mandatory in this port,
	since SpamAssassin clearly states it's optional.  Whoever maintains the
	razor-agents port needs to clean it up anyways, as it ends up doing
	silly things like sticking log files in the root filesystem and other
	nonsense.

	Either way, this patch adds the OPTIONS "RAZOR" hook, and a check for
	the appropriate option flag, so that those of us who don't want
	razor-agents don't have to have it.  However, BY DEFAULT, Razor support
	is ENABLED (to keep 100% compatible with historic installations).

	I've tested this patch on our production mail servers, and it works
	great.

	Port maintainer or committer may want to increase PORTREVISION for
	this, but I personally didn't see the point.
>How-To-Repeat:
	n/a
>Fix:
	Apply below patch.


diff -ruN p5-Mail-SpamAssassin.orig/Makefile p5-Mail-SpamAssassin/Makefile
--- p5-Mail-SpamAssassin.orig/Makefile	Thu May 12 03:32:07 2005
+++ p5-Mail-SpamAssassin/Makefile	Mon May 16 08:41:18 2005
@@ -20,8 +20,7 @@
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Net/DNS.pm:${PORTSDIR}/dns/p5-Net-DNS \
 		${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser \
 		${SITE_PERL}/Mail/Internet.pm:${PORTSDIR}/mail/p5-Mail-Tools
-RUN_DEPENDS=	${BUILD_DEPENDS} \
-		razor-client:${PORTSDIR}/mail/razor-agents
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 CONFIGURE_ARGS=	SYSCONFDIR="${PREFIX}/etc" \
@@ -32,6 +31,7 @@
 		SSL "Build with SSL support for spamd/spamc" on \
 		MYSQL "Add MySQL support" off \
 		PGSQL "Add PostreSQL support" off \
+		RAZOR "Add Vipul's Razor support" on \
 		SPF_QUERY "Add SPF query support" off \
 		TOOLS "Install SpamAssassin tools" off
 
@@ -60,6 +60,10 @@
 .if defined(WITH_PGSQL)
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBD/Pg.pm:${PORTSDIR}/databases/p5-DBD-Pg
 USE_SQLDB=	yes
+.endif
+
+.if !defined(WITHOUT_RAZOR)
+RUN_DEPENDS+=	razor-client:${PORTSDIR}/mail/razor-agents
 .endif
 
 .if defined(WITH_TOOLS)
>Release-Note:
>Audit-Trail:
>Unformatted: