upgrade to 5.42

3 files changed, 24 insertions, 98 deletions

diff --git a/www/p5-libwww/Makefile b/www/p5-libwww/Makefile
index f6ea743b7a24..e2f13d5ca0b4 100644
--- a/www/p5-libwww/Makefile
+++ b/www/p5-libwww/Makefile
@@ -1,21 +1,22 @@
 # New ports collection makefile for:	p5-libwww
 # http://www.linpro.no/lwp/
-# Version required:                     5.36
+# Version required:                     5.*
 # Date created:				September 30th 1996
 # Whom:	      				James FitzGibbon <jfitz@FreeBSD.org>
 #
-# $Id: Makefile,v 1.29 1999/02/02 02:57:08 asami Exp $
+# $Id: Makefile,v 1.30 1999/03/29 17:12:04 jfitz Exp $
 #
 
-DISTNAME=       libwww-perl-5.36
-PKGNAME=        p5-libwww-5.36
+DISTNAME=       libwww-perl-5.42
+PKGNAME=        p5-libwww-5.42
 CATEGORIES=     www perl5 devel
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=     LWP
 
 MAINTAINER=	jfitz@FreeBSD.ORG
 
-BUILD_DEPENDS= 	${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MD5.pm:${PORTSDIR}/security/p5-MD5 \
+BUILD_DEPENDS=  ${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+		${PREFIX}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI \
 		${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Net/FTP.pm:${PORTSDIR}/net/p5-Net \
 		${PREFIX}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64 \
 		${PREFIX}/lib/perl5/site_perl/${PERL_VER}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser
@@ -47,9 +48,6 @@ MAN3=           Bundle::LWP.3 \
 		LWP::RobotUA.3 \
 		LWP::Simple.3 \
 		LWP::UserAgent.3 \
-		URI::Escape.3 \
-		URI::Heuristic.3 \
-		URI::URL.3 \
 		WWW::RobotRules.3 \
 		WWW::RobotRules::AnyDBM_File.3 \
 		lwpcook.3
diff --git a/www/p5-libwww/distinfo b/www/p5-libwww/distinfo
index 7e8b78de12e9..be3a611f76da 100644
--- a/www/p5-libwww/distinfo
+++ b/www/p5-libwww/distinfo
@@ -1 +1 @@
-MD5 (libwww-perl-5.36.tar.gz) = b95248b0b7ed9b32c54848dd3413fae2
+MD5 (libwww-perl-5.42.tar.gz) = 0df9d15c2b6afc19bf42afd907bc4c09
diff --git a/www/p5-libwww/pkg-plist b/www/p5-libwww/pkg-plist
index 8e760177a57d..e6d88e138f7f 100644
--- a/www/p5-libwww/pkg-plist
+++ b/www/p5-libwww/pkg-plist
@@ -11,26 +11,22 @@ lib/perl5/site_perl/%%PERL_VER%%/HTTP/Cookies.pm
 lib/perl5/site_perl/%%PERL_VER%%/HTTP/Daemon.pm
 lib/perl5/site_perl/%%PERL_VER%%/HTTP/Date.pm
 lib/perl5/site_perl/%%PERL_VER%%/HTTP/Headers.pm
+lib/perl5/site_perl/%%PERL_VER%%/HTTP/Headers/Auth.pm
+lib/perl5/site_perl/%%PERL_VER%%/HTTP/Headers/ETag.pm
+lib/perl5/site_perl/%%PERL_VER%%/HTTP/Headers/Util.pm
 lib/perl5/site_perl/%%PERL_VER%%/HTTP/Message.pm
 lib/perl5/site_perl/%%PERL_VER%%/HTTP/Negotiate.pm
 lib/perl5/site_perl/%%PERL_VER%%/HTTP/Request.pm
+lib/perl5/site_perl/%%PERL_VER%%/HTTP/Request/Common.pm
 lib/perl5/site_perl/%%PERL_VER%%/HTTP/Response.pm
 lib/perl5/site_perl/%%PERL_VER%%/HTTP/Status.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/Headers/Auth.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/Headers/ETag.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/Headers/Util.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTTP/Request/Common.pm
 lib/perl5/site_perl/%%PERL_VER%%/LWP.pm
+lib/perl5/site_perl/%%PERL_VER%%/LWP/Authen/Basic.pm
+lib/perl5/site_perl/%%PERL_VER%%/LWP/Authen/Digest.pm
 lib/perl5/site_perl/%%PERL_VER%%/LWP/Debug.pm
 lib/perl5/site_perl/%%PERL_VER%%/LWP/MediaTypes.pm
 lib/perl5/site_perl/%%PERL_VER%%/LWP/MemberMixin.pm
 lib/perl5/site_perl/%%PERL_VER%%/LWP/Protocol.pm
-lib/perl5/site_perl/%%PERL_VER%%/LWP/RobotUA.pm
-lib/perl5/site_perl/%%PERL_VER%%/LWP/Simple.pm
-lib/perl5/site_perl/%%PERL_VER%%/LWP/UserAgent.pm
-lib/perl5/site_perl/%%PERL_VER%%/LWP/media.types
-lib/perl5/site_perl/%%PERL_VER%%/LWP/Authen/Basic.pm
-lib/perl5/site_perl/%%PERL_VER%%/LWP/Authen/Digest.pm
 lib/perl5/site_perl/%%PERL_VER%%/LWP/Protocol/data.pm
 lib/perl5/site_perl/%%PERL_VER%%/LWP/Protocol/file.pm
 lib/perl5/site_perl/%%PERL_VER%%/LWP/Protocol/ftp.pm
@@ -39,90 +35,22 @@ lib/perl5/site_perl/%%PERL_VER%%/LWP/Protocol/http.pm
 lib/perl5/site_perl/%%PERL_VER%%/LWP/Protocol/https.pm
 lib/perl5/site_perl/%%PERL_VER%%/LWP/Protocol/mailto.pm
 lib/perl5/site_perl/%%PERL_VER%%/LWP/Protocol/nntp.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/Escape.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/Heuristic.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/URL.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/URL/_generic.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/URL/_login.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/URL/data.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/URL/file.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/URL/finger.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/URL/ftp.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/URL/gopher.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/URL/http.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/URL/https.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/URL/mailto.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/URL/news.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/URL/nntp.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/URL/prospero.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/URL/rlogin.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/URL/telnet.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/URL/tn3270.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/URL/wais.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/URL/webster.pm
-lib/perl5/site_perl/%%PERL_VER%%/URI/URL/whois.pm
+lib/perl5/site_perl/%%PERL_VER%%/LWP/RobotUA.pm
+lib/perl5/site_perl/%%PERL_VER%%/LWP/Simple.pm
+lib/perl5/site_perl/%%PERL_VER%%/LWP/UserAgent.pm
+lib/perl5/site_perl/%%PERL_VER%%/LWP/media.types
 lib/perl5/site_perl/%%PERL_VER%%/WWW/RobotRules.pm
 lib/perl5/site_perl/%%PERL_VER%%/WWW/RobotRules/AnyDBM_File.pm
-lib/perl5/site_perl/%%PERL_VER%%/auto/LWP/UserAgent/_need_proxy.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/LWP/UserAgent/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/LWP/UserAgent/clone.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/LWP/UserAgent/env_proxy.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/LWP/UserAgent/is_protocol_supported.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/LWP/UserAgent/mirror.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/LWP/UserAgent/no_proxy.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/LWP/UserAgent/proxy.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/abs.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/as_string.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/bad_method.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/base.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/crack.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/eq.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/newlocal.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/print_on.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/rel.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/scheme.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/strict.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/_generic/_netloc_elem.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/_generic/abs.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/_generic/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/_generic/crack.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/_generic/eparams.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/_generic/epath.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/_generic/eq.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/_generic/equery.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/_generic/frag.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/_generic/host.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/_generic/params.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/_generic/password.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/_generic/path.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/_generic/path_components.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/_generic/port.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/_generic/query.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/_generic/rel.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/_generic/user.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/file/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/file/dos_path.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/file/mac_path.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/file/newlocal.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/file/unix_path.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/file/vms_path.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/http/autosplit.ix
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/http/keywords.al
-lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/http/query_form.al
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libwww-perl/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/lwpcook.pod
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libwww-perl/.packlist
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/Bundle
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/File
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTP/Headers
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTP/Request
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/HTTP
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/LWP/Authen
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/LWP/Protocol
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/URI/URL
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/LWP
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/WWW/RobotRules
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/LWP/UserAgent
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/LWP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/_generic
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/file
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL/http
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/URI/URL
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/auto/URI
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libwww-perl
+@dirrm lib/perl5/site_perl/%%PERL_VER%%/WWW
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libwww-perl