- Update to 6.02

- Take maintainership [1]

PR:		ports/157629
Submitted by:	sunpoet (myself)
Approved by:	jadawin (maintainer) [1]

4 files changed, 43 insertions, 77 deletions

diff --git a/www/p5-libwww/Makefile b/www/p5-libwww/Makefile
index bbeffe04193c..dec7ea48362a 100644
--- a/www/p5-libwww/Makefile
+++ b/www/p5-libwww/Makefile
@@ -6,49 +6,58 @@
 #
 
 PORTNAME=	libwww
-PORTVERSION=	5.837
+PORTVERSION=	6.02
 CATEGORIES=	www perl5 devel
-MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	LWP
+MASTER_SITES=	CPAN/LWP
 PKGNAMEPREFIX=	p5-
 DISTNAME=	libwww-perl-${PORTVERSION}
 
-MAINTAINER=	jadawin@FreeBSD.org
+MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Perl5 library for WWW access
 
-RUN_DEPENDS=	p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
-		p5-URI>=0:${PORTSDIR}/net/p5-URI
+RUN_DEPENDS=	p5-Encode-Locale>=0:${PORTSDIR}/converters/p5-Encode-Locale \
+		p5-File-Listing>=6:${PORTSDIR}/sysutils/p5-File-Listing \
+		p5-HTML-Parser>=0:${PORTSDIR}/www/p5-HTML-Parser \
+		p5-HTTP-Cookies>=6:${PORTSDIR}/www/p5-HTTP-Cookies \
+		p5-HTTP-Daemon>=6:${PORTSDIR}/www/p5-HTTP-Daemon \
+		p5-HTTP-Date>=6:${PORTSDIR}/www/p5-HTTP-Date \
+		p5-HTTP-Message>=6:${PORTSDIR}/www/p5-HTTP-Message \
+		p5-HTTP-Negotiate>=6:${PORTSDIR}/www/p5-HTTP-Negotiate \
+		p5-LWP-MediaTypes>=6:${PORTSDIR}/www/p5-LWP-MediaTypes \
+		p5-NTLM>=1.020:${PORTSDIR}/security/p5-Authen-NTLM \
+		p5-Net-HTTP>=6:${PORTSDIR}/net/p5-Net-HTTP \
+		p5-URI>=1.10:${PORTSDIR}/net/p5-URI \
+		p5-WWW-RobotRules>=6:${PORTSDIR}/www/p5-WWW-RobotRules
 
 OPTIONS=	SSL	"Enable https support" off
 
-.include <bsd.port.options.mk>
+CONFIGURE_ARGS=	--aliases
+PERL_CONFIGURE=	yes
 
-.if defined(WITH_SSL)
-RUN_DEPENDS+=	p5-security/p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay
-.endif
+MAN1=		GET.1 \
+		HEAD.1 \
+		POST.1 \
+		lwp-download.1 \
+		lwp-mirror.1 \
+		lwp-request.1 \
+		lwp-dump.1
+MAN3=		LWP.3 \
+		LWP::Authen::Ntlm.3 \
+		LWP::ConnCache.3 \
+		LWP::Debug.3 \
+		LWP::MemberMixin.3 \
+		LWP::Protocol.3 \
+		LWP::RobotUA.3 \
+		LWP::Simple.3 \
+		LWP::UserAgent.3 \
+		lwpcook.3 \
+		lwptut.3
 
-PERL_CONFIGURE=	yes
-CONFIGURE_ARGS=	--aliases
+.include <bsd.port.options.mk>
 
-MAN1=	GET.1 HEAD.1 POST.1 lwp-download.1 lwp-mirror.1 \
-	lwp-request.1 lwp-rget.1 lwp-dump.1
-
-MAN3=	Bundle::LWP.3 File::Listing.3 HTML::Form.3 HTTP::Config.3 \
-	HTTP::Cookies.3 \
-	HTTP::Cookies::Microsoft.3 HTTP::Cookies::Netscape.3 \
-	HTTP::Daemon.3 HTTP::Date.3 HTTP::Headers.3 \
-	HTTP::Headers::Util.3 HTTP::Message.3 HTTP::Negotiate.3 \
-	HTTP::Request.3 HTTP::Request::Common.3 HTTP::Response.3 \
-	HTTP::Status.3 LWP.3 LWP::Authen::Ntlm.3 LWP::ConnCache.3 \
-	LWP::Debug.3 LWP::MediaTypes.3 \
-	LWP::MemberMixin.3 LWP::Protocol.3 LWP::RobotUA.3 LWP::Simple.3 \
-	LWP::UserAgent.3 Net::HTTP.3 Net::HTTP::NB.3 WWW::RobotRules.3 \
-	WWW::RobotRules::AnyDBM_File.3 lwpcook.3 lwptut.3
-
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500903
-RUN_DEPENDS+=	p5-IO-Compress>=2.017:${PORTSDIR}/archivers/p5-IO-Compress
+.if defined(WITH_SSL)
+RUN_DEPENDS+=	p5-Crypt-SSLeay>=0:${PORTSDIR}/security/p5-Crypt-SSLeay \
+		p5-LWP-Protocol-https>=0:${PORTSDIR}/www/p5-LWP-Protocol-https
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/p5-libwww/distinfo b/www/p5-libwww/distinfo
index 445ee5da7358..f9881fe40078 100644
--- a/www/p5-libwww/distinfo
+++ b/www/p5-libwww/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libwww-perl-5.837.tar.gz) = 4f651e9241df8fccd2eeb125eb6a3bfddcfc65f49adb5469313fe4a95aaded45
-SIZE (libwww-perl-5.837.tar.gz) = 270223
+SHA256 (libwww-perl-6.02.tar.gz) = b5193e9e2eb2fa6ff8b7d4d22ec4e9010706f65b6042e86cc537d7f2f362c232
+SIZE (libwww-perl-6.02.tar.gz) = 130344
diff --git a/www/p5-libwww/pkg-descr b/www/p5-libwww/pkg-descr
index 595e9ea3956b..280419034651 100644
--- a/www/p5-libwww/pkg-descr
+++ b/www/p5-libwww/pkg-descr
@@ -11,4 +11,3 @@ these services.  The interface should be easy to extend and customize
 for your needs.
 
 WWW: http://search.cpan.org/dist/libwww-perl/
-WWW: http://www.linpro.no/lwp/
diff --git a/www/p5-libwww/pkg-plist b/www/p5-libwww/pkg-plist
index 05e4e2a4b80c..6a8bbdb74b88 100644
--- a/www/p5-libwww/pkg-plist
+++ b/www/p5-libwww/pkg-plist
@@ -5,27 +5,7 @@ bin/lwp-download
 bin/lwp-dump
 bin/lwp-mirror
 bin/lwp-request
-bin/lwp-rget
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP/.packlist
-%%SITE_PERL%%/Bundle/LWP.pm
-%%SITE_PERL%%/File/Listing.pm
-%%SITE_PERL%%/HTML/Form.pm
-%%SITE_PERL%%/HTTP/Config.pm
-%%SITE_PERL%%/HTTP/Cookies.pm
-%%SITE_PERL%%/HTTP/Cookies/Microsoft.pm
-%%SITE_PERL%%/HTTP/Cookies/Netscape.pm
-%%SITE_PERL%%/HTTP/Daemon.pm
-%%SITE_PERL%%/HTTP/Date.pm
-%%SITE_PERL%%/HTTP/Headers.pm
-%%SITE_PERL%%/HTTP/Headers/Auth.pm
-%%SITE_PERL%%/HTTP/Headers/ETag.pm
-%%SITE_PERL%%/HTTP/Headers/Util.pm
-%%SITE_PERL%%/HTTP/Message.pm
-%%SITE_PERL%%/HTTP/Negotiate.pm
-%%SITE_PERL%%/HTTP/Request.pm
-%%SITE_PERL%%/HTTP/Request/Common.pm
-%%SITE_PERL%%/HTTP/Response.pm
-%%SITE_PERL%%/HTTP/Status.pm
 %%SITE_PERL%%/LWP.pm
 %%SITE_PERL%%/LWP/Authen/Basic.pm
 %%SITE_PERL%%/LWP/Authen/Digest.pm
@@ -33,7 +13,6 @@ bin/lwp-rget
 %%SITE_PERL%%/LWP/ConnCache.pm
 %%SITE_PERL%%/LWP/Debug.pm
 %%SITE_PERL%%/LWP/DebugFile.pm
-%%SITE_PERL%%/LWP/MediaTypes.pm
 %%SITE_PERL%%/LWP/MemberMixin.pm
 %%SITE_PERL%%/LWP/Protocol.pm
 %%SITE_PERL%%/LWP/Protocol/GHTTP.pm
@@ -43,9 +22,6 @@ bin/lwp-rget
 %%SITE_PERL%%/LWP/Protocol/ftp.pm
 %%SITE_PERL%%/LWP/Protocol/gopher.pm
 %%SITE_PERL%%/LWP/Protocol/http.pm
-%%SITE_PERL%%/LWP/Protocol/http10.pm
-%%SITE_PERL%%/LWP/Protocol/https.pm
-%%SITE_PERL%%/LWP/Protocol/https10.pm
 %%SITE_PERL%%/LWP/Protocol/loopback.pm
 %%SITE_PERL%%/LWP/Protocol/mailto.pm
 %%SITE_PERL%%/LWP/Protocol/nntp.pm
@@ -53,27 +29,9 @@ bin/lwp-rget
 %%SITE_PERL%%/LWP/RobotUA.pm
 %%SITE_PERL%%/LWP/Simple.pm
 %%SITE_PERL%%/LWP/UserAgent.pm
-%%SITE_PERL%%/LWP/media.types
-%%SITE_PERL%%/Net/HTTP.pm
-%%SITE_PERL%%/Net/HTTP/Methods.pm
-%%SITE_PERL%%/Net/HTTP/NB.pm
-%%SITE_PERL%%/Net/HTTPS.pm
-%%SITE_PERL%%/WWW/RobotRules.pm
-%%SITE_PERL%%/WWW/RobotRules/AnyDBM_File.pm
 %%SITE_PERL%%/lwpcook.pod
 %%SITE_PERL%%/lwptut.pod
-@dirrmtry %%SITE_PERL%%/WWW/RobotRules
-@dirrmtry %%SITE_PERL%%/WWW
-@dirrmtry %%SITE_PERL%%/Net/HTTP
-@dirrmtry %%SITE_PERL%%/Net
 @dirrmtry %%SITE_PERL%%/LWP/Protocol
 @dirrmtry %%SITE_PERL%%/LWP/Authen
 @dirrmtry %%SITE_PERL%%/LWP
-@dirrmtry %%SITE_PERL%%/HTTP/Request
-@dirrmtry %%SITE_PERL%%/HTTP/Headers
-@dirrmtry %%SITE_PERL%%/HTTP/Cookies
-@dirrmtry %%SITE_PERL%%/HTTP
-@dirrmtry %%SITE_PERL%%/HTML
-@dirrmtry %%SITE_PERL%%/File
-@dirrmtry %%SITE_PERL%%/Bundle
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/LWP