Index: head/net/google-cloud-sdk/Makefile
===================================================================
--- head/net/google-cloud-sdk/Makefile	(revision 568233)
+++ head/net/google-cloud-sdk/Makefile	(revision 568234)
@@ -1,73 +1,73 @@
 # $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
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Google Cloud SDK for Google Cloud Platform
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 
 USES=		python:3.7+
 
 WRKSRC=		${WRKDIR}/google-cloud-sdk
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/bq \
 		bin/docker-credential-gcloud \
 		bin/gcloud \
 		bin/git-credential-gcloud.sh \
 		bin/gsutil
 
 OPTIONS_DEFINE=		BASH ZSH
 OPTIONS_DEFAULT=	BASH ZSH
 
 BASH_PLIST_FILES=	share/bash-completion/completions/gcloud
 ZSH_PLIST_FILES=	share/zsh/site-functions/_gcloud
 
 post-extract:
 	@${RM} -r \
 		${WRKSRC}/bin/anthoscli \
 		${WRKSRC}/bin/kuberun \
 		${WRKSRC}/install.bat \
 		${WRKSRC}/platform/gsutil/third_party/crcmod/docs/source/make.bat \
 		${WRKSRC}/platform/gsutil/third_party/rsa/doc/make.bat \
 		${WRKSRC}/rpm \
 		${WRKSRC}/deb \
 		${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
 	( cd ${WRKSRC} ; ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/google-cloud-sdk )
 .for x in bq docker-credential-gcloud gcloud git-credential-gcloud.sh gsutil
 	${CHMOD} +x ${STAGEDIR}${PREFIX}/google-cloud-sdk/bin/${x}
 	${RLN} ${STAGEDIR}${PREFIX}/google-cloud-sdk/bin/${x} \
 		${STAGEDIR}${PREFIX}/bin/${x}
 .endfor
 
 post-install:
 	@(cd ${STAGEDIR}${PREFIX} && \
 		${FIND} -s google-cloud-sdk -type f -o -type l >> ${TMPPLIST})
 
 post-install-BASH-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions
 	${RLN} ${STAGEDIR}${PREFIX}/google-cloud-sdk/completion.bash.inc \
 		${STAGEDIR}${PREFIX}/share/bash-completion/completions/gcloud
 
 post-install-ZSH-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
 	${RLN} ${STAGEDIR}${PREFIX}/google-cloud-sdk/completion.zsh.inc \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions/_gcloud
 
 .include <bsd.port.mk>
Index: head/net/google-cloud-sdk/distinfo
===================================================================
--- head/net/google-cloud-sdk/distinfo	(revision 568233)
+++ head/net/google-cloud-sdk/distinfo	(revision 568234)
@@ -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
Index: head/net/google-cloud-sdk/files/patch-bin_bq
===================================================================
--- head/net/google-cloud-sdk/files/patch-bin_bq	(nonexistent)
+++ head/net/google-cloud-sdk/files/patch-bin_bq	(revision 568234)
@@ -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
+ }

Property changes on: head/net/google-cloud-sdk/files/patch-bin_bq
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/net/google-cloud-sdk/files/patch-bin_docker-credential-gcloud
===================================================================
--- head/net/google-cloud-sdk/files/patch-bin_docker-credential-gcloud	(nonexistent)
+++ head/net/google-cloud-sdk/files/patch-bin_docker-credential-gcloud	(revision 568234)
@@ -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
+ }

Property changes on: head/net/google-cloud-sdk/files/patch-bin_docker-credential-gcloud
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/net/google-cloud-sdk/files/patch-bin_gcloud
===================================================================
--- head/net/google-cloud-sdk/files/patch-bin_gcloud	(nonexistent)
+++ head/net/google-cloud-sdk/files/patch-bin_gcloud	(revision 568234)
@@ -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
+ }

Property changes on: head/net/google-cloud-sdk/files/patch-bin_gcloud
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/net/google-cloud-sdk/files/patch-bin_git-credential-gcloud.sh
===================================================================
--- head/net/google-cloud-sdk/files/patch-bin_git-credential-gcloud.sh	(nonexistent)
+++ head/net/google-cloud-sdk/files/patch-bin_git-credential-gcloud.sh	(revision 568234)
@@ -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
+ }

Property changes on: head/net/google-cloud-sdk/files/patch-bin_git-credential-gcloud.sh
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/net/google-cloud-sdk/files/patch-bin_gsutil
===================================================================
--- head/net/google-cloud-sdk/files/patch-bin_gsutil	(nonexistent)
+++ head/net/google-cloud-sdk/files/patch-bin_gsutil	(revision 568234)
@@ -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
+ }

Property changes on: head/net/google-cloud-sdk/files/patch-bin_gsutil
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/net/google-cloud-sdk/files/patch-bin_java__dev__appserver.sh
===================================================================
--- head/net/google-cloud-sdk/files/patch-bin_java__dev__appserver.sh	(nonexistent)
+++ head/net/google-cloud-sdk/files/patch-bin_java__dev__appserver.sh	(revision 568234)
@@ -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
+ }

Property changes on: head/net/google-cloud-sdk/files/patch-bin_java__dev__appserver.sh
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property