git: b7744f2b75 - main - Porter's Handbook: Document DISABLE_CONFLICTS variable

[Joseph Mingrone]

The branch main has been updated by jrm (ports committer):

URL: https://cgit.FreeBSD.org/doc/commit/?id=b7744f2b7581c4bce39e3f24b1b72a53bbf288c6

commit b7744f2b7581c4bce39e3f24b1b72a53bbf288c6
Author:     Joseph Mingrone <jrm at FreeBSD.org>
AuthorDate: 2021-02-19 15:23:59 +0000
Commit:     Joseph Mingrone <jrm at FreeBSD.org>
CommitDate: 2021-02-19 15:46:09 +0000

    Porter's Handbook: Document DISABLE_CONFLICTS variable
    
    Requested by:   linimon
    Reviewed by:    crees
    Approved by:    doc (ygy)
    Differential Revision:  https://reviews.freebsd.org/D28582
---
 .../content/en/books/porters-handbook/makefiles/chapter.adoc       | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/documentation/content/en/books/porters-handbook/makefiles/chapter.adoc b/documentation/content/en/books/porters-handbook/makefiles/chapter.adoc
index b9ff670d2f..9daeb08d3f 100644
--- a/documentation/content/en/books/porters-handbook/makefiles/chapter.adoc
+++ b/documentation/content/en/books/porters-handbook/makefiles/chapter.adoc
@@ -4631,6 +4631,13 @@ The first entry match versions `2.0` through `2.3`, the second all the revisions
 package:deskutils/gnotime[] does not have any conflicts line because its current version does not conflict with anything else.
 ====
 
+The variable `DISABLE_CONFLICTS` may be temporarily set when making targets that are not affected by conflicts.  The variable is not to be set in port Makefiles.
+
+[source,bash]
+....
+% make -DDISABLE_CONFLICTS patch
+....
+
 [[install]]
 == Installing Files