From owner-svn-ports-all@freebsd.org Wed Jun 27 00:04:31 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3F2291023143; Wed, 27 Jun 2018 00:04:31 +0000 (UTC) (envelope-from jwb@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CB3BA8ABFC; Wed, 27 Jun 2018 00:04:30 +0000 (UTC) (envelope-from jwb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AAE481B6E2; Wed, 27 Jun 2018 00:04:30 +0000 (UTC) (envelope-from jwb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5R04UCZ055760; Wed, 27 Jun 2018 00:04:30 GMT (envelope-from jwb@FreeBSD.org) Received: (from jwb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5R04SjG055751; Wed, 27 Jun 2018 00:04:28 GMT (envelope-from jwb@FreeBSD.org) Message-Id: <201806270004.w5R04SjG055751@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jwb set sender to jwb@FreeBSD.org using -f From: "Jason W. Bacon" Date: Wed, 27 Jun 2018 00:04:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r473414 - in head/science/paraview: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jwb X-SVN-Commit-Paths: in head/science/paraview: . files X-SVN-Commit-Revision: 473414 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Jun 2018 00:04:31 -0000 Author: jwb Date: Wed Jun 27 00:04:28 2018 New Revision: 473414 URL: https://svnweb.freebsd.org/changeset/ports/473414 Log: science/paraview: Fix protobuf conflict, upgrade to 5.5.1, modernize options PR: 229116 Reported by: jwb Approved by: jrm (mentor) Differential Revision: https://reviews.freebsd.org/D16024 Added: head/science/paraview/files/patch-CommandLineExecutables_CMakeLists.txt (contents, props changed) head/science/paraview/files/patch-ParaViewCore_ClientServerCore_Default_vtkPVFileInformation.h - copied, changed from r473413, head/science/paraview/files/patch-vtkPVFileInformation.h head/science/paraview/files/patch-ParaViewCore_VTKExtensions_Default_vtkPhastaReader.cxx - copied, changed from r473413, head/science/paraview/files/patch-vtkPhastaReader.cxx head/science/paraview/files/patch-VTK_IO_EnSight_vtkEnSight6BinaryReader.cxx - copied, changed from r473413, head/science/paraview/files/patch-vtkEnSight6BinaryReader.cxx head/science/paraview/files/patch-VTK_IO_EnSight_vtkEnSightGoldBinaryReader.cxx - copied, changed from r473413, head/science/paraview/files/patch-vtkEnSightGoldBinaryReader.cxx Deleted: head/science/paraview/files/patch-vtkEnSight6BinaryReader.cxx head/science/paraview/files/patch-vtkEnSightGoldBinaryReader.cxx head/science/paraview/files/patch-vtkPVFileInformation.h head/science/paraview/files/patch-vtkPhastaReader.cxx Modified: head/science/paraview/Makefile head/science/paraview/distinfo head/science/paraview/files/patch-Plugins_CDIReader_cdilib.c head/science/paraview/pkg-plist Modified: head/science/paraview/Makefile ============================================================================== --- head/science/paraview/Makefile Tue Jun 26 22:50:14 2018 (r473413) +++ head/science/paraview/Makefile Wed Jun 27 00:04:28 2018 (r473414) @@ -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 @@ LIB_DEPENDS= libhdf5.so:science/hdf5 \ 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 @@ CMAKE_ARGS+= -DBUILD_SHARED_LIBS="ON" \ -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 @@ SHEBANG_FILES= Catalyst/catalyze.py VTK/Examples/Searc 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 \ Modified: head/science/paraview/distinfo ============================================================================== --- head/science/paraview/distinfo Tue Jun 26 22:50:14 2018 (r473413) +++ head/science/paraview/distinfo Wed Jun 27 00:04:28 2018 (r473414) @@ -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 Added: head/science/paraview/files/patch-CommandLineExecutables_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/paraview/files/patch-CommandLineExecutables_CMakeLists.txt Wed Jun 27 00:04:28 2018 (r473414) @@ -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}") Copied and modified: head/science/paraview/files/patch-ParaViewCore_ClientServerCore_Default_vtkPVFileInformation.h (from r473413, head/science/paraview/files/patch-vtkPVFileInformation.h) ============================================================================== --- head/science/paraview/files/patch-vtkPVFileInformation.h Tue Jun 26 22:50:14 2018 (r473413, copy source) +++ head/science/paraview/files/patch-ParaViewCore_ClientServerCore_Default_vtkPVFileInformation.h Wed Jun 27 00:04:28 2018 (r473414) @@ -1,5 +1,5 @@ ---- 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 +--- 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" Copied and modified: head/science/paraview/files/patch-ParaViewCore_VTKExtensions_Default_vtkPhastaReader.cxx (from r473413, head/science/paraview/files/patch-vtkPhastaReader.cxx) ============================================================================== --- head/science/paraview/files/patch-vtkPhastaReader.cxx Tue Jun 26 22:50:14 2018 (r473413, copy source) +++ head/science/paraview/files/patch-ParaViewCore_VTKExtensions_Default_vtkPhastaReader.cxx Wed Jun 27 00:04:28 2018 (r473414) @@ -1,6 +1,6 @@ ---- 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 @@ +--- 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); Modified: head/science/paraview/files/patch-Plugins_CDIReader_cdilib.c ============================================================================== --- head/science/paraview/files/patch-Plugins_CDIReader_cdilib.c Tue Jun 26 22:50:14 2018 (r473413) +++ head/science/paraview/files/patch-Plugins_CDIReader_cdilib.c Wed Jun 27 00:04:28 2018 (r473414) @@ -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 Copied and modified: head/science/paraview/files/patch-VTK_IO_EnSight_vtkEnSight6BinaryReader.cxx (from r473413, head/science/paraview/files/patch-vtkEnSight6BinaryReader.cxx) ============================================================================== --- head/science/paraview/files/patch-vtkEnSight6BinaryReader.cxx Tue Jun 26 22:50:14 2018 (r473413, copy source) +++ head/science/paraview/files/patch-VTK_IO_EnSight_vtkEnSight6BinaryReader.cxx Wed Jun 27 00:04:28 2018 (r473414) @@ -1,5 +1,5 @@ ---- 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 +--- 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 Copied and modified: head/science/paraview/files/patch-VTK_IO_EnSight_vtkEnSightGoldBinaryReader.cxx (from r473413, head/science/paraview/files/patch-vtkEnSightGoldBinaryReader.cxx) ============================================================================== --- head/science/paraview/files/patch-vtkEnSightGoldBinaryReader.cxx Tue Jun 26 22:50:14 2018 (r473413, copy source) +++ head/science/paraview/files/patch-VTK_IO_EnSight_vtkEnSightGoldBinaryReader.cxx Wed Jun 27 00:04:28 2018 (r473414) @@ -1,5 +1,5 @@ ---- 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 +--- 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 Modified: head/science/paraview/pkg-plist ============================================================================== --- head/science/paraview/pkg-plist Tue Jun 26 22:50:14 2018 (r473413) +++ head/science/paraview/pkg-plist Wed Jun 27 00:04:28 2018 (r473414) @@ -834,8 +834,6 @@ lib/cmake/paraview-%%VERMAJORMINOR%%/vtkm/VTKmMacros.c 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