From erwin@staff.tdk.net  Mon May 17 05:12:31 2004
Return-Path: <erwin@staff.tdk.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C110716A4CF
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 17 May 2004 05:12:22 -0700 (PDT)
Received: from staff.tdk.net (tdk.net [194.239.134.102])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 32D9943D3F
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 17 May 2004 05:12:21 -0700 (PDT)
	(envelope-from erwin@staff.tdk.net)
Received: from bamse.staff.tdk.net (localhost.staff.tdk.net [127.0.0.1])
	by bamse.staff.tdk.net (8.12.9p2/8.12.9) with ESMTP id i4HC18s6051885
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 17 May 2004 14:01:08 +0200 (CEST)
	(envelope-from erwin@bamse.staff.tdk.net)
Received: (from erwin@localhost)
	by bamse.staff.tdk.net (8.12.9p2/8.12.9/Submit) id i4HC18oT051884;
	Mon, 17 May 2004 14:01:08 +0200 (CEST)
	(envelope-from erwin)
Message-Id: <200405171201.i4HC18oT051884@bamse.staff.tdk.net>
Date: Mon, 17 May 2004 14:01:08 +0200 (CEST)
From: Erwin Lansing <erwin@freebsd.org>
Reply-To: Erwin Lansing <erwin@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: Conditionalize dependency on p5-DBI(-137) for mail/yadda
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         66736
>Category:       ports
>Synopsis:       Conditionalize dependency on p5-DBI(-137) for mail/yadda
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    erwin
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 17 05:20:12 PDT 2004
>Closed-Date:    Mon May 17 07:20:05 PDT 2004
>Last-Modified:  Mon Jul 05 17:27:39 GMT 2004
>Originator:     Erwin Lansing
>Release:        FreeBSD 4.9-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD bamse.staff.tdk.net 4.9-RELEASE-p3 FreeBSD 4.9-RELEASE-p3 #4: Wed Mar 3 11:05:11 CET 2004 root@bamse.staff.tdk.net:/usr/obj/usr/src/sys/BAMSE i386


	
>Description:

Perl < 5.6 needs databases/p5-DBI-137, not p5-DBI. The following patch
conditionalizes this dependency depending on the installed perl version.

>How-To-Repeat:
	
>Fix:

	

--- hest begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/mail/yadda/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile	12 Apr 2004 23:06:44 -0000	1.2
+++ Makefile	17 May 2004 12:02:04 -0000
@@ -14,8 +14,7 @@
 MAINTAINER=	jesper@noehr.org
 COMMENT=	Yet Another Damn Delivery Agent
 
-RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
-		${SITE_PERL}/Mail/Audit.pm:${PORTSDIR}/mail/p5-Mail-Audit
+RUN_DEPENDS=	${SITE_PERL}/Mail/Audit.pm:${PORTSDIR}/mail/p5-Mail-Audit
 
 USE_PERL5_RUN=	yes
 
@@ -26,4 +25,12 @@
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/yadda ${PREFIX}/sbin
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500600
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI-137
+.else
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
+.endif
+
+.include <bsd.port.post.mk>
--- hest ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->erwin 
Responsible-Changed-By: erwin 
Responsible-Changed-When: Mon May 17 05:23:16 PDT 2004 
Responsible-Changed-Why:  
Mine 

http://www.freebsd.org/cgi/query-pr.cgi?pr=66736 
State-Changed-From-To: open->closed 
State-Changed-By: erwin 
State-Changed-When: Mon May 17 07:20:00 PDT 2004 
State-Changed-Why:  
Committed. 

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