From owner-freebsd-ports-bugs@FreeBSD.ORG  Fri Jul  2 02:22:24 2004
Return-Path: <owner-freebsd-ports-bugs@FreeBSD.ORG>
Delivered-To: freebsd-ports-bugs@hub.freebsd.org
Received: from mx1.FreeBSD.org (unknown [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 5E85516A4CE
	for <freebsd-ports-bugs@hub.freebsd.org>;
	Fri,  2 Jul 2004 02:22:24 +0000 (GMT)
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 69DB543D3F
	for <freebsd-ports-bugs@hub.freebsd.org>;
	Fri,  2 Jul 2004 02:22:23 +0000 (GMT)
	(envelope-from gnats@FreeBSD.org)
Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1])
	i622KJUZ042729	for <freebsd-ports-bugs@freefall.freebsd.org>;
	Fri, 2 Jul 2004 02:20:19 GMT
	(envelope-from gnats@freefall.freebsd.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i622KJmv042728;
	Fri, 2 Jul 2004 02:20:19 GMT
	(envelope-from gnats)
Resent-Date: Fri, 2 Jul 2004 02:20:19 GMT
Resent-Message-Id: <200407020220.i622KJmv042728@freefall.freebsd.org>
Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer)
Resent-To: freebsd-ports-bugs@FreeBSD.org
Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org,
	David Lay <dsl@webize.com.au>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 31B8916A4CE
	for <FreeBSD-gnats-submit@freebsd.org>;
	Fri,  2 Jul 2004 02:17:15 +0000 (GMT)
Received: from mayhem.webize.com.au (mayhem.webize.com.au [203.48.28.226])
	by mx1.FreeBSD.org (Postfix) with SMTP id E34E443D1D
	for <FreeBSD-gnats-submit@freebsd.org>;
	Fri,  2 Jul 2004 02:17:13 +0000 (GMT)
	(envelope-from dsl@mayhem.webize.com.au)
Received: (qmail 80177 invoked by uid 1003); 2 Jul 2004 02:09:16 -0000
Message-Id: <20040702020916.79793.qmail@mayhem.webize.com.au>
Date: 2 Jul 2004 02:09:16 -0000
From: David Lay <dsl@webize.com.au>
To: FreeBSD-gnats-submit@FreeBSD.org
X-Send-Pr-Version: 3.113
Subject: ports/68579: Update mail/qmail-scanner for Perl 5.8
X-BeenThere: freebsd-ports-bugs@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
Reply-To: David Lay <dsl@webize.com.au>
List-Id: Ports bug reports <freebsd-ports-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>,
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs>
List-Post: <mailto:freebsd-ports-bugs@freebsd.org>
List-Help: <mailto:freebsd-ports-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>,
	<mailto:freebsd-ports-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Jul 2004 02:22:24 -0000


>Number:         68579
>Category:       ports
>Synopsis:       Update mail/qmail-scanner for Perl 5.8
>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:   Fri Jul 02 02:20:19 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     David Lay
>Release:        N/A
>Organization:
Webize
>Environment:
	N/A

>Description:
	qmail-scanner has a dependency on devel/p5-Time-HiRes.  p5-Time-HiRes
        is available in the base Perl 5.8 distribution.  We don't want to add
        p5-Time-HiRes to the dependency list when Perl 5.8 is used.
>How-To-Repeat:
	
>Fix:
diff -ur qmail-scanner.orig/Makefile qmail-scanner/Makefile
--- qmail-scanner.orig/Makefile	Mon Jun 21 10:57:45 2004
+++ qmail-scanner/Makefile	Thu Jul  1 12:47:01 2004
@@ -17,7 +17,6 @@
 COMMENT=	Content/Anti-virus Scanner for qmail
 
 BUILD_DEPENDS=	${QMAIL_QUEUE}:${PORTSDIR}/mail/qmail \
-		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes \
 		reformime:${PORTSDIR}/mail/maildrop
 
 # A normal qmail installation puts everything into /var/qmail/.
@@ -144,4 +143,10 @@
 test:
 	@${WRKSRC}/contrib/test_installation.sh -doit
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PERL_LEVEL} < 500800
+BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
+.endif
+
+.include <bsd.port.post.mk>
>Release-Note:
>Audit-Trail:
>Unformatted: