Date: Tue, 8 Aug 2017 01:10:57 +0000 (UTC) From: Mark Felder <feld@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r447527 - head/Mk/Uses Message-ID: <201708080110.v781Avol098723@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: feld Date: Tue Aug 8 01:10:57 2017 New Revision: 447527 URL: https://svnweb.freebsd.org/changeset/ports/447527 Log: Mk/Uses/shebangfix.mk: Fix SHEBANG_FILES to use find(1) Ports like net/vmware-vsphere-cli use SHEBANG_FILES with globs like so: SHEBANG_FILES= bin/* ... As of FreeBSD 11.1-RELEASE sed has changed and errors if attempted on non-file objects. In the case of the cited port there are many other files in the bin/ directory which are symlinks for compatibility with old scripts. This causes the port patching to fail. PR: 221229 Differential Revision: https://reviews.freebsd.org/D11853 Modified: head/Mk/Uses/shebangfix.mk Modified: head/Mk/Uses/shebangfix.mk ============================================================================== --- head/Mk/Uses/shebangfix.mk Tue Aug 8 00:35:56 2017 (r447526) +++ head/Mk/Uses/shebangfix.mk Tue Aug 8 01:10:57 2017 (r447527) @@ -94,7 +94,8 @@ fix-shebang: .endif .if defined(SHEBANG_FILES) @cd ${WRKSRC}; \ - ${ECHO_CMD} ${SHEBANG_FILES} | ${XARGS} ${SED} -i '' ${_SHEBANG_REINPLACE_ARGS} + ${FIND} ${SHEBANG_FILES} -type f \ + -exec ${SED} -i '' ${_SHEBANG_REINPLACE_ARGS} {} + .endif .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708080110.v781Avol098723>