From nobody Mon Oct 17 09:20:23 2022 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 4MrWgC6M1dz4fMXr; Mon, 17 Oct 2022 09:20:23 +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 4MrWgC5rJGz3S0S; Mon, 17 Oct 2022 09:20:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665998423; 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=9gZ48WY6aCqV5wzfNNTegIQye46J09Pg4mmXpCr1w/E=; b=vzucuFZjX1N35wQK9vPccjKFkV7AeHzSLRpJ4tcJoMLu9UdoX5oBJ6+ei4Naht+m4w9pPS e522ftXTp66VQUvZZhu9cjDjZ2xq++f4UBhl4pbgvOkmpcCIlTr41yRubTt1wsLZ729jqC w/xAlT/UdDDF/iin6MiL995DbGBmDJ0HneVKW6aL0d88ZxrahWKnTBhcllcTpmHW/Wq8GR CKkwmdKH0BxO1WOaSnZeorV6pMos8kds68eNdZZSmA6J4EetOV+9EbFsXDSdwDcFZfzuxD hhp11o1rP7HXEDJ/iXIOO71ESmL95k9NoVGErkUiSPsSrS/6D9XObnQMauYHMQ== 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 4MrWgC4nhFzlxn; Mon, 17 Oct 2022 09:20:23 +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 29H9KNV4041285; Mon, 17 Oct 2022 09:20:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29H9KNOW041284; Mon, 17 Oct 2022 09:20:23 GMT (envelope-from git) Date: Mon, 17 Oct 2022 09:20:23 GMT Message-Id: <202210170920.29H9KNOW041284@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 6673a218d3c1 - main - math/vtk9: Remove bundled pythob module mpi4py because it conflicts with standalone py-mpi4py 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6673a218d3c1eca218d04a346fc1dcb8a532619a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665998423; 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=9gZ48WY6aCqV5wzfNNTegIQye46J09Pg4mmXpCr1w/E=; b=hvAMq7UMtJ7k3o5dxyAzyMJbG1h02x0Jl4qURRs36XFs9saGa4q6nUdrfw0v4pAc6cSEXZ JMe88QYvkyVtflIAgZ1CFbzHwNVIAcxVhATj+COk63ekDCKywvusxeO/Ox2fVZ9a2vaCy7 P4gamOEMNm+P+1HhMGuYyh+1ES/Ol9hnNThuwFVaV2JtbMcehoRyB4gr+dvdbTFwMYUCbW LbeqIREXyOZ3F0eT68mSG/fMfRs1oxSNQcn7x17MJMDFwrhuRVhjNmzXj+wVs2xnO21mJJ ntLazHYQt8i7jQyhhw2McCJz4SD7HngWCBEROhUZikZSDeCZR+gO7fRmFruW0Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665998423; a=rsa-sha256; cv=none; b=jKx4yDJi3RhdZg4uABAihyN72jtwrfU8cmw1nxc1l0FMMOcHHAGFcyXlJ4M2Du33yXGPhU P/87/9v5+EABLqRdz1MuZGSDLxMB6pwF7wFntgq2MT3NX+AZqhmKgDtzJPza+Nn+vVMmpP T0GgAAB2/7VQLNLUTCVJLdQS69+tEeghnn2CcwIHJuJtBiCRD4YNUfkqWDhVsJw9aHC9vj gfVrxquLHZHqlB9S1E6RTXEqLindDHncBVpRCZbM5wfd+40xnuKKxPdk6VsM5s3CJaBIp2 4Dj1DlnTy/tSWHuFVAf7BO6ibE6Y97CZRmnXNUxjiy0MnyR7IH7xnUSx26jCRA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=6673a218d3c1eca218d04a346fc1dcb8a532619a commit 6673a218d3c1eca218d04a346fc1dcb8a532619a Author: Yuri Victorovich AuthorDate: 2022-10-17 09:18:39 +0000 Commit: Yuri Victorovich CommitDate: 2022-10-17 09:20:21 +0000 math/vtk9: Remove bundled pythob module mpi4py because it conflicts with standalone py-mpi4py Requested by: thierry@ --- math/vtk9/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/math/vtk9/Makefile b/math/vtk9/Makefile index 84fe19360a8b..466958c68ffd 100644 --- a/math/vtk9/Makefile +++ b/math/vtk9/Makefile @@ -1,6 +1,6 @@ PORTNAME= vtk DISTVERSION= 9.1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= math graphics MASTER_SITES= https://vtk.org/files/release/${VTK_SHORT_VER}/ PKGNAMESUFFIX= 9 @@ -112,9 +112,12 @@ USE_GL= gl glu CONFLICTS= vtk6 vtk8 -do-install-PYTHON-on: # cmake doesn't install pip's .egg-info: https://gitlab.kitware.com/vtk/vtk/-/issues/18087 +do-install-PYTHON-on: + # cmake doesn't install pip's .egg-info: https://gitlab.kitware.com/vtk/vtk/-/issues/18087 @${MKDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}/vtk-${DISTVERSION}-py${PYTHON_VER}.egg-info @${INSTALL_DATA} ${WRKDIR}/PKG-INFO ${STAGEDIR}${PYTHON_SITELIBDIR}/vtk-${DISTVERSION}-py${PYTHON_VER}.egg-info + # workaround for: VTK installs mpi4py which makes it to conflict with the standalone mpi4py package, see https://gitlab.kitware.com/vtk/vtk/-/issues/18691 + @${RM} -r ${STAGEDIR}${PYTHON_SITELIBDIR}/mpi4py post-install: # autoplist: thousands of files, complex dependencies on options @cd ${STAGEDIR}${PREFIX} && \