From nobody Sun May 15 08:06:08 2022 X-Original-To: dev-commits-ports-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 CCC871ADF160; Sun, 15 May 2022 08:06:08 +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 4L1FM44Knqz3Jd0; Sun, 15 May 2022 08:06:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652601968; 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=3d8UBMvFe1O+1kN8dnFd/+/yBEkL5vUoxXXZuGdxyk8=; b=Ur8FeXwFjrIZrQ4sRi0vcNE+nw7wEjMhFnPKFGnqtsJQ8mp7nbt5PLNy1g99qRMPDINbRH /BCP5MaSApr75WfksUfIzXKe6k2yWakVGELP06r/uAwIGPrsxES9oR0/itfYCtZX4C8pdO +bGyj3uGakZwvM6/i0dqpZ+KZobYTxmAMuGU9Rof1x6VFP88HEUr5rJ6VaKzrVtgY7+X5E frOeuLng1Z5iYTUnyNOAng9VSag6JdlAzy9QfWiW8MQXyBqbxOZf0wIusg3MRVqFqIttoo vfp685Rbd+Fb6IXEmOaBqcq0dAXOqHWR/FEuitfCa0XcEQ+36UUmkdy9t59Fjw== 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 74CF627E06; Sun, 15 May 2022 08:06:08 +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 24F868iO060603; Sun, 15 May 2022 08:06:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24F868ca060602; Sun, 15 May 2022 08:06:08 GMT (envelope-from git) Date: Sun, 15 May 2022 08:06:08 GMT Message-Id: <202205150806.24F868ca060602@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Wen Heping Subject: git: 4f4a9060289c - main - www/joomla*: Update CONFLICTS, only contain the PKGBASE of the conflicting package [1] List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f4a9060289c7b226e5803850341e2053bc09a80 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652601968; 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=3d8UBMvFe1O+1kN8dnFd/+/yBEkL5vUoxXXZuGdxyk8=; b=MZGiHM+Jfj6PS3ljfr5MwjGQa8JeiBFRPhz+zdEz3H0nLVrehuJ6AbJKgfY1zQGK7H4AGP tTzzjJWuggxb049I+rUZjA0806UV/QSCOC331LP8kdyhdqpW+hX0XuHtwSqliJpV8w8Wpj byD706l3m9GY/U3CnNFXHYJfFG/xvge65sz0KSvdND/PD4V+E0GEDLJDnOoidgr24TBdGq 4alT5xjUKk8lr5xs/fhwqi1LeE5ShHWAqt5MRTu1mGEcNyg62jB52ov0Bt1UsYQW1XQhhX ISSfWFdJgenERTzhjiEsnLjGj085oR9LApvwWDj8ZJrooNRGYdbX+iUq1zzdQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652601968; a=rsa-sha256; cv=none; b=cReGOrgIGyfUm5udBQfmFhuuHy+W1eT9PcPku9fUWOSZ2ljGQsarnCo8Ao6L4ZvUx2w/QS rVXPBnw5PHTfk3m/dSZ4xycmeJfNqXBHTGCEYJvrK8+LwZmJVl7qI1bGVCJhJ0jT+k5bzc ntLubGzcp8fMI8dK0Ry/3zzhhMSeQ5EfLTngaDeuIJHI0D74iCVKLSUIgTT02o/YTpOShX p+XOGn2wr3qP/+N2nyqhdG/VMkUAJk/795hP1dFdyGW17P1Wq7zfSJIenZdhtoUJtN94Ha aMhm6Eed5dBwuhrGTKMW1dDH72LhV1FevPU+EEQErrQD/liRSg5vEOtyMyhx6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wen: URL: https://cgit.FreeBSD.org/ports/commit/?id=4f4a9060289c7b226e5803850341e2053bc09a80 commit 4f4a9060289c7b226e5803850341e2053bc09a80 Author: Wen Heping AuthorDate: 2022-05-15 04:27:13 +0000 Commit: Wen Heping CommitDate: 2022-05-15 04:27:13 +0000 www/joomla*: Update CONFLICTS, only contain the PKGBASE of the conflicting package [1] Change CONFLICTS to CONFLICTS_INSTALL Spotted by: se@ [1] --- www/joomla3/Makefile | 2 +- www/joomla4/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/www/joomla3/Makefile b/www/joomla3/Makefile index 26f455d7e0b7..49a6860e022b 100644 --- a/www/joomla3/Makefile +++ b/www/joomla3/Makefile @@ -16,7 +16,7 @@ USES= cpe php:web tar:bz2 shebangfix CPE_VENDOR= ${PORTNAME} CPE_PRODUCT= ${PORTNAME}\! -CONFLICTS= joomla-4.1.[0-9]* +CONFLICTS_INSTALL= joomla NO_ARCH= yes NO_BUILD= yes diff --git a/www/joomla4/Makefile b/www/joomla4/Makefile index ce8475c3a329..eea3176c09a7 100644 --- a/www/joomla4/Makefile +++ b/www/joomla4/Makefile @@ -13,7 +13,7 @@ USES= cpe php:web shebangfix zip CPE_VENDOR= ${PORTNAME} CPE_PRODUCT= ${PORTNAME}\! -CONFLICTS= joomla-3.10.[0-9]* +CONFLICTS_INSTALL= joomla3 NO_ARCH= yes NO_BUILD= yes