Index: head/science/paraview/Makefile =================================================================== --- head/science/paraview/Makefile +++ head/science/paraview/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= paraview -DISTVERSION= 5.5.0 +DISTVERSION= 5.5.1 CATEGORIES= science graphics MASTER_SITES= http://www.paraview.org/files/v${VERMAJORMINOR}/ DISTNAME= ParaView-v${PORTVERSION} @@ -26,12 +26,11 @@ libpcre.so:devel/pcre \ libffi.so:devel/libffi \ libdrm.so:graphics/libdrm \ - libfontconfig.so:x11-fonts/fontconfig + libfontconfig.so:x11-fonts/fontconfig \ + libprotobuf.so:devel/protobuf RUN_DEPENDS= bash:shells/bash \ ${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:math/py-matplotlib@${PY_FLAVOR} -CONFLICTS_INSTALL= protobuf # https://gitlab.kitware.com/paraview/paraview/issues/18225 - USES= alias cmake:outsource jpeg localbase python:2.7 shebangfix USE_QT5= core gui help network sql widgets x11extras buildtools_build qmake_build USE_GL= gl glu @@ -46,6 +45,7 @@ -DVTK_USE_SYSTEM_ZLIB="ON" \ -DVTK_USE_SYSTEM_FREETYPE="ON" \ -DVTK_USE_SYSTEM_EXPAT="ON" \ + -DVTK_USE_SYSTEM_PROTOBUF="ON" \ -DVTK_USE_X="ON" \ -DVTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T=1 \ -DPARAVIEW_ENABLE_PYTHON:BOOL="ON" \ @@ -59,28 +59,20 @@ VTK/Utilities/Maintenance/*.sh OPTIONS_DEFINE= OSMESA GL2PS DOCS +OPTIONS_SUB= yes OSMESA_DESC= Use Mesa for off-screen rendering GL2PS_DESC= Install support conversion OpenGL to PostScript # VTKMPEG2 "Install patented MPEG2 encoder module" Off \ VERMAJORMINOR= ${PORTVERSION:R} -.include +OSMESA_LIB_DEPENDS= libOSMesa.so:graphics/libosmesa +OSMESA_CMAKE_BOOL= VTK_OPENGL_HAS_OSMESA +OSMESA_CMAKE_ON= -DOSMESA_INCLUDE_DIR:PATH=${LOCALBASE}/include/Mesa \ + -DOSMESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa.so -.if ${PORT_OPTIONS:MOSMESA} -LIB_DEPENDS+= libOSMesa.so:graphics/libosmesa -CMAKE_ARGS+= -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \ - -DOSMESA_INCLUDE_DIR:PATH=${LOCALBASE}/include/Mesa \ - -DOSMESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa.so -.endif - -.if ${PORT_OPTIONS:MGL2PS} -LIB_DEPENDS+= libgl2ps.so:print/gl2ps -CMAKE_ARGS+= -DVTK_USE_GL2PS:BOOL=ON -PLIST_SUB+= GL2PS="" -.else -PLIST_SUB+= GL2PS="@comment " -.endif +GL2PS_LIB_DEPENDS= libgl2ps.so:print/gl2ps +GL2PS_CMAKE_BOOL= VTK_USE_GL2PS PLIST_SUB+= VERMAJORMINOR=${VERMAJORMINOR} CMAKE2INST= ParaViewConfig.cmake \ Index: head/science/paraview/distinfo =================================================================== --- head/science/paraview/distinfo +++ head/science/paraview/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1527607320 -SHA256 (ParaView-v5.5.0.tar.gz) = 1b619e326ff574de808732ca9a7447e4cd14e94ae6568f55b6581896cd569dff -SIZE (ParaView-v5.5.0.tar.gz) = 51414419 +TIMESTAMP = 1529035117 +SHA256 (ParaView-v5.5.1.tar.gz) = a6e67a95a7a5711a2b5f95f38ccbff4912262b3e1b1af7d6b9afe8185aa85c0d +SIZE (ParaView-v5.5.1.tar.gz) = 51410785 Index: head/science/paraview/files/patch-CommandLineExecutables_CMakeLists.txt =================================================================== --- head/science/paraview/files/patch-CommandLineExecutables_CMakeLists.txt +++ head/science/paraview/files/patch-CommandLineExecutables_CMakeLists.txt @@ -0,0 +1,11 @@ +--- CommandLineExecutables/CMakeLists.txt.orig 2018-06-01 19:23:15 UTC ++++ CommandLineExecutables/CMakeLists.txt +@@ -67,7 +67,7 @@ foreach (vtk_module IN LISTS VTK_MODULES + if (vtk_module_library STREQUAL "optimized" OR + vtk_module_library STREQUAL "debug") + unset(vtk_module_library_name) +- elseif (vtk_module_library MATCHES "^-l") ++ elseif (vtk_module_library MATCHES "^-l|^-p") + string(SUBSTRING "${vtk_module_library}" 2 -1 vtk_module_library) + find_library(vtk_module_library_name "${vtk_module_library}") + elseif (IS_ABSOLUTE "${vtk_module_library}") Index: head/science/paraview/files/patch-ParaViewCore_ClientServerCore_Default_vtkPVFileInformation.h =================================================================== --- head/science/paraview/files/patch-ParaViewCore_ClientServerCore_Default_vtkPVFileInformation.h +++ head/science/paraview/files/patch-ParaViewCore_ClientServerCore_Default_vtkPVFileInformation.h @@ -0,0 +1,10 @@ +--- ParaViewCore/ClientServerCore/Default/vtkPVFileInformation.h.orig 2018-06-01 19:23:15 UTC ++++ ParaViewCore/ClientServerCore/Default/vtkPVFileInformation.h +@@ -31,6 +31,7 @@ + #include "vtkPVInformation.h" + + #include // Needed for std::string ++#include + + class vtkCollection; + class vtkPVFileInformationSet; Index: head/science/paraview/files/patch-ParaViewCore_VTKExtensions_Default_vtkPhastaReader.cxx =================================================================== --- head/science/paraview/files/patch-ParaViewCore_VTKExtensions_Default_vtkPhastaReader.cxx +++ head/science/paraview/files/patch-ParaViewCore_VTKExtensions_Default_vtkPhastaReader.cxx @@ -0,0 +1,11 @@ +--- ParaViewCore/VTKExtensions/Default/vtkPhastaReader.cxx.orig 2018-06-01 19:23:15 UTC ++++ ParaViewCore/VTKExtensions/Default/vtkPhastaReader.cxx +@@ -200,7 +200,7 @@ int vtkPhastaReader::readHeader(FILE* fi + { + text_header = new char[real_length + 1]; + strncpy(text_header, Line, real_length); +- text_header[real_length] = static_cast(NULL); ++ text_header[real_length] = static_cast(0); + token = strtok(text_header, ":"); + if (cscompare(phrase, token)) + { Index: head/science/paraview/files/patch-Plugins_CDIReader_cdilib.c =================================================================== --- head/science/paraview/files/patch-Plugins_CDIReader_cdilib.c +++ head/science/paraview/files/patch-Plugins_CDIReader_cdilib.c @@ -1,5 +1,5 @@ ---- Plugins/CDIReader/cdilib.c.orig 2018-06-02 11:15:13.052742000 +0700 -+++ Plugins/CDIReader/cdilib.c 2018-06-02 11:15:49.323204000 +0700 +--- Plugins/CDIReader/cdilib.c.orig 2018-06-01 19:23:15 UTC ++++ Plugins/CDIReader/cdilib.c @@ -47,7 +47,7 @@ #define _XOPEN_SOURCE 600 #endif Index: head/science/paraview/files/patch-VTK_IO_EnSight_vtkEnSight6BinaryReader.cxx =================================================================== --- head/science/paraview/files/patch-VTK_IO_EnSight_vtkEnSight6BinaryReader.cxx +++ head/science/paraview/files/patch-VTK_IO_EnSight_vtkEnSight6BinaryReader.cxx @@ -0,0 +1,11 @@ +--- VTK/IO/EnSight/vtkEnSight6BinaryReader.cxx.orig 2018-06-01 19:23:15 UTC ++++ VTK/IO/EnSight/vtkEnSight6BinaryReader.cxx +@@ -36,7 +36,7 @@ + #if defined(_WIN32) + # define VTK_STAT_STRUCT struct _stat64 + # define VTK_STAT_FUNC _stat64 +-#elif defined _DARWIN_FEATURE_64_BIT_INODE && !defined __FreeBSD__ ++#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ + // FreeBSD and OSX now deprecate stat64 + # define VTK_STAT_STRUCT struct stat + # define VTK_STAT_FUNC stat Index: head/science/paraview/files/patch-VTK_IO_EnSight_vtkEnSightGoldBinaryReader.cxx =================================================================== --- head/science/paraview/files/patch-VTK_IO_EnSight_vtkEnSightGoldBinaryReader.cxx +++ head/science/paraview/files/patch-VTK_IO_EnSight_vtkEnSightGoldBinaryReader.cxx @@ -0,0 +1,11 @@ +--- VTK/IO/EnSight/vtkEnSightGoldBinaryReader.cxx.orig 2018-06-01 19:23:15 UTC ++++ VTK/IO/EnSight/vtkEnSightGoldBinaryReader.cxx +@@ -37,7 +37,7 @@ + #if defined(_WIN32) + # define VTK_STAT_STRUCT struct _stat64 + # define VTK_STAT_FUNC _stat64 +-#elif defined _DARWIN_FEATURE_64_BIT_INODE && !defined __FreeBSD__ ++#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ + // FreeBSD and OSX now deprecate stat64 + # define VTK_STAT_STRUCT struct stat + # define VTK_STAT_FUNC stat Index: head/science/paraview/files/patch-vtkEnSight6BinaryReader.cxx =================================================================== --- head/science/paraview/files/patch-vtkEnSight6BinaryReader.cxx +++ head/science/paraview/files/patch-vtkEnSight6BinaryReader.cxx @@ -1,11 +0,0 @@ ---- VTK/IO/EnSight/vtkEnSight6BinaryReader.cxx.orig 2018-05-30 20:27:53.507473000 +0700 -+++ VTK/IO/EnSight/vtkEnSight6BinaryReader.cxx 2018-05-30 20:34:17.396774000 +0700 -@@ -36,7 +36,7 @@ - #if defined(_WIN32) - # define VTK_STAT_STRUCT struct _stat64 - # define VTK_STAT_FUNC _stat64 --#elif defined _DARWIN_FEATURE_64_BIT_INODE && !defined __FreeBSD__ -+#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ - // FreeBSD and OSX now deprecate stat64 - # define VTK_STAT_STRUCT struct stat - # define VTK_STAT_FUNC stat Index: head/science/paraview/files/patch-vtkEnSightGoldBinaryReader.cxx =================================================================== --- head/science/paraview/files/patch-vtkEnSightGoldBinaryReader.cxx +++ head/science/paraview/files/patch-vtkEnSightGoldBinaryReader.cxx @@ -1,11 +0,0 @@ ---- VTK/IO/EnSight/vtkEnSightGoldBinaryReader.cxx.orig 2018-05-30 20:37:02.610942000 +0700 -+++ VTK/IO/EnSight/vtkEnSightGoldBinaryReader.cxx 2018-05-30 20:37:18.549087000 +0700 -@@ -37,7 +37,7 @@ - #if defined(_WIN32) - # define VTK_STAT_STRUCT struct _stat64 - # define VTK_STAT_FUNC _stat64 --#elif defined _DARWIN_FEATURE_64_BIT_INODE && !defined __FreeBSD__ -+#elif defined _DARWIN_FEATURE_64_BIT_INODE || defined __FreeBSD__ - // FreeBSD and OSX now deprecate stat64 - # define VTK_STAT_STRUCT struct stat - # define VTK_STAT_FUNC stat Index: head/science/paraview/files/patch-vtkPVFileInformation.h =================================================================== --- head/science/paraview/files/patch-vtkPVFileInformation.h +++ head/science/paraview/files/patch-vtkPVFileInformation.h @@ -1,10 +0,0 @@ ---- ParaViewCore/ClientServerCore/Default/vtkPVFileInformation.h.orig 2018-05-31 23:28:45.128756000 +0700 -+++ ParaViewCore/ClientServerCore/Default/vtkPVFileInformation.h 2018-05-31 23:28:56.798284000 +0700 -@@ -31,6 +31,7 @@ - #include "vtkPVInformation.h" - - #include // Needed for std::string -+#include - - class vtkCollection; - class vtkPVFileInformationSet; Index: head/science/paraview/files/patch-vtkPhastaReader.cxx =================================================================== --- head/science/paraview/files/patch-vtkPhastaReader.cxx +++ head/science/paraview/files/patch-vtkPhastaReader.cxx @@ -1,11 +0,0 @@ ---- ParaViewCore/VTKExtensions/Default/vtkPhastaReader.cxx.orig 2018-05-31 00:13:08.178409000 +0700 -+++ ParaViewCore/VTKExtensions/Default/vtkPhastaReader.cxx 2018-05-31 18:19:21.545706000 +0700 -@@ -200,7 +200,7 @@ - { - text_header = new char[real_length + 1]; - strncpy(text_header, Line, real_length); -- text_header[real_length] = static_cast(NULL); -+ text_header[real_length] = static_cast(0); - token = strtok(text_header, ":"); - if (cscompare(phrase, token)) - { Index: head/science/paraview/pkg-plist =================================================================== --- head/science/paraview/pkg-plist +++ head/science/paraview/pkg-plist @@ -834,8 +834,6 @@ lib/cmake/paraview-%%VERMAJORMINOR%%/vtkm/VTKmTargets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/paraview-%%VERMAJORMINOR%%/vtkm/VTKmTargets.cmake lib/libQtTesting-pv%%VERMAJORMINOR%%.so -lib/libprotobuf-lite.so -lib/libprotobuf.so lib/libvtkAcceleratorsVTKm-pv%%VERMAJORMINOR%%.so lib/libvtkAcceleratorsVTKm-pv%%VERMAJORMINOR%%.so.1 lib/libvtkAcceleratorsVTKmPython27D-pv%%VERMAJORMINOR%%.so