Update paraview to 2.4.3, fix build with new cmake (I think), and replace

several libraries built inside of VTK with system versions.

3 files changed, 41 insertions, 17 deletions

diff --git a/science/paraview/Makefile b/science/paraview/Makefile
index 5e0340ef9f32..2efda7d590fc 100644
--- a/science/paraview/Makefile
+++ b/science/paraview/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	paraview
-PORTVERSION=	2.4.2
+PORTVERSION=	2.4.3
 CATEGORIES=	science graphics
 MASTER_SITES=	http://www.paraview.org/files/v2.4/
 
@@ -14,9 +14,12 @@ MAINTAINER=	anholt@FreeBSD.org
 COMMENT=	ParaView is a powerful scientific data visualization application
 
 BUILD_DEPENDS=	cmake:${PORTSDIR}/devel/cmake
-LIB_DEPENDS=	hdf5.0:${PORTSDIR}/science/hdf5
-
-BROKEN=		Does not build
+LIB_DEPENDS=	hdf5.0:${PORTSDIR}/science/hdf5 \
+		png.5:${PORTSDIR}/graphics/png \
+		jpeg.9:${PORTSDIR}/graphics/jpeg \
+		tiff.4:${PORTSDIR}/graphics/tiff \
+		freetype.9:${PORTSDIR}/print/freetype2 \
+		expat.6:${PORTSDIR}/textproc/expat2
 
 USE_GL=		yes
 WRKSRC=		${WRKDIR}/${DISTNAME}-build
@@ -24,19 +27,29 @@ PATCH_WRKSRC=	${WRKDIR}/${DISTNAME}
 PLIST_SUB+=	VERMAJORMINOR=2.4
 CMAKE2INST=	Utilities/ParaViewConfig.cmake ParaViewConfig.cmake \
 		ParaViewLibraryDepends.cmake cmake_install.cmake
+MAKE_ENV=	CC="${CC}" \
+		CXX="${CXX}"
 LIB_INSTDIR=	${PREFIX}/lib/${PORTNAME}-${PORTVERSION:R}
 
+pre-patch:
+	${REINPLACE_CMD} -e 's|vtkpng|png|g' \
+		${WRKDIR}/paraview-${PORTVERSION}/GUI/Widgets/CMakeLists.txt
+		
 do-configure:
 	${MKDIR} ${WRKSRC}
 	cd ${WRKSRC} && \
 	${LOCALBASE}/bin/cmake ../${DISTNAME} \
 		-DCMAKE_INSTALL_PREFIX:PATH=${PREFIX} \
-		-DCMAKE_C_COMPILER=${CC} \
-		-DCMAKE_CXX_COMPILER=${CXX} \
-		-DCMAKE_C_FLAGS="${CFLAGS} -I${X11BASE}/include" \
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${X11BASE}/include" \
+		-DCMAKE_C_FLAGS="${CFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -I${X11BASE}/include -I${LOCALBASE}/include" \
 		-DPARAVIEW_USE_SYSTEM_HDF5=1 \
 		-DBUILD_SHARED_LIBS="ON" \
+		-DVTK_USE_SYSTEM_PNG="ON" \
+		-DVTK_USE_SYSTEM_JPEG="ON" \
+		-DVTK_USE_SYSTEM_TIFF="ON" \
+		-DVTK_USE_SYSTEM_ZLIB="ON" \
+		-DVTK_USE_SYSTEM_FREETYPE="ON" \
+		-DVTK_USE_SYSTEM_EXPAT="ON" \
 		-DVTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T=1
 
 post-install:
diff --git a/science/paraview/distinfo b/science/paraview/distinfo
index 5df52afd8871..bcfc0f6cf7cf 100644
--- a/science/paraview/distinfo
+++ b/science/paraview/distinfo
@@ -1,3 +1,3 @@
-MD5 (paraview-2.4.2.tar.gz) = ba116478de58e88d125e77c9f52b0072
-SHA256 (paraview-2.4.2.tar.gz) = a0e02c9284c38515507535aac0d6de8b515298c1a43ec992f3e706651dbd66c3
-SIZE (paraview-2.4.2.tar.gz) = 45366828
+MD5 (paraview-2.4.3.tar.gz) = db4e6974d8bba12de8a50748161b3f42
+SHA256 (paraview-2.4.3.tar.gz) = e84e984a31cbfb332706c3038f22ab92ffaae18e1edd3024fdba6a9f242cffc7
+SIZE (paraview-2.4.3.tar.gz) = 45423483
diff --git a/science/paraview/pkg-plist b/science/paraview/pkg-plist
index ea22ea85b07b..3bac46231de9 100644
--- a/science/paraview/pkg-plist
+++ b/science/paraview/pkg-plist
@@ -20,25 +20,35 @@ lib/paraview-%%VERMAJORMINOR%%/libSPCTH.so
 lib/paraview-%%VERMAJORMINOR%%/libXdmf.so
 lib/paraview-%%VERMAJORMINOR%%/libvtkClientServer.so
 lib/paraview-%%VERMAJORMINOR%%/libvtkCommon.so
+lib/paraview-%%VERMAJORMINOR%%/libvtkCommon.so.pv2.4
 lib/paraview-%%VERMAJORMINOR%%/libvtkCommonCS.so
 lib/paraview-%%VERMAJORMINOR%%/libvtkCommonTCL.so
 lib/paraview-%%VERMAJORMINOR%%/libvtkDICOMParser.so
+lib/paraview-%%VERMAJORMINOR%%/libvtkDICOMParser.so.pv2.4
 lib/paraview-%%VERMAJORMINOR%%/libvtkFiltering.so
+lib/paraview-%%VERMAJORMINOR%%/libvtkFiltering.so.pv2.4
 lib/paraview-%%VERMAJORMINOR%%/libvtkFilteringCS.so
 lib/paraview-%%VERMAJORMINOR%%/libvtkGenericFiltering.so
+lib/paraview-%%VERMAJORMINOR%%/libvtkGenericFiltering.so.pv2.4
 lib/paraview-%%VERMAJORMINOR%%/libvtkGenericFilteringCS.so
 lib/paraview-%%VERMAJORMINOR%%/libvtkGraphics.so
+lib/paraview-%%VERMAJORMINOR%%/libvtkGraphics.so.pv2.4
 lib/paraview-%%VERMAJORMINOR%%/libvtkGraphicsCS.so
 lib/paraview-%%VERMAJORMINOR%%/libvtkHybrid.so
+lib/paraview-%%VERMAJORMINOR%%/libvtkHybrid.so.pv2.4
 lib/paraview-%%VERMAJORMINOR%%/libvtkHybridCS.so
 lib/paraview-%%VERMAJORMINOR%%/libvtkIO.so
+lib/paraview-%%VERMAJORMINOR%%/libvtkIO.so.pv2.4
 lib/paraview-%%VERMAJORMINOR%%/libvtkIOCS.so
 lib/paraview-%%VERMAJORMINOR%%/libvtkImaging.so
+lib/paraview-%%VERMAJORMINOR%%/libvtkImaging.so.pv2.4
 lib/paraview-%%VERMAJORMINOR%%/libvtkImagingCS.so
 lib/paraview-%%VERMAJORMINOR%%/libvtkKWParaView.so
 lib/paraview-%%VERMAJORMINOR%%/libvtkKWParaViewCS.so
 lib/paraview-%%VERMAJORMINOR%%/libvtkMPEG2Encode.so
+lib/paraview-%%VERMAJORMINOR%%/libvtkMPEG2Encode.so.pv2.4
 lib/paraview-%%VERMAJORMINOR%%/libvtkNetCDF.so
+lib/paraview-%%VERMAJORMINOR%%/libvtkNetCDF.so.pv2.4
 lib/paraview-%%VERMAJORMINOR%%/libvtkPVFilters.so
 lib/paraview-%%VERMAJORMINOR%%/libvtkPVFiltersCS.so
 lib/paraview-%%VERMAJORMINOR%%/libvtkPVServerCommon.so
@@ -47,24 +57,25 @@ lib/paraview-%%VERMAJORMINOR%%/libvtkPVServerCommonTCL.so
 lib/paraview-%%VERMAJORMINOR%%/libvtkPVServerManager.so
 lib/paraview-%%VERMAJORMINOR%%/libvtkPVServerManagerTCL.so
 lib/paraview-%%VERMAJORMINOR%%/libvtkParallel.so
+lib/paraview-%%VERMAJORMINOR%%/libvtkParallel.so.pv2.4
 lib/paraview-%%VERMAJORMINOR%%/libvtkParallelCS.so
 lib/paraview-%%VERMAJORMINOR%%/libvtkRendering.so
+lib/paraview-%%VERMAJORMINOR%%/libvtkRendering.so.pv2.4
 lib/paraview-%%VERMAJORMINOR%%/libvtkRenderingCS.so
 lib/paraview-%%VERMAJORMINOR%%/libvtkVolumeRendering.so
+lib/paraview-%%VERMAJORMINOR%%/libvtkVolumeRendering.so.pv2.4
 lib/paraview-%%VERMAJORMINOR%%/libvtkVolumeRenderingCS.so
 lib/paraview-%%VERMAJORMINOR%%/libvtkWidgets.so
+lib/paraview-%%VERMAJORMINOR%%/libvtkWidgets.so.pv2.4
 lib/paraview-%%VERMAJORMINOR%%/libvtkWidgetsCS.so
 lib/paraview-%%VERMAJORMINOR%%/libvtkXdmf.so
 lib/paraview-%%VERMAJORMINOR%%/libvtkXdmfCS.so
 lib/paraview-%%VERMAJORMINOR%%/libvtkexoIIc.so
-lib/paraview-%%VERMAJORMINOR%%/libvtkexpat.so
-lib/paraview-%%VERMAJORMINOR%%/libvtkfreetype.so
+lib/paraview-%%VERMAJORMINOR%%/libvtkexoIIc.so.pv2.4
 lib/paraview-%%VERMAJORMINOR%%/libvtkftgl.so
-lib/paraview-%%VERMAJORMINOR%%/libvtkjpeg.so
-lib/paraview-%%VERMAJORMINOR%%/libvtkpng.so
+lib/paraview-%%VERMAJORMINOR%%/libvtkftgl.so.pv2.4
 lib/paraview-%%VERMAJORMINOR%%/libvtksys.so
-lib/paraview-%%VERMAJORMINOR%%/libvtktiff.so
-lib/paraview-%%VERMAJORMINOR%%/libvtkzlib.so
+lib/paraview-%%VERMAJORMINOR%%/libvtksys.so.pv2.4
 lib/paraview-%%VERMAJORMINOR%%/paraview-real
 lib/paraview-%%VERMAJORMINOR%%/pvbatch-real
 lib/paraview-%%VERMAJORMINOR%%/pvclient-real