pkgsrc changes:

  - Updating package for p5 module Perl::Critic from 1.098 to 1.100
  - removing options for recommended dependencies - require them all
  - Adding license (perl license)

Upstream changes:
[1.100] Released on 2009-07-17

    This is a POD fix release to deal with issues identified by Test::POD
    1.40.  There is no functional difference between this release and 1.098.
    This is the last release of Perl::Critic that will be compatible with PPI
    1.203.  PPI's parsing of for(each)? loops is changing in its next release
    in an incompatible manner and there will be a release in the near future
    to make Perl::Critic compatible with that change.

3 files changed, 15 insertions, 34 deletions

diff --git a/devel/p5-Perl-Critic/Makefile b/devel/p5-Perl-Critic/Makefile
index bf39891b5b2..5b40f14d0aa 100644
--- a/devel/p5-Perl-Critic/Makefile
+++ b/devel/p5-Perl-Critic/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2009/03/10 17:59:46 sno Exp $
+# $NetBSD: Makefile,v 1.9 2009/07/20 09:49:42 sno Exp $
 #
 
-DISTNAME=	Perl-Critic-1.098
+DISTNAME=	Perl-Critic-1.100
 PKGNAME=	p5-${DISTNAME}
 #PKGNAME=	p5-${DISTNAME:C/0[0-9][0-9]$/.&/}
 CATEGORIES=	devel perl5
@@ -10,6 +10,7 @@ MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Perl/}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/Perl-Critic/
 COMMENT=	Perl 5 module providing a static Perl source code analysis engine
+LICENSE=	${PERL5_LICENSE}
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -18,13 +19,19 @@ DEPENDS+=	p5-Config-Tiny>=2:../../devel/p5-Config-Tiny
 DEPENDS+=	p5-Exception-Class>=1.23:../../devel/p5-Exception-Class
 DEPENDS+=	p5-IO-String-[0-9]*:../../devel/p5-IO-String
 DEPENDS+=	p5-List-MoreUtils-[0-9]*:../../devel/p5-List-MoreUtils
-DEPENDS+=	p5-Module-Pluggable>=3.1:../../devel/p5-Module-Pluggable
+DEPENDS+=	{perl>=5.10,p5-Module-Pluggable>=3.1}:../../devel/p5-Module-Pluggable
 DEPENDS+=	p5-PPI>=1.203:../../devel/p5-PPI
 DEPENDS+=	p5-Readonly>=1.03:../../devel/p5-Readonly
 DEPENDS+=	p5-String-Format>=1.13:../../devel/p5-String-Format
 DEPENDS+=	p5-version-[0-9]*:../../devel/p5-version
 
-.include "options.mk"
+# Recommended dependencies
+DEPENDS+=	p5-File-HomeDir>=0:../../devel/p5-File-HomeDir
+DEPENDS+=	p5-File-Which>=0:../../devel/p5-File-Which
+DEPENDS+=	p5-Perl-Tidy>=0:../../devel/p5-Perl-Tidy
+DEPENDS+=	p5-Pod-Spell>=1:../../textproc/p5-Pod-Spell
+DEPENDS+=	p5-Readonly-XS>=0:../../devel/p5-Readonly-XS
+DEPENDS+=	p5-Regexp-Parser>=0.20:../../devel/p5-Regexp-Parser
 
 USE_LANGUAGES=	# empty
 PERL5_PACKLIST=	auto/Perl/Critic/.packlist
diff --git a/devel/p5-Perl-Critic/distinfo b/devel/p5-Perl-Critic/distinfo
index 533f3f3156b..820c340185e 100644
--- a/devel/p5-Perl-Critic/distinfo
+++ b/devel/p5-Perl-Critic/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.5 2009/03/10 17:59:46 sno Exp $
+$NetBSD: distinfo,v 1.6 2009/07/20 09:49:42 sno Exp $
 
-SHA1 (Perl-Critic-1.098.tar.gz) = 8ccb7cfc8529808ea74bce82ed80e6677f09ca17
-RMD160 (Perl-Critic-1.098.tar.gz) = f550f603588ee4dff32e96ef990c4b82e834932c
-Size (Perl-Critic-1.098.tar.gz) = 425245 bytes
+SHA1 (Perl-Critic-1.100.tar.gz) = 4022934daa7c7859e17a2bb244c9f6365fac2538
+RMD160 (Perl-Critic-1.100.tar.gz) = 4edf110d3f250292d226ba3f1aa720b6f70d3a60
+Size (Perl-Critic-1.100.tar.gz) = 533699 bytes
diff --git a/devel/p5-Perl-Critic/options.mk b/devel/p5-Perl-Critic/options.mk
deleted file mode 100644
index ba4fb029f5b..00000000000
--- a/devel/p5-Perl-Critic/options.mk
+++ /dev/null
@@ -1,26 +0,0 @@
-# $NetBSD: options.mk,v 1.2 2009/06/13 06:46:46 rillig Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.p5-Perl-Critic
-PKG_SUPPORTED_OPTIONS=	file-homedir file-which perl-tidy pod-spell readonly-xs regexp-parser
-PKG_SUGGESTED_OPTIONS=	pod-spell readonly-xs regexp-parser
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mfile-homedir)
-DEPENDS+=	p5-File-HomeDir>=0:../../devel/p5-File-HomeDir
-.endif
-.if !empty(PKG_OPTIONS:Mfile-which)
-DEPENDS+=	p5-File-Which>=0:../../devel/p5-File-Which
-.endif
-.if !empty(PKG_OPTIONS:Mperl-tidy)
-DEPENDS+=	p5-Perl-Tidy>=0:../../devel/p5-Perl-Tidy
-.endif
-.if !empty(PKG_OPTIONS:Mpod-spell)
-DEPENDS+=	p5-Pod-Spell>=1:../../textproc/p5-Pod-Spell
-.endif
-.if !empty(PKG_OPTIONS:Mreadonly-xs)
-DEPENDS+=	p5-Readonly-XS>=0:../../devel/p5-Readonly-XS
-.endif
-.if !empty(PKG_OPTIONS:Mregexp-parser)
-DEPENDS+=	p5-Regexp-Parser>=0.20:../../devel/p5-Regexp-Parser
-.endif