Integrate mainline

p4raw-id: //depot/perlio@16793
p4raw-integrated: from //depot/perl@16784 'copy in' AUTHORS (@16446..)
	Configure (@16711..) Changes patchlevel.h (@16764..)

diff --git a/AUTHORS b/AUTHORS
index aa6d2e0..3656632 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -127,6 +127,7 @@ Conrad Augustin
 Conrad E. Kimball              <cek@tblv021.ca.boeing.com>
 Craig A. Berry                 <craig.berry@psinetcs.com>
 Craig Milo Rogers              <Rogers@ISI.EDU>
+Curtis Poe                     <cp@onsitetech.com>
 Dale Amon                      <amon@vnl.com>
 Damian Conway                  <damian@cs.monash.edu.au>
 Damon Atkins                   <Damon.Atkins@nabaus.com.au>
@@ -215,6 +216,7 @@ Gabe Schaffer
 Garry T. Williams              <garry@zvolve.com>
 Gary Clark                     <GaryC@mail.jeld-wen.com>
 Gary Ng                        <71564.1743@compuserve.com>
+Geoffrey F. Green              <geoff-public@stuebegreen.com>
 George Necula                  <necula@eecs.berkeley.edu>
 Geraint A Edwards              <gedge@serf.org>
 Gerben Wierda                  <G.C.Th.Wierda@AWT.nl>
@@ -390,6 +392,7 @@ Ken Williams                   <ken@mathforum.org>
 Kenneth Albanowski             <kjahds@kjahds.com>
 Kenneth Duda                   <kjd@cisco.com>
 Keong Lim                      <Keong.Lim@sr.com.au>
+Kevin Chase                    <kevincha99@hotmail.com>
 Kevin O'Gorman                 <kevin.kosman@nrc.com>
 Kevin Ruscoe                   <Kevin.Ruscoe@ubsw.com>
 Kevin White                    <klwhite@magnus.acs.ohio-state.edu>

diff --git a/Changes b/Changes
index 0ecd94c..eb01661 100644 (file)
--- a/Changes
+++ b/Changes
@@ -28,6 +28,165 @@ example from http://www.xray.mpe.mpg.de/mailing-lists/perl5-porters/
 Version v5.7.X         Development release working toward v5.8
 --------------
 ____________________________________________________________________________
+[ 16788] By: jhi                                   on 2002/05/25  18:55:30
+        Log: AUTHORS updates.
+     Branch: perl
+          ! AUTHORS
+____________________________________________________________________________
+[ 16787] By: jhi                                   on 2002/05/25  18:51:49
+        Log: metaconfig unit changes for #16786.
+     Branch: metaconfig
+          ! U/modified/Getfile.U U/modified/pager.U
+____________________________________________________________________________
+[ 16786] By: jhi                                   on 2002/05/25  18:51:29
+        Log: Pager query tweaks from Andy Dougherty (for OS/2).
+     Branch: perl
+          ! Configure
+____________________________________________________________________________
+[ 16785] By: jhi                                   on 2002/05/25  18:19:56
+        Log: Integrate perlio; Fix VMS ungetc fix for platforms like NetBSD.
+     Branch: perl
+         !> perlio.c
+____________________________________________________________________________
+[ 16784] By: nick                                  on 2002/05/25  17:34:48
+        Log: Fix VMS ungetc fix for platforms like NetBSD.
+     Branch: perlio
+          ! perlio.c
+____________________________________________________________________________
+[ 16783] By: nick                                  on 2002/05/25  16:33:14
+        Log: Integrate mainline for Lupe's perlio.c fix before
+             starting on NetBSD issue
+     Branch: perlio
+         !> README.beos ext/Storable/t/integer.t lib/ExtUtils/t/basic.t
+         !> perlio.c pod/perlapio.pod pod/perldelta.pod
+____________________________________________________________________________
+[ 16782] By: jhi                                   on 2002/05/25  16:26:53
+        Log: Subject: [PATCH perl@16764/MM 5.96_01] basic.t library problem on VMS
+             From: "Craig A. Berry" <craigberry@mac.com>
+             Date: Sat, 25 May 2002 12:19:36 -0500
+             Message-Id: <a0511170cb914b40fc32d@[172.16.52.1]>
+     Branch: perl
+          ! lib/ExtUtils/t/basic.t
+____________________________________________________________________________
+[ 16781] By: jhi                                   on 2002/05/25  16:13:08
+        Log: BeOS: update the test status.
+     Branch: perl
+          ! README.beos pod/perldelta.pod
+____________________________________________________________________________
+[ 16780] By: jhi                                   on 2002/05/25  15:30:32
+        Log: Subject: Re: [PATCH] Re: [PATCH] Re: [Another bug] Re: about Storable perl module (again)
+             From: Nicholas Clark <nick@unfortu.net>
+             Date: Sat, 25 May 2002 17:19:21 +0100
+             Message-ID: <20020525161921.GD299@Bagpuss.unfortu.net>
+     Branch: perl
+          ! ext/Storable/t/integer.t
+____________________________________________________________________________
+[ 16779] By: jhi                                   on 2002/05/25  14:58:48
+        Log: Update the number of tests.
+     Branch: perl
+          ! pod/perldelta.pod
+____________________________________________________________________________
+[ 16778] By: jhi                                   on 2002/05/25  13:11:52
+        Log: Subject: [Patch] Re: ./perl harness on Cygwin today failures
+             From: lupe@lupe-christoph.de (Lupe Christoph)    
+             Date: Sat, 25 May 2002 15:45:34 +0200
+             Message-ID: <20020525134534.GT6638@lupe-christoph.de>
+     Branch: perl
+          ! perlio.c pod/perlapio.pod
+____________________________________________________________________________
+[ 16777] By: jhi                                   on 2002/05/25  12:51:53
+        Log: Subject: [PATCH] Re: [PATCH] Re: [Another bug] Re: about Storable perl module (again)
+             From: Nicholas Clark <nick@unfortu.net>
+             Date: Sat, 25 May 2002 12:17:44 +0100
+             Message-ID: <20020525111743.GC299@Bagpuss.unfortu.net>
+     Branch: perl
+          ! ext/Storable/t/integer.t
+____________________________________________________________________________
+[ 16776] By: nick                                  on 2002/05/25  11:23:28
+        Log: Integrate mainline
+     Branch: perlio
+         +> ext/Storable/t/integer.t
+         !> (integrate 41 files)
+____________________________________________________________________________
+[ 16775] By: jhi                                   on 2002/05/25  01:48:37
+        Log: perldelta tweaks.
+     Branch: perl
+          ! pod/perldelta.pod
+____________________________________________________________________________
+[ 16774] By: jhi                                   on 2002/05/24  22:28:29
+        Log: UNICOS: update test status.
+     Branch: perl
+          ! ext/Socket/socketpair.t pod/perldelta.pod
+____________________________________________________________________________
+[ 16773] By: jhi                                   on 2002/05/24  22:25:41
+        Log: UNICOS: since $] is really 5.00700299999997,
+             testing for equivalence with 5.007003 isn't correct.
+             (From Nicholas Clark.)
+     Branch: perl
+          ! ext/Storable/t/downgrade.t
+____________________________________________________________________________
+[ 16772] By: jhi                                   on 2002/05/24  21:44:35
+        Log: Knock off one test failure thanks to #16771.
+     Branch: perl
+          ! pod/perldelta.pod
+____________________________________________________________________________
+[ 16771] By: jhi                                   on 2002/05/24  21:39:53
+        Log: In some (rare) platforms (such as UNICOS) using the native
+             atof is still better.
+     Branch: perl
+          ! numeric.c perl.h
+____________________________________________________________________________
+[ 16770] By: jhi                                   on 2002/05/24  21:14:34
+        Log: Subject: [PATCH vms/vms.c] logical name translation iteration limits
+             From: "Craig A. Berry" <craigberry@mac.com>
+             Date: Fri, 24 May 2002 16:24:44 -0500
+             Message-Id: <a0511170ab9145b5af8f9@[172.16.52.1]>      
+     Branch: perl
+          ! pod/perldelta.pod vms/vms.c
+____________________________________________________________________________
+[ 16769] By: jhi                                   on 2002/05/24  19:25:55
+        Log: Subject: [PATCH pod/perllol.pod] small typo
+             From: "Geoffrey F. Green" <geoff-public@stuebegreen.com>
+             Date: Fri, 24 May 2002 16:05:07 -0400
+             Message-ID: <B9141533.8467%geoff-public@stuebegreen.com>
+     Branch: perl
+          ! pod/perllol.pod
+____________________________________________________________________________
+[ 16768] By: jhi                                   on 2002/05/24  17:47:14
+        Log: Subject: Re: op/pat.t failure at test 822, Solaris 8, gcc -O -Duse64bitint
+             From: Andy Dougherty <doughera@lafayette.edu>
+             Date: Fri, 24 May 2002 14:46:49 -0400 (EDT)
+             Message-ID: <Pine.SOL.4.10.10205241445520.6195-100000@maxwell.phys.lafayette.edu>
+     Branch: perl
+          ! hints/solaris_2.sh
+____________________________________________________________________________
+[ 16767] By: jhi                                   on 2002/05/24  16:55:48
+        Log: Subject: [patch] small change
+             From: "Konovalov, Vadim" <vkonovalov@spb.lucent.com>
+             Date: Fri, 24 May 2002 19:18:24 +0400
+             Message-ID: <845FCFF2D4C0FC468B485E8777C7A00C07D69E@cio-test001.spb.lucent.com>
+     Branch: perl
+          ! perl.h win32/makefile.mk
+____________________________________________________________________________
+[ 16766] By: jhi                                   on 2002/05/24  14:30:25
+        Log: Subject: [PATCH] README.aix
+             From: John Peacock <jpeacock@rowman.com>    
+             Date: Fri, 24 May 2002 10:49:39 -0400
+             Message-ID: <3CEE5303.1070201@rowman.com>
+     Branch: perl
+          ! README.aix
+____________________________________________________________________________
+[ 16765] By: jhi                                   on 2002/05/24  14:23:06
+        Log: Upgrade to Locale-Codes 2.04.
+     Branch: perl
+          ! lib/Locale/Codes/ChangeLog lib/Locale/Codes/t/country.t
+          ! lib/Locale/Country.pm
+____________________________________________________________________________
+[ 16764] By: jhi                                   on 2002/05/24  12:27:51
+        Log: Update Changes.
+     Branch: perl
+          ! Changes patchlevel.h
+____________________________________________________________________________
 [ 16763] By: jhi                                   on 2002/05/24  12:02:42
         Log: Subject: [PATCH Makefile.SH]  'make distclean' should remove *old files too.
              From: Abigail <abigail@foad.org>

diff --git a/Configure b/Configure
index f71d7e3..a1522f8 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -20,7 +20,7 @@
 
 # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
 #
-# Generated on Mon May 20 18:21:27 EET DST 2002 [metaconfig 3.0 PL70]
+# Generated on Sat May 25 22:51:20 EET DST 2002 [metaconfig 3.0 PL70]
 # (with additional metaconfig patches by perlbug@perl.org)
 
 cat >c1$$ <<EOF
@@ -3833,7 +3833,9 @@ esac
 
 case "$fn" in
 *\(*)
-       expr $fn : '.*(\(.*\)).*' | $tr ',' $trnl >getfile.ok
+       : getfile will accept an answer from the comma-separated list
+       : enclosed in parentheses even if it does not meet other criteria.
+       expr "$fn" : '.*(\(.*\)).*' | $tr ',' $trnl >getfile.ok
        fn=`echo $fn | sed 's/(.*)//'`
        ;;
 esac
@@ -17845,6 +17847,7 @@ EOM
        esac
 fi
 : locate the preferred pager for this system
+fn=f/
 case "$pager" in
 '')
        dflt=''
@@ -17864,10 +17867,14 @@ case "$pager" in
        '') dflt=/usr/ucb/more;;
        esac
        ;;
-*) dflt="$pager";;
+*)     dflt="$pager"
+       : Instruct ./getfile to trust the hinted or previous pager value,
+       : even if it does not begin with a slash.  For example, on os2,
+       : pager might be cmd /c more.  See comments in UU/getfile.
+       fn="f/($pager)"
+       ;;
 esac
 echo " "
-fn=f/
 rp='What pager is used on your system?'
 . ./getfile
 pager="$ans"

diff --git a/patchlevel.h b/patchlevel.h
index e425520..e65f9f1 100644 (file)
--- a/patchlevel.h
+++ b/patchlevel.h
@@ -79,7 +79,7 @@
 #if !defined(PERL_PATCHLEVEL_H_IMPLICIT) && !defined(LOCAL_PATCH_COUNT)
 static char    *local_patches[] = {
         NULL
-       ,"DEVEL16763"
+       ,"DEVEL16788"
        ,NULL
 };