Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 22 Jan 2021 20:43:03 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r562338 - in head: . graphics graphics/py-mayavi
Message-ID:  <202101222043.10MKh3gh024655@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yuri
Date: Fri Jan 22 20:43:02 2021
New Revision: 562338
URL: https://svnweb.freebsd.org/changeset/ports/562338

Log:
  Re-add port: graphics/py-mayavi: Application and library for 3D visualization and plotting in Python

Added:
  head/graphics/py-mayavi/
     - copied from r548979, head/graphics/py-mayavi/
Modified:
  head/MOVED
  head/graphics/Makefile
  head/graphics/py-mayavi/Makefile
  head/graphics/py-mayavi/distinfo
  head/graphics/py-mayavi/pkg-descr

Modified: head/MOVED
==============================================================================
--- head/MOVED	Fri Jan 22 20:40:09 2021	(r562337)
+++ head/MOVED	Fri Jan 22 20:43:02 2021	(r562338)
@@ -15501,7 +15501,6 @@ graphics/cloudcompare||2020-09-19|Has expired: Uses de
 graphics/kudu||2020-09-19|Has expired: Uses deprecated version of python
 graphics/pecomato||2020-09-19|Has expired: Uses deprecated version of python
 graphics/py-editobj||2020-09-19|Has expired: Uses deprecated version of python
-graphics/py-mayavi||2020-09-19|Has expired: Uses deprecated version of python
 graphics/pymorph||2020-09-19|Has expired: Uses deprecated version of python
 graphics/tilecache||2020-09-19|Has expired: Uses deprecated version of python
 japanese/mailman||2020-09-19|Has expired: Uses deprecated version of python

Modified: head/graphics/Makefile
==============================================================================
--- head/graphics/Makefile	Fri Jan 22 20:40:09 2021	(r562337)
+++ head/graphics/Makefile	Fri Jan 22 20:43:02 2021	(r562338)
@@ -846,6 +846,7 @@
     SUBDIR += py-img2pdf
     SUBDIR += py-leather
     SUBDIR += py-mapclassify
+    SUBDIR += py-mayavi
     SUBDIR += py-mcomix
     SUBDIR += py-mgwr
     SUBDIR += py-ming

Modified: head/graphics/py-mayavi/Makefile
==============================================================================
--- head/graphics/py-mayavi/Makefile	Sat Sep 19 12:48:45 2020	(r548979)
+++ head/graphics/py-mayavi/Makefile	Fri Jan 22 20:43:02 2021	(r562338)
@@ -2,56 +2,52 @@
 # $FreeBSD$
 
 PORTNAME=	mayavi
-PORTVERSION=	4.5.0
-PORTREVISION=	8
+DISTVERSION=	4.7.2
 CATEGORIES=	graphics science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	Vladimir.Chukharev@gmail.com
+MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Application and library for 3D visualization and plotting in Python
 
-LICENSE=	BSD3CLAUSE LGPL21 LGPL20 EPL LGPL3 BSD2CLAUSE APACHE11
-LICENSE_COMB=	multi
+LICENSE=			BSD3CLAUSE LGPL21 LGPL20 EPL LGPL3 BSD2CLAUSE APACHE11 # see ${WRKSRC}/image_LICENSE.txt
+LICENSE_COMB=			multi
 LICENSE_FILE_BSD3CLAUSE=	${WRKSRC}/LICENSE.txt
-LICENSE_FILE_LGPL21=	${WRKSRC}/image_LICENSE_Nuvola.txt
-LICENSE_FILE_LGPL20=	${WRKSRC}/image_LICENSE_CP.txt
-LICENSE_FILE_EPL=	${WRKSRC}/image_LICENSE_Eclipse.txt
-LICENSE_FILE_LGPL3=	${WRKSRC}/image_LICENSE_OOo.txt
+LICENSE_FILE_LGPL21=		${WRKSRC}/image_LICENSE_Nuvola.txt
+LICENSE_FILE_LGPL20=		${WRKSRC}/image_LICENSE_CP.txt
+LICENSE_FILE_EPL=		${WRKSRC}/image_LICENSE_Eclipse.txt
+LICENSE_FILE_LGPL3=		${WRKSRC}/image_LICENSE_OOo.txt
 LICENSE_FILE_BSD2CLAUSE=	${WRKSRC}/LICENSE_YORICK.txt
-LICENSE_FILE_APACHE11=	${WRKSRC}/LICENSE_COLORBREWER.txt
-# See ${WRKSRC}/image_LICENSE.txt for per file license information
+LICENSE_FILE_APACHE11=		${WRKSRC}/LICENSE_COLORBREWER.txt
 
-DEPRECATED=	Uses deprecated version of python
-EXPIRATION_DATE=	2020-09-15
-
-BUILD_DEPENDS=	vtk6>=6.1.0_8:math/vtk6 \
+BUILD_DEPENDS=	vtk9>0:math/vtk9 \
+		${PYNUMPY} \
 		${PY_SPHINX}
-RUN_DEPENDS=	vtk6>=6.1.0_8:math/vtk6 \
+RUN_DEPENDS=	vtk9>0:math/vtk9 \
 		${PYNUMPY} \
-		${PYTHON_PKGNAMEPREFIX}envisage>=4.4.0:devel/py-envisage@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pyface>=4.5.2:devel/py-pyface@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}scimath>=4.1.2:science/py-scimath@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}traitsui>=4.5.1:graphics/py-traitsui@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}apptools>0:devel/py-apptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}envisage>0:devel/py-envisage@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pyface>=6.0.0:devel/py-pyface@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}traits>=4.6.0:devel/py-traits@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}traitsui>=6.0.0:graphics/py-traitsui@${PY_FLAVOR}
 
-USES=		python:2.7 shebangfix tar:bzip2
-USE_PYTHON=	autoplist distutils
+USES=		python shebangfix
+USE_PYTHON=	noflavors distutils concurrent autoplist # noflavors to force python to be of the same version as in vtk9, which always has default python version
+
 USE_WX=		3.0+
 WX_COMPS=	python:run
+
 SHEBANG_FILES=	mayavi/tests/csv_files/csv_2_py
 
-DEP1=		vtk6
+POST_PLIST=	fix-plist
 
-pre-configure:
-	if [ ! -e ${PREFIX}/lib/python2.7/site-packages/vtk/__init__.py ]; then \
-		${ECHO_MSG} "Port math/vtk6 is installed without PYTHON option."; \
-		${ECHO_MSG} "Please reinstall with PYTHON selected."; \
-		${FALSE}; \
-	else \
-		${ECHO_MSG} "Good, math/vtk6 is installed with PYTHON option!"; \
-	fi
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tvtk/array_ext.so
+
+fix-plist:
+	@${REINPLACE_CMD} -e "s|${PYTHONPREFIX_SITELIBDIR:S/${PREFIX}\///}/mayavi/preferences/__pycache__$$||" ${TMPPLIST}
+	@${REINPLACE_CMD} -e "s|${PYTHONPREFIX_SITELIBDIR:S/${PREFIX}\///}/tvtk/plugins/scene/__pycache__$$||" ${TMPPLIST}
 
 .include <bsd.port.mk>

Modified: head/graphics/py-mayavi/distinfo
==============================================================================
--- head/graphics/py-mayavi/distinfo	Sat Sep 19 12:48:45 2020	(r548979)
+++ head/graphics/py-mayavi/distinfo	Fri Jan 22 20:43:02 2021	(r562338)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470335243
-SHA256 (mayavi-4.5.0.tar.bz2) = b416bf0b183628e391b73377a965c500480466f06fcf21aae547783eb40c6e49
-SIZE (mayavi-4.5.0.tar.bz2) = 6927482
+TIMESTAMP = 1611297644
+SHA256 (mayavi-4.7.2.tar.gz) = a207290757495c0eccab7f451d75b87792481cd417498ec4d2c49eb1593cb373
+SIZE (mayavi-4.7.2.tar.gz) = 7119909

Modified: head/graphics/py-mayavi/pkg-descr
==============================================================================
--- head/graphics/py-mayavi/pkg-descr	Sat Sep 19 12:48:45 2020	(r548979)
+++ head/graphics/py-mayavi/pkg-descr	Fri Jan 22 20:43:02 2021	(r562338)
@@ -1,4 +1,4 @@
-3D Scientific Data Visualization and Plotting 
+3D Scientific Data Visualization and Plotting.
 
 The Mayavi project includes two related packages for 3-dimensional
 visualization:
@@ -14,4 +14,4 @@ Mayavi user interface or program to its scripting inte
 probably don't need to interact with TVTK unless you want to create
 a new Mayavi module.
 
-WWW: http://code.enthought.com/projects/mayavi/
+WWW: http://code.enthought.com/pages/mayavi-project.html



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101222043.10MKh3gh024655>