Received: by mail.netbsd.org (Postfix, from userid 605)
	id 3A86284DD7; Tue,  2 Jun 2020 06:10:11 +0000 (UTC)
Received: from localhost (localhost [127.0.0.1])
	by mail.netbsd.org (Postfix) with ESMTP id B511784DD6
	for <pkgsrc-changes@NetBSD.org>; Tue,  2 Jun 2020 06:10:10 +0000 (UTC)
X-Virus-Scanned: amavisd-new at netbsd.org
Received: from mail.netbsd.org ([IPv6:::1])
	by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025)
	with ESMTP id YciPEfdD9Ss0 for <pkgsrc-changes@netbsd.org>;
	Tue,  2 Jun 2020 06:10:10 +0000 (UTC)
Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197])
	by mail.netbsd.org (Postfix) with ESMTP id 3733084CFD
	for <pkgsrc-changes@NetBSD.org>; Tue,  2 Jun 2020 06:10:10 +0000 (UTC)
Received: by cvs.NetBSD.org (Postfix, from userid 500)
	id 2B295FB27; Tue,  2 Jun 2020 06:10:10 +0000 (UTC)
Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1591078210272680"
MIME-Version: 1.0
Date: Tue, 2 Jun 2020 06:10:10 +0000
From: "Roland Illig" <rillig@netbsd.org>
Subject: CVS commit: pkgsrc/doc/guide/files
To: pkgsrc-changes@NetBSD.org
Reply-To: rillig@netbsd.org
X-Mailer: log_accum
Message-Id: <20200602061010.2B295FB27@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
List-Id: pkgsrc-changes.NetBSD.org
Precedence: bulk
List-Unsubscribe: <mailto:majordomo@NetBSD.org?subject=Unsubscribe%20pkgsrc-changes&body=unsubscribe%20pkgsrc-changes>

This is a multi-part message in MIME format.

--_----------=_1591078210272680
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	rillig
Date:		Tue Jun  2 06:10:10 UTC 2020

Modified Files:
	pkgsrc/doc/guide/files: build.xml

Log Message:
doc/guide: reword paragraph about patches applying cleanly

The previous wording was too easy to get wrong.  Applying cleanly mainly
means that the context lines are as expected.  In most cases this is good
enough.  Having the exact line information would be nice as well, but if
this were crucial, pkgtools/pkgdiff would need to fix this sitation.
Since it doesn't and even states in a comment that it doesn't, the
situation can't be that bad.


To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 pkgsrc/doc/guide/files/build.xml

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1591078210272680
Content-Disposition: inline
Content-Length: 1310
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/doc/guide/files/build.xml
diff -u pkgsrc/doc/guide/files/build.xml:1.81 pkgsrc/doc/guide/files/build.xml:1.82
--- pkgsrc/doc/guide/files/build.xml:1.81	Sun May  3 08:27:10 2020
+++ pkgsrc/doc/guide/files/build.xml	Tue Jun  2 06:10:09 2020
@@ -1,4 +1,4 @@
-<!-- $NetBSD: build.xml,v 1.81 2020/05/03 08:27:10 rillig Exp $ -->
+<!-- $NetBSD: build.xml,v 1.82 2020/06/02 06:10:09 rillig Exp $ -->
 
 <chapter id="build">
   <title>The build process</title>
@@ -394,12 +394,10 @@ ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${site
     <varname>PATCH_DIST_ARGS</varname>.  See <xref
     linkend="components.patches"/> for more details.</para>
 
-    <para>By default &man.patch.1; is given special args to make
-    it fail if the patches apply with some lines of fuzz. Please
-    fix (regen) the patches so that they apply cleanly. The
-    rationale behind this is that patches that don't apply cleanly
-    may end up being applied in the wrong place, and cause severe
-    harm there.</para>
+    <para>By default &man.patch.1; is given special arguments to make it
+    fail if the expected text from the patch context is not found in the
+    patched file. If that happens, fix the patch file by comparing it
+    with the actual text in the file to be patched.</para>
 
   </sect1>
 


--_----------=_1591078210272680--