- Fix post-patch conditional

- Fix PLIST when building static libraries (SHARED option OFF)
- Bump PORTREVISION

Feature safe:	yes

3 files changed, 31 insertions, 7 deletions

diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile
index ba5f18c8931f..a0793592ece4 100644
--- a/math/vtk5/Makefile
+++ b/math/vtk5/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	vtk
 PORTVERSION=	5.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math graphics
 MASTER_SITES=	http://www.vtk.org/files/release/${PORTVERSION:R}/ \
 		http://www.neuro.mcw.edu/Ports/distfiles/VTK5/
@@ -205,7 +205,7 @@ 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 defined(WITH_SHARED)
 	${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
diff --git a/math/vtk5/distinfo b/math/vtk5/distinfo
index 16f12c7abe79..3aa467e673db 100644
--- a/math/vtk5/distinfo
+++ b/math/vtk5/distinfo
@@ -1,3 +1,2 @@
-MD5 (vtk-5.6.1.tar.gz) = b80a76435207c5d0f74dfcab15b75181
 SHA256 (vtk-5.6.1.tar.gz) = 007be00bae6c7c96f78ca9709516c993a4e3221d0b1762a7fe70e2abe407e86d
 SIZE (vtk-5.6.1.tar.gz) = 20780311
diff --git a/math/vtk5/pkg-plist b/math/vtk5/pkg-plist
index e4ac7d4dab26..336d745df0a3 100644
--- a/math/vtk5/pkg-plist
+++ b/math/vtk5/pkg-plist
@@ -182,6 +182,29 @@
 %%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkWidgetsPythonD.so.%%VER1%%
 %%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkWidgetsPythonD.so.%%VER2%%
 %%SHARED%%%%PYTHON%%lib/vtk-%%VER2%%/libvtkWidgetsPythonD.so.%%VER3%%
+%%STATIC%%include/vtk-%%VER2%%/vtkzlib/zlib.h
+%%STATIC%%include/vtk-%%VER2%%/vtkzlib/zconf.h
+%%STATIC%%include/vtk-%%VER2%%/vtkzlib/vtk_zlib_mangle.h
+%%STATIC%%include/vtk-%%VER2%%/vtkzlib/zlibDllConfig.h
+%%STATIC%%include/vtk-%%VER2%%/vtkjpeg/jpegDllConfig.h
+%%STATIC%%include/vtk-%%VER2%%/vtkjpeg/jpeglib.h
+%%STATIC%%include/vtk-%%VER2%%/vtkjpeg/vtk_jpeg_mangle.h
+%%STATIC%%include/vtk-%%VER2%%/vtkjpeg/jconfig.h
+%%STATIC%%include/vtk-%%VER2%%/vtkjpeg/jmorecfg.h
+%%STATIC%%include/vtk-%%VER2%%/vtkjpeg/jerror.h
+%%STATIC%%include/vtk-%%VER2%%/vtkpng/pngDllConfig.h
+%%STATIC%%include/vtk-%%VER2%%/vtkpng/png.h
+%%STATIC%%include/vtk-%%VER2%%/vtkpng/pngconf.h
+%%STATIC%%include/vtk-%%VER2%%/vtkpng/vtk_png_mangle.h
+%%STATIC%%include/vtk-%%VER2%%/vtktiff/tiffDllConfig.h
+%%STATIC%%include/vtk-%%VER2%%/vtktiff/tiffvers.h
+%%STATIC%%include/vtk-%%VER2%%/vtktiff/vtk_tiff_mangle.h
+%%STATIC%%include/vtk-%%VER2%%/vtktiff/tiff.h
+%%STATIC%%include/vtk-%%VER2%%/vtktiff/tiffio.h
+%%STATIC%%include/vtk-%%VER2%%/vtktiff/tconf.h
+%%STATIC%%include/vtk-%%VER2%%/vtkexpat/expatDllConfig.h
+%%STATIC%%include/vtk-%%VER2%%/vtkexpat/expat.h
+%%STATIC%%include/vtk-%%VER2%%/vtkexpat/vtk_expat_mangle.h
 %%QT%%include/vtk-%%VER2%%/QFilterTreeProxyModel.h
 %%QT%%include/vtk-%%VER2%%/QVTKWidget.h
 %%QT%%include/vtk-%%VER2%%/QVTKWin32Header.h
@@ -478,13 +501,10 @@
 %%WRAP_PYTHON_OR_TCLTK%%include/vtk-%%VER2%%/TclTk/internals/tk%%TCLTK_VER%%/default.h
 %%WRAP_PYTHON_OR_TCLTK%%include/vtk-%%VER2%%/TclTk/internals/tk%%TCLTK_VER%%/tclInt.h
 %%WRAP_PYTHON_OR_TCLTK%%include/vtk-%%VER2%%/TclTk/internals/tk%%TCLTK_VER%%/tclIntDecls.h
-%%WRAP_PYTHON_OR_TCLTK%%include/vtk-%%VER2%%/TclTk/internals/tk%%TCLTK_VER%%/tclIntPlatDecls.h
-%%WRAP_PYTHON_OR_TCLTK%%include/vtk-%%VER2%%/TclTk/internals/tk%%TCLTK_VER%%/tclPort.h
-%%WRAP_PYTHON_OR_TCLTK%%include/vtk-%%VER2%%/TclTk/internals/tk%%TCLTK_VER%%/tclUnixPort.h
-%%WRAP_PYTHON_OR_TCLTK%%include/vtk-%%VER2%%/TclTk/internals/tk%%TCLTK_VER%%/tclWinPort.h
 %%WRAP_PYTHON_OR_TCLTK%%include/vtk-%%VER2%%/TclTk/internals/tk%%TCLTK_VER%%/tkInt.h
 %%WRAP_PYTHON_OR_TCLTK%%include/vtk-%%VER2%%/TclTk/internals/tk%%TCLTK_VER%%/tkIntDecls.h
 %%WRAP_PYTHON_OR_TCLTK%%include/vtk-%%VER2%%/TclTk/internals/tk%%TCLTK_VER%%/tkIntPlatDecls.h
+%%WRAP_PYTHON_OR_TCLTK%%include/vtk-%%VER2%%/TclTk/internals/tk%%TCLTK_VER%%/tkMacDefault.h
 %%WRAP_PYTHON_OR_TCLTK%%include/vtk-%%VER2%%/TclTk/internals/tk%%TCLTK_VER%%/tkMacOSXDefault.h
 %%WRAP_PYTHON_OR_TCLTK%%include/vtk-%%VER2%%/TclTk/internals/tk%%TCLTK_VER%%/tkMacOSXInt.h
 %%WRAP_PYTHON_OR_TCLTK%%include/vtk-%%VER2%%/TclTk/internals/tk%%TCLTK_VER%%/tkMacOSXPort.h
@@ -2850,5 +2870,10 @@ lib/vtk-%%VER2%%/vtkWidgetsKit.cmake
 @dirrm include/vtk-%%VER2%%/alglib
 @dirrm include/vtk-%%VER2%%/VPIC
 @dirrm include/vtk-%%VER2%%/Cosmo
+%%STATIC%%@dirrm include/vtk-%%VER2%%/vtkzlib
+%%STATIC%%@dirrm include/vtk-%%VER2%%/vtkjpeg
+%%STATIC%%@dirrm include/vtk-%%VER2%%/vtkpng
+%%STATIC%%@dirrm include/vtk-%%VER2%%/vtktiff
+%%STATIC%%@dirrm include/vtk-%%VER2%%/vtkexpat
 @comment The following directory is shared with multimedia/vtkmpeg2encode
 @dirrmtry include/vtk-%%VER2%%