2 files changed, 43 insertions, 2 deletions

diff --git a/math/vtk6/Makefile b/math/vtk6/Makefile
index 15cf5e52d404..c5452474b8d1 100644
--- a/math/vtk6/Makefile
+++ b/math/vtk6/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	vtk
 PORTVERSION=	6.1.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	math graphics
 MASTER_SITES=	http://www.vtk.org/files/release/${VTK_SHORT_VER}/
 PKGNAMESUFFIX=	6
@@ -178,8 +178,11 @@ PLIST_SUB+=	JAVA="@comment "
 .if ${PORT_OPTIONS:MPYTHON}
 USES+=		python
 CMAKE_ARGS+=	-DVTK_WRAP_PYTHON:BOOL=ON \
-    		-DVTK_INSTALL_PYTHON_MODULE_DIR:STRING=${PYTHONPREFIX_SITELIBDIR}
+    		-DVTK_INSTALL_PYTHON_MODULE_DIR:STRING=${PYTHONPREFIX_SITELIBDIR} \
+		-DModule_vtkRenderingMatplotlib:BOOL=ON \
+		-DModule_vtkPythonInterpreter:BOOL=ON
 PLIST_SUB+=	PYTHON=""
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/matplotlib/__init__.py:${PORTSDIR}/math/py-matplotlib
 .else
 CMAKE_ARGS+=	-DVTK_WRAP_PYTHON:BOOL=OFF
 PLIST_SUB+=	PYTHON="@comment "
diff --git a/math/vtk6/pkg-plist b/math/vtk6/pkg-plist
index 43eaec654cac..195ffe0c3a19 100644
--- a/math/vtk6/pkg-plist
+++ b/math/vtk6/pkg-plist
@@ -40,6 +40,7 @@
 %%MPI%%lib/cmake/vtk-%%VER2%%/Modules/vtkIOMPIParallel.cmake
 %%MPI%%lib/cmake/vtk-%%VER2%%/Modules/vtkIOParallelNetCDF.cmake
 %%MPI%%lib/cmake/vtk-%%VER2%%/Modules/vtkParallelMPI.cmake
+%%NO_SHARED%%%%PYTHON%%%%QT%%lib/vtk-%%VER2%%/libvtkRenderingQtPython-%%VER2%%.a
 %%NO_SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkChartsCorePython-%%VER2%%.a
 %%NO_SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkChartsCorePython27D-%%VER2%%.a
 %%NO_SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkCommonColorPython-%%VER2%%.a
@@ -176,6 +177,9 @@
 %%NO_SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkInteractionWidgetsPython27D-%%VER2%%.a
 %%NO_SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkParallelCorePython-%%VER2%%.a
 %%NO_SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkParallelCorePython27D-%%VER2%%.a
+%%NO_SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkPythonInterpreter-%%VER2%%.a
+%%NO_SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkPythonInterpreterPython-%%VER2%%.a
+%%NO_SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkPythonInterpreterPython27D-%%VER2%%.a
 %%NO_SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingAnnotationPython-%%VER2%%.a
 %%NO_SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingAnnotationPython27D-%%VER2%%.a
 %%NO_SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingContext2DPython-%%VER2%%.a
@@ -196,6 +200,9 @@
 %%NO_SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingLODPython27D-%%VER2%%.a
 %%NO_SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingLabelPython-%%VER2%%.a
 %%NO_SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingLabelPython27D-%%VER2%%.a
+%%NO_SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingMatplotlib-%%VER2%%.a
+%%NO_SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingMatplotlibPython-%%VER2%%.a
+%%NO_SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingMatplotlibPython27D-%%VER2%%.a
 %%NO_SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingOpenGLPython-%%VER2%%.a
 %%NO_SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingOpenGLPython27D-%%VER2%%.a
 %%NO_SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingVolumeAMRPython-%%VER2%%.a
@@ -215,6 +222,7 @@
 %%NO_SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkViewsInfovisPython-%%VER2%%.a
 %%NO_SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkViewsInfovisPython27D-%%VER2%%.a
 %%NO_SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkWrappingPython27Core-%%VER2%%.a
+%%NO_SHARED%%%%QT%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingQtPython27D-%%VER2%%.a
 %%NO_SHARED%%%%QT%%lib/vtk-%%VER2%%/libvtkGUISupportQt-%%VER2%%.a
 %%NO_SHARED%%%%QT%%lib/vtk-%%VER2%%/libvtkGUISupportQtOpenGL-%%VER2%%.a
 %%NO_SHARED%%%%QT%%lib/vtk-%%VER2%%/libvtkGUISupportQtSQL-%%VER2%%.a
@@ -514,6 +522,8 @@
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkInteractionWidgets.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkParallelCore.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkParallelCore.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkPythonInterpreter.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkPythonInterpreter.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkRenderingAnnotation.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkRenderingAnnotation.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkRenderingContext2D.py
@@ -534,6 +544,8 @@
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkRenderingLOD.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkRenderingLabel.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkRenderingLabel.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkRenderingMatplotlib.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkRenderingMatplotlib.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkRenderingOpenGL.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkRenderingOpenGL.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkRenderingVolume.py
@@ -558,20 +570,33 @@
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/wx/wxVTKRenderWindow.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/wx/wxVTKRenderWindowInteractor.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/wx/wxVTKRenderWindowInteractor.pyc
+%%PYTHON%%%%QT%%%%PYTHON_SITELIBDIR%%/vtk/vtkRenderingQt.py
+%%PYTHON%%%%QT%%%%PYTHON_SITELIBDIR%%/vtk/vtkRenderingQt.pyc
 %%PYTHON%%bin/vtkpython
 %%PYTHON%%include/vtk-%%VER2%%/PyVTKClass.h
 %%PYTHON%%include/vtk-%%VER2%%/PyVTKMutableObject.h
 %%PYTHON%%include/vtk-%%VER2%%/PyVTKObject.h
 %%PYTHON%%include/vtk-%%VER2%%/PyVTKSpecialObject.h
 %%PYTHON%%include/vtk-%%VER2%%/PyVTKTemplate.h
+%%PYTHON%%include/vtk-%%VER2%%/vtkMatplotlibMathTextUtilities.h
 %%PYTHON%%include/vtk-%%VER2%%/vtkPython.h
 %%PYTHON%%include/vtk-%%VER2%%/vtkPythonArgs.h
 %%PYTHON%%include/vtk-%%VER2%%/vtkPythonCommand.h
 %%PYTHON%%include/vtk-%%VER2%%/vtkPythonConfigure.h
+%%PYTHON%%include/vtk-%%VER2%%/vtkPythonInteractiveInterpreter.h
+%%PYTHON%%include/vtk-%%VER2%%/vtkPythonInterpreter.h
+%%PYTHON%%include/vtk-%%VER2%%/vtkPythonInterpreterModule.h
 %%PYTHON%%include/vtk-%%VER2%%/vtkPythonOverload.h
+%%PYTHON%%include/vtk-%%VER2%%/vtkPythonStdStreamCaptureHelper.h
 %%PYTHON%%include/vtk-%%VER2%%/vtkPythonUtil.h
+%%PYTHON%%include/vtk-%%VER2%%/vtkRenderingMatplotlibModule.h
+%%PYTHON%%include/vtk-%%VER2%%/vtkRenderingMatplotlibObjectFactory.h
 %%PYTHON%%include/vtk-%%VER2%%/vtkWrappingPythonCoreModule.h
 %%PYTHON%%lib/cmake/vtk-%%VER2%%/Modules/vtkPython.cmake
+%%PYTHON%%lib/cmake/vtk-%%VER2%%/Modules/vtkPythonInterpreter.cmake
+%%PYTHON%%lib/cmake/vtk-%%VER2%%/Modules/vtkPythonInterpreterHierarchy.txt
+%%PYTHON%%lib/cmake/vtk-%%VER2%%/Modules/vtkRenderingMatplotlib.cmake
+%%PYTHON%%lib/cmake/vtk-%%VER2%%/Modules/vtkRenderingMatplotlibHierarchy.txt
 %%PYTHON%%lib/cmake/vtk-%%VER2%%/Modules/vtkWrappingPythonCore.cmake
 %%QT%%include/vtk-%%VER2%%/QFilterTreeProxyModel.h
 %%QT%%include/vtk-%%VER2%%/QVTKApplication.h
@@ -797,6 +822,7 @@
 %%SHARED%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkInteractionStylePython.so
 %%SHARED%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkInteractionWidgetsPython.so
 %%SHARED%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkParallelCorePython.so
+%%SHARED%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkPythonInterpreterPython.so
 %%SHARED%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkRenderingAnnotationPython.so
 %%SHARED%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkRenderingContext2DPython.so
 %%SHARED%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkRenderingCorePython.so
@@ -807,6 +833,7 @@
 %%SHARED%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkRenderingLICPython.so
 %%SHARED%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkRenderingLODPython.so
 %%SHARED%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkRenderingLabelPython.so
+%%SHARED%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkRenderingMatplotlibPython.so
 %%SHARED%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkRenderingOpenGLPython.so
 %%SHARED%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkRenderingVolumeAMRPython.so
 %%SHARED%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkRenderingVolumeOpenGLPython.so
@@ -816,6 +843,7 @@
 %%SHARED%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkViewsCorePython.so
 %%SHARED%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkViewsGeovisPython.so
 %%SHARED%%%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/vtkViewsInfovisPython.so
+%%SHARED%%%%PYTHON%%%%QT%%%%PYTHON_SITELIBDIR%%/vtk/vtkRenderingQtPython.so
 %%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkChartsCorePython27D-%%VER2%%.so
 %%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkChartsCorePython27D-%%VER2%%.so.1
 %%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkCommonColorPython27D-%%VER2%%.so
@@ -952,6 +980,10 @@
 %%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkInteractionWidgetsPython27D-%%VER2%%.so.1
 %%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkParallelCorePython27D-%%VER2%%.so
 %%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkParallelCorePython27D-%%VER2%%.so.1
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkPythonInterpreter-%%VER2%%.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkPythonInterpreter-%%VER2%%.so.1
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkPythonInterpreterPython27D-%%VER2%%.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkPythonInterpreterPython27D-%%VER2%%.so.1
 %%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingAnnotationPython27D-%%VER2%%.so
 %%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingAnnotationPython27D-%%VER2%%.so.1
 %%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingContext2DPython27D-%%VER2%%.so
@@ -972,6 +1004,10 @@
 %%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingLODPython27D-%%VER2%%.so.1
 %%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingLabelPython27D-%%VER2%%.so
 %%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingLabelPython27D-%%VER2%%.so.1
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingMatplotlib-%%VER2%%.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingMatplotlib-%%VER2%%.so.1
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingMatplotlibPython27D-%%VER2%%.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingMatplotlibPython27D-%%VER2%%.so.1
 %%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingOpenGLPython27D-%%VER2%%.so
 %%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingOpenGLPython27D-%%VER2%%.so.1
 %%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingVolumeAMRPython27D-%%VER2%%.so
@@ -992,6 +1028,8 @@
 %%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkViewsInfovisPython27D-%%VER2%%.so.1
 %%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkWrappingPython27Core-%%VER2%%.so
 %%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkWrappingPython27Core-%%VER2%%.so.1
+%%SHARED%%%%QT%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingQtPython27D-%%VER2%%.so
+%%SHARED%%%%QT%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingQtPython27D-%%VER2%%.so.1
 %%SHARED%%%%QT%%lib/vtk-%%VER2%%/libvtkGUISupportQt-%%VER2%%.so
 %%SHARED%%%%QT%%lib/vtk-%%VER2%%/libvtkGUISupportQt-%%VER2%%.so.1
 %%SHARED%%%%QT%%lib/vtk-%%VER2%%/libvtkGUISupportQtOpenGL-%%VER2%%.so