Update from version 1.5.1 (upstream 1.005001) to version 1.6.0 (upstream

1.006000).

Pkgsrc changes:
- Canonize MASTER_SITES

Upstream changes:
1.006000 2010-03-31
        - Create lib::core::only that provides the "set @INC to core dirs
          only" functionality that was the only part of --self-contained that
          ever worked usefully.
        - Delete broken --self-contained flag from core

3 files changed, 32 insertions, 16 deletions

diff --git a/devel/p5-local-lib/Makefile b/devel/p5-local-lib/Makefile
index 6ad31a78053..37dab93a087 100644
--- a/devel/p5-local-lib/Makefile
+++ b/devel/p5-local-lib/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2010/03/15 19:00:15 sno Exp $
+# $NetBSD: Makefile,v 1.9 2010/04/10 13:21:04 seb Exp $
 #
 
-DISTNAME=	local-lib-1.005001
-PKGNAME=	p5-${DISTNAME:S/005001/5.1/}
+DISTNAME=	local-lib-1.006000
+PKGNAME=	p5-${DISTNAME:S/006000/6.0/}
 CATEGORIES=	devel perl5
-MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../authors/id/A/AP/APEIRON/}
+MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=lib/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://search.cpan.org/dist/local-lib/
diff --git a/devel/p5-local-lib/distinfo b/devel/p5-local-lib/distinfo
index d0cbf5b0a90..aefab09453e 100644
--- a/devel/p5-local-lib/distinfo
+++ b/devel/p5-local-lib/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2010/03/15 19:00:15 sno Exp $
+$NetBSD: distinfo,v 1.9 2010/04/10 13:21:04 seb Exp $
 
-SHA1 (local-lib-1.005001.tar.gz) = 9da4fa3736ffa7d8fa769686b7698716407ff0e5
-RMD160 (local-lib-1.005001.tar.gz) = 678ecbc840d03c2df5036775846d70f100dd9d11
-Size (local-lib-1.005001.tar.gz) = 35281 bytes
-SHA1 (patch-aa) = 35f4d35c67f3dce9313a4f3e36f3c53196ad1e54
+SHA1 (local-lib-1.006000.tar.gz) = 78c3ac009df94805fc199fff4e92e9965dd52a41
+RMD160 (local-lib-1.006000.tar.gz) = 5fe5d222bff188911b4041097ef79900c3326d50
+Size (local-lib-1.006000.tar.gz) = 36674 bytes
+SHA1 (patch-aa) = 80a6f96098ac8972f8db90cbef8f7167cb8a6563
diff --git a/devel/p5-local-lib/patches/patch-aa b/devel/p5-local-lib/patches/patch-aa
index ca8e4773134..ebed4dde193 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.1 2009/08/23 13:47:04 seb Exp $
+$NetBSD: patch-aa,v 1.2 2010/04/10 13:21:04 seb Exp $
 
 Prevent CPAN's interactive configuration process to take place!
 
---- Makefile.PL.orig	2009-08-06 02:45:48.000000000 +0000
+--- Makefile.PL.orig	2010-03-31 14:38:43.000000000 +0000
 +++ Makefile.PL
-@@ -123,36 +123,36 @@ delete $ENV{PERL5_CPAN_IS_RUNNING} if $n
+@@ -192,44 +192,44 @@ 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.
@@ -20,13 +20,21 @@ Prevent CPAN's interactive configuration process to take place!
 -        CPAN::HandleConfig->load;
 -        for my $eumm_setting ( qw/makepl_arg make_install_arg/ ) {
 -            if ($CPAN::Config->{$eumm_setting} =~ /(?:PREFIX|INSTALL_BASE)/) {
--                die "Possibly invalid config detected in $eumm_setting: " . $CPAN::Config->{$eumm_setting};
+-                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 "Possibly invalid config detected in $mb_setting: " . $CPAN::Config->{$mb_setting};
+-                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
 -            }
 -        }
 -    }
@@ -50,13 +58,21 @@ Prevent CPAN's interactive configuration process to take place!
 +#        CPAN::HandleConfig->load;
 +#        for my $eumm_setting ( qw/makepl_arg make_install_arg/ ) {
 +#            if ($CPAN::Config->{$eumm_setting} =~ /(?:PREFIX|INSTALL_BASE)/) {
-+#                die "Possibly invalid config detected in $eumm_setting: " . $CPAN::Config->{$eumm_setting};
++#                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 "Possibly invalid config detected in $mb_setting: " . $CPAN::Config->{$mb_setting};
++#                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
 +#            }
 +#        }
 +#    }