From owner-dev-commits-doc-all@freebsd.org Fri Feb 19 15:46:37 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 D98D5531801 for ; Fri, 19 Feb 2021 15:46:37 +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 4Dhwt55tZDz4f9S; Fri, 19 Feb 2021 15:46:37 +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 BCF6D698A; Fri, 19 Feb 2021 15:46:37 +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 11JFkbKM064073; Fri, 19 Feb 2021 15:46:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 11JFkbcu064072; Fri, 19 Feb 2021 15:46:37 GMT (envelope-from git) Date: Fri, 19 Feb 2021 15:46:37 GMT Message-Id: <202102191546.11JFkbcu064072@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: Joseph Mingrone Subject: git: 47dc6685eb - main - Porter's Handbook: Tweak conflict instructions 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: 47dc6685eb773349a7c9b6b1f86df7aadfff9e30 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:37 -0000 The branch main has been updated by jrm (ports committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=47dc6685eb773349a7c9b6b1f86df7aadfff9e30 commit 47dc6685eb773349a7c9b6b1f86df7aadfff9e30 Author: Joseph Mingrone AuthorDate: 2021-02-19 15:23:22 +0000 Commit: Joseph Mingrone CommitDate: 2021-02-19 15:45:54 +0000 Porter's Handbook: Tweak conflict instructions Reviewed by: crees Approved by: doc (ygy) Differential Revision: https://reviews.freebsd.org/D28582 --- documentation/content/en/books/porters-handbook/makefiles/chapter.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/content/en/books/porters-handbook/makefiles/chapter.adoc b/documentation/content/en/books/porters-handbook/makefiles/chapter.adoc index ff5cb2464d..b9ff670d2f 100644 --- a/documentation/content/en/books/porters-handbook/makefiles/chapter.adoc +++ b/documentation/content/en/books/porters-handbook/makefiles/chapter.adoc @@ -4608,7 +4608,7 @@ CONFLICTS_INSTALL= bind99 ==== -Sometime, only some version of another port is incompatible, in this case, use the full package name, with the version, and use shell globs, like `*` and `?` to make sure all possible versions are matched. +Sometimes, only certain versions of another port are incompatible. When this is the case, use the full package name including the version. If necessary, use shell globs like `*` and `?` so that all necessary versions are matched. [[conflicts-ex2]] .Using `CONFLICTS*` With Globs.