Don't expect perl to provide p5-CGI, depend on the package instead.

Bump PKGREVISION.

p5-CGI will be removed from perl soon.

12 files changed, 38 insertions, 43 deletions

diff --git a/devel/bugzilla/Makefile b/devel/bugzilla/Makefile
index e3fc1e0d0f0..32e52c54b14 100644
--- a/devel/bugzilla/Makefile
+++ b/devel/bugzilla/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.40 2014/05/29 23:35:34 wiz Exp $
+# $NetBSD: Makefile,v 1.41 2014/05/31 12:22:42 wiz Exp $
 
 DISTNAME=	bugzilla-2.22.7
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	www devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA_ALL:=webtools/}
 
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.bugzilla.org/
 COMMENT=	Web based bug tracking system
 
 DEPENDS+=	p5-AppConfig>=1.52:../../devel/p5-AppConfig
-DEPENDS+=	{perl>=5.8.1,p5-CGI>=2.93}:../../www/p5-CGI
+DEPENDS+=	p5-CGI>=2.93:../../www/p5-CGI
 DEPENDS+=	p5-DBI>=1.38:../../databases/p5-DBI
 DEPENDS+=	{perl>=5.6.1,p5-File-Temp-[0-9]*}:../../devel/p5-File-Temp
 DEPENDS+=	p5-Template-Toolkit>=2.10:../../www/p5-Template-Toolkit
diff --git a/devel/bugzilla3/Makefile b/devel/bugzilla3/Makefile
index 883322910cc..bf464518a17 100644
--- a/devel/bugzilla3/Makefile
+++ b/devel/bugzilla3/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2014/05/29 23:35:34 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.22 2014/05/31 12:22:42 wiz Exp $
 
 DISTNAME=	bugzilla-3.2.4
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	www devel
 MASTER_SITES=	${MASTER_SITE_MOZILLA_ALL:=webtools/}
 
@@ -10,7 +9,7 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.bugzilla.org/
 COMMENT=	Web based bug tracking system
 
-DEPENDS+=	{perl>=5.8.9,p5-CGI>=3.21}:../../www/p5-CGI
+DEPENDS+=	p5-CGI>=3.21:../../www/p5-CGI
 DEPENDS+=	p5-DBI>=1.41:../../databases/p5-DBI
 DEPENDS+=	p5-Template-Toolkit>=2.15:../../www/p5-Template-Toolkit
 DEPENDS+=	p5-TimeDate>=1.16:../../time/p5-TimeDate
diff --git a/devel/bugzilla3/options.mk b/devel/bugzilla3/options.mk
index b60655832b0..735eaba4f9a 100644
--- a/devel/bugzilla3/options.mk
+++ b/devel/bugzilla3/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2013/12/09 14:17:42 obache Exp $
+# $NetBSD: options.mk,v 1.5 2014/05/31 12:22:42 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.bugzilla
 
@@ -55,7 +55,7 @@ DEPENDS+=	p5-HTML-Parser>=3.40:../../www/p5-HTML-Parser
 ### mod_perl
 ###
 .if !empty(PKG_OPTIONS:Mbugzilla-modperl)
-DEPENDS+=	{perl>=5.9.3,p5-CGI>=3.11}:../../www/p5-CGI
+DEPENDS+=	p5-CGI>=3.11:../../www/p5-CGI
 DEPENDS+=	p5-Apache-DBI>=0.96:../../databases/p5-Apache-DBI
 . if defined(PKG_APACHE)
 .  if !empty(PKG_APACHE:Mapache2)
diff --git a/devel/p5-RT-Authen-ExternalAuth/Makefile b/devel/p5-RT-Authen-ExternalAuth/Makefile
index 3294d4b92a4..7d2e1a23fca 100644
--- a/devel/p5-RT-Authen-ExternalAuth/Makefile
+++ b/devel/p5-RT-Authen-ExternalAuth/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2014/05/29 23:36:14 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2014/05/31 12:22:42 wiz Exp $
 
 DISTNAME=	RT-Authen-ExternalAuth-0.17
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=RT/}
 
@@ -11,10 +11,10 @@ HOMEPAGE=	http://search.cpan.org/dist/RT-Authen-ExternalAuth/
 COMMENT=	RT extension for external authentication methods
 LICENSE=	${PERL5_LICENSE}
 
-DEPENDS+=	p5-perl-ldap>=0:../../databases/p5-perl-ldap
-DEPENDS+=	{perl5>=5.004,p5-CGI>=0}:../../www/p5-CGI
-DEPENDS+=	p5-DBI>=0:../../databases/p5-DBI
-DEPENDS+=	p5-Net-SSLeay>=0:../../security/p5-Net-SSLeay
+DEPENDS+=	p5-perl-ldap-[0-9]*:../../databases/p5-perl-ldap
+DEPENDS+=	p5-CGI-[0-9]*:../../www/p5-CGI
+DEPENDS+=	p5-DBI-[0-9]*:../../databases/p5-DBI
+DEPENDS+=	p5-Net-SSLeay-[0-9]*:../../security/p5-Net-SSLeay
 
 PERL5_PACKLIST=		auto/RT/Authen/ExternalAuth/.packlist
 
diff --git a/devel/rt3/Makefile b/devel/rt3/Makefile
index d0b8e7562c1..b3830bb759b 100644
--- a/devel/rt3/Makefile
+++ b/devel/rt3/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2014/05/29 23:36:29 wiz Exp $
+# $NetBSD: Makefile,v 1.55 2014/05/31 12:22:42 wiz Exp $
 
 DISTNAME=		rt-3.8.17
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		devel
 MASTER_SITES=		http://download.bestpractical.com/pub/rt/release/
 
@@ -88,7 +88,7 @@ DEPENDS+=	p5-Apache-DBI>=0.92:../../databases/p5-Apache-DBI
 DEPENDS+=	p5-Apache-DBI>=0.92:../../databases/p5-Apache-DBI
 .elif !empty(PKG_OPTIONS:Mfastcgi)
 DEPENDS+=	p5-FCGI>=0.67:../../www/p5-FCGI
-DEPENDS+=	{perl>=5.10.1,p5-CGI>=3.38}:../../www/p5-CGI
+DEPENDS+=	p5-CGI>=3.38:../../www/p5-CGI
 .endif
 PLIST_VARS+=	speedycgi
 .if !empty(PKG_OPTIONS:Mspeedycgi)
diff --git a/devel/rt4/Makefile b/devel/rt4/Makefile
index b1cbfa92333..6d038073c9b 100644
--- a/devel/rt4/Makefile
+++ b/devel/rt4/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2014/05/29 23:36:29 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2014/05/31 12:22:42 wiz Exp $
 
 DISTNAME=	rt-4.2.1
 PKGNAME=	${DISTNAME:S/rt/rt4/}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://download.bestpractical.com/pub/rt/release/
 
@@ -14,7 +14,7 @@ LICENSE=	gnu-gpl-v2
 # Dependency info. from sbin/rt-test-dependencies
 # Core dependencies
 DEPENDS+=	p5-Apache-Session>=1.53:../../www/p5-Apache-Session
-DEPENDS+=	{perl>=5.004,p5-CGI>=3.38}:../../www/p5-CGI
+DEPENDS+=	p5-CGI>=3.38:../../www/p5-CGI
 # CGI::Cookie is a part of p5-CGI.
 DEPENDS+=	p5-CGI-Emulate-PSGI-[0-9]*:../../www/p5-CGI-Emulate-PSGI
 DEPENDS+=	p5-CGI-PSGI-[0-9]*:../../www/p5-CGI-PSGI
diff --git a/editors/p5-Padre/Makefile b/editors/p5-Padre/Makefile
index b30fefbc477..35a2cbaefae 100644
--- a/editors/p5-Padre/Makefile
+++ b/editors/p5-Padre/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.37 2014/05/29 23:36:31 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2014/05/31 12:22:42 wiz Exp $
 
 DISTNAME=	Padre-0.96
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	16
+PKGREVISION=	17
 CATEGORIES=	editors perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Padre/}
 
@@ -30,7 +30,7 @@ BUILD_DEPENDS+= p5-Test-Script>=1.07:../../devel/p5-Test-Script
 #DEPENDS+=	p5-ack>=1.86:../../textproc/p5-ack
 DEPENDS+=	p5-Algorithm-Diff>=1.1900:../../devel/p5-Algorithm-Diff
 DEPENDS+=	p5-App-cpanminus>=0.9923:../../devel/p5-App-cpanminus
-DEPENDS+=	{perl>=5.11.1,p5-CGI>=3.47}:../../www/p5-CGI
+DEPENDS+=	p5-CGI>=3.47:../../www/p5-CGI
 DEPENDS+=	p5-Capture-Tiny>=0.06:../../devel/p5-Capture-Tiny
 DEPENDS+=	p5-Class-Adapter>=1.05:../../devel/p5-Class-Adapter
 DEPENDS+=	p5-Class-Inspector>=1.22:../../devel/p5-Class-Inspector
diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index 5fec9c414cf..7a4333291b6 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.54 2014/05/29 23:36:52 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.55 2014/05/31 12:22:42 wiz Exp $
 
 DISTNAME=	sympa-6.1.11
-PKGREVISION=	7
+PKGREVISION=	8
 CATEGORIES=	mail
 MASTER_SITES=	http://www.sympa.org/distribution/ \
 		http://www.sympa.org/distribution/old/
@@ -17,7 +16,7 @@ PKG_DESTDIR_SUPPORT=	destdir
 DEPENDS+=	mhonarc-[0-9]*:../../mail/mhonarc
 DEPENDS+=	p5-Archive-Zip>=1.05:../../archivers/p5-Archive-Zip
 DEPENDS+=	p5-AuthCAS>=1.5:../../security/p5-AuthCAS
-DEPENDS+=	{perl>=5.10,p5-CGI>=2.52}:../../www/p5-CGI
+DEPENDS+=	p5-CGI>=2.52:../../www/p5-CGI
 DEPENDS+=	p5-Crypt-CipherSaber>=0.50:../../security/p5-Crypt-CipherSaber
 DEPENDS+=	p5-DBD-Sybase>=0.90:../../databases/p5-DBD-Sybase
 DEPENDS+=	p5-DBI>=1.06:../../databases/p5-DBI
diff --git a/net/stripes/Makefile b/net/stripes/Makefile
index 232c3beaa2b..0e4d6008851 100644
--- a/net/stripes/Makefile
+++ b/net/stripes/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2014/05/29 23:37:12 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.19 2014/05/31 12:22:42 wiz Exp $
 
 DISTNAME=		stripes-2.1
-PKGREVISION=		3
+PKGREVISION=		4
 CATEGORIES=		net
 MASTER_SITES=		# ftp://ftp.gw.com/sw/stripes/
 
@@ -10,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,perl>=5.6.1nb2}:../../www/p5-CGI
+DEPENDS+=		p5-CGI>=2.66:../../www/p5-CGI
 DEPENDS+=		p5-Net-Telnet>=3.02:../../net/p5-Net-Telnet
 
 PKG_SYSCONFSUBDIR?=	httpd
diff --git a/textproc/p5-Data-FormValidator/Makefile b/textproc/p5-Data-FormValidator/Makefile
index 0bd2d07acd8..787a180d694 100644
--- a/textproc/p5-Data-FormValidator/Makefile
+++ b/textproc/p5-Data-FormValidator/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2014/05/29 23:37:35 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2014/05/31 12:22:42 wiz Exp $
 
 DISTNAME=	Data-FormValidator-4.81
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	perl5 textproc
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Data/}
 
@@ -19,7 +19,7 @@ DEPENDS+=	p5-MIME-Types>=1.005:../../mail/p5-MIME-Types
 DEPENDS+=	p5-Perl6-Junction-[0-9]*:../../devel/p5-Perl6-Junction
 DEPENDS+=	p5-Regexp-Common-[0-9]*:../../textproc/p5-Regexp-Common
 
-BUILD_DEPENDS+=	{perl>=5.11.1,p5-CGI>=3.48}:../../www/p5-CGI
+BUILD_DEPENDS+=	p5-CGI>=3.48:../../www/p5-CGI
 
 PERL5_REQD+=	5.8.0
 
diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile
index 485f681aa95..780652ba030 100644
--- a/www/p5-Apache-Gallery/Makefile
+++ b/www/p5-Apache-Gallery/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.61 2014/05/29 23:37:59 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.62 2014/05/31 12:22:42 wiz Exp $
 
 DISTNAME=	Apache-Gallery-0.9.1
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	25
+PKGREVISION=	26
 SVR4_PKGNAME=	p5aga
 CATEGORIES=	www graphics perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Apache/}
@@ -13,7 +12,7 @@ HOMEPAGE=	http://apachegallery.dk/
 COMMENT=	Perl5/Apache module for handling image directories
 LICENSE=	artistic
 
-DEPENDS+=	{perl>=5.8.1,p5-CGI>=2.93}:../../www/p5-CGI
+DEPENDS+=	p5-CGI>=2.93:../../www/p5-CGI
 DEPENDS+=	p5-URI>=1.23:../../www/p5-URI
 DEPENDS+=	p5-Image-Imlib2-[0-9]*:../../graphics/p5-Image-Imlib2
 DEPENDS+=	p5-Image-Info>=1.15:../../graphics/p5-Image-Info
diff --git a/www/p5-Apache2-AuthCookie/Makefile b/www/p5-Apache2-AuthCookie/Makefile
index e17332fef93..32710d0d7c8 100644
--- a/www/p5-Apache2-AuthCookie/Makefile
+++ b/www/p5-Apache2-AuthCookie/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.10 2014/05/29 23:37:59 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.11 2014/05/31 12:22:42 wiz Exp $
 
 DISTNAME=	Apache-AuthCookie-3.18
 PKGNAME=	p5-${DISTNAME:S/Apache/Apache2/}
-PKGREVISION=	4
+PKGREVISION=	5
 CATEGORIES=	www perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Apache/}
 
@@ -12,7 +11,7 @@ HOMEPAGE=	http://search.cpan.org/dist/Apache-AuthCookie/
 COMMENT=	Perl5 module for Authentication and Authorization via cookies
 LICENSE=	${PERL5_LICENSE}
 
-DEPENDS+=	{perl>=5.8.8,p5-CGI>=3.12}:../../www/p5-CGI
+DEPENDS+=	p5-CGI>=3.12:../../www/p5-CGI
 
 PERL5_PACKLIST=		auto/Apache/AuthCookie/.packlist