Replacing some dependencies to choose perl core first, because desired

version numbers of required modules are in delivered perl core.

9 files changed, 21 insertions, 21 deletions

diff --git a/mail/fetchyahoo/Makefile b/mail/fetchyahoo/Makefile
index eaacbd3dd88..ebde7b42ba2 100644
--- a/mail/fetchyahoo/Makefile
+++ b/mail/fetchyahoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/04/07 17:07:45 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2009/06/01 19:38:56 sno Exp $
 #
 
 DISTNAME=		fetchyahoo-2.11.0
@@ -14,7 +14,7 @@ COMMENT=		Download mails from Yahoo webmail into mbox
 DEPENDS+=		p5-libwww-[0-9]*:../../www/p5-libwww
 DEPENDS+=		p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser
 DEPENDS+=		p5-MIME-tools-[0-9]*:../../mail/p5-MIME-tools
-DEPENDS+=		p5-Net-[0-9]*:../../net/p5-Net
+DEPENDS+=		{perl>=5.10,p5-Net-[0-9]*}:../../net/p5-Net
 DEPENDS+=		p5-Crypt-SSLeay-[0-9]*:../../security/p5-Crypt-SSLeay
 DEPENDS+=		p5-URI-[0-9]*:../../www/p5-URI
 DEPENDS+=		p5-MailTools-[0-9]*:../../mail/p5-MailTools
diff --git a/mail/p5-Email-Sender/Makefile b/mail/p5-Email-Sender/Makefile
index f079da189ee..a93e57fe709 100644
--- a/mail/p5-Email-Sender/Makefile
+++ b/mail/p5-Email-Sender/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/04/12 12:46:05 sno Exp $
+# $NetBSD: Makefile,v 1.4 2009/06/01 19:38:57 sno Exp $
 
 DISTNAME=	Email-Sender-0.004
 PKGNAME=	p5-${DISTNAME}
@@ -19,7 +19,7 @@ DEPENDS+=	p5-Email-Address>=0:../../mail/p5-Email-Address
 DEPENDS+=	p5-Email-Simple>=1.998:../../mail/p5-Email-Simple
 DEPENDS+=	p5-List-MoreUtils>=0:../../devel/p5-List-MoreUtils
 DEPENDS+=	p5-Moose-[0-9]*:../../devel/p5-Moose
-DEPENDS+=	p5-Net-[0-9]*:../../net/p5-Net
+DEPENDS+=	{perl>=5.10,p5-Net-[0-9]*}:../../net/p5-Net
 DEPENDS+=	p5-Sys-Hostname-Long>=0:../../sysutils/p5-Sys-Hostname-Long
 
 PERL5_REQD+=	5.8.0
diff --git a/mail/p5-Mail-Audit/Makefile b/mail/p5-Mail-Audit/Makefile
index 3717bf67e16..0b387adb045 100644
--- a/mail/p5-Mail-Audit/Makefile
+++ b/mail/p5-Mail-Audit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2008/10/19 19:18:12 he Exp $
+# $NetBSD: Makefile,v 1.22 2009/06/01 19:38:57 sno Exp $
 
 DISTNAME=	Mail-Audit-2.223
 PKGNAME=	p5-${DISTNAME}
@@ -20,7 +20,7 @@ DEPENDS+=	p5-MailTools-[0-9]*:../../mail/p5-MailTools
 # Needs MIME::Entity from p5-MIME-tools.
 DEPENDS+=	p5-MIME-tools-[0-9]*:../../mail/p5-MIME-tools
 # Needs Net::SMTP from p5-Net.
-DEPENDS+=	p5-Net>=1.0:../../net/p5-Net
+DEPENDS+=	{perl>=5.10,p5-Net>=1.0}:../../net/p5-Net
 
 PERL5_PACKLIST=		auto/Mail/Audit/.packlist
 
diff --git a/mail/p5-MailTools/Makefile b/mail/p5-MailTools/Makefile
index 60d9d085c34..29da559b703 100644
--- a/mail/p5-MailTools/Makefile
+++ b/mail/p5-MailTools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2008/10/19 19:18:20 he Exp $
+# $NetBSD: Makefile,v 1.46 2009/06/01 19:38:57 sno Exp $
 
 DISTNAME=	MailTools-2.04
 PKGNAME=	p5-${DISTNAME}
@@ -14,7 +14,7 @@ COMMENT=	Perl5 modules related to mail applications
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-BUILD_DEPENDS+=	p5-Net>=1.09:../../net/p5-Net
+BUILD_DEPENDS+=	{perl>=5.10,p5-Net>=1.09}:../../net/p5-Net
 DEPENDS+=	p5-TimeDate-[0-9]*:../../time/p5-TimeDate
 # just needed for tests
 #DEPENDS+=	p5-Test-Pod-[0-9]*:../../devel/p5-Test-Pod
diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index 7fa4962afcc..b390401e3cf 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2008/12/20 19:02:12 bouyer Exp $
+# $NetBSD: Makefile,v 1.39 2009/06/01 19:38:57 sno Exp $
 #
 
 DISTNAME=	sympa-5.4.4
@@ -19,13 +19,13 @@ DEPENDS+=	p5-IO-stringy>=1.0:../../devel/p5-IO-stringy
 DEPENDS+=	mhonarc-[0-9]*:../../mail/mhonarc
 DEPENDS+=	p5-MIME-tools>=5.209:../../mail/p5-MIME-tools
 DEPENDS+=	p5-MailTools>=1.51:../../mail/p5-MailTools
-DEPENDS+=	p5-Net>=1.0:../../net/p5-Net
+DEPENDS+=	{perl>=5.10,p5-Net>=1.0}:../../net/p5-Net
 DEPENDS+=	p5-SOAP-Lite-[0-9]*:../../net/p5-SOAP-Lite
 DEPENDS+=	p5-Crypt-CipherSaber>=0.50:../../security/p5-Crypt-CipherSaber
-DEPENDS+=	p5-Digest-MD5>=2.00:../../security/p5-Digest-MD5
+DEPENDS+=	{perl>=5.10,p5-Digest-MD5>=2.00]:../../security/p5-Digest-MD5
 DEPENDS+=	p5-IO-Socket-SSL>=0.90:../../security/p5-IO-Socket-SSL
 DEPENDS+=	p5-Net-SSLeay>=1.16:../../security/p5-Net-SSLeay
-DEPENDS+=	p5-CGI>=2.52:../../www/p5-CGI
+DEPENDS+=	{perl>=5.10,p5-CGI>=2.52}:../../www/p5-CGI
 DEPENDS+=	p5-FCGI>=0.67:../../www/p5-FCGI
 DEPENDS+=	p5-libwww>=1.09:../../www/p5-libwww
 DEPENDS+=	p5-Locale-libintl>=1.16:../../misc/p5-Locale-libintl
@@ -33,7 +33,7 @@ DEPENDS+=	p5-XML-LibXML>=1.61:../../textproc/p5-XML-LibXML
 DEPENDS+=	p5-Regexp-Common>=2.120:../../textproc/p5-Regexp-Common
 DEPENDS+=	p5-HTML-StripScripts-Parser>=1.02:../../www/p5-HTML-StripScripts-Parser
 DEPENDS+=	p5-MIME-EncWords>=1.010.101:../../mail/p5-MIME-EncWords
-DEPENDS.SunOS+=	p5-DB_File>=1.75:../../databases/p5-DB_File
+DEPENDS.SunOS+=	{perl>=5.10,p5-DB_File>=1.75}:../../databases/p5-DB_File
 
 OPSYSVARS+=	DEPENDS
 
diff --git a/net/p5-SOAP-Lite/Makefile b/net/p5-SOAP-Lite/Makefile
index 2b05a667694..23fd2b4dce8 100644
--- a/net/p5-SOAP-Lite/Makefile
+++ b/net/p5-SOAP-Lite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2009/04/11 23:15:20 sno Exp $
+# $NetBSD: Makefile,v 1.26 2009/06/01 19:38:57 sno Exp $
 #
 
 DISTNAME=	SOAP-Lite-0.710.08
@@ -20,7 +20,7 @@ DEPENDS+=	p5-IO-Socket-SSL>=0:../../security/p5-IO-Socket-SSL
 DEPENDS+=	p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
 DEPENDS+=	p5-MIME-Lite>=0:../../mail/p5-MIME-Lite
 DEPENDS+=	p5-MIME-tools>=0:../../mail/p5-MIME-tools
-DEPENDS+=	p5-Net>=0:../../net/p5-Net
+DEPENDS+=	{perl>=5.10,p5-Net>=0}:../../net/p5-Net
 DEPENDS+=	p5-URI-[0-9]*:../../www/p5-URI
 DEPENDS+=	{perl>=5.10.0,p5-version>=0}:../../devel/p5-version
 DEPENDS+=	p5-XML-Parser>=2.23:../../textproc/p5-XML-Parser
diff --git a/security/amavis-perl/Makefile b/security/amavis-perl/Makefile
index 38243b4a1f3..32687c2428f 100644
--- a/security/amavis-perl/Makefile
+++ b/security/amavis-perl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2009/04/11 23:15:21 sno Exp $
+# $NetBSD: Makefile,v 1.28 2009/06/01 19:38:57 sno Exp $
 
 DISTNAME=	amavisd-${VERSION}
 PKGNAME=	amavis-perl-${VERSION}
@@ -33,7 +33,7 @@ DEPENDS+=	p5-IO-Compress-[0-9]*:../../devel/p5-IO-Compress
 DEPENDS+=	p5-Convert-TNEF-[0-9]*:../../converters/p5-Convert-TNEF
 DEPENDS+=	p5-Convert-UUlib-[0-9]*:../../converters/p5-Convert-UUlib
 DEPENDS+=	p5-MIME-tools>=5.313:../../mail/p5-MIME-tools
-DEPENDS+=	p5-Net-[0-9]*:../../net/p5-Net
+DEPENDS+=	{perl>=5.10,p5-Net-[0-9]*}:../../net/p5-Net
 DEPENDS+=	p5-Unix-Syslog-[0-9]*:../../sysutils/p5-Unix-Syslog
 
 .include "options.mk"
diff --git a/www/checkbot/Makefile b/www/checkbot/Makefile
index 2b20ac4a29e..355e8222a9f 100644
--- a/www/checkbot/Makefile
+++ b/www/checkbot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2008/10/19 19:19:01 he Exp $
+# $NetBSD: Makefile,v 1.28 2009/06/01 19:38:57 sno Exp $
 #
 
 DISTNAME=	checkbot-1.79
@@ -11,7 +11,7 @@ HOMEPAGE=	http://degraaff.org/checkbot/
 COMMENT=	Verify links on a set of HTML pages
 
 DEPENDS+=	p5-MailTools>=1.03:../../mail/p5-MailTools
-DEPENDS+=	p5-Net-[0-9]*:../../net/p5-Net
+DEPENDS+=	{perl>=5.10,p5-Net-[0-9]*}:../../net/p5-Net
 DEPENDS+=	p5-Time-Duration-[0-9]*:../../time/p5-Time-Duration
 DEPENDS+=	p5-URI>=1.10:../../www/p5-URI
 DEPENDS+=	p5-libwww>=5.76:../../www/p5-libwww
diff --git a/www/p5-libwww/Makefile b/www/p5-libwww/Makefile
index ffd43e9cef7..b102c4497e8 100644
--- a/www/p5-libwww/Makefile
+++ b/www/p5-libwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2009/04/29 07:39:37 sno Exp $
+# $NetBSD: Makefile,v 1.70 2009/06/01 19:38:57 sno Exp $
 
 DISTNAME=	libwww-perl-5.826
 PKGNAME=	p5-${DISTNAME:S/-perl-/-/}
@@ -20,7 +20,7 @@ DEPENDS+=	p5-HTML-Parser>=3.33:../../www/p5-HTML-Parser
 DEPENDS+=	p5-HTML-Tagset-[0-9]*:../../www/p5-HTML-Tagset
 DEPENDS+=	p5-IO-Socket-SSL-[0-9]*:../../security/p5-IO-Socket-SSL
 DEPENDS+=	p5-MIME-Base64>=2.1:../../converters/p5-MIME-Base64
-DEPENDS+=	p5-Net>=1.09:../../net/p5-Net		# for Net::FTP>=2.58
+DEPENDS+=	{perl>=5.10,p5-Net>=1.09}:../../net/p5-Net		# for Net::FTP>=2.58
 DEPENDS+=	p5-URI>=1.10:../../www/p5-URI
 
 USE_LANGUAGES=		# empty