diff --git a/net/google-cloud-sdk/Makefile b/net/google-cloud-sdk/Makefile index 86df5283218a..f053721973fc 100644 --- a/net/google-cloud-sdk/Makefile +++ b/net/google-cloud-sdk/Makefile @@ -1,72 +1,74 @@ PORTNAME= google-cloud-sdk -PORTVERSION= 331.0.0 +PORTVERSION= 426.0.0 CATEGORIES= net MASTER_SITES= https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/ DISTNAME= google-cloud-sdk-${PORTVERSION}-linux-x86_64 MAINTAINER= bofh@FreeBSD.org COMMENT= Google Cloud SDK for Google Cloud Platform WWW= https://developers.google.com/cloud/sdk/ 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}/bin/gcloud-crc32c \ ${WRKSRC}/install.bat \ + ${WRKSRC}/platform/bundledpythonunix \ ${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|%%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 + @${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 ${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 diff --git a/net/google-cloud-sdk/distinfo b/net/google-cloud-sdk/distinfo index dd79c624a646..6d5c3ea616f3 100644 --- a/net/google-cloud-sdk/distinfo +++ b/net/google-cloud-sdk/distinfo @@ -1,3 +1,3 @@ -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 +TIMESTAMP = 1681408277 +SHA256 (google-cloud-sdk-426.0.0-linux-x86_64.tar.gz) = 4f961fd92e744be00e3ce1da0dcbbafadbf81d1e1a2eed1a30c734e2e2522e13 +SIZE (google-cloud-sdk-426.0.0-linux-x86_64.tar.gz) = 190665411 diff --git a/net/google-cloud-sdk/files/patch-bin_bq b/net/google-cloud-sdk/files/patch-bin_bq deleted file mode 100644 index 5d3432536977..000000000000 --- a/net/google-cloud-sdk/files/patch-bin_bq +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - } diff --git a/net/google-cloud-sdk/files/patch-bin_docker-credential-gcloud b/net/google-cloud-sdk/files/patch-bin_docker-credential-gcloud deleted file mode 100644 index 364a5d59b426..000000000000 --- a/net/google-cloud-sdk/files/patch-bin_docker-credential-gcloud +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - } diff --git a/net/google-cloud-sdk/files/patch-bin_gcloud b/net/google-cloud-sdk/files/patch-bin_gcloud deleted file mode 100644 index 11f7259de5dc..000000000000 --- a/net/google-cloud-sdk/files/patch-bin_gcloud +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - } diff --git a/net/google-cloud-sdk/files/patch-bin_git-credential-gcloud.sh b/net/google-cloud-sdk/files/patch-bin_git-credential-gcloud.sh deleted file mode 100644 index fac834e4ba74..000000000000 --- a/net/google-cloud-sdk/files/patch-bin_git-credential-gcloud.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - } diff --git a/net/google-cloud-sdk/files/patch-bin_gsutil b/net/google-cloud-sdk/files/patch-bin_gsutil deleted file mode 100644 index ee7a4b36def7..000000000000 --- a/net/google-cloud-sdk/files/patch-bin_gsutil +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - } diff --git a/net/google-cloud-sdk/files/patch-bin_java__dev__appserver.sh b/net/google-cloud-sdk/files/patch-bin_java__dev__appserver.sh deleted file mode 100644 index 74e257f2df84..000000000000 --- a/net/google-cloud-sdk/files/patch-bin_java__dev__appserver.sh +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 - }