Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/perlmods
In directory
sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv17209/libs/perlmods
Modified Files:
test-harness-pm.info test-simple-pm.info
Added Files:
test-harness-pm.patch test-manifest-pm.info
Log Message:
sync some stuff
--- NEW FILE: test-harness-pm.patch ---
diff -Nurd -x'*~' Test-Harness-3.22.orig/lib/TAP/Parser/SourceHandler/Perl.pm
Test-Harness-3.22/lib/TAP/Parser/SourceHandler/Perl.pm
--- Test-Harness-3.22.orig/lib/TAP/Parser/SourceHandler/Perl.pm 2010-08-14
18:30:13.000000000 -0400
+++ Test-Harness-3.22/lib/TAP/Parser/SourceHandler/Perl.pm 2010-09-19
06:37:48.000000000 -0400
@@ -256,7 +256,21 @@
# XXX don't need to quote if we treat the parts as atoms (except maybe vms)
#$file = qq["$file"] if ( $file =~ /\s/ ) && ( $file !~ /^".*"$/ );
- my @command = ( $command, @{$switches}, $file, @args );
+ 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, ($command, @${switches}, $file, @args);
return @command;
}
diff -Nurd -x'*~' Test-Harness-3.22.orig/t/nofork.t Test-Harness-3.22/t/nofork.t
--- Test-Harness-3.22.orig/t/nofork.t 2010-08-14 18:30:13.000000000 -0400
+++ Test-Harness-3.22/t/nofork.t 2010-09-19 06:52:21.000000000 -0400
@@ -26,7 +26,21 @@
}
my @libs = map "-I$_", @INC;
-my @perl = ( $^X, @libs );
+my @perl;
+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 @perl, '/usr/bin/arch';
+ if ( $Config{"longsize"} == 4 ) {
+ push @perl, '-i386'; # 32-bit
+ } else {
+ push @perl, '-x86_64'; # 64-bit
+ }
+}
+push @perl, ( $^X, @libs );
my $mod = 'TAP::Parser::Iterator::Process';
{ # just check the introspective method to start...
diff -Nurd -x'*~' Test-Harness-3.22.orig/t/proverun.t
Test-Harness-3.22/t/proverun.t
--- Test-Harness-3.22.orig/t/proverun.t 2010-08-14 18:30:13.000000000 -0400
+++ Test-Harness-3.22/t/proverun.t 2010-09-19 06:37:48.000000000 -0400
@@ -166,6 +166,11 @@
# obliterate it here. Need to test that it's sane.
for my $call (@log) {
if ( 'HASH' eq ref $call->[2] && exists $call->[2]->{command} ) {
+ if ($call->[2]->{command}->[0] eq '/usr/bin/arch') {
+ # nuke fink single-arch wrapper to actual perl interp
+ shift @{$call->[2]->{command}}; # '/usr/bin/arch'
+ shift @{$call->[2]->{command}}; # '-i386' or '-x86_64'
+ }
$call->[2]->{command}->[0] = 'PERL';
}
}
Index: test-harness-pm.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/perlmods/test-harness-pm.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- test-harness-pm.info 24 Aug 2009 05:48:05 -0000 1.5
+++ test-harness-pm.info 18 Oct 2010 07:35:18 -0000 1.6
@@ -1,15 +1,19 @@
Info2: <<
Package: test-harness-pm%type_pkg[perl]
-Version: 3.16
+Version: 3.22
Revision: 1
Architecture: (%type_pkg[perl] = 581) powerpc, (%type_pkg[perl] = 584) powerpc
Distribution: (%type_pkg[perl] = 581) 10.4, (%type_pkg[perl] = 584) 10.4,
(%type_pkg[perl] = 586) 10.4, (%type_pkg[perl] = 586) 10.5, (%type_pkg[perl] =
5100) 10.5, (%type_pkg[perl] = 5100) 10.6
Type: perl (5.8.1 5.8.6 5.8.8 5.10.0)
+BuildDepends: fink (>= 0.24.12)
Depends: perl%type_pkg[perl]-core
Source: mirror:cpan:authors/id/A/AN/ANDYA/Test-Harness-%v.tar.gz
-Source-MD5: cd2f3b018767ae9e61d09b23845cb68a
+Source-MD5: 017311ee9a4549a0885e1b9cb5fca3f5
+
+PatchFile: %{ni}.patch
+PatchFile-MD5: 390ed8302a68aa53c62ef6e32d6c3359
InstallScript: <<
%{default_script}
@@ -23,6 +27,10 @@
UpdatePOD: true
Description: Run standard test scripts with statistics
+DescDetail: <<
+Note: TAP::Parser::SourceHandler::pgTAP is now in a separate package
+(tap-parser-sourcehandler-pgtap-pm%type_pkg[perl]).
+<<
DescUsage: <<
The "prove" command is renamed to "prove-%type_pkg[perl]" so as not
to conflict with the "prove" command that comes with perl itself (in
@@ -31,7 +39,13 @@
DescPackaging: <<
This package has language-version variants for historical reasons.
<<
+DescPort: <<
+ This package has hacks for pm5100 on intel-based machines to
+ enforce correct single-arch from fat perl interp. See:
+ http://permalink.gmane.org/gmane.os.apple.fink.devel/19640 and
+ inline comments in the patchfile
+<<
Homepage: http://search.cpan.org/dist/Test-Harness
-License: Artistic
+License: Artistic/GPL
Maintainer: Daniel Macks <[email protected]>
<<
Index: test-simple-pm.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/perlmods/test-simple-pm.info,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- test-simple-pm.info 2 Aug 2010 07:17:57 -0000 1.16
+++ test-simple-pm.info 18 Oct 2010 07:35:18 -0000 1.17
@@ -1,29 +1,37 @@
Info2: <<
Package: test-simple-pm%type_pkg[perl]
-Version: 0.94
-Revision: 2
+Version: 0.96
+Revision: 1
Architecture: (%type_pkg[perl] = 581) powerpc, (%type_pkg[perl] = 584) powerpc
Distribution: (%type_pkg[perl] = 581) 10.4, (%type_pkg[perl] = 584) 10.4,
(%type_pkg[perl] = 586) 10.4, (%type_pkg[perl] = 586) 10.5, (%type_pkg[perl] =
5100) 10.5, (%type_pkg[perl] = 5100) 10.6
Description: Basic utilities for writing tests
Type: perl(5.8.1 5.8.6 5.8.8 5.10.0)
License: Artistic
-Maintainer: None <[email protected]>
+Maintainer: Daniel Johnson <[email protected]>
Depends: <<
perl%type_pkg[perl]-core,
file-spec-pm%type_pkg[perl],
- test-harness-pm%type_pkg[perl] (>= 2.03-1)
+ test-harness-pm%type_pkg[perl] (>= 3.21-104)
<<
BuildDepends: <<
perl%type_pkg[perl]-core,
file-spec-pm%type_pkg[perl],
fink (>= 0.28.0-1),
- test-harness-pm%type_pkg[perl] (>= 2.03-1)
+ test-harness-pm%type_pkg[perl] (>= 3.21-104)
<<
Provides: test-simple-pm
Replaces: test-simple-pm (<= 0.47-14)
Source: mirror:cpan:authors/id/M/MS/MSCHWERN/Test-Simple-%v.tar.gz
-Source-MD5: e4e09d8bf2cc73124152ba2c45c95b5b
+Source-MD5: fbc734a7bb5b3fc3e2bc706e19d08b26
+
+PatchScript: <<
+ #!/bin/sh -ev
+ perlversion=%type_raw[perl]
+ if dpkg --compare-versions "$perlversion" ">=" "5.10.0" && [ "%m" !=
"powerpc" ]; then
+ perl -pi -e 's,(my \$Perl = ).*$,\1"/usr/bin/arch -%m
perl$perlversion";,' t/exit.t
+ fi
+<<
UpdatePOD: true
InstallScript: <<
@@ -35,9 +43,9 @@
Homepage: http://search.cpan.org/dist/Test-Simple/
DescDetail: <<
This is an extremely simple, extremely basic module for writing tests
- suitable for CPAN modules and other pursuits. If you wish to do more
- complicated testing, use the Test::More module (a drop-in replacement
- for this one).
+ suitable for CPAN modules and other pursuits. It also includes the
+ Test::More module which allows for more complex testing.
+
Previous maintainer: Justin F. Hallett <[email protected]>
Koen van der Drift <[email protected]>
<<
--- NEW FILE: test-manifest-pm.info ---
Info2: <<
Package: test-manifest-pm%type_pkg[perl]
Version: 1.23
Revision: 1
Architecture: (%type_pkg[perl] = 581) powerpc, (%type_pkg[perl] = 584) powerpc
Distribution: (%type_pkg[perl] = 581) 10.4, (%type_pkg[perl] = 584) 10.4,
(%type_pkg[perl] = 586) 10.4, (%type_pkg[perl] = 586) 10.5, (%type_pkg[perl] =
5100) 10.5, (%type_pkg[perl] = 5100) 10.6
Description: Perl module for using t/test_manifest files
Type: perl(5.8.1 5.8.4 5.8.6 5.8.8 5.10.0)
License: Artistic
Maintainer: Benjamin Reed <[email protected]>
Depends: <<
perl%type_pkg[perl]-core,
test-simple-pm%type_pkg[perl]
<<
Provides: test-manifest-pm
Replaces: <<
test-manifest-pm560,
test-manifest-pm561,
test-manifest-pm580,
test-manifest-pm581,
test-manifest-pm584,
test-manifest-pm585,
test-manifest-pm (<< %v-%r)
<<
Source: mirror:cpan:modules/by-module/Test/Test-Manifest-%v.tar.gz
Source-MD5: 81c8744987b67d35af05a74a3c7f1742
SourceDirectory: Test-Manifest-%v
UseMaxBuildJobs: true
UpdatePOD: true
DocFiles: Changes MANIFEST
Homepage: http://search.cpan.org/dist/Test-Manifest
DescDetail: <<
MakeMaker assumes that you want to run all of the .t files in the t/
directory in ascii-betical order during make test unless you say
otherwise. This leads to some interesting naming schemes for test
files to get them in the desired order.
You can specify any order or any files that you like, though, with
the test directive to WriteMakefile.
Test::Manifest looks in the t/test_manifest file to find out which
tests you want to run and the order in which you want to run them.
It constructs the right value for MakeMaker to do the right thing.
<<
<<
------------------------------------------------------------------------------
Download new Adobe(R) Flash(R) Builder(TM) 4
The new Adobe(R) Flex(R) 4 and Flash(R) Builder(TM) 4 (formerly
Flex(R) Builder(TM)) enable the development of rich applications that run
across multiple browsers and platforms. Download your free trials today!
http://p.sf.net/sfu/adobe-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
