summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lang/perl5.16/Makefile5
-rw-r--r--lang/perl5.16/files/patch-pad.h46
-rw-r--r--lang/perl5.18/Makefile5
-rw-r--r--lang/perl5.18/files/patch-pad.h46
-rw-r--r--lang/perl5.18/files/patch-perl.h20
-rw-r--r--lang/perl5.20/Makefile5
-rw-r--r--lang/perl5.20/files/patch-vutil.h11
7 files changed, 129 insertions, 9 deletions
diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile
index e9a2b3b7d93d..198b0df15f6f 100644
--- a/lang/perl5.16/Makefile
+++ b/lang/perl5.16/Makefile
@@ -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
diff --git a/lang/perl5.16/files/patch-pad.h b/lang/perl5.16/files/patch-pad.h
new file mode 100644
index 000000000000..87f288899516
--- /dev/null
+++ b/lang/perl5.16/files/patch-pad.h
@@ -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)));
+
+
diff --git a/lang/perl5.18/Makefile b/lang/perl5.18/Makefile
index d3d123194cc8..6523e025f539 100644
--- a/lang/perl5.18/Makefile
+++ b/lang/perl5.18/Makefile
@@ -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
diff --git a/lang/perl5.18/files/patch-pad.h b/lang/perl5.18/files/patch-pad.h
new file mode 100644
index 000000000000..df96aad37e16
--- /dev/null
+++ b/lang/perl5.18/files/patch-pad.h
@@ -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)));
+
+
diff --git a/lang/perl5.18/files/patch-perl.h b/lang/perl5.18/files/patch-perl.h
new file mode 100644
index 000000000000..59529b6dc876
--- /dev/null
+++ b/lang/perl5.18/files/patch-perl.h
@@ -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")]
diff --git a/lang/perl5.20/Makefile b/lang/perl5.20/Makefile
index d0ad5aac51d1..99cc66e11b08 100644
--- a/lang/perl5.20/Makefile
+++ b/lang/perl5.20/Makefile
@@ -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
diff --git a/lang/perl5.20/files/patch-vutil.h b/lang/perl5.20/files/patch-vutil.h
new file mode 100644
index 000000000000..f53ea173a9b0
--- /dev/null
+++ b/lang/perl5.20/files/patch-vutil.h
@@ -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);
+ }
+ }
+
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-07 04:04:43 +0000