Update perl from version 5.10.0nb6 to version 5.10.1.

Pkgsrc changes:
- Adjust some patches
- Remove patches integrated upstream

Upstream changes:
"5.10.1 is a maintenance release for perl 5.10, incorporating various
minor bugfixes and optimisations."

Nonetheless some incompatibles changes are noteworthy and are related
to:
- flip-flop and defined-or operators behavior in switch statement
- type-based dispatch and overloading of the smart match operator
- 'use feature :5.10*' semantics
- Perl development switched to git
- internal structure of the ext/ perl source directory changed
- removal of the modules Test::Harness::Straps, ExtUtils::MakeMaker::bytes
and ExtUtils::MakeMaker::vmsish
- the Module::CoreList module no longer contains the %:patchlevel hash
- a bugfix related to the handling of the /m modifier and qr resulted
in a change of behaviour between 5.8.x and 5.10.0 (this was missing from
perl 5.10.0 perldelta).

For a complete list of changes see included perl5101delta(1) or
http://perldoc.perl.org/perl5101delta.html

16 files changed, 81 insertions, 277 deletions

diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 79b36c81658..2f09379a337 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.154 2009/10/23 18:41:02 tnn Exp $
+# $NetBSD: Makefile,v 1.155 2009/12/14 06:36:56 seb Exp $
 
 .include "license.mk"
 
-DISTNAME=	perl-5.10.0
+DISTNAME=	perl-5.10.1
 CATEGORIES=	lang devel perl5
-PKGREVISION=	6
+#PKGREVISION=	1
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:S,/modules/by-module/$,/src/,}
 DISTFILES+=	${DISTNAME}${EXTRACT_SUFX}
 
diff --git a/lang/perl5/distinfo b/lang/perl5/distinfo
index 2ee0eb9045f..62c13364525 100644
--- a/lang/perl5/distinfo
+++ b/lang/perl5/distinfo
@@ -1,27 +1,21 @@
-$NetBSD: distinfo,v 1.61 2009/10/13 10:38:31 hasso Exp $
+$NetBSD: distinfo,v 1.62 2009/12/14 06:36:56 seb Exp $
 
-SHA1 (perl-5.10.0.tar.gz) = adf73606dd5248af7ccdd735bcaa0e628ea75b3c
-RMD160 (perl-5.10.0.tar.gz) = c6614fc99a162790a703f91085b24a60af903ba2
-Size (perl-5.10.0.tar.gz) = 15595020 bytes
-SHA1 (patch-aa) = 5bd44a8076cf27e2deac52240af7f3898865859c
-SHA1 (patch-ab) = e32427327192f023477b16f29bc55fdf4f057410
-SHA1 (patch-ac) = e6dd7287c1d85a59953610406c5fc1f52c712fb7
-SHA1 (patch-ad) = 72ea84e233fd5e82822078e207d597870a53e9fd
+SHA1 (perl-5.10.1.tar.gz) = 8536ed1c14444d1efea069525a816fbc7be7109f
+RMD160 (perl-5.10.1.tar.gz) = 6fe727a5e8878c26b5bd7cfc7165e10f311f7214
+Size (perl-5.10.1.tar.gz) = 14117518 bytes
+SHA1 (patch-aa) = 7f25db6568bb1b0d079efde82952b2fea919b7f8
+SHA1 (patch-ab) = e3aa6bf9695addb9b754297120caf8683a625d1a
 SHA1 (patch-ah) = 1d2f4049dcc8dafcd0eafad36a74531dc7f305c9
 SHA1 (patch-ai) = 5abdbbddcba79088996056ab88a34db5fcd16b01
 SHA1 (patch-aq) = 3ece22678e3e6dcd3cf641e6389ff203cbe351b9
-SHA1 (patch-as) = 8656cb4d9baf43dd92f4c467aaa40802d4c43239
-SHA1 (patch-at) = 814a7b63def0548c2c73d1162d318b783fd8f8bd
-SHA1 (patch-ba) = dc150656628e83e25c99f246a0fb30906d185184
-SHA1 (patch-ca) = 47db0530a705b8086b2bfc58491f9b56de4b9e12
+SHA1 (patch-ba) = 956faac66f446b05360be16b5d197280dea7f801
+SHA1 (patch-ca) = bc3472f62773045916261e8e434af8f2e25b4f9a
 SHA1 (patch-ch) = 5b6a89c82e158bab0a5f06add48c28e600678099
-SHA1 (patch-ci) = d09c9a47a7c308c36d34940df2652f29de41bc5c
+SHA1 (patch-ci) = e99836c538257f45917c3fb81f9c4d07df2e58e7
 SHA1 (patch-ck) = 28207b8186c9ad194a1edc696159915bc16d1097
 SHA1 (patch-cn) = 7ca2b1ff19f8371637a34ec26779b37d74c74cca
-SHA1 (patch-co) = 811e5c391f9f9f72a3f52e6d590b0b4f1e851325
-SHA1 (patch-da) = 13f576db014ec90df319670703482c7276a1f543
+SHA1 (patch-co) = c4a4e30171cebb1ceaa14850b9be99ffa7c94519
 SHA1 (patch-db) = 3aef75518bfea88cb5166026f04ef4d7c016bc99
-SHA1 (patch-ri) = fc838ec10cf601a580aa1f58eb93c3198a13ff71
-SHA1 (patch-ta) = 60d9ef72db56b9f149f3995b3f526fc32a352bd7
+SHA1 (patch-ta) = 69f0d2df022eb8ff0dbcc77bde638cdc9c6391b1
 SHA1 (patch-zc) = a23002397ffaebb243f7683c95c8fb227af90f49
-SHA1 (patch-zd) = ee67148b8f44fb3826273574abb62ad9ca4ffa7f
+SHA1 (patch-zd) = 1a4ae60e9ae350c813d8b91c61e93805b3e66210
diff --git a/lang/perl5/patches/patch-aa b/lang/perl5/patches/patch-aa
index de25f268bfa..8e9adfafc5a 100644
--- a/lang/perl5/patches/patch-aa
+++ b/lang/perl5/patches/patch-aa
@@ -1,33 +1,22 @@
-$NetBSD: patch-aa,v 1.31 2008/10/10 21:58:43 he Exp $
+$NetBSD: patch-aa,v 1.32 2009/12/14 06:36:57 seb Exp $
 
---- lib/ExtUtils/MM_Unix.pm.orig	2007-12-18 11:47:07.000000000 +0100
-+++ lib/ExtUtils/MM_Unix.pm
-@@ -11,8 +11,8 @@ use DirHandle;
- 
- use vars qw($VERSION @ISA
-             $Is_OS2 $Is_VMS $Is_Win32 $Is_Dos
--            $Is_OSF $Is_IRIX  $Is_NetBSD $Is_BSD
--            $Is_SunOS4 $Is_Solaris $Is_SunOS $Is_Interix
-+            $Is_OSF $Is_IRIX  $Is_BSD
-+            $Is_SunOS4 $Is_Solaris $Is_SunOS
-             %Config_Override
-            );
- 
-@@ -30,8 +30,6 @@ BEGIN { 
-     $Is_VMS     = $^O eq 'VMS';
-     $Is_OSF     = $^O eq 'dec_osf';
-     $Is_IRIX    = $^O eq 'irix';
--    $Is_NetBSD  = $^O eq 'netbsd';
--    $Is_Interix = $^O eq 'interix';
-     $Is_SunOS4  = $^O eq 'sunos';
-     $Is_Solaris = $^O eq 'solaris';
-     $Is_SunOS   = $Is_SunOS4 || $Is_Solaris;
-@@ -932,7 +930,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $
+--- lib/ExtUtils/MM_Unix.pm.orig	2009-12-06 17:10:46.000000000 +0000
++++ lib/ExtUtils/MM_Unix.pm	2009-12-06 17:12:37.000000000 +0000
+@@ -28,8 +28,6 @@
+     $Is{VMS}     = $^O eq 'VMS';
+     $Is{OSF}     = $^O eq 'dec_osf';
+     $Is{IRIX}    = $^O eq 'irix';
+-    $Is{NetBSD}  = $^O eq 'netbsd';
+-    $Is{Interix} = $^O eq 'interix';
+     $Is{SunOS4}  = $^O eq 'sunos';
+     $Is{Solaris} = $^O eq 'solaris';
+     $Is{SunOS}   = $Is{SunOS4} || $Is{Solaris};
+@@ -931,7 +929,7 @@
  
      my $libs = '$(LDLOADLIBS)';
  
--    if (($Is_NetBSD || $Is_Interix) && $Config{'useshrplib'} eq 'true') {
-+    if ($Is_BSD && $Config{'useshrplib'} eq 'true') {
+-    if (($Is{NetBSD} || $Is{Interix}) && $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
diff --git a/lang/perl5/patches/patch-ab b/lang/perl5/patches/patch-ab
index a8b74bb3503..f8471b1a800 100644
--- a/lang/perl5/patches/patch-ab
+++ b/lang/perl5/patches/patch-ab
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.14 2006/11/03 07:09:46 joerg Exp $
+$NetBSD: patch-ab,v 1.15 2009/12/14 06:36:57 seb Exp $
 
---- installperl.orig	2006-11-01 02:21:12.000000000 +0100
-+++ installperl
-@@ -379,7 +379,6 @@ my ($do_installarchlib, $do_installprivl
- mkpath($installprivlib, $verbose, 0777);
- mkpath($installarchlib, $verbose, 0777);
- mkpath($installsitelib, $verbose, 0777) if ($installsitelib);
--mkpath($installsitearch, $verbose, 0777) if ($installsitearch);
+--- installperl.orig	2009-12-06 17:14:00.000000000 +0000
++++ installperl	2009-12-06 17:14:13.000000000 +0000
+@@ -355,7 +355,6 @@
+ 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, '.');
diff --git a/lang/perl5/patches/patch-ac b/lang/perl5/patches/patch-ac
deleted file mode 100644
index c8960382b00..00000000000
--- a/lang/perl5/patches/patch-ac
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-ac,v 1.12 2009/05/02 19:23:45 sno Exp $
-
---- toke.c.orig	2009-05-01 10:57:15.000000000 +0000
-+++ toke.c	2009-05-01 10:57:49.000000000 +0000
-@@ -692,6 +692,7 @@
- #else
-     parser->nexttoke = 0;
- #endif
-+    parser->error_count = oparser ? oparser->error_count : 0;
-     parser->copline = NOLINE;
-     parser->lex_state = LEX_NORMAL;
-     parser->expect = XSTATE;
---- t/comp/require.t.orig	2009-05-01 10:58:10.000000000 +0000
-+++ t/comp/require.t	2009-05-01 10:59:36.000000000 +0000
-@@ -15,7 +15,7 @@
- 
- my $Is_EBCDIC = (ord('A') == 193) ? 1 : 0;
- my $Is_UTF8   = (${^OPEN} || "") =~ /:utf8/;
--my $total_tests = 49;
-+my $total_tests = 50;
- if ($Is_EBCDIC || $Is_UTF8) { $total_tests -= 3; }
- print "1..$total_tests\n";
- 
-@@ -258,6 +258,20 @@
-     }
- }
- 
-+#  [perl #49472] Attributes + Unkown Error
-+
-+{
-+    do_require
-+       'use strict;sub MODIFY_CODE_ATTRIBUTE{} sub f:Blah {$nosuchvar}';
-+    my $err = $@;
-+    $err .= "\n" unless $err =~ /\n$/;
-+    unless ($err =~ /Global symbol "\$nosuchvar" requires /) {
-+       $err =~ s/^/# /mg;
-+       print "${err}not ";
-+    }
-+    print "ok ", ++$i, " [perl #49472]\n";
-+}
-+
- ##########################################
- # What follows are UTF-8 specific tests. #
- # Add generic tests before this point.   #
diff --git a/lang/perl5/patches/patch-ad b/lang/perl5/patches/patch-ad
deleted file mode 100644
index f54d292a1ed..00000000000
--- a/lang/perl5/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.13 2009/07/24 04:58:57 schmonz Exp $
-
---- lib/Cwd.pm.orig	2007-12-18 05:47:07.000000000 -0500
-+++ lib/Cwd.pm
-@@ -540,8 +540,8 @@ sub _perl_abs_path
- 	local *PARENT;
- 	unless (opendir(PARENT, $dotdots))
- 	{
--	    _carp("opendir($dotdots): $!");
--	    return '';
-+	    # probably a permissions issue.  Try the native command.
-+	    return File::Spec->rel2abs( $start, _backtick_pwd() );
- 	}
- 	unless (@cst = stat($dotdots))
- 	{
diff --git a/lang/perl5/patches/patch-as b/lang/perl5/patches/patch-as
deleted file mode 100644
index 6df055475af..00000000000
--- a/lang/perl5/patches/patch-as
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-as,v 1.3 2008/10/10 21:58:43 he Exp $
-
-asm/page.h is no longer installed as part of the kernel header
-page on Gentoo/Linux.
-
---- ext/IPC/SysV/SysV.xs.orig	2007-12-18 11:47:07.000000000 +0100
-+++ ext/IPC/SysV/SysV.xs
-@@ -24,8 +24,6 @@
- #      elif defined(HAS_GETPAGESIZE)
- #          undef  SHMLBA /* not static: determined at boot time */
- #          define SHMLBA getpagesize()
--#      elif defined(__linux__)
--#          include <asm/page.h>          
- #      endif
- #   endif
- #endif
diff --git a/lang/perl5/patches/patch-at b/lang/perl5/patches/patch-at
deleted file mode 100644
index 640b9ae3634..00000000000
--- a/lang/perl5/patches/patch-at
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-at,v 1.2 2009/01/29 10:13:05 wiz Exp $
-
---- makedef.pl.orig	2008-11-14 11:28:39.000000000 +0100
-+++ makedef.pl	2008-11-14 11:30:05.000000000 +0100
-@@ -404,6 +404,9 @@
- 		     PL_statusvalue_vms
- 		     PL_sys_intern
- 		     )]);
-+    emit_symbols([qw(
-+		     boot_DynaLoader
-+		     )]);
- }
- elsif ($PLATFORM eq 'os2') {
-     emit_symbols([qw(
diff --git a/lang/perl5/patches/patch-ba b/lang/perl5/patches/patch-ba
index 2d797354168..37056184eca 100644
--- a/lang/perl5/patches/patch-ba
+++ b/lang/perl5/patches/patch-ba
@@ -1,17 +1,8 @@
-$NetBSD: patch-ba,v 1.5 2008/10/10 21:58:43 he Exp $
+$NetBSD: patch-ba,v 1.6 2009/12/14 06:36:57 seb Exp $
 
---- hints/netbsd.sh.orig	2007-12-18 11:47:07.000000000 +0100
-+++ hints/netbsd.sh
-@@ -79,7 +79,7 @@ case "$osvers" in
- 	;;
- esac
- case "$osvers" in
--0.9*|1.*|2.*|3.*|4.*)
-+0.9*|1.*|2.*|3.*|4.*|5.*)
- 	d_getprotoent_r="$undef"
- 	d_getprotobyname_r="$undef"
- 	d_getprotobynumber_r="$undef"
-@@ -175,23 +175,6 @@ $define|true|[yY]*)
+--- hints/netbsd.sh.orig	2009-12-06 17:21:43.000000000 +0000
++++ hints/netbsd.sh	2009-12-06 17:22:01.000000000 +0000
+@@ -175,23 +175,6 @@
  esac
  EOCBU
  
diff --git a/lang/perl5/patches/patch-ca b/lang/perl5/patches/patch-ca
index 964951b3177..bf0adf8ebf8 100644
--- a/lang/perl5/patches/patch-ca
+++ b/lang/perl5/patches/patch-ca
@@ -1,8 +1,8 @@
-$NetBSD: patch-ca,v 1.6 2008/10/10 21:58:43 he Exp $
+$NetBSD: patch-ca,v 1.7 2009/12/14 06:36:57 seb Exp $
 
---- Configure.orig	2007-12-18 11:47:07.000000000 +0100
-+++ Configure
-@@ -3206,13 +3206,14 @@ EOM
+--- Configure.orig	2009-12-06 17:23:10.000000000 +0000
++++ Configure	2009-12-06 17:51:02.000000000 +0000
+@@ -3233,13 +3233,14 @@
  			osvers="$3"
  			;;
  		dragonfly) osname=dragonfly
@@ -19,7 +19,7 @@ $NetBSD: patch-ca,v 1.6 2008/10/10 21:58:43 he Exp $
  		genix)	osname=genix ;;
  		gnu)	osname=gnu
  			osvers="$3" ;;
-@@ -3234,7 +3235,7 @@ EOM
+@@ -3261,7 +3262,7 @@
  		MiNT)	osname=mint
  			;;
  		netbsd*) osname=netbsd
@@ -28,18 +28,16 @@ $NetBSD: patch-ca,v 1.6 2008/10/10 21:58:43 he Exp $
  			;;
  		news-os) osvers="$3"
  			case "$3" in
-@@ -3245,8 +3246,8 @@ EOM
+@@ -3272,7 +3273,7 @@
  		next*) osname=next ;;
  		nonstop-ux) osname=nonstopux ;;
  		openbsd) osname=openbsd
 -                	osvers="$3"
--                	;;
-+			osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'`
-+			;;
++                	osvers=`$uname -r | UU/tr '[A-Z]' '[a-z]'`
+                 	;;
  		os2)	osname=os2
  			osvers="$4"
- 			;;
-@@ -4739,7 +4740,7 @@ case "$plibpth" in
+@@ -4772,7 +4773,7 @@
  esac
  case "$libpth" in
  ' ') dlist='';;
@@ -48,7 +46,7 @@ $NetBSD: patch-ca,v 1.6 2008/10/10 21:58:43 he Exp $
  *) dlist="$libpth";;
  esac
  
-@@ -6425,7 +6426,9 @@ rp='Pathname for the site-specific libra
+@@ -6503,7 +6504,9 @@
  . ./getfile
  prefixvar=sitelib
  . ./setprefixvar
@@ -59,7 +57,7 @@ $NetBSD: patch-ca,v 1.6 2008/10/10 21:58:43 he Exp $
  
  : Determine list of previous versions to include in @INC
  $cat > getverlist <<EOPL
-@@ -6925,7 +6928,9 @@ case "$vendorprefix" in
+@@ -7015,7 +7018,9 @@
  	vendorlibexp="$ansexp"
  	;;
  esac
@@ -70,21 +68,21 @@ $NetBSD: patch-ca,v 1.6 2008/10/10 21:58:43 he Exp $
  prefixvar=vendorlib
  . ./installprefix
  
-@@ -9170,6 +9175,13 @@ EOCP
+@@ -9381,6 +9386,13 @@
  	;;
  esac
  
 +: Look for a hint-file generated 'call-back-unit'.  We need
 +: to set some defaults for building perl in pkgsrc.
 +if $test -f pkgsrc.cbu; then
-+    echo "Setting pkgsrc-specific hints regarding compiler/linker flags..."
-+    . ./pkgsrc.cbu
++	echo "Setting pkgsrc-specific hints regarding compiler/linker flags..."
++	. ./pkgsrc.cbu
 +fi
 +
+ : Set the vendorbin variables
  case "$vendorprefix" in
  '')	d_vendorbin="$undef"
- 	vendorbin=''
-@@ -18347,7 +18359,15 @@ RCAT(Rei,ser)
+@@ -18816,7 +18828,15 @@
  ACAT(Cir,cus)
  EOCP
  $cppstdin $cppflags $cppminus <cpp_stuff.c >cpp_stuff.out 2>&1
diff --git a/lang/perl5/patches/patch-ci b/lang/perl5/patches/patch-ci
index 42d4cfe6e2b..f6b8b515625 100644
--- a/lang/perl5/patches/patch-ci
+++ b/lang/perl5/patches/patch-ci
@@ -1,17 +1,8 @@
-$NetBSD: patch-ci,v 1.5 2009/01/18 11:10:50 tnn Exp $
+$NetBSD: patch-ci,v 1.6 2009/12/14 06:36:57 seb Exp $
 
---- pp_sys.c.orig	2007-12-18 11:47:08.000000000 +0100
-+++ pp_sys.c
-@@ -3002,7 +3002,7 @@ PP(pp_ftrread)
- 
-     case OP_FTEEXEC:
- #ifdef PERL_EFF_ACCESS
--	access_mode = W_OK;
-+	access_mode = X_OK;
- #else
- 	use_access = 0;
- #endif
-@@ -4452,12 +4452,15 @@ PP(pp_gmtime)
+--- pp_sys.c.orig	2009-12-06 17:53:56.000000000 +0000
++++ pp_sys.c	2009-12-06 17:55:04.000000000 +0000
+@@ -4463,12 +4463,15 @@
  	when = (Time_t)SvIVx(POPs);
  #endif
  
diff --git a/lang/perl5/patches/patch-co b/lang/perl5/patches/patch-co
index 5e85bdc4d99..61666c12f08 100644
--- a/lang/perl5/patches/patch-co
+++ b/lang/perl5/patches/patch-co
@@ -1,7 +1,7 @@
-$NetBSD: patch-co,v 1.3 2008/12/08 12:46:13 schwarz Exp $
+$NetBSD: patch-co,v 1.4 2009/12/14 06:36:57 seb Exp $
 
---- hints/freebsd.sh.orig	2007-12-18 11:47:07.000000000 +0100
-+++ hints/freebsd.sh	2008-12-08 10:41:51.000000000 +0100
+--- hints/freebsd.sh.orig	2009-12-06 18:06:01.000000000 +0000
++++ hints/freebsd.sh	2009-12-06 18:06:31.000000000 +0000
 @@ -114,7 +114,7 @@
  	lddlflags="-Bshareable $lddlflags"
  	;;
@@ -26,16 +26,3 @@ $NetBSD: patch-co,v 1.3 2008/12/08 12:46:13 schwarz Exp $
  esac
  
  case "$osvers" in
-@@ -211,6 +219,12 @@
- 	      exit 1
- 	      ;;
- 
-+	7.*)
-+	      ldflags="-pthread $ldflags"
-+	      # patch according to perl Change 34542
-+	      # to take care of bug perl #57458
-+	      ;;
-+
- 	*)
- 	      if [ ! -r "$lc_r" ]; then
- 	      cat <<EOM >&4
diff --git a/lang/perl5/patches/patch-da b/lang/perl5/patches/patch-da
deleted file mode 100644
index d263c7cd7bc..00000000000
--- a/lang/perl5/patches/patch-da
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-da,v 1.5 2009/01/29 09:41:00 joerg Exp $
-
-Fixes for CVE-2008-2827 and CVE-2008-5302, taken from:
-
-http://rt.cpan.org/Public/Bug/Display.html?id=36982
-http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=85;filename=sid_fix_file_path;att=2;bug=286905
-
---- lib/File/Path.pm.orig	2007-12-18 10:47:07.000000000 +0000
-+++ lib/File/Path.pm	2008-12-08 12:54:44.000000000 +0000
-@@ -316,10 +316,8 @@
-                     print "skipped $root\n" if $arg->{verbose};
-                     next ROOT_DIR;
-                 }
--                if (!chmod $perm | 0700, $root) {
--                    if ($Force_Writeable) {
--                        _error($arg, "cannot make directory writeable", $canon);
--                    }
-+                if ($Force_Writeable && !chmod $perm | 0700, $root) {
-+                    _error($arg, "cannot make directory writeable", $canon);
-                 }
-                 print "rmdir $root\n" if $arg->{verbose};
-                 if (rmdir $root) {
-@@ -328,7 +326,7 @@
-                 }
-                 else {
-                     _error($arg, "cannot remove directory", $canon);
--                    if (!chmod($perm, ($Is_VMS ? VMS::Filespec::fileify($root) : $root))
-+                    if ($Force_Writeable && !chmod($perm, ($Is_VMS ? VMS::Filespec::fileify($root) : $root))
-                     ) {
-                         _error($arg, sprintf("cannot restore permissions to 0%o",$perm), $canon);
-                     }
-@@ -350,9 +348,9 @@
-                 next ROOT_DIR;
-             }
- 
--            my $nperm = $perm & 07777 | 0600;
--            if ($nperm != $perm and not chmod $nperm, $root) {
--                if ($Force_Writeable) {
-+            if ($Force_Writeable) {
-+                my $nperm = $perm & 07777 | 0600;
-+                if ($nperm != $perm and not chmod $nperm, $root) {
-                     _error($arg, "cannot make file writeable", $canon);
-                 }
-             }
diff --git a/lang/perl5/patches/patch-ri b/lang/perl5/patches/patch-ri
deleted file mode 100644
index 675b07b78e2..00000000000
--- a/lang/perl5/patches/patch-ri
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ri,v 1.1 2008/10/21 22:46:49 rillig Exp $
-
-http://rt.perl.org/rt3/Public/Bug/Display.html?id=59516
-
---- pp_hot.c.orig       2008-10-21 23:34:17.000000000 +0200
-+++ pp_hot.c    2008-10-21 23:34:33.000000000 +0200
-@@ -1195,6 +1195,7 @@ PP(pp_qr)
-     SV * const pkg = CALLREG_PACKAGE(rx);
-     SV * const rv = sv_newmortal();
-     SV * const sv = newSVrv(rv, SvPV_nolen(pkg));
-+    SvREFCNT_dec(pkg);
-     if (rx->extflags & RXf_TAINTED)
-         SvTAINTED_on(rv);
-     sv_magic(sv,(SV*)ReREFCNT_inc(rx), PERL_MAGIC_qr,0,0);
diff --git a/lang/perl5/patches/patch-ta b/lang/perl5/patches/patch-ta
index 4b5275202af..84d44ba1136 100644
--- a/lang/perl5/patches/patch-ta
+++ b/lang/perl5/patches/patch-ta
@@ -1,15 +1,15 @@
-$NetBSD: patch-ta,v 1.2 2008/10/10 21:58:44 he Exp $
+$NetBSD: patch-ta,v 1.3 2009/12/14 06:36:57 seb Exp $
 
 On NetBSD, filesystems may be mounted with the noatime option.
 
---- t/io/fs.t.orig	2007-12-18 11:47:08.000000000 +0100
-+++ t/io/fs.t
-@@ -275,15 +275,15 @@ sub check_utime_result {
+--- 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
+@@ -281,15 +281,15 @@
  		is( $atime, 500000001,          'atime' );
  		is( $mtime, 500000000 + $delta, 'mtime' );
  	    }
--	    elsif ($^O eq 'beos') {
-+	    elsif ($^O eq 'beos' || $^O eq 'netbsd') {
+-	    elsif ($^O eq 'beos' || $^O eq 'haiku') {
++	    elsif ($^O eq 'beos' || $^O eq 'haiku' || $^O eq 'netbsd') {
              SKIP: {
  		    skip "atime not updated", 1;
  		}
diff --git a/lang/perl5/patches/patch-zd b/lang/perl5/patches/patch-zd
index 4113819b284..41ec90d2624 100644
--- a/lang/perl5/patches/patch-zd
+++ b/lang/perl5/patches/patch-zd
@@ -1,14 +1,15 @@
-$NetBSD: patch-zd,v 1.1 2008/10/10 21:58:44 he Exp $
+$NetBSD: patch-zd,v 1.2 2009/12/14 06:36:57 seb Exp $
 
---- lib/Module/Build/t/tilde.t.orig	2007-12-18 11:47:07.000000000 +0100
-+++ lib/Module/Build/t/tilde.t
-@@ -40,6 +40,9 @@ my $p = 'install_base';
- SKIP: {
-     my $home = $ENV{HOME} ? $ENV{HOME} : undef;
-     skip "Needs case and syntax tweaks for VMS", 14 if $^O eq 'VMS';
+--- lib/Module/Build/t/tilde.t.orig	2009-12-06 21:07:16.000000000 +0000
++++ lib/Module/Build/t/tilde.t	2009-12-06 21:07:18.000000000 +0000
+@@ -44,7 +44,9 @@
+         $home = VMS::Filespec::unixify($home);
+         $home =~ s#/$##;
+     }
+-
 +    if ($home =~ /work\/.home/) {
-+      skip "Skipping test in pkgsrc env to avoid FAKE_HOME trouble", 14;
++      skip "Skipping test in pkgsrc env to avoid FAKE_HOME trouble", 15;
 +    }
      unless (defined $home) {
        my @info = eval { getpwuid $> };
-       skip "No home directory for tilde-expansion tests", 14 if $@;
+       skip "No home directory for tilde-expansion tests", 15 if $@;