Index: branches/2018Q2/sysutils/py-google-compute-engine/Makefile =================================================================== --- branches/2018Q2/sysutils/py-google-compute-engine/Makefile (revision 470616) +++ branches/2018Q2/sysutils/py-google-compute-engine/Makefile (revision 470617) @@ -1,44 +1,43 @@ # $FreeBSD$ PORTNAME= google-compute-engine DISTVERSION= 2.7.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= helen.koike@collabora.com COMMENT= Guest Environment for Google Compute Engine LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${FLAVOR} \ google_oslogin_control:sysutils/google-compute-engine-oslogin \ sudo:security/sudo USES= python USE_PYTHON= autoplist concurrent distutils NO_ARCH= yes USE_RC_SUBR= google_instance_setup \ google_network_setup \ google_accounts_daemon \ google_clock_skew_daemon \ google_ip_forwarding_daemon \ google_startup SUB_LIST= PYTHON_CMD="${PYTHON_CMD}" REINPLACE_ARGS= -i '' post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/syslog.d ${INSTALL_DATA} ${FILESDIR}/instance_configs.cfg.distro.sample \ ${STAGEDIR}${PREFIX}/etc/instance_configs.cfg.distro.sample ${INSTALL_DATA} ${FILESDIR}/90-google.conf.sample \ ${STAGEDIR}${PREFIX}/etc/syslog.d/90-google.conf.sample - .include Index: branches/2018Q2/sysutils/py-google-compute-engine/files/google_startup.in =================================================================== --- branches/2018Q2/sysutils/py-google-compute-engine/files/google_startup.in (revision 470616) +++ branches/2018Q2/sysutils/py-google-compute-engine/files/google_startup.in (revision 470617) @@ -1,42 +1,45 @@ #!/bin/sh # $FreeBSD$ # # PROVIDE: google_startup # BEFORE: LOGIN # REQUIRE: NETWORKING syslogd google_instance_setup google_network_setup # KEYWORD: shutdown # # google_startup_enable (bool): Set to NO by default. # Set it to YES to enable google_startup. # . /etc/rc.subr +# Required to execute gsutil +export PATH=%%LOCALBASE%%/bin:$PATH + name="google_startup" rcvar="google_startup_enable" load_rc_config "${name}" : ${google_startup_enable:="NO"} command_interpreter="%%PYTHON_CMD%%" command=%%PREFIX%%/bin/google_metadata_script_runner command_startup_args="--script-type startup" command_shutdown_args="--script-type shutdown" pidfile=/var/run/${name}.pid start_cmd="google_startup_start" stop_cmd="google_startup_stop" google_startup_start() { ${command} ${command_startup_args} } google_startup_stop() { echo "Stopping ${name}." ${command} ${command_shutdown_args} } run_rc_command "$1" Index: branches/2018Q2 =================================================================== --- branches/2018Q2 (revision 470616) +++ branches/2018Q2 (revision 470617) Property changes on: branches/2018Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r470611