0905d883b6
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
89 lines
3.3 KiB
Text
89 lines
3.3 KiB
Text
$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 2010-03-31 14:38:43.000000000 +0000
|
|
+++ Makefile.PL
|
|
@@ -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.
|
|
-{
|
|
- local $@;
|
|
- eval { require CPAN::HandleConfig; };
|
|
- # Need newish CPAN.pm for this, ergo skip it if that version of CPAN isn't
|
|
- # installed yet.
|
|
- # 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";
|
|
-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";
|
|
-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
|
|
- }
|
|
- }
|
|
- }
|
|
- else {
|
|
- my $error = $@;
|
|
- require CPAN;
|
|
- # Explode if it looks like requiring CPAN::HandleConfig should
|
|
- # have worked, but didn't.
|
|
- die($error) if $CPAN::VERSION >= $required_CPAN;
|
|
- }
|
|
-}
|
|
+#{
|
|
+# local $@;
|
|
+# eval { require CPAN::HandleConfig; };
|
|
+# # Need newish CPAN.pm for this, ergo skip it if that version of CPAN isn't
|
|
+# # installed yet.
|
|
+# # 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";
|
|
+#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";
|
|
+#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
|
|
+# }
|
|
+# }
|
|
+# }
|
|
+# else {
|
|
+# my $error = $@;
|
|
+# require CPAN;
|
|
+# # Explode if it looks like requiring CPAN::HandleConfig should
|
|
+# # have worked, but didn't.
|
|
+# die($error) if $CPAN::VERSION >= $required_CPAN;
|
|
+# }
|
|
+#}
|
|
|
|
if ($bootstrapping) {
|
|
auto_install_now;
|