- Update to 6.5.0

PR:		213075
Requested by:	freebsd@signout.dk

4 files changed, 16 insertions, 51 deletions

diff --git a/net/vmware-vsphere-cli/Makefile b/net/vmware-vsphere-cli/Makefile
index e68c8285559a..87bc413920b6 100644
--- a/net/vmware-vsphere-cli/Makefile
+++ b/net/vmware-vsphere-cli/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=		vmware-vsphere-cli
-PORTVERSION=		5.5.0
-PORTREVISION=		4
+PORTVERSION=		6.5.0
 CATEGORIES=		net perl5
 MASTER_SITES=		#http://communities.vmware.com/community/vmtn/developer/downloads
 DISTNAME=		VMware-vSphere-Perl-SDK-${PORTVERSION}-${DISTREL}.i386
@@ -31,7 +30,7 @@ NO_CDROM=		May not be redistributed.  Must accept license to download.
 NO_PACKAGE=		May not be redistributed.  Must accept license to download.
 SHEBANG_FILES=		bin/* apps/host/* apps/general/* apps/vm/*
 
-DISTREL=		1384587
+DISTREL=		4566394
 
 .include <bsd.port.pre.mk>
 
@@ -58,12 +57,15 @@ pre-fetch:
 post-extract:
 	@${MV} ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-distrib ${WRKSRC}
 	@${RM} ${WRKSRC}/vmware-install.pl
+	@${RM} -r ${WRKSRC}/lib/VMware/share/VMware/pyexe
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%EXAMPLESDIR%%|${STAGEDIR}${EXAMPLESDIR}|g' ${WRKSRC}/Makefile.PL
 	@${FIND} ${WRKSRC} -name \*.orig -delete
 
 post-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/AppUtil
+	(cd ${WRKSRC}/apps/AppUtil && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/${SITE_PERL_REL}/AppUtil)
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/vicfg-* ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/svmotion ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/vmware-cmd ${STAGEDIR}${PREFIX}/bin
diff --git a/net/vmware-vsphere-cli/distinfo b/net/vmware-vsphere-cli/distinfo
index 835df006f6cb..9070f125a3e0 100644
--- a/net/vmware-vsphere-cli/distinfo
+++ b/net/vmware-vsphere-cli/distinfo
@@ -1,2 +1,3 @@
-SHA256 (VMware-vSphere-Perl-SDK-5.5.0-1384587.i386.tar.gz) = 9997417480d3269a5e84a8fb7ed0155accf83532458708d76cdeee08170cf940
-SIZE (VMware-vSphere-Perl-SDK-5.5.0-1384587.i386.tar.gz) = 27435362
+TIMESTAMP = 1484858031
+SHA256 (VMware-vSphere-Perl-SDK-6.5.0-4566394.i386.tar.gz) = 852c110f53a8c0f89b607c43d33d82d68ca8afe9590605ff01133c779beb7965
+SIZE (VMware-vSphere-Perl-SDK-6.5.0-4566394.i386.tar.gz) = 40680428
diff --git a/net/vmware-vsphere-cli/files/patch-lib__VMware__share__VMware__VICommon.pm b/net/vmware-vsphere-cli/files/patch-lib__VMware__share__VMware__VICommon.pm
deleted file mode 100644
index e54c2115eb8e..000000000000
--- a/net/vmware-vsphere-cli/files/patch-lib__VMware__share__VMware__VICommon.pm
+++ /dev/null
@@ -1,43 +0,0 @@
---- lib/VMware/share/VMware/VICommon.pm.orig	2014-11-11 21:22:23 UTC
-+++ lib/VMware/share/VMware/VICommon.pm
-@@ -424,16 +424,6 @@
-    my $url = shift;
-    my %supportedapiversions;
-    if ($url =~ s|http(s?)://(.*)/sdk.*|http$1://$2/sdk/vimService.wsdl|i) {      
--      if ($1 eq "s") {
--         eval {  
--            require Crypt::SSLeay;  
--            Crypt::SSLeay->import();
--         };
--         if ($@) {
--            die "Crypt::SSLeay is required for https connections, but could not be loaded: $@";
--         }
--      }
--
-       my $temp_addr = $2;
-       if ($temp_addr =~ /:/) {
-          if (($temp_addr =~ tr/:/:/) > 1) {
-@@ -501,23 +491,11 @@
- 
- sub query_server_version {
-    BEGIN {
--      #To remove SSL Warning, switching from IO::Socket::SSL to Net::SSL
--      $ENV{PERL_NET_HTTPS_SSL_SOCKET_CLASS} = "Net::SSL";
- 	  #To remove host verification
-       $ENV{PERL_LWP_SSL_VERIFY_HOSTNAME} = 0;
-    }
-    my $url = shift;
-    if ($url =~ s|http(s?)://(.*)/sdk.*|http$1://$2/sdk/vimService.wsdl|i) {
--      # bug 288336
--      if ($1 eq "s") {
--         eval {  
--            require Crypt::SSLeay;  
--            Crypt::SSLeay->import();
--         };
--         if ($@) { 
--            die "Crypt::SSLeay is required for https connections, but could not be loaded: $@";
--         }
--      }
-       # no IPv6 support yet
-       my $temp_addr = $2;
-       if ($temp_addr =~ /:/) {
diff --git a/net/vmware-vsphere-cli/pkg-plist b/net/vmware-vsphere-cli/pkg-plist
index 2e35d613cbf8..60372795bb00 100644
--- a/net/vmware-vsphere-cli/pkg-plist
+++ b/net/vmware-vsphere-cli/pkg-plist
@@ -58,6 +58,9 @@ bin/vmware-cmd
 %%PERL5_MAN3%%/VMware::VIM25Stub.3.gz
 %%PERL5_MAN3%%/VMware::VIM2Runtime.3.gz
 %%PERL5_MAN3%%/VMware::VIM2Stub.3.gz
+%%SITE_PERL%%/AppUtil/HostUtil.pm
+%%SITE_PERL%%/AppUtil/VMUtil.pm
+%%SITE_PERL%%/AppUtil/XMLInputUtil.pm
 %%SITE_PERL%%/WSMan/WSBasic.pm
 %%SITE_PERL%%/WSMan/Stubs/vmware_storagepool.pm
 %%SITE_PERL%%/WSMan/Stubs/vmware_storageextent.pm
@@ -1045,6 +1048,8 @@ bin/vmware-cmd
 %%SITE_PERL%%/WSMan/StubOps.pm
 %%SITE_PERL%%/WSMan/IdentifyResponse.pm
 %%SITE_PERL%%/WSMan/GenericOps.pm
+%%SITE_PERL%%/VMware/LookupService.pm
+%%SITE_PERL%%/VMware/SSOConnection.pm
 %%SITE_PERL%%/VMware/VIRuntime.pm
 %%SITE_PERL%%/VMware/VIMRuntime.pm
 %%SITE_PERL%%/VMware/VIM2Stub.pm
@@ -1090,6 +1095,6 @@ bin/vmware-cmd
 %%EXAMPLESDIR%%/general/extractlog.pl
 %%EXAMPLESDIR%%/general/credstore_admin.pl
 %%EXAMPLESDIR%%/general/connect.pl
-%%EXAMPLESDIR%%/AppUtil/XMLInputUtil.pm
-%%EXAMPLESDIR%%/AppUtil/VMUtil.pm
-%%EXAMPLESDIR%%/AppUtil/HostUtil.pm
+@comment %%EXAMPLESDIR%%/AppUtil/XMLInputUtil.pm
+@comment %%EXAMPLESDIR%%/AppUtil/VMUtil.pm
+@comment %%EXAMPLESDIR%%/AppUtil/HostUtil.pm