svn commit: r445751 - head/Mk/Uses

[Dmitry Marakasov]

Author: amdmi3
Date: Fri Jul 14 12:47:55 2017
New Revision: 445751
URL: https://svnweb.freebsd.org/changeset/ports/445751

Log:
  - shebangfix: allow to use SHEBANG_REGEX, SHEBANG_GLOB, and SHEBANG_FILES simultaneously
  
  Reported by:	lev
  Approved by:	portmgr (mat)
  Differential Revision:	https://reviews.freebsd.org/D11572

Modified:
  head/Mk/Uses/shebangfix.mk

Modified: head/Mk/Uses/shebangfix.mk
==============================================================================
--- head/Mk/Uses/shebangfix.mk	Fri Jul 14 12:44:57 2017	(r445750)
+++ head/Mk/Uses/shebangfix.mk	Fri Jul 14 12:47:55 2017	(r445751)
@@ -84,13 +84,15 @@ fix-shebang:
 	@cd ${WRKSRC}; \
 		${FIND} -E . -type f -iregex '${SHEBANG_REGEX}' \
 		-exec ${SED} -i '' ${_SHEBANG_REINPLACE_ARGS} {} +
-.elif defined(SHEBANG_GLOB)
-.for f in ${SHEBANG_GLOB}
+.endif
+.if defined(SHEBANG_GLOB)
+.  for f in ${SHEBANG_GLOB}
 	@cd ${WRKSRC}; \
 		${FIND} . -type f -name '${f}' \
 		-exec ${SED} -i '' ${_SHEBANG_REINPLACE_ARGS} {} +
-.endfor
-.else
+.  endfor
+.endif
+.if defined(SHEBANG_FILES)
 	@cd ${WRKSRC}; \
 		${ECHO_CMD} ${SHEBANG_FILES} | ${XARGS} ${SED} -i '' ${_SHEBANG_REINPLACE_ARGS}
 .endif