diff options
| author | wiz <wiz@pkgsrc.org> | 2017-11-16 10:28:26 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2017-11-16 10:28:26 +0000 |
| commit | 51912dafe70579887e2ec0a120d90ef7ce8b66b6 (patch) | |
| tree | 280f1c326f7549fc24fce02a6d84412e5a5b316b /lang/perl5 | |
| parent | 6eaa02a075f183485787b19ccdeb57207493b235 (diff) | |
| download | pkgsrc-51912dafe70579887e2ec0a120d90ef7ce8b66b6.tar.gz | |
perl: Remove patch-dist_Carp_lib_Carp.pm
This patch is a workaround for a perl core problem.
The patch has not been accepted upstream, and in its current form
introduces other bugs, see https://rt.perl.org/Ticket/Display.html?id=132448
Bump PKGREVISION.
Diffstat (limited to 'lang/perl5')
| -rw-r--r-- | lang/perl5/Makefile | 3 | ||||
| -rw-r--r-- | lang/perl5/distinfo | 3 | ||||
| -rw-r--r-- | lang/perl5/patches/patch-dist_Carp_lib_Carp.pm | 19 |
3 files changed, 3 insertions, 22 deletions
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile index 7fa00046856..848ecb4b83f 100644 --- a/lang/perl5/Makefile +++ b/lang/perl5/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.242 2017/10/04 12:54:17 he Exp $ +# $NetBSD: Makefile,v 1.243 2017/11/16 10:28:26 wiz Exp $ .include "license.mk" .include "Makefile.common" +PKGREVISION= 1 COMMENT= Practical Extraction and Report Language CONFLICTS+= perl-base-[0-9]* perl-thread-[0-9]* diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo index 24cd86df1cd..7450f2014f6 100644 --- a/lang/perl5/distinfo +++ b/lang/perl5/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.146 2017/10/04 12:54:17 he Exp $ +$NetBSD: distinfo,v 1.147 2017/11/16 10:28:26 wiz Exp $ SHA1 (perl-5.26.1.tar.bz2) = fadec45b7b48a06b3d2adab91c13f568dce717cd RMD160 (perl-5.26.1.tar.bz2) = fff5bf2e6ad6488b8866bf300c32707972b8ffc6 @@ -16,7 +16,6 @@ SHA1 (patch-ch) = 5b6a89c82e158bab0a5f06add48c28e600678099 SHA1 (patch-ck) = 483e93a782e5627d3c7334d930ee11010fe7f7d8 SHA1 (patch-cn) = d1877383e213a414562b5bb4c1e8aa785926fab7 SHA1 (patch-cpan_File-Path_lib_File_Path.pm) = e8a08e7e7fdbebabbeef7eaa651147353eedbfd7 -SHA1 (patch-dist_Carp_lib_Carp.pm) = fb628ee983462cec9303ceea09852378ec654ecf SHA1 (patch-ext_Errno_Errno__pm.PL) = 4f135e267da17de38f8f1e7e03d5209bfd09a323 SHA1 (patch-ext_File-Glob_bsd_glob.c) = e43252b55f04bb1cd69d48e8155aa110532c9fbe SHA1 (patch-ext_File-Glob_t_rt131211.t) = 9aeddad078cdc920e64ed2e73f952be341745d7e diff --git a/lang/perl5/patches/patch-dist_Carp_lib_Carp.pm b/lang/perl5/patches/patch-dist_Carp_lib_Carp.pm deleted file mode 100644 index f90cdf8d4bb..00000000000 --- a/lang/perl5/patches/patch-dist_Carp_lib_Carp.pm +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-dist_Carp_lib_Carp.pm,v 1.1 2016/06/08 17:39:30 he Exp $ - -Apply workaround from https://rt.cpan.org/Public/Bug/Display.html?id=72467 - ---- dist/Carp/lib/Carp.pm.orig 2016-04-06 12:31:16.000000000 +0000 -+++ dist/Carp/lib/Carp.pm -@@ -226,7 +226,11 @@ sub caller_info { - = "** Incomplete caller override detected$where; \@DB::args were not set **"; - } - else { -- @args = @DB::args; -+ @args = map { -+ local $@; -+ my $tmp = eval { Carp::format_arg($_) }; -+ defined($tmp) ? $tmp : 'unknown'; -+ } @DB::args; - my $overflow; - if ( $MaxArgNums and @args > $MaxArgNums ) - { # More than we want to show? |