From nobody Wed Oct 27 14:53:03 2021 X-Original-To: dev-commits-ports-main@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 911CE182FFA8; Wed, 27 Oct 2021 14:53:03 +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 4HfWrv3YCfz4qB3; Wed, 27 Oct 2021 14:53:03 +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 59E7A12707; Wed, 27 Oct 2021 14:53:03 +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 19REr3vv043261; Wed, 27 Oct 2021 14:53:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19REr3kK043260; Wed, 27 Oct 2021 14:53:03 GMT (envelope-from git) Date: Wed, 27 Oct 2021 14:53:03 GMT Message-Id: <202110271453.19REr3kK043260@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Stefan E=C3=9Fer?= Subject: git: 2e2926e38497 - main - sysutils/iocage: Update CONFLICTS specification List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2e2926e3849731a82ae9a628351c37d36f3d343f Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=2e2926e3849731a82ae9a628351c37d36f3d343f commit 2e2926e3849731a82ae9a628351c37d36f3d343f Author: Stefan Eßer AuthorDate: 2021-10-27 14:48:44 +0000 Commit: Stefan Eßer CommitDate: 2021-10-27 14:52:57 +0000 sysutils/iocage: Update CONFLICTS specification This port used to restrict its CONFLICTS entry to py-iocage built for Python-2.7, but it does obviously conflict with that ports built for any Python version. This port is marked as NO_ARCH=yes and I do assumed that there is only an install conflict, but have not tested that assumption and therefore not changed the CONFLICTS to CONFLICTS_INSTALL. Approved by: grembo (maintainer) --- sysutils/iocage/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysutils/iocage/Makefile b/sysutils/iocage/Makefile index e1dba6cb42d6..0a3d672e5601 100644 --- a/sysutils/iocage/Makefile +++ b/sysutils/iocage/Makefile @@ -37,7 +37,7 @@ USES= python:3.6+ USE_GITHUB= yes USE_PYTHON= autoplist distutils -CONFLICTS= py27-iocage-[0-9]* +CONFLICTS= py*-iocage-[0-9]* NO_ARCH= yes PLIST_FILES= ${PYTHONPREFIX_SITELIBDIR}/${PORTNAME}_lib-${PORTVERSION}-py${PYTHON_VER}.egg-info/PKG-INFO \