X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fftp.pl;h=fd78162a404f37c677c9bd6e8b431892d68bdb74;hb=51cf62d8ec31d46fecbc8564c5b48c17f5776f7f;hp=e67134810502756c050c008372edc12a8e5f8c54;hpb=3e3baf6d63945cb64e829d6e5c70a7d00f3d3d03;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/ftp.pl b/lib/ftp.pl
index e671348..fd78162 100644
--- a/lib/ftp.pl
+++ b/lib/ftp.pl
@@ -88,15 +88,9 @@
 # Initial revision
 #
 
-eval { require 'chat2.pl' };
-die qq{$@
-The obsolete and problematic chat2.pl library has been removed from the
-Perl distribution at the request of it's author. You can either get a
-copy yourself or, preferably, fetch the new and much better Net::FTP
-package from a CPAN ftp site.
-} if $@ && $@ =~ /locate chat2.pl/;
-die $@ if $@;
-eval "require 'socket.ph'" || eval "require 'sys/socket.ph'" || die "socket.ph missing: $!\n";
+require 'chat2.pl';	# into main
+eval "require 'socket.ph'" || eval "require 'sys/socket.ph'"
+	|| die "socket.ph missing: $!\n";
 
 
 package ftp;