git: 456d89f520 - main - porters-handbook: improve wording of CONFLICTS semantics

From: Stefan Eßer <>
Date: Tue, 26 Apr 2022 11:48:57 UTC
The branch main has been updated by se (ports, src committer):


commit 456d89f5203f8e6319fbf2c3e0440e1bf60dbaa3
Author:     Pau Amma <>
AuthorDate: 2022-04-26 11:47:29 +0000
Commit:     Stefan Eßer <>
CommitDate: 2022-04-26 11:47:29 +0000

    porters-handbook: improve wording of CONFLICTS semantics
 .../content/en/books/porters-handbook/makefiles/_index.adoc        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/documentation/content/en/books/porters-handbook/makefiles/_index.adoc b/documentation/content/en/books/porters-handbook/makefiles/_index.adoc
index 2b4759731a..10a76f01da 100644
--- a/documentation/content/en/books/porters-handbook/makefiles/_index.adoc
+++ b/documentation/content/en/books/porters-handbook/makefiles/_index.adoc
@@ -4999,9 +4999,8 @@ Build conflicts are not recorded in the resulting package.
 If the port cannot be built if a certain port is already installed and the resulting package cannot coexist with the other package.
 `CONFLICTS` check is done prior to the build stage and prior to the install stage.
-The values assigned to the `CONFLICTS*` variables are matched against the package base names and the full package names of all installed packages using file globbing rules.
-If the base name of the currently built package is matched by a `CONFLICTS*` pattern, this match is ignored.
-This allows to list all flavors of a port in a conflicts list, without being considered if the installed port matching this pattern is upgraded.
+Each space-separated item in the `CONFLICTS*` variable values is matched against packages except the one being built, using shell globbing rules.
+This allows listing all flavors of a port in a conflict list instead of having to take pains to exclude the flavor being built from that list.
 For example, if git-lite is installed, `CONFLICTS_INSTALL=git git-lite` would allow to perform:
@@ -5014,6 +5013,8 @@ But the following command would report a conflict, since the package base name i
 % make -C devel/git FLAVOR=default all deinstall install
+Without that feature, the Makefile would need one `_flavor__CONFLICTS_INSTALL` for each flavor, listing every other flavor.
 The most common content of one of these variable is the package base of another port.
 The package base is the package name without the appended version, it can be obtained by running `make -V PKGBASE`.