Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 8 Aug 2017 01:11:42 +0000 (UTC)
From:      Mark Felder <feld@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r447528 - branches/2017Q3/Mk/Uses
Message-ID:  <201708080111.v781BgNK099586@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: feld
Date: Tue Aug  8 01:11:42 2017
New Revision: 447528
URL: https://svnweb.freebsd.org/changeset/ports/447528

Log:
  MFH: r447527
  
  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
  
  Approved by:	portmgr (with hat)

Modified:
  branches/2017Q3/Mk/Uses/shebangfix.mk
Directory Properties:
  branches/2017Q3/   (props changed)

Modified: branches/2017Q3/Mk/Uses/shebangfix.mk
==============================================================================
--- branches/2017Q3/Mk/Uses/shebangfix.mk	Tue Aug  8 01:10:57 2017	(r447527)
+++ branches/2017Q3/Mk/Uses/shebangfix.mk	Tue Aug  8 01:11:42 2017	(r447528)
@@ -92,7 +92,8 @@ fix-shebang:
 .endfor
 .else
 	@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?201708080111.v781BgNK099586>