Changes 5.16.1:

Enhancements were made to code features such as "use", which now explicitly enables feature bundles, a more consistent "eval" operator, and a revamped "substr" function. The "__SUB__" sequence now returns a reference to the current subroutine, allowing for recursive subroutines to be written more simply. Support for Unicode 6.1 was improved. Many other minor improvements and bugfixes, along with several deprecations, were made

19 files changed, 100 insertions, 233 deletions

diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index c9987f81798..45c3b20c810 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.181 2012/10/02 20:11:48 asau Exp $
+# $NetBSD: Makefile,v 1.182 2012/10/03 19:59:47 adam Exp $
 
 .include "license.mk"
 .include "Makefile.common"
 
 COMMENT=	Practical Extraction and Report Language
-PKGREVISION=	5
 
 CONFLICTS=	perl-base-[0-9]* perl-thread-[0-9]*			\
 		p5-CGI-2.66{,nb*} p5-CGI-2.75{,nb*} p5-CGI-2.75.[0-2]	\
@@ -322,7 +321,7 @@ pre-configure:
 post-build:
 	${SED}	-e "s,@PERL5@,"${PERL5:Q}",g"				\
 		-e "s,@SH@,"${SH:Q}",g"					\
-		-e "s,@PKGMANDIR@,"${PKGMANDIR:Q}",g"			\
+		-e "s,@PKGMANDIR@,"${PKGMANDIR}",g"			\
 		${FILESDIR}/perllink.in > ${WRKDIR}/perllink.sh
 
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
diff --git a/lang/perl5/Makefile.common b/lang/perl5/Makefile.common
index 94c6b104b22..3e695baee54 100644
--- a/lang/perl5/Makefile.common
+++ b/lang/perl5/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.13 2011/10/16 20:43:56 wiz Exp $
+# $NetBSD: Makefile.common,v 1.14 2012/10/03 19:59:47 adam Exp $
 #
 # used by lang/perl5/Makefile
 # used by databases/p5-gdbm/Makefile
 
-DISTNAME=	perl-5.14.2
+DISTNAME=	perl-5.16.1
 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 38000b22a16..85576e3a19f 100644
--- a/lang/perl5/buildlink3.mk
+++ b/lang/perl5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.49 2011/09/14 15:41:36 hans Exp $
+# $NetBSD: buildlink3.mk,v 1.50 2012/10/03 19:59:47 adam Exp $
 
 BUILDLINK_TREE+=	perl
 
@@ -6,13 +6,13 @@ BUILDLINK_TREE+=	perl
 PERL_BUILDLINK3_MK:=
 
 .include "../../mk/bsd.fast.prefs.mk"
-PERL5_REQD+=			5.14.0
+PERL5_REQD+=			5.16.0
 .for _perl5_ver_ in ${PERL5_REQD}
 BUILDLINK_API_DEPENDS.perl+=	perl>=${_perl5_ver_}
 .endfor
 # Prevent p5-* etc. packages built for 5.14.0 to be used
 # with the next incompatible version of perl:
-BUILDLINK_API_DEPENDS.perl+=	perl<5.16.0
+BUILDLINK_API_DEPENDS.perl+=	perl<5.18.0
 
 BUILDLINK_PKGSRCDIR.perl?=	../../lang/perl5
 
diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo
index 32b51086b1f..f5eb89c5495 100644
--- a/lang/perl5/distinfo
+++ b/lang/perl5/distinfo
@@ -1,23 +1,19 @@
-$NetBSD: distinfo,v 1.85 2012/06/14 16:12:11 jperkin Exp $
+$NetBSD: distinfo,v 1.86 2012/10/03 19:59:47 adam Exp $
 
-SHA1 (perl-5.14.2.tar.gz) = df1549d65cdef2b20023af83ecaa2a024109a5ad
-RMD160 (perl-5.14.2.tar.gz) = bed043edbebd69e1279e9a70424e2552389bea79
-Size (perl-5.14.2.tar.gz) = 15223598 bytes
-SHA1 (patch-aa) = 7578d0ee8fa20e055c50b8c617680b0d90cc5efa
-SHA1 (patch-ab) = b6104a02aa6fbeda2340042a93c2382d1a1965bb
-SHA1 (patch-ac) = c1893ea4cf4b89b03b3acc5dec9b5828d50c5dad
-SHA1 (patch-ah) = 6fe177646f0fc40f11f4b2b4f504ca45ddff1941
-SHA1 (patch-aq) = 0afdf2d8a262ea09e2df6efae705e7227dc9f06f
-SHA1 (patch-ca) = 51ef8888578ce7a724313d6f62e573ca92e455f7
+SHA1 (perl-5.16.1.tar.gz) = 60f2b81e3ffaff3030962ccbc02cd04f91f69ad5
+RMD160 (perl-5.16.1.tar.gz) = c1e69440727c773d5f012e735e77bf3d6a6fa342
+Size (perl-5.16.1.tar.gz) = 15733676 bytes
+SHA1 (patch-aa) = 9066746c6e6ed0d58962f52de1ae773e210cfcb5
+SHA1 (patch-ab) = a9c674c5b09700d13fa885f11a3525d6d54899b5
+SHA1 (patch-ac) = cd918ae7aedddfcd3d555a1d1388c4c8719ccd12
+SHA1 (patch-ah) = f66b496ba8f7b7d3e5a1f0c6f03d051a652f426e
+SHA1 (patch-aq) = 4bf5a76f0277b0939b2ca7720f4bb045a788b5cc
+SHA1 (patch-ca) = 30450f739f51a07825442744d6c38b27b58ddd87
 SHA1 (patch-ch) = 5b6a89c82e158bab0a5f06add48c28e600678099
 SHA1 (patch-ck) = 5c381db130cdf4c315678e2d65380eaaa3065fee
-SHA1 (patch-cn) = a88fcb04b32c6e446d77b62cb6883a04f04e2e75
+SHA1 (patch-cn) = d1877383e213a414562b5bb4c1e8aa785926fab7
 SHA1 (patch-cp) = 0b22d334df24d128142855464bf6dd61d4d82975
-SHA1 (patch-cpan_Digest_Digest.pm) = bcd507631268608385a1a80d879c44cb2a057560
-SHA1 (patch-dist_ExtUtils_CBuilder_lib_ExtUtils_CBuilder_Base.pm) = 322af733b280a3f9c676dcbc890d8dc4f0e3880b
-SHA1 (patch-dist_ExtUtils_CBuilder_t_04-base.t) = 362e6f2884fa225f541b22d8f44af1aa58859daf
-SHA1 (patch-hints_netbsd.sh) = acbe28ff4b99d45e29e66003bdd370ba5aaaa999
-SHA1 (patch-hints_solaris_2.sh) = ded1dca7f731764c750b5064cc3cc84fbfb98546
+SHA1 (patch-hints_solaris_2.sh) = 26f804234c07da04ebd6c33ce7ad54d94c746f1e
 SHA1 (patch-ta) = 51a3e02148e78eaab882125f859e59add39a4fbe
-SHA1 (patch-zd) = 15532739b4a582da322d3e51fc364905bacbcd7e
-SHA1 (patch-ze) = 82f03439ab59aac4adfcb895ca22a0bbaaa0a6d1
+SHA1 (patch-zd) = 469602bc04b217f2d9929f5caeab43f77a74076f
+SHA1 (patch-ze) = a719797ccf8bb09e75aacc1609408fb4afe6aa60
diff --git a/lang/perl5/hacks.mk b/lang/perl5/hacks.mk
index 3dba627bf06..b0558bcfbdd 100644
--- a/lang/perl5/hacks.mk
+++ b/lang/perl5/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.5 2011/10/11 10:02:13 hauke Exp $
+# $NetBSD: hacks.mk,v 1.6 2012/10/03 19:59:47 adam Exp $
 
 .if !defined(PERL5_HACKS_MK)
 PERL5_HACKS_MK=	defined
@@ -50,18 +50,18 @@ CFLAGS+=	-fno-cse-skip-blocks
 ### [ Fri Oct 11 10:00:00 UTC 2011 : hauke ]
 ###
 ### On m68k, gcc creates short assembler branch insns, and expects
-### the assembler to adapt them to the distance. m68k gas appears not to 
-### do that for fpu branch insns, resulting in an out-of-range FPU 
+### the assembler to adapt them to the distance. m68k gas appears not to
+### do that for fpu branch insns, resulting in an out-of-range FPU
 ### assembler branch instruction error in "ext/re/re_exec.c".
 ###
-### As a workaround, building with "-Os" instead of "-O2" reduces 
+### As a workaround, building with "-Os" instead of "-O2" reduces
 ### the size of the object file enough to allow short branches.
-### 
+###
 ### See PR toolchain/45439.
 
-.  if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "m68k"
+.if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "m68k"
 PKG_HACKS+=		m68k-codegen
 BUILDLINK_TRANSFORM+=	rename:-O[0-9]*:-Os
-.  endif
+.endif
 
 .endif  # PERL5_HACKS_MK
diff --git a/lang/perl5/patches/patch-aa b/lang/perl5/patches/patch-aa
index bb8a8679ef5..dbbb96698d6 100644
--- a/lang/perl5/patches/patch-aa
+++ b/lang/perl5/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.34 2011/12/08 22:43:49 hiramatsu Exp $
+$NetBSD: patch-aa,v 1.35 2012/10/03 19:59:47 adam Exp $
 
 - $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	2011-09-26 18:44:34.000000000 +0900
-+++ cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm	2011-12-08 10:18:48.000000000 +0900
-@@ -28,8 +28,6 @@
+--- 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
+@@ -29,8 +29,6 @@ BEGIN { 
      $Is{VMS}     = $^O eq 'VMS';
      $Is{OSF}     = $^O eq 'dec_osf';
      $Is{IRIX}    = $^O eq 'irix';
@@ -14,7 +14,7 @@ $NetBSD: patch-aa,v 1.34 2011/12/08 22:43:49 hiramatsu Exp $
      $Is{SunOS4}  = $^O eq 'sunos';
      $Is{Solaris} = $^O eq 'solaris';
      $Is{SunOS}   = $Is{SunOS4} || $Is{Solaris};
-@@ -931,7 +929,7 @@
+@@ -932,7 +930,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $
  
      my $libs = '$(LDLOADLIBS)';
  
@@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.34 2011/12/08 22:43:49 hiramatsu Exp $
  	# 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
-@@ -2081,7 +2079,7 @@
+@@ -2079,7 +2077,7 @@ pure_site_install :: all
  
  pure_vendor_install :: all
  	$(NOECHO) $(MOD_INSTALL) \
diff --git a/lang/perl5/patches/patch-ab b/lang/perl5/patches/patch-ab
index 6638eddf46e..7252e101bc5 100644
--- a/lang/perl5/patches/patch-ab
+++ b/lang/perl5/patches/patch-ab
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.16 2011/08/05 18:06:14 adam Exp $
+$NetBSD: patch-ab,v 1.17 2012/10/03 19:59:47 adam Exp $
 
---- installperl.orig	2009-12-06 17:14:00.000000000 +0000
-+++ installperl	2009-12-06 17:14:13.000000000 +0000
-@@ -348,7 +348,6 @@
+--- installperl.orig	2012-08-03 17:35:26.000000000 +0000
++++ installperl
+@@ -346,7 +346,6 @@ $do_installprivlib = 0 if $versiononly &
  mkpath($installprivlib, $opts{verbose}, 0777);
  mkpath($installarchlib, $opts{verbose}, 0777);
  mkpath($installsitelib, $opts{verbose}, 0777) if ($installsitelib);
 -mkpath($installsitearch, $opts{verbose}, 0777) if ($installsitearch);
  
- if (chdir "lib") {
-     $do_installarchlib = ! samepath($installarchlib, '.');
+ if (-d 'lib') {
+     find({no_chdir => 1, wanted => \&installlib}, 'lib')
diff --git a/lang/perl5/patches/patch-ac b/lang/perl5/patches/patch-ac
index c3f7da3068d..d54f059edaf 100644
--- a/lang/perl5/patches/patch-ac
+++ b/lang/perl5/patches/patch-ac
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.16 2010/08/30 07:36:31 dsainty Exp $
+$NetBSD: patch-ac,v 1.17 2012/10/03 19:59:47 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
@@ -6,7 +6,7 @@ Pkgsrc control.
 
 --- hints/linux.sh	2009-02-13 11:58:12.000000000 +1300
 +++ hints/linux.sh	2009-12-22 16:46:41.400187863 +1300
-@@ -54,9 +54,6 @@
+@@ -57,9 +57,6 @@
  shift
  libswanted="$*"
  
diff --git a/lang/perl5/patches/patch-ah b/lang/perl5/patches/patch-ah
index f43547f1f44..01d9977d07c 100644
--- a/lang/perl5/patches/patch-ah
+++ b/lang/perl5/patches/patch-ah
@@ -1,18 +1,18 @@
-$NetBSD: patch-ah,v 1.13 2011/08/05 18:06:14 adam Exp $
+$NetBSD: patch-ah,v 1.14 2012/10/03 19:59:47 adam Exp $
 
 NetBSD's implementation sometimes returns "/"; reject that too.
 
---- perl.c.orig	2010-05-21 14:41:18.000000000 +0000
-+++ perl.c	2010-05-21 14:44:01.000000000 +0000
-@@ -1422,8 +1422,10 @@
-        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
+--- 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
 +
-+       NetBSD's implementation sometimes returns "/"; reject that too.
-     */
--    if (len > 0 && memchr(buf, '/', len)) {
-+    if (len > 1 && memchr(buf, '/', len)) {
- 	sv_setpvn(sv,buf,len);
-     }
-     else {
++	   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-aq b/lang/perl5/patches/patch-aq
index 08ca8e66f6a..5ab0435e0c3 100644
--- a/lang/perl5/patches/patch-aq
+++ b/lang/perl5/patches/patch-aq
@@ -1,8 +1,8 @@
-$NetBSD: patch-aq,v 1.3 2011/08/05 18:06:14 adam Exp $
+$NetBSD: patch-aq,v 1.4 2012/10/03 19:59:47 adam Exp $
 
---- XSUB.h.orig	2007-12-18 11:47:07.000000000 +0100
+--- XSUB.h.orig	2012-08-03 17:35:26.000000000 +0000
 +++ XSUB.h
-@@ -94,6 +94,9 @@ is a lexical $_ in scope.
+@@ -102,6 +102,9 @@ is a lexical $_ in scope.
  #ifndef PERL_UNUSED_VAR
  #  define PERL_UNUSED_VAR(x) ((void)x)
  #endif
@@ -12,20 +12,23 @@ $NetBSD: patch-aq,v 1.3 2011/08/05 18:06:14 adam Exp $
  
  #define ST(off) PL_stack_base[ax + (off)]
  
-@@ -117,15 +120,7 @@ is a lexical $_ in scope.
- #  define XS(name) EXPORT_C XSPROTO(name)
+@@ -137,18 +140,7 @@ is a lexical $_ in scope.
+ #  define XS_INTERNAL(name) EXPORT_C STATIC XSPROTO(name)
  #endif
- #ifndef XS
+ #ifndef XS_EXTERNAL
 -#  if defined(HASATTRIBUTE_UNUSED) && !defined(__cplusplus)
--#    define XS(name) void name(pTHX_ CV* cv __attribute__unused__)
+-#    define XS_EXTERNAL(name) void name(pTHX_ CV* cv __attribute__unused__)
+-#    define XS_INTERNAL(name) STATIC void name(pTHX_ CV* cv __attribute__unused__)
 -#  else
 -#    ifdef __cplusplus
--#      define XS(name) extern "C" XSPROTO(name)
+-#      define XS_EXTERNAL(name) extern "C" XSPROTO(name)
+-#      define XS_INTERNAL(name) static XSPROTO(name)
 -#    else
--#      define XS(name) XSPROTO(name)
+-#      define XS_EXTERNAL(name) XSPROTO(name)
+-#      define XS_INTERNAL(name) STATIC XSPROTO(name)
 -#    endif
 -#  endif
-+#  define XS(name) void name(pTHX_ CV* cv PERL_UNUSED_DECL)
++#  define XS_EXTERNAL(name) void name(pTHX_ CV* cv PERL_UNUSED_DECL)
  #endif
  
- #define dAX const I32 ax = (I32)(MARK - PL_stack_base + 1)
+ /* We do export xsub symbols by default for the public XS macro.
diff --git a/lang/perl5/patches/patch-ca b/lang/perl5/patches/patch-ca
index 228b77bec4c..926dd4f160b 100644
--- a/lang/perl5/patches/patch-ca
+++ b/lang/perl5/patches/patch-ca
@@ -1,8 +1,8 @@
-$NetBSD: patch-ca,v 1.11 2012/02/19 04:10:49 sbd Exp $
+$NetBSD: patch-ca,v 1.12 2012/10/03 19:59:47 adam Exp $
 
---- Configure.orig	2011-09-26 09:44:34.000000000 +0000
+--- Configure.orig	2012-08-03 17:35:26.000000000 +0000
 +++ Configure
-@@ -3256,13 +3256,14 @@ EOM
+@@ -3265,13 +3265,14 @@ EOM
  			osvers="$3"
  			;;
  		dragonfly) osname=dragonfly
@@ -19,7 +19,7 @@ $NetBSD: patch-ca,v 1.11 2012/02/19 04:10:49 sbd Exp $
  		genix)	osname=genix ;;
  		gnu)	osname=gnu
  			osvers="$3" ;;
-@@ -3284,7 +3285,7 @@ EOM
+@@ -3293,7 +3294,7 @@ EOM
  		MiNT)	osname=mint
  			;;
  		netbsd*) osname=netbsd
@@ -28,7 +28,7 @@ $NetBSD: patch-ca,v 1.11 2012/02/19 04:10:49 sbd Exp $
  			;;
  		news-os) osvers="$3"
  			case "$3" in
-@@ -3295,7 +3296,7 @@ EOM
+@@ -3304,7 +3305,7 @@ EOM
  		next*) osname=next ;;
  		nonstop-ux) osname=nonstopux ;;
  		openbsd) osname=openbsd
@@ -37,7 +37,7 @@ $NetBSD: patch-ca,v 1.11 2012/02/19 04:10:49 sbd Exp $
                  	;;
  		os2)	osname=os2
  			osvers="$4"
-@@ -4790,7 +4791,7 @@ case "$plibpth" in
+@@ -4713,7 +4714,7 @@ case "$plibpth" in
  esac
  case "$libpth" in
  ' ') dlist='';;
@@ -46,7 +46,7 @@ $NetBSD: patch-ca,v 1.11 2012/02/19 04:10:49 sbd Exp $
  *) dlist="$libpth";;
  esac
  
-@@ -4798,7 +4799,7 @@ esac
+@@ -4721,7 +4722,7 @@ esac
  libpth=''
  for xxx in $dlist
  do
@@ -55,7 +55,7 @@ $NetBSD: patch-ca,v 1.11 2012/02/19 04:10:49 sbd Exp $
  		case " $libpth " in
  		*" $xxx "*) ;;
  		*) libpth="$libpth $xxx";;
-@@ -6521,7 +6522,9 @@ rp='Pathname for the site-specific libra
+@@ -6451,7 +6452,9 @@ rp='Pathname for the site-specific libra
  . ./getfile
  prefixvar=sitelib
  . ./setprefixvar
@@ -66,7 +66,7 @@ $NetBSD: patch-ca,v 1.11 2012/02/19 04:10:49 sbd Exp $
  
  : Determine list of previous versions to include in @INC
  $cat > getverlist <<EOPL
-@@ -7033,7 +7036,9 @@ case "$vendorprefix" in
+@@ -6964,7 +6967,9 @@ case "$vendorprefix" in
  	vendorlibexp="$ansexp"
  	;;
  esac
@@ -77,7 +77,7 @@ $NetBSD: patch-ca,v 1.11 2012/02/19 04:10:49 sbd Exp $
  prefixvar=vendorlib
  . ./installprefix
  
-@@ -7510,6 +7515,15 @@ case "$nm_so_opt" in
+@@ -7441,6 +7446,15 @@ case "$nm_so_opt" in
  	;;
  esac
  
@@ -93,7 +93,7 @@ $NetBSD: patch-ca,v 1.11 2012/02/19 04:10:49 sbd Exp $
  : Figure out where the libc is located
  case "$runnm" in
  true)
-@@ -8339,7 +8353,7 @@ if "$useshrplib"; then
+@@ -8303,7 +8317,7 @@ if "$useshrplib"; then
  		# beos doesn't like the default, either.
  		;;
  	haiku)
@@ -102,9 +102,9 @@ $NetBSD: patch-ca,v 1.11 2012/02/19 04:10:49 sbd Exp $
  		;;
  	hpux*)
  		# hpux doesn't like the default, either.
-@@ -9410,6 +9424,13 @@ EOCP
- 	;;
- esac
+@@ -9377,6 +9391,13 @@ esac
+ : Check if we want perlio
+ useperlio="$define"
  
 +: Look for a hint-file generated 'call-back-unit'.  We need
 +: to set some defaults for building perl in pkgsrc.
@@ -116,7 +116,7 @@ $NetBSD: patch-ca,v 1.11 2012/02/19 04:10:49 sbd Exp $
  : Set the vendorbin variables
  case "$vendorprefix" in
  '')	d_vendorbin="$undef"
-@@ -19061,7 +19082,15 @@ RCAT(Rei,ser)
+@@ -19082,7 +19103,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-cn b/lang/perl5/patches/patch-cn
index 01b8511194f..d6e06723304 100644
--- a/lang/perl5/patches/patch-cn
+++ b/lang/perl5/patches/patch-cn
@@ -1,8 +1,8 @@
-$NetBSD: patch-cn,v 1.3 2011/08/05 18:06:14 adam Exp $
+$NetBSD: patch-cn,v 1.4 2012/10/03 19:59:47 adam Exp $
 
---- hints/hpux.sh.orig	2007-12-18 11:47:07.000000000 +0100
+--- hints/hpux.sh.orig	2012-08-03 17:35:26.000000000 +0000
 +++ hints/hpux.sh
-@@ -377,7 +377,7 @@ case "$ccisgcc" in
+@@ -387,7 +387,7 @@ case "$ccisgcc" in
  	    *O[3456789]*) optimize=`echo "$optimize" | sed -e 's/O[3-9]/O2/'` ;;
  	    esac
  	#ld="$cc"
@@ -11,7 +11,7 @@ $NetBSD: patch-cn,v 1.3 2011/08/05 18:06:14 adam Exp $
  	cccdlflags='-fPIC'
  	#lddlflags='-shared'
  	lddlflags='-b'
-@@ -435,7 +435,7 @@ case "$ccisgcc" in
+@@ -458,7 +458,7 @@ case "$ccisgcc" in
  	    toke_cflags="$toke_cflags;optimize=\"$opt\""
  	    regexec_cflags="optimize=\"$opt\""
  	    fi
diff --git a/lang/perl5/patches/patch-cpan_Digest_Digest.pm b/lang/perl5/patches/patch-cpan_Digest_Digest.pm
deleted file mode 100644
index 702df8796fb..00000000000
--- a/lang/perl5/patches/patch-cpan_Digest_Digest.pm
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-cpan_Digest_Digest.pm,v 1.1 2011/10/16 20:09:42 spz Exp $
-
-taken from:
-http://http://perl5.git.perl.org/perl.git/commitdiff/a2fa999d41c94d622051667d897fedca90be1828
-
---- cpan/Digest/Digest.pm.orig	2010-12-30 02:07:15.000000000 +0000
-+++ cpan/Digest/Digest.pm
-@@ -3,7 +3,7 @@ package Digest;
- use strict;
- use vars qw($VERSION %MMAP $AUTOLOAD);
- 
--$VERSION = "1.16";
-+$VERSION = "1.17";
- 
- %MMAP = (
-   "SHA-1"      => [["Digest::SHA", 1], "Digest::SHA1", ["Digest::SHA2", 1]],
-@@ -16,7 +16,7 @@ $VERSION = "1.16";
-   "CRC-16"     => [["Digest::CRC", type => "crc16"]],
-   "CRC-32"     => [["Digest::CRC", type => "crc32"]],
-   "CRC-CCITT"  => [["Digest::CRC", type => "crcccitt"]],
--  "RIPEMD-160" => "Crypt::PIPEMD160",
-+  "RIPEMD-160" => "Crypt::RIPEMD160",
- );
- 
- sub new
-@@ -24,10 +24,11 @@ sub new
-     shift;  # class ignored
-     my $algorithm = shift;
-     my $impl = $MMAP{$algorithm} || do {
--	$algorithm =~ s/\W+//;
-+	$algorithm =~ s/\W+//g;
- 	"Digest::$algorithm";
-     };
-     $impl = [$impl] unless ref($impl);
-+    local $@;  # don't clobber it for our caller
-     my $err;
-     for  (@$impl) {
- 	my $class = $_;
-@@ -35,7 +36,9 @@ sub new
- 	($class, @args) = @$class if ref($class);
- 	no strict 'refs';
- 	unless (exists ${"$class\::"}{"VERSION"}) {
--	    eval "require $class";
-+	    my $pm_file = $class . ".pm";
-+	    $pm_file =~ s{::}{/}g;
-+	    eval { require $pm_file };
- 	    if ($@) {
- 		$err ||= $@;
- 		next;
diff --git a/lang/perl5/patches/patch-dist_ExtUtils_CBuilder_lib_ExtUtils_CBuilder_Base.pm b/lang/perl5/patches/patch-dist_ExtUtils_CBuilder_lib_ExtUtils_CBuilder_Base.pm
deleted file mode 100644
index 38205ba5aea..00000000000
--- a/lang/perl5/patches/patch-dist_ExtUtils_CBuilder_lib_ExtUtils_CBuilder_Base.pm
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-dist_ExtUtils_CBuilder_lib_ExtUtils_CBuilder_Base.pm,v 1.1 2012/02/23 13:00:23 fhajny Exp $
-
-EU::CBuilder shouldn't override ccflags with CFLAGS (1/2)
-https://rt.perl.org/rt3//Public/Bug/Display.html?id=89478
---- dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm.orig	2011-09-26 09:44:34.000000000 +0000
-+++ dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm
-@@ -40,11 +40,13 @@ sub new {
-     $self->{config}{$k} = $v unless exists $self->{config}{$k};
-   }
-   $self->{config}{cc} = $ENV{CC} if defined $ENV{CC};
--  $self->{config}{ccflags} = $ENV{CFLAGS} if defined $ENV{CFLAGS};
-+  $self->{config}{ccflags} = join(" ", $self->{config}{ccflags}, $ENV{CFLAGS})
-+     if defined $ENV{CFLAGS};
-   $self->{config}{cxx} = $ENV{CXX} if defined $ENV{CXX};
-   $self->{config}{cxxflags} = $ENV{CXXFLAGS} if defined $ENV{CXXFLAGS};
-   $self->{config}{ld} = $ENV{LD} if defined $ENV{LD};
--  $self->{config}{ldflags} = $ENV{LDFLAGS} if defined $ENV{LDFLAGS};
-+  $self->{config}{ldflags} = join(" ", $self->{config}{ldflags}, $ENV{LDFLAGS})
-+     if defined $ENV{LDFLAGS};
- 
-   unless ( exists $self->{config}{cxx} ) {
-     my ($ccpath, $ccbase, $ccsfx ) = fileparse($self->{config}{cc}, qr/\.[^.]*/);
diff --git a/lang/perl5/patches/patch-dist_ExtUtils_CBuilder_t_04-base.t b/lang/perl5/patches/patch-dist_ExtUtils_CBuilder_t_04-base.t
deleted file mode 100644
index 9e96345de58..00000000000
--- a/lang/perl5/patches/patch-dist_ExtUtils_CBuilder_t_04-base.t
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-dist_ExtUtils_CBuilder_t_04-base.t,v 1.1 2012/02/23 13:00:23 fhajny Exp $
-
-EU::CBuilder shouldn't override ccflags with CFLAGS (2/2)
-https://rt.perl.org/rt3//Public/Bug/Display.html?id=89478
---- dist/ExtUtils-CBuilder/t/04-base.t.orig	2011-09-26 09:44:34.000000000 +0000
-+++ dist/ExtUtils-CBuilder/t/04-base.t
-@@ -1,7 +1,7 @@
- #! perl -w
- 
- use strict;
--use Test::More tests => 50;
-+use Test::More tests => 64;
- use Config;
- use Cwd;
- use File::Path qw( mkpath );
-@@ -328,6 +328,29 @@ is_deeply( $mksymlists_args,
-     "_prepare_mksymlists_args(): got expected arguments for Mksymlists",
- );
- 
-+my %testvars = (
-+    CFLAGS  => 'ccflags',
-+    LDFLAGS => 'ldflags',
-+);
-+
-+while (my ($VAR, $var) = each %testvars) {
-+    local $ENV{$VAR};
-+    $base = ExtUtils::CBuilder::Base->new( quiet => 1 );
-+    ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" );
-+    isa_ok( $base, 'ExtUtils::CBuilder::Base' );
-+    like($base->{config}{$var}, qr/\Q$Config{$var}/,
-+        "honours $var from Config.pm");
-+
-+    $ENV{$VAR} = "-foo -bar";
-+    $base = ExtUtils::CBuilder::Base->new( quiet => 1 );
-+    ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" );
-+    isa_ok( $base, 'ExtUtils::CBuilder::Base' );
-+    like($base->{config}{$var}, qr/\Q$ENV{$VAR}/,
-+        "honours $VAR from the environment");
-+    like($base->{config}{$var}, qr/\Q$Config{$var}/,
-+        "doesn't override $var from Config.pm with $VAR from the environment");
-+}
-+
- #####
- 
- for ($source_file, $object_file, $lib_file) {
diff --git a/lang/perl5/patches/patch-hints_netbsd.sh b/lang/perl5/patches/patch-hints_netbsd.sh
deleted file mode 100644
index f53e055dbed..00000000000
--- a/lang/perl5/patches/patch-hints_netbsd.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-hints_netbsd.sh,v 1.1 2012/02/17 14:04:01 obache Exp $
-
-* NetBSD-6.x is same condition as older releases.
-
---- hints/netbsd.sh.orig	2011-09-19 13:18:22.000000000 +0000
-+++ hints/netbsd.sh
-@@ -89,7 +89,7 @@ case "$osvers" in
- 	;;
- esac
- case "$osvers" in
--0.9*|1.*|2.*|3.*|4.*|5.*)
-+0.9*|1.*|2.*|3.*|4.*|5.*|6.*)
- 	d_getprotoent_r="$undef"
- 	d_getprotobyname_r="$undef"
- 	d_getprotobynumber_r="$undef"
diff --git a/lang/perl5/patches/patch-hints_solaris_2.sh b/lang/perl5/patches/patch-hints_solaris_2.sh
index c15bad71301..73892092d84 100644
--- a/lang/perl5/patches/patch-hints_solaris_2.sh
+++ b/lang/perl5/patches/patch-hints_solaris_2.sh
@@ -1,10 +1,10 @@
-$NetBSD: patch-hints_solaris_2.sh,v 1.1 2012/06/14 16:12:11 jperkin Exp $
+$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
-@@ -568,7 +568,7 @@
+@@ -594,7 +594,7 @@
  #		    ccflags="$ccflags -Wa,`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`"
  #		fi
  		ldflags="$ldflags -m64"
diff --git a/lang/perl5/patches/patch-zd b/lang/perl5/patches/patch-zd
index 5f018c98c3f..51f5e342a1f 100644
--- a/lang/perl5/patches/patch-zd
+++ b/lang/perl5/patches/patch-zd
@@ -1,8 +1,8 @@
-$NetBSD: patch-zd,v 1.3 2010/08/19 20:47:10 seb Exp $
+$NetBSD: patch-zd,v 1.4 2012/10/03 19:59:47 adam Exp $
 
---- cpan/Module-Build/t/tilde.t.orig	2010-05-21 04:15:46.000000000 +0000
-+++ cpan/Module-Build/t/tilde.t	2010-05-21 04:16:29.000000000 +0000
-@@ -44,6 +44,9 @@
+--- cpan/Module-Build/t/tilde.t.orig	2012-04-25 00:18:31.000000000 +0000
++++ cpan/Module-Build/t/tilde.t
+@@ -44,6 +44,9 @@ SKIP: {
          $home =~ s#/$##;
      }
  
@@ -11,4 +11,4 @@ $NetBSD: patch-zd,v 1.3 2010/08/19 20:47:10 seb Exp $
 +    }
      unless (defined $home) {
        my @info = eval { getpwuid $> };
-       skip "No home directory for tilde-expansion tests", 15 if $@;
+       skip "No home directory for tilde-expansion tests", 15 if $@
diff --git a/lang/perl5/patches/patch-ze b/lang/perl5/patches/patch-ze
index 99a51229df9..0a26355cb4f 100644
--- a/lang/perl5/patches/patch-ze
+++ b/lang/perl5/patches/patch-ze
@@ -1,10 +1,10 @@
-$NetBSD: patch-ze,v 1.3 2011/08/05 18:06:15 adam Exp $
+$NetBSD: patch-ze,v 1.4 2012/10/03 19:59:47 adam Exp $
 
 Fixes compilation problem on Solaris/SPARC.
 
---- perl.h.orig	2009-07-06 11:18:58.000000000 +0000
+--- perl.h.orig	2012-08-03 17:35:26.000000000 +0000
 +++ perl.h
-@@ -1397,8 +1397,8 @@ EXTERN_C char *crypt(const char *, const
+@@ -1393,8 +1393,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])
-@@ -1476,6 +1476,10 @@ EXTERN_C char *crypt(const char *, const
+@@ -1472,6 +1472,10 @@ EXTERN_C char *crypt(const char *, const
   */
  
  #if defined(I_SYSMODE) && !defined(PERL_MICRO)