[inseperable differences up to perl 5.004_02]perl-5.004_02

[editor's note - this list of differences was built manually, so is
either a little inaccurate or the most well preened out of the
"unapplied changes" lists so far.  It certainly didn't get the usual
injection of message bodies.

The aim of these changes is to give you a vector for finding a list
message if you have an annotate operation hit this commit]

 ------  BUILD PROCESS  ------

 Title:  "[PATCH]: HP-UX 10 w/o transition links"
  From:  Jeff Okamoto <okamoto@hpcc123.corp.hp.com>
Msg-ID:  <199706231650.AA070364627@hpcc123.corp.hp.com>
 Files:  Configure

 Title:  "INSTALL updates for GNU ld and __inet_* errors"
  From:  Andy Dougherty <doughera@newton.phys.lafayette.edu>
 Files:  INSTALL

 ------  CORE LANGUAGE  ------

 Title:  "[PATCH] Additional patch for "Can't execute ...""
  From:  Ilya Zakharevich <ilya@math.ohio-state.edu>
Msg-ID:  <199707191651.MAA04897@monk.mps.ohio-state.edu>
 Files:  pod/perldiag.pod perl.c

  See 21fc060b433a5fd003b9aca5789342207c46ada4 and
      2a92aaa05aa1acbf01092228d30e9b1d7b2a3f61

 Title:  "[PATCH] Re: Can't pack literals as pointers"
  From:  Gurusamy Sarathy <gsar@engin.umich.edu>
Msg-ID:  <199708012250.SAA20278@aatma.engin.umich.edu>
 Files:  pod/perldiag.pod pod/perlfunc.pod pp.c t/op/pack.t

    On Wed, 25 Jun 1997 00:23:18 GMT, John Tobey wrote:
    >
    >IMHO, pack("p","foo") should evaluate to a pointer that's valid
    >in the current context.  pack("p",undef) should return the NULL
    >value.  Currently, they both produce the error "Modification of a
    >read-only value attempted".
    >
    >This looks pretty easy to fix, so I've prepared a diff against
    >the 5.004_01 distribution.  This tests fine on my Linux.  I hope
    >I'm not introducing a memory leak or other ailment...

    That doesn't look quite right to me.  When provided a literal, you
    should point at the actual literal (which normally has a global
    lifetime), rather than making a mortal copy of it and pointing at
    that.  The mortal copy will be destroyed at the next statement
    boundary, and you'll be left with a dangling pointer when you
    unpack().

    You're doing the very thing the XXX comment above was intended to
    highlight.

    I do agree that literals should be pack('p')-able. So, I'd suggest
    the change be modified [...]

 Title:  "One-liner regex causes SEGV on 5.003 under HP-UX and Linux"
  From:  Hugo van der Sanden <hv@crypt.compulink.co.uk>
Msg-ID:  <199707061144.MAA04443@crypt.compulink.co.uk>
 Files:  regexec.c t/op/re_tests

    [was originally credited as the same change as
     44ed422101809141bc33c2b85c1cff357de4d7bf]

 Title:  "Free temps before calling END blocks", "Too late destruction"
  From:  Chip Salzenberg <chip@rio.atlantic.net>
Msg-ID:  <m33erfv5hx.fsf@chany-p100.emwp.com>
 Files:  perl.c

 Title:  "Forbid "goto" into middle of foreach loop"
  From:  Chip Salzenberg <chip@rio.atlantic.net>
 Files:  pod/perldiag.pod pp_ctl.c

 Title:  "[PATCH] m2t2: problem in NetBSD 1.2D with sfio"
  From:  Jarkko Hietaniemi <jhi@iki.fi>
 Files:  perl.h

 Title:  "Forbid negative splice offset beyond array start"
  From:  "John L. Allen" <allen@gateway.grumman.com>, Chip Salzenberg
         <chip@rio.atlantic.net>
Msg-ID:  <Pine.SOL.3.91.970625111744.19300A-100000@gateway>
 Files:  pp.c

 Title:  "Fix memory leak on eval 'sub {}'"
  From:  Chip Salzenberg <chip@rio.atlantic.net>
 Files:  pp_ctl.c

 Title:  "Fix C<qq #hi#>"
  From:  Chip Salzenberg <chip@rio.atlantic.net>
 Files:  toke.c

 Title:  "Don't warn about "${foo}" in string, even if &foo exists"
  From:  Chip Salzenberg <chip@rio.atlantic.net>
 Files:  toke.c

 Title:  "Perldb internal flag rehaul"
  From:  Ilya Zakharevich <ilya@math.ohio-state.edu>
 Files:  pod/perldebug.pod pod/perlvar.pod perl.h gv.c mg.c op.c perl.c
         pp_ctl.c pp_hot.c pp_sys.c sv.c toke.c

 Title:  "Fix C<print $foo x 2> parsing"
  From:  "Chuck D. Phillips (NON-HP Employee)" <cdp@hpescdp.fc.hp.com>, Chip
         Salzenberg <chip@rio.atlantic.net>
Msg-ID:  <199706121737.KAA00503@palrel3.hp.com>
 Files:  toke.c

 Title:  "Fix lockf_emulate_flock() positioning"
  From:  Chip Salzenberg <chip@rio.atlantic.net>, gen@atd.rdc.ricoh.co.jp
Msg-ID:  <199706091132.UAA00895@wampa.atd.rdc.ricoh.co.jp>
 Files:  pp_sys.c

 Title:  "[PATCH] Make DEBUGGING_MSTATS info consistent"
  From:  Andy Dougherty <doughera@newton.phys.lafayette.edu>
Msg-ID:  <Pine.SUN.3.96.970731131529.3740A-100000@newton.phys>
 Files:  INSTALL pod/perldelta.pod perl.h

 Title:  "semctl broken under Linux"
  From:  Andreas Schwab <schwab@LS5.informatik.uni-dortmund.de>, Andreas
         Schwab <schwab@issan.informatik.uni-dortmund.de>, Graham
         Barr <gbarr@ti.com>, Tim Bunce <Tim.Bunce@ig.co.uk>
Msg-ID:  <33C38291.2D9302DA@ti.com>,
         <9707040912.AA03470@issan.informatik.uni-dortmund.de>,
         <9707041538.AA08946@toad.ig.co.uk>,
         <9707070924.AA11774@issan.informatik.uni-dortmund.de>,
         <9707090933.AA19012@issan.informatik.uni-dortmund.de>
 Files:  doio.c

   [one change made it, as 8e591e46b4c6543ed80895327199c4a628ce11b6]

 Title:  "One-liner regex causes SEGV on 5.003 under HP-UX and Linux"
  From:  Hugo van der Sanden <hv@crypt.compulink.co.uk>
Msg-ID:  <199707061144.MAA04443@crypt.compulink.co.uk>
 Files:  regexec.c t/op/re_tests

    [was originally credited as the same change as
     44ed422101809141bc33c2b85c1cff357de4d7bf]

 Title:  "Fix up problems with *DBM tests"
  From:  Paul Marquess <pmarquess@bfsec.bt.co.uk>
 Files:  t/lib/gdbm.t t/lib/ndbm.t t/lib/odbm.t t/lib/sdbm.t

 Title:  "Faster int to string conversion",
 	 "[PATCH} Re: memory leak in buffer
         safety code"
  From:  Chip Salzenberg <chip@rio.atlantic.net>, Hugo van der Sanden
         <hv@crypt.compulink.co.uk>, Tim Bunce <Tim.Bunce@ig.co.uk>
Msg-ID:  <199707140912.KAA09935@crypt.compulink.co.uk>,
         <199707142050.QAA20976@rio.atlantic.net>,
         <199707182035.VAA20990@crypt.compulink.co.uk>,
         <9707151040.AA02883@toad.ig.co.uk>
 Files:  global.sym sv.c

 Title:  "Fix '-' flag on sprintf() of floats"
  From:  Chip Salzenberg <chip@rio.atlantic.net>, Jarkko Hietaniemi
         <jhi@iki.fi>
Msg-ID:  <199705270646.JAA02510@alpha.hut.fi>
 Files:  sv.c

 Title:  "Don't use atol() for unsigned values", "signedness problem in
         pack("N", "value");"
  From:  Chip Salzenberg <chip@rio.atlantic.net>, Roger Espel Llima
         <espel@llaic.univ-bpclermont.fr>
Msg-ID:  <19970531200007.40218@llaic.univ-bpclermont.fr>
 Files:  sv.c

 Title:  "Perldb internal flag rehaul"
  From:  Ilya Zakharevich <ilya@math.ohio-state.edu>
 Files:  pod/perldebug.pod pod/perlvar.pod perl.h gv.c mg.c op.c perl.c
         pp_ctl.c pp_hot.c pp_sys.c sv.c toke.c

 Title:  "[PATCH] Exporter new export_to_level method"
  From:  epeschko@elmer.tci.com (Ed Peschko)
 Files:  lib/Exporter.pm

 Title:  "[MM] Small patch to MakeMaker, new release"
  From:  "Andreas J. Koenig" <k@anna.in-berlin.de>
Msg-ID:  <199706281603.SAA10869@anna.in-berlin.de>
 Files:  lib/ExtUtils/Command.pm lib/ExtUtils/Install.pm
         lib/ExtUtils/Liblist.pm lib/ExtUtils/MM_Unix.pm
         lib/ExtUtils/MakeMaker.pm lib/ExtUtils/Mksymlists.pm

 Title:  "CPAN.pm, $VERSION and nested (bundled) modules."
  From:  a.koenig@kulturbox.de (Andreas J. Koenig)
 Files:  lib/ExtUtils/Install.pm lib/ExtUtils/Liblist.pm
         lib/ExtUtils/MM_Unix.pm lib/ExtUtils/MakeMaker.pm
         lib/ExtUtils/Mksymlists.pm

 Title:  "Time::Local patch (plus perl.c and filehand.t)"
  From:  ilya@math.ohio-state.edu (Ilya Zakharevich)
 Files:  lib/Time/Local.pm perl.c t/lib/filehand.t

 Title:  "Slightly safer signals"
  From:  Ilya Zakharevich <ilya@math.ohio-state.edu>
 Files:  mg.c perl.c

 Title:  "Perldb internal flag rehaul"
  From:  Ilya Zakharevich <ilya@math.ohio-state.edu>
 Files:  pod/perldebug.pod pod/perlvar.pod perl.h gv.c mg.c op.c perl.c
         pp_ctl.c pp_hot.c pp_sys.c sv.c toke.c

 Title:  "'use UNIVERSAL;' deprecated, do C<UNIVERSAL::isa()> instead",
         "UNIVERSAL.pm and import methods"
  From:  "M.J.T. Guy" <mjtg@cus.cam.ac.uk>, Gisle Aas <aas@bergen.sn.no>,
         Graham Barr <gbarr@ti.com>, Gurusamy Sarathy
         <gsar@engin.umich.edu>, Hugo van der Sanden
         <hv@crypt.compulink.co.uk>
Msg-ID:  <199706271701.NAA25664@aatma.engin.umich.edu>,
         <199706271904.UAA00120@crypt.compulink.co.uk>,
         <199706272054.QAA28913@aatma.engin.umich.edu>,
         <199706301554.LAA03763@aatma.engin.umich.edu>,
         <33B22248.7D7C1985@ti.com>,
         <E0wf5TN-0006ps-00@taurus.cus.cam.ac.uk>,
         <E0wguTR-0005bs-00@ursa.cus.cam.ac.uk>,
         <E0whaZJ-0007BA-00@ursa.cus.cam.ac.uk>,
         <E0whfHh-0007bW-00@ursa.cus.cam.ac.uk>,
         <E0wiyUG-00073j-00@taurus.cus.cam.ac.uk>,
         <hiuyv6q9k.fsf@bergen.sn.no>
 Files:  lib/Class/Struct.pm lib/File/Compare.pm lib/File/Copy.pm
         t/op/universal.t universal.c

  [two changes made it, as
   d704f39a0db2dc23790dfd9d7bd59ce9928a6e2c,
   e09f3e01ccd721309f0eb0aae224d84db2e8436a]

 ------  PORTABILITY - WIN32  ------

 Title:  "[PATCH] Embedding threaded apps in perl.dll"
  From:  Gurusamy Sarathy <gsar@engin.umich.edu>
Msg-ID:  <199707261518.LAA24346@aatma.engin.umich.edu>,
         <199707301833.OAA19570@aatma.engin.umich.edu>
 Files:  win32/win32.c

  [one change made it, as
   4dd614da4d1132b957c4951dd00f64d81b89dc20]

 Title:  "minor win32 scribbles"
  From:  Hugo van der Sanden <hv@crypt.compulink.co.uk>
Msg-ID:  <199707270832.JAA19399@crypt.compulink.co.uk>
 Files:  README.win32

  [nitpicking f7c603cbfba7c97f77e257c42aa119ffdb47fe1e]

 Title:  "[PATCH] binary coexistence on win32", "[RESEND] [PATCH] binary
         coexistence on win32"
  From:  Gurusamy Sarathy <gsar@engin.umich.edu>
Msg-ID:  <199707250109.VAA02666@aatma.engin.umich.edu>,
         <199707301829.OAA19516@aatma.engin.umich.edu>
 Files:  lib/ExtUtils/Mksymlists.pm win32/win32.h win32/win32io.h
         win32/win32iop.h win32/makedef.pl win32/win32.c
         win32/win32io.c

 Title:  "WIN32 Build - pod2xxx.bat Missing?", "[PATCH] Re: WIN32 Build -
         pod2xxx.bat Missing?"
  From:  Chris Williams <chrisw@netinfo.com.au>, Gurusamy Sarathy
         <gsar@engin.umich.edu>
Msg-ID:  <199707011423.KAA15855@aatma.engin.umich.edu>,
         <33B8B962.D96FA1F5@netinfo.com.au>
 Files:  win32/Makefile win32/makefile.mk

 Title:  "[PATCH] docs for win32 utilities"
  From:  Gurusamy Sarathy <gsar@engin.umich.edu>
Msg-ID:  <199707250045.UAA02510@aatma.engin.umich.edu>
 Files:  win32/bin/pl2bat.bat win32/bin/runperl.bat

 Title:  "[PATCH] trial2: some batch files won't run"
  From:  Gurusamy Sarathy <gsar@engin.umich.edu>
Msg-ID:  <199708040226.WAA17301@aatma.engin.umich.edu>
 Files:  win32/bin/pl2bat.bat win32/bin/runperl.bat

 Title:  "[PATCH] win32 extras and embedding"
  From:  Gurusamy Sarathy <gsar@engin.umich.edu>
Msg-ID:  <199707250232.WAA03421@aatma.engin.umich.edu>,
         <199707301831.OAA19528@aatma.engin.umich.edu>
 Files:  dosish.h win32/win32.h perl.c win32/config.bc win32/config_H.bc
         win32/makedef.pl win32/perllib.c win32/win32.c

   [one change was applied (hastily), as
    ad2e33dc060dc2ccf73a5ff1557a69a9b09c30c8]

 ------  PORTABILITY - OTHER  ------

 Title:  "Additional OS/2 patches"
  From:  Gurusamy Sarathy <gsar@engin.umich.edu>, Ilya Zakharevich
         <ilya@math.ohio-state.edu>
Msg-ID:  <199708020823.EAA19521@monk.mps.ohio-state.edu>,
         <199708021424.KAA28561@aatma.engin.umich.edu>,
         <199708042108.RAA27671@aatma.engin.umich.edu>
 Files:  README.os2 os2/Changes perl.c

  [one change was applied, as
   d8c2d278168b862ff4120ad8e5887d37d31f858b]

 Title:  "make depend loop fix and minor OS/2 improvements to build process"
  From:  ilya@math.ohio-state.edu (Ilya Zakharevich)
 Files:  Makefile.SH hints/os2.sh os2/Makefile.SHs

 Title:  "Minor VMS patches"
  From:  Charles Bailey <bailey@HMIVAX.HUMGEN.UPENN.EDU>
Msg-ID:  <01ILCUO6XXTE000WFK@hmivax.humgen.upenn.edu>
 Files:  lib/ExtUtils/MM_VMS.pm vms/vmsish.h vms/descrip.mms vms/test.com
         vms/vms.c vms/ext/filespec.t

 Title:  "[PATCH] Two un-disabled tests for VMS"
  From:  Dan Sugalski <sugalsd@lbcc.cc.or.us>
Msg-ID:  <3.0.2.32.19970718095842.00879220@stargate.lbcc.cc.or.us>
 Files:  vms/test.com

 Title:  "fix substr fix (tests 27 etc)", "perl5.004_02 trial 1 available
         (with substr bug and still some"
  From:  "M.J.T. Guy" <mjtg@cus.cam.ac.uk>, Hugo van der Sanden
         <hv@crypt.compulink.co.uk>, Jarkko Hietaniemi <jhi@iki.fi>
Msg-ID:  <199707301759.SAA02899@crypt.compulink.co.uk>,
         <199707302228.BAA18032@alpha.hut.fi>,
         <199707310929.KAA06515@crypt.compulink.co.uk>,
         <E0wtruH-0002JM-00@ursa.cus.cam.ac.uk>
 Files:  pp.c

 Title:  "Fwd: substr("foo", -1000)", "substr: warn if substring doesn't
         intersect original at all"
  From:  "M.J.T. Guy" <mjtg@cus.cam.ac.uk>, Jarkko Hietaniemi <jhi@iki.fi>
Msg-ID:  <199707100655.JAA14924@alpha.hut.fi>,
         <E0wm1JG-0000UY-00@taurus.cus.cam.ac.uk>
 Files:  pod/perlfunc.pod pp.c t/op/substr.t

  [one change was applied, as
   d9fdd1afe4b88705294e21dc4e070c42d3d9a4d8]

 Title:  "[PATCH] Changes for VMS 7.1 support"
  From:  Charles Bailey <bailey@HMIVAX.HUMGEN.UPENN.EDU>, Dan Sugalski
         <sugalsd@lbcc.cc.or.us>
Msg-ID:  <01ILDXUH0J1W00026U@hmivax.humgen.upenn.edu>,
         <3.0.2.32.19970718095935.0087a2d0@stargate.lbcc.cc.or.us>
 Files:  vms/sockadapt.h vms/config.vms vms/sockadapt.c

 ------  DOCUMENTATION  ------

 Title:  "Document bug fix in localization of $1 etc."
  From:  Chip Salzenberg <salzench@nielsenmedia.com>
 Files:  pod/perldelta.pod

 Title:  "[BUG:PATCH] Missing semicolon message wrong in perldiag"
  From:  "M.J.T. Guy" <mjtg@cus.cam.ac.uk>
Msg-ID:  <E0welEn-0002vT-00@taurus.cus.cam.ac.uk>,
         <E0wfRJU-0006Aw-00@taurus.cus.cam.ac.uk>
 Files:  pod/perldiag.pod

  [one change was applied, as
   702d120df290e0de1b21f167f7d0110b35ee2fef]

 Title:  "OK: perl <some_version> on <some_system> (corrected)", "enhancements
         to perlbug -ok"
  From:  "M.J.T. Guy" <mjtg@cus.cam.ac.uk>, Stephen McCamant <alias@mcs.com>
Msg-ID:  <E0wukVt-0006Da-00@ursa.cus.cam.ac.uk>,
         <E0wvMQl-00055y-00@ursa.cus.cam.ac.uk>,
         <m0wv81x-000EYPC@alias-2.pr.mcs.net>
 Files:  utils/Makefile utils/perlbug.PL

 Title:  "perldoc doesn't grok Win32 UNC paths"
  From:  Warren Jones <wjones@tc.fluke.com>
Msg-ID:  <97Jun17.184420pdt.35728-1@gateway.fluke.com>,
         <97Jun18.165618pdt.35713-1@gateway.fluke.com>
 Files:  utils/perldoc.PL

  [one change was applied, as
   f72119fc50f0d88b02501ba41112f82ab99f0c3b]

3 files changed, 96 insertions, 46 deletions

diff --git a/utils/Makefile b/utils/Makefile
index 9dd24642f2..3c343c82b7 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -12,19 +12,19 @@ all: $(plextract)
 $(plextract):
 	$(PERL) -I../lib $@.PL
 
-c2ph:		c2ph.PL
+c2ph:		c2ph.PL ../config.sh
 
-h2ph:		h2ph.PL
+h2ph:		h2ph.PL ../config.sh
 
-h2xs:		h2xs.PL
+h2xs:		h2xs.PL ../config.sh
 
-perlbug:	perlbug.PL
+perlbug:	perlbug.PL ../config.sh ../patchlevel.h
 
-perldoc:	perldoc.PL
+perldoc:	perldoc.PL ../config.sh
 
-pl2pm:		pl2pm.PL
+pl2pm:		pl2pm.PL ../config.sh
 
-splain:		splain.PL ../lib/diagnostics.pm
+splain:		splain.PL ../config.sh ../lib/diagnostics.pm
 
 clean:
 
diff --git a/utils/perlbug.PL b/utils/perlbug.PL
index 2b11012fae..43b6bfcd8e 100644
--- a/utils/perlbug.PL
+++ b/utils/perlbug.PL
@@ -9,6 +9,7 @@ use File::Basename qw(&basename &dirname);
 # %Config entries.  Thus you write
 #  $startperl
 # to ensure Configure will look for $Config{startperl}.
+#  $perlpath
 
 # This forces PL files to create target in same directory as PL file.
 # This is so that make depend always knows where to find PL derivatives.
@@ -18,6 +19,29 @@ $file .= '.com' if $^O eq 'VMS';
 
 open OUT,">$file" or die "Can't create $file: $!";
 
+# extract patchlevel.h information
+
+open PATCH_LEVEL, "<../patchlevel.h" or die "Can't open patchlevel.h: $!";
+
+my $patchlevel_date = (stat PATCH_LEVEL)[9];
+
+while (<PATCH_LEVEL>) {
+    last if index($_, "static\tchar\t*local_patches[] = {") >= 0;
+};
+
+my $patches;
+while (<PATCH_LEVEL>) {
+    last if /^}/;
+    chomp;
+    s/^\s+,?"?//;
+    s/"?,?$//;
+    s/(['\\])/\\$1/g;
+    $patches .= "'$_',\n" unless $_ eq 'NULL';
+};
+
+close PATCH_LEVEL;
+
+
 print "Extracting $file (with variable substitutions)\n";
 
 # In this section, perl variables will be expanded during extraction.
@@ -27,6 +51,9 @@ print OUT <<"!GROK!THIS!";
 $Config{startperl}
     eval 'exec $Config{perlpath} -S \$0 \${1+"\$@"}'
 	if \$running_under_some_shell;
+
+my \$patchlevel_date = $patchlevel_date;
+my \@patches = ( $patches );
 !GROK!THIS!
 
 # In the following, perl variables are not expanded during extraction.
@@ -49,7 +76,7 @@ use strict;
 sub paraprint;
 
 
-my($Version) = "1.18";
+my($Version) = "1.19";
 
 # Changed in 1.06 to skip Mail::Send and Mail::Util if not available.
 # Changed in 1.07 to see more sendmail execs, and added pipe output.
@@ -70,6 +97,9 @@ my($Version) = "1.18";
 # Changed in 1.16 to include @INC, and allow user to re-edit if no changes.
 # Changed in 1.17 Win32 support added.  GSAR 97-04-12
 # Changed in 1.18 add '-ok' option for reporting build success. CFR 97-06-18
+# Changed in 1.19 '-ok' default not '-v'
+#                 add local patch information
+#                 warn on '-ok' if this is an old system; add '-okay'
 
 # TODO: - Allow the user to re-name the file on mail failure, and
 #       make sure failure (transmission-wise) of Mail::Send is 
@@ -153,15 +183,25 @@ sub Init {
         # OK - send "OK" report for build on this system
         $ok = 0;
 	if ( $::opt_o ) {
-	    if ( $::opt_o eq 'k' ) {
+	    if ( $::opt_o eq 'k' or $::opt_o eq 'kay' ) {
+                my $age = time - $patchlevel_date;
+                if ( $::opt_o eq 'k' and $age > 60 * 24 * 60 * 60 ) {
+                    my $date = localtime $patchlevel_date;
+                    print <<"EOF";
+\"perlbug -ok\" does not report on Perl versions which are more than
+60 days old.  This Perl version was constructed on $date.
+If you really want to report this, use \"perlbug -okay\".
+EOF
+                    exit();
+                };
 		# force these options
 		$::opt_S = 1; # don't prompt for send
 		$::opt_C = 1; # don't send a copy to the local admin
-		$::opt_v = 1; $verbose = 1;
-		$::opt_s = 1; $subject = "OK: perl $] on "
-                                         . $::Config{'osname'} . ' '
-                                         . $::Config{'osvers'};
-		$::opt_b = 1; $body    = "Perl reported to build OK on this system\n";
+		$::opt_s = 1;
+		$subject = "OK: perl $] on"
+			  ." $::Config{'osname'} $::Config{'osvers'} $subject";
+		$::opt_b = 1;
+		$body    = "Perl reported to build OK on this system.\n";
 		$ok = 1;
 	    }
 	    else {
@@ -390,7 +430,7 @@ EOF
 	
 	{
 	my($dir) = ($Is_VMS ? 'sys$scratch:' :
-		    ($Is_MSWin32 && $ENV{'TEMP'} ? $ENV{'TEMP'} : '/tmp/'));
+		    (($Is_MSWin32 && $ENV{'TEMP'}) ? $ENV{'TEMP'} : '/tmp/'));
 	$filename = "bugrep0$$";
 	$dir .= "\\" if $Is_MSWin32 and $dir !~ m|[\\/]$|;
 	$filename++ while -e "$dir$filename";
@@ -441,8 +481,10 @@ EOF
 
 	open(REP,">$filename");
 
+	my $reptype = $ok ? "success" : "bug";
+
 	print REP <<EOF;
-This is a bug report for perl from $from,
+This is a $reptype report for perl from $from,
 generated with the help of perlbug $Version running under perl $].
 
 EOF
@@ -499,15 +541,11 @@ EOF
 
 	print OUT Config::myconfig;
 
-	if($verbose) {
-		print OUT "\nComplete configuration data for perl $]:\n\n";
-		my($value);
-		foreach (sort keys %::Config) {
-			$value = $::Config{$_};
-			$value =~ s/'/\\'/g;
-			print OUT "$_='$value'\n";
-		}
-	}
+	if (@patches) {
+		print OUT join "\n\t", "\nLocally applied patches:", @patches;
+                print OUT "\n";
+        };
+
 	print OUT <<EOF;
 
 ---
@@ -531,6 +569,15 @@ EOF
                       exists $ENV{$env} ? "=$ENV{$env}" : ' (unset)',
 	              "\n";
 	}
+	if($verbose) {
+		print OUT "\nComplete configuration data for perl $]:\n\n";
+		my($value);
+		foreach (sort keys %::Config) {
+			$value = $::Config{$_};
+			$value =~ s/'/\\'/g;
+			print OUT "$_='$value'\n";
+		}
+	}
 }
 
 sub Edit {
@@ -757,7 +804,7 @@ sub Send {
 			  }
 			}
 			
-			paraprint <<"EOF", die "\n" if $sendmail eq "";
+			paraprint(<<"EOF"), die "\n" if $sendmail eq "";
 			
 I am terribly sorry, but I cannot find sendmail, or a close equivalent, and
 the perl package Mail::Send has not been installed, so I can't send your bug
@@ -768,7 +815,7 @@ been left in the file `$filename'.
 
 EOF
 			
-			open(SENDMAIL,"|$sendmail -t");
+			open(SENDMAIL,"|$sendmail -t") || die "'|$sendmail -t' failed: $|";
 			print SENDMAIL "To: $address\n";
 			print SENDMAIL "Subject: $subject\n";
 			print SENDMAIL "Cc: $cc\n" if $cc;
@@ -824,7 +871,9 @@ Options:
   -d	Data mode (the default if you redirect or pipe output.) 
         This prints out your configuration data, without mailing
         anything. You can use this with -v to get more complete data.
-  -ok   Report successful build on this sytem to perl porters (use alone).
+  -ok   Report successful build on this system to perl porters
+        (use alone or with -v).
+  -okay As -ok but also report on older systems.
   -h    Print this help message. 
   
 EOF
@@ -860,7 +909,7 @@ S<[ B<-b> I<body> | B<-f> I<file> ]> S<[ B<-r> I<returnaddress> ]>
 S<[ B<-e> I<editor> ]> S<[ B<-c> I<adminaddress> | B<-C> ]>
 S<[ B<-S> ]> S<[ B<-t> ]>  S<[ B<-d> ]>  S<[ B<-h> ]>
 
-B<perlbug> S<[ B<-r> I<returnaddress> ]> B<-ok>
+B<perlbug> S<[ B<-v> ]> S<[ B<-r> I<returnaddress> ]> S<[ B<-ok> | B<okay> ]>
 
 =head1 DESCRIPTION
 
@@ -966,8 +1015,8 @@ produced by running C<perl -V> (note the uppercase V).
 
 Having done your bit, please be prepared to wait, to be told the bug
 is in your code, or even to get no reply at all.  The perl maintainers
-are busy folks, so if your problem is a small one or if it is
-difficult to understand, they may not respond with a personal reply.
+are busy folks, so if your problem is a small one or if it is difficult
+to understand or already known, they may not respond with a personal reply.
 If it is important to you that your bug be fixed, do monitor the
 C<Changes> file in any development releases since the time you submitted
 the bug, and encourage the maintainers with kind words (but never any
@@ -1017,10 +1066,16 @@ Prints a brief summary of the options.
 
 =item B<-ok>
 
-Report successful build on this system to perl porters. Forces B<-S>,
-B<-C>, and B<-v>. Forces and supplies values for B<-s> and B<-b>. Only
+Report successful build on this system to perl porters. Forces B<-S>
+and B<-C>. Forces and supplies values for B<-s> and B<-b>. Only
 prompts for a return address if it cannot guess it (for use with
-B<make>). Honors return address specified with B<-r>.
+B<make>). Honors return address specified with B<-r>.  You can use this
+with B<-v> to get more complete data.   Only makes a report if this
+system is less than 60 days old.
+
+=item B<-okay>
+
+As B<-ok> except it will report on older systems.
 
 =item B<-r>
 
@@ -1051,7 +1106,8 @@ Include verbose configuration data in the report.
 Kenneth Albanowski (E<lt>kjahds@kjahds.comE<gt>), subsequently I<doc>tored
 by Gurusamy Sarathy (E<lt>gsar@umich.eduE<gt>), Tom Christiansen
 (E<lt>tchrist@perl.comE<gt>), Nathan Torkington (E<lt>gnat@frii.comE<gt>),
-and Charles F. Randall (E<lt>cfr@pobox.comE<gt>).
+Charles F. Randall (E<lt>cfr@pobox.comE<gt>) and
+Mike Guy (E<lt>mjtg@cam.a.ukE<gt>).
 
 =head1 SEE ALSO
 
diff --git a/utils/perldoc.PL b/utils/perldoc.PL
index a17cca9b50..38ea9ee5ca 100644
--- a/utils/perldoc.PL
+++ b/utils/perldoc.PL
@@ -134,21 +134,16 @@ sub containspod {
 	return 0;
 }
 
- sub minus_f_nocase {
+sub minus_f_nocase {
      my($file) = @_;
+     # on a case-forgiving file system we can simply use -f $file
+     if ($Is_VMS or $Is_MSWin32 or $^O eq 'os2') {
+        return ( -f $file ) ? $file : '';
+     }
      local *DIR;
      local($")="/";
      my(@p,$p,$cip);
-     $file =~ tr|\\|/| if $Is_MSWin32 or $^O eq 'os2';
-     if ( $Is_MSWin32 and $file =~ s|^(//[^/]+)/|| ) {	# UNC path?
-         push(@p,$1);
-     }
      foreach $p (split(/\//, $file)){
-	if (($Is_VMS or $Is_MSWin32 or $^O eq 'os2') and not scalar @p) {
-	    # VMSish filesystems don't begin at '/'
-	    push(@p,$p);
-	    next;
-	}
  	if (-d ("@p/$p")){
  	    push @p, $p;
  	} elsif (-f ("@p/$p")) {
@@ -158,7 +153,6 @@ sub containspod {
  	    my $lcp = lc $p;
  	    opendir DIR, "@p";
  	    while ($cip=readdir(DIR)) {
-		$cip =~ s/\.dir$// if $Is_VMS;
  		if (lc $cip eq $lcp){
  		    $found++;
  		    last;