From owner-freebsd-ports-bugs@freebsd.org  Sun Nov 22 09:28:43 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 2444AA35A0A
 for <freebsd-ports-bugs@mailman.ysv.freebsd.org>;
 Sun, 22 Nov 2015 09:28:43 +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 0E6C817DF
 for <freebsd-ports-bugs@FreeBSD.org>; Sun, 22 Nov 2015 09:28:43 +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 tAM9Sg37057424
 for <freebsd-ports-bugs@FreeBSD.org>; Sun, 22 Nov 2015 09:28:42 GMT
 (envelope-from bugzilla-noreply@freebsd.org)
From: bugzilla-noreply@freebsd.org
To: freebsd-ports-bugs@FreeBSD.org
Subject: [Bug 204725] Mk/bsd.port.mk: makepatch inserts context junk after
 r401709
Date: Sun, 22 Nov 2015 09:28:43 +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: needs-qa, patch, regression
X-Bugzilla-Severity: Affects Only Me
X-Bugzilla-Who: marino@FreeBSD.org
X-Bugzilla-Status: New
X-Bugzilla-Priority: ---
X-Bugzilla-Assigned-To: marino@FreeBSD.org
X-Bugzilla-Target-Milestone: ---
X-Bugzilla-Flags: maintainer-feedback?
X-Bugzilla-Changed-Fields: 
Message-ID: <bug-204725-13-QnvnjzK7A2@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 09:28:43 -0000

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

--- Comment #10 from John Marino <marino@FreeBSD.org> ---
(In reply to John Marino from comment #7)

Ah, I get what you mean by this now:
".. and any hunks applied before are *lost* because .orig file(s) now points to
a patched version(s)"

The first patch to File X creates the .orig file and the second patch to File X
will overwrite it, thus the resulting patch only includes the last applied
change.

This will be difficult to fix because it's happening in the do-patch phase,
well before makepatch comes in.  It's actually another reason to avoid
splitting a patch into multiple files.  Maintainers have the same problem if
they generate their patches manually (and the previous version of makepatch
also did the the same thing)

The do-patch step would have to be modified in a predictable way (e.g. on the
first patch, cp <file>.orig to <file>.orig.1st if <file>.orig.1st does not
exist.  Then makepatch can mv any <file>.orig.1st back to <file>.orig before
running.

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