Updating devel/p5-Module-Build from 0.35000 to 0.36010

pkgsrc changes:
  - Adjusting options (upstream update clearifies a lot there)
  - Adjusting mandatory dependencies
  - Remove dependencies included at least in 5.10 perl-core

Upstream changes since 0.35 (skipping detailed list of developer versions):
0.3601 - Mon Dec 21 14:39:33 EST 2009
 Bug fixes:
 - When the currently running Module::Build is not the same as the one
   that created the Build file, there is now a warning rather than a fatal
   error.  This helps installation of dependency chains where a dependency
   might configure_requires a new Module::Build after Build.PL was already
   run for an earlier distribution. [David Golden, on advice of Matt Trout]

 Other:
 - t/bundle_inc.t fails in odd ways.  This test of an experimental feature
   should not prevent users from installing Module::Build, so this test
   now skips unless $ENV{MB_TEST_EXPERIMENTAL} is true

0.36 - Sun Dec 20 15:02:38 EST 2009

No changes from 0.35_15 other than the version number.

Summary of major changes since 0.35:
 Enhancements:
 - Added 'Build installdeps' action to install needed dependencies via
   a user-configurable command line program.  (Defaults to 'cpan'.)
 - Command line options may be set via the PERL_MB_OPT environment
   variable (similar to PERL_MM_OPT in ExtUtils::MakeMaker)
 - Generates MYMETA.yml during Build.PL (new standard protocol for
   communicating configuration results between toolchain components)
 - Reduced amount of console output under normal operation (use --verbose
   to see all output)
 - Added experimental inc/ bundling; see Module::Build::Bundling for
   details.

 New or changed properties:
 - Added 'share_dir' property to provide File::ShareDir support;
   File::ShareDir automatically added to 'requires' if 'share_dir' is set
 - Added 'needs_compiler' property.  Defaults to true if XS or c_source
   exist.  If true, ExtUtils::CBuilder is also added to build_requires.
 - 'C_support' is no longer an optional feature.  Modern ExtUtils::CBuilder
   and ExtUtils::ParseXS added to the 'requires' list.  This ensures that
   upgrading Module::Build will upgrade these critical modules.
 - Clarified that 'apache' in the license attribute indicates the Apache
   License 2.0 and added 'apache_1_1' for the older version of the license
   (RT#50614)

 Deprecations:
 - Module::Build::Compat 'passthrough' style has been deprecated.  Using
   'passthrough' will issue warnings on Makefile.PL generation.  See
   Module::Build::Compat documentation for rationale.

 Internals:
 - Replaced use of YAML.pm with YAML::Tiny; Module::Build::YAML is now
   based on YAML::Tiny as well
 - A new get_metadata() method has been added as a simpler wrapper around
   the old, kludgy prepare_metadata() API.
 - Replaced guts of new_from_context().  Build.PL is now executed in a
   separate process before resume() is called.  (This is generally only of
   interest to Module::Build or toolchain developers) (RT#49350)
 - Add support for 'package NAME VERSION' syntax added in Perl 5.11.1

 Notable bug fixes:
 - The "test" action now dies when using the 'use_tap_harness'
   option and tests fail, matching the behavior under Test::Harness.
   (RT#49080) [initial patch from David Wheeler; revised by David Golden]
 - Updated PPM generation to PPM v4 (RT#49600) [Olivier Mengue]
 - When module_name is not supplied, no packlist was being written; fixed
   by guessing module_name from dist_version_from or the directory name
   (just like ExtUtils::Manifest does without NAME) [David Golden]
 - Failure to detect a compiler will now warn during Build.PL and be a
   fatal error when trying to compile during Build. (RT#48918) [David
   Golden]
 - Auto-detection of abstract and author fixed for mixed-case POD headers
   (RT#51117) [David Wheeler]
 - resume() was not restoring additions to @INC added in Build.PL
   (RT#50145) [David Golden]
 - When tarball paths are less than 100 characters, disables 'prefix'
   mode of Archive::Tar for maximum compatibility (RT#50571) [David Golden]
 - Merging 'requires' and 'build_requires' in Module::Build::Compat could
   lead to duplicate PREREQ_PM entries; now the highest version is used
   for PREREQ_PM. (RT#50948) [David Golden]
 - Module::Build::Compat will now die with an error if advanced,
   non-numeric prerequisites are given, as these are not supported by
   ExtUtils::MakeMaker in PREREQ_PM [David Golden]

4 files changed, 47 insertions, 33 deletions

diff --git a/devel/p5-Module-Build/Makefile b/devel/p5-Module-Build/Makefile
index 0e3ce68e2d9..a2b899e3317 100644
--- a/devel/p5-Module-Build/Makefile
+++ b/devel/p5-Module-Build/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2009/09/12 17:59:13 sno Exp $
+# $NetBSD: Makefile,v 1.26 2010/01/17 17:38:17 sno Exp $
 
-DISTNAME=	Module-Build-0.35
-PKGNAME=	p5-${DISTNAME}000
+DISTNAME=	Module-Build-0.3601
+PKGNAME=	p5-${DISTNAME}0
 SVR4_PKGNAME=	p5mob
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=Module/}
@@ -13,6 +13,10 @@ LICENSE=	${PERL5_LICENSE}
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+DEPENDS+=	p5-ExtUtils-CBuilder>=0.27:../../devel/p5-ExtUtils-CBuilder
+DEPENDS+=	p5-ExtUtils-ParseXS>=2.21:../../devel/p5-ExtUtils-ParseXS
+DEPENDS+=	{perl>=5.10.1,p5-PathTools>=3.30}:../../devel/p5-PathTools
+
 .include "options.mk"
 
 USE_LANGUAGES=	c	# For the tests
diff --git a/devel/p5-Module-Build/distinfo b/devel/p5-Module-Build/distinfo
index f8e83d8ede4..ea583b6da10 100644
--- a/devel/p5-Module-Build/distinfo
+++ b/devel/p5-Module-Build/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.16 2009/09/12 17:59:14 sno Exp $
+$NetBSD: distinfo,v 1.17 2010/01/17 17:38:17 sno Exp $
 
-SHA1 (Module-Build-0.35.tar.gz) = 9fc54e0337fa97b32502204f456b2d0d930d7753
-RMD160 (Module-Build-0.35.tar.gz) = ab1894a8c5c9233110eca25c891b18278bc2941e
-Size (Module-Build-0.35.tar.gz) = 263341 bytes
+SHA1 (Module-Build-0.3601.tar.gz) = 12cae96fa2bc62bb554fe9086d69cc9deecfd1aa
+RMD160 (Module-Build-0.3601.tar.gz) = 92864d75e90e2e457903c273291baee0b07513fe
+Size (Module-Build-0.3601.tar.gz) = 296085 bytes
+SHA1 (patch-aa) = ecb95c0d24593787401e9d0776d95ba261975a72
diff --git a/devel/p5-Module-Build/options.mk b/devel/p5-Module-Build/options.mk
index 212e636eaac..245bd02a0af 100644
--- a/devel/p5-Module-Build/options.mk
+++ b/devel/p5-Module-Build/options.mk
@@ -1,36 +1,24 @@
-# $NetBSD: options.mk,v 1.3 2009/06/13 06:46:45 rillig Exp $
+# $NetBSD: options.mk,v 1.4 2010/01/17 17:38:17 sno Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.p5-Module-Build
 
-PKG_SUPPORTED_OPTIONS=	archive-tar module-signature pod-readme
-PKG_SUPPORTED_OPTIONS+=	extutils-parsexs extutils-cbuilder extutils-install
-PKG_SUPPORTED_OPTIONS+=	yaml version
-PKG_SUGGESTED_OPTIONS=	archive-tar extutils-cbuilder extutils-parsexs
-PKG_SUGGESTED_OPTIONS+=	pod-readme yaml version
+PKG_SUPPORTED_OPTIONS=	dist_authoring license_creation ppm_support bundling
+PKG_SUGGESTED_OPTIONS=	# empty - only for CPAN Authors
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Marchive-tar)
-DEPENDS+=	p5-Archive-Tar>=1.08:../../archivers/p5-Archive-Tar
-.endif
-.if !empty(PKG_OPTIONS:Myaml)
-BUILD_DEPENDS+=	p5-YAML>=0.50:../../textproc/p5-YAML
-.endif
-.if !empty(PKG_OPTIONS:Mmodule-signature)
-DEPENDS+=	p5-Module-Signature>=0.55:../../security/p5-Module-Signature
-.endif
-.if !empty(PKG_OPTIONS:Mextutils-parsexs)
-DEPENDS+=	p5-ExtUtils-ParseXS>=1.02:../../devel/p5-ExtUtils-ParseXS
-.endif
-.if !empty(PKG_OPTIONS:Mextutils-cbuilder)
-DEPENDS+=	p5-ExtUtils-CBuilder>=0.15:../../devel/p5-ExtUtils-CBuilder
+.if !empty(PKG_OPTIONS:Mdist_authoring)
+DEPENDS+=	{perl>=5.10.0,p5-Archive-Tar>=1.09}:../../archivers/p5-Archive-Tar
+DEPENDS+=	p5-Pod-Readme>=0.04:../../textproc/p5-Pod-Readme
+DEPENDS+=	p5-Module-Signature>=0.21:../../security/p5-Module-Signature
 .endif
-.if !empty(PKG_OPTIONS:Mextutils-install)
-DEPENDS+=	p5-ExtUtils-Install>=0.30:../../devel/p5-ExtUtils-Install
+.if !empty(PKG_OPTIONS:Mlicense_creation)
+DEPENDS+=	p5-Software-License-[0-9]*:../../devel/p5-Software-License
 .endif
-.if !empty(PKG_OPTIONS:Mpod-readme)
-DEPENDS+=	p5-Pod-Readme>=0.04:../../textproc/p5-Pod-Readme
+.if !empty(PKG_OPTIONS:Mppm_support)
+DEPENDS+=	{perl>=5.10.1,p5-IO>=1.13}:../../devel/p5-IO
 .endif
-.if !empty(PKG_OPTIONS:Mversion)
-DEPENDS+=	p5-version>=0.74:../../devel/p5-version
+.if !empty(PKG_OPTIONS:Mbundling)
+# contains required ExtUtils::Installed>=1.999_001
+DEPENDS+=	{perl>=5.10.1,p5-ExtUtils-Install>=1.54}:../../devel/p5-ExtUtils-Install
 .endif
diff --git a/devel/p5-Module-Build/patches/patch-aa b/devel/p5-Module-Build/patches/patch-aa
new file mode 100644
index 00000000000..e888ba59ab0
--- /dev/null
+++ b/devel/p5-Module-Build/patches/patch-aa
@@ -0,0 +1,21 @@
+$NetBSD: patch-aa,v 1.5 2010/01/17 17:38:17 sno Exp $
+
+--- t/properties/needs_compiler.t.orig	2009-12-21 19:45:39.000000000 +0000
++++ t/properties/needs_compiler.t
+@@ -106,6 +106,8 @@ is( $mb->build_requires->{'ExtUtils::CBu
+ # falsify compiler and test error handling
+ #--------------------------------------------------------------------------#
+ 
++my $oldcc = $ENV{CC};
++undef $ENV{CC};
+ my $err = stderr_of( sub {
+     $mb = $dist->new_from_context( config => { cc => "adfasdfadjdjk" } )
+ });
+@@ -117,6 +119,6 @@ eval { $mb->dispatch('build') };
+ like( $@, qr/no compiler detected/,
+   "hidden compiler resulted in fatal message during Build"
+ );
+-
++$ENV{CC} = $oldcc;
+ 
+ # vim:ts=2:sw=2:et:sta:sts=2