From owner-svn-ports-head@freebsd.org Tue Feb 27 12:23:23 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 75488F03D50; Tue, 27 Feb 2018 12:23:23 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 270F4730E1; Tue, 27 Feb 2018 12:23:23 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 21D1E24B3; Tue, 27 Feb 2018 12:23:23 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w1RCNNAf043150; Tue, 27 Feb 2018 12:23:23 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w1RCNMq8043148; Tue, 27 Feb 2018 12:23:22 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201802271223.w1RCNMq8043148@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Tue, 27 Feb 2018 12:23:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r463115 - in head/net/google-daemon: . files X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: in head/net/google-daemon: . files X-SVN-Commit-Revision: 463115 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Feb 2018 12:23:23 -0000 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@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");