Index: head/sysutils/google-compute-engine-oslogin/Makefile
===================================================================
--- head/sysutils/google-compute-engine-oslogin/Makefile	(revision 507971)
+++ head/sysutils/google-compute-engine-oslogin/Makefile	(revision 507972)
@@ -1,51 +1,51 @@
 # $FreeBSD$
 
 PORTNAME=	google-compute-engine-oslogin
 DISTVERSION=	1.5.3
 PORTREVISION=	2
 CATEGORIES=	sysutils
 
-MAINTAINER=	lucas.kanashiro@collabora.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	OS Login Guest Environment for Google Compute Engine
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/../../LICENSE
 
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libjson-c.so:devel/json-c
 RUN_DEPENDS=	gsed:textproc/gsed \
 		${LOCALBASE}/lib/pam_mkhomedir.so:security/pam_mkhomedir
 
 USES=		compiler:c++11-lang gmake localbase:ldflags
 USE_LDCONFIG=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	GoogleCloudPlatform
 GH_PROJECT=	compute-image-packages
 GH_TAGNAME=	20190522
 
 MAKE_ARGS=	JSON_INCLUDE_PATH=${LOCALBASE}/include/json-c \
 		BIN_INSTALL_PATH=/bin \
 		PAM_INSTALL_PATH=/lib \
 		AUTHKEYS_INSTALL_PATH=/bin \
 		NSS_LIBRARY_SONAME=nss_oslogin.so.1
 
 WRKSRC_SUBDIR=	packages/google-compute-engine-oslogin
 
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!' \
 		${WRKSRC}/bin/google_oslogin_control \
 		${WRKSRC}/libnss_cache_oslogin/nss_cache_oslogin.c \
 		${WRKSRC}/nss_cache/nss_cache.cc
 
 post-install:
 	${LN} -sf libnss_${PORTNAME}-${DISTVERSION}.so ${STAGEDIR}${PREFIX}/lib/nss_oslogin.so.1
 	${LN} -sf libnss_cache_${PORTNAME}-${DISTVERSION}.so ${STAGEDIR}${PREFIX}/lib/nss_cache_oslogin.so.1
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/google_authorized_keys \
 		${STAGEDIR}${PREFIX}/lib/libnss_google-compute-engine-oslogin-${DISTVERSION}.so \
 		${STAGEDIR}${PREFIX}/lib/libnss_cache_google-compute-engine-oslogin-${DISTVERSION}.so \
 		${STAGEDIR}${PREFIX}/lib/pam_oslogin_admin.so \
 		${STAGEDIR}${PREFIX}/lib/pam_oslogin_login.so
 
 .include <bsd.port.mk>
Index: head/sysutils/py-google-compute-engine/Makefile
===================================================================
--- head/sysutils/py-google-compute-engine/Makefile	(revision 507971)
+++ head/sysutils/py-google-compute-engine/Makefile	(revision 507972)
@@ -1,54 +1,54 @@
 # $FreeBSD$
 
 PORTNAME=	google-compute-engine
 DISTVERSION=	2.8.16
 CATEGORIES=	sysutils python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	lucas.kanashiro@collabora.com
+MAINTAINER=	ports@FreeBSD.org
 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=	../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=	20190522
 
 USE_RC_SUBR=	google_accounts_daemon google_clock_skew_daemon \
 		google_instance_setup google_network_daemon google_startup
 
 SUB_LIST=	PYTHON_CMD="${PYTHON_CMD}" \
 		PYTHON_VER="${PYTHON_VER}"
 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>