Received: by mail.netbsd.org (Postfix, from userid 605) id 0436C84F50; Sun, 8 Jul 2018 12:22:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id CFA2B84EDA for ; Sun, 8 Jul 2018 12:22:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id WCPa7JOpCH8u for ; Sun, 8 Jul 2018 12:22:57 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 15A9684F01 for ; Sun, 8 Jul 2018 12:22:57 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 04D74FBEC; Sun, 8 Jul 2018 12:22:57 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1531052576264190" MIME-Version: 1.0 Date: Sun, 8 Jul 2018 12:22:56 +0000 From: "Leonardo Taccari" Subject: CVS commit: pkgsrc/net/py-google-cloud-sdk To: pkgsrc-changes@NetBSD.org Reply-To: leot@netbsd.org X-Mailer: log_accum Message-Id: <20180708122257.04D74FBEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1531052576264190 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: leot Date: Sun Jul 8 12:22:56 UTC 2018 Modified Files: pkgsrc/net/py-google-cloud-sdk: Makefile Log Message: py-google-cloud-sdk: Choose a safe fallback for Python interpreter The logic to find a Python executable can be summarized as: - CLOUDSDK_PYTHON environment variable defined: + If it matches `*python2*', use it - Otherwise: + Try `python2' + Fallback to `python' Substitute the latter fallback to ${PYTHONBIN} in order to have a safe choice. Should fix PR pkg/52122 reported by . This patch is based on the one proposed by (but restricted to CLOUDSDK_PYTHON lines and the fallback `python'). Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/py-google-cloud-sdk/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1531052576264190 Content-Disposition: inline Content-Length: 1139 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/py-google-cloud-sdk/Makefile diff -u pkgsrc/net/py-google-cloud-sdk/Makefile:1.3 pkgsrc/net/py-google-cloud-sdk/Makefile:1.4 --- pkgsrc/net/py-google-cloud-sdk/Makefile:1.3 Sat Apr 2 08:26:49 2016 +++ pkgsrc/net/py-google-cloud-sdk/Makefile Sun Jul 8 12:22:56 2018 @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2016/04/02 08:26:49 jperkin Exp $ +# $NetBSD: Makefile,v 1.4 2018/07/08 12:22:56 leot Exp $ GCLOUDVER= 96.0.0 DISTNAME= google-cloud-sdk-${GCLOUDVER}-linux-x86 PKGNAME= ${PYPKGPREFIX}-google-cloud-sdk-${GCLOUDVER} +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/ @@ -23,6 +24,13 @@ REPLACE_PYTHON+= bin/bootstrapping/* PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} MESSAGE_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} +SUBST_CLASSES+= python +SUBST_STAGE.python= pre-configure +SUBST_MESSAGE.python= Replacing hard coded python executable name +SUBST_FILES.python= lib/googlecloudsdk/core/* +SUBST_FILES.python+= bin/* +SUBST_SED.python= -e "/CLOUDSDK_PYTHON=/ s,python$$,${PYTHONBIN}," + INSTALLATION_DIRS= ${PKGBASE} do-install: --_----------=_1531052576264190--