import perl 5.10.0 from CPAN

7 files changed, 164 insertions, 146 deletions

diff --git a/gnu/usr.bin/perl/win32/ce-helpers/comp.pl b/gnu/usr.bin/perl/win32/ce-helpers/comp.pl
index f19350fc1b1..3fab27ccce3 100644
--- a/gnu/usr.bin/perl/win32/ce-helpers/comp.pl
+++ b/gnu/usr.bin/perl/win32/ce-helpers/comp.pl
@@ -1,4 +1,4 @@
-=begin comment
+=comments
 
 helper script to make life for PerlCE easier.
 
@@ -77,8 +77,8 @@ else {
 }
 
 
-=head1 AUTHOR
+=comments
 
- Vadim Konovalov.
+  Author Vadim Konovalov.
 
 =cut
diff --git a/gnu/usr.bin/perl/win32/ce-helpers/compile-all.bat b/gnu/usr.bin/perl/win32/ce-helpers/compile-all.bat
index c546bb201eb..c85f5e9b7cd 100644
--- a/gnu/usr.bin/perl/win32/ce-helpers/compile-all.bat
+++ b/gnu/usr.bin/perl/win32/ce-helpers/compile-all.bat
@@ -1,62 +1,62 @@
-@echo off
-rem
-rem Normally you do not need to run this file.
-rem Instead you should edit and execute compile.bat .
-rem
-rem This file assumes that you have a set of appropriate
-rem bat-files that prepare environment variables for build process
-rem and execute commands passed as arguments
-rem
-
-call wcearm-300 compile.bat "MACHINE=wince-arm-hpc-wce300"
-call wcearm-300 compile.bat "MACHINE=wince-arm-hpc-wce300" zipdist
-..\miniperl makedist.pl --clean-exts
-
-call wcearm-211 compile.bat "MACHINE=wince-arm-hpc-wce211"
-call wcearm-211 compile.bat "MACHINE=wince-arm-hpc-wce211"  zipdist
-..\miniperl makedist.pl --clean-exts
-
-call wcesh3-211 compile.bat "MACHINE=wince-sh3-hpc-wce211"
-call wcesh3-211 compile.bat "MACHINE=wince-sh3-hpc-wce211"  zipdist
-..\miniperl makedist.pl --clean-exts
-
-call wcemips-211 compile.bat "MACHINE=wince-mips-hpc-wce211"
-call wcemips-211 compile.bat "MACHINE=wince-mips-hpc-wce211"  zipdist
-..\miniperl makedist.pl --clean-exts
-
-rem TODO call wcesh3-200 compile.bat "MACHINE=wince-sh3-hpc-wce200"
-rem TODO call wcesh3-200 compile.bat "MACHINE=wince-sh3-hpc-wce200"  zipdist
-rem TODO ..\miniperl makedist.pl --clean-exts
-
-rem TODO call compile.bat "MACHINE=wince-mips-hpc-wce200"
-rem TODO call compile.bat "MACHINE=wince-mips-hpc-wce200"  zipdist
-rem TODO ..\miniperl makedist.pl --clean-exts
-
-call WCEARM-p300 compile.bat "MACHINE=wince-arm-pocket-wce300"
-call WCEARM-p300 compile.bat "MACHINE=wince-arm-pocket-wce300"  zipdist
-..\miniperl makedist.pl --clean-exts
-
-call WCEMIPS-300 compile.bat "MACHINE=wince-mips-pocket-wce300"
-call WCEMIPS-300 compile.bat "MACHINE=wince-mips-pocket-wce300"  zipdist
-..\miniperl makedist.pl --clean-exts
-
-call WCESH3-300 compile.bat "MACHINE=wince-sh3-pocket-wce300"
-call WCESH3-300 compile.bat "MACHINE=wince-sh3-pocket-wce300"  zipdist
-..\miniperl makedist.pl --clean-exts
-
-call WCEx86-300 compile.bat "MACHINE=wince-x86em-pocket-wce300"
-call WCEx86-300 compile.bat "MACHINE=wince-x86em-pocket-wce300"  zipdist
-..\miniperl makedist.pl --clean-exts
-
-call WCEMIPS-palm211 compile.bat "MACHINE=wince-mips-palm-wce211"
-call WCEMIPS-palm211 compile.bat "MACHINE=wince-mips-palm-wce211"  zipdist
-..\miniperl makedist.pl --clean-exts
-
-call WCESH3-palm211 compile.bat "MACHINE=wince-sh3-palm-wce211"
-call WCESH3-palm211 compile.bat "MACHINE=wince-sh3-palm-wce211"  zipdist
-..\miniperl makedist.pl --clean-exts
-
-call WCEx86-palm211 compile.bat "MACHINE=wince-x86em-palm-wce211"
-call WCEx86-palm211 compile.bat "MACHINE=wince-x86em-palm-wce211"  zipdist
-..\miniperl makedist.pl --clean-exts
-
+@echo off

+rem

+rem Normally you do not need to run this file.

+rem Instead you should edit and execute compile.bat .

+rem

+rem This file assumes that you have a set of appropriate

+rem bat-files that prepare environment variables for build process

+rem and execute commands passed as arguments

+rem

+

+call wcearm-300 compile.bat "MACHINE=wince-arm-hpc-wce300"

+call wcearm-300 compile.bat "MACHINE=wince-arm-hpc-wce300" zipdist

+..\miniperl makedist.pl --clean-exts

+

+call wcearm-211 compile.bat "MACHINE=wince-arm-hpc-wce211"

+call wcearm-211 compile.bat "MACHINE=wince-arm-hpc-wce211"  zipdist

+..\miniperl makedist.pl --clean-exts

+

+call wcesh3-211 compile.bat "MACHINE=wince-sh3-hpc-wce211"

+call wcesh3-211 compile.bat "MACHINE=wince-sh3-hpc-wce211"  zipdist

+..\miniperl makedist.pl --clean-exts

+

+call wcemips-211 compile.bat "MACHINE=wince-mips-hpc-wce211"

+call wcemips-211 compile.bat "MACHINE=wince-mips-hpc-wce211"  zipdist

+..\miniperl makedist.pl --clean-exts

+

+rem TODO call wcesh3-200 compile.bat "MACHINE=wince-sh3-hpc-wce200"

+rem TODO call wcesh3-200 compile.bat "MACHINE=wince-sh3-hpc-wce200"  zipdist

+rem TODO ..\miniperl makedist.pl --clean-exts

+

+rem TODO call compile.bat "MACHINE=wince-mips-hpc-wce200"

+rem TODO call compile.bat "MACHINE=wince-mips-hpc-wce200"  zipdist

+rem TODO ..\miniperl makedist.pl --clean-exts

+

+call WCEARM-p300 compile.bat "MACHINE=wince-arm-pocket-wce300"

+call WCEARM-p300 compile.bat "MACHINE=wince-arm-pocket-wce300"  zipdist

+..\miniperl makedist.pl --clean-exts

+

+call WCEMIPS-300 compile.bat "MACHINE=wince-mips-pocket-wce300"

+call WCEMIPS-300 compile.bat "MACHINE=wince-mips-pocket-wce300"  zipdist

+..\miniperl makedist.pl --clean-exts

+

+call WCESH3-300 compile.bat "MACHINE=wince-sh3-pocket-wce300"

+call WCESH3-300 compile.bat "MACHINE=wince-sh3-pocket-wce300"  zipdist

+..\miniperl makedist.pl --clean-exts

+

+call WCEx86-300 compile.bat "MACHINE=wince-x86em-pocket-wce300"

+call WCEx86-300 compile.bat "MACHINE=wince-x86em-pocket-wce300"  zipdist

+..\miniperl makedist.pl --clean-exts

+

+call WCEMIPS-palm211 compile.bat "MACHINE=wince-mips-palm-wce211"

+call WCEMIPS-palm211 compile.bat "MACHINE=wince-mips-palm-wce211"  zipdist

+..\miniperl makedist.pl --clean-exts

+

+call WCESH3-palm211 compile.bat "MACHINE=wince-sh3-palm-wce211"

+call WCESH3-palm211 compile.bat "MACHINE=wince-sh3-palm-wce211"  zipdist

+..\miniperl makedist.pl --clean-exts

+

+call WCEx86-palm211 compile.bat "MACHINE=wince-x86em-palm-wce211"

+call WCEx86-palm211 compile.bat "MACHINE=wince-x86em-palm-wce211"  zipdist

+..\miniperl makedist.pl --clean-exts

+

diff --git a/gnu/usr.bin/perl/win32/ce-helpers/compile.bat b/gnu/usr.bin/perl/win32/ce-helpers/compile.bat
index 79ed2fb80ce..634b65681da 100644
--- a/gnu/usr.bin/perl/win32/ce-helpers/compile.bat
+++ b/gnu/usr.bin/perl/win32/ce-helpers/compile.bat
@@ -1,42 +1,42 @@
-@echo off
-rem
-rem edit ARG-xxx variable to reflect your system and run
-rem   compile.bat [target] [additional parameters for nmake]
-rem
-
-set ARG-1=PV=
-set ARG-2=INST_VER=
-set ARG-3=INSTALL_ROOT=\Storage Card\perl58m
-set ARG-4=WCEROOT=%SDKROOT%
-set ARG-5=CEPATH=%WCEROOT%
-set ARG-6=CELIBDLLDIR=d:\personal\pocketPC\celib-palm-3.0
-set ARG-7=CECONSOLEDIR=d:\personal\pocketPC\w32console
-
-rem Only for WIN2000
-set ARG-8=YES=/y
-
-set ARG-9=CFG=RELEASE
-
-rem
-rem  uncomment one of following lines that matches your configuration
-
-rem set ARG-10=MACHINE=wince-mips-pocket-wce300
-rem set ARG-10=MACHINE=wince-arm-hpc-wce300
-rem set ARG-10=MACHINE=wince-arm-hpc-wce211
-rem set ARG-10=MACHINE=wince-sh3-hpc-wce211
-rem set ARG-10=MACHINE=wince-mips-hpc-wce211
-rem set ARG-10=MACHINE=wince-sh3-hpc-wce200
-rem set ARG-10=MACHINE=wince-mips-hpc-wce200
-rem set ARG-10=MACHINE=wince-arm-pocket-wce300
-rem set ARG-10=MACHINE=wince-mips-pocket-wce300
-rem set ARG-10=MACHINE=wince-sh3-pocket-wce300
-rem set ARG-10=MACHINE=wince-x86em-pocket-wce300
-rem set ARG-10=MACHINE=wince-mips-palm-wce211
-rem set ARG-10=MACHINE=wince-sh3-palm-wce211
-rem set ARG-10=MACHINE=wince-x86em-palm-wce211
-
-set ARG-11=PERLCEDIR=$(MAKEDIR)
-set ARG-12=MSVCDIR=D:\MSVStudio\VC98
-set ARG-13=CECOPY=$(HPERL) -I$(PERLCEDIR)\lib $(PERLCEDIR)\comp.pl --copy
-
-nmake -f Makefile.ce "%ARG-1%" "%ARG-2%" "%ARG-3%" "%ARG-4%" "%ARG-5%" "%ARG-6%" "%ARG-7%" "%ARG-8%" "%ARG-9%" "%ARG-10%" "%ARG-11%" "%ARG-12%" "%ARG-13%" %1 %2 %3 %4 %5 %6 %7 %8 %9
+@echo off

+rem

+rem edit ARG-xxx variable to reflect your system and run

+rem   compile.bat [target] [additional parameters for nmake]

+rem

+

+set ARG-1=PV=

+set ARG-2=INST_VER=

+set ARG-3=INSTALL_ROOT=\Storage Card\perl58m

+set ARG-4=WCEROOT=%SDKROOT%

+set ARG-5=CEPATH=%WCEROOT%

+set ARG-6=CELIBDLLDIR=d:\personal\pocketPC\celib-palm-3.0

+set ARG-7=CECONSOLEDIR=d:\personal\pocketPC\w32console

+

+rem Only for WIN2000

+set ARG-8=YES=/y

+

+set ARG-9=CFG=RELEASE

+

+rem

+rem  uncomment one of following lines that matches your configuration

+

+rem set ARG-10=MACHINE=wince-mips-pocket-wce300

+rem set ARG-10=MACHINE=wince-arm-hpc-wce300

+rem set ARG-10=MACHINE=wince-arm-hpc-wce211

+rem set ARG-10=MACHINE=wince-sh3-hpc-wce211

+rem set ARG-10=MACHINE=wince-mips-hpc-wce211

+rem set ARG-10=MACHINE=wince-sh3-hpc-wce200

+rem set ARG-10=MACHINE=wince-mips-hpc-wce200

+rem set ARG-10=MACHINE=wince-arm-pocket-wce300

+rem set ARG-10=MACHINE=wince-mips-pocket-wce300

+rem set ARG-10=MACHINE=wince-sh3-pocket-wce300

+rem set ARG-10=MACHINE=wince-x86em-pocket-wce300

+rem set ARG-10=MACHINE=wince-mips-palm-wce211

+rem set ARG-10=MACHINE=wince-sh3-palm-wce211

+rem set ARG-10=MACHINE=wince-x86em-palm-wce211

+

+set ARG-11=PERLCEDIR=$(MAKEDIR)

+set ARG-12=MSVCDIR=D:\MSVStudio\VC98

+set ARG-13=CECOPY=$(HPERL) -I$(PERLCEDIR)\lib $(PERLCEDIR)\comp.pl --copy

+

+nmake -f Makefile.ce "%ARG-1%" "%ARG-2%" "%ARG-3%" "%ARG-4%" "%ARG-5%" "%ARG-6%" "%ARG-7%" "%ARG-8%" "%ARG-9%" "%ARG-10%" "%ARG-11%" "%ARG-12%" "%ARG-13%" %1 %2 %3 %4 %5 %6 %7 %8 %9

diff --git a/gnu/usr.bin/perl/win32/ce-helpers/makedist.pl b/gnu/usr.bin/perl/win32/ce-helpers/makedist.pl
index daf4f3e96c4..85812673e47 100644
--- a/gnu/usr.bin/perl/win32/ce-helpers/makedist.pl
+++ b/gnu/usr.bin/perl/win32/ce-helpers/makedist.pl
@@ -15,7 +15,7 @@ my %opts = (
     'cross-name' => 'wince',
     'strip-pod' => 0, # strip POD from perl modules
     'adaptation' => 1, # do some adaptation, such as stripping such
-                       # occurrences as "if ($^O eq 'VMS'){...}" for Dynaloader.pm
+                       # occurences as "if ($^O eq 'VMS'){...}" for Dynaloader.pm
     'zip' => 0,     # perform zip
     'clean-exts' => 0,
   #options itself
@@ -101,7 +101,7 @@ for (@efiles) {
 my ($dynaloader_pm);
 if ($opts{adaptation}) {
   # let's copy our Dynaloader.pm (make this optional?)
-  open my $fhdyna, '>', "$opts{distdir}/lib/Dynaloader.pm";
+  open my $fhdyna, ">$opts{distdir}/lib/Dynaloader.pm";
   print $fhdyna $dynaloader_pm;
   close $fhdyna;
 }
@@ -110,7 +110,7 @@ if ($opts{adaptation}) {
 if ($opts{'verbose'} >=1) {
   print STDERR "Copying Config.pm, perl.dll and perl.exe...\n";
 }
-copy "../lib/Config.pm", "$opts{distdir}/lib/Config.pm";
+copy "../xlib/$opts{'cross-name'}/Config.pm", "$opts{distdir}/lib/Config.pm";
 copy "$opts{'cross-name'}/perl.exe", "$opts{distdir}/bin/perl.exe";
 copy "$opts{'cross-name'}/perl.dll", "$opts{distdir}/bin/perl.dll";
 # how do we know exact name of perl.dll?
@@ -121,7 +121,7 @@ my %aexcl = (socket=>'Socket_1');
 # on WinCE, %aexcl needed to replace it with a different name that however
 # will be found by Dynaloader
 my @afiles;
-chdir "../lib/auto";
+chdir "../xlib/$opts{'cross-name'}/auto";
 find({no_chdir=>1,wanted=>sub{push @afiles, $_ if /\.(dll|bs)$/}},'.');
 chdir $cwd;
 if ($opts{'verbose'} >=1) {
@@ -129,16 +129,16 @@ if ($opts{'verbose'} >=1) {
 }
 for (@afiles) {
   if (/^(.*)\/(\w+)\.dll$/i && exists $aexcl{lc($2)}) {
-    copy "../lib/auto/$_", "$opts{distdir}/lib/auto/$1/$aexcl{lc($2)}.dll";
+    copy "../xlib/$opts{'cross-name'}/auto/$_", "$opts{distdir}/lib/auto/$1/$aexcl{lc($2)}.dll";
   }
   else {
-    copy "../lib/auto/$_", "$opts{distdir}/lib/auto/$_";
+    copy "../xlib/$opts{'cross-name'}/auto/$_", "$opts{distdir}/lib/auto/$_";
   }
 }
 
 sub copy($$) {
   my ($fnfrom, $fnto) = @_;
-  open my $fh, '<', $fnfrom or die "can not open $fnfrom: $!";
+  open my $fh, "<$fnfrom" or die "can not open $fnfrom: $!";
   binmode $fh;
   local $/;
   my $ffrom = <$fh>;
@@ -153,7 +153,7 @@ sub copy($$) {
     }
   }
   mkpath $1 if $fnto=~/^(.*)\/([^\/]+)$/;
-  open my $fhout, '>', $fnto;
+  open my $fhout, ">$fnto";
   binmode $fhout;
   print $fhout $ffrom;
   if ($opts{'verbose'} >=2) {
@@ -237,7 +237,6 @@ sub bootstrap {
     my $bs = $file;
     $bs =~ s/(\.\w+)?(;\d*)?$/\.bs/;
     if (-s $bs) { # only read file if it's not empty
-        local @INC = ('.');
         do $bs;
         warn "$bs: $@\n" if $@;
     }
diff --git a/gnu/usr.bin/perl/win32/ce-helpers/registry.bat b/gnu/usr.bin/perl/win32/ce-helpers/registry.bat
index 0fd58c3d3c4..f9c819312de 100644
--- a/gnu/usr.bin/perl/win32/ce-helpers/registry.bat
+++ b/gnu/usr.bin/perl/win32/ce-helpers/registry.bat
@@ -1,28 +1,28 @@
-@echo off
-
-::- This script must be executed on the PC with an ActiveSync
-::- connection. If it does not work, create the entries with
-::- a remote registry editor or get a registry editor for your
-::- devices.
-::-
-::- You need my cereg.exe program.
-
-::- My paths...
-set perlexe=\speicherkarte2\bin\perl.exe
-set perllib=\speicherkarte2\usr\lib\perl5
-
-::- PERL5LIB
-cereg -k "HKLM\Environment" -n "PERL5LIB" -v "%perllib%"
-
-::- For ShellExecute
-cereg -k "HKCR\.pl" -n "" -v "perlfile"
-cereg -k "HKCR\perlfile" -n "" -v "Perl Script"
-cereg -k "HKCR\perlfile\DefaultIcon" -n "" -v "%perlexe%,-1"
-
-::- You might need to fix the quotes if your paths contain spaces!
-cereg -k "HKCR\perlfile\Shell\open\command" -n "" -v "%perlexe% %%1"
-
-cereg -k "HKLM\Environment" -n "ROWS" -v "10"
-cereg -k "HKLM\Environment" -n "COLS" -v "75"
-cereg -k "HKLM\Environment" -n "PATH" -v "/Speicherkarte2/bin"
-cereg -k "HKLM\Environment" -n "UNIXROOTDIR" -v "/Speicherkarte2"
+@echo off

+

+::- This script must be executed on the PC with an ActiveSync

+::- connection. If it does not work, create the entries with

+::- a remote registry editor or get a registry editor for your

+::- devices.

+::-

+::- You need my cereg.exe program.

+

+::- My paths...

+set perlexe=\speicherkarte2\bin\perl.exe

+set perllib=\speicherkarte2\usr\lib\perl5

+

+::- PERL5LIB

+cereg -k "HKLM\Environment" -n "PERL5LIB" -v "%perllib%"

+

+::- For ShellExecute

+cereg -k "HKCR\.pl" -n "" -v "perlfile"

+cereg -k "HKCR\perlfile" -n "" -v "Perl Script"

+cereg -k "HKCR\perlfile\DefaultIcon" -n "" -v "%perlexe%,-1"

+

+::- You might need to fix the quotes if your paths contain spaces!

+cereg -k "HKCR\perlfile\Shell\open\command" -n "" -v "%perlexe% %%1"

+

+cereg -k "HKLM\Environment" -n "ROWS" -v "10"

+cereg -k "HKLM\Environment" -n "COLS" -v "75"

+cereg -k "HKLM\Environment" -n "PATH" -v "/Speicherkarte2/bin"

+cereg -k "HKLM\Environment" -n "UNIXROOTDIR" -v "/Speicherkarte2"

diff --git a/gnu/usr.bin/perl/win32/win32iop-o.h b/gnu/usr.bin/perl/win32/win32iop-o.h
index 2b766dc5540..47c0de91b82 100644
--- a/gnu/usr.bin/perl/win32/win32iop-o.h
+++ b/gnu/usr.bin/perl/win32/win32iop-o.h
@@ -16,7 +16,11 @@
 #endif
 
 #ifndef UNDER_CE
-#include <sys/utime.h>
+#if defined(_MSC_VER) || defined(__MINGW32__)
+#  include <sys/utime.h>
+#else
+#  include <utime.h>
+#endif
 #endif
 
 /*
@@ -123,8 +127,10 @@ DllExport  void		win32_seekdir(DIR *dirp, long loc);
 DllExport  void		win32_rewinddir(DIR *dirp);
 DllExport  int		win32_closedir(DIR *dirp);
 
+#ifndef USE_WIN32_RTL_ENV
 DllExport  char*	win32_getenv(const char *name);
 DllExport  int		win32_putenv(const char *name);
+#endif
 
 DllExport  unsigned 	win32_sleep(unsigned int);
 DllExport  int		win32_times(struct tms *timebuf);
@@ -174,6 +180,15 @@ END_EXTERN_C
 #undef uname
 #undef wait
 
+#ifdef __BORLANDC__
+#undef ungetc
+#undef getc
+#undef putc
+#undef getchar
+#undef putchar
+#undef fileno
+#endif
+
 #define stderr				win32_stderr()
 #define stdout				win32_stdout()
 #define	stdin				win32_stdin()
@@ -317,10 +332,12 @@ END_EXTERN_C
 #undef crypt
 #define crypt(t,s)		win32_crypt(t,s)
 
+#ifndef USE_WIN32_RTL_ENV
 #undef getenv
 #define getenv win32_getenv
 #undef putenv
 #define putenv win32_putenv
+#endif
 
 #endif /* WIN32IO_IS_STDIO */
 #endif /* WIN32IOP_H */
diff --git a/gnu/usr.bin/perl/win32/wincesck.c b/gnu/usr.bin/perl/win32/wincesck.c
index 9ef025d46cb..067b257ea07 100644
--- a/gnu/usr.bin/perl/win32/wincesck.c
+++ b/gnu/usr.bin/perl/win32/wincesck.c
@@ -3,7 +3,7 @@
 /* wincesck.c
  *
  * (c) 1995 Microsoft Corporation. All rights reserved.
- * 		Developed by hip communications inc.
+ * 		Developed by hip communications inc., http://info.hip.com/info/
  * Portions (c) 1993 Intergraph Corporation. All rights reserved.
  *
  *    You may distribute under the terms of either the GNU General Public
@@ -483,9 +483,11 @@ win32_savecopyservent(struct servent*d, struct servent*s, const char *proto)
     d->s_name = s->s_name;
     d->s_aliases = s->s_aliases;
     d->s_port = s->s_port;
+#ifndef __BORLANDC__	/* Buggy on Win95 and WinNT-with-Borland-WSOCK */
     if (!IsWin95() && s->s_proto && strlen(s->s_proto))
 	d->s_proto = s->s_proto;
     else
+#endif
     if (proto && strlen(proto))
 	d->s_proto = (char *)proto;
     else