Upgrade to 5.36 (fixes some problems with hung connections).

3 files changed, 60 insertions, 103 deletions

diff --git a/www/p5-libwww/Makefile b/www/p5-libwww/Makefile
index 4c354f989ce..66fece86c7c 100644
--- a/www/p5-libwww/Makefile
+++ b/www/p5-libwww/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 1998/06/22 13:14:31 agc Exp $
+# $NetBSD: Makefile,v 1.8 1999/01/11 22:35:14 kim Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/09/14 04:00:11 jfitz Exp
 #
 
-DISTNAME=       	libwww-perl-5.12
-PKGNAME=        	p5-libwww-5.12
+PKGNAME=        	p5-libwww-5.36
+DISTNAME!=       	echo ${PKGNAME} | sed -e 's/^p5-//' -e 's/-/-perl-/'
 CATEGORIES=		www perl5
 MASTER_SITES=		${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	URI
@@ -12,7 +12,8 @@ MAINTAINER=		packages@netbsd.org
 
 BUILD_DEPENDS= 	${PREFIX}/lib/perl5/site_perl/MD5.pm:../../security/p5-MD5 \
 		${PREFIX}/lib/perl5/site_perl/Net/FTP.pm:../../net/p5-Net \
-		${PREFIX}/lib/perl5/site_perl/MIME/Base64.pm:../../converters/p5-MIME-Base64
+		${PREFIX}/lib/perl5/site_perl/MIME/Base64.pm:../../converters/p5-MIME-Base64 \
+		${PREFIX}/lib/perl5/site_perl/HTML/Parser.pm:../../libwww/p5-HTML-Parser
 
 USE_PERL5=	YES
 
diff --git a/www/p5-libwww/files/md5 b/www/p5-libwww/files/md5
index a60039db118..990e4be5cd9 100644
--- a/www/p5-libwww/files/md5
+++ b/www/p5-libwww/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1998/08/07 13:27:42 agc Exp $
+$NetBSD: md5,v 1.3 1999/01/11 22:35:14 kim Exp $
 
-MD5 (libwww-perl-5.12.tar.gz) = ffdff7a384e7bddaa5434bebaae2086d
+MD5 (libwww-perl-5.36.tar.gz) = b95248b0b7ed9b32c54848dd3413fae2
diff --git a/www/p5-libwww/pkg/PLIST b/www/p5-libwww/pkg/PLIST
index 240466e1c5b..5e4c4f50327 100644
--- a/www/p5-libwww/pkg/PLIST
+++ b/www/p5-libwww/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 1998/01/28 15:34:06 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.4 1999/01/11 22:35:14 kim Exp $
 bin/GET
 bin/HEAD
 bin/POST
@@ -6,77 +6,42 @@ bin/lwp-mirror
 bin/lwp-request
 bin/lwp-rget
 bin/lwp-download
-lib/perl5/man/man3/Bundle::LWP.3.gz
-lib/perl5/man/man3/File::CounterFile.3.gz
-lib/perl5/man/man3/File::Listing.3.gz
-lib/perl5/man/man3/Font::AFM.3.gz
-lib/perl5/man/man3/HTML::AsSubs.3.gz
-lib/perl5/man/man3/HTML::Element.3.gz
-lib/perl5/man/man3/HTML::Entities.3.gz
-lib/perl5/man/man3/HTML::FormatPS.3.gz
-lib/perl5/man/man3/HTML::FormatText.3.gz
-lib/perl5/man/man3/HTML::Formatter.3.gz
-lib/perl5/man/man3/HTML::HeadParser.3.gz
-lib/perl5/man/man3/HTML::LinkExtor.3.gz
-lib/perl5/man/man3/HTML::Parse.3.gz
-lib/perl5/man/man3/HTML::Parser.3.gz
-lib/perl5/man/man3/HTML::TreeBuilder.3.gz
-lib/perl5/man/man3/HTTP::Daemon.3.gz
-lib/perl5/man/man3/HTTP::Date.3.gz
-lib/perl5/man/man3/HTTP::Headers.3.gz
-lib/perl5/man/man3/HTTP::Message.3.gz
-lib/perl5/man/man3/HTTP::Negotiate.3.gz
-lib/perl5/man/man3/HTTP::Request.3.gz
-lib/perl5/man/man3/HTTP::Response.3.gz
-lib/perl5/man/man3/HTTP::Request::Common.3.gz
-lib/perl5/man/man3/HTTP::Status.3.gz
-lib/perl5/man/man3/LWP.3.gz
-lib/perl5/man/man3/LWP::Debug.3.gz
-lib/perl5/man/man3/LWP::IO.3.gz
-lib/perl5/man/man3/LWP::MediaTypes.3.gz
-lib/perl5/man/man3/LWP::MemberMixin.3.gz
-lib/perl5/man/man3/LWP::Protocol.3.gz
-lib/perl5/man/man3/LWP::RobotUA.3.gz
-lib/perl5/man/man3/LWP::Simple.3.gz
-lib/perl5/man/man3/LWP::Socket.3.gz
-lib/perl5/man/man3/LWP::TkIO.3.gz
-lib/perl5/man/man3/LWP::UserAgent.3.gz
-lib/perl5/man/man3/LWP::SecureSocket.3.gz
-lib/perl5/man/man3/URI::Escape.3.gz
-lib/perl5/man/man3/URI::URL.3.gz
-lib/perl5/man/man3/WWW::RobotRules.3.gz
-lib/perl5/man/man3/WWW::RobotRules::AnyDBM_File.3.gz
-lib/perl5/man/man3/lwpcook.3.gz
+lib/perl5/man/man3/Bundle::LWP.3
+lib/perl5/man/man3/File::Listing.3
+lib/perl5/man/man3/HTTP::Cookies.3
+lib/perl5/man/man3/HTTP::Daemon.3
+lib/perl5/man/man3/HTTP::Date.3
+lib/perl5/man/man3/HTTP::Headers.3
+lib/perl5/man/man3/HTTP::Headers::Util.3
+lib/perl5/man/man3/HTTP::Message.3
+lib/perl5/man/man3/HTTP::Negotiate.3
+lib/perl5/man/man3/HTTP::Request.3
+lib/perl5/man/man3/HTTP::Request::Common.3
+lib/perl5/man/man3/HTTP::Response.3
+lib/perl5/man/man3/HTTP::Status.3
+lib/perl5/man/man3/LWP.3
+lib/perl5/man/man3/LWP::Debug.3
+lib/perl5/man/man3/LWP::MediaTypes.3
+lib/perl5/man/man3/LWP::MemberMixin.3
+lib/perl5/man/man3/LWP::Protocol.3
+lib/perl5/man/man3/LWP::RobotUA.3
+lib/perl5/man/man3/LWP::Simple.3
+lib/perl5/man/man3/LWP::UserAgent.3
+lib/perl5/man/man3/URI::Escape.3
+lib/perl5/man/man3/URI::Heuristic.3
+lib/perl5/man/man3/URI::URL.3
+lib/perl5/man/man3/WWW::RobotRules.3
+lib/perl5/man/man3/WWW::RobotRules::AnyDBM_File.3
+lib/perl5/man/man3/lwpcook.3
 lib/perl5/site_perl/Bundle/LWP.pm
-lib/perl5/site_perl/File/CounterFile.pm
 lib/perl5/site_perl/File/Listing.pm
-lib/perl5/site_perl/Font/AFM.pm
-lib/perl5/site_perl/Font/Metrics/Courier.pm
-lib/perl5/site_perl/Font/Metrics/CourierBold.pm
-lib/perl5/site_perl/Font/Metrics/CourierBoldOblique.pm
-lib/perl5/site_perl/Font/Metrics/CourierOblique.pm
-lib/perl5/site_perl/Font/Metrics/Helvetica.pm
-lib/perl5/site_perl/Font/Metrics/HelveticaBold.pm
-lib/perl5/site_perl/Font/Metrics/HelveticaBoldOblique.pm
-lib/perl5/site_perl/Font/Metrics/HelveticaOblique.pm
-lib/perl5/site_perl/Font/Metrics/TimesBold.pm
-lib/perl5/site_perl/Font/Metrics/TimesBoldItalic.pm
-lib/perl5/site_perl/Font/Metrics/TimesItalic.pm
-lib/perl5/site_perl/Font/Metrics/TimesRoman.pm
-lib/perl5/site_perl/HTML/AsSubs.pm
-lib/perl5/site_perl/HTML/Element.pm
-lib/perl5/site_perl/HTML/Entities.pm
-lib/perl5/site_perl/HTML/FormatPS.pm
-lib/perl5/site_perl/HTML/FormatText.pm
-lib/perl5/site_perl/HTML/Formatter.pm
-lib/perl5/site_perl/HTML/HeadParser.pm
-lib/perl5/site_perl/HTML/LinkExtor.pm
-lib/perl5/site_perl/HTML/Parse.pm
-lib/perl5/site_perl/HTML/Parser.pm
-lib/perl5/site_perl/HTML/TreeBuilder.pm
-lib/perl5/site_perl/HTTP/Date.pm
+lib/perl5/site_perl/HTTP/Cookies.pm
 lib/perl5/site_perl/HTTP/Daemon.pm
+lib/perl5/site_perl/HTTP/Date.pm
 lib/perl5/site_perl/HTTP/Headers.pm
+lib/perl5/site_perl/HTTP/Headers/Auth.pm
+lib/perl5/site_perl/HTTP/Headers/ETag.pm
+lib/perl5/site_perl/HTTP/Headers/Util.pm
 lib/perl5/site_perl/HTTP/Message.pm
 lib/perl5/site_perl/HTTP/Negotiate.pm
 lib/perl5/site_perl/HTTP/Request.pm
@@ -84,8 +49,9 @@ lib/perl5/site_perl/HTTP/Request/Common.pm
 lib/perl5/site_perl/HTTP/Response.pm
 lib/perl5/site_perl/HTTP/Status.pm
 lib/perl5/site_perl/LWP.pm
+lib/perl5/site_perl/LWP/Authen/Basic.pm
+lib/perl5/site_perl/LWP/Authen/Digest.pm
 lib/perl5/site_perl/LWP/Debug.pm
-lib/perl5/site_perl/LWP/IO.pm
 lib/perl5/site_perl/LWP/MediaTypes.pm
 lib/perl5/site_perl/LWP/MemberMixin.pm
 lib/perl5/site_perl/LWP/Protocol.pm
@@ -99,12 +65,10 @@ lib/perl5/site_perl/LWP/Protocol/mailto.pm
 lib/perl5/site_perl/LWP/Protocol/nntp.pm
 lib/perl5/site_perl/LWP/RobotUA.pm
 lib/perl5/site_perl/LWP/Simple.pm
-lib/perl5/site_perl/LWP/Socket.pm
-lib/perl5/site_perl/LWP/SecureSocket.pm
-lib/perl5/site_perl/LWP/TkIO.pm
 lib/perl5/site_perl/LWP/UserAgent.pm
 lib/perl5/site_perl/LWP/media.types
 lib/perl5/site_perl/URI/Escape.pm
+lib/perl5/site_perl/URI/Heuristic.pm
 lib/perl5/site_perl/URI/URL.pm
 lib/perl5/site_perl/URI/URL/_generic.pm
 lib/perl5/site_perl/URI/URL/_login.pm
@@ -127,9 +91,6 @@ lib/perl5/site_perl/URI/URL/webster.pm
 lib/perl5/site_perl/URI/URL/whois.pm
 lib/perl5/site_perl/WWW/RobotRules.pm
 lib/perl5/site_perl/WWW/RobotRules/AnyDBM_File.pm
-lib/perl5/site_perl/auto/LWP/IO/autosplit.ix
-lib/perl5/site_perl/auto/LWP/IO/read.al
-lib/perl5/site_perl/auto/LWP/IO/write.al
 lib/perl5/site_perl/auto/LWP/UserAgent/_need_proxy.al
 lib/perl5/site_perl/auto/LWP/UserAgent/autosplit.ix
 lib/perl5/site_perl/auto/LWP/UserAgent/clone.al
@@ -163,7 +124,6 @@ lib/perl5/site_perl/auto/URI/URL/bad_method.al
 lib/perl5/site_perl/auto/URI/URL/base.al
 lib/perl5/site_perl/auto/URI/URL/crack.al
 lib/perl5/site_perl/auto/URI/URL/eq.al
-lib/perl5/site_perl/auto/URI/URL/escape.al
 lib/perl5/site_perl/auto/URI/URL/file/autosplit.ix
 lib/perl5/site_perl/auto/URI/URL/file/dos_path.al
 lib/perl5/site_perl/auto/URI/URL/file/mac_path.al
@@ -178,33 +138,29 @@ lib/perl5/site_perl/auto/URI/URL/print_on.al
 lib/perl5/site_perl/auto/URI/URL/rel.al
 lib/perl5/site_perl/auto/URI/URL/scheme.al
 lib/perl5/site_perl/auto/URI/URL/strict.al
-lib/perl5/site_perl/auto/URI/URL/unescape.al
-lib/perl5/site_perl/auto/URI/URL/unsafe.al
 lib/perl5/site_perl/lwpcook.pod
 man/man1/lwp-download.1.gz
 man/man1/lwp-mirror.1.gz
 man/man1/lwp-request.1.gz
 man/man1/lwp-rget.1.gz
 lib/perl5/site_perl/${MACHINE_ARCH}-netbsd/auto/libwww-perl/.packlist
-@dirrm lib/perl5/site_perl/File
-@dirrm lib/perl5/site_perl/Font/Metrics
-@dirrm lib/perl5/site_perl/Font
-@dirrm lib/perl5/site_perl/HTTP/Request
-@dirrm lib/perl5/site_perl/HTTP
-@dirrm lib/perl5/site_perl/LWP/Protocol
-@dirrm lib/perl5/site_perl/LWP
-@dirrm lib/perl5/site_perl/URI/URL
-@dirrm lib/perl5/site_perl/URI
+@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-netbsd/auto/libwww-perl
+@dirrm lib/perl5/site_perl/auto/URI/URL/http
+@dirrm lib/perl5/site_perl/auto/URI/URL/file
+@dirrm lib/perl5/site_perl/auto/URI/URL/_generic
+@dirrm lib/perl5/site_perl/auto/URI/URL
+@dirrm lib/perl5/site_perl/auto/URI
+@dirrm lib/perl5/site_perl/auto/LWP/UserAgent
+@dirrm lib/perl5/site_perl/auto/LWP
 @dirrm lib/perl5/site_perl/WWW/RobotRules
 @dirrm lib/perl5/site_perl/WWW
-@dirrm lib/perl5/site_perl/HTML
+@dirrm lib/perl5/site_perl/URI/URL
+@dirrm lib/perl5/site_perl/URI
+@dirrm lib/perl5/site_perl/LWP/Protocol
+@dirrm lib/perl5/site_perl/LWP/Authen
+@dirrm lib/perl5/site_perl/LWP
+@dirrm lib/perl5/site_perl/HTTP/Request
+@dirrm lib/perl5/site_perl/HTTP/Headers
+@dirrm lib/perl5/site_perl/HTTP
+@dirrm lib/perl5/site_perl/File
 @dirrm lib/perl5/site_perl/Bundle
-@dirrm lib/perl5/site_perl/auto/LWP/IO
-@dirrm lib/perl5/site_perl/auto/LWP/UserAgent
-@dirrm lib/perl5/site_perl/auto/LWP
-@dirrm lib/perl5/site_perl/auto/URI/URL/_generic
-@dirrm lib/perl5/site_perl/auto/URI/URL/file
-@dirrm lib/perl5/site_perl/auto/URI/URL/http
-@dirrm lib/perl5/site_perl/auto/URI/URL
-@dirrm lib/perl5/site_perl/auto/URI/
-@dirrm lib/perl5/site_perl/${MACHINE_ARCH}-netbsd/auto/libwww-perl