On Mon, Feb 09, 2009 at 10:24:33AM +0000, Stuart Henderson wrote:
On 2009/02/08 23:33, James Wright wrote:
Has anyone succeeded in getting Class::MOP upgraded to 0.76 in their
tree? I get 'make: don't know how to make
t/pp_072_immutable_w_constructors.t. Stop in
/usr/ports/devel/p5-Class-MOP/w-p5-Class-MOP-0.76/Class-MOP-0.76.'.
ftp://ftp.netbsd.org/pub/NetBSD/packages/pkgsrc/devel/p5-Class-MOP/patches/patch-aa
Good stuff, thanks digging that out, Stuart!
Diff below that adds the patch.
Regards,
Simon
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/p5-Class-MOP/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile 1 Feb 2009 00:58:50 -0000 1.5
+++ Makefile 9 Feb 2009 10:58:03 -0000
@@ -5,7 +5,7 @@ SHARED_ONLY= Yes
COMMENT= meta object protocol for perl 5
MODULES= cpan
-DISTNAME= Class-MOP-0.75
+DISTNAME= Class-MOP-0.76
CATEGORIES= devel
# perl
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/p5-Class-MOP/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 1 Feb 2009 00:58:50 -0000 1.4
+++ distinfo 9 Feb 2009 10:58:03 -0000
@@ -1,5 +1,5 @@
-MD5 (Class-MOP-0.75.tar.gz) = uCu7Fo7sd27AJ5W7IYyfIw==
-RMD160 (Class-MOP-0.75.tar.gz) = XiDwJwHmzSpwp5X4XXQ3HUULQ90=
-SHA1 (Class-MOP-0.75.tar.gz) = WoL0InbK1VpAIZ7ZDDySvtieVjs=
-SHA256 (Class-MOP-0.75.tar.gz) = OGIQr9jTvFwec1vxSghREqqwqnYJhTe+qO2Bf1D9xUQ=
-SIZE (Class-MOP-0.75.tar.gz) = 153042
+MD5 (Class-MOP-0.76.tar.gz) = eeP02o+snSyWAXd753J5yg==
+RMD160 (Class-MOP-0.76.tar.gz) = NVexK519YQNfpOxd1dlIXCseq3o=
+SHA1 (Class-MOP-0.76.tar.gz) = wbR8kc2fbEFOigSfccOSgwIMSSY=
+SHA256 (Class-MOP-0.76.tar.gz) = 3sfN7d7EQ/x+74IgUZiX7+sHnlZWURrcLqYB9D08ykM=
+SIZE (Class-MOP-0.76.tar.gz) = 154409
Index: patches/patch-Makefile_PL
===================================================================
RCS file: patches/patch-Makefile_PL
diff -N patches/patch-Makefile_PL
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile_PL 9 Feb 2009 10:58:03 -0000
@@ -0,0 +1,46 @@
+$OpenBSD$
+
+Avoid GNU make inference rules extension, from NetBSD (applied uptream
+already).
+
+--- Makefile.PL.orig Thu Jan 22 23:20:41 2009
++++ Makefile.PL Mon Feb 9 11:54:12 2009
+@@ -130,9 +130,7 @@ sub is_maintainer {
+ sub get_pp_tests {
+ opendir my $dh, 't' or die "Cannot read t: $!";
+
+- return map {
+- File::Spec->catfile('t', "pp_${_}")
+- } grep { $_ !~ /^99/ } grep {/^\d.+\.t$/} readdir $dh;
++ return grep { $_ !~ /^99/ } grep {/^\d.+\.t$/} readdir $dh;
+ }
+
+ # This is EUMM voodoo
+@@ -149,9 +147,17 @@ sub init {
+ package MY;
+
+ sub postamble {
+- my $pp_tests = join q{ }, ::get_pp_tests();
++ my @test_files = ::get_pp_tests();
++ my $pp_tests = join q{ }, map { File::Spec->catfile('t', "pp_${_}") }
@test_files;
++ my @pp_test_targets = join qq{\n}, map {
++ my $source = File::Spec->catfile('t', ${_});
++ File::Spec->catfile('t', "pp_${_}") . q{: }
++ . qq{$source t/header_pp.inc\n\t}
++ . q{$(NOECHO) $(ABSPERLRUN) "-MExtUtils::Command" -e cat
t/header_pp.inc }
++ . $source . q{ > $...@} . qq{\n}
++ } @test_files;
+ my $test_dep = $::has_compiler && ::is_maintainer()
+- ? 'pure_all :: pp_tests'
++ ? qq{pure_all :: pp_tests\n} . join qq{\n}, @pp_test_targets
+ : '';
+
+ return <<"EOM"
+@@ -159,7 +165,5 @@ pp_tests: ${pp_tests}
+
+ ${test_dep}
+
+-t/pp_%: t/% t/header_pp.inc
+-\t\$(NOECHO) \$(ABSPERLRUN) "-MExtUtils::Command" -e cat t/header_pp.inc \$<
> \$@
+ EOM
+ }
