We are excited to announce perl v5.18.0, the first stable release of version

18 of Perl 5.

You can find a full list of changes in the file "perldelta.pod" located in
the "pod" directory inside the release and on the web.

Perl v5.18.0 represents approximately 12 months of development since Perl
v5.16.0 and contains approximately 400,000 lines of changes across 2,100
files from 113 authors.

12 files changed, 50 insertions, 181 deletions

diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 543ae8b0df1..18c535f0649 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.200 2013/04/23 12:22:35 obache Exp $
+# $NetBSD: Makefile,v 1.201 2013/05/31 10:55:15 adam Exp $
 
 .include "license.mk"
 .include "Makefile.common"
@@ -163,12 +163,15 @@ SUBST_MESSAGE.rm=	Do not use tools version of rm.
 SUBST_SED.rm=	-e "s!^rm_try='/.*/\\.tools/bin/rm -f!rm_try='/bin/rm -f!"
 
 # Replace our perl as the interpreter
-REPLACE_PERL+=		lib/File/DosGlob.pm
-REPLACE_PERL+=		lib/unicore/mktables
-REPLACE_PERL+=		lib/version.pm
+REPLACE_PERL+=		cpan/Config-Perl-V/V.pm
+REPLACE_PERL+=		cpan/Getopt-Long/lib/Getopt/Long.pm
 REPLACE_PERL+=		dist/bignum/lib/Math/BigFloat/Trace.pm
 REPLACE_PERL+=		dist/bignum/lib/Math/BigInt/Trace.pm
 REPLACE_PERL+=		dist/ExtUtils-ParseXS/lib/ExtUtils/xsubpp
+REPLACE_PERL+=		ext/File-DosGlob/lib/File/DosGlob.pm
+REPLACE_PERL+=		lib/File/DosGlob.pm
+REPLACE_PERL+=		lib/unicore/mktables
+REPLACE_PERL+=		lib/version.pm
 
 # And replace a perl interpreter during the pre-install stage
 # I think this may be a bootstrap script, so can't use REPLACE_PERL
diff --git a/lang/perl5/Makefile.common b/lang/perl5/Makefile.common
index 7dec3921624..fafbcc3b42a 100644
--- a/lang/perl5/Makefile.common
+++ b/lang/perl5/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.17 2013/04/06 01:16:50 dholland Exp $
+# $NetBSD: Makefile.common,v 1.18 2013/05/31 10:55:15 adam Exp $
 #
 # used by lang/perl5/Makefile
 # used by databases/p5-gdbm/Makefile
 
-DISTNAME=	perl-5.16.3
+DISTNAME=	perl-5.18.0
 CATEGORIES=	lang devel perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:S,/modules/by-module/$,/src/5.0/,}
 DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}
@@ -11,5 +11,3 @@ DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.perl.org/
 LICENSE=	${PERL5_LICENSE}
-
-MAKE_JOBS_SAFE=	no
diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk
index 61a898cc534..0ee0edec67c 100644
--- a/lang/perl5/buildlink3.mk
+++ b/lang/perl5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.51 2012/10/03 21:23:25 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.52 2013/05/31 10:55:15 adam Exp $
 
 BUILDLINK_TREE+=	perl
 
@@ -6,13 +6,13 @@ BUILDLINK_TREE+=	perl
 PERL_BUILDLINK3_MK:=
 
 .include "../../mk/bsd.fast.prefs.mk"
-PERL5_REQD+=			5.16.0
+PERL5_REQD+=			5.18.0
 .for _perl5_ver_ in ${PERL5_REQD}
 BUILDLINK_API_DEPENDS.perl+=	perl>=${_perl5_ver_}
 .endfor
-# Prevent p5-* etc. packages built for 5.16.0 to be used
+# Prevent p5-* etc. packages built for 5.18.0 to be used
 # with the next incompatible version of perl:
-BUILDLINK_API_DEPENDS.perl+=	perl<5.18.0
+BUILDLINK_API_DEPENDS.perl+=	perl<5.20.0
 
 BUILDLINK_PKGSRCDIR.perl?=	../../lang/perl5
 
diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo
index 5b19b73fa0a..57c755fd577 100644
--- a/lang/perl5/distinfo
+++ b/lang/perl5/distinfo
@@ -1,24 +1,20 @@
-$NetBSD: distinfo,v 1.98 2013/04/23 12:22:35 obache Exp $
+$NetBSD: distinfo,v 1.99 2013/05/31 10:55:15 adam Exp $
 
-SHA1 (perl-5.16.3.tar.gz) = 83678adf56d3dc51f47a90444a891f4fe16868da
-RMD160 (perl-5.16.3.tar.gz) = e1fe549e5e085c0e089c63d7994d7f11cde059a8
-Size (perl-5.16.3.tar.gz) = 16930885 bytes
+SHA1 (perl-5.18.0.tar.gz) = f5a97a9fa4e9d0ef9c4b313c5b778a0e76291ee2
+RMD160 (perl-5.18.0.tar.gz) = 10774aa60a76b30579aedf23f4a21775301e3235
+Size (perl-5.18.0.tar.gz) = 17323206 bytes
 SHA1 (patch-aa) = 9066746c6e6ed0d58962f52de1ae773e210cfcb5
 SHA1 (patch-ab) = ddddf24cfa96c3b95202c2081006e0c7216afa1d
 SHA1 (patch-ac) = cd918ae7aedddfcd3d555a1d1388c4c8719ccd12
 SHA1 (patch-ah) = f66b496ba8f7b7d3e5a1f0c6f03d051a652f426e
 SHA1 (patch-aq) = 4bf5a76f0277b0939b2ca7720f4bb045a788b5cc
-SHA1 (patch-ca) = 746789b98a4e7c3b84f145c85181d9838c1288ae
+SHA1 (patch-ca) = 54b3f40e181857c197a7d384f89e4c06bbb41ce4
 SHA1 (patch-ch) = 5b6a89c82e158bab0a5f06add48c28e600678099
 SHA1 (patch-ck) = 5c381db130cdf4c315678e2d65380eaaa3065fee
 SHA1 (patch-cn) = d1877383e213a414562b5bb4c1e8aa785926fab7
-SHA1 (patch-cp) = 0b22d334df24d128142855464bf6dd61d4d82975
-SHA1 (patch-cpan_Sys-Syslog_Syslog.xs) = 4413010d0b55a0ae636bca8ff3ace2ebc99e90ba
-SHA1 (patch-dist_Locale-Maketext_lib_Locale_Maketext.pm) = d44647f32d356030c8c2cd6346559f613a7fe459
 SHA1 (patch-hints_cygwin.sh) = 1b21d927d6b7379754c4cd64a2b05d3632c35470
 SHA1 (patch-hints_netbsd.sh) = 8a0656a72e81461f461757712b7fc27ad8928028
-SHA1 (patch-hints_solaris_2.sh) = 26f804234c07da04ebd6c33ce7ad54d94c746f1e
-SHA1 (patch-hv.c) = eaea29e1c59bf3b698478ba8ec3f1b25c4ed6cc8
-SHA1 (patch-ta) = 51a3e02148e78eaab882125f859e59add39a4fbe
+SHA1 (patch-hv.c) = 0ed39926d620724db6d612a717d84b4efa129162
+SHA1 (patch-ta) = 2b71ea3be3feccbdd40a7e7cefddd48e5fb71673
 SHA1 (patch-zd) = 469602bc04b217f2d9929f5caeab43f77a74076f
-SHA1 (patch-ze) = a719797ccf8bb09e75aacc1609408fb4afe6aa60
+SHA1 (patch-ze) = 211ed6065ecf2ca02f8e95283c2d67a64c2e6b41
diff --git a/lang/perl5/patches/patch-ca b/lang/perl5/patches/patch-ca
index c640897aa1a..60486dde181 100644
--- a/lang/perl5/patches/patch-ca
+++ b/lang/perl5/patches/patch-ca
@@ -1,8 +1,4 @@
-$NetBSD: patch-ca,v 1.13 2013/01/24 18:23:51 apb Exp $
-
-* Don't be confused by '=' in output from "uname -a".
-  PR pkg/45814, also reported upstream at
-  <https://rt.perl.org/rt3/Public/Bug/Display.html?id=116523>.
+$NetBSD: patch-ca,v 1.14 2013/05/31 10:55:15 adam Exp $
 
 * Use "uname -r" to get OS version for *BSD.
 
@@ -10,18 +6,9 @@ $NetBSD: patch-ca,v 1.13 2013/01/24 18:23:51 apb Exp $
 
 * Several other changes.
 
---- Configure.orig	2012-10-26 02:44:14.000000000 +0000
+--- Configure.orig	2013-05-10 14:13:56.000000000 +0000
 +++ Configure
-@@ -3099,7 +3099,7 @@ myuname=`$uname -a 2>/dev/null`
- $test -z "$myuname" && myuname=`hostname 2>/dev/null`
- # tr '[A-Z]' '[a-z]' would not work in EBCDIC
- # because the A-Z/a-z are not consecutive.
--myuname=`echo $myuname | $sed -e 's/^[^=]*=//' -e "s,['/],,g" | \
-+myuname=`echo $myuname | $sed -e 's/^[^= ]*=//' -e "s,['/],,g" | \
- 	./tr '[A-Z]' '[a-z]' | $tr $trnl ' '`
- newmyuname="$myuname"
- dflt=n
-@@ -3265,13 +3265,14 @@ EOM
+@@ -3274,13 +3274,14 @@ EOM
  			osvers="$3"
  			;;
  		dragonfly) osname=dragonfly
@@ -38,7 +25,7 @@ $NetBSD: patch-ca,v 1.13 2013/01/24 18:23:51 apb Exp $
  		genix)	osname=genix ;;
  		gnu)	osname=gnu
  			osvers="$3" ;;
-@@ -3293,7 +3294,7 @@ EOM
+@@ -3302,7 +3303,7 @@ EOM
  		MiNT)	osname=mint
  			;;
  		netbsd*) osname=netbsd
@@ -47,7 +34,7 @@ $NetBSD: patch-ca,v 1.13 2013/01/24 18:23:51 apb Exp $
  			;;
  		news-os) osvers="$3"
  			case "$3" in
-@@ -3304,7 +3305,7 @@ EOM
+@@ -3313,7 +3314,7 @@ EOM
  		next*) osname=next ;;
  		nonstop-ux) osname=nonstopux ;;
  		openbsd) osname=openbsd
@@ -56,7 +43,7 @@ $NetBSD: patch-ca,v 1.13 2013/01/24 18:23:51 apb Exp $
                  	;;
  		os2)	osname=os2
  			osvers="$4"
-@@ -4713,7 +4714,7 @@ case "$plibpth" in
+@@ -4722,7 +4723,7 @@ case "$plibpth" in
  esac
  case "$libpth" in
  ' ') dlist='';;
@@ -65,7 +52,7 @@ $NetBSD: patch-ca,v 1.13 2013/01/24 18:23:51 apb Exp $
  *) dlist="$libpth";;
  esac
  
-@@ -4721,7 +4722,7 @@ esac
+@@ -4730,7 +4731,7 @@ esac
  libpth=''
  for xxx in $dlist
  do
@@ -74,7 +61,7 @@ $NetBSD: patch-ca,v 1.13 2013/01/24 18:23:51 apb Exp $
  		case " $libpth " in
  		*" $xxx "*) ;;
  		*) libpth="$libpth $xxx";;
-@@ -6451,7 +6452,9 @@ rp='Pathname for the site-specific libra
+@@ -6486,7 +6487,9 @@ rp='Pathname for the site-specific libra
  . ./getfile
  prefixvar=sitelib
  . ./setprefixvar
@@ -85,7 +72,7 @@ $NetBSD: patch-ca,v 1.13 2013/01/24 18:23:51 apb Exp $
  
  : Determine list of previous versions to include in @INC
  $cat > getverlist <<EOPL
-@@ -6964,7 +6967,9 @@ case "$vendorprefix" in
+@@ -6999,7 +7002,9 @@ case "$vendorprefix" in
  	vendorlibexp="$ansexp"
  	;;
  esac
@@ -96,7 +83,7 @@ $NetBSD: patch-ca,v 1.13 2013/01/24 18:23:51 apb Exp $
  prefixvar=vendorlib
  . ./installprefix
  
-@@ -7441,6 +7446,15 @@ case "$nm_so_opt" in
+@@ -7476,6 +7481,15 @@ case "$nm_so_opt" in
  	;;
  esac
  
@@ -112,8 +99,8 @@ $NetBSD: patch-ca,v 1.13 2013/01/24 18:23:51 apb Exp $
  : Figure out where the libc is located
  case "$runnm" in
  true)
-@@ -8303,7 +8317,7 @@ if "$useshrplib"; then
- 		# beos doesn't like the default, either.
+@@ -8347,7 +8361,7 @@ if "$useshrplib"; then
+ 		# next doesn't like the default...
  		;;
  	haiku)
 -		# Haiku doesn't like the default, either.
@@ -121,7 +108,7 @@ $NetBSD: patch-ca,v 1.13 2013/01/24 18:23:51 apb Exp $
  		;;
  	hpux*)
  		# hpux doesn't like the default, either.
-@@ -9377,6 +9391,13 @@ esac
+@@ -9431,6 +9445,13 @@ esac
  : Check if we want perlio
  useperlio="$define"
  
@@ -135,7 +122,7 @@ $NetBSD: patch-ca,v 1.13 2013/01/24 18:23:51 apb Exp $
  : Set the vendorbin variables
  case "$vendorprefix" in
  '')	d_vendorbin="$undef"
-@@ -19082,7 +19103,15 @@ RCAT(Rei,ser)
+@@ -19243,7 +19264,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-cp b/lang/perl5/patches/patch-cp
deleted file mode 100644
index 4307f8887a5..00000000000
--- a/lang/perl5/patches/patch-cp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cp,v 1.1 2010/08/21 03:12:46 obache Exp $
-
-Allow to install our prefix.
-
---- hints/haiku.sh.orig	2010-04-26 08:09:20.000000000 +0000
-+++ hints/haiku.sh
-@@ -3,3 +3,5 @@
- 
--prefix="/boot/common"
-+case "$prefix" in
-+'') prefix="/boot/common" ;;
-+esac
- 
diff --git a/lang/perl5/patches/patch-cpan_Sys-Syslog_Syslog.xs b/lang/perl5/patches/patch-cpan_Sys-Syslog_Syslog.xs
deleted file mode 100644
index 41b8dbe859e..00000000000
--- a/lang/perl5/patches/patch-cpan_Sys-Syslog_Syslog.xs
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-cpan_Sys-Syslog_Syslog.xs,v 1.1 2012/10/16 13:21:31 obache Exp $
-
-CPAN-RT#77577: Build on Haiku-OS
- https://rt.cpan.org/Public/Bug/Display.html?id=77577
-
---- cpan/Sys-Syslog/Syslog.xs.orig	2012-04-25 00:18:32.000000000 +0000
-+++ cpan/Sys-Syslog/Syslog.xs
-@@ -39,6 +39,10 @@ static SV *ident_svptr;
- #define LOG_FAC(p)      (((p) & LOG_FACMASK) >> 3)
- #endif
- 
-+#ifndef LOG_PRIMASK
-+#define LOG_PRIMASK	0x07
-+#endif
-+
- #ifndef	LOG_PRI
- #define	LOG_PRI(p)	((p) & LOG_PRIMASK)
- #endif
diff --git a/lang/perl5/patches/patch-dist_Locale-Maketext_lib_Locale_Maketext.pm b/lang/perl5/patches/patch-dist_Locale-Maketext_lib_Locale_Maketext.pm
deleted file mode 100644
index ac0eb9f446a..00000000000
--- a/lang/perl5/patches/patch-dist_Locale-Maketext_lib_Locale_Maketext.pm
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-dist_Locale-Maketext_lib_Locale_Maketext.pm,v 1.1 2012/12/12 10:13:47 spz Exp $
-
-patch for SA51498 taken from:
-http://perl5.git.perl.org/perl.git/commitdiff/1735f6f53ca19f99c6e9e39496c486af323ba6a8?hp=569ba91fcdabdc53eb4284f860a25273bd7fe4e1
-
---- dist/Locale-Maketext/lib/Locale/Maketext.pm.orig	2012-10-11 18:20:45.000000000 +0000
-+++ dist/Locale-Maketext/lib/Locale/Maketext.pm	2012-12-12 09:26:29.000000000 +0000
-@@ -625,21 +625,9 @@ sub _compile {
-                         # 0-length method name means to just interpolate:
-                         push @code, ' (';
-                     }
--                    elsif($m =~ /^\w+(?:\:\:\w+)*$/s
--                            and $m !~ m/(?:^|\:)\d/s
--                        # exclude starting a (sub)package or symbol with a digit
-+                    elsif($m =~ /^\w+$/s
-+                        # exclude anything fancy, especially fully-qualified module names
-                     ) {
--                        # Yes, it even supports the demented (and undocumented?)
--                        #  $obj->Foo::bar(...) syntax.
--                        $target->_die_pointing(
--                            $string_to_compile, q{Can't use "SUPER::" in a bracket-group method},
--                            2 + length($c[-1])
--                        )
--                        if $m =~ m/^SUPER::/s;
--                        # Because for SUPER:: to work, we'd have to compile this into
--                        #  the right package, and that seems just not worth the bother,
--                        #  unless someone convinces me otherwise.
--
-                         push @code, ' $_[0]->' . $m . '(';
-                     }
-                     else {
-@@ -693,7 +681,9 @@ sub _compile {
-             elsif(substr($1,0,1) ne '~') {
-                 # it's stuff not containing "~" or "[" or "]"
-                 # i.e., a literal blob
--                $c[-1] .= $1;
-+                my $text = $1;
-+                $text =~ s/\\/\\\\/g;
-+                $c[-1] .= $text;
- 
-             }
-             elsif($1 eq '~~') { # "~~"
-@@ -731,7 +721,9 @@ sub _compile {
-             else {
-                 # It's a "~X" where X is not a special character.
-                 # Consider it a literal ~ and X.
--                $c[-1] .= $1;
-+                my $text = $1;
-+                $text =~ s/\\/\\\\/g;
-+                $c[-1] .= $text;
-             }
-         }
-     }
diff --git a/lang/perl5/patches/patch-hints_solaris_2.sh b/lang/perl5/patches/patch-hints_solaris_2.sh
deleted file mode 100644
index 73892092d84..00000000000
--- a/lang/perl5/patches/patch-hints_solaris_2.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-hints_solaris_2.sh,v 1.2 2012/10/03 19:59:47 adam Exp $
-
-https://rt.perl.org/rt3/Public/Bug/Display.html?id=63604
-
---- hints/solaris_2.sh.orig	2012-06-14 15:47:47.585206126 +0000
-+++ hints/solaris_2.sh	2012-06-14 15:49:23.484363255 +0000
-@@ -594,7 +594,7 @@
- #		    ccflags="$ccflags -Wa,`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`"
- #		fi
- 		ldflags="$ldflags -m64"
--		lddlflags="$lddlflags -G -m64"
-+		lddlflags="$lddlflags -shared -m64"
- 		;;
- 	    *)
- 		getconfccflags="`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`"
diff --git a/lang/perl5/patches/patch-hv.c b/lang/perl5/patches/patch-hv.c
index 3b1e595264f..daf15f10b3a 100644
--- a/lang/perl5/patches/patch-hv.c
+++ b/lang/perl5/patches/patch-hv.c
@@ -1,37 +1,21 @@
-$NetBSD: patch-hv.c,v 1.1 2013/01/17 13:29:59 manu Exp $
+$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:
 
-Program received signal SIGSEGV, Segmentation fault.
-[Switching to LWP 1]
-Perl_hv_undef_flags (my_perl=0xbb537800, hv=0x0, flags=0) at hv.c:1788
-1788        const bool save = !!SvREFCNT(hv);
-(gdb) bt
-#0  Perl_hv_undef_flags (my_perl=0xbb537800, hv=0x0, flags=0) at hv.c:1788
-#1  0xbb646f8e in perl_util_cleanup () from /usr/pkg/lib/httpd/mod_perl.so
-#2  0xbb639b10 in perl_shutdown () from /usr/pkg/lib/httpd/mod_perl.so
-#3  0xbb639ec3 in mp_dso_unload () from /usr/pkg/lib/httpd/mod_perl.so
-#4  0x08073524 in ap_clear_pool ()
-#5  0x08081956 in main ()
-
-
---- hv.c.orig	2013-01-17 08:54:13.000000000 +0100
-+++ hv.c	2013-01-17 08:55:42.000000000 +0100
-@@ -1784,14 +1784,16 @@
- {
+--- 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;
-     register XPVHV* xhv;
+     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-
-        served until after that call (and only deleted afterwards if the
diff --git a/lang/perl5/patches/patch-ta b/lang/perl5/patches/patch-ta
index 59d008268b7..0592e73cfcb 100644
--- a/lang/perl5/patches/patch-ta
+++ b/lang/perl5/patches/patch-ta
@@ -1,15 +1,15 @@
-$NetBSD: patch-ta,v 1.4 2011/08/05 18:06:15 adam Exp $
+$NetBSD: patch-ta,v 1.5 2013/05/31 10:55:15 adam Exp $
 
 On NetBSD, filesystems may be mounted with the noatime option.
 
---- t/io/fs.t.orig	2009-12-06 21:03:51.000000000 +0000
-+++ t/io/fs.t	2009-12-06 21:04:34.000000000 +0000
-@@ -275,15 +275,15 @@
+--- t/io/fs.t.orig	2013-05-01 02:52:56.000000000 +0000
++++ t/io/fs.t
+@@ -275,15 +275,15 @@ sub check_utime_result {
  		is( $atime, 500000001,          'atime' );
  		is( $mtime, 500000000 + $delta, 'mtime' );
  	    }
--	    elsif ($^O eq 'beos' || $^O eq 'haiku') {
-+	    elsif ($^O eq 'beos' || $^O eq 'haiku' || $^O eq 'netbsd') {
+-	    elsif ($^O eq 'haiku') {
++	    elsif ($^O eq 'haiku' || $^O eq 'netbsd')) {
              SKIP: {
  		    skip "atime not updated", 1;
  		}
diff --git a/lang/perl5/patches/patch-ze b/lang/perl5/patches/patch-ze
index 0a26355cb4f..72259c9a976 100644
--- a/lang/perl5/patches/patch-ze
+++ b/lang/perl5/patches/patch-ze
@@ -1,10 +1,10 @@
-$NetBSD: patch-ze,v 1.4 2012/10/03 19:59:47 adam Exp $
+$NetBSD: patch-ze,v 1.5 2013/05/31 10:55:15 adam Exp $
 
 Fixes compilation problem on Solaris/SPARC.
 
---- perl.h.orig	2012-08-03 17:35:26.000000000 +0000
+--- perl.h.orig	2013-05-05 19:32:18.000000000 +0000
 +++ perl.h
-@@ -1393,8 +1393,8 @@ EXTERN_C char *crypt(const char *, const
+@@ -1435,8 +1435,8 @@ EXTERN_C char *crypt(const char *, const
  #       endif
  #else
  #    ifdef HAS_SYS_ERRLIST
@@ -15,7 +15,7 @@ Fixes compilation problem on Solaris/SPARC.
  #       ifndef Strerror
  #           define Strerror(e) \
  		((e) < 0 || (e) >= sys_nerr ? "(unknown)" : sys_errlist[e])
-@@ -1472,6 +1472,10 @@ EXTERN_C char *crypt(const char *, const
+@@ -1514,6 +1514,10 @@ EXTERN_C char *crypt(const char *, const
   */
  
  #if defined(I_SYSMODE) && !defined(PERL_MICRO)