From owner-svn-ports-head@freebsd.org Mon May 13 10:05:28 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BED1F1589C8C; Mon, 13 May 2019 10:05:28 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 638DF7252F; Mon, 13 May 2019 10:05:28 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3A90B8525; Mon, 13 May 2019 10:05:28 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4DA5S1Z073722; Mon, 13 May 2019 10:05:28 GMT (envelope-from swills@FreeBSD.org) Received: (from swills@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4DA5Rq2073717; Mon, 13 May 2019 10:05:27 GMT (envelope-from swills@FreeBSD.org) Message-Id: <201905131005.x4DA5Rq2073717@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: swills set sender to swills@FreeBSD.org using -f From: Steve Wills Date: Mon, 13 May 2019 10:05:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r501547 - in head/sysutils/py-google-compute-engine: . files X-SVN-Group: ports-head X-SVN-Commit-Author: swills X-SVN-Commit-Paths: in head/sysutils/py-google-compute-engine: . files X-SVN-Commit-Revision: 501547 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 638DF7252F X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.98)[-0.980,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 May 2019 10:05:29 -0000 Author: swills Date: Mon May 13 10:05:26 2019 New Revision: 501547 URL: https://svnweb.freebsd.org/changeset/ports/501547 Log: sysutils/py-google-compute-engine: fix daemons in python 2.7 case PR: 237845 Reviewed by: koobs Approved by: implicit (portmgr, python, jfi blanket) MFH: 2019Q2 Modified: head/sysutils/py-google-compute-engine/Makefile (contents, props changed) head/sysutils/py-google-compute-engine/files/google_accounts_daemon.in head/sysutils/py-google-compute-engine/files/google_clock_skew_daemon.in head/sysutils/py-google-compute-engine/files/google_instance_setup.in head/sysutils/py-google-compute-engine/files/google_network_daemon.in head/sysutils/py-google-compute-engine/files/google_startup.in Modified: head/sysutils/py-google-compute-engine/Makefile ============================================================================== --- head/sysutils/py-google-compute-engine/Makefile Mon May 13 09:55:23 2019 (r501546) +++ head/sysutils/py-google-compute-engine/Makefile Mon May 13 10:05:26 2019 (r501547) @@ -2,7 +2,7 @@ PORTNAME= google-compute-engine DISTVERSION= 2.8.13 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -25,24 +25,22 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}distro>0:sysutils USES= python shebangfix USE_PYTHON= autoplist concurrent distutils -WRKSRC_SUBDIR= packages/python-google-compute-engine +WRKSRC_SUBDIR= packages/python-google-compute-engine NO_ARCH= yes -SHEBANG_FILES= ../google-compute-engine/src/usr/bin/google_set_multiqueue \ - ../google-compute-engine/src/usr/bin/google_optimize_local_ssd +SHEBANG_FILES= ../google-compute-engine/src/usr/bin/google_optimize_local_ssd \ + ../google-compute-engine/src/usr/bin/google_set_multiqueue USE_GITHUB= yes GH_ACCOUNT= GoogleCloudPlatform GH_PROJECT= compute-image-packages GH_TAGNAME= 20190416 -USE_RC_SUBR= google_instance_setup \ - google_accounts_daemon \ - google_clock_skew_daemon \ - google_network_daemon \ - google_startup +USE_RC_SUBR= google_accounts_daemon google_clock_skew_daemon \ + google_instance_setup google_network_daemon google_startup -SUB_LIST= PYTHON_CMD="${PYTHON_CMD}" +SUB_LIST= PYTHON_CMD="${PYTHON_CMD}" \ + PYTHON_VER="${PYTHON_VER}" REINPLACE_ARGS= -i '' post-install: Modified: head/sysutils/py-google-compute-engine/files/google_accounts_daemon.in ============================================================================== --- head/sysutils/py-google-compute-engine/files/google_accounts_daemon.in Mon May 13 09:55:23 2019 (r501546) +++ head/sysutils/py-google-compute-engine/files/google_accounts_daemon.in Mon May 13 10:05:26 2019 (r501547) @@ -24,7 +24,7 @@ load_rc_config "${name}" : ${google_accounts_daemon_enable:="NO"} command_interpreter="%%PYTHON_CMD%%" -command=%%PREFIX%%/bin/${name} +command=%%PREFIX%%/bin/${name}-%%PYTHON_VER%% pidfile=/var/run/${name}.pid start_cmd="google_accounts_daemon_start" Modified: head/sysutils/py-google-compute-engine/files/google_clock_skew_daemon.in ============================================================================== --- head/sysutils/py-google-compute-engine/files/google_clock_skew_daemon.in Mon May 13 09:55:23 2019 (r501546) +++ head/sysutils/py-google-compute-engine/files/google_clock_skew_daemon.in Mon May 13 10:05:26 2019 (r501547) @@ -21,7 +21,7 @@ load_rc_config "${name}" : ${google_clock_skew_daemon_enable:="NO"} command_interpreter="%%PYTHON_CMD%%" -command=%%PREFIX%%/bin/${name} +command=%%PREFIX%%/bin/${name}-%%PYTHON_VER%% pidfile=/var/run/${name}.pid start_cmd="google_clock_skew_daemon_start" Modified: head/sysutils/py-google-compute-engine/files/google_instance_setup.in ============================================================================== --- head/sysutils/py-google-compute-engine/files/google_instance_setup.in Mon May 13 09:55:23 2019 (r501546) +++ head/sysutils/py-google-compute-engine/files/google_instance_setup.in Mon May 13 10:05:26 2019 (r501547) @@ -21,7 +21,7 @@ load_rc_config "${name}" : ${google_instance_setup_enable:="NO"} command_interpreter="%%PYTHON_CMD%%" -command=%%PREFIX%%/bin/${name} +command=%%PREFIX%%/bin/${name}-%%PYTHON_VER%% pidfile=/var/run/${name}.pid run_rc_command "$1" Modified: head/sysutils/py-google-compute-engine/files/google_network_daemon.in ============================================================================== --- head/sysutils/py-google-compute-engine/files/google_network_daemon.in Mon May 13 09:55:23 2019 (r501546) +++ head/sysutils/py-google-compute-engine/files/google_network_daemon.in Mon May 13 10:05:26 2019 (r501547) @@ -21,7 +21,7 @@ load_rc_config "${name}" : ${google_network_daemon_enable:="NO"} command_interpreter="%%PYTHON_CMD%%" -command=%%PREFIX%%/bin/${name} +command=%%PREFIX%%/bin/${name}-%%PYTHON_VER%% pidfile=/var/run/${name}.pid start_cmd="google_network_daemon_start" Modified: head/sysutils/py-google-compute-engine/files/google_startup.in ============================================================================== --- head/sysutils/py-google-compute-engine/files/google_startup.in Mon May 13 09:55:23 2019 (r501546) +++ head/sysutils/py-google-compute-engine/files/google_startup.in Mon May 13 10:05:26 2019 (r501547) @@ -24,7 +24,7 @@ load_rc_config "${name}" : ${google_startup_enable:="NO"} command_interpreter="%%PYTHON_CMD%%" -command=%%PREFIX%%/bin/google_metadata_script_runner +command=%%PREFIX%%/bin/google_metadata_script_runner-%%PYTHON_VER%% command_startup_args="--script-type startup" command_shutdown_args="--script-type shutdown" pidfile=/var/run/${name}.pid