Index: head/sysutils/py-google-compute-engine/Makefile
===================================================================
--- head/sysutils/py-google-compute-engine/Makefile	(revision 499789)
+++ head/sysutils/py-google-compute-engine/Makefile	(revision 499790)
@@ -1,50 +1,57 @@
 # $FreeBSD$
 
 PORTNAME=	google-compute-engine
 DISTVERSION=	2.8.13
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	lucas.kanashiro@collabora.com
 COMMENT=	Guest Environment for Google Compute Engine
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}boto>0:devel/py-boto@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netaddr>0:net/py-netaddr@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}netifaces>0:net/py-netifaces@${PY_FLAVOR} \
 		google_oslogin_control:sysutils/google-compute-engine-oslogin \
 		sudo:security/sudo
 
+.if ${FLAVOR:Upy36:Mpy3*}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}distro>0:sysutils/py-distro@${PY_FLAVOR}
+.endif
+
 USES=		python shebangfix
 USE_PYTHON=	autoplist concurrent distutils
 
+WRKSRC_SUBDIR=  packages/python-google-compute-engine
+
 NO_ARCH=	yes
-SHEBANG_FILES=	scripts/google_set_multiqueue scripts/google_optimize_local_ssd
+SHEBANG_FILES=	../google-compute-engine/src/usr/bin/google_set_multiqueue \
+		../google-compute-engine/src/usr/bin/google_optimize_local_ssd
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	GoogleCloudPlatform
 GH_PROJECT=	compute-image-packages
-GH_TAGNAME=	20190124
+GH_TAGNAME=	20190416
 
 USE_RC_SUBR=	google_instance_setup \
 		google_accounts_daemon \
 		google_clock_skew_daemon \
 		google_network_daemon \
 		google_startup
 
 SUB_LIST=	PYTHON_CMD="${PYTHON_CMD}"
 REINPLACE_ARGS=	-i ''
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/syslog.d ${STAGEDIR}/etc
 	${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
 	${INSTALL_DATA} ${FILESDIR}/google_set_hostname \
 		${STAGEDIR}/etc/dhclient-exit-hooks
 
 .include <bsd.port.mk>
Index: head/sysutils/py-google-compute-engine/distinfo
===================================================================
--- head/sysutils/py-google-compute-engine/distinfo	(revision 499789)
+++ head/sysutils/py-google-compute-engine/distinfo	(revision 499790)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1551668922
-SHA256 (GoogleCloudPlatform-compute-image-packages-2.8.13-20190124_GH0.tar.gz) = 09637f951245729c66eb5b7b9ed49bead31349b29829baf5c8a4e5d45405a2f4
-SIZE (GoogleCloudPlatform-compute-image-packages-2.8.13-20190124_GH0.tar.gz) = 126211
+TIMESTAMP = 1556025006
+SHA256 (GoogleCloudPlatform-compute-image-packages-2.8.13-20190416_GH0.tar.gz) = cef65af726b7c32db9035266804e0393b54196fabd1007026554bae2d9540de4
+SIZE (GoogleCloudPlatform-compute-image-packages-2.8.13-20190416_GH0.tar.gz) = 130216