3 files changed, 83 insertions, 13 deletions

diff --git a/science/mayavi/Makefile b/science/mayavi/Makefile
index 26fc02db98a7..e613d1cb0392 100644
--- a/science/mayavi/Makefile
+++ b/science/mayavi/Makefile
@@ -7,21 +7,26 @@
 #
 
 PORTNAME=	mayavi
-PORTVERSION=	1.1
+PORTVERSION=	1.3
 CATEGORIES=	science python
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	MayaVi-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The MayaVi Data Visualizer
+COMMENT=	A scientific data visualizer
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/vtk.pth:${PORTSDIR}/math/vtk-python \
+		${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-USE_MESA=	yes
-PLIST_SUB=	PYTHON_SITELIBDIR=lib/${PYTHON_VERSION}/site-packages
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/*.* ${EXAMPLESDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/science/mayavi/distinfo b/science/mayavi/distinfo
index c67fd442d73b..5e200b7b2dde 100644
--- a/science/mayavi/distinfo
+++ b/science/mayavi/distinfo
@@ -1,2 +1,2 @@
-MD5 (MayaVi-1.1.tar.gz) = 0a169f794c633ca1000c6f0462b633f2
-SIZE (MayaVi-1.1.tar.gz) = 402995
+MD5 (MayaVi-1.3.tar.gz) = 38ae9dbe09a6bdb35289d8d6d98c65ba
+SIZE (MayaVi-1.3.tar.gz) = 504912
diff --git a/science/mayavi/pkg-plist b/science/mayavi/pkg-plist
index 642a3b99baee..78ac9cc653ff 100644
--- a/science/mayavi/pkg-plist
+++ b/science/mayavi/pkg-plist
@@ -14,6 +14,21 @@ bin/mayavi
 %%PYTHON_SITELIBDIR%%/mayavi/Common.py
 %%PYTHON_SITELIBDIR%%/mayavi/Common.pyc
 %%PYTHON_SITELIBDIR%%/mayavi/Common.pyo
+%%PYTHON_SITELIBDIR%%/mayavi/Filters/CellToPointData.py
+%%PYTHON_SITELIBDIR%%/mayavi/Filters/CellToPointData.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Filters/CellToPointData.pyo
+%%PYTHON_SITELIBDIR%%/mayavi/Filters/CutPlane.py
+%%PYTHON_SITELIBDIR%%/mayavi/Filters/CutPlane.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Filters/CutPlane.pyo
+%%PYTHON_SITELIBDIR%%/mayavi/Filters/Delaunay2D.py
+%%PYTHON_SITELIBDIR%%/mayavi/Filters/Delaunay2D.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Filters/Delaunay2D.pyo
+%%PYTHON_SITELIBDIR%%/mayavi/Filters/Delaunay3D.py
+%%PYTHON_SITELIBDIR%%/mayavi/Filters/Delaunay3D.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Filters/Delaunay3D.pyo
+%%PYTHON_SITELIBDIR%%/mayavi/Filters/ExtractGrid.py
+%%PYTHON_SITELIBDIR%%/mayavi/Filters/ExtractGrid.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Filters/ExtractGrid.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/ExtractTensorComponents.py
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/ExtractTensorComponents.pyc
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/ExtractTensorComponents.pyo
@@ -32,9 +47,15 @@ bin/mayavi
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/PolyDataNormals.py
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/PolyDataNormals.pyc
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/PolyDataNormals.pyo
+%%PYTHON_SITELIBDIR%%/mayavi/Filters/StructuredPointsProbe.py
+%%PYTHON_SITELIBDIR%%/mayavi/Filters/StructuredPointsProbe.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Filters/StructuredPointsProbe.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/Threshold.py
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/Threshold.pyc
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/Threshold.pyo
+%%PYTHON_SITELIBDIR%%/mayavi/Filters/UserDefined.py
+%%PYTHON_SITELIBDIR%%/mayavi/Filters/UserDefined.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Filters/UserDefined.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/WarpScalar.py
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/WarpScalar.pyc
 %%PYTHON_SITELIBDIR%%/mayavi/Filters/WarpScalar.pyo
@@ -47,12 +68,21 @@ bin/mayavi
 %%PYTHON_SITELIBDIR%%/mayavi/Main.py
 %%PYTHON_SITELIBDIR%%/mayavi/Main.pyc
 %%PYTHON_SITELIBDIR%%/mayavi/Main.pyo
+%%PYTHON_SITELIBDIR%%/mayavi/Misc/CTFEditor.py
+%%PYTHON_SITELIBDIR%%/mayavi/Misc/CTFEditor.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Misc/CTFEditor.pyo
+%%PYTHON_SITELIBDIR%%/mayavi/Misc/Lights.py
+%%PYTHON_SITELIBDIR%%/mayavi/Misc/Lights.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Misc/Lights.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Misc/LutHandler.py
 %%PYTHON_SITELIBDIR%%/mayavi/Misc/LutHandler.pyc
 %%PYTHON_SITELIBDIR%%/mayavi/Misc/LutHandler.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Misc/Lut_Editor.py
 %%PYTHON_SITELIBDIR%%/mayavi/Misc/Lut_Editor.pyc
 %%PYTHON_SITELIBDIR%%/mayavi/Misc/Lut_Editor.pyo
+%%PYTHON_SITELIBDIR%%/mayavi/Misc/Picker.py
+%%PYTHON_SITELIBDIR%%/mayavi/Misc/Picker.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Misc/Picker.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Misc/RenderWindow.py
 %%PYTHON_SITELIBDIR%%/mayavi/Misc/RenderWindow.pyc
 %%PYTHON_SITELIBDIR%%/mayavi/Misc/RenderWindow.pyo
@@ -62,12 +92,18 @@ bin/mayavi
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/Axes.py
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/Axes.pyc
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/Axes.pyo
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/BandedSurfaceMap.py
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/BandedSurfaceMap.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/BandedSurfaceMap.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/ContourGridPlane.py
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/ContourGridPlane.pyc
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/ContourGridPlane.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/CustomGridPlane.py
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/CustomGridPlane.pyc
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/CustomGridPlane.pyo
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/Glyph.py
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/Glyph.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/Glyph.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/GridPlane.py
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/GridPlane.pyc
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/GridPlane.pyo
@@ -77,6 +113,9 @@ bin/mayavi
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/IsoSurface.py
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/IsoSurface.pyc
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/IsoSurface.pyo
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/Labels.py
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/Labels.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/Labels.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/Locator.py
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/Locator.pyc
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/Locator.pyo
@@ -101,12 +140,18 @@ bin/mayavi
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/TensorGlyphs.py
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/TensorGlyphs.pyc
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/TensorGlyphs.pyo
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/Text.py
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/Text.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/Text.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/VectorCutPlane.py
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/VectorCutPlane.pyc
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/VectorCutPlane.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/VelocityVector.py
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/VelocityVector.pyc
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/VelocityVector.pyo
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/Volume.py
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/Volume.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Modules/Volume.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/WarpVectorCutPlane.py
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/WarpVectorCutPlane.pyc
 %%PYTHON_SITELIBDIR%%/mayavi/Modules/WarpVectorCutPlane.pyo
@@ -125,6 +170,12 @@ bin/mayavi
 %%PYTHON_SITELIBDIR%%/mayavi/Sources/VtkDataReader.py
 %%PYTHON_SITELIBDIR%%/mayavi/Sources/VtkDataReader.pyc
 %%PYTHON_SITELIBDIR%%/mayavi/Sources/VtkDataReader.pyo
+%%PYTHON_SITELIBDIR%%/mayavi/Sources/VtkEnSightReader.py
+%%PYTHON_SITELIBDIR%%/mayavi/Sources/VtkEnSightReader.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Sources/VtkEnSightReader.pyo
+%%PYTHON_SITELIBDIR%%/mayavi/Sources/VtkXMLDataReader.py
+%%PYTHON_SITELIBDIR%%/mayavi/Sources/VtkXMLDataReader.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/Sources/VtkXMLDataReader.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/Sources/__init__.py
 %%PYTHON_SITELIBDIR%%/mayavi/Sources/__init__.pyc
 %%PYTHON_SITELIBDIR%%/mayavi/Sources/__init__.pyo
@@ -134,9 +185,18 @@ bin/mayavi
 %%PYTHON_SITELIBDIR%%/mayavi/__init__.py
 %%PYTHON_SITELIBDIR%%/mayavi/__init__.pyc
 %%PYTHON_SITELIBDIR%%/mayavi/__init__.pyo
+%%PYTHON_SITELIBDIR%%/mayavi/__version__.py
+%%PYTHON_SITELIBDIR%%/mayavi/__version__.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/__version__.pyo
 %%PYTHON_SITELIBDIR%%/mayavi/ivtk.py
 %%PYTHON_SITELIBDIR%%/mayavi/ivtk.pyc
 %%PYTHON_SITELIBDIR%%/mayavi/ivtk.pyo
+%%PYTHON_SITELIBDIR%%/mayavi/tools/__init__.py
+%%PYTHON_SITELIBDIR%%/mayavi/tools/__init__.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/tools/__init__.pyo
+%%PYTHON_SITELIBDIR%%/mayavi/tools/imv.py
+%%PYTHON_SITELIBDIR%%/mayavi/tools/imv.pyc
+%%PYTHON_SITELIBDIR%%/mayavi/tools/imv.pyo
 %%PYTHON_SITELIBDIR%%/vtkPipeline/ConfigVtkObj.py
 %%PYTHON_SITELIBDIR%%/vtkPipeline/ConfigVtkObj.pyc
 %%PYTHON_SITELIBDIR%%/vtkPipeline/ConfigVtkObj.pyo
@@ -176,11 +236,16 @@ bin/mayavi
 %%PYTHON_SITELIBDIR%%/vtkPipeline/vtkPipeline.py
 %%PYTHON_SITELIBDIR%%/vtkPipeline/vtkPipeline.pyc
 %%PYTHON_SITELIBDIR%%/vtkPipeline/vtkPipeline.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/mayavi/Base
-@dirrm %%PYTHON_SITELIBDIR%%/mayavi/Filters
-@dirrm %%PYTHON_SITELIBDIR%%/mayavi/Misc
-@dirrm %%PYTHON_SITELIBDIR%%/mayavi/Modules
-@dirrm %%PYTHON_SITELIBDIR%%/mayavi/Sources
-@dirrm %%PYTHON_SITELIBDIR%%/mayavi
+%%PORTDOCS%%%%EXAMPLESDIR%%/custom16.lut
+%%PORTDOCS%%%%EXAMPLESDIR%%/heart.mv
+%%PORTDOCS%%%%EXAMPLESDIR%%/heart.vtk
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/vtkPipeline/Icons
 @dirrm %%PYTHON_SITELIBDIR%%/vtkPipeline
+@dirrm %%PYTHON_SITELIBDIR%%/mayavi/tools
+@dirrm %%PYTHON_SITELIBDIR%%/mayavi/Sources
+@dirrm %%PYTHON_SITELIBDIR%%/mayavi/Modules
+@dirrm %%PYTHON_SITELIBDIR%%/mayavi/Misc
+@dirrm %%PYTHON_SITELIBDIR%%/mayavi/Filters
+@dirrm %%PYTHON_SITELIBDIR%%/mayavi/Base
+@dirrm %%PYTHON_SITELIBDIR%%/mayavi