CVS commit: pkgsrc/net/py-google-cloud-sdk

["Leonardo Taccari" <leot%netbsd.org@localhost>]

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 <jklos>.
This patch is based on the one proposed by <maya> (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.

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: