Modify dependencies to perl-modules which are deployed with the perl-core,

mainly Scalar::Util and List::Util

24 files changed, 57 insertions, 57 deletions

diff --git a/databases/p5-DBIx-Class-Schema-Loader/Makefile b/databases/p5-DBIx-Class-Schema-Loader/Makefile
index 7e8a0bf3688..a315d1eb018 100644
--- a/databases/p5-DBIx-Class-Schema-Loader/Makefile
+++ b/databases/p5-DBIx-Class-Schema-Loader/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/10/19 19:17:44 he Exp $
+# $NetBSD: Makefile,v 1.3 2009/04/24 17:15:21 sno Exp $
 
 DISTNAME=	DBIx-Class-Schema-Loader-0.04005
 PKGNAME=	p5-${DISTNAME}
@@ -23,8 +23,8 @@ DEPENDS+=	p5-DBD-SQLite>=1.12:../../databases/p5-DBD-SQLite
 DEPENDS+=	p5-Carp-Clan>=0:../../devel/p5-Carp-Clan
 DEPENDS+=	p5-DBIx-Class>=0.06003:../../databases/p5-DBIx-Class
 DEPENDS+=	p5-Data-Dump>=1.06:../../devel/p5-Data-Dump
-DEPENDS+=	p5-PathTools>=0:../../devel/p5-PathTools
-DEPENDS+=	p5-Scalar-List-Utils>=0:../../devel/p5-Scalar-List-Utils
+DEPENDS+=	{perl>=5.10,p5-PathTools>=0}:../../devel/p5-PathTools
+DEPENDS+=	{perl>=5.10,p5-Scalar-List-Utils>=0}:../../devel/p5-Scalar-List-Utils
 DEPENDS+=	p5-Class-Inspector>=0:../../devel/p5-Class-Inspector
 
 # Avoid complaints if we do not have DB2, Oracle, Pg and mysql
diff --git a/databases/p5-Rose-DBx-Garden-Catalyst/Makefile b/databases/p5-Rose-DBx-Garden-Catalyst/Makefile
index cbbab3abcd5..7816863d6f0 100644
--- a/databases/p5-Rose-DBx-Garden-Catalyst/Makefile
+++ b/databases/p5-Rose-DBx-Garden-Catalyst/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/03/28 17:01:05 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2009/04/24 17:15:21 sno Exp $
 
 DISTNAME=	Rose-DBx-Garden-Catalyst-0.13
 PKGNAME=	p5-${DISTNAME}
@@ -31,11 +31,11 @@ DEPENDS+=	p5-Catalyst-View-TT>=0:../../www/p5-Catalyst-View-TT
 DEPENDS+=	p5-CatalystX-CRUD>=0:../../databases/p5-CatalystX-CRUD
 DEPENDS+=	p5-CatalystX-CRUD-Model-RDBO>=0.16:../../databases/p5-CatalystX-CRUD-Model-RDBO
 DEPENDS+=	p5-CatalystX-CRUD-Controller-RHTMLO>=0.10:../../www/p5-CatalystX-CRUD-Controller-RHTMLO
-DEPENDS+=	p5-Scalar-List-Utils>=0:../../devel/p5-Scalar-List-Utils
+DEPENDS+=	{perl>=5.10,p5-Scalar-List-Utils>=0}:../../devel/p5-Scalar-List-Utils
 
 # For tests:
 BUILD_DEPENDS+=	sqlite3>=0:../../databases/sqlite3
-BUILD_DEPENDS+=	p5-IPC-Cmd>=0:../../devel/p5-IPC-Cmd
+BUILD_DEPENDS+=	{perl>5.10,p5-IPC-Cmd>=0}:../../devel/p5-IPC-Cmd
 
 SUBST_CLASSES+=	sqlite3
 SUBST_MESSAGE.sqlite3=	Fixing sqlite3-using test
diff --git a/databases/p5-SQL-Abstract/Makefile b/databases/p5-SQL-Abstract/Makefile
index 64944e26290..b30d16f844c 100644
--- a/databases/p5-SQL-Abstract/Makefile
+++ b/databases/p5-SQL-Abstract/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2009/04/10 09:43:22 abs Exp $
+# $NetBSD: Makefile,v 1.11 2009/04/24 17:15:21 sno Exp $
 #
 
 DISTNAME=	SQL-Abstract-1.51
@@ -13,8 +13,8 @@ COMMENT=	Generate SQL from Perl data structures
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	p5-Scalar-List-Utils>0:../../devel/p5-Scalar-List-Utils
-BUILD_DEPENDS+=	p5-Test-Simple>0:../../devel/p5-Test-Simple
+DEPENDS+=	{perl>=5.10,p5-Scalar-List-Utils>=0}:../../devel/p5-Scalar-List-Utils
+BUILD_DEPENDS+=	{perl>=5.10,p5-Test-Simple>0}:../../devel/p5-Test-Simple
 BUILD_DEPENDS+=	p5-Test-Exception-[0-9]*:../../devel/p5-Test-Exception
 BUILD_DEPENDS+=	p5-Test-Warn-[0-9]*:../../devel/p5-Test-Warn
 BUILD_DEPENDS+=	p5-Test-Deep-[0-9]*:../../devel/p5-Test-Deep
diff --git a/devel/p5-Class-Accessor-Grouped/Makefile b/devel/p5-Class-Accessor-Grouped/Makefile
index 6ee583163e2..d91b4f92686 100644
--- a/devel/p5-Class-Accessor-Grouped/Makefile
+++ b/devel/p5-Class-Accessor-Grouped/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/04/10 09:46:18 abs Exp $
+# $NetBSD: Makefile,v 1.5 2009/04/24 17:15:21 sno Exp $
 
 DISTNAME=	Class-Accessor-Grouped-0.08003
 PKGNAME=	p5-${DISTNAME}
@@ -9,7 +9,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/Class-Accessor-Grouped/
 COMMENT=	Lets you build groups of accessors
 
-DEPENDS+=	p5-Scalar-List-Utils>=0:../../devel/p5-Scalar-List-Utils
+DEPENDS+=	{perl>=5.10,p5-Scalar-List-Utils-[0-9]*}:../../devel/p5-Scalar-List-Utils
 DEPENDS+=	p5-MRO-Compat>=0:../../devel/p5-MRO-Compat
 DEPENDS+=	p5-Class-Inspector>=0:../../devel/p5-Class-Inspector
 
diff --git a/devel/p5-Class-Autouse/Makefile b/devel/p5-Class-Autouse/Makefile
index 170d94bc06f..92af066afca 100644
--- a/devel/p5-Class-Autouse/Makefile
+++ b/devel/p5-Class-Autouse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2008/10/19 19:17:48 he Exp $
+# $NetBSD: Makefile,v 1.15 2009/04/24 17:15:22 sno Exp $
 
 DISTNAME=	Class-Autouse-1.29
 PKGNAME=	p5-${DISTNAME}
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=	p5-ExtUtils-AutoInstall>=0.61:../../devel/p5-ExtUtils-AutoInstall
-DEPENDS+=	p5-Scalar-List-Utils>=1.19:../../devel/p5-Scalar-List-Utils
+DEPENDS+=	{perl>=5.10,p5-Scalar-List-Utils>=1.19}:../../devel/p5-Scalar-List-Utils
 
 PERL5_PACKLIST=		auto/Class/Autouse/.packlist
 
diff --git a/devel/p5-Class-C3/Makefile b/devel/p5-Class-C3/Makefile
index 0bcf2d771ba..38172efc591 100644
--- a/devel/p5-Class-C3/Makefile
+++ b/devel/p5-Class-C3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/04/12 10:53:33 he Exp $
+# $NetBSD: Makefile,v 1.5 2009/04/24 17:15:22 sno Exp $
 
 DISTNAME=	Class-C3-0.21
 PKGNAME=	p5-${DISTNAME}
@@ -9,8 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/Class-C3/
 COMMENT=	Pragma to use the C3 method resolution order algortihm
 
+DEPENDS+=	{perl>=5.10,p5-Scalar-List-Utils>=1.10}:../../devel/p5-Scalar-List-Utils
 DEPENDS+=	p5-Test-Exception>=0.15:../../devel/p5-Test-Exception
-DEPENDS+=	p5-Scalar-List-Utils>=1.10:../../devel/p5-Scalar-List-Utils
 DEPENDS+=	p5-Algorithm-C3>=0.05:../../devel/p5-Algorithm-C3
 DEPENDS+=	p5-Class-C3-XS>=0.08:../../devel/p5-Class-C3-XS
 
diff --git a/devel/p5-Class-Container/Makefile b/devel/p5-Class-Container/Makefile
index 6c4c6316840..b7f3ddb1e5a 100644
--- a/devel/p5-Class-Container/Makefile
+++ b/devel/p5-Class-Container/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/10/19 19:17:48 he Exp $
+# $NetBSD: Makefile,v 1.14 2009/04/24 17:15:22 sno Exp $
 
 DISTNAME=	Class-Container-0.12
 PKGNAME=	p5-${DISTNAME}
@@ -15,7 +15,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 DEPENDS+=	p5-Params-Validate>=0.23:../../devel/p5-Params-Validate
-DEPENDS+=	p5-Scalar-List-Utils-[0-9]*:../../devel/p5-Scalar-List-Utils
+DEPENDS+=	{perl>=5.10,p5-Scalar-List-Utils-[0-9]*}:../../devel/p5-Scalar-List-Utils
 
 USE_LANGUAGES=		# none
 PERL5_MODULE_TYPE=	Module::Build
diff --git a/devel/p5-Object-Realize-Later/Makefile b/devel/p5-Object-Realize-Later/Makefile
index 7c6fb71578b..68b20abf0d8 100644
--- a/devel/p5-Object-Realize-Later/Makefile
+++ b/devel/p5-Object-Realize-Later/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2008/10/19 19:17:57 he Exp $
+# $NetBSD: Makefile,v 1.9 2009/04/24 17:15:22 sno Exp $
 
 DISTNAME=	Object-Realize-Later-0.18
 PKGNAME=	p5-${DISTNAME}
@@ -10,7 +10,7 @@ MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/Object-Realize-Later/
 COMMENT=	Delayed creation of objects
 
-DEPENDS+=	p5-Scalar-List-Utils-[0-9]*:../../devel/p5-Scalar-List-Utils
+DEPENDS+=	{perl>=5.10,p5-Scalar-List-Utils-[0-9]*}:../../devel/p5-Scalar-List-Utils
 BUILD_DEPENDS+=	p5-Test-Pod>=1.00:../../devel/p5-Test-Pod
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/devel/p5-PathTools/Makefile b/devel/p5-PathTools/Makefile
index f4bea7ec0e1..028c99a595b 100644
--- a/devel/p5-PathTools/Makefile
+++ b/devel/p5-PathTools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/02/22 18:09:24 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2009/04/24 17:15:22 sno Exp $
 
 DISTNAME=	PathTools-3.29
 PKGNAME=	p5-${DISTNAME}
@@ -11,7 +11,7 @@ COMMENT=	Perl module for portably manipulating file specifications
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	p5-Scalar-List-Utils>=1.14:../../devel/p5-Scalar-List-Utils
+DEPENDS+=	{perl>=5.10,p5-Scalar-List-Utils>=1.14}:../../devel/p5-Scalar-List-Utils
 
 CONFLICTS+=	p5-File-Spec-[0-9]*
 
diff --git a/devel/p5-Test-MockObject/Makefile b/devel/p5-Test-MockObject/Makefile
index 1132acf0b21..ee54030b264 100644
--- a/devel/p5-Test-MockObject/Makefile
+++ b/devel/p5-Test-MockObject/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/10/19 19:18:01 he Exp $
+# $NetBSD: Makefile,v 1.4 2009/04/24 17:15:22 sno Exp $
 
 DISTNAME=	Test-MockObject-1.09
 PKGNAME=	p5-${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT=	Tests remote URLs or local web files
 
 DEPENDS+=	p5-UNIVERSAL-can>=1.00:../../devel/p5-UNIVERSAL-can
 DEPENDS+=	p5-UNIVERSAL-isa>=0.02:../../devel/p5-UNIVERSAL-isa
-BUILD_DEPENDS+=	p5-Scalar-List-Utils>=0:../../devel/p5-Scalar-List-Utils
+BUILD_DEPENDS+=	{perl>=5.10,p5-Scalar-List-Utils-[0-9]*}:../../devel/p5-Scalar-List-Utils
 BUILD_DEPENDS+=	p5-Test-Exception>=0:../../devel/p5-Test-Exception
 BUILD_DEPENDS+=	p5-Test-Warn>=0:../../devel/p5-Test-Warn
 
diff --git a/devel/p5-Tree-Simple/Makefile b/devel/p5-Tree-Simple/Makefile
index dbc6ef2fcb7..1bb367b62fe 100644
--- a/devel/p5-Tree-Simple/Makefile
+++ b/devel/p5-Tree-Simple/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2008/10/19 19:18:09 he Exp $
+# $NetBSD: Makefile,v 1.13 2009/04/24 17:15:22 sno Exp $
 #
 
 DISTNAME=	Tree-Simple-1.18
@@ -11,7 +11,7 @@ MAINTAINER=	rhaen@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/Tree-Simple/
 COMMENT=	Simple extension to manipulate tree objects
 
-DEPENDS+=	p5-Scalar-List-Utils>=0.18:../../devel/p5-Scalar-List-Utils
+DEPENDS+=	{perl>=5.10,p5-Scalar-List-Utils>=1.18}:../../devel/p5-Scalar-List-Utils
 DEPENDS+=	p5-Test-Exception>=0.20:../../devel/p5-Test-Exception
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
diff --git a/devel/p5-UNIVERSAL-can/Makefile b/devel/p5-UNIVERSAL-can/Makefile
index 38ee6cac4f2..74565ff66ec 100644
--- a/devel/p5-UNIVERSAL-can/Makefile
+++ b/devel/p5-UNIVERSAL-can/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/10/19 19:18:09 he Exp $
+# $NetBSD: Makefile,v 1.3 2009/04/24 17:15:22 sno Exp $
 
 DISTNAME=	UNIVERSAL-can-1.12
 PKGNAME=	p5-${DISTNAME}
@@ -10,8 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/UNIVERSAL-can/
 COMMENT=	Hack around people calling UNIVERSAL::can() as a function
 
-DEPENDS+=	p5-Scalar-List-Utils>=0:../../devel/p5-Scalar-List-Utils
-BUILD_DEPENDS+=	p5-Test-Simple>=0.60:../../devel/p5-Test-Simple
+DEPENDS+=	{perl>=5.10,p5-Scalar-List-Utils>=0}:../../devel/p5-Scalar-List-Utils
+BUILD_DEPENDS+=	{perl>=5.10,p5-Test-Simple>=0.60}:../../devel/p5-Test-Simple
 
 USE_LANGUAGES=	# empty
 PERL5_PACKLIST= auto/UNIVERSAL/can/.packlist
diff --git a/finance/p5-Data-Currency/Makefile b/finance/p5-Data-Currency/Makefile
index 652bffe9354..efb15db73b2 100644
--- a/finance/p5-Data-Currency/Makefile
+++ b/finance/p5-Data-Currency/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/10/19 19:18:09 he Exp $
+# $NetBSD: Makefile,v 1.3 2009/04/24 17:15:22 sno Exp $
 
 DISTNAME=	Data-Currency-0.04002
 PKGNAME=	p5-${DISTNAME}
@@ -15,7 +15,7 @@ DEPENDS+=	p5-Class-Inspector>=0:../../devel/p5-Class-Inspector
 DEPENDS+=	p5-Finance-Currency-Convert-WebserviceX>=0.03:../../finance/p5-Finance-Currency-Convert-WebserviceX
 DEPENDS+=	p5-Locale-Codes>=2.07:../../misc/p5-Locale-Codes
 DEPENDS+=	p5-Locale-Currency-Format>=1.22:../../finance/p5-Locale-Currency-Format
-DEPENDS+=	p5-Scalar-List-Utils>=0:../../devel/p5-Scalar-List-Utils
+DEPENDS+=	{perl>=5.10,p5-Scalar-List-Utils>=0}:../../devel/p5-Scalar-List-Utils
 
 USE_LANGUAGES=	# empty
 PERL5_PACKLIST=	auto/Data/Currency/.packlist
diff --git a/mail/p5-Mail-Box/Makefile b/mail/p5-Mail-Box/Makefile
index 518fbb98292..002b36207ab 100644
--- a/mail/p5-Mail-Box/Makefile
+++ b/mail/p5-Mail-Box/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2009/01/04 20:11:45 adrianp Exp $
+# $NetBSD: Makefile,v 1.12 2009/04/24 17:15:23 sno Exp $
 
 DISTNAME=	Mail-Box-2.086
 PKGNAME=	p5-${DISTNAME}
@@ -12,17 +12,17 @@ COMMENT=	Set of packages which implement methods to handle e-mail
 DEPENDS+=	p5-Encode>=2.26:../../textproc/p5-Encode
 DEPENDS+=	p5-TimeDate-[0-9]*:../../time/p5-TimeDate
 DEPENDS+=	p5-IO-stringy-[0-9]*:../../devel/p5-IO-stringy
-DEPENDS+=	p5-Scalar-List-Utils>=1.13:../../devel/p5-Scalar-List-Utils
+DEPENDS+=	{perl>=5.10,p5-Scalar-List-Utils>=1.13}:../../devel/p5-Scalar-List-Utils
 DEPENDS+=	p5-Object-Realize-Later>=0.14:../../devel/p5-Object-Realize-Later
 DEPENDS+=	p5-MIME-Types>=1.004:../../mail/p5-MIME-Types
 DEPENDS+=	p5-URI>=1.23:../../www/p5-URI
-DEPENDS+=	p5-Test-Simple>=0.47:../../devel/p5-Test-Simple
+DEPENDS+=	{perl>=5.10,p5-Test-Simple>=0.47}:../../devel/p5-Test-Simple
 DEPENDS+=	p5-User-Identity>=0.07:../../mail/p5-User-Identity
 DEPENDS+=	p5-MailTools>=2.01:../../mail/p5-MailTools
 DEPENDS+=	p5-MIME-tools-[0-9]*:../../mail/p5-MIME-tools
 DEPENDS+=	p5-Digest-HMAC-[0-9]*:../../security/p5-Digest-HMAC
 DEPENDS+=	p5-File-Remove-[0-9]*:../../sysutils/p5-File-Remove
-DEPENDS+=	p5-Test-Harness>=2.62:../../devel/p5-Test-Harness
+DEPENDS+=	{perl>=5.10,p5-Test-Harness>=2.62}:../../devel/p5-Test-Harness
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/net/p5-eBay-API/Makefile b/net/p5-eBay-API/Makefile
index e0915a7971e..2e288ebf0e4 100644
--- a/net/p5-eBay-API/Makefile
+++ b/net/p5-eBay-API/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2009/04/11 23:15:20 sno Exp $
+# $NetBSD: Makefile,v 1.3 2009/04/24 17:15:23 sno Exp $
 
 DISTNAME=		eBay-API-0.25
 PKGNAME=		p5-${DISTNAME}
@@ -20,8 +20,8 @@ DEPENDS+=	p5-Exception-Class>=1.14:../../devel/p5-Exception-Class
 DEPENDS+=  	p5-libwww>=2:../../www/p5-libwww
 DEPENDS+=  	p5-ParallelUserAgent>=2.57:../../www/p5-ParallelUserAgent
 DEPENDS+=  	p5-Params-Validate>=0.74:../../devel/p5-Params-Validate
-DEPENDS+=  	p5-Scalar-List-Utils>=1.11:../../devel/p5-Scalar-List-Utils
-DEPENDS+=  	p5-Time-HiRes>=1.51:../../time/p5-Time-HiRes
+DEPENDS+=	{perl>=5.10,p5-Scalar-List-Utils>=1.11}:../../devel/p5-Scalar-List-Utils
+DEPENDS+=  	{perl>=5.10,p5-Time-HiRes>=1.51}:../../time/p5-Time-HiRes
 DEPENDS+=  	p5-XML-Simple>=2.09:../../textproc/p5-XML-Simple
 DEPENDS+=  	p5-XML-Tidy>=1.2.54:../../textproc/p5-XML-Tidy
 DEPENDS+=  	p5-XML-Writer>=0.600:../../textproc/p5-XML-Writer
diff --git a/textproc/p5-FormValidator-Simple/Makefile b/textproc/p5-FormValidator-Simple/Makefile
index 22706d4223a..7757bbc6e70 100644
--- a/textproc/p5-FormValidator-Simple/Makefile
+++ b/textproc/p5-FormValidator-Simple/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/10/19 19:18:54 he Exp $
+# $NetBSD: Makefile,v 1.4 2009/04/24 17:15:23 sno Exp $
 
 DISTNAME=	FormValidator-Simple-0.23
 PKGNAME=	p5-${DISTNAME}
@@ -21,7 +21,7 @@ DEPENDS+=	p5-Email-Valid-Loose>=0.04:../../mail/p5-Email-Valid-Loose
 DEPENDS+=	p5-Tie-IxHash>=1.21:../../devel/p5-Tie-IxHash
 DEPENDS+=	p5-YAML>=0.39:../../textproc/p5-YAML
 DEPENDS+=	p5-List-MoreUtils>=0.16:../../devel/p5-List-MoreUtils
-DEPENDS+=	p5-Scalar-List-Utils>=0:../../devel/p5-Scalar-List-Utils
+DEPENDS+=	{perl>=5.10,p5-Scalar-List-Utils>=0}:../../devel/p5-Scalar-List-Utils
 DEPENDS+=	p5-DateTime-Format-Strptime>=1.0700:../../time/p5-DateTime-Format-Strptime
 DEPENDS+=	p5-Date-Calc>=5.4:../../devel/p5-Date-Calc
 
diff --git a/textproc/p5-Text-WikiFormat/Makefile b/textproc/p5-Text-WikiFormat/Makefile
index 052ce9a53e0..d4930c100bc 100644
--- a/textproc/p5-Text-WikiFormat/Makefile
+++ b/textproc/p5-Text-WikiFormat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/10/19 19:18:57 he Exp $
+# $NetBSD: Makefile,v 1.12 2009/04/24 17:15:23 sno Exp $
 #
 
 DISTNAME=	Text-WikiFormat-0.79
@@ -14,7 +14,7 @@ COMMENT=	Translate Wiki formatted text into other formats
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 DEPENDS+=	p5-URI>=1.30:../../www/p5-URI
-DEPENDS+=	p5-Scalar-List-Utils>=1.14:../../devel/p5-Scalar-List-Utils
+DEPENDS+=	{perl>=5.10,p5-Scalar-List-Utils>=1.14}:../../devel/p5-Scalar-List-Utils
 
 PERL5_MODULE_TYPE=	Module::Build
 PERL5_PACKLIST=		auto/Text/WikiFormat/.packlist
diff --git a/time/p5-DateTimeX-Easy/Makefile b/time/p5-DateTimeX-Easy/Makefile
index b961d0e7f41..bcf91025d47 100644
--- a/time/p5-DateTimeX-Easy/Makefile
+++ b/time/p5-DateTimeX-Easy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/02/14 00:14:25 abs Exp $
+# $NetBSD: Makefile,v 1.2 2009/04/24 17:15:23 sno Exp $
 
 DISTNAME=	DateTimeX-Easy-0.085
 PKGNAME=	p5-${DISTNAME}
@@ -14,7 +14,7 @@ DEPENDS+=	p5-DateTime-Format-Natural>0:../../time/p5-DateTime-Format-Natural
 DEPENDS+=	p5-DateTime-Format-Flexible>0:../../time/p5-DateTime-Format-Flexible
 DEPENDS+=	p5-DateTime-Format-ICal>0:../../time/p5-DateTime-Format-ICal
 DEPENDS+=	p5-DateTime-Format-DateManip>0:../../time/p5-DateTime-Format-DateManip
-DEPENDS+=	p5-Scalar-List-Utils>=0:../../devel/p5-Scalar-List-Utils
+DEPENDS+=	{perl>=5.10,p5-Scalar-List-Utils-[0-9]*}:../../devel/p5-Scalar-List-Utils
 
 BUILD_DEPENDS+=	p5-Test-Most>0:../../devel/p5-Test-Most
 
diff --git a/www/p5-Catalyst-Component-InstancePerContext/Makefile b/www/p5-Catalyst-Component-InstancePerContext/Makefile
index dc98447fad6..c02c010a636 100644
--- a/www/p5-Catalyst-Component-InstancePerContext/Makefile
+++ b/www/p5-Catalyst-Component-InstancePerContext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/01/19 17:59:05 abs Exp $
+# $NetBSD: Makefile,v 1.2 2009/04/24 17:15:23 sno Exp $
 
 DISTNAME=	Catalyst-Component-InstancePerContext-0.001001
 PKGNAME=	p5-${DISTNAME}
@@ -11,7 +11,7 @@ COMMENT=	Return a new instance a component on each request
 
 DEPENDS+=	p5-Catalyst-Runtime>=0:../../www/p5-Catalyst-Runtime
 DEPENDS+=	p5-Moose>0:../../devel/p5-Moose
-DEPENDS+=	p5-Scalar-List-Utils>0:../../devel/p5-Scalar-List-Utils
+DEPENDS+=	{perl>=5.10,p5-Scalar-List-Utils-[0-9]*}:../../devel/p5-Scalar-List-Utils
 
 USE_LANGUAGES=	# empty
 PERL5_PACKLIST= auto/Catalyst/Component/InstancePerContext/.packlist
diff --git a/www/p5-Catalyst-Controller-FormBuilder/Makefile b/www/p5-Catalyst-Controller-FormBuilder/Makefile
index 953b014bae6..aacba027dc9 100644
--- a/www/p5-Catalyst-Controller-FormBuilder/Makefile
+++ b/www/p5-Catalyst-Controller-FormBuilder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/10/19 19:19:06 he Exp $
+# $NetBSD: Makefile,v 1.3 2009/04/24 17:15:23 sno Exp $
 
 DISTNAME=	Catalyst-Controller-FormBuilder-0.04
 PKGNAME=	p5-${DISTNAME}
@@ -17,7 +17,7 @@ DEPENDS+=	p5-Test-WWW-Mechanize-Catalyst>=0.37:../../www/p5-Test-WWW-Mechanize-C
 DEPENDS+=	p5-Tie-IxHash>=1.21:../../devel/p5-Tie-IxHash
 DEPENDS+=	p5-Class-Data-Inheritable>=0.04:../../devel/p5-Class-Data-Inheritable
 DEPENDS+=	p5-Class-Inspector>=1.13:../../devel/p5-Class-Inspector
-DEPENDS+=	p5-Scalar-List-Utils>=1.19:../../devel/p5-Scalar-List-Utils
+DEPENDS+=	{perl>=5.10,p5-Scalar-List-Utils>=1.19}:../../devel/p5-Scalar-List-Utils
 
 USE_LANGUAGES=	# empty
 PERL5_PACKLIST= auto/Catalyst/Controller/FormBuilder/.packlist
diff --git a/www/p5-Catalyst-Runtime/Makefile b/www/p5-Catalyst-Runtime/Makefile
index 0f6f17bb419..d98199b7ff3 100644
--- a/www/p5-Catalyst-Runtime/Makefile
+++ b/www/p5-Catalyst-Runtime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/11/10 22:51:47 rhaen Exp $
+# $NetBSD: Makefile,v 1.4 2009/04/24 17:15:23 sno Exp $
 
 DISTNAME=	Catalyst-Runtime-5.7015
 PKGNAME=	p5-${DISTNAME}
@@ -21,7 +21,7 @@ DEPENDS+=	p5-HTML-Parser>=0:../../www/p5-HTML-Parser
 DEPENDS+=	p5-HTTP-Body>=0.9:../../www/p5-HTTP-Body
 DEPENDS+=	p5-libwww>=5.805:../../www/p5-libwww
 DEPENDS+=	p5-HTTP-Request-AsCGI>=0.5:../../www/p5-HTTP-Request-AsCGI
-DEPENDS+=	p5-Module-Pluggable>=3.01:../../devel/p5-Module-Pluggable
+DEPENDS+=	{perl>=5.10,p5-Module-Pluggable>=3.01}:../../devel/p5-Module-Pluggable
 DEPENDS+=	p5-NEXT>=0:../../devel/p5-NEXT
 DEPENDS+=	p5-Path-Class>=0.09:../../devel/p5-Path-Class
 DEPENDS+=	p5-Scalar-List-Utils>=0:../../devel/p5-Scalar-List-Utils
diff --git a/www/p5-Catalyst-View-Mason/Makefile b/www/p5-Catalyst-View-Mason/Makefile
index ea3518d0e14..a2b9dab7615 100644
--- a/www/p5-Catalyst-View-Mason/Makefile
+++ b/www/p5-Catalyst-View-Mason/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/02/13 21:35:07 abs Exp $
+# $NetBSD: Makefile,v 1.2 2009/04/24 17:15:24 sno Exp $
 
 DISTNAME=	Catalyst-View-Mason-0.16
 PKGNAME=	p5-${DISTNAME}
@@ -11,7 +11,7 @@ COMMENT=	HTML::Mason view class for Catalyst
 
 DEPENDS+=	p5-Catalyst-Runtime>=5.50:../../www/p5-Catalyst-Runtime
 DEPENDS+=	p5-HTML-Mason>=0:../../www/p5-HTML-Mason
-DEPENDS+=	p5-Scalar-List-Utils>=0:../../devel/p5-Scalar-List-Utils
+DEPENDS+=	{perl>=5.10,p5-Scalar-List-Utils-[0-9]*}:../../devel/p5-Scalar-List-Utils
 
 USE_LANGUAGES=	# empty
 PERL5_PACKLIST= auto/Catalyst/View/Mason/.packlist
diff --git a/www/p5-Handel/Makefile b/www/p5-Handel/Makefile
index f483112ea26..881942816b0 100644
--- a/www/p5-Handel/Makefile
+++ b/www/p5-Handel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/04/24 08:25:32 sno Exp $
+# $NetBSD: Makefile,v 1.5 2009/04/24 17:15:23 sno Exp $
 
 DISTNAME=	Handel-1.00011
 PKGNAME=	p5-${DISTNAME}
@@ -21,15 +21,15 @@ DEPENDS+=	p5-Clone>=0.28:../../devel/p5-Clone
 DEPENDS+=	p5-Locale-Maketext>=1.06:../../misc/p5-Locale-Maketext
 DEPENDS+=	{perl>=5.10,p5-Module-Pluggable>=3.1}:../../devel/p5-Module-Pluggable
 DEPENDS+=	p5-Module-Starter>=1.42:../../devel/p5-Module-Starter
-DEPENDS+=	p5-Scalar-List-Utils>=0:../../devel/p5-Scalar-List-Utils
+DEPENDS+=	{perl>=5.10,p5-Scalar-List-Utils>=0}:../../devel/p5-Scalar-List-Utils
 DEPENDS+=	p5-DateTime>=0:../../time/p5-DateTime
 DEPENDS+=	p5-DateTime-Format-MySQL>=0:../../time/p5-DateTime-Format-MySQL
 DEPENDS+=	p5-Locale-Codes>=2.07:../../misc/p5-Locale-Codes
 DEPENDS+=	p5-Locale-Currency-Format>=1.22:../../finance/p5-Locale-Currency-Format
 DEPENDS+=	p5-FormValidator-Simple>=0.17:../../textproc/p5-FormValidator-Simple
 DEPENDS+=	p5-Finance-Currency-Convert-WebserviceX>=0.03:../../finance/p5-Finance-Currency-Convert-WebserviceX
-DEPENDS+=	p5-NEXT>=0:../../devel/p5-NEXT
-DEPENDS+=	p5-PathTools>=0:../../devel/p5-PathTools
+DEPENDS+=	{perl>=5.10,p5-NEXT>=0}:../../devel/p5-NEXT
+DEPENDS+=	{perl>=5.10,p5-PathTools>=0}:../../devel/p5-PathTools
 DEPENDS+=	p5-SQL-Translator>=0.08:../../databases/p5-SQL-Translator
 DEPENDS+=	p5-DBD-SQLite>=0:../../databases/p5-DBD-SQLite
 
diff --git a/www/p5-Rose-HTML-Objects/Makefile b/www/p5-Rose-HTML-Objects/Makefile
index 5e164a7f8be..5a9b04d0489 100644
--- a/www/p5-Rose-HTML-Objects/Makefile
+++ b/www/p5-Rose-HTML-Objects/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/01/13 00:02:22 he Exp $
+# $NetBSD: Makefile,v 1.6 2009/04/24 17:15:23 sno Exp $
 
 DISTNAME=	Rose-HTML-Objects-0.601
 PKGNAME=	p5-${DISTNAME}
@@ -16,7 +16,7 @@ DEPENDS+=	p5-Email-Valid>=0:../../mail/p5-Email-Valid
 DEPENDS+=	p5-HTML-Parser>=0:../../www/p5-HTML-Parser
 DEPENDS+=	p5-Image-Size>=0:../../graphics/p5-Image-Size
 DEPENDS+=	p5-URI>=0:../../www/p5-URI
-DEPENDS+=	p5-Scalar-List-Utils>=0:../../devel/p5-Scalar-List-Utils
+DEPENDS+=	{perl>=5.10,p5-Scalar-List-Utils>=0}:../../devel/p5-Scalar-List-Utils
 DEPENDS+=	p5-Rose-Object>=0.85.4:../../devel/p5-Rose-Object
 DEPENDS+=	p5-Rose-DateTime>=0.532:../../time/p5-Rose-DateTime
 DEPENDS+=	p5-Rose-URI>=0.021:../../www/p5-Rose-URI