From owner-svn-ports-head@freebsd.org  Tue Aug  8 01:10:58 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5561ADD44AA;
 Tue,  8 Aug 2017 01:10:58 +0000 (UTC)
 (envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2354166102;
 Tue,  8 Aug 2017 01:10:58 +0000 (UTC)
 (envelope-from feld@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v781AvLW098724;
 Tue, 8 Aug 2017 01:10:57 GMT (envelope-from feld@FreeBSD.org)
Received: (from feld@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v781Avol098723;
 Tue, 8 Aug 2017 01:10:57 GMT (envelope-from feld@FreeBSD.org)
Message-Id: <201708080110.v781Avol098723@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: feld set sender to
 feld@FreeBSD.org using -f
From: Mark Felder <feld@FreeBSD.org>
Date: Tue, 8 Aug 2017 01:10:57 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r447527 - head/Mk/Uses
X-SVN-Group: ports-head
X-SVN-Commit-Author: feld
X-SVN-Commit-Paths: head/Mk/Uses
X-SVN-Commit-Revision: 447527
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 08 Aug 2017 01:10:58 -0000

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