srcpkgs/perl/patches/cpan_definstalldirs.diff

   1 From 91c395844c280f07b4eeb4aa20f1b2abd9fe1126 Mon Sep 17 00:00:00 2001
   2 From: Torsten Veller <tove@gentoo.org>
   3 Date: Sat, 14 Apr 2012 13:34:20 +0200
   4 Subject: Provide a sensible INSTALLDIRS default for modules installed from
   5  CPAN.
   6
   7 Some modules which are included in core set INSTALLDIRS => 'perl'
   8 explicitly in Makefile.PL or Build.PL.  This makes sense for the normal @INC
   9 ordering, but not ours.
  10 Taken from Debian.
  11
  12 Patch-Name: gentoo/cpan_definstalldirs.diff
  13 ---
  14  cpan/CPAN/lib/CPAN/FirstTime.pm | 4 ++--
  15  1 file changed, 2 insertions(+), 2 deletions(-)
  16
  17 diff --git a/cpan/CPAN/lib/CPAN/FirstTime.pm b/cpan/CPAN/lib/CPAN/FirstTime.pm
  18 index 5030ef9..5953cb7 100644
  19 --- cpan/CPAN/lib/CPAN/FirstTime.pm
  20 +++ cpan/CPAN/lib/CPAN/FirstTime.pm
  21 @@ -990,7 +990,7 @@ sub init {
  22      my_prompt_loop(prefer_installer => 'MB', $matcher, 'MB|EUMM|RAND');
  23
  24      if (!$matcher or 'makepl_arg make_arg' =~ /$matcher/) {
  25 -        my_dflt_prompt(makepl_arg => "", $matcher);
  26 +        my_dflt_prompt(makepl_arg => "INSTALLDIRS=site", $matcher);
  27          my_dflt_prompt(make_arg => "", $matcher);
  28          if ( $CPAN::Config->{makepl_arg} =~ /LIBS=|INC=/ ) {
  29              $CPAN::Frontend->mywarn(
  30 @@ -1022,7 +1022,7 @@ sub init {
  31      my_dflt_prompt(make_install_arg => $CPAN::Config->{make_arg} || "",
  32                     $matcher);
  33
  34 -    my_dflt_prompt(mbuildpl_arg => "", $matcher);
  35 +    my_dflt_prompt(mbuildpl_arg => "--installdirs site", $matcher);
  36      my_dflt_prompt(mbuild_arg => "", $matcher);
  37
  38      if (exists $CPAN::HandleConfig::keys{mbuild_install_build_command}