Update perl to 5.6.0nb2 from perl5-current. Changes from version 5.00404

(from commit log of perl5-current/Makefile):

 *  Interpreter cloning, threads, and concurrency
 *  Lexically scoped warning categories
 *  Unicode and UTF-8 support
 *  Support for interpolating named characters
 *  "our" declarations
 *  Support for strings represented as a vector of ordinals
 *  Improved Perl version numbering system
 *  New syntax for declaring subroutine attributes
 *  File and directory handles can be autovivified
 *  open() with more than two arguments
 *  64-bit support
 *  Large file support
 *  Long doubles
 *  "more bits"
 *  Enhanced support for sort() subroutines
 *  C<sort $coderef @foo> allowed
 *  File globbing implemented internally
 *  POSIX character class syntax [: :] supported
 *  Improved C<qw//> operator
 *  pack() format 'Z' supported
 *  pack() format modifier '!' supported
 *  pack() and unpack() support counted strings
 *  Comments in pack() templates
 *  Weak references
 *  Binary numbers supported
 *  Lvalue subroutines
 *  Some arrows may be omitted in calls through references
 *  Boolean assignment operators are legal lvalues
 *  exists() is supported on subroutine names
 *  exists() and delete() are supported on array elements
 *  Pseudo-hashes work better
 *  Automatic flushing of output buffers
 *  Better diagnostics on meaningless filehandle operations
 *  Where possible, buffered data discarded from duped input filehandle
 *  eof() has the same old magic as <>
 *  binmode() can be used to set :crlf and :raw modes
 *  C<-T> filetest recognizes UTF-8 encoded files as "text"
 *  system(), backticks and pipe open now reflect exec() failure
 *  Improved diagnostics
 *  Diagnostics follow STDERR
 *  syswrite() ease-of-use
 *  Better syntax checks on parenthesized unary operators
 *  Bit operators support full native integer width
 *  Improved security features
 *  C<require> and C<do> may be overridden
 *  $^X variables may now have names longer than one character
 *  New variable $^C reflects C<-c> switch
 *  New variable $^V contains Perl version as a string
 *  Optional Y2K warnings
 *  Modules
 *  Pragmata
 *  dprofpp
 *  find2perl
 *  h2xs
 *  perlcc
 *  perldoc
 *  The Perl Debugger
 *  Simple sort() using { $a <=> $b } and the like are optimized
 *  Optimized assignments to lexical variables
 *  Faster subroutine calls
 *  -Dusethreads means something different
 *  New Configure flags
 *  Threadedness and 64-bitness now more daring
 *  Long Doubles
    ...

See 'perldoc perldelta' for a full list.

10 files changed, 280 insertions, 341 deletions

diff --git a/lang/perl5/patches/patch-aa b/lang/perl5/patches/patch-aa
index 60d76396c4f..5d9dea1fea9 100644
--- a/lang/perl5/patches/patch-aa
+++ b/lang/perl5/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.15 2000/01/18 22:31:47 tron Exp $
+$NetBSD: patch-aa,v 1.16 2000/08/30 18:42:24 jlam Exp $
 
---- Configure.orig	Fri Oct  3 13:57:39 1997
-+++ Configure	Wed Dec  2 14:30:27 1998
-@@ -65,7 +65,7 @@
+--- Configure.orig	Wed Mar 22 15:36:37 2000
++++ Configure
+@@ -70,7 +70,7 @@
  fi
  
  : Proper PATH setting
@@ -11,22 +11,7 @@ $NetBSD: patch-aa,v 1.15 2000/01/18 22:31:47 tron Exp $
  paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin"
  paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin"
  paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin"
-@@ -92,10 +92,10 @@
- esac
- 
- : Sanity checks
--if test ! -t 0; then
--	echo "Say 'sh $me', not 'sh <$me'"
--	exit 1
--fi
-+# if test ! -t 0; then
-+# 	echo "Say 'sh $me', not 'sh <$me'"
-+# 	exit 1
-+# fi
- 
- : Test and see if we are running under ksh, either blatantly or in disguise.
- if (PATH=.; alias -x) >/dev/null 2>&1; then
-@@ -725,7 +725,7 @@
+@@ -955,7 +955,7 @@
  archobjs=''
  : Possible local include directories to search.
  : Set locincpth to "" in a hint file to defeat local include searches.
@@ -35,84 +20,56 @@ $NetBSD: patch-aa,v 1.15 2000/01/18 22:31:47 tron Exp $
  locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include"
  :
  : no include file wanted by default
-@@ -735,14 +735,14 @@
+@@ -965,13 +965,13 @@
+ : change the next line if compiling for Xenix/286 on Xenix/386
  xlibpth='/usr/lib/386 /lib/386'
- 
  : Possible local library directories to search.
 -loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
 +loclibpth="${PREFIX}/lib /opt/local/lib /usr/gnu/lib"
  loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
  
  : general looking path for locating libraries
- glibpth="/shlib /usr/shlib /usr/lib/pa1.1 /usr/lib/large"
- glibpth="$glibpth /lib /usr/lib $xlibpth"
+ glibpth="/usr/lib/large /lib /usr/lib $xlibpth"
  glibpth="$glibpth /lib/large /usr/lib/small /lib/small"
 -glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
 +glibpth="$glibpth /usr/ccs/lib /usr/ucblib ${PREFIX}/lib"
+ test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
+ test -f /shlib/libc.so     && glibpth="/shlib $glibpth"
  
- : Private path used by Configure to find libraries.  Its value
- : is prepended to libpth. This variable takes care of special
-@@ -753,9 +753,16 @@
- defvoidused=15
+@@ -992,10 +992,17 @@
  
  : List of libraries we want.
--libswanted='sfio net socket inet nsl nm ndbm gdbm dbm db malloc dl'
--libswanted="$libswanted dld ld sun m c cposix posix ndir dir crypt"
--libswanted="$libswanted ucb bsd BSD PW x"
+ : If anyone needs -lnet, put it in a hint file.
 +case `uname -s` in
-+SunOS)
-+	libswanted='sfio net socket inet nsl nm ndbm dbm db malloc dl'
-+	libswanted="$libswanted dld ld sun m c cposix posix ndir dir crypt"
-+	libswanted="$libswanted ucb bsd BSD PW x"
-+	;;
 +NetBSD)
 +	libswanted='m crypt'
 +	;;
++*)
+ libswanted='sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl'
+ libswanted="$libswanted dld ld sun m c cposix posix"
+ libswanted="$libswanted ndir dir crypt sec"
+ libswanted="$libswanted ucb bsd BSD PW x iconv"
++	;;
 +esac
  : We probably want to search /usr/shlib before most other libraries.
  : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
  glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
-@@ -2365,7 +2372,7 @@
- : determine root of directory hierarchy where package will be installed.
- case "$prefix" in
- '')
--	dflt=`./loc . /usr/local /usr/local /local /opt /usr`
-+	dflt=`./loc . ${PREFIX} ${PREFIX} /local /opt /usr`
- 	;;
+@@ -1337,10 +1344,10 @@
+ case "$fastread$alldone" in
+ yescont|yesexit) ;;
  *)
- 	dflt="$prefix"
-@@ -2375,10 +2382,10 @@
- 
- By default, $package will be installed in $dflt/bin, manual
- pages under $dflt/man, etc..., i.e. with $dflt as prefix for
--all installation directories. Typically set to /usr/local, but you
-+all installation directories. Typically set to ${PREFIX}, but you
- may choose /usr if you wish to install $package among your system
- binaries. If you wish to have binaries under /bin but manual pages
--under /usr/local/man, that's ok: you will be prompted separately
-+under ${PREFIX}/man, that's ok: you will be prompted separately
- for each of the installation directories, the prefix being only used
- to set the defaults.
- 
-@@ -2426,7 +2433,7 @@
- esac'
- 
- : determine where private library files go
--: Usual default is /usr/local/lib/perl5.  Also allow things like 
-+: Usual default is ${PREFIX}/lib/perl5.  Also allow things like 
- : /opt/perl/lib, since /opt/perl/lib/perl5 would be redundant.
- case "$prefix" in
- *perl*) set dflt privlib lib ;;
-@@ -2501,7 +2508,7 @@
- case "$archlib" in
- '')
-     case "$privlib" in
--    '')	dflt=`./loc . "." $prefixexp/lib /usr/local/lib /usr/lib /lib`
-+    '')	dflt=`./loc . "." $prefixexp/lib ${PREFIX}/lib /usr/lib /lib`
- 	set dflt
- 	eval $prefixup
+-	if test ! -t 0; then
+-		echo "Say 'sh Configure', not 'sh <Configure'"
+-		exit 1
+-	fi
++#	if test ! -t 0; then
++#		echo "Say 'sh Configure', not 'sh <Configure'"
++#		exit 1
++#	fi
  	;;
-@@ -2986,8 +2993,8 @@
+ esac
+ 
+@@ -2763,8 +2770,8 @@
  	syspath='/usr/man/man1 /usr/man/mann /usr/man/manl /usr/man/local/man1'
  	syspath="$syspath /usr/man/u_man/man1 /usr/share/man/man1"
  	syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1"
@@ -123,7 +80,7 @@ $NetBSD: patch-aa,v 1.15 2000/01/18 22:31:47 tron Exp $
  	sysman=`./loc . /usr/man/man1 $syspath`
  	;;
  esac
-@@ -3268,7 +3275,7 @@
+@@ -3577,7 +3584,7 @@
  : Set private lib path
  case "$plibpth" in
  '') if ./mips; then
@@ -132,13 +89,77 @@ $NetBSD: patch-aa,v 1.15 2000/01/18 22:31:47 tron Exp $
  	fi;;
  esac
  case "$libpth" in
-@@ -4742,15 +4749,15 @@
- shrpdir=$archlibexp/CORE
- xxx=''
- tmp_shrpenv=''
--if "$useshrplib"; then
-+if true; then
-     case "$osname" in 
+@@ -4664,7 +4671,7 @@
+ : determine root of directory hierarchy where package will be installed.
+ case "$prefix" in
+ '')
+-	dflt=`./loc . /usr/local /usr/local /local /opt /usr`
++	dflt=`./loc . ${PREFIX} ${PREFIX} /local /opt /usr`
+ 	;;
+ *)
+ 	dflt="$prefix"
+@@ -4674,9 +4681,9 @@
+ 
+ By default, $package will be installed in $dflt/bin, manual pages
+ under $dflt/man, etc..., i.e. with $dflt as prefix for all
+-installation directories. Typically this is something like /usr/local.
++installation directories. Typically this is something like ${PREFIX}.
+ If you wish to have binaries under /usr/bin but other parts of the
+-installation under /usr/local, that's ok: you will be prompted
++installation under ${PREFIX}, that's ok: you will be prompted
+ separately for each of the installation directories, the prefix being
+ only used to set the defaults.
+ 
+@@ -4835,7 +4842,7 @@
+ installstyle=$dflt
+ 
+ : determine where private library files go
+-: Usual default is /usr/local/lib/perl5/$version.
++: Usual default is ${PREFIX}/lib/perl5.  Also allow things like 
+ : Also allow things like /opt/perl/lib/$version, since 
+ : /opt/perl/lib/perl5... would be redundant.
+ : The default "style" setting is made in installstyle.U
+@@ -4871,8 +4878,8 @@
+ : determine where public architecture dependent libraries go
+ set archlib archlib
+ eval $prefixit
+-: privlib default is /usr/local/lib/$package/$version
+-: archlib default is /usr/local/lib/$package/$version/$archname
++: privlib default is ${PREFIX}/lib/$package/$version
++: archlib default is ${PREFIX}/lib/$package/$version/$archname
+ : privlib may have an optional trailing /share.
+ tdflt=`echo $privlib | $sed 's,/share$,,'`
+ tdflt=$tdflt/$archname
+@@ -5304,7 +5311,7 @@
+ 	;;
+ *)	d_vendorlib="$define"
+ 	: determine where vendor-supplied modules go.
+-	: Usual default is /usr/local/lib/perl5/vendor_perl/$version
++	: Usual default is ${PREFIX}/lib/perl5/vendor_perl/$version
+ 	case "$vendorlib" in
+ 	'')
+ 		prog=`echo $package | $sed 's/-*[0-9.]*$//'`
+@@ -5338,8 +5345,8 @@
+ 	;;
+ *)	d_vendorarch="$define"
+ 	: determine where vendor-supplied architecture-dependent libraries go.
+-	: vendorlib  default is /usr/local/lib/perl5/vendor_perl/$version
+-	: vendorarch default is /usr/local/lib/perl5/vendor_perl/$version/$archname
++	: vendorlib  default is ${PREFIX}/lib/perl5/vendor_perl/$version
++	: vendorarch default is ${PREFIX}/lib/perl5/vendor_perl/$version/$archname
+ 	: vendorlib may have an optional trailing /share.
+ 	case "$vendorarch" in
+ 	'')	dflt=`echo $vendorlib | $sed 's,/share$,,'`
+@@ -5481,7 +5488,7 @@
+ siteprefixexp="$ansexp"
+ 
+ : determine where site specific libraries go.
+-: Usual default is /usr/local/lib/perl5/site_perl/$version
++: Usual default is ${PREFIX}/lib/perl5/site_perl/$version
+ : The default "style" setting is made in installstyle.U
+ : XXX No longer works with Prefixit stuff.
+ prog=`echo $package | $sed 's/-*[0-9.]*$//'`
+@@ -6476,10 +6483,10 @@
  	aix)
  		# We'll set it in Makefile.SH...
  		;;
@@ -151,27 +172,29 @@ $NetBSD: patch-aa,v 1.15 2000/01/18 22:31:47 tron Exp $
  		xxx="-Wl,-R$shrpdir"
  		;;
  	linux|irix*|dec_osf)
-@@ -4965,8 +4972,8 @@
- esac
- 
- echo "If you don't want the manual sources installed, answer 'none'."
--: We dont use /usr/local/man/man3 because some man programs will
--: only show the /usr/local/man/man3 contents, and not the system ones,
-+: We dont use ${PREFIX}/man/man3 because some man programs will
-+: only show the ${PREFIX}/man/man3 contents, and not the system ones,
- : thus man less will show the perl module less.pm, but not the system
- : less command.  We might also conflict with TCL man pages.
- : However, something like /opt/perl/man/man3 is fine.
-@@ -5413,7 +5420,7 @@
+@@ -7113,8 +7120,8 @@
  	: guess some guesses
  	$test -d /usr/share/scripts && dflt=/usr/share/scripts
- 	$test -d /usr/share/bin && dflt=/usr/share/bin
--	$test -d /usr/local/script && dflt=/usr/local/script
-+	$test -d ${PREFIX}/script && dflt=${PREFIX}/script
- 	$test -d $prefixexp/script && dflt=$prefixexp/script
+ 	$test -d /usr/share/bin     && dflt=/usr/share/bin
+-	$test -d /usr/local/script  && dflt=/usr/local/script
+-	$test -d /usr/local/scripts && dflt=/usr/local/scripts
++	$test -d ${PREFIX}/script   && dflt=${PREFIX}/script
++	$test -d ${PREFIX}/scripts  && dflt=${PREFIX}/scripts
+ 	$test -d $prefixexp/script  && dflt=$prefixexp/script
  	set dflt
  	eval $prefixup
-@@ -8726,7 +8733,7 @@
+@@ -7146,8 +7153,8 @@
+ fi
+ 
+ : determine where site specific architecture-dependent libraries go.
+-: sitelib  default is /usr/local/lib/perl5/site_perl/$version
+-: sitearch default is /usr/local/lib/perl5/site_perl/$version/$archname
++: sitelib  default is ${PREFIX}/lib/perl5/site_perl/$version
++: sitearch default is ${PREFIX}/lib/perl5/site_perl/$version/$archname
+ : sitelib may have an optional trailing /share.
+ case "$sitearch" in
+ '')	dflt=`echo $sitelib | $sed 's,/share$,,'`
+@@ -13366,7 +13373,7 @@
  	case "$ranlib" in
  	:) ranlib='';;
  	'')
diff --git a/lang/perl5/patches/patch-ab b/lang/perl5/patches/patch-ab
index 61350907e28..248228ec04c 100644
--- a/lang/perl5/patches/patch-ab
+++ b/lang/perl5/patches/patch-ab
@@ -1,42 +1,60 @@
-$NetBSD: patch-ab,v 1.5 2000/01/18 22:31:47 tron Exp $
+$NetBSD: patch-ab,v 1.6 2000/08/30 18:42:24 jlam Exp $
 
---- installperl.BAK	Wed Nov 19 23:02:26 1997
-+++ installperl	Wed Nov 19 23:04:08 1997
-@@ -93,7 +93,7 @@
- safe_unlink("$installbin/sperl$ver$exe_ext");
- if ($d_dosuid) {
-     copy("suidperl$exe_ext", "$installbin/sperl$ver$exe_ext");
--    chmod(04711, "$installbin/sperl$ver$exe_ext");
-+    chmod(04111, "$installbin/sperl$ver$exe_ext");
- }
- 
- # Install library files.
-@@ -156,17 +156,17 @@
- 	      (-l $usrbinperl) &&
- 	      ((readlink $usrbinperl) eq $expinstperl));
-     }
--    if ((! $mainperl_is_instperl) &&
--	(yn("Many scripts expect perl to be installed as $usrbinperl.\n" . 
--	     "Do you wish to have $usrbinperl be the same as\n" .
--	     "$expinstperl? [y] ")))
--    {	
--	unlink($usrbinperl);
--	eval { CORE::link $instperl, $usrbinperl } ||
--	    eval { symlink $expinstperl, $usrbinperl } ||
--		copy($instperl, $usrbinperl);
--	$mainperl_is_instperl = 1;
--    }
-+#    if ((! $mainperl_is_instperl) &&
-+#	(yn("Many scripts expect perl to be installed as $usrbinperl.\n" . 
-+#	     "Do you wish to have $usrbinperl be the same as\n" .
-+#	     "$expinstperl? [y] ")))
-+#    {	
-+#	unlink($usrbinperl);
-+#	eval { CORE::link $instperl, $usrbinperl } ||
-+#	    eval { symlink $expinstperl, $usrbinperl } ||
-+#		copy($instperl, $usrbinperl);
-+#	$mainperl_is_instperl = 1;
-+#    }
- }
- 
- # Make links to ordinary names if installbin directory isn't current directory.
+--- MANIFEST.orig	Wed Mar 22 14:33:23 2000
++++ MANIFEST	Mon Aug 28 18:35:18 2000
+@@ -214,20 +214,6 @@
+ ext/DB_File/hints/sco.pl	Hint for DB_File for named architecture
+ ext/DB_File/typemap		Berkeley DB extension interface types
+ ext/DB_File/version.c		Berkeley DB extension interface version check
+-ext/Data/Dumper/Changes		Data pretty printer, changelog
+-ext/Data/Dumper/Dumper.pm	Data pretty printer, module
+-ext/Data/Dumper/Dumper.xs	Data pretty printer, externals
+-ext/Data/Dumper/Makefile.PL	Data pretty printer, makefile writer
+-ext/Data/Dumper/Todo		Data pretty printer, futures
+-ext/Devel/DProf/Changes		Perl code profiler changelog
+-ext/Devel/DProf/DProf.pm	Perl code profiler
+-ext/Devel/DProf/DProf.xs	Perl code profiler
+-ext/Devel/DProf/Makefile.PL	Perl code profiler makefile writer
+-ext/Devel/DProf/Todo		Perl code profiler todo list
+-ext/Devel/Peek/Changes		Data debugging tool, changelog
+-ext/Devel/Peek/Makefile.PL	Data debugging tool, makefile writer
+-ext/Devel/Peek/Peek.pm		Data debugging tool, module and pod
+-ext/Devel/Peek/Peek.xs		Data debugging tool, externals
+ ext/DynaLoader/DynaLoader_pm.PL	Dynamic Loader perl module
+ ext/DynaLoader/Makefile.PL	Dynamic Loader makefile writer
+ ext/DynaLoader/README		Dynamic Loader notes and intro
+@@ -260,11 +246,6 @@
+ ext/File/Glob/TODO		File::Glob extension todo list
+ ext/File/Glob/bsd_glob.c	File::Glob extension run time code
+ ext/File/Glob/bsd_glob.h	File::Glob extension header file
+-ext/GDBM_File/GDBM_File.pm	GDBM extension Perl module
+-ext/GDBM_File/GDBM_File.xs	GDBM extension external subroutines
+-ext/GDBM_File/Makefile.PL	GDBM extension makefile writer
+-ext/GDBM_File/hints/sco.pl	Hint for GDBM_File for named architecture
+-ext/GDBM_File/typemap		GDBM extension interface types
+ ext/IO/ChangeLog		IO perl module change log
+ ext/IO/IO.pm			Top-level interface to IO::* classes
+ ext/IO/IO.xs			IO extension external subroutines
+@@ -559,14 +540,6 @@
+ lib/AutoLoader.pm	Autoloader base class
+ lib/AutoSplit.pm	Split up autoload functions
+ lib/Benchmark.pm	Measure execution time
+-lib/CGI.pm		Web server interface ("Common Gateway Interface")
+-lib/CGI/Apache.pm	Support for Apache's Perl module
+-lib/CGI/Carp.pm		Log server errors with helpful context
+-lib/CGI/Cookie.pm	Interface to Netscape Cookies
+-lib/CGI/Fast.pm		Support for FastCGI (persistent server process)
+-lib/CGI/Pretty.pm	Output nicely formatted HTML
+-lib/CGI/Push.pm		Support for server push
+-lib/CGI/Switch.pm	Simple interface for multiple server types
+ lib/CPAN.pm		Interface to Comprehensive Perl Archive Network
+ lib/CPAN/FirstTime.pm	Utility for creating CPAN config files
+ lib/CPAN/Nox.pm		Runs CPAN while avoiding compiled extensions
+@@ -1493,7 +1466,6 @@
+ util.h			Dummy header
+ utils/Makefile		Extract the utility scripts
+ utils/c2ph.PL		program to translate dbx stabs to perl
+-utils/dprofpp.PL	Perl code profile post-processor
+ utils/h2ph.PL		A thing to turn C .h files into perl .ph files
+ utils/h2xs.PL		Program to make .xs files from C header files
+ utils/perlbc.PL		Front-end for byte compiler
diff --git a/lang/perl5/patches/patch-ac b/lang/perl5/patches/patch-ac
index d94b84eacf0..c21de046084 100644
--- a/lang/perl5/patches/patch-ac
+++ b/lang/perl5/patches/patch-ac
@@ -1,20 +1,13 @@
-$NetBSD: patch-ac,v 1.5 2000/01/18 22:31:47 tron Exp $
+$NetBSD: patch-ac,v 1.6 2000/08/30 18:42:24 jlam Exp $
 
---- perl.h.BAK	Wed Nov 19 23:07:32 1997
-+++ perl.h	Wed Nov 19 23:08:54 1997
-@@ -223,6 +223,15 @@
- #   include <sys/param.h>
- #endif
- 
-+/* needed for IAMSUID case for 4.4BSD systems
-+ * XXX there should probably be a Configure variable
-+ */
-+
-+#ifdef I_SYS_PARAM
-+#if (defined (BSD) && (BSD >= 199306))
-+#   include <sys/mount.h>
-+#endif /* !BSD */
-+#endif /* !I_SYS_PARAM */
- 
- /* Use all the "standard" definitions? */
- #if defined(STANDARD_C) && defined(I_STDLIB)
+--- ext/POSIX/Makefile.PL.orig	Wed Mar 22 11:23:03 2000
++++ ext/POSIX/Makefile.PL
+@@ -6,7 +6,7 @@
+ 	@libs = ('LIBS' => ["-lm -lc -lposix -lcposix"]);
+     }
+     else {
+-	@libs = ('LIBS' => ["-lm -lposix -lcposix"]);
++	@libs = ('LIBS' => ["-lm"]);
+     }
+ }
+ WriteMakefile(
diff --git a/lang/perl5/patches/patch-ad b/lang/perl5/patches/patch-ad
index 0b3e12a99d6..667177a6c93 100644
--- a/lang/perl5/patches/patch-ad
+++ b/lang/perl5/patches/patch-ad
@@ -1,25 +1,46 @@
-$NetBSD: patch-ad,v 1.5 2000/01/18 22:31:47 tron Exp $
+$NetBSD: patch-ad,v 1.6 2000/08/30 18:42:24 jlam Exp $
 
---- perl.c.BAK	Wed Nov 19 23:09:31 1997
-+++ perl.c	Wed Nov 19 23:10:58 1997
-@@ -2036,6 +2036,20 @@
- 		croak("Can't swap uid and euid");	/* really paranoid */
- 	    if (Stat(SvPVX(GvSV(curcop->cop_filegv)),&tmpstatbuf) < 0)
- 		croak("Permission denied");	/* testing full pathname here */
-+#if (defined(BSD) && (BSD >= 199306))
-+#ifdef IAMSUID
-+        {
-+            struct statfs stfs;
-+
-+            if (fstatfs(fileno(rsfp),&stfs) < 0)
-+                croak("Can't statfs filesystem of script \"%s\"",origfilename);
-+
-+           if (stfs.f_flags & MNT_NOSUID)
-+                croak("Permission denied");
-+        }
-+#endif /* IAMSUID */
-+#endif /* BSD */
-+
- 	    if (tmpstatbuf.st_dev != statbuf.st_dev ||
- 		tmpstatbuf.st_ino != statbuf.st_ino) {
- 		(void)PerlIO_close(rsfp);
+--- installperl.orig	Wed Mar  8 07:22:41 2000
++++ installperl
+@@ -224,7 +224,7 @@
+ safe_unlink("$installbin/s$perl_verbase$ver$exe_ext");
+ if ($d_dosuid) {
+     copy("suidperl$exe_ext", "$installbin/s$perl_verbase$ver$exe_ext");
+-    chmod(04711, "$installbin/s$perl_verbase$ver$exe_ext");
++    chmod(04111, "$installbin/s$perl_verbase$ver$exe_ext");
+ }
+ 
+ # Install library files.
+@@ -326,19 +326,19 @@
+ 	      (-l $usrbinperl) &&
+ 	      ((readlink $usrbinperl) eq $expinstperl));
+     }
+-    if ((! $mainperl_is_instperl) &&
+-	(yn("Many scripts expect perl to be installed as $usrbinperl.\n" . 
+-	     "Do you wish to have $usrbinperl be the same as\n" .
+-	     "$expinstperl? [y] ")))
+-    {
+-	unlink($usrbinperl);
+-	( $Config{'d_link'} eq 'define' &&
+-	  eval { CORE::link $instperl, $usrbinperl } )	||
+-	eval { symlink $expinstperl, $usrbinperl }	||
+-	copy($instperl, $usrbinperl);
+-
+-	$mainperl_is_instperl = 1;
+-    }
++#    if ((! $mainperl_is_instperl) &&
++#	(yn("Many scripts expect perl to be installed as $usrbinperl.\n" . 
++#	     "Do you wish to have $usrbinperl be the same as\n" .
++#	     "$expinstperl? [y] ")))
++#    {
++#	unlink($usrbinperl);
++#	( $Config{'d_link'} eq 'define' &&
++#	  eval { CORE::link $instperl, $usrbinperl } )	||
++#	eval { symlink $expinstperl, $usrbinperl }	||
++#	copy($instperl, $usrbinperl);
++#
++#	$mainperl_is_instperl = 1;
++#    }
+ }
+ 
+ # Make links to ordinary names if installbin directory isn't current directory.
diff --git a/lang/perl5/patches/patch-ae b/lang/perl5/patches/patch-ae
index 1ae93e6847a..2e8d3a4ee04 100644
--- a/lang/perl5/patches/patch-ae
+++ b/lang/perl5/patches/patch-ae
@@ -1,12 +1,20 @@
-$NetBSD: patch-ae,v 1.5 2000/01/18 22:31:47 tron Exp $
+$NetBSD: patch-ae,v 1.6 2000/08/30 18:42:24 jlam Exp $
 
---- makedepend.SH.BAK	Wed Nov 19 23:11:49 1997
-+++ makedepend.SH	Wed Nov 19 23:12:34 1997
-@@ -66,6 +66,7 @@
-     # to be out of date.  I don't know if OS/2 has touch, so do this:
-     case "$osname" in
-     os2) ;;
-+    netbsd) ;;
-     *) $touch $firstmakefile ;;
-     esac
- fi
+--- perl.h.orig	Sun Mar 19 00:45:33 2000
++++ perl.h
+@@ -486,6 +486,15 @@
+ #   include <sys/param.h>
+ #endif
+ 
++/* needed for IAMSUID case for 4.4BSD systems
++ * XXX there should probably be a Configure variable
++ */
++
++#ifdef I_SYS_PARAM
++#if (defined (BSD) && (BSD >= 199306))
++#   include <sys/mount.h>
++#endif /* !BSD */
++#endif /* !I_SYS_PARAM */
+ 
+ /* Use all the "standard" definitions? */
+ #if defined(STANDARD_C) && defined(I_STDLIB)
diff --git a/lang/perl5/patches/patch-af b/lang/perl5/patches/patch-af
index be16759a3c7..8928aa1b73d 100644
--- a/lang/perl5/patches/patch-af
+++ b/lang/perl5/patches/patch-af
@@ -1,80 +1,26 @@
-$NetBSD: patch-af,v 1.8 2000/01/18 22:31:47 tron Exp $
+$NetBSD: patch-af,v 1.9 2000/08/30 18:42:24 jlam Exp $
 
---- hints/netbsd.sh.orig	Thu May  8 11:52:59 1997
-+++ hints/netbsd.sh	Wed Dec  2 14:21:34 1998
-@@ -1,12 +1,11 @@
- # hints/netbsd.sh
- #
--# talk to mrg@eterna.com.au if you want to change this file.
-+# talk to packages@netbsd.org if you want to change this file.
- #
- # netbsd keeps dynamic loading dl*() functions in /usr/lib/crt0.o,
- # so Configure doesn't find them (unless you abandon the nm scan).
- # this should be *just* 0.9 below as netbsd 0.9a was the first to
--# introduce shared libraries.  however, they don't work/build on
--# pmax, powerpc and alpha ports correctly, yet.
-+# introduce shared libraries.
+--- utils/Makefile.orig	Mon Sep  6 15:46:15 1999
++++ utils/Makefile
+@@ -5,9 +5,9 @@
+ # Files to be built with variable substitution after miniperl is
+ # available.  Dependencies handled manually below (for now).
  
- case "$archname" in
- '')
-@@ -19,26 +18,26 @@
- 	usedl="$undef"
- 	;;
- *)
--	case `uname -m` in
--	alpha|powerpc|pmax)
-+	if [ -f /usr/libexec/ld.elf_so ]; then
-+		d_dlopen=$define
-+		d_dlerror=$define
-+		ccdlflags="-Wl,-E -Wl,-R${PREFIX}/lib $ccdlflags"
-+		cccdlflags="-DPIC -fPIC $cccdlflags"
-+		lddlflags="--whole-archive -shared $lddlflags"
-+	elif [ "`uname -m`" = "pmax" ]; then
-+# NetBSD 1.3 and 1.3.1 on pmax shipped an `old' ld.so, which will not work.
- 		d_dlopen=$undef
--		;;
--# this doesn't work (yet).
--#	alpha)
--#		d_dlopen=$define
--#		d_dlerror=$define
--#		cccdlflags="-DPIC -fPIC $cccdlflags"
--#		lddlflags="-shared $lddlflags"
--#		;;
--	*)
-+	elif [ -f /usr/libexec/ld.so ]; then
- 		d_dlopen=$define
- 		d_dlerror=$define
-+		ccdlflags="-Wl,-R${PREFIX}/lib $ccdlflags"
- # we use -fPIC here because -fpic is *NOT* enough for some of the
- # extensions like Tk on some netbsd platforms (the sparc is one)
- 		cccdlflags="-DPIC -fPIC $cccdlflags"
- 		lddlflags="-Bforcearchive -Bshareable $lddlflags"
--		;;
--	esac
-+	else
-+		d_dlopen=$undef
-+	fi
- 	;;
- esac
+-pl = c2ph.PL h2ph.PL h2xs.PL perlbug.PL perldoc.PL pl2pm.PL splain.PL perlcc.PL dprofpp.PL
+-plextract  = c2ph h2ph h2xs perlbug perldoc pl2pm splain perlcc dprofpp
+-plextractexe  = c2ph.exe h2ph.exe h2xs.exe perlbug.exe perldoc.exe pl2pm.exe splain.exe perlcc.exe dprofpp.exe
++pl = c2ph.PL h2ph.PL h2xs.PL perlbug.PL perldoc.PL pl2pm.PL splain.PL perlcc.PL
++plextract  = c2ph h2ph h2xs perlbug perldoc pl2pm splain perlcc
++plextractexe  = c2ph.exe h2ph.exe h2xs.exe perlbug.exe perldoc.exe pl2pm.exe splain.exe perlcc.exe
  
-@@ -47,15 +46,18 @@
- # way to make perl call setuid() or setgid().  if they aren't, then
- # ($<, $>) = ($u, $u); will work (same for $(/$)).  this is because
- # you can not change the real userid of a process under 4.4BSD.
--# netbsd fixed this in 1.2A.
-+# netbsd fixed this in 1.3.2.
- case "$osvers" in
--0.9*|1.0*|1.1*|1.2_*|1.2|1.2.*)
-+0.9*|1.[012]*|1.3|1.3.1)
- 	d_setregid="$undef"
- 	d_setreuid="$undef"
- 	d_setrgid="$undef"
- 	d_setruid="$undef"
- 	;;
- esac
-+
-+# there's no problem with vfork.
-+d_vfork="$define"
+ all: $(plextract) 
+ 
+@@ -32,8 +32,6 @@
+ splain:		splain.PL ../config.sh ../lib/diagnostics.pm
+ 
+ perlcc:		perlcc.PL ../config.sh
+-
+-dprofpp:	dprofpp.PL ../config.sh
+ 
+ clean:
  
- # Avoid telldir prototype conflict in pp_sys.c  (NetBSD uses const DIR *)
- # Configure should test for this.  Volunteers?
diff --git a/lang/perl5/patches/patch-ag b/lang/perl5/patches/patch-ag
deleted file mode 100644
index 7f90590f356..00000000000
--- a/lang/perl5/patches/patch-ag
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ag,v 1.5 2000/01/18 22:31:47 tron Exp $
-
---- doio.c.orig	Mon Jul 28 21:08:11 1997
-+++ doio.c	Sun Sep  5 23:27:54 1999
-@@ -1333,7 +1333,7 @@
-     char *a;
-     I32 id, n, cmd, infosize, getinfo;
-     I32 ret = -1;
--#ifdef __linux__	/* XXX Need metaconfig test */
-+#if defined(__linux__) || (defined(__NetBSD__) && (__NetBSD_Version__ < 104110000))	/* XXX Need metaconfig test */
-     union semun unsemds;
- #endif
- 
-@@ -1365,7 +1365,7 @@
- 	else if (cmd == GETALL || cmd == SETALL)
- 	{
- 	    struct semid_ds semds;
--#ifdef __linux__	/* XXX Need metaconfig test */
-+#if defined(__linux__) || (defined(__NetBSD__) && (__NetBSD_Version__ < 104110000))	/* XXX Need metaconfig test */
- /* linux (and Solaris2?) uses :
-    int semctl (int semid, int semnum, int cmd, union semun arg)
-        union semun {
-@@ -1425,7 +1425,7 @@
- #endif
- #ifdef HAS_SEM
-     case OP_SEMCTL:
--#ifdef __linux__	/* XXX Need metaconfig test */
-+#if defined(__linux__) || (defined(__NetBSD__) && (__NetBSD_Version__ < 104110000))	/* XXX Need metaconfig test */
-         unsemds.buf = (struct semid_ds *)a;
- 	ret = semctl(id, n, cmd, unsemds);
- #else
diff --git a/lang/perl5/patches/patch-ah b/lang/perl5/patches/patch-ah
deleted file mode 100644
index 0283d2fddc6..00000000000
--- a/lang/perl5/patches/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2000/01/18 22:31:47 tron Exp $
-
---- unixish.h.orig	Mon Sep 22 13:46:47 1997
-+++ unixish.h	Thu Nov 26 17:18:58 1998
-@@ -81,7 +81,7 @@
-  */
- /* #define ALTERNATE_SHEBANG "#!" / **/
- 
--#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX)
-+#if !defined(NSIG) || defined(M_UNIX) || defined(M_XENIX)  || defined(__NetBSD__)
- # include <signal.h>
- #endif
- 
diff --git a/lang/perl5/patches/patch-ai b/lang/perl5/patches/patch-ai
deleted file mode 100644
index 8752d8e2a36..00000000000
--- a/lang/perl5/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.3 2000/01/18 22:31:47 tron Exp $
-
---- Makefile.SH.orig	Wed Oct 15 05:33:16 1997
-+++ Makefile.SH	Mon Nov 30 21:02:40 1998
-@@ -37,7 +37,7 @@
- 		-prebind -seg1addr 0x27000000 -install_name \$(shrpdir)/\$@"
- 		;;
- 	sunos*|freebsd[23]*|netbsd*)
--		linklibperl="-lperl"
-+		linklibperl="-L. -lperl"
- 		;;
- 	aix*)
- 		shrpldflags="-H512 -T512 -bhalt:4 -bM:SRE -bE:perl.exp"
diff --git a/lang/perl5/patches/patch-aj b/lang/perl5/patches/patch-aj
deleted file mode 100644
index e400248087d..00000000000
--- a/lang/perl5/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2000/01/18 22:31:47 tron Exp $
-
---- ext/POSIX/Makefile.PL.orig	Mon Jun 24 16:25:03 1996
-+++ ext/POSIX/Makefile.PL	Thu Jul  1 18:46:41 1999
-@@ -1,7 +1,7 @@
- use ExtUtils::MakeMaker;
- WriteMakefile(
-     NAME	=> 'POSIX',
--    LIBS	=> ["-lm -lposix -lcposix"],
-+    LIBS	=> ["-lm"],
-     MAN3PODS 	=> ' ', 	# Pods will be built by installman.
-     XSPROTOARG => '-noprototypes', 		# XXX remove later?
-     VERSION_FROM => 'POSIX.pm',