From nobody Tue Apr 26 11:48:57 2022 X-Original-To: dev-commits-doc-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id B81E81998055 for ; Tue, 26 Apr 2022 11:48:57 +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 4KngBx4XFKz4dwx; Tue, 26 Apr 2022 11:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650973737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=du6+Q4c8Guoe+xZFkQq4Aj8x3V4+OJHJ7zpHrh5Ru0Q=; b=Fw341hfhziRmMlC/JSoF711B3kJCJEKbuNxYAThyQ9M9MbSNRx/lmuJTUB6KEpj0fKxvsi ZexrGHH0ZXx0l9mJ33YUO637pbLYNfMYIai8vVBu+9D9jEPUseKMhXLXm3LgRmWcqVzyKf PVQaXHNy60fwqUGKUo6DVEuA0HYQwFueViAcnWx9yZVE5gKh3BzTMQ6K4SzTAgYekQ/Krw lEqLEBssmn/7YuS7cxc7sRyqicyPNjh4jbOTOkoSJlWNndrfE1uXsqYecHGwus1inbcf86 6c8VOEns9iyTNoMNgWbVzXeElc2vvkRbQ88Du+TXCqbNy79k83SL354x7o3lHQ== 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 780716890; Tue, 26 Apr 2022 11:48:57 +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 23QBmv8a065209; Tue, 26 Apr 2022 11:48:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23QBmvBk065208; Tue, 26 Apr 2022 11:48:57 GMT (envelope-from git) Date: Tue, 26 Apr 2022 11:48:57 GMT Message-Id: <202204261148.23QBmvBk065208@gitrepo.freebsd.org> To: doc-committers@FreeBSD.org, dev-commits-doc-all@FreeBSD.org From: =?utf-8?Q?Stefan E=C3=9Fer?= Subject: git: 456d89f520 - main - porters-handbook: improve wording of CONFLICTS semantics List-Id: Commit messages for all branches of the doc repository List-Archive: https://lists.freebsd.org/archives/dev-commits-doc-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-doc-all@freebsd.org X-BeenThere: dev-commits-doc-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: doc X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 456d89f5203f8e6319fbf2c3e0440e1bf60dbaa3 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650973737; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=du6+Q4c8Guoe+xZFkQq4Aj8x3V4+OJHJ7zpHrh5Ru0Q=; b=qzjAHgH//K1gwcoUYK38mac8wzUnHnTOKM/kSBO2hxDEN1PnYhHwpA0zQdr/PWq3b5BTNj Cx5314yElCuYq7Y5ZQN2fUKOx2xREJW8ERrAbwda5qzfzjSz9RsdzdjXb1MknokyeeCnY8 qbFdtsknfMUbrob1nSmJsrie0DBLf28UBZCd392cLcbHo72ik8Hwf5gXnufqdGqdxk5cqi yHfRILJSgpOpMQ50X27/yRThxU1KWGuZGbMAVuLRfyOjdkI4k0WCHcLfXGNBI4MzJjzU1q w9M593tBLC9AVDByKxXLKe/ip639v9b0rqlzMglbVNjPlKZyvO/DIwN9JwRX3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650973737; a=rsa-sha256; cv=none; b=ToREDraJdEQMxZe4FraJYj6hjGYCeTCjUDpGpRxg9DmkgRM9Xoy/HZHhC4CAvi8wCsXLhm 05aoBP54o99g1rPuLYu2nz8e+N+Vq5OJdZ95K+F11t0KGBfzkKUVVc/GuYAJ2SH7+IfeDt S2QEvDaQqDL9P3I9vKe4rHRO4Bb+qpRrgaEtJv2j/vQJfb+5qM2dyid4KmSk2GJhO3N5kJ QbYqMLL8f4cKaBp5IdjPQdEgPNMUpSnh/vrl4TduA3TnGJJCHxNnLb/1krrJXWuj/62AYW PEs3fIb2fLn9htvm0qfADMzJY+hnP8Uff4jJdjudkUbdSNmOu57VrZqd8IJtbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se (ports, src committer): URL: https://cgit.FreeBSD.org/doc/commit/?id=456d89f5203f8e6319fbf2c3e0440e1bf60dbaa3 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: [source,shell] .... @@ -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`.