Dual-life Term::ReadLine

6 files changed, 12 insertions, 11 deletions

diff --git a/MANIFEST b/MANIFEST
index d48876e957..842daa3d8c 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -3266,6 +3266,8 @@ dist/Storable/t/tied.t			See if Storable works
 dist/Storable/t/utf8hash.t		See if Storable works
 dist/Storable/t/utf8.t			See if Storable works
 dist/Storable/t/weak.t			Can Storable store weakrefs
+dist/Term-ReadLine/lib/Term/ReadLine.pm		Stub readline library
+dist/Term-ReadLine/t/ReadLine.t			See if Term::ReadLine works
 dist/Text-Abbrev/lib/Text/Abbrev.pm		An abbreviation table builder
 dist/Text-Abbrev/t/Abbrev.t		Test Text::Abbrev
 dist/Thread-Queue/lib/Thread/Queue.pm	Thread-safe queues
@@ -3995,8 +3997,6 @@ lib/Symbol.pm			Symbol table manipulation routines
 lib/Symbol.t			See if Symbol works
 lib/Term/Complete.pm		A command completion subroutine
 lib/Term/Complete.t		See if Term::Complete works
-lib/Term/ReadLine.pm		Stub readline library
-lib/Term/ReadLine.t		See if Term::ReadLine works
 lib/Thread.pm			Thread extensions frontend
 lib/Thread.t			Thread extensions frontend tests
 lib/Tie/Array.pm		Base class for tied arrays
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 1b330d29cd..9d1c3a7104 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1718,6 +1718,14 @@ use File::Glob qw(:case);
 	'UPSTREAM'	=> undef,
 	},
 
+    'Term::ReadLine' =>
+	{
+	'MAINTAINER'	=> 'p5p',
+	'DISTRIBUTION'	=> 'FLORA/Term-ReadLine-1.07.tar.gz',
+	'FILES'		=> q[dist/Term-ReadLine],
+	'UPSTREAM'	=> 'blead',
+	},
+
     'Term::UI' =>
 	{
 	'MAINTAINER'	=> 'kane',
@@ -2126,7 +2134,6 @@ use File::Glob qw(:case);
 				lib/SelectSaver.{pm,t}
 				lib/Symbol.{pm,t}
 				lib/Term/Complete.{pm,t}
-				lib/Term/ReadLine.{pm,t}
 				lib/Thread.{pm,t}
 				lib/Tie/Array.pm
 				lib/Tie/Array/
diff --git a/lib/Term/ReadLine.pm b/dist/Term-ReadLine/lib/Term/ReadLine.pm
index 0121cdfd06..0121cdfd06 100644
--- a/lib/Term/ReadLine.pm
+++ b/dist/Term-ReadLine/lib/Term/ReadLine.pm
diff --git a/lib/Term/ReadLine.t b/dist/Term-ReadLine/t/ReadLine.t
index a3d57564f6..6c21deac5c 100644
--- a/lib/Term/ReadLine.t
+++ b/dist/Term-ReadLine/t/ReadLine.t
@@ -1,13 +1,6 @@
 #!./perl -w
 use strict;
 
-BEGIN {
-    if ( $ENV{PERL_CORE} ) {
-        chdir 't' if -d 't';
-        @INC = '../lib';
-    }
-}
-
 package Term::ReadLine::Mock;
 our @ISA = 'Term::ReadLine::Stub';
 sub ReadLine {'Term::ReadLine::Mock'};
diff --git a/lib/.gitignore b/lib/.gitignore
index 96884a3164..bf848f29d2 100644
--- a/lib/.gitignore
+++ b/lib/.gitignore
@@ -346,6 +346,7 @@
 /Term/Cap.pm
 /Term/UI.pm
 /Term/UI/History.pm
+/Term/ReadLine.pm
 /Test.pm
 /Test/Builder
 /Test/Builder.pm
diff --git a/t/porting/known_pod_issues.dat b/t/porting/known_pod_issues.dat
index 7d8cb0389f..4b85fe6edb 100644
--- a/t/porting/known_pod_issues.dat
+++ b/t/porting/known_pod_issues.dat
@@ -170,6 +170,7 @@ dist/safe/safe.pm	Verbatim line length including indents exceeds 80 by	1
 dist/safe/safe.pm	empty section in previous paragraph	1
 dist/selfloader/lib/selfloader.pm	Verbatim line length including indents exceeds 80 by	14
 dist/storable/storable.pm	Verbatim line length including indents exceeds 80 by	4
+dist/term-readline/lib/term/readline.pm	Verbatim line length including indents exceeds 80 by	1
 dist/thread-queue/lib/thread/queue.pm	Verbatim line length including indents exceeds 80 by	4
 dist/threads/lib/threads.pm	Verbatim line length including indents exceeds 80 by	3
 ext/b/b.pm	Verbatim line length including indents exceeds 80 by	1
@@ -336,7 +337,6 @@ lib/file/find.pm	Verbatim line length including indents exceeds 80 by	1
 lib/getopt/std.pm	Verbatim line length including indents exceeds 80 by	1
 lib/perlio.pm	Verbatim line length including indents exceeds 80 by	2
 lib/pod/text/overstrike.pm	Verbatim line length including indents exceeds 80 by	1
-lib/term/readline.pm	Verbatim line length including indents exceeds 80 by	1
 lib/tie/array.pm	Verbatim line length including indents exceeds 80 by	1
 lib/tie/hash.pm	Verbatim line length including indents exceeds 80 by	3
 lib/tie/scalar.pm	Verbatim line length including indents exceeds 80 by	1