From fa6ea79312fc43e6551a9b5868d1697ca072fae2 Mon Sep 17 00:00:00 2001 From: Mathieu Arnold Date: Mon, 26 Dec 2016 14:00:09 +0000 Subject: [PATCH] Update to v5.25.8-78-gd720149. Changes: https://github.com/Perl/perl5/compare/v5.25.7-145-g54f6f37...v5.25.8-78-gd720149 Sponsored by: Absolight --- lang/perl5-devel/Makefile | 4 +-- lang/perl5-devel/distinfo | 6 ++-- lang/perl5-devel/files/patch-dtrace | 52 ++++++++++++++--------------- lang/perl5-devel/files/patch-perl.c | 4 +-- lang/perl5-devel/pkg-plist | 4 +++ lang/perl5-devel/version.mk | 2 +- 6 files changed, 38 insertions(+), 34 deletions(-) diff --git a/lang/perl5-devel/Makefile b/lang/perl5-devel/Makefile index 8d587873e50f..277ac525e1ec 100644 --- a/lang/perl5-devel/Makefile +++ b/lang/perl5-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= perl -PORTREVISION= 1 +PORTREVISION= 0 # XXX Remove second line, uncomment first #DISTVERSION= ${PERL_VERSION} DISTVERSION= ${GH_TAGNAME:C/^v//:C/-g[0-9a-f]*$//} @@ -30,7 +30,7 @@ TEST_ENV= ${MAKE_ENV} TEST_JOBS=${MAKE_JOBS_NUMBER} \ USE_GITHUB= yes GH_ACCOUNT= Perl GH_PROJECT= perl5 -GH_TAGNAME= v5.25.7-145-g54f6f37 +GH_TAGNAME= v5.25.8-78-gd720149 MAKE_JOBS_UNSAFE= yes diff --git a/lang/perl5-devel/distinfo b/lang/perl5-devel/distinfo index 088fe1403043..b3ec16840c36 100644 --- a/lang/perl5-devel/distinfo +++ b/lang/perl5-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1482145764 -SHA256 (perl/perl-5.25.7-145_GH0.tar.gz) = 0092a834cef04436c99cf017f37c8cd933648bf9130472562e4ad48db4c8f99e -SIZE (perl/perl-5.25.7-145_GH0.tar.gz) = 18398759 +TIMESTAMP = 1482758953 +SHA256 (perl/perl-5.25.8-78_GH0.tar.gz) = 7e6279bb53b5ba410fbf85ceb981894ab86ecec9246dd0e674ad6edbe3008a8d +SIZE (perl/perl-5.25.8-78_GH0.tar.gz) = 18424919 diff --git a/lang/perl5-devel/files/patch-dtrace b/lang/perl5-devel/files/patch-dtrace index 7bae626907a7..b709a7de45e0 100644 --- a/lang/perl5-devel/files/patch-dtrace +++ b/lang/perl5-devel/files/patch-dtrace @@ -1,6 +1,6 @@ ---- Configure.orig 2016-07-14 15:08:07.000000000 -0400 -+++ Configure 2016-11-24 08:13:04.507723000 -0500 -@@ -940,6 +940,7 @@ +--- Configure.orig 2016-12-26 12:49:24 UTC ++++ Configure +@@ -949,6 +949,7 @@ lddlflags='' usedl='' doublesize='' dtraceobject='' @@ -8,7 +8,7 @@ ebcdic='' fflushNULL='' fflushall='' -@@ -8140,10 +8141,19 @@ +@@ -8202,10 +8203,19 @@ while $test 1 ; do if $test -f $dtrace then @@ -29,7 +29,7 @@ echo " " echo "Good: your $dtrace knows about the -h flag." else -@@ -8157,6 +8167,17 @@ +@@ -8219,6 +8229,17 @@ while $test 1 ; do EOM exit 1 fi @@ -47,7 +47,7 @@ break; fi -@@ -20756,7 +20777,11 @@ +@@ -20971,7 +20992,11 @@ $define) dtraceobject=$define ;; ' '|'') @@ -60,7 +60,7 @@ $cat >try.c </dev/null ;; esac @@ -102,7 +102,7 @@ DTRACE_H = $dtrace_h DTRACE_PERLLIB_O = $dtrace_perllib_o # "dtrace -G" output for perllib_objs -@@ -517,10 +522,53 @@ +@@ -518,10 +523,53 @@ main_only_objs = op$(OBJ_EXT) perl$( miniperl_objs_nodt = $(mini_only_objs) $(common_objs) miniperlmain$(OBJ_EXT) perllib_objs_nodt = $(main_only_objs) $(common_objs) @@ -153,10 +153,10 @@ + +$spitshell >>$Makefile <<'!NO!SUBS!' + - perltoc_pod_prereqs = extra.pods pod/perl5258delta.pod pod/perlapi.pod pod/perlintern.pod pod/perlmodlib.pod pod/perluniprops.pod + perltoc_pod_prereqs = extra.pods pod/perl5259delta.pod pod/perlapi.pod pod/perlintern.pod pod/perlmodlib.pod pod/perluniprops.pod generated_pods = pod/perltoc.pod $(perltoc_pod_prereqs) generated_headers = uudmap.h bitcount.h mg_data.h -@@ -859,19 +907,32 @@ +@@ -834,19 +882,32 @@ mydtrace.h: $(DTRACE_H) define) $spitshell >>$Makefile <<'!NO!SUBS!' $(DTRACE_MINI_O): perldtrace.d $(miniperl_objs_nodt) @@ -193,7 +193,7 @@ !NO!SUBS! case "$useshrplib" in true) -@@ -972,7 +1033,7 @@ +@@ -947,7 +1008,7 @@ lib/buildcustomize.pl: $& $(miniperl_obj *) if test "X$hostperl" != X; then $spitshell >>$Makefile <>$Makefile <<'!NO!SUBS!' @@ -211,7 +211,7 @@ -@rm -f miniperl.xok $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \ $(miniperl_objs) $(libs) -@@ -994,7 +1055,7 @@ +@@ -969,7 +1030,7 @@ lib/buildcustomize.pl: $& $(miniperl_obj $spitshell >>$Makefile <<'!NO!SUBS!' @@ -220,9 +220,9 @@ -@rm -f miniperl.xok !NO!SUBS! ---- Porting/Glossary.orig 2016-07-14 15:06:55.000000000 -0400 -+++ Porting/Glossary 2016-11-24 08:13:04.511723000 -0500 -@@ -2949,6 +2949,11 @@ +--- Porting/Glossary.orig 2016-12-26 12:49:24 UTC ++++ Porting/Glossary +@@ -3031,6 +3031,11 @@ dtrace (usedtrace.U): dtraceobject (dtraceobject.U): Whether we need to build an object file with the dtrace tool. @@ -234,9 +234,9 @@ dynamic_ext (Extensions.U): This variable holds a list of XS extension files we want to link dynamically into the package. It is used by Makefile. ---- ext/XS-APItest/Makefile.PL.orig 2016-07-14 15:08:07.000000000 -0400 -+++ ext/XS-APItest/Makefile.PL 2016-11-24 08:13:04.512100000 -0500 -@@ -58,7 +58,8 @@ +--- ext/XS-APItest/Makefile.PL.orig 2016-12-26 12:49:24 UTC ++++ ext/XS-APItest/Makefile.PL +@@ -59,7 +59,8 @@ sub MY::postamble DTRACE_D = ../../perldtrace.d dtrace\$(OBJ_EXT): \$(DTRACE_D) core\$(OBJ_EXT) @@ -246,9 +246,9 @@ POSTAMBLE return $post; ---- hints/freebsd.sh.orig 2016-07-14 15:07:39.000000000 -0400 -+++ hints/freebsd.sh 2016-11-24 08:13:04.512583000 -0500 -@@ -105,6 +105,15 @@ +--- hints/freebsd.sh.orig 2016-12-26 12:49:24 UTC ++++ hints/freebsd.sh +@@ -105,6 +105,15 @@ case "$osvers" in ;; esac diff --git a/lang/perl5-devel/files/patch-perl.c b/lang/perl5-devel/files/patch-perl.c index 85beaf63897b..59b563329634 100644 --- a/lang/perl5-devel/files/patch-perl.c +++ b/lang/perl5-devel/files/patch-perl.c @@ -1,6 +1,6 @@ ---- perl.c.orig 2016-11-14 00:17:42 UTC +--- perl.c.orig 2016-12-26 12:49:24 UTC +++ perl.c -@@ -1867,23 +1867,7 @@ S_Internals_V(pTHX_ CV *cv) +@@ -1869,23 +1869,7 @@ S_Internals_V(pTHX_ CV *cv) PUSHs(Perl_newSVpvn_flags(aTHX_ non_bincompat_options, sizeof(non_bincompat_options) - 1, SVs_TEMP)); diff --git a/lang/perl5-devel/pkg-plist b/lang/perl5-devel/pkg-plist index bdc503f3f2fc..0b0d5b97a729 100644 --- a/lang/perl5-devel/pkg-plist +++ b/lang/perl5-devel/pkg-plist @@ -520,6 +520,7 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%PRIV_LIB%%/Test2/IPC.pm %%PRIV_LIB%%/Test2/IPC/Driver.pm %%PRIV_LIB%%/Test2/IPC/Driver/Files.pm +%%PRIV_LIB%%/Test2/Tools/Tiny.pm %%PRIV_LIB%%/Test2/Transition.pod %%PRIV_LIB%%/Test2/Util.pm %%PRIV_LIB%%/Test2/Util/ExternalMeta.pm @@ -979,6 +980,7 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%MAN1%%/perl5256delta.1.gz %%MAN1%%/perl5257delta.1.gz %%MAN1%%/perl5258delta.1.gz +%%MAN1%%/perl5259delta.1.gz %%MAN1%%/perl561delta.1.gz %%MAN1%%/perl56delta.1.gz %%MAN1%%/perl581delta.1.gz @@ -1606,6 +1608,7 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%MAN3%%/Test2::IPC.3.gz %%MAN3%%/Test2::IPC::Driver.3.gz %%MAN3%%/Test2::IPC::Driver::Files.3.gz +%%MAN3%%/Test2::Tools::Tiny.3.gz %%MAN3%%/Test2::Transition.3.gz %%MAN3%%/Test2::Util.3.gz %%MAN3%%/Test2::Util::ExternalMeta.3.gz @@ -1762,6 +1765,7 @@ etc/man.d/perl%%PKGNAMESUFFIX%%.conf %%PRIV_LIB%%/pod/perl5256delta.pod %%PRIV_LIB%%/pod/perl5257delta.pod %%PRIV_LIB%%/pod/perl5258delta.pod +%%PRIV_LIB%%/pod/perl5259delta.pod %%PRIV_LIB%%/pod/perl561delta.pod %%PRIV_LIB%%/pod/perl56delta.pod %%PRIV_LIB%%/pod/perl581delta.pod diff --git a/lang/perl5-devel/version.mk b/lang/perl5-devel/version.mk index 9d844033427b..a1ea2cf2698b 100644 --- a/lang/perl5-devel/version.mk +++ b/lang/perl5-devel/version.mk @@ -1,2 +1,2 @@ -PERL_VERSION= 5.25.8 +PERL_VERSION= 5.25.9 PERL5_DEPEND= perl5>=5.25<5.26