[50957] trunk/dports/lang/perl5.10

[ricci at macports.org]

Revision: 50957
          http://trac.macports.org/changeset/50957
Author:   ricci at macports.org
Date:     2009-05-13 22:09:42 -0700 (Wed, 13 May 2009)
Log Message:
-----------
resolve #19490 (and #19604) by adding suggested patch

Modified Paths:
--------------
    trunk/dports/lang/perl5.10/Portfile

Added Paths:
-----------
    trunk/dports/lang/perl5.10/files/patch-t_comp_require.t.diff
    trunk/dports/lang/perl5.10/files/patch-toke.c.diff

Modified: trunk/dports/lang/perl5.10/Portfile
===================================================================
--- trunk/dports/lang/perl5.10/Portfile	2009-05-14 04:54:21 UTC (rev 50956)
+++ trunk/dports/lang/perl5.10/Portfile	2009-05-14 05:09:42 UTC (rev 50957)
@@ -4,7 +4,7 @@
 
 name            perl5.10
 version         5.10.0
-revision        3
+revision        4
 categories      lang
 platforms       darwin freebsd linux
 maintainers     ricci openmaintainer
@@ -25,6 +25,20 @@
                 sha1 adf73606dd5248af7ccdd735bcaa0e628ea75b3c \
                 rmd160 c6614fc99a162790a703f91085b24a60af903ba2
 
+##
+## Patchfiles:
+##	patch-t_comp_require.t.diff
+## 	patch-toke.c.diff
+## resolve #19490 (and #19604) with patches from 
+## 	http://www.nntp.perl.org/group/perl.perl5.changes/2008/02/msg21106.html
+## Bug is:
+## 	http://rt.perl.org/rt3/Public/Bug/Display.html?id=49472
+## and marked as fixed for perl 5.10.1 
+## 
+## 
+patchfiles	patch-t_comp_require.t.diff	\
+			patch-toke.c.diff
+
 platform darwin {
     patchfiles-append   patch-hints_darwin.diff \
 						patch-perl.c.diff

Added: trunk/dports/lang/perl5.10/files/patch-t_comp_require.t.diff
===================================================================
--- trunk/dports/lang/perl5.10/files/patch-t_comp_require.t.diff	                        (rev 0)
+++ trunk/dports/lang/perl5.10/files/patch-t_comp_require.t.diff	2009-05-14 05:09:42 UTC (rev 50957)
@@ -0,0 +1,32 @@
+--- t/comp/require.t.orig	2007-12-18 02:47:08.000000000 -0800
++++ t/comp/require.t	2009-05-13 21:20:43.000000000 -0700
+@@ -15,7 +15,7 @@
+ 
+ my $Is_EBCDIC = (ord('A') == 193) ? 1 : 0;
+ my $Is_UTF8   = (${^OPEN} || "") =~ /:utf8/;
+-my $total_tests = 49;
++my $total_tests = 50;
+ if ($Is_EBCDIC || $Is_UTF8) { $total_tests -= 3; }
+ print "1..$total_tests\n";
+ 
+@@ -258,6 +258,20 @@
+     }
+ }
+ 
++#  [perl #49472] Attributes + Unkown Error
++
++{
++	do_require
++		'use strict;sub MODIFY_CODE_ATTRIBUTE{} sub f:Blah {$nosuchvar}';
++	my $err = $@;
++	$err .= "\n" unless $err =~ /\n$/;
++	unless ($err =~ /Global symbol "\$nosuchvar" requires /) {
++		$err =~ s/^/# /mg;
++		print "${err}not ";
++	}
++	print "ok ", ++$i, " [perl #49472]\n";
++}
++
+ ##########################################
+ # What follows are UTF-8 specific tests. #
+ # Add generic tests before this point.   #

Added: trunk/dports/lang/perl5.10/files/patch-toke.c.diff
===================================================================
--- trunk/dports/lang/perl5.10/files/patch-toke.c.diff	                        (rev 0)
+++ trunk/dports/lang/perl5.10/files/patch-toke.c.diff	2009-05-14 05:09:42 UTC (rev 50957)
@@ -0,0 +1,10 @@
+--- toke.c.orig	2007-12-18 02:47:08.000000000 -0800
++++ toke.c	2009-05-13 21:21:32.000000000 -0700
+@@ -692,6 +692,7 @@
+ #else
+     parser->nexttoke = 0;
+ #endif
++    parser->error_count = oparser ? oparser->error_count : 0;
+     parser->copline = NOLINE;
+     parser->lex_state = LEX_NORMAL;
+     parser->expect = XSTATE;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090513/e95decb5/attachment.html>