From owner-dev-commits-doc-all@freebsd.org Fri Feb 19 15:46:39 2021 Return-Path: Delivered-To: dev-commits-doc-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 10A72531880 for ; Fri, 19 Feb 2021 15:46:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Dhwt66q5mz4dtw; Fri, 19 Feb 2021 15:46:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DCDF066B7; Fri, 19 Feb 2021 15:46:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 11JFkcai064095; Fri, 19 Feb 2021 15:46:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 11JFkcaX064094; Fri, 19 Feb 2021 15:46:38 GMT (envelope-from git) Date: Fri, 19 Feb 2021 15:46:38 GMT Message-Id: <202102191546.11JFkcaX064094@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Joseph Mingrone Subject: git: b7744f2b75 - main - Porter's Handbook: Document DISABLE_CONFLICTS variable MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b7744f2b7581c4bce39e3f24b1b72a53bbf288c6 Auto-Submitted: auto-generated X-BeenThere: dev-commits-doc-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the doc repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Feb 2021 15:46:39 -0000 The branch main has been updated by jrm (ports committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=b7744f2b7581c4bce39e3f24b1b72a53bbf288c6 commit b7744f2b7581c4bce39e3f24b1b72a53bbf288c6 Author: Joseph Mingrone AuthorDate: 2021-02-19 15:23:59 +0000 Commit: Joseph Mingrone 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