Update to 5.69.

PR:		50551
Approved by:	maintainer

4 files changed, 94 insertions, 93 deletions

diff --git a/www/p5-libwww/Makefile b/www/p5-libwww/Makefile
index deaf6bd07cc9..b4f54507dd6c 100644
--- a/www/p5-libwww/Makefile
+++ b/www/p5-libwww/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	p5-libwww
-PORTVERSION=	5.65
-PORTREVISION=	1
+PORTVERSION=	5.69
 CATEGORIES=	www perl5 devel
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	LWP
@@ -16,10 +15,9 @@ DISTNAME=	libwww-perl-${PORTVERSION}
 MAINTAINER=	petef@FreeBSD.org
 COMMENT=	Perl5 library for WWW access
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser
-RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/URI.pm:${PORTSDIR}/net/p5-URI \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser
+BUILD_DEPENDS=	${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
+		${SITE_PERL}/${PERL_ARCH}/HTML/Parser.pm:${PORTSDIR}/www/p5-HTML-Parser
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
@@ -32,19 +30,18 @@ MAN3=	Bundle::LWP.3 File::Listing.3 HTML::Form.3 HTTP::Cookies.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
-
-MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
+	LWP::Authen::Ntlm.3 HTTP::Cookies::Microsoft.3 LWP::DebugFile.3 \
+	HTTP::Cookies::Netscape.3 lwpcook.3 lwptut.3
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500800
-BUILD_DEPENDS+=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/FTP.pm:${PORTSDIR}/net/p5-Net \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
-RUN_DEPENDS+=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Net/FTP.pm:${PORTSDIR}/net/p5-Net \
-		${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
+BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+		${SITE_PERL}/Net/FTP.pm:${PORTSDIR}/net/p5-Net \
+		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
+RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+		${SITE_PERL}/Net/FTP.pm:${PORTSDIR}/net/p5-Net \
+		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
 .endif
 
 post-patch:
diff --git a/www/p5-libwww/distinfo b/www/p5-libwww/distinfo
index 6f69124b242a..63e5038ec7e7 100644
--- a/www/p5-libwww/distinfo
+++ b/www/p5-libwww/distinfo
@@ -1 +1 @@
-MD5 (libwww-perl-5.65.tar.gz) = 3908e80b96f7995042012061c57a9b73
+MD5 (libwww-perl-5.69.tar.gz) = b4567b6fae2b1733415a746956826e0c
diff --git a/www/p5-libwww/files/patch-Makefile.PL b/www/p5-libwww/files/patch-Makefile.PL
index a3639bb1e518..c4552e9473a5 100644
--- a/www/p5-libwww/files/patch-Makefile.PL
+++ b/www/p5-libwww/files/patch-Makefile.PL
@@ -1,31 +1,29 @@
-$FreeBSD$
-
---- Makefile.PL.orig	Fri May 31 14:51:03 2002
-+++ Makefile.PL	Sun Aug  4 16:02:00 2002
-@@ -57,7 +57,7 @@
+--- Makefile.PL.orig	Wed Apr  2 21:15:42 2003
++++ Makefile.PL	Wed Apr  2 21:16:00 2003
+@@ -57,7 +57,7 @@ support works as it should.
  
  EOT
  
 -        if (prompt("Do you want to enable these tests?", "y") =~ /^y/i) {
-+        if (1) {
++        if (1 || prompt("Do you want to enable these tests?", "y") =~ /^y/i) {
  	    open(ENABLED, ">t/live/ENABLED") || die "Can't enable: $!";
  	    close(ENABLED);
  
-@@ -95,7 +95,7 @@
+@@ -95,7 +95,7 @@ to install in $Config{sitebin}.
  EOT
      my @tmp;
      for (@programs_to_install) {
 -	if (prompt("Do you want to install $_?", "y") =~ /^y/) {
-+	if (1) {
++	if (1 || prompt("Do you want to install $_?", "y") =~ /^y/) {
  	    push(@tmp, $_);
  	}
      }
-@@ -125,7 +125,7 @@
- 		}
- 		close(PROG);
- 	    }
--	    if (prompt("Do you want to install the $alias alias?", $default) =~ /^y/) {
-+	    if (1) {
- 		push(@tmp, $alias);
+@@ -126,7 +126,7 @@ EOT
  	    }
+ 	    close(PROG);
+ 	}
+-	if (prompt("Do you want to install the $alias alias?", $default) =~ /^y/) {
++	if (1 || prompt("Do you want to install the $alias alias?", $default) =~ /^y/) {
+ 	    push(@tmp, $alias);
  	}
+     }
diff --git a/www/p5-libwww/pkg-plist b/www/p5-libwww/pkg-plist
index 068f99e48446..e6beb7e55b48 100644
--- a/www/p5-libwww/pkg-plist
+++ b/www/p5-libwww/pkg-plist
@@ -5,65 +5,71 @@ bin/lwp-download
 bin/lwp-mirror
 bin/lwp-request
 bin/lwp-rget
-lib/perl5/site_perl/%%PERL_VER%%/Bundle/LWP.pm
-lib/perl5/site_perl/%%PERL_VER%%/File/Listing.pm
-lib/perl5/site_perl/%%PERL_VER%%/HTML/Form.pm
-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%%/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/ConnCache.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/Protocol/GHTTP.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
-lib/perl5/site_perl/%%PERL_VER%%/LWP/Protocol/gopher.pm
-lib/perl5/site_perl/%%PERL_VER%%/LWP/Protocol/http.pm
-lib/perl5/site_perl/%%PERL_VER%%/LWP/Protocol/http10.pm
-lib/perl5/site_perl/%%PERL_VER%%/LWP/Protocol/https.pm
-lib/perl5/site_perl/%%PERL_VER%%/LWP/Protocol/https10.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%%/LWP/Protocol/nogo.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%%/Net/HTTP.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/HTTP/Methods.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/HTTP/NB.pm
-lib/perl5/site_perl/%%PERL_VER%%/Net/HTTPS.pm
-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%%/lwpcook.pod
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/libwww-perl/.packlist
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/WWW/RobotRules
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/WWW 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/Net/HTTP
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Net 2>/dev/null || true
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/LWP/Authen
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/LWP/Protocol
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/LWP 2>/dev/null || true
-@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%%/%%PERL_ARCH%%/auto/libwww-perl
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/Bundle 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/File 2>/dev/null || true
-@unexec rmdir %D/lib/perl5/site_perl/%%PERL_VER%%/HTML 2>/dev/null || true
+%%SITE_PERL%%/Bundle/LWP.pm
+%%SITE_PERL%%/File/Listing.pm
+%%SITE_PERL%%/HTML/Form.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
+%%SITE_PERL%%/LWP/Authen/Ntlm.pm
+%%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
+%%SITE_PERL%%/LWP/Protocol/data.pm
+%%SITE_PERL%%/LWP/Protocol/file.pm
+%%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/mailto.pm
+%%SITE_PERL%%/LWP/Protocol/nntp.pm
+%%SITE_PERL%%/LWP/Protocol/nogo.pm
+%%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
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/libwww-perl/.packlist
+@dirrm %%SITE_PERL%%/WWW/RobotRules
+@unexec rmdir %D/%%SITE_PERL%%/WWW 2>/dev/null || true
+@dirrm %%SITE_PERL%%/Net/HTTP
+@unexec rmdir %D/%%SITE_PERL%%/Net 2>/dev/null || true
+@dirrm %%SITE_PERL%%/LWP/Authen
+@dirrm %%SITE_PERL%%/LWP/Protocol
+@unexec rmdir %D/%%SITE_PERL%%/LWP 2>/dev/null || true
+@dirrm %%SITE_PERL%%/HTTP/Cookies
+@dirrm %%SITE_PERL%%/HTTP/Headers
+@dirrm %%SITE_PERL%%/HTTP/Request
+@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/libwww-perl
+@unexec rmdir %D/%%SITE_PERL%%/Bundle 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/File 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/HTML 2>/dev/null || true
+@unexec rmdir %D/%%SITE_PERL%%/HTTP 2>/dev/null || true