Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/perlmods
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv7186
Modified Files:
local-lib-pm.info local-lib-pm.patch
Removed Files:
local-lib-pm5100.info local-lib-pm5100+.patch
Log Message:
unified patch
Index: local-lib-pm.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/perlmods/local-lib-pm.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- local-lib-pm.info 1 Aug 2010 07:44:03 -0000 1.1
+++ local-lib-pm.info 1 Aug 2010 17:02:15 -0000 1.2
@@ -5,7 +5,7 @@
Distribution: (%type_pkg[perl] = 586) 10.4, (%type_pkg[perl] = 586) 10.5,
(%type_pkg[perl] = 5100) 10.5, (%type_pkg[perl] = 5100) 10.6
Source: mirror:cpan:authors/id/G/GE/GETTY/local-lib-%v.tar.gz
Source-MD5: ab715339d5595c2c738144e10b7a9684
-Type: perl (5.8.6 5.8.8)
+Type: perl (5.8.6 5.8.8 5.10.0)
BuildDepends: <<
fink (>= 0.24.12)
<<
@@ -19,7 +19,7 @@
perl%type_pkg[perl]-core
<<
PatchFile: %{ni}.patch
-PatchFile-MD5: 1b837da7ce965d5e4107330d430c94b3
+PatchFile-MD5: 1294112ab97591c17028441a69309f58
PatchScript: <<
%{default_script}
perl -0 -pe's/^.*=head\d\s+(Support.*)$/$1/is' lib/local/lib.pm > README
@@ -39,6 +39,10 @@
Nuke a ton of stuff from Makefile.PL that is inappropriate for
a packaging-system-driven build.
<<
+DescPort: <<
+ Hack test suite to enforce correct single-arch from fat perl
+ interp for spawned perl script (see test-harness-pmXXX).
+<<
Description: Manage private collection of libs vs global
License: Artistic/GPL
Homepage: http://search.cpan.org/dist/local-lib/
--- local-lib-pm5100.info DELETED ---
Index: local-lib-pm.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/perlmods/local-lib-pm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- local-lib-pm.patch 1 Aug 2010 07:44:03 -0000 1.1
+++ local-lib-pm.patch 1 Aug 2010 17:02:15 -0000 1.2
@@ -24,3 +24,42 @@
}
chdir($cwd);
WriteAll;
+diff -Nurd -x'*~' local-lib-1.006005.orig/t/install.t
local-lib-1.006005/t/install.t
+--- local-lib-1.006005.orig/t/install.t 2010-06-08 19:01:42.000000000
-0400
++++ local-lib-1.006005/t/install.t 2010-08-01 03:41:25.000000000 -0400
+@@ -19,16 +19,32 @@
+ my $orig_dir = cwd;
+ SKIP: for my $dist_type (qw(EUMM MB)) {
+ chdir File::Spec->catdir($orig_dir, qw(t dist), $dist_type);
++ my @command;
++ if ($] >= 5.010 && $Config{"byteorder"} =~ /^1/) {
++ # little-endian means intel (not powerpc), for which fink has
++ # multiple single-arch distros that are seen by a single (fat)
++ # perl interp from apple for a perl version supported by fink
++ # (i.e., starting with 5.10.0). This is the logic taken from
++ # Fink::PkgVersion as of fink-0.29.13.
++ push @command, '/usr/bin/arch';
++ if ( $Config{"longsize"} == 4 ) {
++ push @command, '-i386'; # 32-bit
++ } else {
++ push @command, '-x86_64'; # 64-bit
++ }
++ }
++ push @command, $^X;
++
+ if ($dist_type eq 'EUMM') {
+ my ($stdout, $stderr) = capture { eval {
+- system($^X, 'Makefile.PL') && die "Makefile.PL failed";
++ system(@command, 'Makefile.PL') && die "Makefile.PL failed";
+ system($Config{make}, 'install') && die "$Config{make} install failed";
+ } };
+ diag $stdout, $stderr if $@;
+ } else {
+ my ($stdout, $stderr) = capture { eval {
+- system($^X, 'Build.PL') && die "Build.PL failed";
+- system($^X, 'Build', 'install') && die "Build install failed";
++ system(@command, 'Build.PL') && die "Build.PL failed";
++ system(@command, 'Build', 'install') && die "Build install failed";
+ } };
+ diag $stdout, $stderr if $@;
+ }
--- local-lib-pm5100+.patch DELETED ---
------------------------------------------------------------------------------
The Palm PDK Hot Apps Program offers developers who use the
Plug-In Development Kit to bring their C/C++ apps to Palm for a share
of $1 Million in cash or HP Products. Visit us here for more details:
http://p.sf.net/sfu/dev2dev-palm
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
