Remove MacOS classic support from blib, diagnostics and Term::ReadLine.

ExtUtils::MakeMaker removed MacOS support in 6.25, merged to blead in December
2004, so this code is vestigial, and a small runtime penalty.

3 files changed, 5 insertions, 22 deletions

diff --git a/lib/Term/ReadLine.pm b/lib/Term/ReadLine.pm
index 7ecb479646..0121cdfd06 100644
--- a/lib/Term/ReadLine.pm
+++ b/lib/Term/ReadLine.pm
@@ -180,7 +180,6 @@ sub readline {
 	and defined &Tk::DoOneEvent;
   #$str = scalar <$in>;
   $str = $self->get_line;
-  $str =~ s/^\s*\Q$prompt\E// if ($^O eq 'MacOS');
   utf8::upgrade($str)
       if (${^UNICODE} & PERL_UNICODE_STDIN || defined ${^ENCODING}) &&
          utf8::valid($str);
@@ -195,9 +194,7 @@ sub findConsole {
     my $console;
     my $consoleOUT;
 
-    if ($^O eq 'MacOS') {
-        $console = "Dev:Console";
-    } elsif (-e "/dev/tty") {
+    if (-e "/dev/tty") {
 	$console = "/dev/tty";
     } elsif (-e "con" or $^O eq 'MSWin32') {
        $console = 'CONIN$';
@@ -291,7 +288,7 @@ sub get_line {
 
 package Term::ReadLine;		# So late to allow the above code be defined?
 
-our $VERSION = '1.06';
+our $VERSION = '1.07';
 
 my ($which) = exists $ENV{PERL_RL} ? split /\s+/, $ENV{PERL_RL} : undef;
 if ($which) {
diff --git a/lib/blib.pm b/lib/blib.pm
index f755e29b0d..854ec0b4f8 100644
--- a/lib/blib.pm
+++ b/lib/blib.pm
@@ -40,7 +40,7 @@ use Cwd;
 use File::Spec;
 
 use vars qw($VERSION $Verbose);
-$VERSION = '1.04';
+$VERSION = '1.05';
 $Verbose = 0;
 
 sub import
@@ -73,15 +73,7 @@ sub import
   {
    $blib = File::Spec->catdir($dir, "blib");
    $blib_lib = File::Spec->catdir($blib, "lib");
-
-   if ($^O eq 'MacOS')
-    {
-     $blib_arch = File::Spec->catdir($blib_lib, $MacPerl::Architecture);
-    }
-   else
-    {
-     $blib_arch = File::Spec->catdir($blib, "arch");
-    }
+   $blib_arch = File::Spec->catdir($blib, "arch");
 
    if (-d $blib && -d $blib_arch && -d $blib_lib)
     {
diff --git a/lib/diagnostics.pm b/lib/diagnostics.pm
index 721b466fd0..f694e3f427 100644
--- a/lib/diagnostics.pm
+++ b/lib/diagnostics.pm
@@ -185,7 +185,7 @@ use 5.009001;
 use Carp;
 $Carp::Internal{__PACKAGE__.""}++;
 
-our $VERSION = '1.19';
+our $VERSION = '1.20';
 our $DEBUG;
 our $VERBOSE;
 our $PRETTY;
@@ -211,12 +211,6 @@ my @trypod = (
 unshift @trypod, "./pod/perldiag.pod" if -e "pod/perldiag.pod";
 (my $PODFILE) = ((grep { -e } @trypod), $trypod[$#trypod])[0];
 
-if ($^O eq 'MacOS') {
-    # just updir one from each lib dir, we'll find it ...
-    ($PODFILE) = grep { -e } map { "$_:pod:perldiag.pod" } @INC;
-}
-
-
 $DEBUG ||= 0;
 my $WHOAMI = ref bless [];  # nobody's business, prolly not even mine