From nobody Thu Oct 20 05:18:00 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 4MtG885FZtz4fXVl; Thu, 20 Oct 2022 05:18:00 +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 4MtG884fbwz3vQq; Thu, 20 Oct 2022 05:18:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666243080; 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=xf5ojgzMDgNdtPxsujAfvZ1SXjtRnseunxlnF/guctA=; b=JV2eDuVckbiJtH8SrNn9bGp5usl5Uk84pCywGSowSlaM/VLebpsKzZQsXkGr2v96xJl67N odGJDZhvlc7pAYZcezrGO5iGb0MOFqM42YmcpQOFxSHu26pjby4rhK71KfHzRoPQEWCF30 k2aWS3gpd1tViGKjZYiZ4kM0hvosDCI0b8Jed9AbuegVPhCT8269VXKlxbFs7QG3bcEvrG Xcoawuc4BFJ7nW1gfc672+VYeLGQ9BWWbWnxXMcvfTFsQa9PmDC4qebba5/vhH4VWo8WDK eZn+X+i9hs8GDTf6gf9TiotJ3oARzDCrjFVsLMUw7O+XpBU1OXLDm92CckZsyg== 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 4MtG883jMSzmTl; Thu, 20 Oct 2022 05:18:00 +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 29K5I0Lv056817; Thu, 20 Oct 2022 05:18:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29K5I0ML056816; Thu, 20 Oct 2022 05:18:00 GMT (envelope-from git) Date: Thu, 20 Oct 2022 05:18:00 GMT Message-Id: <202210200518.29K5I0ML056816@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: 24eb2fbf5e80 - main - math/vtk9: Limit net/py-mpi4py dependency when both PYTHON and MPI options are on 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 24eb2fbf5e80b7ba9ea3be8cabfcf7dd54b08935 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666243080; 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=xf5ojgzMDgNdtPxsujAfvZ1SXjtRnseunxlnF/guctA=; b=C3JPewlUIofC359HAHf6KaGCjuL5LALlHKX2uF8QjtI3jKyGpCfqs7tinh1dAnZ0Ne+uXB KxGu5OIIrGEHIM8xW1bG4P3IPm+pIjG6H57RLrZjN5Ifr73hI9xHBQHC9sVa1nOsohCneb ojf4x7+EpwZOS9WvJ7QDxZikbWygImGmeoguZiLHQvUif2N4OiwqJ8len/4EM3vJmfqdMF 26S8vRkNijQJ3gRdFkcmns+sJLpnMHSVkxAK4gAc2kCYftHMsLzEoD6iJF9ekjo63x3hr6 GHfVe9jTiIEU4PG/SI5BeNvJLYs+o74Ks5nwmIIiXolaUaPBTjkXN1GRBL6VuQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666243080; a=rsa-sha256; cv=none; b=Fo+q26wRPUTP7Su97cXqrRFjqsP15J/fMWl8Mg0Ln602SOOBRaweOmrLDy1dodaclcVhPP ljvepRZwLzoKKwVwLc8+k3EQdo03FeWnRTMIsP6p27d4yvRQn4s8h800uQFaN+6JeYB7mD LT79W7T0sJezzVOqLDXUdjbHOF5J/yidbShqiJ6+j5ndrWXcyHCHH5toB0tHEakjfOLvW+ s1qB7ubYzg5Zaqy8pZk0wkWpReJHIyKkH1OZBcbpA5dhlVkeVhhc2klxwW/N/QxThRFRTW z/9aPvNqJk+xDFQKj4Fk/083ux+DilXZTHwYakR+CeUamhv8JzRe7lTCh6SQMg== 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=24eb2fbf5e80b7ba9ea3be8cabfcf7dd54b08935 commit 24eb2fbf5e80b7ba9ea3be8cabfcf7dd54b08935 Author: Yuri Victorovich AuthorDate: 2022-10-20 05:15:59 +0000 Commit: Yuri Victorovich CommitDate: 2022-10-20 05:17:58 +0000 math/vtk9: Limit net/py-mpi4py dependency when both PYTHON and MPI options are on PR: 267191 Reported by: VVD --- math/vtk9/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/math/vtk9/Makefile b/math/vtk9/Makefile index 116521129e1b..2ec7af56d10f 100644 --- a/math/vtk9/Makefile +++ b/math/vtk9/Makefile @@ -1,6 +1,6 @@ PORTNAME= vtk DISTVERSION= 9.1.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= math graphics MASTER_SITES= https://vtk.org/files/release/${VTK_SHORT_VER}/ PKGNAMESUFFIX= 9 @@ -19,8 +19,6 @@ LIB_DEPENDS= \ libnetcdf.so:science/netcdf \ libpng.so:graphics/png \ libtiff.so:graphics/tiff -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR} USES= alias cmake compiler:c++11-lang gl jpeg localbase xorg USE_LDCONFIG= ${PREFIX}/lib/vtk-${VTK_SHORT_VER} @@ -112,6 +110,11 @@ USES+= gl USE_GL= gl glu .endif +.if ${PORT_OPTIONS:MPYTHON} && ${PORT_OPTIONS:MMPI} +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mpi4py>0:net/py-mpi4py@${PY_FLAVOR} +.endif + CONFLICTS= vtk6 vtk8 do-install-PYTHON-on: