git: 6673a218d3c1 - main - math/vtk9: Remove bundled pythob module mpi4py because it conflicts with standalone py-mpi4py

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Mon, 17 Oct 2022 09:20:23 UTC

The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=6673a218d3c1eca218d04a346fc1dcb8a532619a

commit 6673a218d3c1eca218d04a346fc1dcb8a532619a
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-10-17 09:18:39 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
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} && \