2 files changed, 367 insertions, 260 deletions

diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile
index a7492ba8a860..9984d9c162ee 100644
--- a/math/vtk5/Makefile
+++ b/math/vtk5/Makefile
@@ -31,10 +31,12 @@ SUB_FILES=	vtk.3
 USE_CMAKE=	yes
 USE_GMAKE=	yes
 USE_GL=		yes
+USE_XORG=	xt
 USE_LDCONFIG=	${PREFIX}/lib/vtk-${PORTVERSION:R}
 MAKE_JOBS_SAFE=	yes
 
-OPTIONS=	VTKMPEG2	"Install patented MPEG2 encoder module" Off \
+OPTIONS=	SHARED		"Build shared libraries" On \
+		VTKMPEG2	"Install patented MPEG2 encoder module" Off \
 		GL2PS           "Install support conversion OpenGL to PostScript" On \
 		OSMESA		"Use Mesa for off-screen rendering" Off \
 		QT		"Enable Qt gui support" On \
@@ -42,7 +44,7 @@ OPTIONS=	VTKMPEG2	"Install patented MPEG2 encoder module" Off \
 		WRAP_PYTHON	"Enable Python wrapping" On \
 		WRAP_TCLTK	"Enable Tcl/Tk wrapping" On
 
-PLIST_SUB=	VER1="${PORTVERSION}" \
+PLIST_SUB+=	VER1="${PORTVERSION}" \
 		VER2="${PORTVERSION:R}" \
 		VER3="${PORTVERSION:R:R}"
 
@@ -54,8 +56,7 @@ CMAKE_OUTSOURCE=	yes
 
 # Set this when testing port changes
 #-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
-CMAKE_ARGS+=	-DBUILD_SHARED_LIBS:BOOL=ON \
-		-DBUILD_DOCUMENTATION:BOOL=ON \
+CMAKE_ARGS+=	-DBUILD_DOCUMENTATION:BOOL=ON \
 		-DBUILD_TESTING:BOOL=OFF \
 		-DKWSYS_LFS_DISABLE:BOOL=ON \
 		-DVTK_USE_PARALLEL:BOOL=ON \
@@ -73,6 +74,16 @@ CMAKE_ARGS+=	-DBUILD_SHARED_LIBS:BOOL=ON \
 
 .include <bsd.port.options.mk>
 
+.if defined(WITH_SHARED)
+CMAKE_ARGS+=	-DBUILD_SHARED_LIBS:BOOL=ON
+PLIST_SUB+=	SHARED="" \
+		STATIC="@comment "
+.else
+CMAKE_ARGS+=	-DBUILD_SHARED_LIBS:BOOL=OFF
+PLIST_SUB+=	SHARED="@comment " \
+		STATIC=""
+.endif
+
 .if defined(WITH_VTKMPEG2)
 LIB_DEPENDS+=	vtkMPEG2Encode.5:${PORTSDIR}/multimedia/vtkmpeg2encode
 PLIST_SUB+=	MPEG=""
@@ -117,6 +128,10 @@ PLIST_SUB+=	QT="@comment "
 .endif
 
 .if defined(WITH_WRAP_PYTHON)
+.if !defined(WITH_SHARED)
+IGNORE=		python wrapping requires shared libraries.\
+		Run make config again and enable the SHARED option
+.endif
 USE_PYTHON=	yes
 PYDISTUTILS_PKGNAME=	VTK
 INSTALLS_EGGINFO=	yes
@@ -150,6 +165,13 @@ PLIST_SUB+=	WRAP_PYTHON_OR_TCLTK="@comment "
 .endif
 
 .if defined(WITH_WRAP_JAVA)
+.if !defined(WITH_SHARED)
+IGNORE=		java wrapping requires shared libraries.\
+		Run make config again and enable the SHARED option
+.endif
+.if ${ARCH} == "amd64"
+CXXFLAGS+=	-fPIC
+.endif
 USE_JAVA=	yes
 JAVA_VENDOR=	freebsd
 JAVA_VERSION=	1.5+
@@ -157,8 +179,8 @@ CMAKE_ARGS+=	-DVTK_WRAP_JAVA:BOOL=ON \
     		-DJAVA_AWT_INCLUDE_PATH:FILEPATH=${JAVA_HOME}/include \
     		-DJAVA_INCLUDE_PATH:FILEPATH=${JAVA_HOME}/include \
     		-DJAVA_INCLUDE_PATH2:FILEPATH=${JAVA_HOME}/include/freebsd \
-		-DJAVA_AWT_LIBRARY:FILEPATH=${JAVA_HOME}/jre/lib/${ARCH}/libawt.so \
-		-DJAVA_JVM_LIBRARY:FILEPATH=${JAVA_HOME}/jre/lib/${ARCH}/client/libjvm.so
+		-DJAVA_AWT_LIBRARY:FILEPATH=${JAVA_HOME}/jre/lib/${ARCH}/libjawt.so \
+		-DJAVA_JVM_LIBRARY:FILEPATH=${JAVA_HOME}/jre/lib/${ARCH}/server/libjvm.so
 PLIST_SUB+=	JAVA=""
 .else
 PLIST_SUB+=	JAVA="@comment "
@@ -182,7 +204,7 @@ post-patch:
 
 post-configure:
 .if defined(WITH_WRAP_JAVA)
-	${REINPLACE_CMD} -e 's|$$|-L/usr/local/${JAVA_HOME}/jre/lib/${ARCH} -ljawt|' \
+	${REINPLACE_CMD} -e 's|-ljawt$$||' \
 	    ${CONFIGURE_WRKSRC}/Wrapping/Java/CMakeFiles/VTKJavaExecutable.dir/link.txt
 .endif
 
@@ -200,6 +222,7 @@ pre-install:
 post-install:
 # Ports system wants us to conform to lib.so.x format, but VTK5
 # only installs lib.so.x.y and lib.so.x.y.z.
+.if defined(WITH_SHARED)
 	@for lib in ${PREFIX}/lib/vtk-${PORTVERSION:R}/libvtk*.so; do \
 	    ${RM} -f $$lib; \
 	    ${LN} -sf $$lib.${PORTVERSION} $$lib; \
@@ -212,6 +235,7 @@ post-install:
 	    ${LN} -sf $$lib.${PORTVERSION} $$lib.${PORTVERSION:R:R}; \
 	done
 .endif
+.endif
 .if defined(WITH_VTKMPEG2)
 	@${ECHO_CMD}
 	@${ECHO_CMD} "This port uses the patented MPEG2 encoder."
diff --git a/math/vtk5/pkg-plist b/math/vtk5/pkg-plist
index 1fc8c68ef26f..5f879fa28b9d 100644
--- a/math/vtk5/pkg-plist
+++ b/math/vtk5/pkg-plist
@@ -1,5 +1,3 @@
-
-
 %%GL2PS%%include/vtk-%%VER2%%/vtkGL2PSExporter.h
 %%MPEG%%include/vtk-%%VER2%%/vtkMPEG2Writer.h
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/__helper.py
@@ -117,70 +115,101 @@
 %%PYTHON%%include/vtk-%%VER2%%/vtkPython.h
 %%PYTHON%%include/vtk-%%VER2%%/vtkPythonUtil.h
 
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkChartsPythonD.so
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkChartsPythonD.so.%%VER2%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkChartsPythonD.so.%%VER2%%.0
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkChartsPythonD.so.5
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkCommonPythonD.so
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkCommonPythonD.so.%%VER1%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkCommonPythonD.so.%%VER2%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkCommonPythonD.so.%%VER3%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkFilteringPythonD.so
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkFilteringPythonD.so.%%VER1%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkFilteringPythonD.so.%%VER2%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkFilteringPythonD.so.%%VER3%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkGenericFilteringPythonD.so
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkGenericFilteringPythonD.so.%%VER1%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkGenericFilteringPythonD.so.%%VER2%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkGenericFilteringPythonD.so.%%VER3%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkGeovisPythonD.so
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkGeovisPythonD.so.%%VER1%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkGeovisPythonD.so.%%VER2%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkGeovisPythonD.so.%%VER3%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkGraphicsPythonD.so
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkGraphicsPythonD.so.%%VER1%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkGraphicsPythonD.so.%%VER2%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkGraphicsPythonD.so.%%VER3%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkHybridPythonD.so
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkHybridPythonD.so.%%VER1%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkHybridPythonD.so.%%VER2%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkHybridPythonD.so.%%VER3%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkIOPythonD.so
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkIOPythonD.so.%%VER1%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkIOPythonD.so.%%VER2%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkIOPythonD.so.%%VER3%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkImagingPythonD.so
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkImagingPythonD.so.%%VER1%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkImagingPythonD.so.%%VER2%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkImagingPythonD.so.%%VER3%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkInfovisPythonD.so
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkInfovisPythonD.so.%%VER1%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkInfovisPythonD.so.%%VER2%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkInfovisPythonD.so.%%VER3%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkParallelPythonD.so
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkParallelPythonD.so.%%VER1%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkParallelPythonD.so.%%VER2%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkParallelPythonD.so.%%VER3%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingPythonD.so
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingPythonD.so.%%VER1%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingPythonD.so.%%VER2%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingPythonD.so.%%VER3%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingPythonTkWidgets.so
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingPythonTkWidgets.so.%%VER1%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingPythonTkWidgets.so.%%VER2%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingPythonTkWidgets.so.%%VER3%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkViewsPythonD.so
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkViewsPythonD.so.%%VER1%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkViewsPythonD.so.%%VER2%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkViewsPythonD.so.%%VER3%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkVolumeRenderingPythonD.so
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkVolumeRenderingPythonD.so.%%VER1%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkVolumeRenderingPythonD.so.%%VER2%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkVolumeRenderingPythonD.so.%%VER3%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkWidgetsPythonD.so
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkWidgetsPythonD.so.%%VER1%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkWidgetsPythonD.so.%%VER2%%
-%%PYTHON%%lib/vtk-%%VER2%%/libvtkWidgetsPythonD.so.%%VER3%%
+%%STATIC%%%%STATIC%%lib/vtk-%%VER2%%/libCosmo.a
+%%STATIC%%lib/vtk-%%VER2%%/libMapReduceMPI.a
+%%STATIC%%lib/vtk-%%VER2%%/libVPIC.a
+%%STATIC%%lib/vtk-%%VER2%%/libmpistubs.a
+%%STATIC%%lib/vtk-%%VER2%%/libvtkCharts.a
+%%STATIC%%lib/vtk-%%VER2%%/libvtkCommon.a
+%%STATIC%%lib/vtk-%%VER2%%/libvtkDICOMParser.a
+%%STATIC%%lib/vtk-%%VER2%%/libvtkFiltering.a
+%%STATIC%%lib/vtk-%%VER2%%/libvtkGenericFiltering.a
+%%STATIC%%lib/vtk-%%VER2%%/libvtkGeovis.a
+%%STATIC%%lib/vtk-%%VER2%%/libvtkGraphics.a
+%%STATIC%%lib/vtk-%%VER2%%/libvtkHybrid.a
+%%STATIC%%lib/vtk-%%VER2%%/libvtkIO.a
+%%STATIC%%lib/vtk-%%VER2%%/libvtkImaging.a
+%%STATIC%%lib/vtk-%%VER2%%/libvtkInfovis.a
+%%STATIC%%lib/vtk-%%VER2%%/libvtkNetCDF.a
+%%STATIC%%lib/vtk-%%VER2%%/libvtkParallel.a
+%%STATIC%%lib/vtk-%%VER2%%/libvtkRendering.a
+%%STATIC%%lib/vtk-%%VER2%%/libvtkViews.a
+%%STATIC%%lib/vtk-%%VER2%%/libvtkVolumeRendering.a
+%%STATIC%%lib/vtk-%%VER2%%/libvtkWidgets.a
+%%STATIC%%lib/vtk-%%VER2%%/libvtkalglib.a
+%%STATIC%%lib/vtk-%%VER2%%/libvtkexoIIc.a
+%%STATIC%%lib/vtk-%%VER2%%/libvtkfreetype.a
+%%STATIC%%lib/vtk-%%VER2%%/libvtkftgl.a
+%%STATIC%%lib/vtk-%%VER2%%/libvtklibxml2.a
+%%STATIC%%lib/vtk-%%VER2%%/libvtkmetaio.a
+%%STATIC%%lib/vtk-%%VER2%%/libvtkproj4.a
+%%STATIC%%lib/vtk-%%VER2%%/libvtksqlite.a
+%%STATIC%%lib/vtk-%%VER2%%/libvtksys.a
+%%STATIC%%lib/vtk-%%VER2%%/libvtkverdict.a
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkChartsPythonD.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkChartsPythonD.so.%%VER2%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkChartsPythonD.so.%%VER2%%.0
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkChartsPythonD.so.5
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkCommonPythonD.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkCommonPythonD.so.%%VER1%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkCommonPythonD.so.%%VER2%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkCommonPythonD.so.%%VER3%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkFilteringPythonD.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkFilteringPythonD.so.%%VER1%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkFilteringPythonD.so.%%VER2%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkFilteringPythonD.so.%%VER3%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkGenericFilteringPythonD.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkGenericFilteringPythonD.so.%%VER1%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkGenericFilteringPythonD.so.%%VER2%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkGenericFilteringPythonD.so.%%VER3%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkGeovisPythonD.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkGeovisPythonD.so.%%VER1%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkGeovisPythonD.so.%%VER2%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkGeovisPythonD.so.%%VER3%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkGraphicsPythonD.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkGraphicsPythonD.so.%%VER1%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkGraphicsPythonD.so.%%VER2%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkGraphicsPythonD.so.%%VER3%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkHybridPythonD.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkHybridPythonD.so.%%VER1%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkHybridPythonD.so.%%VER2%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkHybridPythonD.so.%%VER3%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkIOPythonD.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkIOPythonD.so.%%VER1%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkIOPythonD.so.%%VER2%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkIOPythonD.so.%%VER3%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkImagingPythonD.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkImagingPythonD.so.%%VER1%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkImagingPythonD.so.%%VER2%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkImagingPythonD.so.%%VER3%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkInfovisPythonD.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkInfovisPythonD.so.%%VER1%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkInfovisPythonD.so.%%VER2%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkInfovisPythonD.so.%%VER3%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkParallelPythonD.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkParallelPythonD.so.%%VER1%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkParallelPythonD.so.%%VER2%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkParallelPythonD.so.%%VER3%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingPythonD.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingPythonD.so.%%VER1%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingPythonD.so.%%VER2%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingPythonD.so.%%VER3%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingPythonTkWidgets.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingPythonTkWidgets.so.%%VER1%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingPythonTkWidgets.so.%%VER2%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingPythonTkWidgets.so.%%VER3%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkViewsPythonD.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkViewsPythonD.so.%%VER1%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkViewsPythonD.so.%%VER2%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkViewsPythonD.so.%%VER3%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkVolumeRenderingPythonD.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkVolumeRenderingPythonD.so.%%VER1%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkVolumeRenderingPythonD.so.%%VER2%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkVolumeRenderingPythonD.so.%%VER3%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkWidgetsPythonD.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkWidgetsPythonD.so.%%VER1%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkWidgetsPythonD.so.%%VER2%%
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkWidgetsPythonD.so.%%VER3%%
 %%QT%%include/vtk-%%VER2%%/QFilterTreeProxyModel.h
 %%QT%%include/vtk-%%VER2%%/QVTKWidget.h
 %%QT%%include/vtk-%%VER2%%/QVTKWin32Header.h
@@ -292,20 +321,26 @@
 %%QT%%include/vtk-%%VER2%%/vtkQtTreeRingLabelMapper.h
 %%QT%%include/vtk-%%VER2%%/vtkQtTreeView.h
 %%QT%%include/vtk-%%VER2%%/vtkQtView.h
-%%QT%%lib/qt4/plugins/designer/libQVTKWidgetPlugin.so
+%%SHARED%%%%QT%%lib/qt4/plugins/designer/libQVTKWidgetPlugin.so
 %%QT%%lib/vtk-%%VER2%%/VTKConfigQt.cmake
-%%QT%%lib/vtk-%%VER2%%/libQVTK.so
-%%QT%%lib/vtk-%%VER2%%/libQVTK.so.%%VER1%%
-%%QT%%lib/vtk-%%VER2%%/libQVTK.so.%%VER2%%
-%%QT%%lib/vtk-%%VER2%%/libQVTK.so.%%VER3%%
-%%QT%%lib/vtk-%%VER2%%/libvtkQtChart.so
-%%QT%%lib/vtk-%%VER2%%/libvtkQtChart.so.%%VER1%%
-%%QT%%lib/vtk-%%VER2%%/libvtkQtChart.so.%%VER2%%
-%%QT%%lib/vtk-%%VER2%%/libvtkQtChart.so.%%VER3%%
+%%STATIC%%%%QT%%lib/vtk-%%VER2%%/libQVTK.a
+%%STATIC%%%%QT%%lib/vtk-%%VER2%%/libvtkQtChart.a
+%%SHARED%%%%QT%%lib/vtk-%%VER2%%/libQVTK.so
+%%SHARED%%%%QT%%lib/vtk-%%VER2%%/libQVTK.so.%%VER1%%
+%%SHARED%%%%QT%%lib/vtk-%%VER2%%/libQVTK.so.%%VER2%%
+%%SHARED%%%%QT%%lib/vtk-%%VER2%%/libQVTK.so.%%VER3%%
+%%SHARED%%%%QT%%lib/vtk-%%VER2%%/libvtkQtChart.so
+%%SHARED%%%%QT%%lib/vtk-%%VER2%%/libvtkQtChart.so.%%VER1%%
+%%SHARED%%%%QT%%lib/vtk-%%VER2%%/libvtkQtChart.so.%%VER2%%
+%%SHARED%%%%QT%%lib/vtk-%%VER2%%/libvtkQtChart.so.%%VER3%%
 %%JAVA%%bin/vtkParseJava
 %%JAVA%%bin/vtkWrapJava
 %%JAVA%%include/vtk-%%VER2%%/vtkJavaUtil.h
-%%JAVA%%lib/vtk-%%VER2%%/java/vtk/vtk.jar
+%%JAVA%%lib/vtk-%%VER2%%/java/vtk.jar
+%%JAVA%%lib/vtk-%%VER2%%/libvtkChartsJava.so
+%%JAVA%%lib/vtk-%%VER2%%/libvtkChartsJava.so.%%VER1%%
+%%JAVA%%lib/vtk-%%VER2%%/libvtkChartsJava.so.%%VER2%%
+%%JAVA%%lib/vtk-%%VER2%%/libvtkChartsJava.so.%%VER3%%
 %%JAVA%%lib/vtk-%%VER2%%/libvtkCommonJava.so
 %%JAVA%%lib/vtk-%%VER2%%/libvtkCommonJava.so.%%VER1%%
 %%JAVA%%lib/vtk-%%VER2%%/libvtkCommonJava.so.%%VER2%%
@@ -366,66 +401,81 @@
 %%TCLTK%%bin/vtkWrapTcl
 %%TCLTK%%bin/vtkWrapTclInit
 %%TCLTK%%include/vtk-%%VER2%%/vtkTclUtil.h
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkChartsTCL.so
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkChartsTCL.so.%%VER1%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkChartsTCL.so.%%VER2%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkChartsTCL.so.%%VER3%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkCommonTCL.so
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkCommonTCL.so.%%VER1%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkCommonTCL.so.%%VER2%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkCommonTCL.so.%%VER3%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkFilteringTCL.so
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkFilteringTCL.so.%%VER1%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkFilteringTCL.so.%%VER2%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkFilteringTCL.so.%%VER3%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkGenericFilteringTCL.so
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkGenericFilteringTCL.so.%%VER1%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkGenericFilteringTCL.so.%%VER2%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkGenericFilteringTCL.so.%%VER3%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkGeovisTCL.so
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkGeovisTCL.so.%%VER1%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkGeovisTCL.so.%%VER2%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkGeovisTCL.so.%%VER3%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkGraphicsTCL.so
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkGraphicsTCL.so.%%VER1%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkGraphicsTCL.so.%%VER2%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkGraphicsTCL.so.%%VER3%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkHybridTCL.so
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkHybridTCL.so.%%VER1%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkHybridTCL.so.%%VER2%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkHybridTCL.so.%%VER3%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkIOTCL.so
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkIOTCL.so.%%VER1%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkIOTCL.so.%%VER2%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkIOTCL.so.%%VER3%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkImagingTCL.so
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkImagingTCL.so.%%VER1%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkImagingTCL.so.%%VER2%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkImagingTCL.so.%%VER3%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkInfovisTCL.so
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkInfovisTCL.so.%%VER1%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkInfovisTCL.so.%%VER2%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkInfovisTCL.so.%%VER3%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkParallelTCL.so
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkParallelTCL.so.%%VER1%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkParallelTCL.so.%%VER2%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkParallelTCL.so.%%VER3%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkRenderingTCL.so
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkRenderingTCL.so.%%VER1%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkRenderingTCL.so.%%VER2%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkRenderingTCL.so.%%VER3%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkViewsTCL.so
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkViewsTCL.so.%%VER1%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkViewsTCL.so.%%VER2%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkViewsTCL.so.%%VER3%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkVolumeRenderingTCL.so
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkVolumeRenderingTCL.so.%%VER1%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkVolumeRenderingTCL.so.%%VER2%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkVolumeRenderingTCL.so.%%VER3%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkWidgetsTCL.so
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkWidgetsTCL.so.%%VER1%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkWidgetsTCL.so.%%VER2%%
-%%TCLTK%%lib/vtk-%%VER2%%/libvtkWidgetsTCL.so.%%VER3%%
+%%STATIC%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkChartsTCL.a
+%%STATIC%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkCommonTCL.a
+%%STATIC%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkFilteringTCL.a
+%%STATIC%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkGenericFilteringTCL.a
+%%STATIC%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkGeovisTCL.a
+%%STATIC%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkGraphicsTCL.a
+%%STATIC%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkHybridTCL.a
+%%STATIC%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkIOTCL.a
+%%STATIC%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkImagingTCL.a
+%%STATIC%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkInfovisTCL.a
+%%STATIC%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkParallelTCL.a
+%%STATIC%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkRenderingTCL.a
+%%STATIC%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkViewsTCL.a
+%%STATIC%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkVolumeRenderingTCL.a
+%%STATIC%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkWidgetsTCL.a
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkChartsTCL.so
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkChartsTCL.so.%%VER1%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkChartsTCL.so.%%VER2%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkChartsTCL.so.%%VER3%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkCommonTCL.so
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkCommonTCL.so.%%VER1%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkCommonTCL.so.%%VER2%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkCommonTCL.so.%%VER3%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkFilteringTCL.so
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkFilteringTCL.so.%%VER1%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkFilteringTCL.so.%%VER2%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkFilteringTCL.so.%%VER3%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkGenericFilteringTCL.so
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkGenericFilteringTCL.so.%%VER1%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkGenericFilteringTCL.so.%%VER2%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkGenericFilteringTCL.so.%%VER3%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkGeovisTCL.so
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkGeovisTCL.so.%%VER1%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkGeovisTCL.so.%%VER2%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkGeovisTCL.so.%%VER3%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkGraphicsTCL.so
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkGraphicsTCL.so.%%VER1%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkGraphicsTCL.so.%%VER2%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkGraphicsTCL.so.%%VER3%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkHybridTCL.so
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkHybridTCL.so.%%VER1%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkHybridTCL.so.%%VER2%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkHybridTCL.so.%%VER3%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkIOTCL.so
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkIOTCL.so.%%VER1%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkIOTCL.so.%%VER2%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkIOTCL.so.%%VER3%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkImagingTCL.so
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkImagingTCL.so.%%VER1%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkImagingTCL.so.%%VER2%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkImagingTCL.so.%%VER3%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkInfovisTCL.so
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkInfovisTCL.so.%%VER1%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkInfovisTCL.so.%%VER2%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkInfovisTCL.so.%%VER3%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkParallelTCL.so
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkParallelTCL.so.%%VER1%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkParallelTCL.so.%%VER2%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkParallelTCL.so.%%VER3%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkRenderingTCL.so
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkRenderingTCL.so.%%VER1%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkRenderingTCL.so.%%VER2%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkRenderingTCL.so.%%VER3%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkViewsTCL.so
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkViewsTCL.so.%%VER1%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkViewsTCL.so.%%VER2%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkViewsTCL.so.%%VER3%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkVolumeRenderingTCL.so
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkVolumeRenderingTCL.so.%%VER1%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkVolumeRenderingTCL.so.%%VER2%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkVolumeRenderingTCL.so.%%VER3%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkWidgetsTCL.so
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkWidgetsTCL.so.%%VER1%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkWidgetsTCL.so.%%VER2%%
+%%SHARED%%%%TCLTK%%lib/vtk-%%VER2%%/libvtkWidgetsTCL.so.%%VER3%%
 %%TCLTK%%lib/vtk-%%VER2%%/pkgIndex.tcl
 %%TCLTK%%lib/vtk-%%VER2%%/tcl/README
 %%TCLTK%%lib/vtk-%%VER2%%/tcl/vtk/vtk.tcl
@@ -2575,122 +2625,122 @@ lib/vtk-%%VER2%%/doxygen/paper-clip.gif
 lib/vtk-%%VER2%%/doxygen/pic.gif
 lib/vtk-%%VER2%%/doxygen/vtk-logo.gif
 lib/vtk-%%VER2%%/hints
-lib/vtk-%%VER2%%/libCosmo.so
-lib/vtk-%%VER2%%/libMapReduceMPI.so
-lib/vtk-%%VER2%%/libMapReduceMPI.so.%%VER1%%
-lib/vtk-%%VER2%%/libMapReduceMPI.so.%%VER2%%
-lib/vtk-%%VER2%%/libVPIC.so
-lib/vtk-%%VER2%%/libmpistubs.so
-lib/vtk-%%VER2%%/libmpistubs.so.%%VER1%%
-lib/vtk-%%VER2%%/libmpistubs.so.%%VER2%%
-lib/vtk-%%VER2%%/libvtkCharts.so
-lib/vtk-%%VER2%%/libvtkCharts.so.%%VER1%%
-lib/vtk-%%VER2%%/libvtkCharts.so.%%VER2%%
-lib/vtk-%%VER2%%/libvtkCharts.so.%%VER3%%
-lib/vtk-%%VER2%%/libvtkCommon.so
-lib/vtk-%%VER2%%/libvtkCommon.so.%%VER1%%
-lib/vtk-%%VER2%%/libvtkCommon.so.%%VER2%%
-lib/vtk-%%VER2%%/libvtkCommon.so.%%VER3%%
-lib/vtk-%%VER2%%/libvtkDICOMParser.so
-lib/vtk-%%VER2%%/libvtkDICOMParser.so.%%VER1%%
-lib/vtk-%%VER2%%/libvtkDICOMParser.so.%%VER2%%
-lib/vtk-%%VER2%%/libvtkDICOMParser.so.%%VER3%%
-lib/vtk-%%VER2%%/libvtkFiltering.so
-lib/vtk-%%VER2%%/libvtkFiltering.so.%%VER1%%
-lib/vtk-%%VER2%%/libvtkFiltering.so.%%VER2%%
-lib/vtk-%%VER2%%/libvtkFiltering.so.%%VER3%%
-lib/vtk-%%VER2%%/libvtkGenericFiltering.so
-lib/vtk-%%VER2%%/libvtkGenericFiltering.so.%%VER1%%
-lib/vtk-%%VER2%%/libvtkGenericFiltering.so.%%VER2%%
-lib/vtk-%%VER2%%/libvtkGenericFiltering.so.%%VER3%%
-lib/vtk-%%VER2%%/libvtkGeovis.so
-lib/vtk-%%VER2%%/libvtkGeovis.so.%%VER1%%
-lib/vtk-%%VER2%%/libvtkGeovis.so.%%VER2%%
-lib/vtk-%%VER2%%/libvtkGeovis.so.%%VER3%%
-lib/vtk-%%VER2%%/libvtkGraphics.so
-lib/vtk-%%VER2%%/libvtkGraphics.so.%%VER1%%
-lib/vtk-%%VER2%%/libvtkGraphics.so.%%VER2%%
-lib/vtk-%%VER2%%/libvtkGraphics.so.%%VER3%%
-lib/vtk-%%VER2%%/libvtkHybrid.so
-lib/vtk-%%VER2%%/libvtkHybrid.so.%%VER1%%
-lib/vtk-%%VER2%%/libvtkHybrid.so.%%VER2%%
-lib/vtk-%%VER2%%/libvtkHybrid.so.%%VER3%%
-lib/vtk-%%VER2%%/libvtkIO.so
-lib/vtk-%%VER2%%/libvtkIO.so.%%VER1%%
-lib/vtk-%%VER2%%/libvtkIO.so.%%VER2%%
-lib/vtk-%%VER2%%/libvtkIO.so.%%VER3%%
-lib/vtk-%%VER2%%/libvtkImaging.so
-lib/vtk-%%VER2%%/libvtkImaging.so.%%VER1%%
-lib/vtk-%%VER2%%/libvtkImaging.so.%%VER2%%
-lib/vtk-%%VER2%%/libvtkImaging.so.%%VER3%%
-lib/vtk-%%VER2%%/libvtkInfovis.so
-lib/vtk-%%VER2%%/libvtkInfovis.so.%%VER1%%
-lib/vtk-%%VER2%%/libvtkInfovis.so.%%VER2%%
-lib/vtk-%%VER2%%/libvtkInfovis.so.%%VER3%%
-lib/vtk-%%VER2%%/libvtkNetCDF.so
-lib/vtk-%%VER2%%/libvtkNetCDF.so.%%VER1%%
-lib/vtk-%%VER2%%/libvtkNetCDF.so.%%VER2%%
-lib/vtk-%%VER2%%/libvtkNetCDF.so.%%VER3%%
-lib/vtk-%%VER2%%/libvtkParallel.so
-lib/vtk-%%VER2%%/libvtkParallel.so.%%VER1%%
-lib/vtk-%%VER2%%/libvtkParallel.so.%%VER2%%
-lib/vtk-%%VER2%%/libvtkParallel.so.%%VER3%%
-lib/vtk-%%VER2%%/libvtkRendering.so
-lib/vtk-%%VER2%%/libvtkRendering.so.%%VER1%%
-lib/vtk-%%VER2%%/libvtkRendering.so.%%VER2%%
-lib/vtk-%%VER2%%/libvtkRendering.so.%%VER3%%
-lib/vtk-%%VER2%%/libvtkViews.so
-lib/vtk-%%VER2%%/libvtkViews.so.%%VER1%%
-lib/vtk-%%VER2%%/libvtkViews.so.%%VER2%%
-lib/vtk-%%VER2%%/libvtkViews.so.%%VER3%%
-lib/vtk-%%VER2%%/libvtkVolumeRendering.so
-lib/vtk-%%VER2%%/libvtkVolumeRendering.so.%%VER1%%
-lib/vtk-%%VER2%%/libvtkVolumeRendering.so.%%VER2%%
-lib/vtk-%%VER2%%/libvtkVolumeRendering.so.%%VER3%%
-lib/vtk-%%VER2%%/libvtkWidgets.so
-lib/vtk-%%VER2%%/libvtkWidgets.so.%%VER1%%
-lib/vtk-%%VER2%%/libvtkWidgets.so.%%VER2%%
-lib/vtk-%%VER2%%/libvtkWidgets.so.%%VER3%%
-lib/vtk-%%VER2%%/libvtkalglib.so
-lib/vtk-%%VER2%%/libvtkalglib.so.%%VER1%%
-lib/vtk-%%VER2%%/libvtkalglib.so.%%VER2%%
-lib/vtk-%%VER2%%/libvtkalglib.so.%%VER3%%
-lib/vtk-%%VER2%%/libvtkexoIIc.so
-lib/vtk-%%VER2%%/libvtkexoIIc.so.%%VER1%%
-lib/vtk-%%VER2%%/libvtkexoIIc.so.%%VER2%%
-lib/vtk-%%VER2%%/libvtkexoIIc.so.%%VER3%%
-lib/vtk-%%VER2%%/libvtkfreetype.so
-lib/vtk-%%VER2%%/libvtkfreetype.so.%%VER1%%
-lib/vtk-%%VER2%%/libvtkfreetype.so.%%VER2%%
-lib/vtk-%%VER2%%/libvtkfreetype.so.%%VER3%%
-lib/vtk-%%VER2%%/libvtkftgl.so
-lib/vtk-%%VER2%%/libvtkftgl.so.%%VER1%%
-lib/vtk-%%VER2%%/libvtkftgl.so.%%VER2%%
-lib/vtk-%%VER2%%/libvtkftgl.so.%%VER3%%
-lib/vtk-%%VER2%%/libvtklibxml2.so
-lib/vtk-%%VER2%%/libvtklibxml2.so.%%VER1%%
-lib/vtk-%%VER2%%/libvtklibxml2.so.%%VER2%%
-lib/vtk-%%VER2%%/libvtklibxml2.so.%%VER3%%
-lib/vtk-%%VER2%%/libvtkmetaio.so
-lib/vtk-%%VER2%%/libvtkmetaio.so.%%VER1%%
-lib/vtk-%%VER2%%/libvtkmetaio.so.%%VER2%%
-lib/vtk-%%VER2%%/libvtkmetaio.so.%%VER3%%
-lib/vtk-%%VER2%%/libvtkproj4.so
-lib/vtk-%%VER2%%/libvtkproj4.so.%%VER1%%
-lib/vtk-%%VER2%%/libvtkproj4.so.%%VER2%%
-lib/vtk-%%VER2%%/libvtkproj4.so.%%VER3%%
-lib/vtk-%%VER2%%/libvtksqlite.so
-lib/vtk-%%VER2%%/libvtksqlite.so.%%VER1%%
-lib/vtk-%%VER2%%/libvtksqlite.so.%%VER2%%
-lib/vtk-%%VER2%%/libvtksqlite.so.%%VER3%%
-lib/vtk-%%VER2%%/libvtksys.so
-lib/vtk-%%VER2%%/libvtksys.so.%%VER1%%
-lib/vtk-%%VER2%%/libvtksys.so.%%VER2%%
-lib/vtk-%%VER2%%/libvtksys.so.%%VER3%%
-lib/vtk-%%VER2%%/libvtkverdict.so
-lib/vtk-%%VER2%%/libvtkverdict.so.%%VER1%%
-lib/vtk-%%VER2%%/libvtkverdict.so.%%VER2%%
-lib/vtk-%%VER2%%/libvtkverdict.so.%%VER3%%
+%%SHARED%%lib/vtk-%%VER2%%/libCosmo.so
+%%SHARED%%lib/vtk-%%VER2%%/libMapReduceMPI.so
+%%SHARED%%lib/vtk-%%VER2%%/libMapReduceMPI.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libMapReduceMPI.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libVPIC.so
+%%SHARED%%lib/vtk-%%VER2%%/libmpistubs.so
+%%SHARED%%lib/vtk-%%VER2%%/libmpistubs.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libmpistubs.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkCharts.so
+%%SHARED%%lib/vtk-%%VER2%%/libvtkCharts.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkCharts.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkCharts.so.%%VER3%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkCommon.so
+%%SHARED%%lib/vtk-%%VER2%%/libvtkCommon.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkCommon.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkCommon.so.%%VER3%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkDICOMParser.so
+%%SHARED%%lib/vtk-%%VER2%%/libvtkDICOMParser.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkDICOMParser.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkDICOMParser.so.%%VER3%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkFiltering.so
+%%SHARED%%lib/vtk-%%VER2%%/libvtkFiltering.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkFiltering.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkFiltering.so.%%VER3%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkGenericFiltering.so
+%%SHARED%%lib/vtk-%%VER2%%/libvtkGenericFiltering.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkGenericFiltering.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkGenericFiltering.so.%%VER3%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkGeovis.so
+%%SHARED%%lib/vtk-%%VER2%%/libvtkGeovis.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkGeovis.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkGeovis.so.%%VER3%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkGraphics.so
+%%SHARED%%lib/vtk-%%VER2%%/libvtkGraphics.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkGraphics.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkGraphics.so.%%VER3%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkHybrid.so
+%%SHARED%%lib/vtk-%%VER2%%/libvtkHybrid.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkHybrid.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkHybrid.so.%%VER3%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkIO.so
+%%SHARED%%lib/vtk-%%VER2%%/libvtkIO.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkIO.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkIO.so.%%VER3%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkImaging.so
+%%SHARED%%lib/vtk-%%VER2%%/libvtkImaging.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkImaging.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkImaging.so.%%VER3%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkInfovis.so
+%%SHARED%%lib/vtk-%%VER2%%/libvtkInfovis.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkInfovis.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkInfovis.so.%%VER3%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkNetCDF.so
+%%SHARED%%lib/vtk-%%VER2%%/libvtkNetCDF.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkNetCDF.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkNetCDF.so.%%VER3%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkParallel.so
+%%SHARED%%lib/vtk-%%VER2%%/libvtkParallel.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkParallel.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkParallel.so.%%VER3%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkRendering.so
+%%SHARED%%lib/vtk-%%VER2%%/libvtkRendering.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkRendering.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkRendering.so.%%VER3%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkViews.so
+%%SHARED%%lib/vtk-%%VER2%%/libvtkViews.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkViews.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkViews.so.%%VER3%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkVolumeRendering.so
+%%SHARED%%lib/vtk-%%VER2%%/libvtkVolumeRendering.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkVolumeRendering.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkVolumeRendering.so.%%VER3%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkWidgets.so
+%%SHARED%%lib/vtk-%%VER2%%/libvtkWidgets.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkWidgets.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkWidgets.so.%%VER3%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkalglib.so
+%%SHARED%%lib/vtk-%%VER2%%/libvtkalglib.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkalglib.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkalglib.so.%%VER3%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkexoIIc.so
+%%SHARED%%lib/vtk-%%VER2%%/libvtkexoIIc.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkexoIIc.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkexoIIc.so.%%VER3%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkfreetype.so
+%%SHARED%%lib/vtk-%%VER2%%/libvtkfreetype.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkfreetype.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkfreetype.so.%%VER3%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkftgl.so
+%%SHARED%%lib/vtk-%%VER2%%/libvtkftgl.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkftgl.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkftgl.so.%%VER3%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtklibxml2.so
+%%SHARED%%lib/vtk-%%VER2%%/libvtklibxml2.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtklibxml2.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtklibxml2.so.%%VER3%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkmetaio.so
+%%SHARED%%lib/vtk-%%VER2%%/libvtkmetaio.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkmetaio.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkmetaio.so.%%VER3%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkproj4.so
+%%SHARED%%lib/vtk-%%VER2%%/libvtkproj4.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkproj4.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkproj4.so.%%VER3%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtksqlite.so
+%%SHARED%%lib/vtk-%%VER2%%/libvtksqlite.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtksqlite.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtksqlite.so.%%VER3%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtksys.so
+%%SHARED%%lib/vtk-%%VER2%%/libvtksys.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtksys.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtksys.so.%%VER3%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkverdict.so
+%%SHARED%%lib/vtk-%%VER2%%/libvtkverdict.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkverdict.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkverdict.so.%%VER3%%
 lib/vtk-%%VER2%%/testing/FindString.tcl
 lib/vtk-%%VER2%%/testing/HeaderTesting.py
 lib/vtk-%%VER2%%/testing/PrintSelfCheck.tcl
@@ -2721,7 +2771,6 @@ lib/vtk-%%VER2%%/vtkWidgetsKit.cmake
 %%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/vtk/qt
 %%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/vtk/gtk
 %%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/vtk
-%%JAVA%%@dirrm lib/vtk-%%VER2%%/java/vtk
 %%JAVA%%@dirrm lib/vtk-%%VER2%%/java
 %%TCLTK%%@dirrm lib/vtk-%%VER2%%/tcl/vtkwidgets
 %%TCLTK%%@dirrm lib/vtk-%%VER2%%/tcl/vtkvolumerendering
@@ -2773,3 +2822,37 @@ lib/vtk-%%VER2%%/vtkWidgetsKit.cmake
 @dirrm include/vtk-%%VER2%%/Cosmo
 @comment The following directory is shared with multimedia/vtkmpeg2encode
 @dirrmtry include/vtk-%%VER2%%
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/libvtkChartsPython.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/libvtkCommonPython.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/libvtkFilteringPython.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/libvtkGenericFilteringPython.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/libvtkGeovisPython.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/libvtkGraphicsPython.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/libvtkHybridPython.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/libvtkIOPython.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/libvtkImagingPython.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/libvtkInfovisPython.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/libvtkParallelPython.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/libvtkRenderingPython.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/libvtkViewsPython.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/libvtkVolumeRenderingPython.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/libvtkWidgetsPython.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkChartsPythonD.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkCommonPythonD.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkFilteringPythonD.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkGenericFilteringPythonD.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkGeovisPythonD.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkGraphicsPythonD.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkHybridPythonD.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkIOPythonD.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkImagingPythonD.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkInfovisPythonD.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkParallelPythonD.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingPythonD.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkRenderingPythonTkWidgets.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkViewsPythonD.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkVolumeRenderingPythonD.so
+%%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkWidgetsPythonD.so
+%%QT%%lib/qt4/plugins/designer/libQVTKWidgetPlugin.so
+%%SHARED%%%%QT%%lib/vtk-%%VER2%%/libQVTK.so
+%%SHARED%%%%QT%%lib/vtk-%%VER2%%/libvtkQtChart.so