Index: head/net/google-daemon/Makefile
===================================================================
--- head/net/google-daemon/Makefile	(revision 463114)
+++ head/net/google-daemon/Makefile	(revision 463115)
@@ -1,46 +1,40 @@
 # Created by: Steve Wills <swills@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	google-daemon
 PORTVERSION=	1.2.1
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=	swills@FreeBSD.org
 COMMENT=	Google daemon for use with Google Cloud Compute Engine
 
 BUILD_DEPENDS=	python:lang/python
 RUN_DEPENDS=	python:lang/python \
 		sudo:security/sudo
 
-USES=		python shebangfix
+USES=		python:2.7 shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	GoogleCloudPlatform
 GH_PROJECT=	compute-image-packages
 USE_RC_SUBR=	google-accounts-manager
 WRKSRC_SUBDIR=	${PORTNAME}
+NO_ARCH=	yes
 
-SHEBANG_FILES=	usr/share/google/google_daemon/accounts.py \
-		usr/share/google/google_daemon/accounts_manager.py \
-		usr/share/google/google_daemon/accounts_manager_daemon.py \
-		usr/share/google/google_daemon/address_manager.py \
-		usr/share/google/google_daemon/desired_accounts.py \
-		usr/share/google/google_daemon/manage_accounts.py \
-		usr/share/google/google_daemon/manage_addresses.py \
-		usr/share/google/google_daemon/utils.py
+SHEBANG_FILES=	usr/share/google/google_daemon/*.py
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; s|%%PYTHON_CMD%%|${PYTHON_CMD}|' \
 		${WRKSRC}/usr/share/google/google_daemon/accounts.py \
 		${WRKSRC}/usr/share/google/google_daemon/accounts_manager.py \
 		${WRKSRC}/usr/share/google/google_daemon/utils.py
 	@${RM} ${WRKSRC}/usr/share/google/google_daemon/*.bak \
 		${WRKSRC}/usr/share/google/google_daemon/*.orig
 
 do-build:
 	${PYTHON_CMD} -m compileall ${WRKSRC}/usr/share/google/google_daemon
 
 do-install:
 	cd ${WRKSRC}/usr/share ; ${COPYTREE_BIN} google ${STAGEDIR}${PREFIX}/share
 
 .include <bsd.port.mk>
Index: head/net/google-daemon/files/patch-usr__share__google__google_daemon__accounts_manager.py
===================================================================
--- head/net/google-daemon/files/patch-usr__share__google__google_daemon__accounts_manager.py	(revision 463114)
+++ head/net/google-daemon/files/patch-usr__share__google__google_daemon__accounts_manager.py	(revision 463115)
@@ -1,27 +1,27 @@
 --- ./usr/share/google/google_daemon/accounts_manager.py.orig	2014-08-10 19:54:20.429932607 +0000
 +++ ./usr/share/google/google_daemon/accounts_manager.py	2014-08-10 19:55:06.794964428 +0000
 @@ -1,3 +1,4 @@
-+#!%%PREFIX%%/bin/python
++#!%%PYTHON_CMD%%
  # Copyright 2013 Google Inc. All Rights Reserved.
  #
  # Licensed under the Apache License, Version 2.0 (the "License");
 @@ -20,7 +21,7 @@
  import pwd
  import time
  
 -LOCKFILE = '/var/lock/manage-accounts.lock'
 +LOCKFILE = '/var/run/manage-accounts.lock'
  
  
  class AccountsManager(object):
 @@ -95,8 +96,8 @@
    def RegenerateKeysAndUpdateAccounts(self):
      """Regenerate the keys and update accounts as needed."""
      logging.debug('RegenerateKeysAndUpdateAccounts')
 -    if self.system.IsExecutable('/usr/share/google/first-boot'):
 -      self.system.RunCommand('/usr/share/google/first-boot')
 +    if self.system.IsExecutable('%%PREFIX%%/share/google/first-boot'):
 +      self.system.RunCommand('%%PREFIX%%/share/google/first-boot')
  
      self.lock_file.RunExclusively(self.lock_fname, self.UpdateAccounts)