Update p5-local-lib to 1.008004.

Changes from previous:
1.008004 2011-02-24

        - Fix stackable tests on win32 by canonicalizing the path ahead of time

1.008003 2011-02-23

        - Fix tests with stacking l::ls.

1.008002 2011-02-23

        - Add local::lib stacking support.
        - Add activation/deactivation support.

1.008001 2011-01-09

        - Bootstrap Module::Build just like ExtUtils::MakeMaker

1.008000 2011-01-05

        - Remove redundant prereqs now that Module::Build 0.36 is required
        - Makefile.PL avoids CPAN client configuration when not required
        - print_environment_vars_for() refactored with separate function
          environment_vars_string_for()
        - PERL_LOCAL_LIB_ROOT environment is added to disambiguate when
          PERL_MM_OPT, etc. was set by local::lib or other means

1.007000 2010-12-09
        - Chase the Module::Build version which supports PERL_MB_OPT. Thanks to
        miyagawa for pointing this out.

1.006009 2010-12-09

        - Split up method guess_shelltype from parts of print_environment_vars_for
        - Updated documentation about change of use with .modulebuildrc

1.006008 2010-11-17

        - Finally move to PERL_MB_OPT rather than using .modulebuildrc.

3 files changed, 33 insertions, 30 deletions

diff --git a/devel/p5-local-lib/Makefile b/devel/p5-local-lib/Makefile
index 5f25cbcfdec..2059da576dc 100644
--- a/devel/p5-local-lib/Makefile
+++ b/devel/p5-local-lib/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2011/08/14 12:26:49 obache Exp $
+# $NetBSD: Makefile,v 1.15 2011/11/05 13:30:44 hiramatsu Exp $
 #
 
-DISTNAME=	local-lib-1.006007
-PKGNAME=	p5-${DISTNAME:S/006007/6.7/}
-PKGREVISION=	2
+DISTNAME=	local-lib-1.008004
+PKGNAME=	p5-${DISTNAME:S/008004/8.4/}
 CATEGORIES=	devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=lib/}
 
diff --git a/devel/p5-local-lib/distinfo b/devel/p5-local-lib/distinfo
index e8aff2116f0..e217b01ca66 100644
--- a/devel/p5-local-lib/distinfo
+++ b/devel/p5-local-lib/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2010/08/15 08:49:05 seb Exp $
+$NetBSD: distinfo,v 1.13 2011/11/05 13:30:44 hiramatsu Exp $
 
-SHA1 (local-lib-1.006007.tar.gz) = 69b2fde00e86a0c2e73fded98b6cdd1e68c09aab
-RMD160 (local-lib-1.006007.tar.gz) = 8126393a6b889a72df2e6dc0eeb101ffd4a786ec
-Size (local-lib-1.006007.tar.gz) = 51929 bytes
-SHA1 (patch-aa) = 80a6f96098ac8972f8db90cbef8f7167cb8a6563
+SHA1 (local-lib-1.008004.tar.gz) = 21e5e32774b0704dd22fb81af5989fbf2098f651
+RMD160 (local-lib-1.008004.tar.gz) = 50e7153041e723cb6197cc1c7a724b04e4b5d8d5
+Size (local-lib-1.008004.tar.gz) = 53977 bytes
+SHA1 (patch-aa) = 68232a7b89bdf1209d7c788a4afb2a2056bca85c
diff --git a/devel/p5-local-lib/patches/patch-aa b/devel/p5-local-lib/patches/patch-aa
index ebed4dde193..f8a78d31c78 100644
--- a/devel/p5-local-lib/patches/patch-aa
+++ b/devel/p5-local-lib/patches/patch-aa
@@ -1,10 +1,10 @@
-$NetBSD: patch-aa,v 1.2 2010/04/10 13:21:04 seb Exp $
+$NetBSD: patch-aa,v 1.3 2011/11/05 13:30:44 hiramatsu Exp $
 
 Prevent CPAN's interactive configuration process to take place!
 
---- Makefile.PL.orig	2010-03-31 14:38:43.000000000 +0000
+--- Makefile.PL.orig	2011-11-04 19:20:21.000000000 +0000
 +++ Makefile.PL
-@@ -192,44 +192,44 @@ delete $ENV{PERL5_CPAN_IS_RUNNING} if $n
+@@ -200,46 +200,46 @@ delete $ENV{PERL5_CPAN_IS_RUNNING} if $n
  
  # and make sure that the user doesn't have any existing CPAN config that'll
  # cause us problems for the next few steps.
@@ -16,25 +16,27 @@ Prevent CPAN's interactive configuration process to take place!
 -    # It will already be installed by the time we reach here if bootstrapping,
 -    # otherwise, if we're running from CPAN then it will be installed soon
 -    # enough, and we'll come back here..
--    if (!$@) {
--        CPAN::HandleConfig->load;
--        for my $eumm_setting ( qw/makepl_arg make_install_arg/ ) {
--            if ($CPAN::Config->{$eumm_setting} =~ /(?:PREFIX|INSTALL_BASE)/) {
--                die <<"DEATH";
+-    if (!$@ ) {
+-        CPAN::HandleConfig->require_myconfig_or_config;
+-        if ( $CPAN::Config ) {
+-            for my $eumm_setting ( qw/makepl_arg make_install_arg/ ) {
+-                if ($CPAN::Config->{$eumm_setting} =~ /(?:PREFIX|INSTALL_BASE)/) {
+-                    die <<"DEATH";
 -WHOA THERE! It looks like you've got $CPAN::Config->{$eumm_setting} set. This is
 -known to cause problems with local::lib. Please either remove this setting or
 -clear out your .cpan directory.
 -DEATH
+-                }
 -            }
--        }
 -
--        for my $mb_setting (qw/mbuild_arg mbuild_install_arg mbuildpl_arg/) {
--            if ($CPAN::Config->{$mb_setting} =~ /(?:--prefix|--install_base)/) {
--                die <<"DEATH";
+-            for my $mb_setting (qw/mbuild_arg mbuild_install_arg mbuildpl_arg/) {
+-                if ($CPAN::Config->{$mb_setting} =~ /(?:--prefix|--install_base)/) {
+-                    die <<"DEATH";
 -WHOA THERE! It looks like you've got $CPAN::Config->{$mb_setting} set. This is
 -known to cause problems with local::lib. Please either remove this setting or
 -clear out your .cpan directory.
 -DEATH
+-                }
 -            }
 -        }
 -    }
@@ -54,25 +56,27 @@ Prevent CPAN's interactive configuration process to take place!
 +#    # It will already be installed by the time we reach here if bootstrapping,
 +#    # otherwise, if we're running from CPAN then it will be installed soon
 +#    # enough, and we'll come back here..
-+#    if (!$@) {
-+#        CPAN::HandleConfig->load;
-+#        for my $eumm_setting ( qw/makepl_arg make_install_arg/ ) {
-+#            if ($CPAN::Config->{$eumm_setting} =~ /(?:PREFIX|INSTALL_BASE)/) {
-+#                die <<"DEATH";
++#    if (!$@ ) {
++#        CPAN::HandleConfig->require_myconfig_or_config;
++#        if ( $CPAN::Config ) {
++#            for my $eumm_setting ( qw/makepl_arg make_install_arg/ ) {
++#                if ($CPAN::Config->{$eumm_setting} =~ /(?:PREFIX|INSTALL_BASE)/) {
++#                    die <<"DEATH";
 +#WHOA THERE! It looks like you've got $CPAN::Config->{$eumm_setting} set. This is
 +#known to cause problems with local::lib. Please either remove this setting or
 +#clear out your .cpan directory.
 +#DEATH
++#                }
 +#            }
-+#        }
 +#
-+#        for my $mb_setting (qw/mbuild_arg mbuild_install_arg mbuildpl_arg/) {
-+#            if ($CPAN::Config->{$mb_setting} =~ /(?:--prefix|--install_base)/) {
-+#                die <<"DEATH";
++#            for my $mb_setting (qw/mbuild_arg mbuild_install_arg mbuildpl_arg/) {
++#                if ($CPAN::Config->{$mb_setting} =~ /(?:--prefix|--install_base)/) {
++#                    die <<"DEATH";
 +#WHOA THERE! It looks like you've got $CPAN::Config->{$mb_setting} set. This is
 +#known to cause problems with local::lib. Please either remove this setting or
 +#clear out your .cpan directory.
 +#DEATH
++#                }
 +#            }
 +#        }
 +#    }