- Update to 3.8.1.

- Disable broken Mangled Mesa support.
- Add GL2PS knob.
- Disable conflict with vtk 5.
- Use bsd.port.options.mk.
- Fix COMMENT.

PR:		ports/153163
Submitted by:	Stas Timokhin <devel@stasyan.com> (maintainer)

3 files changed, 60 insertions, 31 deletions

diff --git a/science/paraview/Makefile b/science/paraview/Makefile
index 453b6e65678..142dda221d9 100644
--- a/science/paraview/Makefile
+++ b/science/paraview/Makefile
@@ -6,13 +6,13 @@
 #
 
 PORTNAME=	paraview
-PORTVERSION=	3.8.0
+PORTVERSION=	3.8.1
 CATEGORIES=	science graphics
 MASTER_SITES=	http://www.paraview.org/files/v3.8/
 DISTNAME=	ParaView-${PORTVERSION}
 
 MAINTAINER=	devel@stasyan.com
-COMMENT=	ParaView is a powerful scientific data visualization application
+COMMENT=	Powerful scientific data visualization application
 
 LIB_DEPENDS=	hdf5.0:${PORTSDIR}/science/hdf5 \
 		png.6:${PORTSDIR}/graphics/png \
@@ -31,7 +31,7 @@ USE_XORG=	x11 xt
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_CMAKE=	yes
-CONFLICTS=	vtk-5.*
+#CONFLICTS=	vtk-5.*
 CMAKE_ARGS+=	-DPARAVIEW_USE_SYSTEM_HDF5=1 \
 		-DBUILD_SHARED_LIBS="ON" \
 		-DVTK_USE_SYSTEM_PNG="ON" \
@@ -45,29 +45,33 @@ CMAKE_ARGS+=	-DPARAVIEW_USE_SYSTEM_HDF5=1 \
 		-DQT_ASSISTANT_EXECUTABLE="${LOCALBASE}/bin/assistant-qt4" \
 		-DVTK_INSTALL_QT_PLUGIN_DIR="${PREFIX}/${QT_PLUGINDIR_REL}/designer" \
 		-DPARAVIEW_INSTALL_DEVELOPMENT="ON" \
-		-DPV_INSTALL_DOC_DIR=${DOCSDIR}
+		-DPV_INSTALL_DOC_DIR=${DOCSDIR} \
+		-DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES="OFF"
 #		-DVTK_PYTHON_INCLUDE_PATH=${PYTHON_INCLUDEDIR} \
 #		-DPYTHON_INCLUDE_PATH:FILEPATH=${PYTHON_INCLUDEDIR} \
 #		-DVTK_WRAP_PYTHON:BOOL=ON \
 #		-DPARAVIEW_ENABLE_PYTHON:BOOL=ON
 #		-DVTK_PYTHON_SETUP_ARGS:STRING='--prefix="${PREFIX}"' \
 
-OPTIONS=	MANGLEDMESA	"Use off-screen (Mangled) Mesa" Off
+OPTIONS=	OSMESA	"Use Mesa for off-screen rendering" Off \
+		GL2PS		"Install support conversion OpenGL to PostScript" On
 #		VTKMPEG2	"Install patented MPEG2 encoder module" Off \
-#		GL2PS           "Install support conversion OpenGL to PostScript" On
 
-.if defined(WITH_MANGLEDMESA)
-LIB_DEPENDS+=	MesaGL.14:${PORTSDIR}/graphics/mesagl
-CMAKE_ARGS+=	-DVTK_OPENGL_HAS_OSMESA:BOOL=OFF	\
-		-DVTK_USE_MANGLED_MESA:BOOL=ON \
-		-DMANGLED_MESA_INCLUDE_DIR:PATH=${LOCALBASE}/include/Mesa \
-		-DMANGLED_MESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libMesaGL.so \
-		-DMANGLED_OSMESA_INCLUDE_DIR:PATH=${LOCALBASE}/include/Mesa \
-		-DMANGLED_OSMESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libMesaOSMesa.so
-.else
-LIB_DEPENDS+=	OSMesa.7:${PORTSDIR}/graphics/libosmesa
+.include <bsd.port.options.mk>
+
+.if defined(WITH_OSMESA)
+LIB_DEPENDS+=	OSMesa32.7:${PORTSDIR}/graphics/libosmesa
 CMAKE_ARGS+=	-DVTK_OPENGL_HAS_OSMESA:BOOL=ON \
-		-DOSMESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa.so
+		-DOSMESA_INCLUDE_DIR:PATH=${LOCALBASE}/include/Mesa \
+		-DOSMESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa32.so
+.endif
+
+.if defined(WITH_GL2PS)
+LIB_DEPENDS+=	gl2ps.1:${PORTSDIR}/print/gl2ps
+CMAKE_ARGS+=	-DVTK_USE_GL2PS:BOOL=ON
+PLIST_SUB+=	GL2PS=""
+.else
+PLIST_SUB+=	GL2PS="@comment "
 .endif
 
 MAKE_JOBS_SAFE=	yes
@@ -80,7 +84,7 @@ LIB_INSTDIR=	${PREFIX}/lib/${PORTNAME}-${PORTVERSION:R}
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 700000
+.if ${OSVERSION} < 700042
 BROKEN=		does not build on 6.x
 .endif
 
diff --git a/science/paraview/distinfo b/science/paraview/distinfo
index 8f1d0356391..47951bf1ddf 100644
--- a/science/paraview/distinfo
+++ b/science/paraview/distinfo
@@ -1,3 +1,2 @@
-MD5 (ParaView-3.8.0.tar.gz) = 4f371631c373452b202a3d91f2cca12f
-SHA256 (ParaView-3.8.0.tar.gz) = fe26c5aab225e804a9d890007d3963988c5f1000bdb270576dc9c2549c6a4078
-SIZE (ParaView-3.8.0.tar.gz) = 31703024
+SHA256 (ParaView-3.8.1.tar.gz) = 37647172af0ac7fc3b677cc2d1e2e825cf364cb4915190da74f19992d84e263c
+SIZE (ParaView-3.8.1.tar.gz) = 33123181
diff --git a/science/paraview/pkg-plist b/science/paraview/pkg-plist
index ca8ee33d8ad..c31fd3d4b01 100644
--- a/science/paraview/pkg-plist
+++ b/science/paraview/pkg-plist
@@ -7,7 +7,6 @@ bin/pvserver
 bin/smTestDriver
 bin/vtkEncodeString
 bin/vtkWrapClientServer
-%%DOCSDIR%%/paraview.qch
 include/paraview-%%VERMAJORMINOR%%/Cosmo/BasicDefinition.h
 include/paraview-%%VERMAJORMINOR%%/Cosmo/ChainingMesh.h
 include/paraview-%%VERMAJORMINOR%%/Cosmo/CosmoDefinition.h
@@ -326,6 +325,7 @@ include/paraview-%%VERMAJORMINOR%%/Qt/Components/Resources/UI/pqDisplayRepresent
 include/paraview-%%VERMAJORMINOR%%/Qt/Components/Resources/UI/pqEditServerStartupDialog.ui
 include/paraview-%%VERMAJORMINOR%%/Qt/Components/Resources/UI/pqEmptyView.ui
 include/paraview-%%VERMAJORMINOR%%/Qt/Components/Resources/UI/pqExodusIIPanel.ui
+include/paraview-%%VERMAJORMINOR%%/Qt/Components/Resources/UI/pqFixStateFilenamesDialog.ui
 include/paraview-%%VERMAJORMINOR%%/Qt/Components/Resources/UI/pqGlobalRenderViewOptions.ui
 include/paraview-%%VERMAJORMINOR%%/Qt/Components/Resources/UI/pqHandleWidget.ui
 include/paraview-%%VERMAJORMINOR%%/Qt/Components/Resources/UI/pqImplicitPlaneWidget.ui
@@ -389,6 +389,7 @@ include/paraview-%%VERMAJORMINOR%%/Qt/Widgets/Resources/UI/pqHelpWindow.ui
 include/paraview-%%VERMAJORMINOR%%/Qt/Widgets/Resources/UI/pqQuickLaunchDialog.ui
 include/paraview-%%VERMAJORMINOR%%/QtWidgetsExport.h
 include/paraview-%%VERMAJORMINOR%%/QtWidgetsPlugin.h
+include/paraview-%%VERMAJORMINOR%%/VPIC/GridExchange.h
 include/paraview-%%VERMAJORMINOR%%/VPIC/VPICDataSet.h
 include/paraview-%%VERMAJORMINOR%%/VPIC/VPICDefinition.h
 include/paraview-%%VERMAJORMINOR%%/VPIC/VPICGlobal.h
@@ -446,7 +447,6 @@ include/paraview-%%VERMAJORMINOR%%/Xdmf/vtkXdmfReader.h
 include/paraview-%%VERMAJORMINOR%%/Xdmf/vtkXdmfReaderInternal.h
 include/paraview-%%VERMAJORMINOR%%/Xdmf/vtkXdmfRenderWindowInteractor.h
 include/paraview-%%VERMAJORMINOR%%/Xdmf/vtkXdmfWriter.h
-include/paraview-%%VERMAJORMINOR%%/Xdmf/vtkXdmfWriter2.h
 include/paraview-%%VERMAJORMINOR%%/alglib/ap.h
 include/paraview-%%VERMAJORMINOR%%/alglib/apvt.h
 include/paraview-%%VERMAJORMINOR%%/alglib/bdsvd.h
@@ -629,6 +629,8 @@ include/paraview-%%VERMAJORMINOR%%/pqFileDialogFilter.h
 include/paraview-%%VERMAJORMINOR%%/pqFileDialogModel.h
 include/paraview-%%VERMAJORMINOR%%/pqFileDialogRecentDirsModel.h
 include/paraview-%%VERMAJORMINOR%%/pqFiltersMenuReaction.h
+include/paraview-%%VERMAJORMINOR%%/pqFixPathsInStateFilesBehavior.h
+include/paraview-%%VERMAJORMINOR%%/pqFixStateFilenamesDialog.h
 include/paraview-%%VERMAJORMINOR%%/pqFlatTreeView.h
 include/paraview-%%VERMAJORMINOR%%/pqFlatTreeViewEventPlayer.h
 include/paraview-%%VERMAJORMINOR%%/pqFlatTreeViewEventTranslator.h
@@ -900,6 +902,7 @@ include/paraview-%%VERMAJORMINOR%%/vtkAMRDualGridHelper.h
 include/paraview-%%VERMAJORMINOR%%/vtkAVSucdReader.h
 include/paraview-%%VERMAJORMINOR%%/vtkAbstractArray.h
 include/paraview-%%VERMAJORMINOR%%/vtkAbstractCellLocator.h
+include/paraview-%%VERMAJORMINOR%%/vtkAbstractContextBufferId.h
 include/paraview-%%VERMAJORMINOR%%/vtkAbstractInterpolatedVelocityField.h
 include/paraview-%%VERMAJORMINOR%%/vtkAbstractIterator.h
 include/paraview-%%VERMAJORMINOR%%/vtkAbstractIterator.txx
@@ -1265,6 +1268,8 @@ include/paraview-%%VERMAJORMINOR%%/vtkDelaunay3D.h
 include/paraview-%%VERMAJORMINOR%%/vtkDelimitedTextReader.h
 include/paraview-%%VERMAJORMINOR%%/vtkDelimitedTextWriter.h
 include/paraview-%%VERMAJORMINOR%%/vtkDemandDrivenPipeline.h
+include/paraview-%%VERMAJORMINOR%%/vtkDenseArray.h
+include/paraview-%%VERMAJORMINOR%%/vtkDenseArray.txx
 include/paraview-%%VERMAJORMINOR%%/vtkDensifyPolyData.h
 include/paraview-%%VERMAJORMINOR%%/vtkDepthPeelingPass.h
 include/paraview-%%VERMAJORMINOR%%/vtkDepthSortPolyData.h
@@ -1428,6 +1433,7 @@ include/paraview-%%VERMAJORMINOR%%/vtkFunctionParser.h
 include/paraview-%%VERMAJORMINOR%%/vtkFunctionSet.h
 include/paraview-%%VERMAJORMINOR%%/vtkGAMBITReader.h
 include/paraview-%%VERMAJORMINOR%%/vtkGESignaReader.h
+%%GL2PS%%include/paraview-%%VERMAJORMINOR%%/vtkGL2PSExporter.h
 include/paraview-%%VERMAJORMINOR%%/vtkGLSLShader.h
 include/paraview-%%VERMAJORMINOR%%/vtkGLSLShaderDeviceAdapter.h
 include/paraview-%%VERMAJORMINOR%%/vtkGLSLShaderDeviceAdapter2.h
@@ -1815,6 +1821,7 @@ include/paraview-%%VERMAJORMINOR%%/vtkInteractorStyleUser.h
 include/paraview-%%VERMAJORMINOR%%/vtkInterpolateDataSetAttributes.h
 include/paraview-%%VERMAJORMINOR%%/vtkInterpolatedVelocityField.h
 include/paraview-%%VERMAJORMINOR%%/vtkInterpolatingSubdivisionFilter.h
+include/paraview-%%VERMAJORMINOR%%/vtkIntersectFragments.h
 include/paraview-%%VERMAJORMINOR%%/vtkIterativeClosestPointTransform.h
 include/paraview-%%VERMAJORMINOR%%/vtkJPEGReader.h
 include/paraview-%%VERMAJORMINOR%%/vtkJPEGWriter.h
@@ -1889,6 +1896,7 @@ include/paraview-%%VERMAJORMINOR%%/vtkMINC.h
 include/paraview-%%VERMAJORMINOR%%/vtkMINCImageAttributes.h
 include/paraview-%%VERMAJORMINOR%%/vtkMINCImageReader.h
 include/paraview-%%VERMAJORMINOR%%/vtkMINCImageWriter.h
+include/paraview-%%VERMAJORMINOR%%/vtkMPASReader.h
 include/paraview-%%VERMAJORMINOR%%/vtkMPICompositeManager.h
 include/paraview-%%VERMAJORMINOR%%/vtkMPIImageReader.h
 include/paraview-%%VERMAJORMINOR%%/vtkMPIMToNSocketConnection.h
@@ -1906,6 +1914,17 @@ include/paraview-%%VERMAJORMINOR%%/vtkMaskFields.h
 include/paraview-%%VERMAJORMINOR%%/vtkMaskPoints.h
 include/paraview-%%VERMAJORMINOR%%/vtkMaskPolyData.h
 include/paraview-%%VERMAJORMINOR%%/vtkMassProperties.h
+include/paraview-%%VERMAJORMINOR%%/vtkMaterialInterfaceCommBuffer.h
+include/paraview-%%VERMAJORMINOR%%/vtkMaterialInterfaceFilter.h
+include/paraview-%%VERMAJORMINOR%%/vtkMaterialInterfaceIdList.h
+include/paraview-%%VERMAJORMINOR%%/vtkMaterialInterfaceIdListItem.h
+include/paraview-%%VERMAJORMINOR%%/vtkMaterialInterfacePieceLoading.h
+include/paraview-%%VERMAJORMINOR%%/vtkMaterialInterfacePieceTransaction.h
+include/paraview-%%VERMAJORMINOR%%/vtkMaterialInterfacePieceTransactionMatrix.h
+include/paraview-%%VERMAJORMINOR%%/vtkMaterialInterfaceProcessLoading.h
+include/paraview-%%VERMAJORMINOR%%/vtkMaterialInterfaceProcessRing.h
+include/paraview-%%VERMAJORMINOR%%/vtkMaterialInterfaceToProcMap.h
+include/paraview-%%VERMAJORMINOR%%/vtkMaterialInterfaceUtilities.hxx
 include/paraview-%%VERMAJORMINOR%%/vtkMaterialLibrary.h
 include/paraview-%%VERMAJORMINOR%%/vtkMath.h
 include/paraview-%%VERMAJORMINOR%%/vtkMatricizeArray.h
@@ -1983,6 +2002,7 @@ include/paraview-%%VERMAJORMINOR%%/vtkOpenGLActor.h
 include/paraview-%%VERMAJORMINOR%%/vtkOpenGLCamera.h
 include/paraview-%%VERMAJORMINOR%%/vtkOpenGLClipPlanesPainter.h
 include/paraview-%%VERMAJORMINOR%%/vtkOpenGLCoincidentTopologyResolutionPainter.h
+include/paraview-%%VERMAJORMINOR%%/vtkOpenGLContextBufferId.h
 include/paraview-%%VERMAJORMINOR%%/vtkOpenGLContextDevice2D.h
 include/paraview-%%VERMAJORMINOR%%/vtkOpenGLDisplayListPainter.h
 include/paraview-%%VERMAJORMINOR%%/vtkOpenGLExtensionManager.h
@@ -3077,11 +3097,14 @@ include/paraview-%%VERMAJORMINOR%%/vtkTypeInt16Array.h
 include/paraview-%%VERMAJORMINOR%%/vtkTypeInt32Array.h
 include/paraview-%%VERMAJORMINOR%%/vtkTypeInt64Array.h
 include/paraview-%%VERMAJORMINOR%%/vtkTypeInt8Array.h
+include/paraview-%%VERMAJORMINOR%%/vtkTypeTemplate.h
 include/paraview-%%VERMAJORMINOR%%/vtkTypeTraits.h
 include/paraview-%%VERMAJORMINOR%%/vtkTypeUInt16Array.h
 include/paraview-%%VERMAJORMINOR%%/vtkTypeUInt32Array.h
 include/paraview-%%VERMAJORMINOR%%/vtkTypeUInt64Array.h
 include/paraview-%%VERMAJORMINOR%%/vtkTypeUInt8Array.h
+include/paraview-%%VERMAJORMINOR%%/vtkTypedArray.h
+include/paraview-%%VERMAJORMINOR%%/vtkTypedArray.txx
 include/paraview-%%VERMAJORMINOR%%/vtkUGFacetReader.h
 include/paraview-%%VERMAJORMINOR%%/vtkUncertaintyTubeFilter.h
 include/paraview-%%VERMAJORMINOR%%/vtkUndirectedGraph.h
@@ -3126,6 +3149,8 @@ include/paraview-%%VERMAJORMINOR%%/vtkVRMLImporter.h
 include/paraview-%%VERMAJORMINOR%%/vtkVRMLSource.h
 include/paraview-%%VERMAJORMINOR%%/vtkVariant.h
 include/paraview-%%VERMAJORMINOR%%/vtkVariantArray.h
+include/paraview-%%VERMAJORMINOR%%/vtkVariantCast.h
+include/paraview-%%VERMAJORMINOR%%/vtkVariantCreate.h
 include/paraview-%%VERMAJORMINOR%%/vtkVariantInlineOperators.h
 include/paraview-%%VERMAJORMINOR%%/vtkVector.h
 include/paraview-%%VERMAJORMINOR%%/vtkVector.txx
@@ -3374,6 +3399,7 @@ include/paraview-%%VERMAJORMINOR%%/vtkmetaio/metaVesselTube.h
 include/paraview-%%VERMAJORMINOR%%/vtknetcdf/ncconfig.h
 include/paraview-%%VERMAJORMINOR%%/vtknetcdf/netcdf.h
 include/paraview-%%VERMAJORMINOR%%/vtknetcdf/netcdf3.h
+include/paraview-%%VERMAJORMINOR%%/vtknetcdf/netcdfcpp.h
 include/paraview-%%VERMAJORMINOR%%/vtknetcdf/vtk_netcdf_mangle.h
 include/paraview-%%VERMAJORMINOR%%/vtksqlite/vtk_sqlite3.h
 include/paraview-%%VERMAJORMINOR%%/vtkstd/algorithm
@@ -3524,7 +3550,6 @@ lib/paraview-%%VERMAJORMINOR%%/doc/verdict/1.2.0/Verdict.doc
 lib/paraview-%%VERMAJORMINOR%%/doc/verdict/1.2.0/Verdict.htm
 lib/paraview-%%VERMAJORMINOR%%/doc/verdict/1.2.0/verdict_test.cpp
 lib/paraview-%%VERMAJORMINOR%%/hints
-lib/paraview-%%VERMAJORMINOR%%/kwProcessXML-real
 lib/paraview-%%VERMAJORMINOR%%/libAnalyzeReader.so
 lib/paraview-%%VERMAJORMINOR%%/libAnalyzeWriter.so
 lib/paraview-%%VERMAJORMINOR%%/libCosmo.so
@@ -3587,6 +3612,7 @@ lib/paraview-%%VERMAJORMINOR%%/libvtkInfovis.so.pv%%VERMAJORMINOR%%
 lib/paraview-%%VERMAJORMINOR%%/libvtkInfovisCS.so
 lib/paraview-%%VERMAJORMINOR%%/libvtkNetCDF.so
 lib/paraview-%%VERMAJORMINOR%%/libvtkNetCDF.so.pv%%VERMAJORMINOR%%
+lib/paraview-%%VERMAJORMINOR%%/libvtkNetCDF_cxx.so
 lib/paraview-%%VERMAJORMINOR%%/libvtkPVCommandOptions.so
 lib/paraview-%%VERMAJORMINOR%%/libvtkPVFilters.so
 lib/paraview-%%VERMAJORMINOR%%/libvtkPVFiltersCS.so
@@ -3630,11 +3656,11 @@ lib/paraview-%%VERMAJORMINOR%%/libvtksys.so
 lib/paraview-%%VERMAJORMINOR%%/libvtksys.so.pv%%VERMAJORMINOR%%
 lib/paraview-%%VERMAJORMINOR%%/libvtkverdict.so
 lib/paraview-%%VERMAJORMINOR%%/libvtkverdict.so.pv%%VERMAJORMINOR%%
-lib/paraview-%%VERMAJORMINOR%%/paraview-real
-lib/paraview-%%VERMAJORMINOR%%/pvdataserver-real
-lib/paraview-%%VERMAJORMINOR%%/pvrenderserver-real
-lib/paraview-%%VERMAJORMINOR%%/pvserver-real
-lib/paraview-%%VERMAJORMINOR%%/smTestDriver-real
+lib/paraview-%%VERMAJORMINOR%%/paraview
+lib/paraview-%%VERMAJORMINOR%%/pvdataserver
+lib/paraview-%%VERMAJORMINOR%%/pvrenderserver
+lib/paraview-%%VERMAJORMINOR%%/pvserver
+lib/paraview-%%VERMAJORMINOR%%/smTestDriver
 lib/paraview-%%VERMAJORMINOR%%/testing/FindString.tcl
 lib/paraview-%%VERMAJORMINOR%%/testing/HeaderTesting.py
 lib/paraview-%%VERMAJORMINOR%%/testing/PrintSelfCheck.tcl
@@ -3663,7 +3689,8 @@ lib/paraview-%%VERMAJORMINOR%%/vtkViewsKit.cmake
 lib/paraview-%%VERMAJORMINOR%%/vtkVolumeRenderingKit.cmake
 lib/paraview-%%VERMAJORMINOR%%/vtkWidgetsKit.cmake
 lib/paraview-%%VERMAJORMINOR%%/vtkXdmfKit.cmake
-%%QT_PLUGINDIR_REL%%/designer/libQVTKWidgetPlugin.so
+%%DOCSDIR%%/paraview.qch
+@dirrm %%DOCSDIR%%
 @dirrm lib/paraview-%%VERMAJORMINOR%%/testing
 @dirrm lib/paraview-%%VERMAJORMINOR%%/doc/verdict/1.2.0
 @dirrm lib/paraview-%%VERMAJORMINOR%%/doc/verdict
@@ -3703,4 +3730,3 @@ lib/paraview-%%VERMAJORMINOR%%/vtkXdmfKit.cmake
 @dirrm include/paraview-%%VERMAJORMINOR%%/Qt
 @dirrm include/paraview-%%VERMAJORMINOR%%/Cosmo
 @dirrm include/paraview-%%VERMAJORMINOR%%
-@dirrmtry %%DOCSDIR%%