Update lang/perl5 to 5.8.8. Changes from version 5.8.7 include:

   * Updates of many standard Perl modules.
   * Performance enhancements for loadable modules and memory usage.

   * Fixed bug when running with "-w".  Previously when running with
     warnings enabled globally via "-w", selective disabling of specific
     warning categories would actually turn off all warnings.  This
     is now fixed; now "no warnings 'io';" will only turn off warnings
     in the "io" class.  This bug fix may cause some programs to start
     correctly issuing warnings.

   * Perl 5.8.4 introduced a change so that assignments of "undef" to a
     scalar, or of an empty list to an array or a hash, were optimised away.
     As this could cause problems when "goto" jumps were involved, this
     change has been backed out.

   * Using the sprintf function with some formats could lead to a
     buffer overflow in some specific cases.  This has been fixed,
     along with several other bugs, notably in bounds checking.

   * Fixed bug in pkgsrc-installed perl-5.8.7 and all subsequent
     PKGREVISIONs, where perl didn't look for site modules under
     /usr/pkg/lib/perl5/site_perl, but only under
     /usr/pkg/lib/perl5/site_perl/5.8.0, and similarly for the vendor
     modules.

   * Honor PKGMANDIR when installing man pages.

12 files changed, 152 insertions, 171 deletions

diff --git a/lang/perl5/patches/patch-aa b/lang/perl5/patches/patch-aa
index f5b58f45ffd..f8d5b4b2b0a 100644
--- a/lang/perl5/patches/patch-aa
+++ b/lang/perl5/patches/patch-aa
@@ -1,89 +1,43 @@
-$NetBSD: patch-aa,v 1.29 2005/08/12 19:59:03 jlam Exp $
+$NetBSD: patch-aa,v 1.30 2006/04/09 06:34:32 jlam Exp $
 
---- lib/ExtUtils/MM_Unix.pm.orig	2004-01-05 17:34:59.000000000 -0500
+--- lib/ExtUtils/MM_Unix.pm.orig	2005-05-21 05:42:56.000000000 -0400
 +++ lib/ExtUtils/MM_Unix.pm
-@@ -12,7 +12,7 @@ use DirHandle;
+@@ -12,8 +12,8 @@ use DirHandle;
  
  use vars qw($VERSION @ISA
-             $Is_Mac $Is_OS2 $Is_VMS $Is_Win32 $Is_Win95  $Is_Dos $Is_VOS
--            $Is_QNX $Is_AIX $Is_OSF $Is_IRIX  $Is_NetBSD $Is_BSD
-+            $Is_QNX $Is_AIX $Is_OSF $Is_IRIX  $Is_BSD $Is_Interix
-             $Is_SunOS4 $Is_Solaris $Is_SunOS
-             $Verbose %pm %static
+             $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
+             $Verbose %pm
              %Config_Override
-@@ -36,11 +36,11 @@ $Is_QNX     = $^O eq 'qnx';
- $Is_AIX     = $^O eq 'aix';
- $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;
--$Is_BSD     = $^O =~ /^(?:free|net|open)bsd|bsdos$/;
-+$Is_BSD     = $^O =~ /^(?:free|net|open)bsd|bsdos|dragonfly|interix$/;
- 
- 
- =head1 NAME
-@@ -1120,16 +1120,16 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $
+            );
+@@ -32,13 +32,11 @@ 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;
+     $Is_BSD     = $^O =~ /^(?:free|net|open)bsd$/ or
+-                  $^O eq 'bsdos' or $^O eq 'interix';
++                  $^O eq 'bsdos' or $^O eq 'dragonfly' or $^O eq 'interix';
+ }
+ 
+ BEGIN {
+@@ -928,7 +926,7 @@ $(INST_DYNAMIC): $(OBJECT) $(MYEXTLIB) $
  
      my $libs = '$(LDLOADLIBS)';
  
--    if ($Is_NetBSD) {
--	# 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
-+    if ($Is_BSD) {
-+	# Use nothing on static perl platforms, and add 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
- 	# or -R to add paths to the run-time library search path.
- 	if ($Config{'useshrplib'}) {
- 	    if ($Config{'lddlflags'} =~ /-Wl,-R/) {
--		$libs .= ' -L$(PERL_INC) -Wl,-R$(INSTALLARCHLIB)/CORE -lperl';
-+		$libs .= ' -L$(PERL_INC) -Wl,-R$(INSTALLARCHLIB)/CORE -Wl,-R$(PERL_ARCHLIB)/CORE -lperl';
- 	    } elsif ($Config{'lddlflags'} =~ /-R/) {
--		$libs .= ' -L$(PERL_INC) -R$(INSTALLARCHLIB)/CORE -lperl';
-+		$libs .= ' -L$(PERL_INC) -R$(INSTALLARCHLIB)/CORE -R$(PERL_ARCHLIB)/CORE -lperl';
- 	    }
- 	}
-     }
-@@ -2082,6 +2082,21 @@ sub init_INSTALL {
-           $self->catdir($sprefix, 'bin');
-     }
- 
-+    unless( $Config{installsitescript} ) {
-+        $Config_Override{installsitescript} =
-+          $self->catdir($sprefix, 'bin');
-+    }
-+
-+    unless( $Config{installvendorbin} ) {
-+        $Config_Override{installvendorbin} =
-+          $self->catdir($vprefix, 'bin');
-+    }
-+
-+    unless( $Config{installvendorscript} ) {
-+        $Config_Override{installvendorscript} =
-+          $self->catdir($vprefix, 'bin');
-+    }
-+
-     $self->{PREFIX}       ||= '';
- 
-     if( $self->{PREFIX} ) {
-@@ -2127,6 +2142,12 @@ sub init_INSTALL {
-         script      => { s => $iprefix,
-                          t => 'perl',
-                          d => 'bin' },
-+        vendorscript => { s => $vprefix,
-+                          t => 'vendor',
-+                          d => 'bin' },
-+        sitescript   => { s => $sprefix,
-+                          t => 'site',
-+                          d => 'bin' },
-     );
-     
-     my %man_layouts =
-@@ -2519,7 +2540,7 @@ pure_site_install ::
+-    if (($Is_NetBSD || $Is_Interix) && $Config{'useshrplib'}) {
++    if ($Is_BSD && $Config{'useshrplib'}) {
+ 	# 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
+@@ -2074,7 +2072,7 @@ pure_site_install ::
  		$(INST_LIB) $(DESTINSTALLSITELIB) \
  		$(INST_ARCHLIB) $(DESTINSTALLSITEARCH) \
  		$(INST_BIN) $(DESTINSTALLSITEBIN) \
@@ -92,7 +46,7 @@ $NetBSD: patch-aa,v 1.29 2005/08/12 19:59:03 jlam Exp $
  		$(INST_MAN1DIR) $(DESTINSTALLSITEMAN1DIR) \
  		$(INST_MAN3DIR) $(DESTINSTALLSITEMAN3DIR)
  	$(NOECHO) $(WARN_IF_OLD_PACKLIST) \
-@@ -2532,7 +2553,7 @@ pure_vendor_install ::
+@@ -2087,7 +2085,7 @@ pure_vendor_install ::
  		$(INST_LIB) $(DESTINSTALLVENDORLIB) \
  		$(INST_ARCHLIB) $(DESTINSTALLVENDORARCH) \
  		$(INST_BIN) $(DESTINSTALLVENDORBIN) \
diff --git a/lang/perl5/patches/patch-ah b/lang/perl5/patches/patch-ah
index 27c45c2cc78..1f61459b23b 100644
--- a/lang/perl5/patches/patch-ah
+++ b/lang/perl5/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.7 2005/08/06 06:18:45 jlam Exp $
+$NetBSD: patch-ah,v 1.8 2006/04/09 06:34:32 jlam Exp $
 
---- perl.c.orig	2005-04-22 10:14:27.000000000 -0400
+--- perl.c.orig	2006-01-31 07:34:47.000000000 -0500
 +++ perl.c
-@@ -4391,45 +4391,12 @@ S_init_perllib(pTHX)
+@@ -4770,45 +4770,12 @@ S_init_perllib(pTHX)
      }
  
  /* Use the ~-expanded versions of APPLLIB (undocumented),
@@ -49,7 +49,7 @@ $NetBSD: patch-ah,v 1.7 2005/08/06 06:18:45 jlam Exp $
  #ifdef SITEARCH_EXP
      /* sitearch is always relative to sitelib on Windows for
       * DLL-based path intuition to work correctly */
-@@ -4471,6 +4438,39 @@ S_init_perllib(pTHX)
+@@ -4850,6 +4817,39 @@ S_init_perllib(pTHX)
      incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE);
  #endif
  
diff --git a/lang/perl5/patches/patch-am b/lang/perl5/patches/patch-am
index 97baf7442de..ed6dbb2dd9e 100644
--- a/lang/perl5/patches/patch-am
+++ b/lang/perl5/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.3 2005/08/06 06:18:45 jlam Exp $
+$NetBSD: patch-am,v 1.4 2006/04/09 06:34:32 jlam Exp $
 
---- lib/ExtUtils/MakeMaker.pm.orig	2004-01-05 17:34:59.000000000 -0500
+--- lib/ExtUtils/MakeMaker.pm.orig	2005-10-21 10:11:04.000000000 -0400
 +++ lib/ExtUtils/MakeMaker.pm
-@@ -215,7 +215,7 @@ sub full_setup {
+@@ -222,7 +222,7 @@ sub full_setup {
      INSTALLMAN1DIR          INSTALLMAN3DIR
      INSTALLSITEMAN1DIR      INSTALLSITEMAN3DIR
      INSTALLVENDORMAN1DIR    INSTALLVENDORMAN3DIR
@@ -11,7 +11,7 @@ $NetBSD: patch-am,v 1.3 2005/08/06 06:18:45 jlam Exp $
      PERL_LIB        PERL_ARCHLIB 
      SITELIBEXP      SITEARCHEXP 
  
-@@ -1075,7 +1075,7 @@ INSTALLDIRS according to the following t
+@@ -1084,7 +1084,7 @@ INSTALLDIRS according to the following t
    INST_ARCHLIB   INSTALLARCHLIB  INSTALLSITEARCH     INSTALLVENDORARCH
    INST_LIB       INSTALLPRIVLIB  INSTALLSITELIB      INSTALLVENDORLIB
    INST_BIN       INSTALLBIN      INSTALLSITEBIN      INSTALLVENDORBIN
@@ -20,7 +20,7 @@ $NetBSD: patch-am,v 1.3 2005/08/06 06:18:45 jlam Exp $
    INST_MAN1DIR   INSTALLMAN1DIR  INSTALLSITEMAN1DIR  INSTALLVENDORMAN1DIR
    INST_MAN3DIR   INSTALLMAN3DIR  INSTALLSITEMAN3DIR  INSTALLVENDORMAN3DIR
  
-@@ -1527,7 +1527,7 @@ Defaults to $Config{installprivlib}.
+@@ -1545,7 +1545,7 @@ Defaults to $Config{installprivlib}.
  =item INSTALLSCRIPT
  
  Used by 'make install' which copies files from INST_SCRIPT to this
@@ -29,7 +29,7 @@ $NetBSD: patch-am,v 1.3 2005/08/06 06:18:45 jlam Exp $
  
  =item INSTALLSITEARCH
  
-@@ -1554,6 +1554,11 @@ $(SITEPREFIX)/man/man$(MAN*EXT).
+@@ -1572,6 +1572,11 @@ $(SITEPREFIX)/man/man$(MAN*EXT).
  
  If set to 'none', no man pages will be installed.
  
@@ -41,7 +41,7 @@ $NetBSD: patch-am,v 1.3 2005/08/06 06:18:45 jlam Exp $
  =item INSTALLVENDORARCH
  
  Used by 'make install', which copies files from INST_ARCHLIB to this
-@@ -1578,6 +1583,11 @@ INSTALLDIRS=vendor.  Defaults to $(VENDO
+@@ -1596,6 +1601,11 @@ INSTALLDIRS=vendor.  Defaults to $(VENDO
  
  If set to 'none', no man pages will be installed.
  
diff --git a/lang/perl5/patches/patch-an b/lang/perl5/patches/patch-an
index 584129ece08..edd051b572f 100644
--- a/lang/perl5/patches/patch-an
+++ b/lang/perl5/patches/patch-an
@@ -1,8 +1,45 @@
-$NetBSD: patch-an,v 1.1 2005/08/06 06:18:45 jlam Exp $
+$NetBSD: patch-an,v 1.2 2006/04/09 06:34:32 jlam Exp $
 
---- lib/ExtUtils/MM_Any.pm.orig	2004-01-05 17:34:59.000000000 -0500
+--- lib/ExtUtils/MM_Any.pm.orig	2005-04-13 03:49:53.000000000 -0400
 +++ lib/ExtUtils/MM_Any.pm
-@@ -57,7 +57,7 @@ sub installvars {
+@@ -1052,6 +1052,15 @@ sub init_INSTALL_from_PREFIX {
+                                     : '';
+     }
+ 
++    $self->{INSTALLSITESCRIPT} ||= '$(INSTALLSCRIPT)'
++      unless $Config{installsitescript};
++
++    unless( $Config{installvendorscript} ) {
++        $self->{INSTALLVENDORSCRIPT} ||= $Config{usevendorprefix} 
++                                    ? $Config{installscript}
++                                    : '';
++    }
++
+ 
+     my $iprefix = $Config{installprefixexp} || $Config{installprefix} || 
+                   $Config{prefixexp}        || $Config{prefix} || '';
+@@ -1111,6 +1120,12 @@ sub init_INSTALL_from_PREFIX {
+         script      => { s => $iprefix,
+                          t => 'perl',
+                          d => 'bin' },
++        vendorscript => { s => $vprefix,
++                          t => 'vendor',
++                          d => 'bin' },
++        sitescript   => { s => $sprefix,
++                          t => 'site',
++                          d => 'bin' },
+     );
+     
+     my %man_layouts =
+@@ -1253,7 +1268,6 @@ sub init_INSTALL_from_INSTALLBASE {
+     # Adjust for variable quirks.
+     $install{INSTALLARCHLIB} ||= delete $install{INSTALLARCH};
+     $install{INSTALLPRIVLIB} ||= delete $install{INSTALLLIB};
+-    delete @install{qw(INSTALLVENDORSCRIPT INSTALLSITESCRIPT)};
+ 
+     foreach my $key (keys %install) {
+         $self->{$key} ||= $install{$key};
+@@ -1627,7 +1641,7 @@ sub installvars {
      return qw(PRIVLIB SITELIB  VENDORLIB
                ARCHLIB SITEARCH VENDORARCH
                BIN     SITEBIN  VENDORBIN
diff --git a/lang/perl5/patches/patch-ap b/lang/perl5/patches/patch-ap
new file mode 100644
index 00000000000..9d26b4e80fe
--- /dev/null
+++ b/lang/perl5/patches/patch-ap
@@ -0,0 +1,16 @@
+$NetBSD: patch-ap,v 1.1 2006/04/09 06:34:32 jlam Exp $
+
+On VAX, feeding a bare "NaN" to nawk causes nawk to core dump since
+it tries to interpret it as a number, which causes an FP exception.
+
+--- MANIFEST.orig	2006-01-31 18:27:53.000000000 -0500
++++ MANIFEST
+@@ -1586,7 +1586,7 @@ lib/Math/BigInt/t/const_mbf.t	Test Math:
+ lib/Math/BigInt/t/downgrade.t	Test if use Math::BigInt(); under downgrade works
+ lib/Math/BigInt/t/_e_math.t	Helper routine in BigFloat for _e math
+ lib/Math/BigInt/t/fallback.t	Test Math::BigInt
+-lib/Math/BigInt/t/inf_nan.t	Special tests for inf and NaN handling
++lib/Math/BigInt/t/inf_nan.t	Special tests for inf and *NaN* handling
+ lib/Math/BigInt/t/isa.t		Test for Math::BigInt inheritance
+ lib/Math/BigInt/t/lib_load.t	Test sane lib names
+ lib/Math/BigInt/t/mbf_ali.t	Tests for BigFloat
diff --git a/lang/perl5/patches/patch-bd b/lang/perl5/patches/patch-bd
deleted file mode 100644
index 676131bdbf4..00000000000
--- a/lang/perl5/patches/patch-bd
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2005/06/24 06:43:47 jlam Exp $
-
---- lib/ExtUtils/instmodsh.orig	2004-01-05 17:34:59.000000000 -0500
-+++ lib/ExtUtils/instmodsh
-@@ -58,16 +58,13 @@ while (1)
-       $reply =~ /^t\s*/ and do
-          {
-          my $file = (split(' ', $reply))[1];
--         my $tmp = "/tmp/inst.$$";
--         if (my $fh = IO::File->new($tmp, "w"))
--            {
--            $fh->print(join("\n", $Inst->files($module)));
--            $fh->close();
--            system("tar cvf $file -I $tmp");
--            unlink($tmp);
--            last CASE;
--            }
--         else { print("Can't open $file: $!\n"); }
-+         # Use File::Temp to create the tempfile and avoid possible symlink
-+         # race attacks against a known filename in /tmp [CAN-2004-0976].
-+         my ($fh, $tmp) = File::Temp::tempfile(UNLINK => 1);
-+         $fh->print(join("\n", $Inst->files($module)));
-+         $fh->close();
-+         system("tar cvf $file -T $tmp");
-+         unlink($tmp);
-          last CASE;
-          };
-       $reply eq 'v' and do
diff --git a/lang/perl5/patches/patch-ca b/lang/perl5/patches/patch-ca
index b5c453ea017..267bfc21544 100644
--- a/lang/perl5/patches/patch-ca
+++ b/lang/perl5/patches/patch-ca
@@ -1,8 +1,8 @@
-$NetBSD: patch-ca,v 1.4 2005/12/29 17:54:45 jlam Exp $
+$NetBSD: patch-ca,v 1.5 2006/04/09 06:34:33 jlam Exp $
 
---- Configure.orig	2005-04-20 12:34:37.000000000 -0400
+--- Configure.orig	2006-01-08 09:51:03.000000000 -0500
 +++ Configure
-@@ -3111,11 +3111,13 @@ EOM
+@@ -3130,11 +3130,13 @@ EOM
  		dgux)	osname=dgux 
  			osvers="$3"
  			;;
@@ -17,7 +17,7 @@ $NetBSD: patch-ca,v 1.4 2005/12/29 17:54:45 jlam Exp $
  		genix)	osname=genix ;;
  		gnu)	osname=gnu
  			osvers="$3" ;;
-@@ -3137,7 +3139,7 @@ EOM
+@@ -3156,7 +3158,7 @@ EOM
  		MiNT)	osname=mint
  			;;
  		netbsd*) osname=netbsd
@@ -26,7 +26,7 @@ $NetBSD: patch-ca,v 1.4 2005/12/29 17:54:45 jlam Exp $
  			;;
  		news-os) osvers="$3"
  			case "$3" in
-@@ -3148,8 +3150,8 @@ EOM
+@@ -3167,8 +3169,8 @@ EOM
  		next*) osname=next ;;
  		nonstop-ux) osname=nonstopux ;;
  		openbsd) osname=openbsd
@@ -37,7 +37,7 @@ $NetBSD: patch-ca,v 1.4 2005/12/29 17:54:45 jlam Exp $
  		os2)	osname=os2
  			osvers="$4"
  			;;
-@@ -4426,7 +4428,7 @@ case "$plibpth" in
+@@ -4445,7 +4447,7 @@ case "$plibpth" in
  esac
  case "$libpth" in
  ' ') dlist='';;
@@ -46,7 +46,29 @@ $NetBSD: patch-ca,v 1.4 2005/12/29 17:54:45 jlam Exp $
  *) dlist="$libpth";;
  esac
  
-@@ -7856,7 +7858,7 @@ if "$useshrplib"; then
+@@ -6485,7 +6487,9 @@ rp='Pathname for the site-specific libra
+ . ./getfile
+ sitelib="$ans"
+ sitelibexp="$ansexp"
+-sitelib_stem=`echo "$sitelibexp" | sed "s,/$version$,,"`
++if $test -z "$sitelib_stem"; then
++	sitelib_stem=`echo "$sitelibexp" | sed "s,/$version$,,"`
++fi
+ : Change installation prefix, if necessary.
+ if $test X"$prefix" != X"$installprefix"; then
+ 	installsitelib=`echo $sitelibexp | $sed "s#^$prefix#$installprefix#"`
+@@ -6606,7 +6610,9 @@ case "$vendorprefix" in
+ 	vendorlibexp="$ansexp"
+ 	;;
+ esac
+-vendorlib_stem=`echo "$vendorlibexp" | sed "s,/$version$,,"`
++if $test -z "$vendorlib_stem"; then
++	vendorlib_stem=`echo "$vendorlibexp" | sed "s,/$version$,,"`
++fi
+ : Change installation prefix, if necessary.
+ if $test X"$prefix" != X"$installprefix"; then
+ 	installvendorlib=`echo $vendorlibexp | $sed "s#^$prefix#$installprefix#"`
+@@ -7889,7 +7895,7 @@ if "$useshrplib"; then
  	solaris)
  		xxx="-R $shrpdir"
  		;;
@@ -55,7 +77,7 @@ $NetBSD: patch-ca,v 1.4 2005/12/29 17:54:45 jlam Exp $
  		xxx="-Wl,-R$shrpdir"
  		;;
  	bsdos|linux|irix*|dec_osf|gnu*)
-@@ -8977,6 +8979,13 @@ EOCP
+@@ -9010,6 +9016,13 @@ EOCP
  	;;
  esac
  
@@ -69,7 +91,7 @@ $NetBSD: patch-ca,v 1.4 2005/12/29 17:54:45 jlam Exp $
  case "$vendorprefix" in
  '')	d_vendorbin="$undef"
  	vendorbin=''
-@@ -17339,7 +17348,15 @@ RCAT(Rei,ser)
+@@ -17776,7 +17789,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-cb b/lang/perl5/patches/patch-cb
index 4ee3864c341..6f26f1be635 100644
--- a/lang/perl5/patches/patch-cb
+++ b/lang/perl5/patches/patch-cb
@@ -1,6 +1,6 @@
-$NetBSD: patch-cb,v 1.2 2005/08/06 06:18:45 jlam Exp $
+$NetBSD: patch-cb,v 1.3 2006/04/09 06:34:33 jlam Exp $
 
---- Makefile.SH.orig	2005-02-05 10:17:44.000000000 -0500
+--- Makefile.SH.orig	2006-01-24 07:49:44.000000000 -0500
 +++ Makefile.SH
 @@ -73,7 +73,11 @@ true)
  	sunos*)
@@ -24,7 +24,7 @@ $NetBSD: patch-cb,v 1.2 2005/08/06 06:18:45 jlam Exp $
  			;;
  		esac
  	        shrpldflags="$shrpldflags $ldflags $perllibs $cryptlib"
-@@ -969,6 +973,10 @@ s_dummy $(static_ext):	miniperl$(EXE_EXT
+@@ -990,6 +994,10 @@ s_dummy $(static_ext):	miniperl$(EXE_EXT
  n_dummy $(nonxs_ext):	miniperl$(EXE_EXT) preplibrary $(DYNALOADER) FORCE
  	@$(LDLIBPTH) sh ext/util/make_ext nonxs $@ MAKE=$(MAKE) LIBPERL_A=$(LIBPERL)
  
diff --git a/lang/perl5/patches/patch-ch b/lang/perl5/patches/patch-ch
index b5a96982e4b..451d3dbb5d3 100644
--- a/lang/perl5/patches/patch-ch
+++ b/lang/perl5/patches/patch-ch
@@ -1,8 +1,8 @@
-$NetBSD: patch-ch,v 1.2 2005/08/06 06:18:45 jlam Exp $
+$NetBSD: patch-ch,v 1.3 2006/04/09 06:34:33 jlam Exp $
 
---- hints/dec_osf.sh.orig	2005-02-05 10:19:27.000000000 -0500
+--- hints/dec_osf.sh.orig	2006-01-08 04:53:29.000000000 -0500
 +++ hints/dec_osf.sh
-@@ -254,7 +254,7 @@ case "`uname -r`" in
+@@ -285,7 +285,7 @@ case "`uname -r`" in
  		      # fixed in 4.0E or better.
  		      ;;
  		  *)    
diff --git a/lang/perl5/patches/patch-ci b/lang/perl5/patches/patch-ci
index 8cab67363e0..9d2285804fa 100644
--- a/lang/perl5/patches/patch-ci
+++ b/lang/perl5/patches/patch-ci
@@ -1,18 +1,21 @@
-$NetBSD: patch-ci,v 1.2 2005/08/06 06:18:45 jlam Exp $
+$NetBSD: patch-ci,v 1.3 2006/04/09 06:34:33 jlam Exp $
 
---- pp_sys.c.orig	2005-04-27 18:12:46.000000000 -0400
+--- pp_sys.c.orig	2006-01-13 13:15:15.000000000 -0500
 +++ pp_sys.c
-@@ -4466,9 +4466,11 @@ PP(pp_gmtime)
+@@ -4516,12 +4516,15 @@ PP(pp_gmtime)
  	when = (Time_t)SvIVx(POPs);
  #endif
  
 -    if (PL_op->op_type == OP_LOCALTIME)
 +    if (PL_op->op_type == OP_LOCALTIME) {
+ #ifdef LOCALTIME_EDGECASE_BROKEN
+ 	tmbuf = S_my_localtime(aTHX_ &when);
+ #else
 +	/* Explicitly invoke tzset() as localtime_r may not. */
 +	tzset();
  	tmbuf = localtime(&when);
--    else
-+    } else
+ #endif
++    }
+     else
  	tmbuf = gmtime(&when);
  
-     if (GIMME != G_ARRAY) {
diff --git a/lang/perl5/patches/patch-cl b/lang/perl5/patches/patch-cl
deleted file mode 100644
index 40d496bc5b6..00000000000
--- a/lang/perl5/patches/patch-cl
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-cl,v 1.1 2005/06/24 06:43:47 jlam Exp $
-
---- ext/SDBM_File/sdbm/sdbm.c.orig	2003-08-27 06:30:22.000000000 -0400
-+++ ext/SDBM_File/sdbm/sdbm.c
-@@ -34,10 +34,12 @@
- /*
-  * externals
-  */
--#ifndef WIN32
--#ifndef sun
--extern int errno;
--#endif
-+#ifndef errno
-+	extern int errno;     /* ANSI allows errno to be an lvalue expr.
-+			       * For example in multithreaded environments
-+			       * something like this might happen:
-+			       * extern int *_errno(void);
-+			       * #define errno (*_errno()) */
- #endif
- 
- extern Malloc_t malloc proto((MEM_SIZE));
diff --git a/lang/perl5/patches/patch-zc b/lang/perl5/patches/patch-zc
index d7b090de6fc..1023115c20f 100644
--- a/lang/perl5/patches/patch-zc
+++ b/lang/perl5/patches/patch-zc
@@ -1,8 +1,8 @@
-$NetBSD: patch-zc,v 1.1 2005/06/24 06:43:47 jlam Exp $
+$NetBSD: patch-zc,v 1.2 2006/04/09 06:34:33 jlam Exp $
 
---- Policy_sh.SH.orig	Fri Aug  1 05:23:23 2003
-+++ Policy_sh.SH	Tue Aug 26 02:12:12 2003
-@@ -184,11 +184,11 @@
+--- Policy_sh.SH.orig	2003-08-01 08:23:23.000000000 -0400
++++ Policy_sh.SH
+@@ -184,10 +184,10 @@ do
  	;;
      sitearch)	dflt="$sitelib/$archname" ;;
  
@@ -12,13 +12,11 @@ $NetBSD: patch-zc,v 1.1 2005/06/24 06:43:47 jlam Exp $
 +    siteman3dir)	dflt="$siteprefix/man/man3" ;;
      # We don't know what to do with these yet.
 -    sitehtml1)	dflt='' ;;
--    sitehtm31dir)	dflt='' ;;
-+    sitehtml1dir)	dflt='' ;;
 +    sitehtml1dir)	dflt='' ;;
+     sitehtm31dir)	dflt='' ;;
      
      # Directories for vendor-supplied add-on files
-     # These are all usually empty.
-@@ -213,11 +213,11 @@
+@@ -213,11 +213,11 @@ do
  		;;
  	    vendorarch)	dflt="$vendorlib/$archname" ;;