Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 13 Mar 2021 06:37:23 +0000 (UTC)
From:      Steve Wills <swills@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r568234 - in head/net/google-cloud-sdk: . files
Message-ID:  <202103130637.12D6bNGG062385@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: swills
Date: Sat Mar 13 06:37:22 2021
New Revision: 568234
URL: https://svnweb.freebsd.org/changeset/ports/568234

Log:
  net/google-cloud-sdk: update to 331.0.0
  
  While here, convert to patch files

Added:
  head/net/google-cloud-sdk/files/
  head/net/google-cloud-sdk/files/patch-bin_bq   (contents, props changed)
  head/net/google-cloud-sdk/files/patch-bin_docker-credential-gcloud   (contents, props changed)
  head/net/google-cloud-sdk/files/patch-bin_gcloud   (contents, props changed)
  head/net/google-cloud-sdk/files/patch-bin_git-credential-gcloud.sh   (contents, props changed)
  head/net/google-cloud-sdk/files/patch-bin_gsutil   (contents, props changed)
  head/net/google-cloud-sdk/files/patch-bin_java__dev__appserver.sh   (contents, props changed)
Modified:
  head/net/google-cloud-sdk/Makefile   (contents, props changed)
  head/net/google-cloud-sdk/distinfo   (contents, props changed)

Modified: head/net/google-cloud-sdk/Makefile
==============================================================================
--- head/net/google-cloud-sdk/Makefile	Sat Mar 13 06:37:18 2021	(r568233)
+++ head/net/google-cloud-sdk/Makefile	Sat Mar 13 06:37:22 2021	(r568234)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	google-cloud-sdk
-PORTVERSION=	329.0.0
+PORTVERSION=	331.0.0
 CATEGORIES=	net
 MASTER_SITES=	https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/
 DISTNAME=	google-cloud-sdk-${PORTVERSION}-linux-x86_64
@@ -44,8 +44,8 @@ post-extract:
 		${WRKSRC}/lib/third_party/grpc/_cython/cygrpc.so
 
 post-patch:
-	@${REINPLACE_CMD} -e "s,python2\.7,${PYTHON_CMD},g" ${WRKSRC}/bin/bq ${WRKSRC}/bin/gsutil ${WRKSRC}/bin/docker-credential-gcloud ${WRKSRC}/bin/java_dev_appserver.sh ${WRKSRC}/bin/git-credential-gcloud.sh ${WRKSRC}/bin/gcloud
-	@${RM} ${WRKSRC}/bin/*.bak
+	@${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|g' ${WRKSRC}/bin/bq ${WRKSRC}/bin/gsutil ${WRKSRC}/bin/docker-credential-gcloud ${WRKSRC}/bin/java_dev_appserver.sh ${WRKSRC}/bin/git-credential-gcloud.sh ${WRKSRC}/bin/gcloud
+	@${RM} ${WRKSRC}/bin/*.bak ${WRKSRC}/bin/*.orig
 
 do-install:
 	${RM} -r ${WRKSRC}/help ${WRKSRC}/.install/.download

Modified: head/net/google-cloud-sdk/distinfo
==============================================================================
--- head/net/google-cloud-sdk/distinfo	Sat Mar 13 06:37:18 2021	(r568233)
+++ head/net/google-cloud-sdk/distinfo	Sat Mar 13 06:37:22 2021	(r568234)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614387896
-SHA256 (google-cloud-sdk-329.0.0-linux-x86_64.tar.gz) = bab65ba4997632a85bbf7f5d7c7cfceb851edd0fa00114151dea2492b8045854
-SIZE (google-cloud-sdk-329.0.0-linux-x86_64.tar.gz) = 112299338
+TIMESTAMP = 1615615006
+SHA256 (google-cloud-sdk-331.0.0-linux-x86_64.tar.gz) = f90c2df5bd0b3498d7e33112f17439eead8c94ae7d60a1cab0091de0eee62c16
+SIZE (google-cloud-sdk-331.0.0-linux-x86_64.tar.gz) = 112634068

Added: head/net/google-cloud-sdk/files/patch-bin_bq
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/google-cloud-sdk/files/patch-bin_bq	Sat Mar 13 06:37:22 2021	(r568234)
@@ -0,0 +1,11 @@
+--- bin/bq.orig	1980-01-01 08:00:00 UTC
++++ bin/bq
+@@ -109,7 +109,7 @@ setup_cloudsdk_python() {
+       CLOUDSDK_PYTHON="$CLOUDSDK_ROOT_DIR/platform/bundledpythonunix/bin/python3"
+       CLOUDSDK_PYTHON_SITEPACKAGES=1
+     else
+-      CLOUDSDK_PYTHON=$(order_python python3 python2 python2.7 python)
++      CLOUDSDK_PYTHON=$(order_python python3 python2 %%PYTHON_CMD%% python)
+     fi
+   fi
+ }

Added: head/net/google-cloud-sdk/files/patch-bin_docker-credential-gcloud
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/google-cloud-sdk/files/patch-bin_docker-credential-gcloud	Sat Mar 13 06:37:22 2021	(r568234)
@@ -0,0 +1,11 @@
+--- bin/docker-credential-gcloud.orig	1980-01-01 08:00:00 UTC
++++ bin/docker-credential-gcloud
+@@ -109,7 +109,7 @@ setup_cloudsdk_python() {
+       CLOUDSDK_PYTHON="$CLOUDSDK_ROOT_DIR/platform/bundledpythonunix/bin/python3"
+       CLOUDSDK_PYTHON_SITEPACKAGES=1
+     else
+-      CLOUDSDK_PYTHON=$(order_python python3 python2 python2.7 python)
++      CLOUDSDK_PYTHON=$(order_python python3 python2 %%PYTHON_CMD%% python)
+     fi
+   fi
+ }

Added: head/net/google-cloud-sdk/files/patch-bin_gcloud
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/google-cloud-sdk/files/patch-bin_gcloud	Sat Mar 13 06:37:22 2021	(r568234)
@@ -0,0 +1,11 @@
+--- bin/gcloud.orig	1980-01-01 08:00:00 UTC
++++ bin/gcloud
+@@ -109,7 +109,7 @@ setup_cloudsdk_python() {
+       CLOUDSDK_PYTHON="$CLOUDSDK_ROOT_DIR/platform/bundledpythonunix/bin/python3"
+       CLOUDSDK_PYTHON_SITEPACKAGES=1
+     else
+-      CLOUDSDK_PYTHON=$(order_python python3 python2 python2.7 python)
++      CLOUDSDK_PYTHON=$(order_python python3 python2 %%PYTHON_CMD%% python)
+     fi
+   fi
+ }

Added: head/net/google-cloud-sdk/files/patch-bin_git-credential-gcloud.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/google-cloud-sdk/files/patch-bin_git-credential-gcloud.sh	Sat Mar 13 06:37:22 2021	(r568234)
@@ -0,0 +1,11 @@
+--- bin/git-credential-gcloud.sh.orig	1980-01-01 08:00:00 UTC
++++ bin/git-credential-gcloud.sh
+@@ -118,7 +118,7 @@ setup_cloudsdk_python() {
+       CLOUDSDK_PYTHON="$CLOUDSDK_ROOT_DIR/platform/bundledpythonunix/bin/python3"
+       CLOUDSDK_PYTHON_SITEPACKAGES=1
+     else
+-      CLOUDSDK_PYTHON=$(order_python python3 python2 python2.7 python)
++      CLOUDSDK_PYTHON=$(order_python python3 python2 %%PYTHON_CMD%% python)
+     fi
+   fi
+ }

Added: head/net/google-cloud-sdk/files/patch-bin_gsutil
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/google-cloud-sdk/files/patch-bin_gsutil	Sat Mar 13 06:37:22 2021	(r568234)
@@ -0,0 +1,11 @@
+--- bin/gsutil.orig	1980-01-01 08:00:00 UTC
++++ bin/gsutil
+@@ -111,7 +111,7 @@ setup_cloudsdk_python() {
+       CLOUDSDK_PYTHON="$CLOUDSDK_ROOT_DIR/platform/bundledpythonunix/bin/python3"
+       CLOUDSDK_PYTHON_SITEPACKAGES=1
+     else
+-      CLOUDSDK_PYTHON=$(order_python python3 python2 python2.7 python)
++      CLOUDSDK_PYTHON=$(order_python python3 python2 %%PYTHON_CMD%% python)
+     fi
+   fi
+ }

Added: head/net/google-cloud-sdk/files/patch-bin_java__dev__appserver.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/google-cloud-sdk/files/patch-bin_java__dev__appserver.sh	Sat Mar 13 06:37:22 2021	(r568234)
@@ -0,0 +1,11 @@
+--- bin/java_dev_appserver.sh.orig	1980-01-01 08:00:00 UTC
++++ bin/java_dev_appserver.sh
+@@ -109,7 +109,7 @@ setup_cloudsdk_python() {
+       CLOUDSDK_PYTHON="$CLOUDSDK_ROOT_DIR/platform/bundledpythonunix/bin/python3"
+       CLOUDSDK_PYTHON_SITEPACKAGES=1
+     else
+-      CLOUDSDK_PYTHON=$(order_python python3 python2 python2.7 python)
++      CLOUDSDK_PYTHON=$(order_python python3 python2 %%PYTHON_CMD%% python)
+     fi
+   fi
+ }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103130637.12D6bNGG062385>