Rename all three p5-ReadLine-(Gnu,Perl,TTYtter) to their real names

p5-Term-ReadLine-(Gnu,Perl,TTYtter).

I can't find any reason for p5-ReadLine-Gnu to have been added as
ReadLine-Gnu instead of Term-ReadLine-Gnu twenty years ago.

devel/p5-Term-ReadLine-Perl was added as a dupplicate a few years back
where it should not have, so change its maintainer to be perl@ like
devel/p5-ReadLine-Perl had.

Sponsored by:	Absolight

32 files changed, 34 insertions, 66 deletions

diff --git a/MOVED b/MOVED
index 4f59c46754c3..440cdefb3035 100644
--- a/MOVED
+++ b/MOVED
@@ -8242,8 +8242,8 @@ graphics/hugin-2016||2016-03-22|overtaken by released version
 net/rubygem-omniauth-cas3||2016-03-28|Removed
 textproc/libvisio||2016-03-28|No longer used by other ports: use textproc/libvisio01 instead
 textproc/libe-book00||2016-03-28|No longer used by other ports: use textproc/libe-book instead
-graphics/libtxc_dxtn|graphics/s2tc|2016-03-29|Superseded by graphics/s2tc
 devel/erlang-ssl_verify_hostname|devel/erlang-ssl_verify_fun|2016-03-28|Project renamed
+graphics/libtxc_dxtn|graphics/s2tc|2016-03-29|Superseded by graphics/s2tc
 www/session2||2016-03-29|Has expired: That is a part of Quixote webapp framework we no longer have in ports
 www/py-django-pipeline14||2016-03-29|Has expired: This port depends upon expired www/py-django16 and have no consumers
 textproc/libwpd||2016-03-29|Has expired: Not used any more
@@ -8321,16 +8321,16 @@ databases/postgresql90-contrib||2016-05-16|Has expired: "EOL was reached in Sept
 databases/postgresql90-pltcl||2016-05-16|Has expired: "EOL was reached in September 2015"
 databases/postgresql90-docs||2016-05-16|Has expired: "EOL was reached in September 2015"
 devel/py-gyp-devel|devel/py-gyp|2016-05-16|Renamed to devel/py-gyp
+databases/py-sqlalchemy|databases/py-sqlalchemy07|2016-05-18|Renamed to databases/py-sqlalchemy07
+databases/py-sqlalchemy-devel|databases/py-sqlalchemy08|2016-05-18|Renamed to databases/py-sqlalchemy08
 sysutils/relaunchd|sysutils/jobd|2016-05-20|Renamed to sysutils/jobd
 dns/nsd3|dns/nsd|2016-05-20|Has expired: NSD 3 is EOL, please upgrade to NSD 4 in dns/nsd
 security/easypg||2016-05-22|Has expired: Included into emacs since 2.3
-databases/py-sqlalchemy|databases/py-sqlalchemy07|2016-05-18|Renamed to databases/py-sqlalchemy07
-databases/py-sqlalchemy-devel|databases/py-sqlalchemy08|2016-05-18|Renamed to databases/py-sqlalchemy08
 misc/kdehier4||2016-05-25|Not used since 2014
 devel/maven-ant-tasks||2016-05-27|Use Maven directly
 graphics/py-imaging|graphics/py-pillow|2016-05-28|Has expired: Unmaintained upstream; use graphics/py-pillow
 textproc/py-curator|textproc/py-elasticsearch-curator-py|2016-05-29|Follow existing Elasticsearch naming conventions
-databases/py-psycopg|databases/py-psycopg2|2016-05-29|Has expired: This port is obsoleted by databases/py-psycopg2.
+databases/py-psycopg|databases/py-psycopg2|2016-05-29|Has expired: This port is obsoleted by databases/py-psycopg2
 security/py-clamav|security/py-pyclamd|2016-05-30|Has expired: Not updated since 2008 by upstream and abandoned in favor of pyClamd (security/py-pyclamd)
 graphics/ruby-gdal||2016-05-31|Has expired: disabled by upstream (https://trac.osgeo.org/gdal/changeset/28756)
 net/omcmd||2016-06-01|Has expired: Unfetchable and depends on expired net/isc-dhcp41-server
@@ -8367,3 +8367,6 @@ www/drupal6-page_title||2016-06-18|Has expired: www/drupal6 upstream is EOL and
 www/drupal6-cck||2016-06-18|Has expired: www/drupal6 upstream is EOL and port expired 2016-04-24
 www/drupal6||2016-06-18|Has expired: EOL upstream as of 2016-02-24
 x11-toolkits/gtk-sharp10||2016-06-20|Not depend on anymore superceeded by gtk-sharp20 and gtk-sharp30
+devel/p5-ReadLine-Perl|devel/p5-Term-ReadLine-Perl|2016-06-21|Duplicates
+devel/p5-ReadLine-Gnu|devel/p5-Term-ReadLine-Gnu|2016-06-21|Rename to match upstream
+devel/p5-ReadLine-TTYtter|devel/p5-Term-ReadLine-TTYtter|2016-06-21|Rename to match upstream
diff --git a/audio/soundgrab/Makefile b/audio/soundgrab/Makefile
index f84eb3e6f2eb..638ffc9cf472 100644
--- a/audio/soundgrab/Makefile
+++ b/audio/soundgrab/Makefile
@@ -14,7 +14,7 @@ RUN_DEPENDS=	sox:audio/sox \
 		rawplay:audio/rawrec \
 		oggenc:audio/vorbis-tools \
 		flac:audio/flac \
-		p5-ReadLine-Gnu>=0:devel/p5-ReadLine-Gnu \
+		p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu \
 		p5-Time-HiRes>=0:devel/p5-Time-HiRes
 
 LICENSE=	GPLv2
diff --git a/databases/p5-Prophet/Makefile b/databases/p5-Prophet/Makefile
index 0bfda7f93e6a..9bd92e561813 100644
--- a/databases/p5-Prophet/Makefile
+++ b/databases/p5-Prophet/Makefile
@@ -34,7 +34,7 @@ BUILD_DEPENDS=	p5-Any-Moose>=0.04:devel/p5-Any-Moose \
 		p5-Proc-InvokeEditor>=0:editors/p5-Proc-InvokeEditor \
 		p5-Template-Declare>=0.35:textproc/p5-Template-Declare \
 		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
-		p5-ReadLine-Perl>=0:devel/p5-ReadLine-Perl \
+		p5-Term-ReadLine-Perl>=0:devel/p5-Term-ReadLine-Perl \
 		p5-Time-Progress>=0:devel/p5-Time-Progress \
 		p5-URI>=0:net/p5-URI \
 		p5-UUID-Tiny>=1.02:devel/p5-UUID-Tiny \
diff --git a/databases/yasql/Makefile b/databases/yasql/Makefile
index 545d13ff9ba0..d9caed7f4990 100644
--- a/databases/yasql/Makefile
+++ b/databases/yasql/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Yet Another SQL*Plus Replacement
 LICENSE=	GPLv2
 
 RUN_DEPENDS=	p5-DBD-Oracle>0:databases/p5-DBD-Oracle \
-		p5-ReadLine-Gnu>0:devel/p5-ReadLine-Gnu
+		p5-Term-ReadLine-Gnu>0:devel/p5-Term-ReadLine-Gnu
 
 NO_ARCH=	yes
 
diff --git a/devel/Makefile b/devel/Makefile
index 1e903eece846..bf7f825dcdf5 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -2988,9 +2988,6 @@
     SUBDIR += p5-Range-String
     SUBDIR += p5-Rcs
     SUBDIR += p5-Rcs-Agent
-    SUBDIR += p5-ReadLine-Gnu
-    SUBDIR += p5-ReadLine-Perl
-    SUBDIR += p5-ReadLine-TTYtter
     SUBDIR += p5-Readonly
     SUBDIR += p5-Readonly-XS
     SUBDIR += p5-Reflex
@@ -3173,7 +3170,9 @@
     SUBDIR += p5-Term-RawInput
     SUBDIR += p5-Term-ReadKey
     SUBDIR += p5-Term-ReadLine
+    SUBDIR += p5-Term-ReadLine-Gnu
     SUBDIR += p5-Term-ReadLine-Perl
+    SUBDIR += p5-Term-ReadLine-TTYtter
     SUBDIR += p5-Term-ReadLine-Zoid
     SUBDIR += p5-Term-ReadPassword
     SUBDIR += p5-Term-Screen
diff --git a/devel/p5-Debug-Client/Makefile b/devel/p5-Debug-Client/Makefile
index e13ad461196c..5112e56c10d9 100644
--- a/devel/p5-Debug-Client/Makefile
+++ b/devel/p5-Debug-Client/Makefile
@@ -14,10 +14,10 @@ LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	p5-PadWalker>=1.96:devel/p5-PadWalker \
-		p5-ReadLine-Perl>=1.0303:devel/p5-ReadLine-Perl
+		p5-Term-ReadLine-Perl>=1.0303:devel/p5-Term-ReadLine-Perl
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-File-HomeDir>=1:devel/p5-File-HomeDir \
-		p5-ReadLine-Gnu>=1.20:devel/p5-ReadLine-Gnu \
+		p5-Term-ReadLine-Gnu>=1.20:devel/p5-Term-ReadLine-Gnu \
 		p5-Test-CheckDeps>=0.006:devel/p5-Test-CheckDeps \
 		p5-Test-Class>=0.39:devel/p5-Test-Class \
 		p5-Test-Deep>=0.110:devel/p5-Test-Deep \
diff --git a/devel/p5-ReadLine-Perl/Makefile b/devel/p5-ReadLine-Perl/Makefile
deleted file mode 100644
index 3f1e0f48f95d..000000000000
--- a/devel/p5-ReadLine-Perl/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# Created by: Matthew Hunt <mph@pobox.com>
-# $FreeBSD$
-
-PORTNAME=	ReadLine-Perl
-PORTVERSION=	1.0303
-PORTREVISION=	3
-CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/Term
-PKGNAMEPREFIX=	p5-
-DISTNAME=	Term-${PORTNAME}-${PORTVERSION}
-
-MAINTAINER=	perl@FreeBSD.org
-COMMENT=	Perl 5 module for Term::ReadLine editing without GNU readline
-
-USES=		perl5
-USE_PERL5=	configure
-
-.include <bsd.port.mk>
diff --git a/devel/p5-ReadLine-Perl/distinfo b/devel/p5-ReadLine-Perl/distinfo
deleted file mode 100644
index 508c7ab89a55..000000000000
--- a/devel/p5-ReadLine-Perl/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (Term-ReadLine-Perl-1.0303.tar.gz) = 314b9f8df7e89e77eaac200b9bbcbe28e01e0dab2646ada83c5b26584839095d
-SIZE (Term-ReadLine-Perl-1.0303.tar.gz) = 48710
diff --git a/devel/p5-ReadLine-Perl/pkg-descr b/devel/p5-ReadLine-Perl/pkg-descr
deleted file mode 100644
index 22600d11a8db..000000000000
--- a/devel/p5-ReadLine-Perl/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Perl 5 ships with a module called Term::ReadLine which is an interface
-to command line editing and recall.  The version that ships with Perl
-is only a stub, and offers little functionality.
-
-This module supplants the Term::ReadLine stubs with real command line
-editing and recall facilities, written entirely in Perl.  Applications
-that use Term::ReadLine do not need to be modified to gain the benefits
-of this package; it will happen transparently upon installation.
-
-WWW: http://search.cpan.org/dist/Term-ReadLine-Perl/
diff --git a/devel/p5-ReadLine-Perl/pkg-plist b/devel/p5-ReadLine-Perl/pkg-plist
deleted file mode 100644
index 11c3f24b6556..000000000000
--- a/devel/p5-ReadLine-Perl/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-%%SITE_PERL%%/Term/ReadLine/Perl.pm
-%%SITE_PERL%%/Term/ReadLine/readline.pm
diff --git a/devel/p5-Term-Clui/Makefile b/devel/p5-Term-Clui/Makefile
index 60853eb430b8..94bfcb941e41 100644
--- a/devel/p5-Term-Clui/Makefile
+++ b/devel/p5-Term-Clui/Makefile
@@ -14,7 +14,7 @@ LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	p5-Term-Size>=0:devel/p5-Term-Size \
 		p5-Term-ReadKey>=2.14:devel/p5-Term-ReadKey \
-		p5-ReadLine-Gnu>=0:devel/p5-ReadLine-Gnu
+		p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
diff --git a/devel/p5-ReadLine-Gnu/Makefile b/devel/p5-Term-ReadLine-Gnu/Makefile
index fbd3e75014c8..e2e08be170b1 100644
--- a/devel/p5-ReadLine-Gnu/Makefile
+++ b/devel/p5-Term-ReadLine-Gnu/Makefile
@@ -1,12 +1,11 @@
 # Created by: Matthew Hunt <mph@pobox.com>
 # $FreeBSD$
 
-PORTNAME=	ReadLine-Gnu
+PORTNAME=	Term-ReadLine-Gnu
 PORTVERSION=	1.31
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/Term
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	Term-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Allow Term::ReadLine to use GNU readline
diff --git a/devel/p5-ReadLine-Gnu/distinfo b/devel/p5-Term-ReadLine-Gnu/distinfo
index a0d5bfc2809b..a0d5bfc2809b 100644
--- a/devel/p5-ReadLine-Gnu/distinfo
+++ b/devel/p5-Term-ReadLine-Gnu/distinfo
diff --git a/devel/p5-ReadLine-Gnu/pkg-descr b/devel/p5-Term-ReadLine-Gnu/pkg-descr
index 36ec4c0cae3c..36ec4c0cae3c 100644
--- a/devel/p5-ReadLine-Gnu/pkg-descr
+++ b/devel/p5-Term-ReadLine-Gnu/pkg-descr
diff --git a/devel/p5-ReadLine-Gnu/pkg-plist b/devel/p5-Term-ReadLine-Gnu/pkg-plist
index abd36e5e16e7..abd36e5e16e7 100644
--- a/devel/p5-ReadLine-Gnu/pkg-plist
+++ b/devel/p5-Term-ReadLine-Gnu/pkg-plist
diff --git a/devel/p5-Term-ReadLine-Perl/Makefile b/devel/p5-Term-ReadLine-Perl/Makefile
index 7eb0f8e524d3..da2a1c2ac369 100644
--- a/devel/p5-Term-ReadLine-Perl/Makefile
+++ b/devel/p5-Term-ReadLine-Perl/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	anes@anes.su
+MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Quick implementation of the minimal interface to Readline libraries
 
 BUILD_DEPENDS=	p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
diff --git a/devel/p5-ReadLine-TTYtter/Makefile b/devel/p5-Term-ReadLine-TTYtter/Makefile
index 69e27c3fa08c..13448c373101 100644
--- a/devel/p5-ReadLine-TTYtter/Makefile
+++ b/devel/p5-Term-ReadLine-TTYtter/Makefile
@@ -1,13 +1,12 @@
 # Created by: Sébastien Santoro <dereckson@gmail.com>
 # $FreeBSD$
 
-PORTNAME=	ReadLine-TTYtter
+PORTNAME=	Term-ReadLine-TTYtter
 PORTVERSION=	1.4
 PORTREVISION=	2
 CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN/Term
+MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	Term-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	dereckson@gmail.com
 COMMENT=	Perl5 module for Term::ReadLine allowing rich editing
diff --git a/devel/p5-ReadLine-TTYtter/distinfo b/devel/p5-Term-ReadLine-TTYtter/distinfo
index 5faed33792f3..5faed33792f3 100644
--- a/devel/p5-ReadLine-TTYtter/distinfo
+++ b/devel/p5-Term-ReadLine-TTYtter/distinfo
diff --git a/devel/p5-ReadLine-TTYtter/pkg-descr b/devel/p5-Term-ReadLine-TTYtter/pkg-descr
index 951ddc946667..951ddc946667 100644
--- a/devel/p5-ReadLine-TTYtter/pkg-descr
+++ b/devel/p5-Term-ReadLine-TTYtter/pkg-descr
diff --git a/devel/p5-ReadLine-TTYtter/pkg-plist b/devel/p5-Term-ReadLine-TTYtter/pkg-plist
index bf24c45cdddf..bf24c45cdddf 100644
--- a/devel/p5-ReadLine-TTYtter/pkg-plist
+++ b/devel/p5-Term-ReadLine-TTYtter/pkg-plist
diff --git a/devel/perlconsole/Makefile b/devel/perlconsole/Makefile
index c986f747fea3..09ad67a4290e 100644
--- a/devel/perlconsole/Makefile
+++ b/devel/perlconsole/Makefile
@@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR=	CPAN:SUKRIA
 MAINTAINER=	jadawin@FreeBSD.org
 COMMENT=	Light program that lets you evaluate Perl code interactively
 
-RUN_DEPENDS=	p5-ReadLine-Gnu>=0:devel/p5-ReadLine-Gnu \
+RUN_DEPENDS=	p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu \
 		p5-Module-Refresh>=0:devel/p5-Module-Refresh \
 		p5-Lexical-Persistence>=0:devel/p5-Lexical-Persistence \
 		p5-B-Keywords>=0:devel/p5-B-Keywords
diff --git a/ftp/profxp/Makefile b/ftp/profxp/Makefile
index c2d01e32c0d3..0c9297ccc897 100644
--- a/ftp/profxp/Makefile
+++ b/ftp/profxp/Makefile
@@ -13,7 +13,7 @@ COMMENT=	FXP (server-to-server FTP) client
 
 RUN_DEPENDS=	p5-SOCKS>=0:net/p5-Socks \
 		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
-		p5-ReadLine-Perl>=0:devel/p5-ReadLine-Perl
+		p5-Term-ReadLine-Perl>=0:devel/p5-Term-ReadLine-Perl
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
diff --git a/mail/sieve-connect/Makefile b/mail/sieve-connect/Makefile
index 5474fac6f0aa..2e689a15ba25 100644
--- a/mail/sieve-connect/Makefile
+++ b/mail/sieve-connect/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	p5-Authen-SASL>=0:security/p5-Authen-SASL \
 		p5-Mozilla-PublicSuffix>=0:dns/p5-Mozilla-PublicSuffix \
 		p5-Net-DNS>=0:dns/p5-Net-DNS \
 		p5-Net-SSLeay>=1.37:security/p5-Net-SSLeay \
-		p5-ReadLine-Gnu>=0:devel/p5-ReadLine-Gnu \
+		p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu \
 		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey
 
 USES=		perl5 tar:bzip2 shebangfix
diff --git a/math/PDL/Makefile b/math/PDL/Makefile
index 931e92a7cf0a..bbd83f75b6e2 100644
--- a/math/PDL/Makefile
+++ b/math/PDL/Makefile
@@ -66,8 +66,8 @@ FFTW_LIB_DEPENDS=	libfftw.so:math/fftw
 GSL_LIB_DEPENDS=	libgsl.so:math/gsl
 HDF_LIB_DEPENDS=	libdf.so:science/hdf
 PROJ_LIB_DEPENDS=	libproj.so:graphics/proj
-READLINE_RUN_DEPENDS=	p5-ReadLine-Gnu>=0:devel/p5-ReadLine-Gnu
-READLINE_RUN_DEPENDS_OFF=	p5-ReadLine-Perl>=0:devel/p5-ReadLine-Perl
+READLINE_RUN_DEPENDS=	p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu
+READLINE_RUN_DEPENDS_OFF=	p5-Term-ReadLine-Perl>=0:devel/p5-Term-ReadLine-Perl
 SINK_RUN_DEPENDS=	ppmtogif:graphics/netpbm \
 			mpeg_encode:multimedia/mpeg_encode \
 			saoimage:astro/saoimage
diff --git a/misc/pfm/Makefile b/misc/pfm/Makefile
index bde3dce8eb5d..39759d07cf13 100644
--- a/misc/pfm/Makefile
+++ b/misc/pfm/Makefile
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	p5-libwww>=5.827:www/p5-libwww \
 		p5-File-Stat-Bits>=1.01:sysutils/p5-File-Stat-Bits \
-		p5-ReadLine-Gnu>=1.09:devel/p5-ReadLine-Gnu \
+		p5-Term-ReadLine-Gnu>=1.09:devel/p5-Term-ReadLine-Gnu \
 		p5-Term-ScreenColor>=1.13:devel/p5-Term-ScreenColor
 
 USES=		perl5
diff --git a/multimedia/gtk-youtube-viewer/Makefile b/multimedia/gtk-youtube-viewer/Makefile
index d05ada3449bf..9dca799346a5 100644
--- a/multimedia/gtk-youtube-viewer/Makefile
+++ b/multimedia/gtk-youtube-viewer/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	p5-JSON>0:converters/p5-JSON \
 		p5-File-Path>0:devel/p5-File-Path \
 		p5-Getopt-Long>0:devel/p5-Getopt-Long \
 		p5-PathTools>0:devel/p5-PathTools \
-		p5-ReadLine-Gnu>0:devel/p5-ReadLine-Gnu \
+		p5-Term-ReadLine-Gnu>0:devel/p5-Term-ReadLine-Gnu \
 		p5-Term-ANSIColor>0:devel/p5-Term-ANSIColor \
 		p5-Term-ReadLine>0:devel/p5-Term-ReadLine \
 		p5-Thread-Queue>0:devel/p5-Thread-Queue \
diff --git a/net-im/ttytter/Makefile b/net-im/ttytter/Makefile
index 248371b0091e..a75480889f61 100644
--- a/net-im/ttytter/Makefile
+++ b/net-im/ttytter/Makefile
@@ -36,11 +36,11 @@ PLIST_FILES=	bin/${PORTNAME}
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MREADLINE}
-RUN_DEPENDS+=	p5-ReadLine-Perl>=0:devel/p5-ReadLine-Perl
+RUN_DEPENDS+=	p5-Term-ReadLine-Perl>=0:devel/p5-Term-ReadLine-Perl
 .endif
 
 .if ${PORT_OPTIONS:MRLTTYTTER}
-RUN_DEPENDS+=	p5-ReadLine-TTYtter>=1.4:devel/p5-ReadLine-TTYtter
+RUN_DEPENDS+=	p5-Term-ReadLine-TTYtter>=1.4:devel/p5-Term-ReadLine-TTYtter
 .endif
 
 do-extract:
diff --git a/net/ldapsh/Makefile b/net/ldapsh/Makefile
index fd6f969e4741..3770042511fe 100644
--- a/net/ldapsh/Makefile
+++ b/net/ldapsh/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	flz@FreeBSD.org
 COMMENT=	Interactive shell used to administer ldap directories
 
 BUILD_DEPENDS=	p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
-		p5-ReadLine-Perl>=0:devel/p5-ReadLine-Perl \
+		p5-Term-ReadLine-Perl>=0:devel/p5-Term-ReadLine-Perl \
 		p5-perl-ldap>=0:net/p5-perl-ldap \
 		p5-Date-Manip>=0:devel/p5-Date-Manip \
 		p5-ParseLex>=0:devel/p5-ParseLex
diff --git a/net/shelldap/Makefile b/net/shelldap/Makefile
index 8140fde3a854..fd382987c8fd 100644
--- a/net/shelldap/Makefile
+++ b/net/shelldap/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	p5-Algorithm-Diff>=0:devel/p5-Algorithm-Diff \
 		p5-perl-ldap>=0:net/p5-perl-ldap \
 		p5-Term-Shell>=0:devel/p5-Term-Shell \
 		p5-Term-ReadKey>=0:devel/p5-Term-ReadKey \
-		p5-ReadLine-Gnu>=0:devel/p5-ReadLine-Gnu \
+		p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu \
 		p5-YAML-Syck>=0:textproc/p5-YAML-Syck
 
 USES=		perl5
diff --git a/security/kpcli/Makefile b/security/kpcli/Makefile
index 89cd69e76348..029f811e7196 100644
--- a/security/kpcli/Makefile
+++ b/security/kpcli/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	p5-Crypt-Rijndael>=1.08:security/p5-Crypt-Rijndael \
 		p5-Sort-Naturally>=1.02:textproc/p5-Sort-Naturally \
 		p5-File-KeePass>=2.03:security/p5-File-KeePass \
 		p5-Term-ShellUI>=0.9:shells/p5-Term-ShellUI \
-		p5-ReadLine-Gnu>=1.19:devel/p5-ReadLine-Gnu \
+		p5-Term-ReadLine-Gnu>=1.19:devel/p5-Term-ReadLine-Gnu \
 		p5-Data-Password>=0:security/p5-Data-Password \
 		p5-Clone>=0.31:devel/p5-Clone \
 		p5-Capture-Tiny>=0:devel/p5-Capture-Tiny \
diff --git a/shells/p5-Term-ShellUI/Makefile b/shells/p5-Term-ShellUI/Makefile
index b29f6b95c8cf..8988f3007a99 100644
--- a/shells/p5-Term-ShellUI/Makefile
+++ b/shells/p5-Term-ShellUI/Makefile
@@ -11,7 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Fully-featured shell-like command line environment
 
-BUILD_DEPENDS=	p5-ReadLine-Gnu>=0:devel/p5-ReadLine-Gnu
+BUILD_DEPENDS=	p5-Term-ReadLine-Gnu>=0:devel/p5-Term-ReadLine-Gnu
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5 shebangfix
diff --git a/www/asql/Makefile b/www/asql/Makefile
index ad667a5b2eb4..914eb5014300 100644
--- a/www/asql/Makefile
+++ b/www/asql/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Query Apache logfiles via SQL
 
 RUN_DEPENDS=	p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \
 		p5-DBI>=0:databases/p5-DBI \
-		p5-ReadLine-Perl>=0:devel/p5-ReadLine-Perl
+		p5-Term-ReadLine-Perl>=0:devel/p5-Term-ReadLine-Perl
 
 NO_BUILD=	yes
 PLIST_FILES=	bin/asql