- Update to 5.10.0

  Release notes: http://www.kitware.com/news/home/browse/408
- Convert to OptionsNG

7 files changed, 427 insertions, 49 deletions

diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile
index b02df6b014fd..2899e509a113 100644
--- a/math/vtk5/Makefile
+++ b/math/vtk5/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	vtk
-PORTVERSION=	5.8.0
-PORTREVISION=	3
+PORTVERSION=	5.10.0
 CATEGORIES=	math graphics
 MASTER_SITES=	http://www.vtk.org/files/release/${PORTVERSION:R}/ \
 		http://www.neuro.mcw.edu/Ports/distfiles/VTK5/
@@ -32,16 +31,16 @@ SUB_FILES=	vtk.3
 USE_CMAKE=	yes
 USE_XORG=	xt
 USE_LDCONFIG=	${PREFIX}/lib/vtk-${PORTVERSION:R}
+CXXFLAGS+=	-DUSE_INTERP_ERRORLINE
 MAKE_JOBS_SAFE=	yes
 
-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 \
-		WRAP_JAVA	"Enable Java wrapping" Off \
-		WRAP_PYTHON	"Enable Python wrapping" On \
-		WRAP_TCLTK	"Enable Tcl/Tk wrapping" On
+OPTIONS_DEFINE=	SHARED VTKMPEG2 GL2PS OSMESA QT4 JAVA PYTHON TCLTK
+OPTIONS_DEFAULT=SHARED GL2PS QT4 PYTHON TCLTK
+
+SHARED_DESC=	Build shared libraries
+VTKMPEG2_DESC=	Patented MPEG2 encoder module
+GL2PS_DESC=	OpenGL to PostScript conversion module
+OSMESA_DESC=	Use Mesa for off-screen rendering
 
 PLIST_SUB+=	VER1="${PORTVERSION}" \
 		VER2="${PORTVERSION:R}" \
@@ -61,11 +60,12 @@ CMAKE_ARGS+=	-DBUILD_DOCUMENTATION:BOOL=ON \
 		-DVTK_DATA_ROOT:PATH=${EXAMPLESDIR}/VTKData \
 		-DOPENGL_INCLUDE_DIR:PATH=${LOCALBASE}/include \
 		-DOPENGL_gl_LIBRARY:FILEPATH=${LOCALBASE}/lib/libGL.so \
-		-DOPENGL_glu_LIBRARY:FILEPATH=${LOCALBASE}/lib/libGLU.so
+		-DOPENGL_glu_LIBRARY:FILEPATH=${LOCALBASE}/lib/libGLU.so \
+		-DCMAKE_BUILD_TYPE=CMAKE_CXX_FLAGS_RELWITHDEBINFO
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_SHARED)
+.if ${PORT_OPTIONS:MSHARED}
 CMAKE_ARGS+=	-DBUILD_SHARED_LIBS:BOOL=ON \
 		-DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
 		-DVTK_USE_SYSTEM_JPEG:BOOL=ON \
@@ -85,7 +85,7 @@ PLIST_SUB+=	SHARED="@comment " \
 		STATIC=""
 .endif
 
-.if defined(WITH_VTKMPEG2)
+.if ${PORT_OPTIONS:MVTKMPEG2}
 LIB_DEPENDS+=	vtkMPEG2Encode:${PORTSDIR}/multimedia/vtkmpeg2encode
 PLIST_SUB+=	MPEG=""
 CMAKE_ARGS+=	-DVTK_USE_PATENTED:BOOL=ON \
@@ -96,7 +96,7 @@ CMAKE_ARGS+=	-DVTK_USE_PATENTED:BOOL=ON \
 PLIST_SUB+=	MPEG="@comment "
 .endif
 
-.if defined(WITH_GL2PS)
+.if ${PORT_OPTIONS:MGL2PS}
 LIB_DEPENDS+=	gl2ps:${PORTSDIR}/print/gl2ps
 CMAKE_ARGS+=	-DVTK_USE_GL2PS:BOOL=ON
 PLIST_SUB+=	GL2PS=""
@@ -104,7 +104,7 @@ PLIST_SUB+=	GL2PS=""
 PLIST_SUB+=	GL2PS="@comment "
 .endif
 
-.if defined(WITH_OSMESA)
+.if ${PORT_OPTIONS:MOSMESA}
 LIB_DEPENDS+=	OSMesa32:${PORTSDIR}/graphics/libosmesa
 CMAKE_ARGS+=	-DVTK_OPENGL_HAS_OSMESA:BOOL=ON \
 		-DOSMESA_INCLUDE_DIR:PATH=${LOCALBASE}/include/Mesa \
@@ -119,7 +119,7 @@ CMAKE_ARGS+=	-DVTK_USE_X:BOOL=ON
 PLIST_SUB+=	X11=""
 .endif
 
-.if defined(WITH_QT)
+.if ${PORT_OPTIONS:MQT4}
 USE_QT4=	corelib designer gui opengl qmake_build uic_build \
 		moc_build rcc_build
 CMAKE_ARGS+=	-DVTK_USE_GUISUPPORT:BOOL=ON \
@@ -134,8 +134,8 @@ CMAKE_ARGS+=	-DVTK_USE_GUISUPPORT:BOOL=OFF
 PLIST_SUB+=	QT="@comment "
 .endif
 
-.if defined(WITH_WRAP_PYTHON)
-.if !defined(WITH_SHARED)
+.if ${PORT_OPTIONS:MPYTHON}
+.if ${PORT_OPTIONS:MSHARED} == ""
 IGNORE=		python wrapping requires shared libraries.\
 		Run make config again and enable the SHARED option
 .endif
@@ -150,7 +150,7 @@ CMAKE_ARGS+=	-DVTK_WRAP_PYTHON:BOOL=OFF
 PLIST_SUB+=	PYTHON="@comment "
 .endif
 
-.if defined(WITH_WRAP_TCLTK)
+.if ${PORT_OPTIONS:MTCLTK}
 CMAKE_ARGS+=	-DVTK_WRAP_TCL:BOOL=ON
 PLIST_SUB+=	TCLTK=""
 .else
@@ -159,7 +159,7 @@ PLIST_SUB+=	TCLTK="@comment "
 .endif
 
 # Used by both tcl/tk and python
-.if defined(WITH_WRAP_TCLTK) || defined(WITH_WRAP_PYTHON)
+.if ${PORT_OPTIONS:MTCLTK} || ${PORT_OPTIONS:MPYTHON}
 USE_TCL=	84+
 USE_TK=		84+
 CMAKE_ARGS+=	-DVTK_USE_TK:BOOL=ON \
@@ -171,8 +171,8 @@ PLIST_SUB+=	WRAP_PYTHON_OR_TCLTK="" \
 PLIST_SUB+=	WRAP_PYTHON_OR_TCLTK="@comment "
 .endif
 
-.if defined(WITH_WRAP_JAVA)
-.if !defined(WITH_SHARED)
+.if ${PORT_OPTIONS:MJAVA}
+.if ${PORT_OPTIONS:MSHARED} == ""
 IGNORE=		java wrapping requires shared libraries.\
 		Run make config again and enable the SHARED option
 .endif
@@ -194,7 +194,7 @@ PLIST_SUB+=	JAVA="@comment "
 .endif
 
 # Wrapping
-.if defined(WITH_WRAP_PYTHON) || defined(WITH_WRAP_TCLTK) || defined(WITH_WRAP_JAVA)
+.if ${PORT_OPTIONS:MPYTHON} || ${PORT_OPTIONS:MTCLTK} || ${PORT_OPTIONS:MJAVA}
 PLIST_SUB+=	WRAPPING=""
 .else
 PLIST_SUB+=	WRAPPING="@comment "
@@ -206,24 +206,24 @@ post-patch:
 #	${REINPLACE_CMD} -e '222s|)|) \&\& !defined(__FreeBSD__)|' \
 #	    ${WRKSRC}/Utilities/kwsys/SharedForward.h.in
 	${REINPLACE_CMD} -e '25,30d' ${WRKSRC}/Wrapping/Python/setup.py.in
-.if defined(WITH_SHARED)
+.if ${PORT_OPTIONS:MSHARED}
 	${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|g' \
 	    ${WRKSRC}/IO/vtkPNGReader.cxx
 .endif
 
 post-configure:
-.if defined(WITH_WRAP_JAVA)
+.if ${PORT_OPTIONS:MJAVA}
 	${REINPLACE_CMD} -e 's|-ljawt$$||' \
 	    ${CONFIGURE_WRKSRC}/Wrapping/Java/CMakeFiles/VTKJavaExecutable.dir/link.txt
 .endif
 
 pre-install:
-.if defined(WITH_PYTHON)
+.if ${PORT_OPTIONS:MPYTHON}
 	${MKDIR} ${PYTHONPREFIX_SITELIBDIR}
 .endif
 	${MKDIR} ${MANPREFIX}/man/man3
 	${INSTALL_MAN} ${WRKDIR}/vtk.3 ${MANPREFIX}/man/man3
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.html ${DOCSDIR}
 .endif
@@ -234,7 +234,7 @@ LIBDIR=		${PREFIX}/lib/vtk-${PORTVERSION:R}/
 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)
+.if ${PORT_OPTIONS:MSHARED}
 	@for lib in ${LIBS_TOFIX}; do \
 		${CP} ${LIBDIR}/lib$$lib.so ${LIBDIR}/lib$$lib.so.${PORTVERSION}; \
 	done
@@ -244,7 +244,7 @@ post-install:
 		 ${LN} -sf $$lib.${PORTVERSION:R} $$lib.${PORTVERSION:R:R}; \
 		 ${LN} -sf $$lib.${PORTVERSION:R:R} $$lib; \
 	done
-.if defined(WITH_QT)
+.if ${PORT_OPTIONS:MQT4}
 	@for lib in ${LIBDIR}/libQVTK*.so; do \
 	    ${RM} -f $$lib; \
 	    ${LN} -sf $$lib.${PORTVERSION} $$lib; \
@@ -252,7 +252,7 @@ post-install:
 	done
 .endif
 .endif
-.if defined(WITH_VTKMPEG2)
+.if ${PORT_OPTIONS:MVTKMPEG2}
 	@${ECHO_CMD}
 	@${ECHO_CMD} "This port uses the patented MPEG2 encoder."
 	@${ECHO_CMD}
diff --git a/math/vtk5/distinfo b/math/vtk5/distinfo
index 153ca8d93cec..895f680ceb83 100644
--- a/math/vtk5/distinfo
+++ b/math/vtk5/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vtk-5.8.0.tar.gz) = 83ee74b83403590342c079a52b06eef7ab862417f941d5f4558aea25c6bbc2d5
-SIZE (vtk-5.8.0.tar.gz) = 23745803
+SHA256 (vtk-5.10.0.tar.gz) = 9dd8c750f5d974ca92734d0168db6b534109b9ec30461eb7082a9f71d4716392
+SIZE (vtk-5.10.0.tar.gz) = 24803686
diff --git a/math/vtk5/files/patch-Common_vtkMath.h b/math/vtk5/files/patch-Common_vtkMath.h
new file mode 100644
index 000000000000..37cbbf418580
--- /dev/null
+++ b/math/vtk5/files/patch-Common_vtkMath.h
@@ -0,0 +1,17 @@
+--- Common/vtkMath.h.orig	2012-05-12 13:59:27.000000000 +0200
++++ Common/vtkMath.h	2012-09-13 09:24:53.000000000 +0200
+@@ -1336,6 +1336,7 @@
+   return result;
+ }
+ 
++#ifndef __WRAP__
+ #if defined(VTK_HAS_ISINF)
+ //-----------------------------------------------------------------------------
+ inline int vtkMath::IsInf(double x)
+@@ -1351,5 +1352,6 @@
+   return (isnan(x) ? 1 : 0);
+ }
+ #endif
++#endif
+ 
+ #endif
diff --git a/math/vtk5/files/patch-Rendering_vtkTkRenderWidget.cxx b/math/vtk5/files/patch-Rendering_vtkTkRenderWidget.cxx
new file mode 100644
index 000000000000..0d6d22ee07e0
--- /dev/null
+++ b/math/vtk5/files/patch-Rendering_vtkTkRenderWidget.cxx
@@ -0,0 +1,38 @@
+--- Rendering/vtkTkRenderWidget.cxx.orig
++++ Rendering/vtkTkRenderWidget.cxx
+@@ -941,8 +941,9 @@ static int vtkTkRenderWidget_MakeRenderWindow(struct vtkTkRenderWidget *self)
+     vtkTclGetObjectFromPointer(self->Interp, self->RenderWindow,
+                                "vtkRenderWindow");
+ #endif
+-    self->RW = ckalloc(
+-      static_cast<unsigned int>(strlen(Tcl_GetStringResult(self->Interp)) + 1));
++    // in Tcl 8.6.x, ckalloc was changed to return "void *".
++    self->RW = static_cast<char *>(ckalloc(
++      static_cast<unsigned int>(strlen(Tcl_GetStringResult(self->Interp)) + 1)));
+     strcpy(self->RW, Tcl_GetStringResult(self->Interp));
+     Tcl_ResetResult(self->Interp);
+     }
+@@ -1113,8 +1114,9 @@ vtkTkRenderWidget_MakeRenderWindow(struct vtkTkRenderWidget *self)
+     vtkTclGetObjectFromPointer(self->Interp, self->RenderWindow,
+           "vtkRenderWindow");
+ #endif
+-    self->RW = ckalloc(
+-      static_cast<unsigned int>(strlen(Tcl_GetStringResult(self->Interp)) + 1));
++    // in Tcl 8.6.x, ckalloc was changed to return "void *".
++    self->RW = static_cast<char *>(ckalloc(
++      static_cast<unsigned int>(strlen(Tcl_GetStringResult(self->Interp)) + 1)));
+     strcpy(self->RW, Tcl_GetStringResult(self->Interp));
+     Tcl_ResetResult(self->Interp);
+     }
+@@ -1306,8 +1308,9 @@ vtkTkRenderWidget_MakeRenderWindow(struct vtkTkRenderWidget *self)
+     vtkTclGetObjectFromPointer(self->Interp, self->RenderWindow,
+           "vtkRenderWindow");
+ #endif
+-    self->RW = ckalloc(
+-      static_cast<unsigned int>(strlen(Tcl_GetStringResult(self->Interp)) + 1));
++    // in Tcl 8.6.x, ckalloc was changed to return "void *".
++    self->RW = static_cast<char *>(ckalloc(
++      static_cast<unsigned int>(strlen(Tcl_GetStringResult(self->Interp)) + 1)));
+     strcpy(self->RW, Tcl_GetStringResult(self->Interp));
+     Tcl_ResetResult(self->Interp);
+     }
diff --git a/math/vtk5/files/patch-Utilities-LSDyna_LSDynaFamily.cxx b/math/vtk5/files/patch-Utilities-LSDyna_LSDynaFamily.cxx
new file mode 100644
index 000000000000..4b6e410ddab1
--- /dev/null
+++ b/math/vtk5/files/patch-Utilities-LSDyna_LSDynaFamily.cxx
@@ -0,0 +1,11 @@
+--- Utilities/LSDyna/LSDynaFamily.cxx.orig	2012-09-07 10:04:57.000000000 +0200
++++ Utilities/LSDyna/LSDynaFamily.cxx	2012-09-07 10:07:21.000000000 +0200
+@@ -33,7 +33,7 @@
+ namespace
+ {
+ //Documentation on why the exemption
+-#define USE_STAT_64 VTK_SIZEOF_ID_TYPE==8 && !defined _DARWIN_FEATURE_64_BIT_INODE
++#define USE_STAT_64 VTK_SIZEOF_ID_TYPE==8 && !defined _DARWIN_FEATURE_64_BIT_INODE && !defined __FreeBSD__
+ //OSX uses stat instead of stat64
+ #if (USE_STAT_64)
+ //64bit
diff --git a/math/vtk5/files/patch-Wrapping_vtkParsePreprocess.c b/math/vtk5/files/patch-Wrapping_vtkParsePreprocess.c
new file mode 100644
index 000000000000..de2ef183e521
--- /dev/null
+++ b/math/vtk5/files/patch-Wrapping_vtkParsePreprocess.c
@@ -0,0 +1,129 @@
+--- Wrapping/vtkParsePreprocess.c.orig	2012-09-10 16:13:54.000000000 +0200
++++ Wrapping/vtkParsePreprocess.c	2012-09-10 16:14:03.000000000 +0200
+@@ -33,6 +33,9 @@
+ 
+ #define PREPROC_DEBUG 0
+ 
++/** Block size for reading files */
++#define FILE_BUFFER_SIZE 8192
++
+ /** Preprocessor tokens. */
+ enum _preproc_token_t
+ {
+@@ -1787,10 +1790,10 @@
+   PreprocessInfo *info, const char *filename, int system_first)
+ {
+   char *tbuf;
+-  size_t tbuflen = 8192;
++  size_t tbuflen = FILE_BUFFER_SIZE;
+   char *line;
+   size_t linelen = 80;
+-  size_t i, j, n;
++  size_t i, j, n, r;
+   int in_comment = 0;
+   int in_quote = 0;
+   int result = VTK_PARSE_OK;
+@@ -1849,29 +1852,48 @@
+   info->IsExternal = 1;
+   info->FileName = path;
+ 
+-  tbuf = (char *)malloc(tbuflen);
++  tbuf = (char *)malloc(tbuflen+4);
+   line = (char *)malloc(linelen);
+ 
+   /* the buffer must hold a whole line for it to be processed */
+   j = 0;
+   i = 0;
+   n = 0;
++  r = 0;
+ 
+   do
+     {
+-    if (i == n)
++    if (i >= n)
+       {
++      /* recycle unused lookahead chars */
++      if (r)
++        {
++        r = n + 2 - i;
++        if (r == 2)
++          {
++          tbuf[0] = tbuf[tbuflen-2];
++          tbuf[1] = tbuf[tbuflen-1];
++          }
++        else if (r == 1)
++          {
++          tbuf[0] = tbuf[tbuflen-1];
++          }
++        }
++
+       /* read the next chunk of the file */
+       i = 0;
+       if (feof(fp))
+         {
+-        n = 0;
++        /* still have the lookahead chars left */
++        n = r;
++        r = 0;
+         }
+       else
+         {
++        /* fill the remainder of the buffer */
+         errno = 0;
+-        i = 0;
+-        while ((n = fread(tbuf, 1, tbuflen, fp)) == 0 && ferror(fp))
++        tbuflen = r + FILE_BUFFER_SIZE;
++        while ((n = fread(&tbuf[r], 1, tbuflen-r, fp)) == 0 && ferror(fp))
+           {
+           if (errno != EINTR)
+             {
+@@ -1884,6 +1906,22 @@
+           errno = 0;
+           clearerr(fp);
+           }
++
++        if (n + r < tbuflen)
++          {
++          /* this only occurs if the final fread does not fill the buffer */
++          n += r;
++          r = 0;
++          }
++        else
++          {
++          /* set a lookahead reserve of two chars */
++          n -= (2 - r);
++          r = 2;
++          }
++
++        /* guard against lookahead past last char in file */
++        tbuf[n + r] = '\0';
+         }
+       }
+ 
+@@ -1891,7 +1929,7 @@
+     while (i < n)
+       {
+       /* expand line buffer as necessary */
+-      if (j+4 > linelen)
++      while (j+4 > linelen)
+         {
+         linelen *= 2;
+         line = (char *)realloc(line, linelen);
+@@ -1917,7 +1955,7 @@
+           line[j++] = tbuf[i++];
+           in_quote = 0;
+           }
+-        else if (tbuf[i] == '\\' && tbuf[i] == '\"')
++        else if (tbuf[i] == '\\' && tbuf[i+1] == '\"')
+           {
+           line[j++] = tbuf[i++];
+           line[j++] = tbuf[i++];
+@@ -1927,7 +1965,7 @@
+           line[j++] = tbuf[i++];
+           }
+         }
+-      else if (tbuf[i] == '/' && tbuf[i] == '*')
++      else if (tbuf[i] == '/' && tbuf[i+1] == '*')
+         {
+         line[j++] = tbuf[i++];
+         line[j++] = tbuf[i++];
diff --git a/math/vtk5/pkg-plist b/math/vtk5/pkg-plist
index 2f9b10d170b4..8df02461e4e8 100644
--- a/math/vtk5/pkg-plist
+++ b/math/vtk5/pkg-plist
@@ -16,12 +16,18 @@
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/geovis.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/graphics.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/graphics.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/gtk/GtkGLExtVTKRenderWindow.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/gtk/GtkGLExtVTKRenderWindow.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/gtk/GtkGLExtVTKRenderWindowInteractor.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/gtk/GtkGLExtVTKRenderWindowInteractor.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/gtk/GtkVTKRenderWindow.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/gtk/GtkVTKRenderWindow.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/gtk/GtkVTKRenderWindowInteractor.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/gtk/GtkVTKRenderWindowInteractor.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/gtk/__init__.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/gtk/__init__.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/chemistry.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/chemistry.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/hybrid.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/hybrid.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/vtk/imaging.py
@@ -419,6 +425,7 @@
 %%TCLTK%%lib/vtk-%%VER2%%/tcl/README
 %%TCLTK%%lib/vtk-%%VER2%%/tcl/vtk/vtk.tcl
 %%TCLTK%%lib/vtk-%%VER2%%/tcl/vtkbase/vtkbase.tcl
+%%TCLTK%%lib/vtk-%%VER2%%/tcl/vtkcharts/vtkcharts.tcl
 %%TCLTK%%lib/vtk-%%VER2%%/tcl/vtkcommon/vtkcommon.tcl
 %%TCLTK%%lib/vtk-%%VER2%%/tcl/vtkfiltering/vtkfiltering.tcl
 %%TCLTK%%lib/vtk-%%VER2%%/tcl/vtkgeovis/vtkgeovis.tcl
@@ -508,7 +515,6 @@ include/vtk-%%VER2%%/alglib/reflections.h
 include/vtk-%%VER2%%/alglib/rotations.h
 include/vtk-%%VER2%%/alglib/svd.h
 include/vtk-%%VER2%%/internal/stdio_core.h
-include/vtk-%%VER2%%/metaIOConfig.h
 include/vtk-%%VER2%%/mrmpi/cmapreduce.h
 include/vtk-%%VER2%%/mrmpi/error.h
 include/vtk-%%VER2%%/mrmpi/hash.h
@@ -642,7 +648,6 @@ include/vtk-%%VER2%%/vtkBiQuadraticTriangle.h
 include/vtk-%%VER2%%/vtkBitArray.h
 include/vtk-%%VER2%%/vtkBitArrayIterator.h
 include/vtk-%%VER2%%/vtkBivariateLinearTableThreshold.h
-include/vtk-%%VER2%%/vtkBivariateStatisticsAlgorithm.h
 include/vtk-%%VER2%%/vtkBlankStructuredGrid.h
 include/vtk-%%VER2%%/vtkBlankStructuredGridWithImage.h
 include/vtk-%%VER2%%/vtkBlockIdScalars.h
@@ -1581,7 +1586,6 @@ include/vtk-%%VER2%%/vtkOpenGLGPUVolumeRayCastMapper.h
 include/vtk-%%VER2%%/vtkOpenGLGlyph3DMapper.h
 include/vtk-%%VER2%%/vtkOpenGLHAVSVolumeMapper.h
 include/vtk-%%VER2%%/vtkOpenGLHardwareSupport.h
-include/vtk-%%VER2%%/vtkOpenGLImageActor.h
 include/vtk-%%VER2%%/vtkOpenGLImageMapper.h
 include/vtk-%%VER2%%/vtkOpenGLLight.h
 include/vtk-%%VER2%%/vtkOpenGLLightingPainter.h
@@ -2230,7 +2234,6 @@ include/vtk-%%VER2%%/vtkUnicodeString.h
 include/vtk-%%VER2%%/vtkUnicodeStringArray.h
 include/vtk-%%VER2%%/vtkUniformGrid.h
 include/vtk-%%VER2%%/vtkUniformVariables.h
-include/vtk-%%VER2%%/vtkUnivariateStatisticsAlgorithm.h
 include/vtk-%%VER2%%/vtkUnsignedCharArray.h
 include/vtk-%%VER2%%/vtkUnsignedIntArray.h
 include/vtk-%%VER2%%/vtkUnsignedLongArray.h
@@ -2408,6 +2411,150 @@ include/vtk-%%VER2%%/vtkXMLWriter.h
 include/vtk-%%VER2%%/vtkXMLWriterC.h
 %%X11%%include/vtk-%%VER2%%/vtkXOpenGLRenderWindow.h
 %%X11%%include/vtk-%%VER2%%/vtkXRenderWindowInteractor.h
+include/vtk-%%VER2%%/LSDyna/LSDynaExport.h
+include/vtk-%%VER2%%/LSDyna/LSDynaFamily.h
+include/vtk-%%VER2%%/LSDyna/LSDynaMetaData.h
+include/vtk-%%VER2%%/vtkAbstractImageInterpolator.h
+include/vtk-%%VER2%%/vtkArrayDataReader.h
+include/vtk-%%VER2%%/vtkArrayDataWriter.h
+include/vtk-%%VER2%%/vtkAtom.h
+include/vtk-%%VER2%%/vtkAxisExtended.h
+include/vtk-%%VER2%%/vtkAxisFollower.h
+include/vtk-%%VER2%%/vtkBSplineTransform.h
+include/vtk-%%VER2%%/vtkBond.h
+include/vtk-%%VER2%%/vtkBooleanOperationPolyDataFilter.h
+include/vtk-%%VER2%%/vtkBrokenLineWidget.h
+include/vtk-%%VER2%%/vtkCellCentersPointPlacer.h
+include/vtk-%%VER2%%/vtkCellTreeLocator.h
+include/vtk-%%VER2%%/vtkCenterOfMass.h
+include/vtk-%%VER2%%/vtkChartMatrix.h
+include/vtk-%%VER2%%/vtkCirclePackFrontChainLayoutStrategy.h
+include/vtk-%%VER2%%/vtkCirclePackLayout.h
+include/vtk-%%VER2%%/vtkCirclePackLayoutStrategy.h
+include/vtk-%%VER2%%/vtkCirclePackToPolyData.h
+include/vtk-%%VER2%%/vtkColorMaterialHelper_vs.h
+include/vtk-%%VER2%%/vtkContextKeyEvent.h
+include/vtk-%%VER2%%/vtkConvexHull2D.h
+include/vtk-%%VER2%%/vtkDepthPeeling_fs.h
+include/vtk-%%VER2%%/vtkDistancePolyDataFilter.h
+include/vtk-%%VER2%%/vtkFixedSizeHandleRepresentation3D.h
+include/vtk-%%VER2%%/vtkGPUVolumeRayCastMapper_AdditiveCroppingFS.h
+include/vtk-%%VER2%%/vtkGPUVolumeRayCastMapper_AdditiveFS.h
+include/vtk-%%VER2%%/vtkGPUVolumeRayCastMapper_AdditiveNoCroppingFS.h
+include/vtk-%%VER2%%/vtkGPUVolumeRayCastMapper_CompositeBinaryMaskFS.h
+include/vtk-%%VER2%%/vtkGPUVolumeRayCastMapper_CompositeCroppingFS.h
+include/vtk-%%VER2%%/vtkGPUVolumeRayCastMapper_CompositeFS.h
+include/vtk-%%VER2%%/vtkGPUVolumeRayCastMapper_CompositeMaskFS.h
+include/vtk-%%VER2%%/vtkGPUVolumeRayCastMapper_CompositeNoCroppingFS.h
+include/vtk-%%VER2%%/vtkGPUVolumeRayCastMapper_FourComponentsFS.h
+include/vtk-%%VER2%%/vtkGPUVolumeRayCastMapper_HeaderFS.h
+include/vtk-%%VER2%%/vtkGPUVolumeRayCastMapper_MIPBinaryMaskFS.h
+include/vtk-%%VER2%%/vtkGPUVolumeRayCastMapper_MIPCroppingFS.h
+include/vtk-%%VER2%%/vtkGPUVolumeRayCastMapper_MIPFS.h
+include/vtk-%%VER2%%/vtkGPUVolumeRayCastMapper_MIPFourDependentCroppingFS.h
+include/vtk-%%VER2%%/vtkGPUVolumeRayCastMapper_MIPFourDependentFS.h
+include/vtk-%%VER2%%/vtkGPUVolumeRayCastMapper_MIPFourDependentNoCroppingFS.h
+include/vtk-%%VER2%%/vtkGPUVolumeRayCastMapper_MIPNoCroppingFS.h
+include/vtk-%%VER2%%/vtkGPUVolumeRayCastMapper_MinIPBinaryMaskFS.h
+include/vtk-%%VER2%%/vtkGPUVolumeRayCastMapper_MinIPCroppingFS.h
+include/vtk-%%VER2%%/vtkGPUVolumeRayCastMapper_MinIPFS.h
+include/vtk-%%VER2%%/vtkGPUVolumeRayCastMapper_MinIPFourDependentCroppingFS.h
+include/vtk-%%VER2%%/vtkGPUVolumeRayCastMapper_MinIPFourDependentFS.h
+include/vtk-%%VER2%%/vtkGPUVolumeRayCastMapper_MinIPFourDependentNoCroppingFS.h
+include/vtk-%%VER2%%/vtkGPUVolumeRayCastMapper_MinIPNoCroppingFS.h
+include/vtk-%%VER2%%/vtkGPUVolumeRayCastMapper_NoShadeFS.h
+include/vtk-%%VER2%%/vtkGPUVolumeRayCastMapper_OneComponentFS.h
+include/vtk-%%VER2%%/vtkGPUVolumeRayCastMapper_ParallelProjectionFS.h
+include/vtk-%%VER2%%/vtkGPUVolumeRayCastMapper_PerspectiveProjectionFS.h
+include/vtk-%%VER2%%/vtkGPUVolumeRayCastMapper_ScaleBiasFS.h
+include/vtk-%%VER2%%/vtkGPUVolumeRayCastMapper_ShadeFS.h
+include/vtk-%%VER2%%/vtkGaussianBlurPassShader_fs.h
+include/vtk-%%VER2%%/vtkGraphAnnotationLayersFilter.h
+include/vtk-%%VER2%%/vtkGraphWeightEuclideanDistanceFilter.h
+include/vtk-%%VER2%%/vtkGraphWeightFilter.h
+include/vtk-%%VER2%%/vtkImageBSplineCoefficients.h
+include/vtk-%%VER2%%/vtkImageBSplineInternals.h
+include/vtk-%%VER2%%/vtkImageBSplineInterpolator.h
+include/vtk-%%VER2%%/vtkImageCroppingRegionsWidget.h
+include/vtk-%%VER2%%/vtkImageDataToPointSet.h
+include/vtk-%%VER2%%/vtkImageHistogram.h
+include/vtk-%%VER2%%/vtkImageHistogramStatistics.h
+include/vtk-%%VER2%%/vtkImageInterpolator.h
+include/vtk-%%VER2%%/vtkImageInterpolatorInternals.h
+include/vtk-%%VER2%%/vtkImageMapper3D.h
+include/vtk-%%VER2%%/vtkImageProperty.h
+include/vtk-%%VER2%%/vtkImageResize.h
+include/vtk-%%VER2%%/vtkImageResliceMapper.h
+include/vtk-%%VER2%%/vtkImageResliceToColors.h
+include/vtk-%%VER2%%/vtkImageSincInterpolator.h
+include/vtk-%%VER2%%/vtkImageSlabReslice.h
+include/vtk-%%VER2%%/vtkImageSlice.h
+include/vtk-%%VER2%%/vtkImageSliceCollection.h
+include/vtk-%%VER2%%/vtkImageSliceMapper.h
+include/vtk-%%VER2%%/vtkImageStack.h
+include/vtk-%%VER2%%/vtkImageThresholdConnectivity.h
+include/vtk-%%VER2%%/vtkImageToStructuredGrid.h
+include/vtk-%%VER2%%/vtkImplicitPolyDataDistance.h
+include/vtk-%%VER2%%/vtkIntersectionPolyDataFilter.h
+include/vtk-%%VER2%%/vtkKCoreDecomposition.h
+include/vtk-%%VER2%%/vtkKCoreLayout.h
+include/vtk-%%VER2%%/vtkLSDynaPart.h
+include/vtk-%%VER2%%/vtkLSDynaPartCollection.h
+include/vtk-%%VER2%%/vtkLSDynaSummaryParser.h
+include/vtk-%%VER2%%/vtkLightingHelper_s.h
+include/vtk-%%VER2%%/vtkLighting_s.h
+include/vtk-%%VER2%%/vtkLineIntegralConvolution2D_fs.h
+include/vtk-%%VER2%%/vtkLineIntegralConvolution2D_fs1.h
+include/vtk-%%VER2%%/vtkLineIntegralConvolution2D_fs2.h
+include/vtk-%%VER2%%/vtkLinearSelector.h
+include/vtk-%%VER2%%/vtkMarchingCubesTriangleCases.h
+include/vtk-%%VER2%%/vtkMarchingSquaresLineCases.h
+include/vtk-%%VER2%%/vtkMathConfigure.h
+include/vtk-%%VER2%%/vtkMathUtilities.h
+include/vtk-%%VER2%%/vtkMolecule.h
+include/vtk-%%VER2%%/vtkNetCDFCAMReader.h
+include/vtk-%%VER2%%/vtkOpenGLImageSliceMapper.h
+include/vtk-%%VER2%%/vtkOpenGLPropertyDefaultMain_fs.h
+include/vtk-%%VER2%%/vtkOpenGLPropertyDefaultMain_vs.h
+include/vtk-%%VER2%%/vtkOpenGLPropertyDefaultPropFunc_fs.h
+include/vtk-%%VER2%%/vtkOpenGLPropertyDefaultPropFunc_vs.h
+include/vtk-%%VER2%%/vtkOpenGLRenderer_PeelingFS.h
+include/vtk-%%VER2%%/vtkPLSDynaReader.h
+include/vtk-%%VER2%%/vtkPMaskPoints.h
+include/vtk-%%VER2%%/vtkPYoungsMaterialInterface.h
+include/vtk-%%VER2%%/vtkPiecewisePointHandleItem.h
+include/vtk-%%VER2%%/vtkPolarAxesActor.h
+include/vtk-%%VER2%%/vtkPolyPlane.h
+include/vtk-%%VER2%%/vtkProjectedAAHexahedraMapper_FS.h
+include/vtk-%%VER2%%/vtkProjectedAAHexahedraMapper_GS.h
+include/vtk-%%VER2%%/vtkProjectedAAHexahedraMapper_VS.h
+include/vtk-%%VER2%%/vtkQtDebugLeaksModel.h
+include/vtk-%%VER2%%/vtkQtDebugLeaksView.h
+include/vtk-%%VER2%%/vtkQuadRotationalExtrusionFilter.h
+include/vtk-%%VER2%%/vtkRectilinearGridToPointSet.h
+include/vtk-%%VER2%%/vtkResliceCursor.h
+include/vtk-%%VER2%%/vtkResliceCursorActor.h
+include/vtk-%%VER2%%/vtkResliceCursorLineRepresentation.h
+include/vtk-%%VER2%%/vtkResliceCursorPicker.h
+include/vtk-%%VER2%%/vtkResliceCursorPolyDataAlgorithm.h
+include/vtk-%%VER2%%/vtkResliceCursorRepresentation.h
+include/vtk-%%VER2%%/vtkResliceCursorThickLineRepresentation.h
+include/vtk-%%VER2%%/vtkResliceCursorWidget.h
+include/vtk-%%VER2%%/vtkResliceImageViewer.h
+include/vtk-%%VER2%%/vtkResliceImageViewerMeasurements.h
+include/vtk-%%VER2%%/vtkScatterPlotMatrix.h
+include/vtk-%%VER2%%/vtkShaderDeviceAdapter2.h
+include/vtk-%%VER2%%/vtkShadowMapPassShader_fs.h
+include/vtk-%%VER2%%/vtkShadowMapPassShader_vs.h
+include/vtk-%%VER2%%/vtkSimplePointsWriter.h
+include/vtk-%%VER2%%/vtkSobelGradientMagnitudePassShader1_fs.h
+include/vtk-%%VER2%%/vtkSobelGradientMagnitudePassShader2_fs.h
+include/vtk-%%VER2%%/vtkStructuredGridLIC2D_fs.h
+include/vtk-%%VER2%%/vtkSurfaceLICPainter_fs1.h
+include/vtk-%%VER2%%/vtkSurfaceLICPainter_fs2.h
+include/vtk-%%VER2%%/vtkSurfaceLICPainter_vs1.h
+include/vtk-%%VER2%%/vtkTreeIterator.h
+include/vtk-%%VER2%%/vtkTuple.h
 include/vtk-%%VER2%%/vtkXYPlotActor.h
 include/vtk-%%VER2%%/vtkXYPlotWidget.h
 include/vtk-%%VER2%%/vtkXYZMolReader.h
@@ -2416,7 +2563,9 @@ include/vtk-%%VER2%%/vtkZLibDataCompressor.h
 include/vtk-%%VER2%%/vtk_expat.h
 include/vtk-%%VER2%%/vtk_freetype.h
 include/vtk-%%VER2%%/vtk_gl2ps.h
+include/vtk-%%VER2%%/vtk_hdf5.h
 include/vtk-%%VER2%%/vtk_jpeg.h
+include/vtk-%%VER2%%/vtk_libproj4.h
 include/vtk-%%VER2%%/vtk_libxml2.h
 include/vtk-%%VER2%%/vtk_oggtheora.h
 include/vtk-%%VER2%%/vtk_png.h
@@ -2432,6 +2581,7 @@ include/vtk-%%VER2%%/vtkfreetype/include/freetype/ftadvanc.h
 include/vtk-%%VER2%%/vtkfreetype/include/freetype/ftbbox.h
 include/vtk-%%VER2%%/vtkfreetype/include/freetype/ftbdf.h
 include/vtk-%%VER2%%/vtkfreetype/include/freetype/ftbitmap.h
+include/vtk-%%VER2%%/vtkfreetype/include/freetype/ftbzip2.h
 include/vtk-%%VER2%%/vtkfreetype/include/freetype/ftcache.h
 include/vtk-%%VER2%%/vtkfreetype/include/freetype/ftchapters.h
 include/vtk-%%VER2%%/vtkfreetype/include/freetype/ftcid.h
@@ -2477,7 +2627,6 @@ include/vtk-%%VER2%%/vtkfreetype/include/freetype/internal/ftstream.h
 include/vtk-%%VER2%%/vtkfreetype/include/freetype/internal/fttrace.h
 include/vtk-%%VER2%%/vtkfreetype/include/freetype/internal/ftvalid.h
 include/vtk-%%VER2%%/vtkfreetype/include/freetype/internal/internal.h
-include/vtk-%%VER2%%/vtkfreetype/include/freetype/internal/pcftypes.h
 include/vtk-%%VER2%%/vtkfreetype/include/freetype/internal/psaux.h
 include/vtk-%%VER2%%/vtkfreetype/include/freetype/internal/pshints.h
 include/vtk-%%VER2%%/vtkfreetype/include/freetype/internal/sfnt.h
@@ -2509,6 +2658,7 @@ include/vtk-%%VER2%%/vtkhdf5/H5CSprivate.h
 include/vtk-%%VER2%%/vtkhdf5/H5Cpkg.h
 include/vtk-%%VER2%%/vtkhdf5/H5Cprivate.h
 include/vtk-%%VER2%%/vtkhdf5/H5Cpublic.h
+include/vtk-%%VER2%%/vtkhdf5/H5DSpublic.h
 include/vtk-%%VER2%%/vtkhdf5/H5Dpkg.h
 include/vtk-%%VER2%%/vtkhdf5/H5Dprivate.h
 include/vtk-%%VER2%%/vtkhdf5/H5Dpublic.h
@@ -2553,9 +2703,12 @@ include/vtk-%%VER2%%/vtkhdf5/H5HLpkg.h
 include/vtk-%%VER2%%/vtkhdf5/H5HLprivate.h
 include/vtk-%%VER2%%/vtkhdf5/H5HLpublic.h
 include/vtk-%%VER2%%/vtkhdf5/H5HPprivate.h
+include/vtk-%%VER2%%/vtkhdf5/H5IMpublic.h
 include/vtk-%%VER2%%/vtkhdf5/H5Ipkg.h
 include/vtk-%%VER2%%/vtkhdf5/H5Iprivate.h
 include/vtk-%%VER2%%/vtkhdf5/H5Ipublic.h
+include/vtk-%%VER2%%/vtkhdf5/H5LTparse.h
+include/vtk-%%VER2%%/vtkhdf5/H5LTpublic.h
 include/vtk-%%VER2%%/vtkhdf5/H5Lpkg.h
 include/vtk-%%VER2%%/vtkhdf5/H5Lprivate.h
 include/vtk-%%VER2%%/vtkhdf5/H5Lpublic.h
@@ -2568,6 +2721,7 @@ include/vtk-%%VER2%%/vtkhdf5/H5Opkg.h
 include/vtk-%%VER2%%/vtkhdf5/H5Oprivate.h
 include/vtk-%%VER2%%/vtkhdf5/H5Opublic.h
 include/vtk-%%VER2%%/vtkhdf5/H5Oshared.h
+include/vtk-%%VER2%%/vtkhdf5/H5PTpublic.h
 include/vtk-%%VER2%%/vtkhdf5/H5Ppkg.h
 include/vtk-%%VER2%%/vtkhdf5/H5Pprivate.h
 include/vtk-%%VER2%%/vtkhdf5/H5Ppublic.h
@@ -2583,6 +2737,7 @@ include/vtk-%%VER2%%/vtkhdf5/H5STprivate.h
 include/vtk-%%VER2%%/vtkhdf5/H5Spkg.h
 include/vtk-%%VER2%%/vtkhdf5/H5Sprivate.h
 include/vtk-%%VER2%%/vtkhdf5/H5Spublic.h
+include/vtk-%%VER2%%/vtkhdf5/H5TBpublic.h
 include/vtk-%%VER2%%/vtkhdf5/H5TSprivate.h
 include/vtk-%%VER2%%/vtkhdf5/H5Tpkg.h
 include/vtk-%%VER2%%/vtkhdf5/H5Tprivate.h
@@ -2599,6 +2754,8 @@ include/vtk-%%VER2%%/vtkhdf5/H5pubconf.h
 include/vtk-%%VER2%%/vtkhdf5/H5public.h
 include/vtk-%%VER2%%/vtkhdf5/H5version.h
 include/vtk-%%VER2%%/vtkhdf5/hdf5.h
+include/vtk-%%VER2%%/vtkhdf5/hdf5_hl.h
+include/vtk-%%VER2%%/vtkhdf5/vtk_libhdf5_hl_mangle.h
 include/vtk-%%VER2%%/vtkhdf5/vtk_libhdf5_mangle.h
 include/vtk-%%VER2%%/vtklibproj4/lib_proj.h
 include/vtk-%%VER2%%/vtklibproj4/proj_config.h
@@ -2659,9 +2816,11 @@ include/vtk-%%VER2%%/vtkmetaio/metaContour.h
 include/vtk-%%VER2%%/vtkmetaio/metaDTITube.h
 include/vtk-%%VER2%%/vtkmetaio/metaEllipse.h
 include/vtk-%%VER2%%/vtkmetaio/metaEvent.h
+include/vtk-%%VER2%%/vtkmetaio/metaFEMObject.h
 include/vtk-%%VER2%%/vtkmetaio/metaForm.h
 include/vtk-%%VER2%%/vtkmetaio/metaGaussian.h
 include/vtk-%%VER2%%/vtkmetaio/metaGroup.h
+include/vtk-%%VER2%%/vtkmetaio/metaIOConfig.h
 include/vtk-%%VER2%%/vtkmetaio/metaITKUtils.h
 include/vtk-%%VER2%%/vtkmetaio/metaImage.h
 include/vtk-%%VER2%%/vtkmetaio/metaImageTypes.h
@@ -2679,11 +2838,24 @@ include/vtk-%%VER2%%/vtkmetaio/metaTubeGraph.h
 include/vtk-%%VER2%%/vtkmetaio/metaTypes.h
 include/vtk-%%VER2%%/vtkmetaio/metaUtils.h
 include/vtk-%%VER2%%/vtkmetaio/metaVesselTube.h
+include/vtk-%%VER2%%/vtknetcdf/include/fbits.h
+include/vtk-%%VER2%%/vtknetcdf/include/nc.h
+include/vtk-%%VER2%%/vtknetcdf/include/nc3dispatch.h
+include/vtk-%%VER2%%/vtknetcdf/include/nc_logging.h
+include/vtk-%%VER2%%/vtknetcdf/include/nc_tests.h
+include/vtk-%%VER2%%/vtknetcdf/include/nc_url.h
+include/vtk-%%VER2%%/vtknetcdf/include/ncdimscale.h
+include/vtk-%%VER2%%/vtknetcdf/include/ncdispatch.h
+include/vtk-%%VER2%%/vtknetcdf/include/ncio.h
+include/vtk-%%VER2%%/vtknetcdf/include/nclist.h
+include/vtk-%%VER2%%/vtknetcdf/include/netcdf.h
+include/vtk-%%VER2%%/vtknetcdf/include/netcdf_f.h
+include/vtk-%%VER2%%/vtknetcdf/include/netcdf_par.h
+include/vtk-%%VER2%%/vtknetcdf/include/utf8proc.h
+include/vtk-%%VER2%%/vtknetcdf/include/vtk_netcdf_mangle.h
 include/vtk-%%VER2%%/vtknetcdf/ncconfig.h
-include/vtk-%%VER2%%/vtknetcdf/netcdf.h
-include/vtk-%%VER2%%/vtknetcdf/netcdf3.h
+include/vtk-%%VER2%%/vtknetcdf/ncvalues.h
 include/vtk-%%VER2%%/vtknetcdf/netcdfcpp.h
-include/vtk-%%VER2%%/vtknetcdf/vtk_netcdf_mangle.h
 include/vtk-%%VER2%%/vtksqlite/vtk_sqlite3.h
 include/vtk-%%VER2%%/vtkstd/algorithm
 include/vtk-%%VER2%%/vtkstd/deque
@@ -2788,19 +2960,14 @@ lib/vtk-%%VER2%%/doxygen/paper-clip.gif
 lib/vtk-%%VER2%%/doxygen/pic.gif
 lib/vtk-%%VER2%%/doxygen/vtk-logo.gif
 lib/vtk-%%VER2%%/hints
-%%SHARED%%lib/vtk-%%VER2%%/libvtkhdf5.so.%%VER1%%
-%%SHARED%%lib/vtk-%%VER2%%/libvtkhdf5.so.%%VER2%%
-%%SHARED%%lib/vtk-%%VER2%%/libvtkhdf5.so.%%VER3%%
-%%SHARED%%lib/vtk-%%VER2%%/libvtkhdf5.so
-%%SHARED%%lib/vtk-%%VER2%%/libvtkhdf5.so.1.8.5
-%%SHARED%%lib/vtk-%%VER2%%/libvtkNetCDF_cxx.so
-%%SHARED%%lib/vtk-%%VER2%%/libvtkNetCDF_cxx.so.%%VER1%%
-%%SHARED%%lib/vtk-%%VER2%%/libvtkNetCDF_cxx.so.%%VER2%%
-%%SHARED%%lib/vtk-%%VER2%%/libvtkNetCDF_cxx.so.%%VER3%%
 %%SHARED%%lib/vtk-%%VER2%%/libCosmo.so
 %%SHARED%%lib/vtk-%%VER2%%/libCosmo.so.%%VER1%%
 %%SHARED%%lib/vtk-%%VER2%%/libCosmo.so.%%VER2%%
 %%SHARED%%lib/vtk-%%VER2%%/libCosmo.so.%%VER3%%
+%%SHARED%%lib/vtk-%%VER2%%/libLSDyna.so
+%%SHARED%%lib/vtk-%%VER2%%/libLSDyna.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libLSDyna.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libLSDyna.so.%%VER3%%
 %%SHARED%%lib/vtk-%%VER2%%/libMapReduceMPI.so
 %%SHARED%%lib/vtk-%%VER2%%/libMapReduceMPI.so.%%VER1%%
 %%SHARED%%lib/vtk-%%VER2%%/libMapReduceMPI.so.%%VER2%%
@@ -2861,6 +3028,10 @@ lib/vtk-%%VER2%%/hints
 %%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%%/libvtkNetCDF_cxx.so
+%%SHARED%%lib/vtk-%%VER2%%/libvtkNetCDF_cxx.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkNetCDF_cxx.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkNetCDF_cxx.so.%%VER3%%
 %%SHARED%%lib/vtk-%%VER2%%/libvtkParallel.so
 %%SHARED%%lib/vtk-%%VER2%%/libvtkParallel.so.%%VER1%%
 %%SHARED%%lib/vtk-%%VER2%%/libvtkParallel.so.%%VER2%%
@@ -2897,6 +3068,15 @@ lib/vtk-%%VER2%%/hints
 %%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%%/libvtkhdf5.so
+%%SHARED%%lib/vtk-%%VER2%%/libvtkhdf5.so.%%VER1%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkhdf5.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkhdf5.so.%%VER3%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkhdf5.so.1.8.5
+%%SHARED%%lib/vtk-%%VER2%%/libvtkhdf5_hl.so
+%%SHARED%%lib/vtk-%%VER2%%/libvtkhdf5_hl.so.%%VER2%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkhdf5_hl.so.%%VER3%%
+%%SHARED%%lib/vtk-%%VER2%%/libvtkhdf5_hl.so.1.8.5
 %%SHARED%%lib/vtk-%%VER2%%/libvtklibxml2.so
 %%SHARED%%lib/vtk-%%VER2%%/libvtklibxml2.so.%%VER1%%
 %%SHARED%%lib/vtk-%%VER2%%/libvtklibxml2.so.%%VER2%%
@@ -2987,6 +3167,7 @@ lib/vtk-%%VER2%%/vtkWidgetsKit.cmake
 %%TCLTK%%@dirrm lib/vtk-%%VER2%%/tcl/vtkgeovis
 %%TCLTK%%@dirrm lib/vtk-%%VER2%%/tcl/vtkfiltering
 %%TCLTK%%@dirrm lib/vtk-%%VER2%%/tcl/vtkcommon
+%%TCLTK%%@dirrm lib/vtk-%%VER2%%/tcl/vtkcharts
 %%TCLTK%%@dirrm lib/vtk-%%VER2%%/tcl/vtkbase
 %%TCLTK%%@dirrm lib/vtk-%%VER2%%/tcl/vtk
 %%TCLTK%%@dirrm lib/vtk-%%VER2%%/tcl
@@ -3005,6 +3186,7 @@ lib/vtk-%%VER2%%/vtkWidgetsKit.cmake
 @dirrm include/vtk-%%VER2%%/vtksys
 @dirrm include/vtk-%%VER2%%/vtkstd
 @dirrm include/vtk-%%VER2%%/vtksqlite
+@dirrm include/vtk-%%VER2%%/vtknetcdf/include
 @dirrm include/vtk-%%VER2%%/vtknetcdf
 @dirrm include/vtk-%%VER2%%/vtkmetaio
 @dirrm include/vtk-%%VER2%%/vtklibxml2/libxml
@@ -3020,6 +3202,7 @@ lib/vtk-%%VER2%%/vtkWidgetsKit.cmake
 @dirrm include/vtk-%%VER2%%/internal
 @dirrm include/vtk-%%VER2%%/alglib
 @dirrm include/vtk-%%VER2%%/VPIC
+@dirrm include/vtk-%%VER2%%/LSDyna
 @dirrm include/vtk-%%VER2%%/Cosmo
 %%STATIC%%@dirrm include/vtk-%%VER2%%/vtkzlib
 %%STATIC%%@dirrm include/vtk-%%VER2%%/vtkjpeg