From owner-dev-commits-ports-main@freebsd.org Sun Aug 8 15:06:24 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 85D8265A582; Sun, 8 Aug 2021 15:06:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GjMxC35DJz4nFQ; Sun, 8 Aug 2021 15:06:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6B2C916E1A; Sun, 8 Aug 2021 15:06:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 178F6K8G047699; Sun, 8 Aug 2021 15:06:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 178F6Kan047698; Sun, 8 Aug 2021 15:06:20 GMT (envelope-from git) Date: Sun, 8 Aug 2021 15:06:20 GMT Message-Id: <202108081506.178F6Kan047698@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: 70dba0117fec - main - sysutils/rubygem-smart_proxy_salt: Use USES=shebangfix MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 70dba0117fecb475c20986e83d246b0b50d5659e Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Aug 2021 15:06:24 -0000 The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=70dba0117fecb475c20986e83d246b0b50d5659e commit 70dba0117fecb475c20986e83d246b0b50d5659e Author: Po-Chuan Hsieh AuthorDate: 2021-08-08 14:44:08 +0000 Commit: Po-Chuan Hsieh CommitDate: 2021-08-08 14:55:33 +0000 sysutils/rubygem-smart_proxy_salt: Use USES=shebangfix - Fix indent --- sysutils/rubygem-smart_proxy_salt/Makefile | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/sysutils/rubygem-smart_proxy_salt/Makefile b/sysutils/rubygem-smart_proxy_salt/Makefile index d4afb5e3aaa1..43e07220b8ec 100644 --- a/sysutils/rubygem-smart_proxy_salt/Makefile +++ b/sysutils/rubygem-smart_proxy_salt/Makefile @@ -13,30 +13,22 @@ LICENSE= GPLv3 RUN_DEPENDS= foreman-proxy>=1.8.0:net/foreman-proxy \ ${PYTHON_PKGNAMEPREFIX}salt>0:sysutils/py-salt@${PY_FLAVOR} -USES= gem python +USES= gem python shebangfix USE_RUBY= yes NO_ARCH= yes +SHEBANG_FILES= bin/foreman-node \ + sbin/upload-salt-reports + post-patch: - @${REINPLACE_CMD} \ - -e "s|/usr/bin/env ruby|${RUBY}|g" \ - -e "s|/usr/bin/env python|${PYTHON_CMD}|g" \ - -e "s|%%LOCALBASE%%|${LOCALBASE}|g" \ - ${WRKSRC}/bin/foreman-node \ - ${WRKSRC}/sbin/upload-salt-reports + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/bin/foreman-node ${WRKSRC}/sbin/upload-salt-reports post-install: - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d - ${INSTALL_DATA} ${WRKSRC}/settings.d/salt.yml.example \ - ${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d/salt.yml.sample - ${MKDIR} ${STAGEDIR}${PREFIX}/share/foreman-proxy/bundler.d - ${INSTALL_DATA} ${FILESDIR}/salt.rb \ - ${STAGEDIR}${PREFIX}/share/foreman-proxy/bundler.d/salt.rb - ${MKDIR} ${STAGEDIR}${PREFIX}/etc/salt - ${INSTALL_DATA} ${WRKSRC}/etc/foreman.yaml.example \ - ${STAGEDIR}${PREFIX}/etc/salt/foreman.yaml.sample - ${INSTALL_SCRIPT} ${WRKSRC}/sbin/upload-salt-reports \ - ${STAGEDIR}${PREFIX}/sbin + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d ${STAGEDIR}${PREFIX}/etc/salt ${STAGEDIR}${PREFIX}/share/foreman-proxy/bundler.d + ${INSTALL_DATA} ${WRKSRC}/settings.d/salt.yml.example ${STAGEDIR}${PREFIX}/etc/foreman-proxy/settings.d/salt.yml.sample + ${INSTALL_DATA} ${WRKSRC}/etc/foreman.yaml.example ${STAGEDIR}${PREFIX}/etc/salt/foreman.yaml.sample + ${INSTALL_SCRIPT} ${WRKSRC}/sbin/upload-salt-reports ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_DATA} ${FILESDIR}/salt.rb ${STAGEDIR}${PREFIX}/share/foreman-proxy/bundler.d/salt.rb .include