From nobody Tue Jun 28 16:48:30 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 676FE866E64; Tue, 28 Jun 2022 16:48:30 +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 4LXVsV2SX3z4p1x; Tue, 28 Jun 2022 16:48:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656434910; 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=VZ8V1nviES1BznaCwKLj0N3A4iOIlA6RImr+WWTr2Yg=; b=JCDX8Pm3POoOTf3rQNje5ImhxfOS6M2Aa0jpf/HS7DEvJtBxMvR6jGvZ4lwmYQXAB+dZnL 0b+z2OdmoPmd1UwffAvg9eLy+NVAQ2otblcZdzNc39Ll+ISCMoOiN2Rg39WjGgy6JM0T9z /pdjrEZW4wVA0YgKWVfDLCwPmU5BHbsJPH4xBNh6rup1D7sdhYwdQrXOTfJEidh7mPHmt+ dW2fmB3L+bkylu7dxxwrJbZwUNjihViCLRM7BTOCPgcdKHTWDHLTlOJKN1UwqEvgC/ebbO F+8oC7KSxC89FEBrDHwavLs+0qRiNrFuT/D78CW2FnxYaqjKJ6kpK2a+3rf4WQ== 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 3446620C10; Tue, 28 Jun 2022 16:48:30 +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 25SGmUvo046481; Tue, 28 Jun 2022 16:48:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25SGmUh7046480; Tue, 28 Jun 2022 16:48:30 GMT (envelope-from git) Date: Tue, 28 Jun 2022 16:48:30 GMT Message-Id: <202206281648.25SGmUh7046480@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: 1f7e038474d4 - main - math/vtk9: Fix MPI option 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: 1f7e038474d43e3d2e4ce6fbc1d27e435c70db76 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656434910; 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=VZ8V1nviES1BznaCwKLj0N3A4iOIlA6RImr+WWTr2Yg=; b=SQBBVP+zFUAw5kxim9tsCiLdUJMJyhub81m/hEK8xWrd7lFti6NyjO6/7hNJoh0XacNB3v fDZxaXAGDNExBvdqHi7/mMoUF+UCJ0EacQ3fVjnL2pCI/pLittudf/5yCZWiOslv5HtSYg KrAm0cXcYWg3rdoDpNQ1b6HGxPNhwZGIkOcfqsijta2WuYap/jOZz9NY+F/GRA20Tt0tdF 0zm16KRJzS+ZSbi7X8bZfCoMMf0Q6qBKJwEq1C8F+dMbXHTHYikaDOv8Y+7Oji0YQINFXT VLJGVl7qIsndeBlq6KkU1WLDV4IYwRpBx1a5MDuvo/MlBFA5z0FpRXtPFbTItg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656434910; a=rsa-sha256; cv=none; b=L7p36h6nGgNUVkqim7IWLq2dJrJ68I3Xdh4E01gcfRatXVYlDf9kZLJiis6kSSY43NMSyY dJcFhogRWsjp+pE0ZCl0X4kuyBt1FDHiYKaLaK6j85VNGuxDKSU2ZkU2dmDqYPzYVEnCyo kCq0fLTyzgLluYujKfcKCnAVOceBw78oLmICshpGGyncV3VVcb9TYF5dHTt+w241DcbQ8x 6McT4dkSqzNFhH8eHVbyCdmUIS7NzGfDqnpe49JnyhaY8JJPN5Mp1x4yjFhwrZQNGLr/Ie S4U7z4w1ycLNWzWsDZvcyqqEGRvo675g4a3yXNkGPXg99fjhIqEujoc7QxaSBQ== 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=1f7e038474d43e3d2e4ce6fbc1d27e435c70db76 commit 1f7e038474d43e3d2e4ce6fbc1d27e435c70db76 Author: Yuri Victorovich AuthorDate: 2022-06-28 14:58:47 +0000 Commit: Yuri Victorovich CommitDate: 2022-06-28 16:48:27 +0000 math/vtk9: Fix MPI option It wasn't linking to MPI libraries due to change in cmake flag name. --- math/vtk9/Makefile | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/math/vtk9/Makefile b/math/vtk9/Makefile index 32075f4a1377..06fac3fcbf9a 100644 --- a/math/vtk9/Makefile +++ b/math/vtk9/Makefile @@ -1,6 +1,6 @@ PORTNAME= vtk DISTVERSION= 9.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math graphics MASTER_SITES= https://vtk.org/files/release/${VTK_SHORT_VER}/ PKGNAMESUFFIX= 9 @@ -41,24 +41,18 @@ DOCSDIR= ${PREFIX}/share/doc/vtk-${VTK_SHORT_VER} DATADIR= ${PREFIX}/share/vtk-${VTK_SHORT_VER} # Options -OPTIONS_DEFINE= DESIGNER DOCS OSMESA PYTHON QT5 EXAMPLES +OPTIONS_DEFINE= DESIGNER DOCS MPI OSMESA PYTHON QT5 EXAMPLES OPTIONS_DEFAULT= MPI PYTHON QT5 # vtk python binding is needed by other packages, and is unfortunately is unseparable. It is a candidate to be a subpackage. OSMESA_DESC= Use Mesa for off-screen rendering DESIGNER_DESC= Build the Qt Designer plugin OPTIONS_SUB= yes # Options groups -#VTK_GROUPS= Imaging MPI Qt Rendering StandAlone Views -VTK_GROUPS= MPI VTK_WRAPS= JAVA TCLTK -OPTIONS_GROUP= GROUPS WRAPPING -OPTIONS_GROUP_GROUPS=${VTK_GROUPS} +OPTIONS_GROUP= WRAPPING OPTIONS_GROUP_WRAPPING=${VTK_WRAPS} GROUPS_DESC= Groups WRAPPING_DESC= Wrapping -.for g in ${VTK_GROUPS} -$g_DESC= Build the $g group -.endfor .for w in ${VTK_WRAPS} $w_DESC= $w wrapping .endfor @@ -78,7 +72,8 @@ DESIGNER_CMAKE_BOOL= QT_DESIGNER_PLUGIN DESIGNER_USE= QT=designer DESIGNER_IMPLIES= QT5 -MPI_LIB_DEPENDS= libmpi.so:net/openmpi +MPI_CMAKE_BOOL= VTK_USE_MPI +MPI_LIB_DEPENDS= libmpi.so:net/mpich MPI_CMAKE_ON= -DMPIEXEC=${LOCALBASE}/mpi/openmpi/bin/mpiexec OSMESA_CMAKE_ON= -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \ @@ -109,14 +104,6 @@ EXAMPLES_CMAKE_BOOL= BUILD_EXAMPLES .include -.for g in ${VTK_GROUPS} -. if ${PORT_OPTIONS:M${g}} -CMAKE_ARGS+= -DVTK_Group_${g}:BOOL=ON -. else -CMAKE_ARGS+= -DVTK_Group_${g}:BOOL=OFF -. endif -.endfor - .if !${PORT_OPTIONS:MOSMESA} USES+= gl USE_GL= gl glu