From 3d4ceda8008ddc2294d52ce6452ca1580ecdd7c7 Mon Sep 17 00:00:00 2001
From: Nicholas Clark <nick@ccl4.org>
Date: Tue, 24 Jan 2012 16:08:37 +0100
Subject: diagnostics doesn't need to search for perldelta.pod in pre-5.005
 locations.

Pods are installed into privlib. Before Perl 5.005, privlib didn't contain
the version number in it, so 5.004 and 5.003 (etc) both installed to the same
directory. perldiag.pod differed in not-quite compatible ways, so hacks were
put in to (a) also install it in privlib with the version number in the
filename (b) to hard link it to archlib, which always did contain the version
number.

5.005 changed privlib to contain the version number, solving the underlying
problem (strictly commit bfb7748a896459cc, described here:
http://www.xray.mpe.mpg.de/mailing-lists/perl5-porters/1998-07/msg00136.html )

Commit a841533b5cf319b3 (Oct 2009) removed the first installation hack,
Commit e8ea61279d90dbe9 (Jul 1998) removed the second.

Hence the code to search in the "hacked" locations is no longer needed,
and in the interests of clarity, should go.
---
 lib/diagnostics.pm | 9 ++-------
 pod/perldelta.pod  | 7 +++++++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/diagnostics.pm b/lib/diagnostics.pm
index a1841cf90b..dfb05c7217 100644
--- a/lib/diagnostics.pm
+++ b/lib/diagnostics.pm
@@ -186,7 +186,7 @@ use 5.009001;
 use Carp;
 $Carp::Internal{__PACKAGE__.""}++;
 
-our $VERSION = '1.27';
+our $VERSION = '1.28';
 our $DEBUG;
 our $VERBOSE;
 our $PRETTY;
@@ -194,18 +194,13 @@ our $TRACEONLY = 0;
 our $WARNTRACE = 0;
 
 use Config;
-my($privlib, $archlib) = @Config{qw(privlibexp archlibexp)};
+my $privlib = $Config{privlibexp};
 if ($^O eq 'VMS') {
     require VMS::Filespec;
     $privlib = VMS::Filespec::unixify($privlib);
-    $archlib = VMS::Filespec::unixify($archlib);
 }
 my @trypod = (
-	   "$archlib/pod/perldiag.pod",
-	   "$privlib/pod/perldiag-$Config{version}.pod",
 	   "$privlib/pod/perldiag.pod",
-	   "$archlib/pods/perldiag.pod",
-	   "$privlib/pods/perldiag-$Config{version}.pod",
 	   "$privlib/pods/perldiag.pod",
 	  );
 # handy for development testing of new warnings etc
diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index 7c5ffa0873..fe88199dfe 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -113,6 +113,13 @@ XXX
 
 =item *
 
+L<diagnostics> has been upgraded from version 1.27 to version 1.28.
+
+When searching for F<perldiag.pod>, it no longer uses paths that were only
+relevant on Perl 5.004 and earlier.
+
+=item *
+
 L<Pod::Parser> has been upgraded from version 1.37 to version 1.50.
 
 =back
-- 
cgit v1.2.1