summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authoradam <adam>2014-05-29 07:57:07 +0000
committeradam <adam>2014-05-29 07:57:07 +0000
commit1d0d2344b0253995875119f5b72c5fe60282a809 (patch)
treeeacd917d3b8107b3c75fd68e85fe69f83bb6ee45 /lang
parent0309e57abdb80e3e540f20eee97dcca2dee04145 (diff)
downloadpkgsrc-1d0d2344b0253995875119f5b72c5fe60282a809.tar.gz
Changes 5.20.0:
Experimental Subroutine signatures subs now take a prototype attribute More consistent prototype parsing rand now uses a consistent random number generator New slice syntax Experimental Postfix Dereferencing Unicode 6.3 now supported New \p{Unicode} regular expression pattern property Better 64-bit support use locale now works on UTF-8 locales use locale now compiles on systems without locale ability More locale initialization fallback options -DL runtime option now added for tracing locale setting -F now implies -a and -a implies -n $a and $b warnings exemption
Diffstat (limited to 'lang')
-rw-r--r--lang/perl5/Makefile13
-rw-r--r--lang/perl5/Makefile.common4
-rw-r--r--lang/perl5/buildlink3.mk8
-rw-r--r--lang/perl5/distinfo22
-rw-r--r--lang/perl5/hacks.mk4
-rw-r--r--lang/perl5/patches/patch-aa28
-rw-r--r--lang/perl5/patches/patch-ab47
-rw-r--r--lang/perl5/patches/patch-ac22
-rw-r--r--lang/perl5/patches/patch-ah28
-rw-r--r--lang/perl5/patches/patch-ca51
-rw-r--r--lang/perl5/patches/patch-hv.c21
-rw-r--r--lang/perl5/patches/patch-locale.c18
-rw-r--r--lang/perl5/patches/patch-ze14
13 files changed, 98 insertions, 182 deletions
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 484fe2de3a5..9485407a322 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.220 2014/05/10 13:45:57 richard Exp $
+# $NetBSD: Makefile,v 1.221 2014/05/29 07:57:07 adam Exp $
.include "license.mk"
.include "Makefile.common"
-PKGREVISION= 2
COMMENT= Practical Extraction and Report Language
CONFLICTS+= perl-base-[0-9]* perl-thread-[0-9]*
@@ -284,11 +283,11 @@ SUBST_FILES.dirmode= installhtml install_lib.pl \
SUBST_SED.dirmode= -e "s/755/${PKGDIRMODE}/g;/umask(/d"
post-extract:
- cp ${FILESDIR}/Policy.sh ${WRKSRC}/Policy.sh
- cp ${FILESDIR}/cpan-DB_File-hints-netbsd.pl \
- ${WRKSRC}/cpan/DB_File/hints/netbsd.pl
- cp ${FILESDIR}/cpan-DB_File-hints-openbsd.pl \
- ${WRKSRC}/cpan/DB_File/hints/openbsd.pl
+ cp ${FILESDIR}/Policy.sh ${WRKSRC}/Policy.sh
+ cp ${FILESDIR}/cpan-DB_File-hints-netbsd.pl \
+ ${WRKSRC}/cpan/DB_File/hints/netbsd.pl
+ cp ${FILESDIR}/cpan-DB_File-hints-openbsd.pl \
+ ${WRKSRC}/cpan/DB_File/hints/openbsd.pl
pre-configure:
cd ${WRKSRC} && find `pwd` -name "*.orig" -type f -exec ${RM} -f {} \;
diff --git a/lang/perl5/Makefile.common b/lang/perl5/Makefile.common
index 135fb98b816..f2bdcc96a26 100644
--- a/lang/perl5/Makefile.common
+++ b/lang/perl5/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.20 2014/01/13 09:59:16 adam Exp $
+# $NetBSD: Makefile.common,v 1.21 2014/05/29 07:57:07 adam Exp $
#
# used by lang/perl5/Makefile
# used by databases/p5-gdbm/Makefile
-DISTNAME= perl-5.18.2
+DISTNAME= perl-5.20.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 6fc7537c8df..4da3d7ead97 100644
--- a/lang/perl5/buildlink3.mk
+++ b/lang/perl5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.53 2014/05/21 13:35:23 obache Exp $
+# $NetBSD: buildlink3.mk,v 1.54 2014/05/29 07:57:07 adam Exp $
BUILDLINK_TREE+= perl
@@ -6,13 +6,13 @@ BUILDLINK_TREE+= perl
PERL_BUILDLINK3_MK:=
.include "../../mk/bsd.fast.prefs.mk"
-PERL5_REQD+= 5.18.0
+PERL5_REQD+= 5.20.0
.for _perl5_ver_ in ${PERL5_REQD}
BUILDLINK_API_DEPENDS.perl+= perl>=${_perl5_ver_}
.endfor
-# Prevent p5-* etc. packages built for 5.18.0 to be used
+# Prevent p5-* etc. packages built for 5.20.0 to be used
# with the next incompatible version of perl:
-BUILDLINK_API_DEPENDS.perl+= perl<5.20.0
+BUILDLINK_API_DEPENDS.perl+= perl<5.22.0
BUILDLINK_PKGSRCDIR.perl?= ../../lang/perl5
diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo
index ad3b40a55f2..39222574ba8 100644
--- a/lang/perl5/distinfo
+++ b/lang/perl5/distinfo
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.116 2014/05/10 13:39:57 richard Exp $
+$NetBSD: distinfo,v 1.117 2014/05/29 07:57:07 adam Exp $
-SHA1 (perl-5.18.2.tar.bz2) = b8b87ef46630b5a2287b86b6e0c69088da36adfd
-RMD160 (perl-5.18.2.tar.bz2) = 1b656ae4f53845aac11e62b71c2d84c156ebfbd0
-Size (perl-5.18.2.tar.bz2) = 14058513 bytes
+SHA1 (perl-5.20.0.tar.bz2) = e925e4fc36e90eace19a1ca850f912618ba6788f
+RMD160 (perl-5.20.0.tar.bz2) = a14fa854f2d50aa5f16ff3a982244dd6cd0c4730
+Size (perl-5.20.0.tar.bz2) = 13770469 bytes
SHA1 (patch-Makefile.SH) = 4fceb8bc225ea784ecda3920e888f0ddb1aad997
-SHA1 (patch-aa) = 9066746c6e6ed0d58962f52de1ae773e210cfcb5
-SHA1 (patch-ab) = ddddf24cfa96c3b95202c2081006e0c7216afa1d
-SHA1 (patch-ac) = cd918ae7aedddfcd3d555a1d1388c4c8719ccd12
-SHA1 (patch-ah) = f66b496ba8f7b7d3e5a1f0c6f03d051a652f426e
+SHA1 (patch-aa) = 441ad4f0d27d9be0fcdce31c9d35d35d98958518
+SHA1 (patch-ab) = c899b7221a78e74cc9b1480834baba047dd19f38
+SHA1 (patch-ac) = 7e26ac37d540fdb64a8c1b379f0bbb96efa77e56
+SHA1 (patch-ah) = c1cb4ddb6db49dcfe12bb1d47911668b2318b953
SHA1 (patch-aq) = 4bf5a76f0277b0939b2ca7720f4bb045a788b5cc
-SHA1 (patch-ca) = 7061f28e599526b6f68087b232c3465aac87f1a2
+SHA1 (patch-ca) = 7340d2858d5969d519b43b12e5701677b219bc84
SHA1 (patch-ch) = 5b6a89c82e158bab0a5f06add48c28e600678099
SHA1 (patch-ck) = 5c381db130cdf4c315678e2d65380eaaa3065fee
SHA1 (patch-cn) = d1877383e213a414562b5bb4c1e8aa785926fab7
@@ -18,8 +18,6 @@ SHA1 (patch-hints_cygwin.sh) = 1b21d927d6b7379754c4cd64a2b05d3632c35470
SHA1 (patch-hints_darwin.sh) = c561d1862f8ca76652a35741c691394eb8cda70a
SHA1 (patch-hints_netbsd.sh) = 027722c47bb01aa8db21e534178432cd26b49cdf
SHA1 (patch-hints_sco.sh) = 8d43cdc0632799e1cdb5dc6fdb968052a9ae4216
-SHA1 (patch-hv.c) = 0ed39926d620724db6d612a717d84b4efa129162
-SHA1 (patch-locale.c) = e34500b5d0e2f868a4c9e3b3e4ae84e2ddbf1b18
SHA1 (patch-ta) = a9d13eeec22733e4087942f217a0d47a19498a6f
SHA1 (patch-zd) = 469602bc04b217f2d9929f5caeab43f77a74076f
-SHA1 (patch-ze) = 211ed6065ecf2ca02f8e95283c2d67a64c2e6b41
+SHA1 (patch-ze) = d6fb718a1417e37a7d6bee1ae89fe2beec51c81b
diff --git a/lang/perl5/hacks.mk b/lang/perl5/hacks.mk
index 209faa04bec..2869ad8b301 100644
--- a/lang/perl5/hacks.mk
+++ b/lang/perl5/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.11 2014/05/22 08:17:10 martin Exp $
+# $NetBSD: hacks.mk,v 1.12 2014/05/29 07:57:07 adam Exp $
.if !defined(PERL5_HACKS_MK)
PERL5_HACKS_MK= defined
@@ -79,7 +79,7 @@ PERL5_BUILD_THREADS_SUPPORT= no
.if (!empty(MACHINE_PLATFORM:MNetBSD-*-alpha) || !empty(MACHINE_PLATFORM:MOpenBSD-*-alpha)) \
&& !empty(CC_VERSION:Mgcc-4.*.*)
# XXX: is there any good way to replace the default -O2 with multiple args?
-PKG_HACKS+= alpha-optimisation
+PKG_HACKS+= alpha-optimisation
#BUILDLINK_TRANSFORM+= rename:-O[2-9]*:-O2 -fno-tree-ter
CFLAGS+=-fno-tree-ter
.endif
diff --git a/lang/perl5/patches/patch-aa b/lang/perl5/patches/patch-aa
index dbbb96698d6..c185fd45cd8 100644
--- a/lang/perl5/patches/patch-aa
+++ b/lang/perl5/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.35 2012/10/03 19:59:47 adam Exp $
+$NetBSD: patch-aa,v 1.36 2014/05/29 07:57:07 adam Exp $
-- $Is{NetBSD} and $Is{Interix} are unified into $Is{BSD}.
-- Ignore installed packlist when creating new packlist.
+* $Is{NetBSD} and $Is{Interix} are unified into $Is{BSD}.
+* Ignore installed packlist when creating new packlist.
---- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm.orig 2012-04-25 00:18:31.000000000 +0000
+--- cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm.orig 2014-05-26 13:34:19.000000000 +0000
+++ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
-@@ -29,8 +29,6 @@ BEGIN {
+@@ -29,8 +29,6 @@ BEGIN {
$Is{VMS} = $^O eq 'VMS';
$Is{OSF} = $^O eq 'dec_osf';
$Is{IRIX} = $^O eq 'irix';
@@ -14,21 +14,21 @@ $NetBSD: patch-aa,v 1.35 2012/10/03 19:59:47 adam Exp $
$Is{SunOS4} = $^O eq 'sunos';
$Is{Solaris} = $^O eq 'solaris';
$Is{SunOS} = $Is{SunOS4} || $Is{Solaris};
-@@ -932,7 +930,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $
+@@ -934,7 +932,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $
my $libs = '$(LDLOADLIBS)';
-- if (($Is{NetBSD} || $Is{Interix}) && $Config{'useshrplib'} eq 'true') {
+- if (($Is{NetBSD} || $Is{Interix} || $Is{Android}) && $Config{'useshrplib'} eq 'true') {
+ if ($Is{BSD} && $Config{'useshrplib'} eq 'true') {
# Use nothing on static perl platforms, and to the flags needed
# to link against the shared libperl library on shared perl
# platforms. We peek at lddlflags to see if we need -Wl,-R
-@@ -2079,7 +2077,7 @@ pure_site_install :: all
-
- pure_vendor_install :: all
+@@ -2116,7 +2114,7 @@ pure_vendor_install :: all
$(NOECHO) $(MOD_INSTALL) \
-- read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
-+ read "" \
+ };
+ push @m,
+-q{ read }.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{ \
++q{ read "" \
write }.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{ \
- $(INST_LIB) $(DESTINSTALLVENDORLIB) \
- $(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \
+ } unless $self->{NO_PACKLIST};
+
diff --git a/lang/perl5/patches/patch-ab b/lang/perl5/patches/patch-ab
index 9b24783c283..d4c651737d1 100644
--- a/lang/perl5/patches/patch-ab
+++ b/lang/perl5/patches/patch-ab
@@ -1,51 +1,14 @@
-$NetBSD: patch-ab,v 1.19 2013/03/04 11:56:29 obache Exp $
+$NetBSD: patch-ab,v 1.20 2014/05/29 07:57:07 adam Exp $
-* fixes packlist with destdir installation on Cygwin.
- https://rt.perl.org/rt3/Ticket/Display.html?id=117033
* XXX
---- installperl.orig 2012-10-26 02:44:15.000000000 +0000
+--- installperl.orig 2014-05-26 13:34:20.000000000 +0000
+++ installperl
-@@ -275,7 +275,7 @@ if (($Is_W32 and ! $Is_NetWare) or $Is_C
- safe_unlink("$installbin/$perldll");
- copy("$perldll", "$installbin/$perldll");
- chmod(0755, "$installbin/$perldll");
-- $packlist->{"$installbin/$perldll"} = { type => 'file' };
-+ $packlist->{"$Config{installbin}/$perldll"} = { type => 'file' };
- } # if (($Is_W32 and ! $Is_NetWare) or $Is_Cygwin)
-
- # First we install the version-numbered executables.
-@@ -346,7 +346,6 @@ $do_installprivlib = 0 if $versiononly &
- mkpath($installprivlib, $opts{verbose}, 0777);
- mkpath($installarchlib, $opts{verbose}, 0777);
+@@ -332,7 +332,6 @@ $do_installprivlib = 0 if $versiononly &
+ mkpath($installprivlib);
+ mkpath($installarchlib);
mkpath($installsitelib, $opts{verbose}, 0777) if ($installsitelib);
-mkpath($installsitearch, $opts{verbose}, 0777) if ($installsitearch);
if (-d 'lib') {
find({no_chdir => 1, wanted => \&installlib}, 'lib')
-@@ -367,21 +366,22 @@ if ($Is_VMS) { # We did core file selec
- elsif ($Is_Cygwin) { # On Cygwin symlink it to CORE to make Makefile happy
- @corefiles = <*.h libperl*.* perl*$Config{lib_ext}>;
- my $coredll = "$installarchlib/CORE/$libperl";
-+ my $instcoredll = "$Config{installarchlib}/CORE/$libperl";
- safe_unlink($coredll);
- ( $Config{'d_link'} eq 'define' &&
- eval {
- CORE::link("$installbin/$libperl", $coredll);
-- $packlist->{$coredll} = { from => "$installbin/$libperl",
-+ $packlist->{$instcoredll} = { from => "$Config{installbin}/$libperl",
- type => 'link' };
- }
- ) ||
- eval {
- symlink("$installbin/$libperl", $coredll);
-- $packlist->{$coredll} = { from => "$installbin/$libperl",
-+ $packlist->{$instcoredll} = { from => "$Config{installbin}/$libperl",
- type => 'link' };
- } ||
- ( copy("$installbin/$libperl", $coredll) &&
-- push(@corefiles, $coredll)
-+ push(@corefiles, $instcoredll)
- )
- } else {
- # [als] hard-coded 'libperl' name... not good!
diff --git a/lang/perl5/patches/patch-ac b/lang/perl5/patches/patch-ac
index d54f059edaf..6144d12e5ac 100644
--- a/lang/perl5/patches/patch-ac
+++ b/lang/perl5/patches/patch-ac
@@ -1,18 +1,16 @@
-$NetBSD: patch-ac,v 1.17 2012/10/03 19:59:47 adam Exp $
+$NetBSD: patch-ac,v 1.18 2014/05/29 07:57:07 adam Exp $
We intentionally wire down the 'libswanted' list in the package Makefile,
so don't let the hints file add new libraries that may be found outside
Pkgsrc control.
---- hints/linux.sh 2009-02-13 11:58:12.000000000 +1300
-+++ hints/linux.sh 2009-12-22 16:46:41.400187863 +1300
-@@ -57,9 +57,6 @@
- shift
- libswanted="$*"
+--- hints/linux.sh.orig 2014-05-26 13:34:20.000000000 +0000
++++ hints/linux.sh
+@@ -61,7 +61,6 @@ libswanted="$*"
+ echo $libs
+ if echo " $libswanted " | grep -q ' gdbm '; then
+ # Only add if gdbm is in libswanted.
+- libswanted="$libswanted gdbm_compat"
+ fi
--# Debian 4.0 puts ndbm in the -lgdbm_compat library.
--libswanted="$libswanted gdbm_compat"
--
- # If you have glibc, then report the version for ./myconfig bug reporting.
- # (Configure doesn't need to know the specific version since it just uses
- # gcc to load the library for all tests.)
+ # Configure may fail to find lstat() since it's a static/inline
diff --git a/lang/perl5/patches/patch-ah b/lang/perl5/patches/patch-ah
index 01d9977d07c..1466e20ee27 100644
--- a/lang/perl5/patches/patch-ah
+++ b/lang/perl5/patches/patch-ah
@@ -1,18 +1,18 @@
-$NetBSD: patch-ah,v 1.14 2012/10/03 19:59:47 adam Exp $
+$NetBSD: patch-ah,v 1.15 2014/05/29 07:57:07 adam Exp $
NetBSD's implementation sometimes returns "/"; reject that too.
---- perl.c.orig 2012-08-03 17:35:26.000000000 +0000
-+++ perl.c
-@@ -1451,8 +1451,10 @@ S_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
+--- 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;
- }
++ 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-ca b/lang/perl5/patches/patch-ca
index d8bb2ef7904..8d6993a7c99 100644
--- a/lang/perl5/patches/patch-ca
+++ b/lang/perl5/patches/patch-ca
@@ -1,14 +1,12 @@
-$NetBSD: patch-ca,v 1.19 2014/05/10 13:39:57 richard Exp $
+$NetBSD: patch-ca,v 1.20 2014/05/29 07:57:07 adam Exp $
* Use "uname -r" to get OS version for *BSD.
-
* Move $loclibpth to the end of $dlist, instead of the beginning.
-
* Several other changes.
---- Configure.orig 2014-01-06 22:46:42.000000000 +0000
+--- Configure.orig 2014-05-26 13:34:18.000000000 +0000
+++ Configure
-@@ -3274,13 +3274,14 @@ EOM
+@@ -3372,13 +3372,14 @@ EOM
osvers="$3"
;;
dragonfly) osname=dragonfly
@@ -25,7 +23,7 @@ $NetBSD: patch-ca,v 1.19 2014/05/10 13:39:57 richard Exp $
genix) osname=genix ;;
gnu) osname=gnu
osvers="$3" ;;
-@@ -3302,7 +3303,7 @@ EOM
+@@ -3401,7 +3402,7 @@ EOM
MiNT) osname=mint
;;
netbsd*) osname=netbsd
@@ -34,7 +32,7 @@ $NetBSD: patch-ca,v 1.19 2014/05/10 13:39:57 richard Exp $
;;
news-os) osvers="$3"
case "$3" in
-@@ -3313,7 +3314,7 @@ EOM
+@@ -3412,7 +3413,7 @@ EOM
next*) osname=next ;;
nonstop-ux) osname=nonstopux ;;
openbsd) osname=openbsd
@@ -43,7 +41,7 @@ $NetBSD: patch-ca,v 1.19 2014/05/10 13:39:57 richard Exp $
;;
os2) osname=os2
osvers="$4"
-@@ -3328,6 +3329,9 @@ EOM
+@@ -3427,6 +3428,9 @@ EOM
qnx) osname=qnx
osvers="$4"
;;
@@ -53,7 +51,7 @@ $NetBSD: patch-ca,v 1.19 2014/05/10 13:39:57 richard Exp $
solaris) osname=solaris
case "$3" in
5*) osvers=`echo $3 | $sed 's/^5/2/g'` ;;
-@@ -4722,7 +4726,7 @@ case "$plibpth" in
+@@ -4941,14 +4945,14 @@ case "$plibpth" in
esac
case "$libpth" in
' ') dlist='';;
@@ -62,8 +60,7 @@ $NetBSD: patch-ca,v 1.19 2014/05/10 13:39:57 richard Exp $
*) dlist="$libpth";;
esac
-@@ -4730,7 +4734,7 @@ esac
- libpth=''
+ : Now check and see which directories actually exist, avoiding duplicates
for xxx in $dlist
do
- if $test -d $xxx; then
@@ -71,7 +68,7 @@ $NetBSD: patch-ca,v 1.19 2014/05/10 13:39:57 richard Exp $
case " $libpth " in
*" $xxx "*) ;;
*) libpth="$libpth $xxx";;
-@@ -4819,7 +4823,7 @@ lib_ext=$_a
+@@ -5064,7 +5068,7 @@ lib_ext=$_a
obj_ext=$_o
path_sep=$p_
@@ -80,7 +77,7 @@ $NetBSD: patch-ca,v 1.19 2014/05/10 13:39:57 richard Exp $
: Which makefile gets called first. This is used by make depend.
case "$firstmakefile" in
-@@ -6486,7 +6492,9 @@ rp='Pathname for the site-specific libra
+@@ -6767,7 +6771,9 @@ rp='Pathname for the site-specific libra
. ./getfile
prefixvar=sitelib
. ./setprefixvar
@@ -91,7 +88,7 @@ $NetBSD: patch-ca,v 1.19 2014/05/10 13:39:57 richard Exp $
: Determine list of previous versions to include in @INC
$cat > getverlist <<EOPL
-@@ -6999,7 +7007,9 @@ case "$vendorprefix" in
+@@ -7179,7 +7185,9 @@ case "$vendorprefix" in
vendorlibexp="$ansexp"
;;
esac
@@ -102,7 +99,7 @@ $NetBSD: patch-ca,v 1.19 2014/05/10 13:39:57 richard Exp $
prefixvar=vendorlib
. ./installprefix
-@@ -7476,6 +7486,15 @@ case "$nm_so_opt" in
+@@ -7656,6 +7664,15 @@ case "$nm_so_opt" in
;;
esac
@@ -118,15 +115,15 @@ $NetBSD: patch-ca,v 1.19 2014/05/10 13:39:57 richard Exp $
: Figure out where the libc is located
case "$runnm" in
true)
-@@ -8048,6 +8067,7 @@ EOM
- ;;
- linux|irix*|gnu*) dflt="-shared $optimize" ;;
- next) dflt='none' ;;
-+ sco_sv) dflt='-shared' ;;
- solaris) # See [perl #66604]. On Solaris 11, gcc -m64 on amd64
- # appears not to understand -G. gcc versions at
- # least as old as 3.4.3 support -shared, so just
-@@ -8347,7 +8361,7 @@ if "$useshrplib"; then
+@@ -8240,6 +8257,7 @@ EOM
+ ;;
+ *linux*|irix*|gnu*) dflt="-shared $optimize" ;;
+ next) dflt='none' ;;
++ sco_sv) dflt='-shared' ;;
+ solaris) # See [perl #66604].
+ # On Solaris 11, gcc -m64 on amd64
+ # appears not to understand -G. gcc versions at
+@@ -8549,7 +8567,7 @@ if "$useshrplib"; then
# next doesn't like the default...
;;
haiku)
@@ -135,7 +132,7 @@ $NetBSD: patch-ca,v 1.19 2014/05/10 13:39:57 richard Exp $
;;
hpux*)
# hpux doesn't like the default, either.
-@@ -8356,6 +8376,9 @@ if "$useshrplib"; then
+@@ -8558,6 +8576,9 @@ if "$useshrplib"; then
cygwin)
# cygwin needs only ldlibpth
;;
@@ -145,7 +142,7 @@ $NetBSD: patch-ca,v 1.19 2014/05/10 13:39:57 richard Exp $
*)
tmp_shrpenv="env LD_RUN_PATH=$shrpdir"
;;
-@@ -9431,6 +9454,13 @@ esac
+@@ -9633,6 +9654,13 @@ esac
: Check if we want perlio
useperlio="$define"
@@ -159,7 +156,7 @@ $NetBSD: patch-ca,v 1.19 2014/05/10 13:39:57 richard Exp $
: Set the vendorbin variables
case "$vendorprefix" in
'') d_vendorbin="$undef"
-@@ -19243,7 +19273,15 @@ RCAT(Rei,ser)
+@@ -19366,7 +19394,15 @@ RCAT(Rei,ser)
ACAT(Cir,cus)
EOCP
$cppstdin $cppflags $cppminus <cpp_stuff.c >cpp_stuff.out 2>&1
diff --git a/lang/perl5/patches/patch-hv.c b/lang/perl5/patches/patch-hv.c
deleted file mode 100644
index daf15f10b3a..00000000000
--- a/lang/perl5/patches/patch-hv.c
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-hv.c,v 1.2 2013/05/31 10:55:15 adam Exp $
-
-Work around a crash with apaache-1.3.42 and mod_perl-1.31:
-
---- hv.c.orig 2013-05-09 13:47:39.000000000 +0000
-+++ hv.c
-@@ -1728,12 +1728,13 @@ Perl_hv_undef_flags(pTHX_ HV *hv, U32 fl
- dVAR;
- XPVHV* xhv;
- const char *name;
-- const bool save = !!SvREFCNT(hv);
-+ bool save;
-
- if (!hv)
- return;
- DEBUG_A(Perl_hv_assert(aTHX_ hv));
- xhv = (XPVHV*)SvANY(hv);
-+ save = !!SvREFCNT(hv);
-
- /* The name must be deleted before the call to hfreeeeentries so that
- CVs are anonymised properly. But the effective name must be pre-
diff --git a/lang/perl5/patches/patch-locale.c b/lang/perl5/patches/patch-locale.c
deleted file mode 100644
index 6b02345473a..00000000000
--- a/lang/perl5/patches/patch-locale.c
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-locale.c,v 1.1 2014/03/14 22:41:10 ryoon Exp $
-
---- locale.c.orig 2014-01-06 22:46:45.000000000 +0000
-+++ locale.c
-@@ -517,6 +517,13 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
- char *codeset = NULL;
- #if defined(HAS_NL_LANGINFO) && defined(CODESET)
- codeset = nl_langinfo(CODESET);
-+/*
-+ * SCO OpenServer 5.0.7/3.2's nl_langinfo(CODESET) always returns empty.
-+ */
-+#if defined(_SCO_DS)
-+ strncpy(codeset, "646", 3);
-+ codeset[3] = '\0';
-+#endif
- #endif
- if (codeset)
- utf8locale = (foldEQ(codeset, STR_WITH_LEN("UTF-8"))
diff --git a/lang/perl5/patches/patch-ze b/lang/perl5/patches/patch-ze
index 72259c9a976..aa45c453465 100644
--- a/lang/perl5/patches/patch-ze
+++ b/lang/perl5/patches/patch-ze
@@ -1,11 +1,11 @@
-$NetBSD: patch-ze,v 1.5 2013/05/31 10:55:15 adam Exp $
+$NetBSD: patch-ze,v 1.6 2014/05/29 07:57:07 adam Exp $
Fixes compilation problem on Solaris/SPARC.
---- perl.h.orig 2013-05-05 19:32:18.000000000 +0000
+--- perl.h.orig 2014-05-26 13:34:20.000000000 +0000
+++ perl.h
-@@ -1435,8 +1435,8 @@ EXTERN_C char *crypt(const char *, const
- # endif
+@@ -1265,8 +1265,8 @@ EXTERN_C char *crypt(const char *, const
+ # endif
#else
# ifdef HAS_SYS_ERRLIST
- extern int sys_nerr;
@@ -14,11 +14,11 @@ Fixes compilation problem on Solaris/SPARC.
+ extern const char *const sys_errlist[];
# ifndef Strerror
# define Strerror(e) \
- ((e) < 0 || (e) >= sys_nerr ? "(unknown)" : sys_errlist[e])
-@@ -1514,6 +1514,10 @@ EXTERN_C char *crypt(const char *, const
+ ((e) < 0 || (e) >= sys_nerr ? UNKNOWN_ERRNO_MSG : sys_errlist[e])
+@@ -1331,6 +1331,10 @@ EXTERN_C char *crypt(const char *, const
*/
- #if defined(I_SYSMODE) && !defined(PERL_MICRO)
+ #if defined(I_SYSMODE)
+#if defined(__sun)
+#include <sys/stat.h>
+#include <sys/vnode.h>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-17 20:12:35 +0000