From owner-svn-src-user@freebsd.org  Tue Jan 12 18:06:08 2016
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@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 B4AC9A6CA9E
 for <svn-src-user@mailman.ysv.freebsd.org>;
 Tue, 12 Jan 2016 18:06:08 +0000 (UTC)
 (envelope-from glebius@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 7F4FE1191;
 Tue, 12 Jan 2016 18:06:08 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0CI67tk009532;
 Tue, 12 Jan 2016 18:06:07 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0CI67gI009531;
 Tue, 12 Jan 2016 18:06:07 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201601121806.u0CI67gI009531@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Tue, 12 Jan 2016 18:06:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r293777 - user/cperciva/freebsd-update-build/scripts
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Jan 2016 18:06:08 -0000

Author: glebius
Date: Tue Jan 12 18:06:07 2016
New Revision: 293777
URL: https://svnweb.freebsd.org/changeset/base/293777

Log:
  Adjust script removing .orig files and empty files:
  - Adopt the regexp to cleaned patches, that don't have
    diff or subversion header.
  - Switch from awk to sed, due to bugs in awk regexps.

Modified:
  user/cperciva/freebsd-update-build/scripts/build.subr

Modified: user/cperciva/freebsd-update-build/scripts/build.subr
==============================================================================
--- user/cperciva/freebsd-update-build/scripts/build.subr	Tue Jan 12 16:38:09 2016	(r293776)
+++ user/cperciva/freebsd-update-build/scripts/build.subr	Tue Jan 12 18:06:07 2016	(r293777)
@@ -401,7 +401,8 @@ applypatches () {
 	while read PATCH; do
 		patch -p0 < ${PATCHDIR}/${PATCH}
 		# Remove ".orig" files created by patch(1) and empty files
-		for file in $(awk '$1 ~ /^(Index:|diff)/ { print $NF }' < \
+		for file in $(sed -Ene \
+		    's/^--- (.*)(\.orig$|[[:space:]]*)?/\1/p' < \
 		    ${PATCHDIR}/${PATCH}); do
 			echo ${file}.orig
 			if [ ! -s ${file} ]; then