From owner-freebsd-ports-bugs@freebsd.org  Sun Nov 22 01:56:48 2015
Return-Path: <owner-freebsd-ports-bugs@freebsd.org>
Delivered-To: freebsd-ports-bugs@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 64DB2A3508D
 for <freebsd-ports-bugs@mailman.ysv.freebsd.org>;
 Sun, 22 Nov 2015 01:56:48 +0000 (UTC)
 (envelope-from bugzilla-noreply@freebsd.org)
Received: from kenobi.freebsd.org (kenobi.freebsd.org
 [IPv6:2001:1900:2254:206a::16:76])
 (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 505A71DF7
 for <freebsd-ports-bugs@FreeBSD.org>; Sun, 22 Nov 2015 01:56:48 +0000 (UTC)
 (envelope-from bugzilla-noreply@freebsd.org)
Received: from bugs.freebsd.org ([127.0.1.118])
 by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id tAM1umb1074840
 for <freebsd-ports-bugs@FreeBSD.org>; Sun, 22 Nov 2015 01:56:48 GMT
 (envelope-from bugzilla-noreply@freebsd.org)
From: bugzilla-noreply@freebsd.org
To: freebsd-ports-bugs@FreeBSD.org
Subject: [Bug 204725] |make makepatch| inserts context junk after r401709
Date: Sun, 22 Nov 2015 01:56:48 +0000
X-Bugzilla-Reason: CC
X-Bugzilla-Type: changed
X-Bugzilla-Watch-Reason: None
X-Bugzilla-Product: Ports & Packages
X-Bugzilla-Component: Ports Framework
X-Bugzilla-Version: Latest
X-Bugzilla-Keywords: regression
X-Bugzilla-Severity: Affects Only Me
X-Bugzilla-Who: marino@FreeBSD.org
X-Bugzilla-Status: New
X-Bugzilla-Priority: ---
X-Bugzilla-Assigned-To: portmgr@FreeBSD.org
X-Bugzilla-Target-Milestone: ---
X-Bugzilla-Flags: 
X-Bugzilla-Changed-Fields: 
Message-ID: <bug-204725-13-C0mi8DPiAh@https.bugs.freebsd.org/bugzilla/>
In-Reply-To: <bug-204725-13@https.bugs.freebsd.org/bugzilla/>
References: <bug-204725-13@https.bugs.freebsd.org/bugzilla/>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/
Auto-Submitted: auto-generated
MIME-Version: 1.0
X-BeenThere: freebsd-ports-bugs@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: Ports bug reports <freebsd-ports-bugs.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-ports-bugs>, 
 <mailto:freebsd-ports-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs/>
List-Post: <mailto:freebsd-ports-bugs@freebsd.org>
List-Help: <mailto:freebsd-ports-bugs-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, 
 <mailto:freebsd-ports-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 22 Nov 2015 01:56:48 -0000

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=204725

--- Comment #4 from John Marino <marino@FreeBSD.org> ---
There were two issues.

1) The last minute add of "local" keyword broke makepatch.  I don't know why,
but some of the "local var=$(some cmd)" didn't work.  I had to change them to:
local var
var=$(some cmd)

2) The hunk processing had a logic flaw.

Please try the attached patch.
I think it works.

(It results in one less patch at the end because one patch changed a file that
had been altered by another another patch.  When this happens, the changes get
combined and this is expected)

-- 
You are receiving this mail because:
You are on the CC list for the bug.