aboutsummaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorSergey Skvortsov <skv@FreeBSD.org>2009-04-11 12:51:22 +0000
committerSergey Skvortsov <skv@FreeBSD.org>2009-04-11 12:51:22 +0000
commit3b03d918066c823f39536b8d108d1145c833a3dd (patch)
treec64bf01cb97c61d3d95161580fc9c721906030d4 /lang
parentf7863280fa6c9a707f6f08c7c4f24cc97561e0c3 (diff)
downloadports-3b03d918066c823f39536b8d108d1145c833a3dd.tar.gz
ports-3b03d918066c823f39536b8d108d1145c833a3dd.zip
Add bugfiux for "Attributes + Unkown Error".
Bug: http://rt.perl.org/rt3/Public/Bug/Display.html?id=49472
Notes
Notes: svn path=/head/; revision=232097
Diffstat (limited to 'lang')
-rw-r--r--lang/perl5.10/Makefile2
-rw-r--r--lang/perl5.10/files/patch-bug4947248
-rw-r--r--lang/perl5.12/Makefile2
-rw-r--r--lang/perl5.12/files/patch-bug4947248
-rw-r--r--lang/perl5.14/Makefile2
-rw-r--r--lang/perl5.14/files/patch-bug4947248
-rw-r--r--lang/perl5.16/Makefile2
-rw-r--r--lang/perl5.16/files/patch-bug4947248
8 files changed, 196 insertions, 4 deletions
diff --git a/lang/perl5.10/Makefile b/lang/perl5.10/Makefile
index aabf0c6a9c92..9dc3f0724c9d 100644
--- a/lang/perl5.10/Makefile
+++ b/lang/perl5.10/Makefile
@@ -7,7 +7,7 @@
PORTNAME= perl
PORTVERSION= ${PERL_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang devel perl5
MASTER_SITES= CPAN \
${MASTER_SITE_LOCAL:S/$/:local/} \
diff --git a/lang/perl5.10/files/patch-bug49472 b/lang/perl5.10/files/patch-bug49472
new file mode 100644
index 000000000000..afc02952ba56
--- /dev/null
+++ b/lang/perl5.10/files/patch-bug49472
@@ -0,0 +1,48 @@
+# http://rt.perl.org/rt3/Public/Bug/Display.html?id=49472
+# http://perl5.git.perl.org/perl.git/commitdiff/ca4cfd28534303b82a216cfe83a1c80cbc3b9dc5?hp=41d86c6b932c287037db3584f7658c067cae5e84
+diff --git a/t/comp/require.t b/t/comp/require.t
+index af5e4b2..0746b3b 100755
+--- t/comp/require.t
++++ t/comp/require.t
+@@ -15,7 +15,7 @@ krunch.pm krunch.pmc whap.pm whap.pmc);
+
+ 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 @@ EOT
+ }
+ }
+
++# [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. #
+diff --git a/toke.c b/toke.c
+index 2ae8b75..ecee902 100644
+--- toke.c
++++ toke.c
+@@ -692,6 +692,7 @@ Perl_lex_start(pTHX_ SV *line, PerlIO *rsfp, bool new_filter)
+ #else
+ parser->nexttoke = 0;
+ #endif
++ parser->error_count = oparser ? oparser->error_count : 0;
+ parser->copline = NOLINE;
+ parser->lex_state = LEX_NORMAL;
+ parser->expect = XSTATE;
diff --git a/lang/perl5.12/Makefile b/lang/perl5.12/Makefile
index aabf0c6a9c92..9dc3f0724c9d 100644
--- a/lang/perl5.12/Makefile
+++ b/lang/perl5.12/Makefile
@@ -7,7 +7,7 @@
PORTNAME= perl
PORTVERSION= ${PERL_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang devel perl5
MASTER_SITES= CPAN \
${MASTER_SITE_LOCAL:S/$/:local/} \
diff --git a/lang/perl5.12/files/patch-bug49472 b/lang/perl5.12/files/patch-bug49472
new file mode 100644
index 000000000000..afc02952ba56
--- /dev/null
+++ b/lang/perl5.12/files/patch-bug49472
@@ -0,0 +1,48 @@
+# http://rt.perl.org/rt3/Public/Bug/Display.html?id=49472
+# http://perl5.git.perl.org/perl.git/commitdiff/ca4cfd28534303b82a216cfe83a1c80cbc3b9dc5?hp=41d86c6b932c287037db3584f7658c067cae5e84
+diff --git a/t/comp/require.t b/t/comp/require.t
+index af5e4b2..0746b3b 100755
+--- t/comp/require.t
++++ t/comp/require.t
+@@ -15,7 +15,7 @@ krunch.pm krunch.pmc whap.pm whap.pmc);
+
+ 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 @@ EOT
+ }
+ }
+
++# [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. #
+diff --git a/toke.c b/toke.c
+index 2ae8b75..ecee902 100644
+--- toke.c
++++ toke.c
+@@ -692,6 +692,7 @@ Perl_lex_start(pTHX_ SV *line, PerlIO *rsfp, bool new_filter)
+ #else
+ parser->nexttoke = 0;
+ #endif
++ parser->error_count = oparser ? oparser->error_count : 0;
+ parser->copline = NOLINE;
+ parser->lex_state = LEX_NORMAL;
+ parser->expect = XSTATE;
diff --git a/lang/perl5.14/Makefile b/lang/perl5.14/Makefile
index aabf0c6a9c92..9dc3f0724c9d 100644
--- a/lang/perl5.14/Makefile
+++ b/lang/perl5.14/Makefile
@@ -7,7 +7,7 @@
PORTNAME= perl
PORTVERSION= ${PERL_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang devel perl5
MASTER_SITES= CPAN \
${MASTER_SITE_LOCAL:S/$/:local/} \
diff --git a/lang/perl5.14/files/patch-bug49472 b/lang/perl5.14/files/patch-bug49472
new file mode 100644
index 000000000000..afc02952ba56
--- /dev/null
+++ b/lang/perl5.14/files/patch-bug49472
@@ -0,0 +1,48 @@
+# http://rt.perl.org/rt3/Public/Bug/Display.html?id=49472
+# http://perl5.git.perl.org/perl.git/commitdiff/ca4cfd28534303b82a216cfe83a1c80cbc3b9dc5?hp=41d86c6b932c287037db3584f7658c067cae5e84
+diff --git a/t/comp/require.t b/t/comp/require.t
+index af5e4b2..0746b3b 100755
+--- t/comp/require.t
++++ t/comp/require.t
+@@ -15,7 +15,7 @@ krunch.pm krunch.pmc whap.pm whap.pmc);
+
+ 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 @@ EOT
+ }
+ }
+
++# [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. #
+diff --git a/toke.c b/toke.c
+index 2ae8b75..ecee902 100644
+--- toke.c
++++ toke.c
+@@ -692,6 +692,7 @@ Perl_lex_start(pTHX_ SV *line, PerlIO *rsfp, bool new_filter)
+ #else
+ parser->nexttoke = 0;
+ #endif
++ parser->error_count = oparser ? oparser->error_count : 0;
+ parser->copline = NOLINE;
+ parser->lex_state = LEX_NORMAL;
+ parser->expect = XSTATE;
diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile
index aabf0c6a9c92..9dc3f0724c9d 100644
--- a/lang/perl5.16/Makefile
+++ b/lang/perl5.16/Makefile
@@ -7,7 +7,7 @@
PORTNAME= perl
PORTVERSION= ${PERL_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang devel perl5
MASTER_SITES= CPAN \
${MASTER_SITE_LOCAL:S/$/:local/} \
diff --git a/lang/perl5.16/files/patch-bug49472 b/lang/perl5.16/files/patch-bug49472
new file mode 100644
index 000000000000..afc02952ba56
--- /dev/null
+++ b/lang/perl5.16/files/patch-bug49472
@@ -0,0 +1,48 @@
+# http://rt.perl.org/rt3/Public/Bug/Display.html?id=49472
+# http://perl5.git.perl.org/perl.git/commitdiff/ca4cfd28534303b82a216cfe83a1c80cbc3b9dc5?hp=41d86c6b932c287037db3584f7658c067cae5e84
+diff --git a/t/comp/require.t b/t/comp/require.t
+index af5e4b2..0746b3b 100755
+--- t/comp/require.t
++++ t/comp/require.t
+@@ -15,7 +15,7 @@ krunch.pm krunch.pmc whap.pm whap.pmc);
+
+ 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 @@ EOT
+ }
+ }
+
++# [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. #
+diff --git a/toke.c b/toke.c
+index 2ae8b75..ecee902 100644
+--- toke.c
++++ toke.c
+@@ -692,6 +692,7 @@ Perl_lex_start(pTHX_ SV *line, PerlIO *rsfp, bool new_filter)
+ #else
+ parser->nexttoke = 0;
+ #endif
++ parser->error_count = oparser ? oparser->error_count : 0;
+ parser->copline = NOLINE;
+ parser->lex_state = LEX_NORMAL;
+ parser->expect = XSTATE;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 09:26:50 +0000