Update perl dependencies to find correct version of perl.

4 files changed, 16 insertions, 15 deletions

diff --git a/devel/p5-Data-Dumper/Makefile b/devel/p5-Data-Dumper/Makefile
index 5b9f4c38711..356f92ec17d 100644
--- a/devel/p5-Data-Dumper/Makefile
+++ b/devel/p5-Data-Dumper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2000/08/27 21:05:14 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2000/09/05 09:25:20 jlam Exp $
 # FreeBSD Id: Makefile,v 1.7 1997/06/24 18:43:11 jfitz Exp
 
 DISTNAME=	Data-Dumper-2.101
@@ -9,9 +9,10 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Data/}
 MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://theory.uwinnipeg.ca/CPAN/data/Data-Dumper/Dumper.html
 
-CONFLICTS=	perl-5.6.0	# needs perl>5.6.0 or perl-5.00*
+# Some perl packages install their own versions of this module.
+# Can't simply define USE_PERL5.
+DEPENDS+=	perl-{5.0*,5.6.0nb[12],base-5.[6-9]*}:../../lang/perl5-base
 
-USE_PERL5=	# defined
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Data/Dumper/.packlist
 
 do-configure:
diff --git a/devel/p5-Devel-DProf/Makefile b/devel/p5-Devel-DProf/Makefile
index ce5c1be8341..b35eee1caae 100644
--- a/devel/p5-Devel-DProf/Makefile
+++ b/devel/p5-Devel-DProf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/08/27 21:13:43 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2000/09/05 09:25:21 jlam Exp $
 #
 
 DISTNAME=		DProf-19990108
@@ -8,9 +8,10 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Devel/}
 
 MAINTAINER=		bad@netbsd.org
 
-CONFLICTS=		perl-5.6.0	# needs perl>5.6.0 or perl-5.00*
+# Some perl packages install their own versions of this module.
+# Can't simply define USE_PERL5.
+DEPENDS+=		perl-{5.0*,5.6.0nb[12],base-5.[6-9]*}:../../lang/perl5-base
 
-USE_PERL5=		# defined
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Devel/DProf/.packlist
 
 do-configure:
diff --git a/devel/p5-Devel-Peek/Makefile b/devel/p5-Devel-Peek/Makefile
index 9a1792026db..48e5143a66a 100644
--- a/devel/p5-Devel-Peek/Makefile
+++ b/devel/p5-Devel-Peek/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2000/08/30 19:08:13 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2000/09/05 09:25:21 jlam Exp $
 #
 
 DISTNAME=		perl-5.6.0
@@ -10,11 +10,10 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Devel/} \
 
 MAINTAINER=		packages@netbsd.org
 
-# Needs at least perl-5.6.0 to build, and versions older than 5.6.0nb1
-# had their own version of Devel::Peek.
-DEPENDS+=		perl>=5.6.0nb1:../../lang/perl5
+# Some perl packages install their own versions of this module.
+# Can't simply define USE_PERL5.
+DEPENDS+=		perl-{5.0*,5.6.0nb2,base-5.[6-9]*}:../../lang/perl5-base
 
-USE_PERL5=		# defined
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/Devel/Peek/.packlist
 EXTRACT_ELEMENTS=	${DISTNAME}/ext/Devel/Peek
 WRKSRC=			${WRKDIR}/${EXTRACT_ELEMENTS}
diff --git a/www/p5-CGI/Makefile b/www/p5-CGI/Makefile
index 476ab72b201..be22dd6d04a 100644
--- a/www/p5-CGI/Makefile
+++ b/www/p5-CGI/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2000/08/30 19:08:13 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2000/09/05 09:25:21 jlam Exp $
 #
 
 DISTNAME=       	CGI.pm-2.72
@@ -8,10 +8,10 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=CGI/}
 
 MAINTAINER=		christos@netbsd.org
 
-# Older perl packages install their own versions of CGI.pm.
-DEPENDS+=		perl>=5.6.0nb2:../../lang/perl5
+# Some perl packages install their own versions of this module.
+# Can't simply define USE_PERL5.
+DEPENDS+=		perl-{5.0*,5.6.0nb2,base-5.[6-9]*}:../../lang/perl5-base
 
-USE_PERL5=		# defined
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/CGI/.packlist
 
 pre-configure: