From hideo@lastamericanempire.com  Wed Sep 28 21:21:43 2005
Return-Path: <hideo@lastamericanempire.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 869B416A41F
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 28 Sep 2005 21:21:43 +0000 (GMT)
	(envelope-from hideo@lastamericanempire.com)
Received: from darwin.lastamericanempire.com (lastamericanempire.com [66.134.56.226])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4CB5543D48
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 28 Sep 2005 21:21:43 +0000 (GMT)
	(envelope-from hideo@lastamericanempire.com)
Received: by darwin.lastamericanempire.com (Postfix, from userid 1001)
	id C3D0826; Wed, 28 Sep 2005 15:21:42 -0600 (MDT)
Message-Id: <20050928212142.C3D0826@darwin.lastamericanempire.com>
Date: Wed, 28 Sep 2005 15:21:42 -0600 (MDT)
From: Zach Thompson <hideo@lastamericanempire.com>
Reply-To: Zach Thompson <hideo@lastamericanempire.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] mail/p5-Mail-SpamAssassin: add RELAY_COUNTRY option/run depends
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         86689
>Category:       ports
>Synopsis:       [patch] mail/p5-Mail-SpamAssassin: add RELAY_COUNTRY option/run depends
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    perl
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 28 21:30:20 GMT 2005
>Closed-Date:    Thu Sep 29 11:42:05 CEST 2005
>Last-Modified:  Thu Sep 29 11:42:05 CEST 2005
>Originator:     hideo
>Release:        FreeBSD 7.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD darwin.lastamericanempire.com 7.0-CURRENT FreeBSD 7.0-CURRENT #0: Sun Sep 25 19:05:22 MDT 2005 hideo@darwin.lastamericanempire.com:/usr/obj/usr/src/sys/darwin amd64


	
>Description:
Enabling the Mail::Spamassassin::Plugin::RelayCountry plugin fails since 
IO::Country::Fast is not pulled in to the dependencies. The latter module 
is clearly stated as a requirement for the plugin.

This patch requires adding net/p5-IP-Country to RUN_DEPENDS so I made 
RELAY_COUNTRY support optional. Also, since the plugin, in commented form, 
does appear in the default init.pre and may be breaking w/o detection for 
many people using SA I bumped PORTREVISION.

>How-To-Repeat:
	
>Fix:

	

--- sa_relay-country begins here ---
diff -ruN /usr/ports/mail/p5-Mail-SpamAssassin/Makefile p5-Mail-SpamAssassin/Makefile
--- /usr/ports/mail/p5-Mail-SpamAssassin/Makefile	Sat Sep 17 10:57:25 2005
+++ p5-Mail-SpamAssassin/Makefile	Wed Sep 28 13:33:09 2005
@@ -7,6 +7,7 @@
 
 PORTNAME=	Mail-SpamAssassin
 PORTVERSION=	3.1.0
+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
@@ -33,6 +34,7 @@
 		PGSQL "Add PostreSQL support" off \
 		RAZOR "Add Vipul's Razor support" off \
 		SPF_QUERY "Add SPF query support" off \
+		RELAY_COUNTRY "Relay country support" off \
 		TOOLS "Install SpamAssassin tools" off
 
 .include <bsd.port.pre.mk>
@@ -66,6 +68,10 @@
 
 .if defined(WITH_DOMAINKEYS)
 RUN_DEPENDS+=	${SITE_PERL}/Mail/DomainKeys.pm:${PORTSDIR}/mail/p5-Mail-DomainKeys
+.endif
+
+.if defined(WITH_RELAY_COUNTRY)
+RUN_DEPENDS=	${SITE_PERL}/IP/Country/Fast.pm:${PORTSDIR}/net/p5-IP-Country
 .endif
 
 .if defined(WITH_TOOLS)
--- sa_relay-country ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->perl 
Responsible-Changed-By: erwin 
Responsible-Changed-When: Thu Sep 29 07:26:23 GMT 2005 
Responsible-Changed-Why:  
Over to maitnainers 

http://www.freebsd.org/cgi/query-pr.cgi?pr=86689 
State-Changed-From-To: open->closed 
State-Changed-By: tobez 
State-Changed-When: Thu Sep 29 11:42:04 CEST 2005 
State-Changed-Why:  
The update has been committed. Thank you for your submission. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=86689 
>Unformatted:
