diff options
| author | Mark Felder <feld@FreeBSD.org> | 2017-08-08 01:10:57 +0000 | 
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2017-08-08 01:10:57 +0000 | 
| commit | 45e556ab892f8996c0ed4ec68cab55384f69e954 (patch) | |
| tree | f5df69ff81995c40a5dc2203184c3df4e471cb9f | |
| parent | devel/rubygem-capybara: Fix RUN_DEPENDS to match gemspec (diff) | |
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
| -rw-r--r-- | Mk/Uses/shebangfix.mk | 3 | 
1 files changed, 2 insertions, 1 deletions
diff --git a/Mk/Uses/shebangfix.mk b/Mk/Uses/shebangfix.mk index c2543e72af90..5cf726ee499e 100644 --- a/Mk/Uses/shebangfix.mk +++ b/Mk/Uses/shebangfix.mk @@ -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  | 
