Alter dependencies so that perl>=5.6.1nb2 will satisfy the dependency for

p5-CGI or p5-Data-Dumper.

8 files changed, 16 insertions, 16 deletions

diff --git a/comms/pilotmgr/Makefile b/comms/pilotmgr/Makefile
index 2fade23cfbf..556f5ce3b2e 100644
--- a/comms/pilotmgr/Makefile
+++ b/comms/pilotmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/02/25 04:17:38 hubertf Exp $
+# $NetBSD: Makefile,v 1.14 2001/09/05 17:18:21 jlam Exp $
 
 DISTNAME=	pilotmgr-1.107p2
 CATEGORIES=	comms
@@ -9,7 +9,7 @@ MAINTAINER=	tron@netbsd.org
 HOMEPAGE=	http://www.moshpit.org/pilotmgr/
 COMMENT=	synchronize databases on any 3Com Palm device
 
-DEPENDS+=	p5-Data-Dumper-*:../../devel/p5-Data-Dumper
+DEPENDS+=	{p5-Data-Dumper-*,perl>=5.6.1nb2}:../../lang/perl5
 DEPENDS+=	p5-Digest-MD5-*:../../security/p5-Digest-MD5
 DEPENDS+=	p5-Tk-*:../../x11/p5-Tk
 DEPENDS+=	p5-pilot-link-*:../p5-pilot-link
diff --git a/databases/p5-DBD-mysql/Makefile b/databases/p5-DBD-mysql/Makefile
index b947af4d72d..29d2fc5e994 100644
--- a/databases/p5-DBD-mysql/Makefile
+++ b/databases/p5-DBD-mysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2001/06/17 10:28:33 veego Exp $
+# $NetBSD: Makefile,v 1.13 2001/09/05 17:18:21 jlam Exp $
 #
 
 DISTNAME=		Msql-Mysql-modules-1.2215
@@ -12,7 +12,7 @@ COMMENT=		perl DBI/DBD driver for MySQL databases
 
 DEPENDS+=		mysql-client>=3.23.35:../../databases/mysql-client
 DEPENDS+=		p5-DBI>=1.13:../../databases/p5-DBI
-DEPENDS+=		p5-Data-Dumper>=2.101:../../devel/p5-Data-Dumper
+DEPENDS+=		{p5-Data-Dumper>=2.101,perl>=5.6.1nb2}:../../lang/perl5
 DEPENDS+=		p5-Data-ShowTable-3.3:../../devel/p5-Data-ShowTable
 
 USE_PERL5=		# defined
diff --git a/databases/p5-MLDBM/Makefile b/databases/p5-MLDBM/Makefile
index 7c4c4a78e65..de4993eb95d 100644
--- a/databases/p5-MLDBM/Makefile
+++ b/databases/p5-MLDBM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/04/02 14:33:50 agc Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/05 17:18:22 jlam Exp $
 #
 
 DISTNAME=		MLDBM-2.00
@@ -10,7 +10,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://theory.uwinnipeg.ca/CPAN/data/MLDBM/MLDBM.html
 COMMENT=		perl5 module for storing arbitrary data in tied hashes
 
-DEPENDS+= 		p5-Data-Dumper-*:../../devel/p5-Data-Dumper
+DEPENDS+= 		{p5-Data-Dumper-*,perl>=5.6.1nb2}:../../lang/perl5
 
 USE_PERL5=		# defined
 PERL5_PACKLIST=		${PERL5_SITEARCH}/auto/MLDBM/.packlist
diff --git a/net/p5-Net-Daemon/Makefile b/net/p5-Net-Daemon/Makefile
index 962130f1a7d..407dec4eca3 100644
--- a/net/p5-Net-Daemon/Makefile
+++ b/net/p5-Net-Daemon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2001/03/20 14:17:43 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2001/09/05 17:18:22 jlam Exp $
 #
 
 DISTNAME=	Net-Daemon-0.34
@@ -10,7 +10,7 @@ MAINTAINER=	eric@cirr.com
 HOMEPAGE=	http://theory.uwinnipeg.ca/CPAN/data/libnet/FAQ.html
 COMMENT=	perl5 module for writing networking daemons
 
-DEPENDS+= 	p5-Data-Dumper-*:../../devel/p5-Data-Dumper
+DEPENDS+= 	{p5-Data-Dumper-*,perl>=5.6.1nb2}:../../lang/perl5
 
 USE_PERL5=	# defined
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Net/Daemon/.packlist
diff --git a/net/p5-Net/Makefile b/net/p5-Net/Makefile
index 5c21fddc29b..b72e45a8a9d 100644
--- a/net/p5-Net/Makefile
+++ b/net/p5-Net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/06/17 10:31:02 veego Exp $
+# $NetBSD: Makefile,v 1.19 2001/09/05 17:18:22 jlam Exp $
 # FreeBSD Id: Makefile,v 1.13 1997/06/27 18:38:15 jfitz Exp
 #
 
@@ -11,7 +11,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://theory.uwinnipeg.ca/CPAN/data/libnet/Net/libnetFAQ.html  
 COMMENT=	perl5 modules to access and use network protocols
 
-DEPENDS+= 	p5-Data-Dumper-*:../../devel/p5-Data-Dumper
+DEPENDS+= 	{p5-Data-Dumper-*,perl>=5.6.1nb2}:../../lang/perl5
 
 USE_PERL5=	# defined
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/Net/.packlist
diff --git a/net/p5-ispman/Makefile b/net/p5-ispman/Makefile
index bf2e95dc7fa..14f8168c906 100644
--- a/net/p5-ispman/Makefile
+++ b/net/p5-ispman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/02/17 18:19:25 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/05 17:18:21 jlam Exp $
 #
 
 DISTNAME=		ispman-0.5
@@ -11,7 +11,7 @@ MAINTAINER=		rh@netbsd.org
 HOMEPAGE=		http://www.ispman.org/
 COMMENT=		Perl module for ISPMan webAdministrator and command line utils
 
-DEPENDS+=		p5-CGI>=2.72:../../www/p5-CGI
+DEPENDS+=		{p5-CGI>=2.72,perl>=5.6.1nb2}:../../www/p5-CGI
 DEPENDS+=		p5-Text-Template>=1.23:../../textproc/p5-Text-Template
 DEPENDS+=		p5-perl-ldap>=0.22:../../databases/p5-perl-ldap
 DEPENDS+=		p5-IMAP-Admin>=1.2.5:../../mail/p5-IMAP-Admin
diff --git a/net/stripes/Makefile b/net/stripes/Makefile
index 12902c0049a..22b73cf2850 100644
--- a/net/stripes/Makefile
+++ b/net/stripes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/05/31 19:18:18 kim Exp $
+# $NetBSD: Makefile,v 1.4 2001/09/05 17:18:21 jlam Exp $
 #
 
 DISTNAME=		stripes-2.1
@@ -9,7 +9,7 @@ MAINTAINER=		kim@tac.nyc.ny.us
 HOMEPAGE=		http://www.gw.com/sw/stripes/
 COMMENT=		Looking Glass for Zebra and Cisco Routers
 
-DEPENDS+=		p5-CGI>=2.66:../../www/p5-CGI
+DEPENDS+=		{p5-CGI>=2.66,perl>=5.6.1nb2}:../../www/p5-CGI
 DEPENDS+=		p5-Net-Telnet>=3.02:../../net/p5-Net-Telnet
 
 USE_PERL5=		# defined
diff --git a/www/p5-CGI-Application/Makefile b/www/p5-CGI-Application/Makefile
index 0567dac69e6..189f76bdbf8 100644
--- a/www/p5-CGI-Application/Makefile
+++ b/www/p5-CGI-Application/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2001/02/17 17:22:20 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2001/09/05 17:18:21 jlam Exp $
 
 DISTNAME=		CGI-Application-1.2
 PKGNAME=		p5-${DISTNAME}
@@ -8,7 +8,7 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=CGI/}
 MAINTAINER=		jlam@netbsd.org
 COMMENT=		perl5 module to create sophisticated, reusable web-based applications
 
-DEPENDS+=		p5-CGI-[0-9]*:../../www/p5-CGI
+DEPENDS+=		{p5-CGI>=2.66,perl>=5.6.1nb2}:../../www/p5-CGI
 DEPENDS+=		p5-HTML-Template-*:../../www/p5-HTML-Template
 
 USE_PERL5=		# defined