diff options
author | he <he@pkgsrc.org> | 2016-06-08 17:39:30 +0000 |
---|---|---|
committer | he <he@pkgsrc.org> | 2016-06-08 17:39:30 +0000 |
commit | aebdee1cb9b5efdecaf428b3f77634584d809d02 (patch) | |
tree | bf5fcddf7495710bc00022229cbc79e34776de14 /lang | |
parent | c146e8eed6af126d00f82c3a8e307fb518fca2ec (diff) | |
download | pkgsrc-aebdee1cb9b5efdecaf428b3f77634584d809d02.tar.gz |
Update perl to version 5.24.0.
Pkgsrc changes:
* Add candidate fix from https://rt.cpan.org/Public/Bug/Display.html?id=72467
* Remove patches which have been integrated upstream
* Rename and re-mould some patches which required adjustments
http://perlnews.org/2016/05/perl-5-24-released/ has pointer to
more details and says:
May 9 2016
Perl 5.24.0 has been released.
You can read about the changes which include:
Postfix dereferencing is no longer experimental
Unicode 8.0 is now supported
The autoderef feature has been removed
Perl 5.24.0 represents approximately 11 months of development since
Perl 5.22.0 and contains approximately 360,000 lines of changes
across 1,800 files from 77 authors.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/perl5/Makefile.common | 4 | ||||
-rw-r--r-- | lang/perl5/buildlink3.mk | 8 | ||||
-rw-r--r-- | lang/perl5/distinfo | 17 | ||||
-rw-r--r-- | lang/perl5/patches/patch-Configure (renamed from lang/perl5/patches/patch-ca) | 47 | ||||
-rw-r--r-- | lang/perl5/patches/patch-ah | 18 | ||||
-rw-r--r-- | lang/perl5/patches/patch-caretx.c | 18 | ||||
-rw-r--r-- | lang/perl5/patches/patch-cpan_Socket_Socket.xs | 17 | ||||
-rw-r--r-- | lang/perl5/patches/patch-dist_Carp_lib_Carp.pm | 19 | ||||
-rw-r--r-- | lang/perl5/patches/patch-hints_darwin.sh | 26 |
9 files changed, 70 insertions, 104 deletions
diff --git a/lang/perl5/Makefile.common b/lang/perl5/Makefile.common index 9d448424657..e1a442363cf 100644 --- a/lang/perl5/Makefile.common +++ b/lang/perl5/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.26 2016/05/01 00:05:57 ryoon Exp $ +# $NetBSD: Makefile.common,v 1.27 2016/06/08 17:39:30 he Exp $ # # used by lang/perl5/Makefile # used by databases/p5-gdbm/Makefile -DISTNAME= perl-5.22.2 +DISTNAME= perl-5.24.0 CATEGORIES= lang devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:S,/modules/by-module/$,/src/5.0/,} DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk index cda18c07827..77bd2ce93f2 100644 --- a/lang/perl5/buildlink3.mk +++ b/lang/perl5/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.58 2016/03/25 21:10:36 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.59 2016/06/08 17:39:30 he Exp $ BUILDLINK_TREE+= perl @@ -6,13 +6,13 @@ BUILDLINK_TREE+= perl PERL_BUILDLINK3_MK:= .include "../../mk/bsd.fast.prefs.mk" -PERL5_REQD+= 5.22.0 +PERL5_REQD+= 5.24.0 .for _perl5_ver_ in ${PERL5_REQD} BUILDLINK_API_DEPENDS.perl+= perl>=${_perl5_ver_} .endfor -# Prevent p5-* etc. packages built for 5.22.0 to be used +# Prevent p5-* etc. packages built for 5.24.0 to be used # with the next incompatible version of perl: -BUILDLINK_API_DEPENDS.perl+= perl<5.24.0 +BUILDLINK_API_DEPENDS.perl+= perl<5.26.0 BUILDLINK_PKGSRCDIR.perl?= ../../lang/perl5 diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo index f83ec7f3989..7f9b37b06d8 100644 --- a/lang/perl5/distinfo +++ b/lang/perl5/distinfo @@ -1,22 +1,21 @@ -$NetBSD: distinfo,v 1.135 2016/05/01 00:05:57 ryoon Exp $ +$NetBSD: distinfo,v 1.136 2016/06/08 17:39:30 he Exp $ -SHA1 (perl-5.22.2.tar.bz2) = e2f465446dcd45a7fa3da696037f9ebe73e78e55 -RMD160 (perl-5.22.2.tar.bz2) = 203afca8995ca426db0af48b78eb606b5d24011a -SHA512 (perl-5.22.2.tar.bz2) = 1acb77ead47955ef6e8d84903e86cb584ee9415742fb99eb2f1f30772087e8ed0def5f643ce4ee7693df5a1dfe154b108aa85df232d81107f98820bb84a0d71a -Size (perl-5.22.2.tar.bz2) = 13717881 bytes +SHA1 (perl-5.24.0.tar.bz2) = 298fa605138c1a00dab95643130ae0edab369b4d +RMD160 (perl-5.24.0.tar.bz2) = 756bf07069e91eabe3dac3a47aec5097d48f8963 +SHA512 (perl-5.24.0.tar.bz2) = 05ecc6774da475d14f426a850be7adf754fcb17a2fa85a67aeaf8ddb9c86ae8b1ee654e803ebae5ccdaa73ad3e35188e3254ac9452b47cd4f8ffe47e67d15f53 +Size (perl-5.24.0.tar.bz2) = 14155784 bytes +SHA1 (patch-Configure) = 13455c1b32b0f602b339787af4ddcd481f9c2dd5 SHA1 (patch-aa) = 9bbcc9395080b11934528a32808e0a509f1d831c SHA1 (patch-ab) = c899b7221a78e74cc9b1480834baba047dd19f38 SHA1 (patch-ac) = 4baa8f80695687abb53d4f4e1830cf86db5b2bf7 -SHA1 (patch-ah) = c1cb4ddb6db49dcfe12bb1d47911668b2318b953 SHA1 (patch-aq) = 4bf5a76f0277b0939b2ca7720f4bb045a788b5cc -SHA1 (patch-ca) = 32ca5f5cc9264d3bbc5295c04b4062db2a0e1b4d +SHA1 (patch-caretx.c) = 9f53a9133f8dd2f962b448d7288b5b20454c86fb SHA1 (patch-ch) = 5b6a89c82e158bab0a5f06add48c28e600678099 SHA1 (patch-ck) = 483e93a782e5627d3c7334d930ee11010fe7f7d8 SHA1 (patch-cn) = d1877383e213a414562b5bb4c1e8aa785926fab7 -SHA1 (patch-cpan_Socket_Socket.xs) = 9390c42ad456b0ea114c2e57e4d829d630fb698e +SHA1 (patch-dist_Carp_lib_Carp.pm) = fb628ee983462cec9303ceea09852378ec654ecf SHA1 (patch-ext_Errno_Errno__pm.PL) = 4f135e267da17de38f8f1e7e03d5209bfd09a323 SHA1 (patch-hints_cygwin.sh) = 1b21d927d6b7379754c4cd64a2b05d3632c35470 -SHA1 (patch-hints_darwin.sh) = bb4ea9e16a1d441388b8e9cdd37a7d757f3f1687 SHA1 (patch-hints_netbsd.sh) = 0d549a48800372d75fe34b783529a78cba90f646 SHA1 (patch-hints_sco.sh) = 8d43cdc0632799e1cdb5dc6fdb968052a9ae4216 SHA1 (patch-hints_solaris__2.sh) = 0e54889648a6f0f2a0232c5e01bef89d245c213d diff --git a/lang/perl5/patches/patch-ca b/lang/perl5/patches/patch-Configure index e648a411de2..4edfeef90d7 100644 --- a/lang/perl5/patches/patch-ca +++ b/lang/perl5/patches/patch-Configure @@ -1,13 +1,13 @@ -$NetBSD: patch-ca,v 1.25 2016/03/07 21:27:58 kamil Exp $ +$NetBSD: patch-Configure,v 1.3 2016/06/08 17:39:30 he Exp $ * Use "uname -r" to get OS version for *BSD. * Move $loclibpth to the end of $dlist, instead of the beginning. * Detect systems which have <fenv.h> but where using it fails. * Several other changes. ---- Configure.orig 2015-10-17 12:38:37.000000000 +0000 +--- Configure.orig 2016-04-26 22:11:09.000000000 +0000 +++ Configure -@@ -3439,13 +3439,14 @@ EOM +@@ -3468,13 +3468,14 @@ EOM osvers="$3" ;; dragonfly) osname=dragonfly @@ -24,7 +24,7 @@ $NetBSD: patch-ca,v 1.25 2016/03/07 21:27:58 kamil Exp $ genix) osname=genix ;; gnu) osname=gnu osvers="$3" ;; -@@ -3468,7 +3469,7 @@ EOM +@@ -3497,7 +3498,7 @@ EOM MiNT) osname=mint ;; netbsd*) osname=netbsd @@ -33,7 +33,7 @@ $NetBSD: patch-ca,v 1.25 2016/03/07 21:27:58 kamil Exp $ ;; news-os) osvers="$3" case "$3" in -@@ -3478,7 +3479,7 @@ EOM +@@ -3507,7 +3508,7 @@ EOM ;; nonstop-ux) osname=nonstopux ;; openbsd) osname=openbsd @@ -42,7 +42,7 @@ $NetBSD: patch-ca,v 1.25 2016/03/07 21:27:58 kamil Exp $ ;; os2) osname=os2 osvers="$4" -@@ -3493,6 +3494,9 @@ EOM +@@ -3522,6 +3523,9 @@ EOM qnx) osname=qnx osvers="$4" ;; @@ -52,7 +52,7 @@ $NetBSD: patch-ca,v 1.25 2016/03/07 21:27:58 kamil Exp $ solaris) osname=solaris case "$3" in 5*) osvers=`echo $3 | $sed 's/^5/2/g'` ;; -@@ -4931,7 +4935,7 @@ esac +@@ -4960,7 +4964,7 @@ esac # If using gcc or clang, we can get better values for libpth, incpth # and usrinc directly from the compiler. # Note that ccname for clang is also gcc. @@ -61,7 +61,7 @@ $NetBSD: patch-ca,v 1.25 2016/03/07 21:27:58 kamil Exp $ gcc) $echo 'extern int foo;' > try.c set X `$cppstdin -v try.c 2>&1 | $awk '/^#include </,/^End of search /'|$cppfilter $grep '/include'` -@@ -5007,14 +5011,14 @@ case "$plibpth" in +@@ -5036,14 +5040,14 @@ case "$plibpth" in esac case "$libpth" in ' ') dlist='';; @@ -78,7 +78,7 @@ $NetBSD: patch-ca,v 1.25 2016/03/07 21:27:58 kamil Exp $ case " $libpth " in *" $xxx "*) ;; *) libpth="$libpth $xxx";; -@@ -5130,7 +5134,7 @@ lib_ext=$_a +@@ -5159,7 +5163,7 @@ lib_ext=$_a obj_ext=$_o path_sep=$p_ @@ -87,7 +87,7 @@ $NetBSD: patch-ca,v 1.25 2016/03/07 21:27:58 kamil Exp $ : Which makefile gets called first. This is used by make depend. case "$firstmakefile" in -@@ -6416,6 +6420,15 @@ case "$nm_so_opt" in +@@ -6461,6 +6465,15 @@ case "$nm_so_opt" in ;; esac @@ -103,7 +103,7 @@ $NetBSD: patch-ca,v 1.25 2016/03/07 21:27:58 kamil Exp $ : Figure out where the libc is located case "$runnm" in true) -@@ -7490,7 +7503,9 @@ rp='Pathname for the site-specific libra +@@ -7564,7 +7577,9 @@ rp='Pathname for the site-specific libra . ./getfile prefixvar=sitelib . ./setprefixvar @@ -114,16 +114,7 @@ $NetBSD: patch-ca,v 1.25 2016/03/07 21:27:58 kamil Exp $ : Determine list of previous versions to include in @INC $cat > getverlist <<EOPL -@@ -7631,7 +7646,7 @@ echo " " - case "$ptrsize" in - '') - echo "Checking to see how big your pointers are..." >&4 -- $cat >>try.c <<EOCP -+ $cat >try.c <<EOCP - #include <stdio.h> - #$i_stdlib I_STDLIB - #ifdef I_STDLIB -@@ -7902,7 +7917,9 @@ case "$vendorprefix" in +@@ -7976,7 +7991,9 @@ case "$vendorprefix" in vendorlibexp="$ansexp" ;; esac @@ -134,7 +125,7 @@ $NetBSD: patch-ca,v 1.25 2016/03/07 21:27:58 kamil Exp $ prefixvar=vendorlib . ./installprefix -@@ -8443,6 +8460,7 @@ EOM +@@ -8518,6 +8535,7 @@ EOM esac ;; *linux*|irix*|gnu*) dflt="-shared $optimize" ;; @@ -142,7 +133,7 @@ $NetBSD: patch-ca,v 1.25 2016/03/07 21:27:58 kamil Exp $ solaris) # See [perl #66604]. # On Solaris 11, gcc -m64 on amd64 # appears not to understand -G. gcc versions at -@@ -8741,6 +8759,10 @@ if "$useshrplib"; then +@@ -8816,6 +8834,10 @@ if "$useshrplib"; then bsdos|linux|irix*|dec_osf|gnu*|haiku) xxx="-Wl,-rpath,$shrpdir" ;; @@ -153,7 +144,7 @@ $NetBSD: patch-ca,v 1.25 2016/03/07 21:27:58 kamil Exp $ hpux*) # hpux doesn't like the default, either. tmp_shrpenv="env LDOPTS=\"+s +b${shrpdir}\"" -@@ -8748,6 +8770,9 @@ if "$useshrplib"; then +@@ -8823,6 +8845,9 @@ if "$useshrplib"; then cygwin) # cygwin needs only ldlibpth ;; @@ -163,7 +154,7 @@ $NetBSD: patch-ca,v 1.25 2016/03/07 21:27:58 kamil Exp $ *) tmp_shrpenv="env LD_RUN_PATH=$shrpdir" ;; -@@ -9826,6 +9851,13 @@ esac +@@ -9901,6 +9926,13 @@ esac : Check if we want perlio useperlio="$define" @@ -177,7 +168,7 @@ $NetBSD: patch-ca,v 1.25 2016/03/07 21:27:58 kamil Exp $ : Set the vendorbin variables case "$vendorprefix" in '') d_vendorbin="$undef" -@@ -20129,7 +20161,15 @@ RCAT(Rei,ser) +@@ -20262,7 +20294,15 @@ RCAT(Rei,ser) ACAT(Cir,cus) EOCP $cppstdin $cppflags $cppminus <cpp_stuff.c >cpp_stuff.out 2>&1 @@ -194,7 +185,7 @@ $NetBSD: patch-ca,v 1.25 2016/03/07 21:27:58 kamil Exp $ echo "Oh! Smells like ANSI's been here." >&4 echo "We can catify or stringify, separately or together!" cpp_stuff=42 -@@ -22645,6 +22685,21 @@ eval $inhdr +@@ -23049,6 +23089,21 @@ eval $inhdr set fenv.h i_fenv eval $inhdr @@ -216,7 +207,7 @@ $NetBSD: patch-ca,v 1.25 2016/03/07 21:27:58 kamil Exp $ : see if this is a fp.h system set fp.h i_fp eval $inhdr -@@ -24966,4 +25021,3 @@ $rm -f kit*isdone ark*isdone +@@ -25402,4 +25457,3 @@ $rm -f kit*isdone ark*isdone $rm -rf UU : End of Configure diff --git a/lang/perl5/patches/patch-ah b/lang/perl5/patches/patch-ah deleted file mode 100644 index 1466e20ee27..00000000000 --- a/lang/perl5/patches/patch-ah +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ah,v 1.15 2014/05/29 07:57:07 adam Exp $ - -NetBSD's implementation sometimes returns "/"; reject that too. - ---- caretx.c.orig 2014-05-29 07:34:48.000000000 +0000 -+++ caretx.c -@@ -117,8 +117,10 @@ Perl_set_caret_X(pTHX) { - to the executable (or returning an error from the readlink). Any - valid path has a '/' in it somewhere, so use that to validate the - result. See http://www.freebsd.org/cgi/query-pr.cgi?pr=35703 -+ -+ NetBSD's implementation sometimes returns "/"; reject that too. - */ -- if (len > 0 && memchr(buf, '/', len)) { -+ if (len > 1 && memchr(buf, '/', len)) { - sv_setpvn(caret_x, buf, len); - return; - } diff --git a/lang/perl5/patches/patch-caretx.c b/lang/perl5/patches/patch-caretx.c new file mode 100644 index 00000000000..788d946441d --- /dev/null +++ b/lang/perl5/patches/patch-caretx.c @@ -0,0 +1,18 @@ +$NetBSD: patch-caretx.c,v 1.1 2016/06/08 17:39:30 he Exp $ + +NetBSD's implementation sometimes returns "/"; reject that too. + +--- caretx.c.orig 2016-03-01 12:33:01.000000000 +0000 ++++ caretx.c +@@ -121,8 +121,10 @@ Perl_set_caret_X(pTHX) { + to the executable (or returning an error from the readlink). Any + valid path has a '/' in it somewhere, so use that to validate the + result. See http://www.freebsd.org/cgi/query-pr.cgi?pr=35703 ++ ++ NetBSD's implementation sometimes returns "/"; reject that too. + */ +- if (len > 0 && memchr(buf, '/', len)) { ++ if (len > 1 && memchr(buf, '/', len)) { + sv_setpvn(caret_x, buf, len); + return; + } diff --git a/lang/perl5/patches/patch-cpan_Socket_Socket.xs b/lang/perl5/patches/patch-cpan_Socket_Socket.xs deleted file mode 100644 index 1e46f6da5d7..00000000000 --- a/lang/perl5/patches/patch-cpan_Socket_Socket.xs +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-cpan_Socket_Socket.xs,v 1.1 2014/03/14 22:41:10 ryoon Exp $ - -* Fix build under SCO OpenServer 5.0.7/3.2 - ---- cpan/Socket/Socket.xs.orig 2014-01-06 22:46:43.000000000 +0000 -+++ cpan/Socket/Socket.xs -@@ -75,6 +75,10 @@ NETINET_DEFINE_CONTEXT - # define INADDR_LOOPBACK 0x7F000001 - #endif /* INADDR_LOOPBACK */ - -+#if !defined(INET_ADDRSTRLEN) -+#define INET_ADDRSTRLEN 16 -+#endif -+ - #ifndef C_ARRAY_LENGTH - #define C_ARRAY_LENGTH(arr) (sizeof(arr) / sizeof(*(arr))) - #endif /* !C_ARRAY_LENGTH */ diff --git a/lang/perl5/patches/patch-dist_Carp_lib_Carp.pm b/lang/perl5/patches/patch-dist_Carp_lib_Carp.pm new file mode 100644 index 00000000000..f90cdf8d4bb --- /dev/null +++ b/lang/perl5/patches/patch-dist_Carp_lib_Carp.pm @@ -0,0 +1,19 @@ +$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? diff --git a/lang/perl5/patches/patch-hints_darwin.sh b/lang/perl5/patches/patch-hints_darwin.sh deleted file mode 100644 index 25afb6eb01a..00000000000 --- a/lang/perl5/patches/patch-hints_darwin.sh +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-hints_darwin.sh,v 1.6 2015/06/11 13:44:23 adam Exp $ - -MACOSX_DEVELOPMENT_TARGET is required on version of OS X pre 10.6 -See Perl bug #117433 - ---- hints/darwin.sh.orig 2015-05-13 20:19:29.000000000 +0000 -+++ hints/darwin.sh -@@ -200,7 +200,7 @@ case "$osvers" in - ldflags="${ldflags} -flat_namespace" - lddlflags="${ldflags} -bundle -undefined suppress" - ;; --*) -+[7-9].*) - # MACOSX_DEPLOYMENT_TARGET selects the minimum OS level we want to support - # https://developer.apple.com/library/mac/documentation/DeveloperTools/Conceptual/cross_development/Configuring/configuring.html - lddlflags="${ldflags} -bundle -undefined dynamic_lookup" -@@ -209,6 +209,9 @@ case "$osvers" in - *) ld="env MACOSX_DEPLOYMENT_TARGET=10.3 ${ld}" ;; - esac - ;; -+*) -+ lddlflags="${ldflags} -bundle -undefined dynamic_lookup" -+ ;; - esac - ldlibpthname='DYLD_LIBRARY_PATH'; - |