Integrate:

[ 21369]
Subject: Re: 5.8.1 and gcc-3.2.3 (& Win98)
Message-ID: <20030924225109.A17126@ms>

(Win98 + MinGW, a missing Win95.pm hunk)

[ 21370]
CPAN sites update.

Regen perltoc, perlmodlib.
p4raw-link: @21370 on //depot/perl: 2e75584a9dc32e975efde1885af821901fd45208
p4raw-link: @21369 on //depot/perl: f8f79f57f467ffff4d31dc518ce3f6d2364090a0

p4raw-id: //depot/maint-5.8/perl@21374
p4raw-edited: from //depot/perl@21373 'edit in' pod/perlmodlib.PL
	(@20862..)
p4raw-integrated: from //depot/perl@21373 'copy in'
	lib/ExtUtils/MM_Win95.pm (@21325..)

4 files changed, 150 insertions, 37 deletions

diff --git a/lib/ExtUtils/MM_Win95.pm b/lib/ExtUtils/MM_Win95.pm
index 549e1d78ac..68c2ac8588 100644
--- a/lib/ExtUtils/MM_Win95.pm
+++ b/lib/ExtUtils/MM_Win95.pm
@@ -125,6 +125,8 @@ The && problem.
 sub xs_o {
     my($self) = shift;
     return '' unless $self->needs_linking();
+    # Having to choose between .xs -> .c -> .o and .xs -> .o confuses dmake.
+    return '' if $DMAKE;
     '
 .xs$(OBJ_EXT):
 	$(PERLRUN) $(XSUBPP) $(XSPROTOARG) $(XSUBPPARGS) $*.xs > $*.c
diff --git a/pod/perlmodlib.PL b/pod/perlmodlib.PL
index 427243c88c..d87785f506 100644
--- a/pod/perlmodlib.PL
+++ b/pod/perlmodlib.PL
@@ -415,6 +415,8 @@ You should try to choose one close to you.
 
 =item Austria
 
+                      http://cpan.inode.at/
+                      ftp://cpan.inode.at
                       ftp://ftp.tuwien.ac.at/pub/CPAN/
 
 =item Belgium
@@ -571,7 +573,7 @@ You should try to choose one close to you.
 
 =item Poland
 
-                      ftp.mega.net.pl/CPAN
+                      ftp://ftp.mega.net.pl/CPAN
                       ftp://ftp.man.torun.pl/pub/doc/CPAN/
                       ftp://sunsite.icm.edu.pl/pub/CPAN/
 
@@ -625,7 +627,7 @@ You should try to choose one close to you.
 
                       http://cpan.imasd.elmundo.es/
                       ftp://ftp.rediris.es/mirror/CPAN/
-                      ftp://ftp.ri.telefonica-data.net/
+                      ftp://ftp.ri.telefonica-data.net/CPAN
                       ftp://ftp.etse.urv.es/pub/perl/
 
 =item Sweden
@@ -791,6 +793,8 @@ You should try to choose one close to you.
 =item Michigan
 
                       ftp://cpan.cse.msu.edu/
+                      http://cpan.calvin.edu/pub/CPAN
+                      ftp://cpan.calvin.edu/pub/CPAN
 
 =item Nevada
 
diff --git a/pod/perlmodlib.pod b/pod/perlmodlib.pod
index 66d0f5e350..22343d7a75 100644
--- a/pod/perlmodlib.pod
+++ b/pod/perlmodlib.pod
@@ -559,7 +559,7 @@ OS adjusted ExtUtils::MakeMaker subclass
 
 =item ExtUtils::MM_Any
 
-Platform agnostic MM methods
+Platform-agnostic MM methods
 
 =item ExtUtils::MM_BeOS
 
@@ -1669,6 +1669,8 @@ You should try to choose one close to you.
 
 =item Austria
 
+                      http://cpan.inode.at/
+                      ftp://cpan.inode.at
                       ftp://ftp.tuwien.ac.at/pub/CPAN/
 
 =item Belgium
@@ -1825,7 +1827,7 @@ You should try to choose one close to you.
 
 =item Poland
 
-                      ftp.mega.net.pl/CPAN
+                      ftp://ftp.mega.net.pl/CPAN
                       ftp://ftp.man.torun.pl/pub/doc/CPAN/
                       ftp://sunsite.icm.edu.pl/pub/CPAN/
 
@@ -1879,7 +1881,7 @@ You should try to choose one close to you.
 
                       http://cpan.imasd.elmundo.es/
                       ftp://ftp.rediris.es/mirror/CPAN/
-                      ftp://ftp.ri.telefonica-data.net/
+                      ftp://ftp.ri.telefonica-data.net/CPAN
                       ftp://ftp.etse.urv.es/pub/perl/
 
 =item Sweden
@@ -2045,6 +2047,8 @@ You should try to choose one close to you.
 =item Michigan
 
                       ftp://cpan.cse.msu.edu/
+                      http://cpan.calvin.edu/pub/CPAN
+                      ftp://cpan.calvin.edu/pub/CPAN
 
 =item Nevada
 
diff --git a/pod/perltoc.pod b/pod/perltoc.pod
index 55349780d3..9cd76c367c 100644
--- a/pod/perltoc.pod
+++ b/pod/perltoc.pod
@@ -4851,6 +4851,8 @@ Getarg, Fileno, Dup, Read, Write, Seek, Tell, Close, Flush, Fill, Eof,
 Error,	Clearerr, Setlinebuf, Get_base, Get_bufsiz, Get_ptr, Get_cnt,
 Set_ptrcnt
 
+=item Utilities
+
 =item Implementing PerlIO Layers
 
 C implementations, Perl implementations
@@ -5522,6 +5524,15 @@ B<-V>
 
 =item Updated Modules And Pragmata
 
+base, B::Bytecode, B::Concise, B::Deparse, Benchmark, ByteLoader, bytes,
+CGI, charnames, CPAN, Data::Dumper, DB_File, Devel::PPPort, Digest::MD5,
+Encode, fields, libnet, Math::BigInt, MIME::Base64, NEXT, Net::Ping,
+PerlIO::scalar, podlators, Pod::LaTeX, PodParsers, Pod::Perldoc,
+Scalar::Util, Storable, strict, Term::ANSIcolor, Test::Harness, Test::More,
+Test::Simple, Text::Balanced, Time::HiRes, threads, threads::shared,
+Unicode::Collate, Unicode::Normalize, Win32::GetFolderPath,
+Win32::GetOSVersion
+
 =back
 
 =item Utility Changes
@@ -5544,10 +5555,6 @@ B<-V>
 
 =item Generic fixes
 
-=item Module and pragma specific fixes
-
-Encode, PerlIO::scalar, strict
-
 =item Platform-specific fixes
 
 =back
@@ -5580,8 +5587,7 @@ Encode, PerlIO::scalar, strict
 
 =item New "To%s: illegal mapping '%s'"
 
-=item New "Use of freed value in iteration (perhaps you modified the
-iterated array within the loop?)"
+=item New "Use of freed value in iteration"
 
 =back
 
@@ -5593,9 +5599,9 @@ iterated array within the loop?)"
 
 =over 4
 
-=item tied hashes in scalar context
+=item Tied hashes in scalar context
 
-=item lib/Net/Ping/t/510_ping_udp.t subtest 2
+=item Net::Ping 450_service and 510_ping_udp failures
 
 =item B::C
 
@@ -5607,11 +5613,9 @@ iterated array within the loop?)"
 
 =item EBCDIC Platforms
 
-=item Cygwin 1.5 sysio.t
+=item Cygwin 1.5 problems
 
-=item FreeBSD: malloc dilemma
-
-=item HP-UX: HP cc warnings about sendfile
+=item HP-UX: HP cc warnings about sendfile and sendpath
 
 =item IRIX: t/uni/tr_7jis.t falsely failing
 
@@ -7599,6 +7603,34 @@ R4 x86, R4 PPC
 
 =back
 
+=over 4
+
+=item Name
+
+=item Description
+
+=item Build
+
+=over 4
+
+=item Tools & SDK
+
+Microsoft Embedded Visual Tools, Microsoft Visual C++, Rainer Keuchel's
+celib-sources, Rainer Keuchel's console-sources
+
+=item Make
+
+go to ./wince subdirectory, edit file compile.bat, run	  compile.bat, run 
+  compile.bat dist
+
+=back
+
+=item Acknowledgements
+
+=item AUTHORS
+
+=back
+
 =head2 perlcygwin, README.cygwin - Perl for Cygwin
 
 =over 4
@@ -7713,6 +7745,50 @@ Source, Compiled Module Source, Perl Modules/Scripts
 
 =back
 
+=head2 perldos - Perl under DOS, W31, W95.
+
+=over 4
+
+=item SYNOPSIS
+
+=item DESCRIPTION
+
+=over 4
+
+=item Prerequisites for Compiling Perl on DOS
+
+DJGPP, Pthreads
+
+=item Shortcomings of Perl under DOS
+
+=item Building Perl on DOS
+
+=item Testing Perl on DOS
+
+=item Installation of Perl on DOS
+
+=back
+
+=item BUILDING AND INSTALLING MODULES ON DOS
+
+=over 4
+
+=item Building Prerequisites for Perl on DOS
+
+=item Unpacking CPAN Modules on DOS
+
+=item Building Non-XS Modules on DOS
+
+=item Building XS Modules on DOS
+
+=back
+
+=item AUTHOR
+
+=item SEE ALSO
+
+=back
+
 =head2 perlepoc, README.epoc - Perl for EPOC
 
 =over 4
@@ -8719,6 +8795,53 @@ LIST, waitpid PID,FLAGS
 
 =back
 
+=head2 perlwin32 - Perl under Windows
+
+=over 4
+
+=item SYNOPSIS
+
+=item DESCRIPTION
+
+=over 4
+
+=item Setting Up Perl on Win32
+
+Make, Command Shell, Borland C++, Microsoft Visual C++, Microsoft Platform
+SDK 64-bit Compiler, MinGW32 with gcc, MinGW release 1
+
+=item Building
+
+=item Testing Perl on Win32
+
+=item Installation of Perl on Win32
+
+=item Usage Hints for Perl on Win32
+
+Environment Variables, File Globbing, Using perl from the command line,
+Building Extensions, Command-line Wildcard Expansion, Win32 Specific
+Extensions, Notes on 64-bit Windows
+
+=item Running Perl Scripts
+
+Miscellaneous Things
+
+=back
+
+=item BUGS AND CAVEATS
+
+=item AUTHORS
+
+Gary Ng E<lt>71564.1743@CompuServe.COME<gt>, Gurusamy Sarathy
+E<lt>gsar@activestate.comE<gt>, Nick Ing-Simmons
+E<lt>nick@ing-simmons.netE<gt>
+
+=item SEE ALSO
+
+=item HISTORY
+
+=back
+
 =head1 PRAGMA DOCUMENTATION
 
 =head2 attrs - set/get attributes of a subroutine (deprecated)
@@ -9181,12 +9304,6 @@ literals in regex that are longer than 127 bytes, EBCDIC, format
 
 new, phash
 
-=over 4
-
-=item NOTES
-
-=back
-
 =item SEE ALSO
 
 =back
@@ -13823,18 +13940,6 @@ B<PERL_MM_MANIFEST_DEBUG>
 
 =back
 
-=head2 ExtUtils::Miniperl, writemain - write the C code for perlmain.c
-
-=over 4
-
-=item SYNOPSIS
-
-=item DESCRIPTION
-
-=item SEE ALSO
-
-=back
-
 =head2 ExtUtils::Mkbootstrap - make a bootstrap file for use by DynaLoader
 
 =over 4
@@ -14734,8 +14839,6 @@ VersionMessage, C<-message>, C<-msg>, C<-exitval>, C<-output>, HelpMessage
 
 =over 4
 
-=item Warning: Ignoring '!' modifier for short option
-
 =item GetOptions does not return a false result when an option is not
 supplied