From owner-svn-ports-head@freebsd.org  Wed Feb  1 17:42:42 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 865ADCC46BE;
 Wed,  1 Feb 2017 17:42:42 +0000 (UTC) (envelope-from lev@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 2FC0D14E7;
 Wed,  1 Feb 2017 17:42:42 +0000 (UTC) (envelope-from lev@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v11HgfIh098959;
 Wed, 1 Feb 2017 17:42:41 GMT (envelope-from lev@FreeBSD.org)
Received: (from lev@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v11Hgf2I098957;
 Wed, 1 Feb 2017 17:42:41 GMT (envelope-from lev@FreeBSD.org)
Message-Id: <201702011742.v11Hgf2I098957@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: lev set sender to lev@FreeBSD.org
 using -f
From: "Lev A. Serebryakov" <lev@FreeBSD.org>
Date: Wed, 1 Feb 2017 17:42:41 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r433059 - in head/devel: subversion subversion18
X-SVN-Group: ports-head
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: Wed, 01 Feb 2017 17:42:42 -0000

Author: lev
Date: Wed Feb  1 17:42:40 2017
New Revision: 433059
URL: https://svnweb.freebsd.org/changeset/ports/433059

Log:
   Fix shebang fix for new sed(1) behavior
  
  PR:		215230
  Submitted by:	Xin Li <delphij@FreeBSD.org>

Modified:
  head/devel/subversion/Makefile.common
  head/devel/subversion18/Makefile.common

Modified: head/devel/subversion/Makefile.common
==============================================================================
--- head/devel/subversion/Makefile.common	Wed Feb  1 17:39:40 2017	(r433058)
+++ head/devel/subversion/Makefile.common	Wed Feb  1 17:42:40 2017	(r433059)
@@ -105,8 +105,9 @@ post-patch:
 	@${ECHO_CMD} "#define ORGANIZATION_NAME \"${ORGANIZATION}\"" > ${WRKSRC}/subversion/freebsd-organization.h
 .endif
 # shebangfix
-	@${GREP} -Rl -e '#!/bin/b' -e '#!/bin/env' -e '#!/usr/bin/p' ${WRKSRC}/tools/ \
-		| ${XARGS} ${REINPLACE_CMD} -e '1s|#\!/bin/b|#\!/usr/local/bin/b|' \
+	@${FIND} ${WRKSRC}/tools/ -type f -exec ${GREP} -l -e '#!/bin/b' -e '#!/bin/env' \
+		-e '#!/usr/bin/p' {} + | ${XARGS} ${REINPLACE_CMD} -e \
+		'1s|#\!/bin/b|#\!/usr/local/bin/b|' \
 		-e '1s|#\!/bin/env|#\!/usr/bin/env|' \
 		-e '1s|#\!/usr/bin/p|#\!/usr/local/bin/p|'
 # remove all .bak files to clean the stage

Modified: head/devel/subversion18/Makefile.common
==============================================================================
--- head/devel/subversion18/Makefile.common	Wed Feb  1 17:39:40 2017	(r433058)
+++ head/devel/subversion18/Makefile.common	Wed Feb  1 17:42:40 2017	(r433059)
@@ -108,8 +108,9 @@ post-patch:
 	@${ECHO_CMD} "#define ORGANIZATION_NAME \"${ORGANIZATION}\"" > ${WRKSRC}/subversion/freebsd-organization.h
 .endif
 # shebangfix
-	@${GREP} -Rl -e '#!/bin/b' -e '#!/bin/env' -e '#!/usr/bin/p' ${WRKSRC}/tools/ \
-		| ${XARGS} ${REINPLACE_CMD} -e '1s|#\!/bin/b|#\!/usr/local/bin/b|' \
+	@${FIND} ${WRKSRC}/tools/ -type f -exec ${GREP} -l -e '#!/bin/b' -e '#!/bin/env' \
+		-e '#!/usr/bin/p' {} + | ${XARGS} ${REINPLACE_CMD} -e \
+		'1s|#\!/bin/b|#\!/usr/local/bin/b|' \
 		-e '1s|#\!/bin/env|#\!/usr/bin/env|' \
 		-e '1s|#\!/usr/bin/p|#\!/usr/local/bin/p|'
 # remove all .bak files to clean the stage