From owner-svn-ports-all@freebsd.org Tue Aug 8 01:11:43 2017 Return-Path: Delivered-To: svn-ports-all@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 DFCC5DD464A; Tue, 8 Aug 2017 01:11:43 +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 A1604662C8; Tue, 8 Aug 2017 01:11:43 +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 v781BgM8099587; Tue, 8 Aug 2017 01:11:42 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v781BgNK099586; Tue, 8 Aug 2017 01:11:42 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201708080111.v781BgNK099586@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Tue, 8 Aug 2017 01:11:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r447528 - branches/2017Q3/Mk/Uses X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: branches/2017Q3/Mk/Uses X-SVN-Commit-Revision: 447528 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Aug 2017 01:11:44 -0000 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