Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/perlmods
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv24078

Modified Files:
        extutils-makemaker-pm.info extutils-makemaker-pm.patch 
Log Message:
It appears that Cwd::cwd can't get the cwd from within fink's build
environment but Cwd::getcwd can. Patch MakeMaker.pm to use getcwd.

Index: extutils-makemaker-pm.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/perlmods/extutils-makemaker-pm.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- extutils-makemaker-pm.patch 8 Jan 2012 08:16:58 -0000       1.2
+++ extutils-makemaker-pm.patch 7 Jul 2013 03:05:57 -0000       1.3
@@ -1,7 +1,18 @@
-diff -Nurd -x'*~' ExtUtils-MakeMaker-6.58.orig/lib/ExtUtils/MakeMaker.pm 
ExtUtils-MakeMaker-6.58/lib/ExtUtils/MakeMaker.pm
---- ExtUtils-MakeMaker-6.58.orig/lib/ExtUtils/MakeMaker.pm     2011-07-06 
17:17:22.000000000 -0400
-+++ ExtUtils-MakeMaker-6.58/lib/ExtUtils/MakeMaker.pm  2011-07-18 
14:11:58.000000000 -0400
-@@ -361,6 +361,11 @@
+diff -ru ExtUtils-MakeMaker-6.68.orig/lib/ExtUtils/MakeMaker.pm 
ExtUtils-MakeMaker-6.68/lib/ExtUtils/MakeMaker.pm
+--- ExtUtils-MakeMaker-6.68.orig/lib/ExtUtils/MakeMaker.pm     2013-06-14 
18:26:40.000000000 -0400
++++ ExtUtils-MakeMaker-6.68/lib/ExtUtils/MakeMaker.pm  2013-07-06 
22:55:48.000000000 -0400
+@@ -209,8 +209,8 @@
+ 
+ sub eval_in_subdirs {
+     my($self) = @_;
+-    use Cwd qw(cwd abs_path);
+-    my $pwd = cwd() || die "Can't figure out your cwd!";
++    use Cwd qw(getcwd abs_path);
++    my $pwd = getcwd() || die "Can't figure out your cwd!";
+ 
+     local @INC = map eval {abs_path($_) if -e} || $_, @INC;
+     push @INC, '.';     # '.' has to always be at the end of @INC
+@@ -363,6 +363,11 @@
          $Recognized_Att_Keys{$item} = 1;
      }
      foreach my $item (@Get_from_Config) {
@@ -13,10 +24,10 @@
          $Recognized_Att_Keys{uc $item} = $Config{$item};
          print "Attribute '\U$item\E' => '$Config{$item}'\n"
              if ($Verbose >= 2);
-diff -Nurd -x'*~' ExtUtils-MakeMaker-6.58.orig/t/lib/MakeMaker/Test/Utils.pm 
ExtUtils-MakeMaker-6.58/t/lib/MakeMaker/Test/Utils.pm
---- ExtUtils-MakeMaker-6.58.orig/t/lib/MakeMaker/Test/Utils.pm 2011-04-12 
11:49:16.000000000 -0400
-+++ ExtUtils-MakeMaker-6.58/t/lib/MakeMaker/Test/Utils.pm      2011-07-18 
14:12:32.000000000 -0400
-@@ -104,6 +104,7 @@
+diff -ru ExtUtils-MakeMaker-6.68.orig/t/lib/MakeMaker/Test/Utils.pm 
ExtUtils-MakeMaker-6.68/t/lib/MakeMaker/Test/Utils.pm
+--- ExtUtils-MakeMaker-6.68.orig/t/lib/MakeMaker/Test/Utils.pm 2013-04-14 
05:53:19.000000000 -0400
++++ ExtUtils-MakeMaker-6.68/t/lib/MakeMaker/Test/Utils.pm      2013-07-06 
22:54:15.000000000 -0400
+@@ -114,6 +114,7 @@
  =cut
  
  sub which_perl {

Index: extutils-makemaker-pm.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/perlmods/extutils-makemaker-pm.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- extutils-makemaker-pm.info  6 Jul 2013 01:30:33 -0000       1.10
+++ extutils-makemaker-pm.info  7 Jul 2013 03:05:57 -0000       1.11
@@ -1,7 +1,7 @@
 Info2: <<
 Package: extutils-makemaker-pm%type_pkg[perl]
 Version: 6.68
-Revision: 1
+Revision: 2
 Distribution: (%type_pkg[perl] = 586) 10.5
 Type: perl (5.8.6 5.8.8 5.10.0)
 Description: Perl module to create a module Makefile
@@ -20,6 +20,9 @@
 DescPort: <<
        Patch makefile generator to remove -L/usr/local/lib from early
        in LDDLFLAGS (don't have non-fink mask fink)
+       
+       It appears that Cwd::cwd can't get the cwd from within fink's build
+       environment but Cwd::getcwd can. Patch MakeMaker.pm to use getcwd.
 <<
 
 # Dependencies:
@@ -44,13 +47,11 @@
 Provides: %N-bin
 
 # Unpack Phase:
-Source: mirror:cpan:authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-%v.tar.gz
-#Source: mirror:cpan:authors/id/M/MS/MSCHWERN/ExtUtils-MakeMaker-%v.tar.gz
-#Source: mirror:cpan:authors/id/M/MS/MSTROUT/ExtUtils-MakeMaker-%v.tar.gz
+Source: mirror:cpan:modules/by-module/ExtUtils/ExtUtils-MakeMaker-%v.tar.gz
 Source-MD5: a8afd7a2796d1dd64ef9d2b995e7eab6
 
 PatchFile: %{ni}.patch
-PatchFile-MD5: 0f2c2c26ca6d04cc6c519d73f096e708
+PatchFile-MD5: 85f7c82e830f1d7b23e18ed32c078d3c
 PatchScript: <<
 #!/bin/sh -ex
        sed 's|@PREFIX@|%p|g' < %{PatchFile} | patch -p1


------------------------------------------------------------------------------
This SF.net email is sponsored by Windows:

Build for Windows Store.

http://p.sf.net/sfu/windows-dev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to