Date: Sat, 11 Apr 2015 10:31:43 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383784 - in head/lang: perl5.16 perl5.16/files perl5.18 perl5.18/files perl5.20 perl5.20/files Message-ID: <201504111031.t3BAVhNx034139@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Sat Apr 11 10:31:43 2015 New Revision: 383784 URL: https://svnweb.freebsd.org/changeset/ports/383784 Log: Patch Perl's header for c++11 compatibility. While there, drop MASTER_SITE_SUBDIRS. PR: 199361 Submitted by: amdmi3 Sponsored by: Absolight Added: head/lang/perl5.16/files/patch-pad.h (contents, props changed) head/lang/perl5.18/files/patch-pad.h (contents, props changed) head/lang/perl5.18/files/patch-perl.h (contents, props changed) head/lang/perl5.20/files/patch-vutil.h (contents, props changed) Modified: head/lang/perl5.16/Makefile head/lang/perl5.18/Makefile head/lang/perl5.20/Makefile Modified: head/lang/perl5.16/Makefile ============================================================================== --- head/lang/perl5.16/Makefile Sat Apr 11 09:27:16 2015 (r383783) +++ head/lang/perl5.16/Makefile Sat Apr 11 10:31:43 2015 (r383784) @@ -3,10 +3,9 @@ PORTNAME= perl PORTVERSION= ${PERL_VERSION} -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= lang devel perl5 -MASTER_SITES= CPAN -MASTER_SITE_SUBDIR= ../../src +MASTER_SITES= CPAN/../../src DIST_SUBDIR= perl MAINTAINER= perl@FreeBSD.org Added: head/lang/perl5.16/files/patch-pad.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/perl5.16/files/patch-pad.h Sat Apr 11 10:31:43 2015 (r383784) @@ -0,0 +1,46 @@ +--- pad.h.orig 2013-03-04 15:16:22 UTC ++++ pad.h +@@ -140,14 +140,14 @@ typedef enum { + # define ASSERT_CURPAD_LEGAL(label) \ + pad_peg(label); \ + if (PL_comppad ? (AvARRAY(PL_comppad) != PL_curpad) : (PL_curpad != 0)) \ +- Perl_croak(aTHX_ "panic: illegal pad in %s: 0x%"UVxf"[0x%"UVxf"]",\ ++ Perl_croak(aTHX_ "panic: illegal pad in %s: 0x%" UVxf "[0x%" UVxf "]",\ + label, PTR2UV(PL_comppad), PTR2UV(PL_curpad)); + + + # define ASSERT_CURPAD_ACTIVE(label) \ + pad_peg(label); \ + if (!PL_comppad || (AvARRAY(PL_comppad) != PL_curpad)) \ +- Perl_croak(aTHX_ "panic: invalid pad in %s: 0x%"UVxf"[0x%"UVxf"]",\ ++ Perl_croak(aTHX_ "panic: invalid pad in %s: 0x%" UVxf "[0x%" UVxf "]",\ + label, PTR2UV(PL_comppad), PTR2UV(PL_curpad)); + #else + # define ASSERT_CURPAD_LEGAL(label) +@@ -233,7 +233,7 @@ Restore the old pad saved into the local + PL_comppad = (PAD*) (AvARRAY(padlist)[nth]); \ + PL_curpad = AvARRAY(PL_comppad); \ + DEBUG_Xv(PerlIO_printf(Perl_debug_log, \ +- "Pad 0x%"UVxf"[0x%"UVxf"] set_cur depth=%d\n", \ ++ "Pad 0x%" UVxf "[0x%" UVxf "] set_cur depth=%d\n", \ + PTR2UV(PL_comppad), PTR2UV(PL_curpad), (int)(nth))); + + +@@ -251,7 +251,7 @@ Restore the old pad saved into the local + PL_comppad = (npad); \ + PL_curpad = PL_comppad ? AvARRAY(PL_comppad) : NULL; \ + DEBUG_Xv(PerlIO_printf(Perl_debug_log, \ +- "Pad 0x%"UVxf"[0x%"UVxf"] save_local\n", \ ++ "Pad 0x%" UVxf "[0x%" UVxf "] save_local\n", \ + PTR2UV(PL_comppad), PTR2UV(PL_curpad))); + + #define PAD_RESTORE_LOCAL(opad) \ +@@ -259,7 +259,7 @@ Restore the old pad saved into the local + PL_comppad = opad; \ + PL_curpad = PL_comppad ? AvARRAY(PL_comppad) : NULL; \ + DEBUG_Xv(PerlIO_printf(Perl_debug_log, \ +- "Pad 0x%"UVxf"[0x%"UVxf"] restore_local\n", \ ++ "Pad 0x%" UVxf "[0x%" UVxf "] restore_local\n", \ + PTR2UV(PL_comppad), PTR2UV(PL_curpad))); + + Modified: head/lang/perl5.18/Makefile ============================================================================== --- head/lang/perl5.18/Makefile Sat Apr 11 09:27:16 2015 (r383783) +++ head/lang/perl5.18/Makefile Sat Apr 11 10:31:43 2015 (r383784) @@ -3,10 +3,9 @@ PORTNAME= perl PORTVERSION= ${PERL_VERSION} -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= lang devel perl5 -MASTER_SITES= CPAN -MASTER_SITE_SUBDIR= ../../src +MASTER_SITES= CPAN/../../src DIST_SUBDIR= perl MAINTAINER= perl@FreeBSD.org Added: head/lang/perl5.18/files/patch-pad.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/perl5.18/files/patch-pad.h Sat Apr 11 10:31:43 2015 (r383784) @@ -0,0 +1,46 @@ +--- pad.h.orig 2014-10-01 01:33:00 UTC ++++ pad.h +@@ -143,14 +143,14 @@ typedef enum { + # define ASSERT_CURPAD_LEGAL(label) \ + pad_peg(label); \ + if (PL_comppad ? (AvARRAY(PL_comppad) != PL_curpad) : (PL_curpad != 0)) \ +- Perl_croak(aTHX_ "panic: illegal pad in %s: 0x%"UVxf"[0x%"UVxf"]",\ ++ Perl_croak(aTHX_ "panic: illegal pad in %s: 0x%" UVxf "[0x%" UVxf "]",\ + label, PTR2UV(PL_comppad), PTR2UV(PL_curpad)); + + + # define ASSERT_CURPAD_ACTIVE(label) \ + pad_peg(label); \ + if (!PL_comppad || (AvARRAY(PL_comppad) != PL_curpad)) \ +- Perl_croak(aTHX_ "panic: invalid pad in %s: 0x%"UVxf"[0x%"UVxf"]",\ ++ Perl_croak(aTHX_ "panic: invalid pad in %s: 0x%" UVxf "[0x%" UVxf "]",\ + label, PTR2UV(PL_comppad), PTR2UV(PL_curpad)); + #else + # define ASSERT_CURPAD_LEGAL(label) +@@ -320,7 +320,7 @@ Restore the old pad saved into the local + PL_comppad = (PAD*) (PadlistARRAY(padlist)[nth]); \ + PL_curpad = AvARRAY(PL_comppad); \ + DEBUG_Xv(PerlIO_printf(Perl_debug_log, \ +- "Pad 0x%"UVxf"[0x%"UVxf"] set_cur depth=%d\n", \ ++ "Pad 0x%" UVxf "[0x%" UVxf "] set_cur depth=%d\n", \ + PTR2UV(PL_comppad), PTR2UV(PL_curpad), (int)(nth))); + + +@@ -338,7 +338,7 @@ Restore the old pad saved into the local + PL_comppad = (npad); \ + PL_curpad = PL_comppad ? AvARRAY(PL_comppad) : NULL; \ + DEBUG_Xv(PerlIO_printf(Perl_debug_log, \ +- "Pad 0x%"UVxf"[0x%"UVxf"] save_local\n", \ ++ "Pad 0x%" UVxf "[0x%" UVxf "] save_local\n", \ + PTR2UV(PL_comppad), PTR2UV(PL_curpad))); + + #define PAD_RESTORE_LOCAL(opad) \ +@@ -346,7 +346,7 @@ Restore the old pad saved into the local + PL_comppad = opad; \ + PL_curpad = PL_comppad ? AvARRAY(PL_comppad) : NULL; \ + DEBUG_Xv(PerlIO_printf(Perl_debug_log, \ +- "Pad 0x%"UVxf"[0x%"UVxf"] restore_local\n", \ ++ "Pad 0x%" UVxf "[0x%" UVxf "] restore_local\n", \ + PTR2UV(PL_comppad), PTR2UV(PL_curpad))); + + Added: head/lang/perl5.18/files/patch-perl.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/perl5.18/files/patch-perl.h Sat Apr 11 10:31:43 2015 (r383784) @@ -0,0 +1,20 @@ +--- perl.h.orig 2014-10-01 01:33:00 UTC ++++ perl.h +@@ -4254,7 +4254,7 @@ START_EXTERN_C + EXTCONST char PL_warn_uninit[] + INIT("Use of uninitialized value%s%s%s"); + EXTCONST char PL_warn_uninit_sv[] +- INIT("Use of uninitialized value%"SVf"%s%s"); ++ INIT("Use of uninitialized value%" SVf "%s%s"); + EXTCONST char PL_warn_nosemi[] + INIT("Semicolon seems to be missing"); + EXTCONST char PL_warn_reserved[] +@@ -4274,7 +4274,7 @@ EXTCONST char PL_no_usym[] + EXTCONST char PL_no_aelem[] + INIT("Modification of non-creatable array value attempted, subscript %d"); + EXTCONST char PL_no_helem_sv[] +- INIT("Modification of non-creatable hash value attempted, subscript \"%"SVf"\""); ++ INIT("Modification of non-creatable hash value attempted, subscript \"%" SVf "\""); + EXTCONST char PL_no_modify[] + INIT("Modification of a read-only value attempted"); + EXTCONST char PL_no_mem[sizeof("Out of memory!\n")] Modified: head/lang/perl5.20/Makefile ============================================================================== --- head/lang/perl5.20/Makefile Sat Apr 11 09:27:16 2015 (r383783) +++ head/lang/perl5.20/Makefile Sat Apr 11 10:31:43 2015 (r383784) @@ -3,10 +3,9 @@ PORTNAME= perl PORTVERSION= ${PERL_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang devel perl5 -MASTER_SITES= CPAN -MASTER_SITE_SUBDIR= ../../src +MASTER_SITES= CPAN/../../src DIST_SUBDIR= perl MAINTAINER= perl@FreeBSD.org Added: head/lang/perl5.20/files/patch-vutil.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/perl5.20/files/patch-vutil.h Sat Apr 11 10:31:43 2015 (r383784) @@ -0,0 +1,11 @@ +--- vutil.h.orig 2014-12-27 11:49:03 UTC ++++ vutil.h +@@ -115,7 +115,7 @@ S_croak_xs_usage(pTHX_ const CV *const c + Perl_croak_nocontext("Usage: %s(%s)", gvname, params); + } else { + /* Pants. I don't think that it should be possible to get here. */ +- Perl_croak_nocontext("Usage: CODE(0x%"UVxf")(%s)", PTR2UV(cv), params); ++ Perl_croak_nocontext("Usage: CODE(0x%" UVxf ")(%s)", PTR2UV(cv), params); + } + } +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504111031.t3BAVhNx034139>