Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 8 Aug 2021 15:06:20 GMT
From:      Po-Chuan Hsieh <sunpoet@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 70dba0117fec - main - sysutils/rubygem-smart_proxy_salt: Use USES=shebangfix
Message-ID:  <202108081506.178F6Kan047698@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=70dba0117fecb475c20986e83d246b0b50d5659e

commit 70dba0117fecb475c20986e83d246b0b50d5659e
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2021-08-08 14:44:08 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
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 <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108081506.178F6Kan047698>