svn commit: r463115 - in head/net/google-daemon: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Tue Feb 27 12:23:22 2018
New Revision: 463115
URL: https://svnweb.freebsd.org/changeset/ports/463115

Log:
  - Limit python version
  - Fix shebangs properly
  - Add NO_ARCH
  
  Approved by:	portmgr blanket

Modified:
  head/net/google-daemon/Makefile
  head/net/google-daemon/files/patch-usr__share__google__google_daemon__accounts_manager.py

Modified: head/net/google-daemon/Makefile
==============================================================================
--- head/net/google-daemon/Makefile	Tue Feb 27 09:33:01 2018	(r463114)
+++ head/net/google-daemon/Makefile	Tue Feb 27 12:23:22 2018	(r463115)
@@ -3,7 +3,7 @@
 
 PORTNAME=	google-daemon
 PORTVERSION=	1.2.1
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=	swills at FreeBSD.org
@@ -13,24 +13,18 @@ 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

Modified: 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	Tue Feb 27 09:33:01 2018	(r463114)
+++ head/net/google-daemon/files/patch-usr__share__google__google_daemon__accounts_manager.py	Tue Feb 27 12:23:22 2018	(r463115)
@@ -1,7 +1,7 @@
 --- ./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");