Index: head/science/paraview/Makefile =================================================================== --- head/science/paraview/Makefile (revision 456188) +++ head/science/paraview/Makefile (revision 456189) @@ -1,121 +1,122 @@ # Created by: anholt@FreeBSD.org # $FreeBSD$ PORTNAME= paraview -PORTVERSION= 5.2.0 -PORTREVISION= 2 +DISTVERSION= 5.2.0 +PORTREVISION= 3 CATEGORIES= science graphics MASTER_SITES= http://www.paraview.org/files/v${VERMAJORMINOR}/ DISTNAME= ParaView-v${PORTVERSION} MAINTAINER= devel@stasyan.com COMMENT= Powerful scientific data visualization application LICENSE= ParaView_License_1.2 LICENSE_NAME= ParaView_License LICENSE_FILE= ${PATCH_WRKSRC}/License_v1.2.txt LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:math/py-matplotlib +BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:math/py-matplotlib@${PY_FLAVOR} LIB_DEPENDS= libhdf5.so:science/hdf5 \ libpng.so:graphics/png \ libtiff.so:graphics/tiff \ libfreetype.so:print/freetype2 \ libexpat.so:textproc/expat2 \ libjbig.so:graphics/jbigkit \ liborc-0.4.so:devel/orc \ libpcre.so:devel/pcre \ libffi.so:devel/libffi \ libdrm.so:graphics/libdrm \ libfontconfig.so:x11-fonts/fontconfig RUN_DEPENDS= bash:shells/bash \ - ${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:math/py-matplotlib + ${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:math/py-matplotlib@${PY_FLAVOR} CONFLICTS_BUILD= protobuf* +USES= alias desktop-file-utils cmake:outsource jpeg python:2.7 shebangfix USE_QT4= qmake_build moc_build rcc_build uic_build \ linguisttools_build assistant_run qt3support \ corelib dbus designer gui help-tools network script \ sql svg xml webkit assistantclient clucene \ xmlpatterns xmlpatterns-tool help -USE_GL= gl -USE_XORG= x11 xt xext ice xdmcp xau xcb xfixes xdamage xxf86vm xrender sm +USE_GL= gl glu +USE_XORG= x11 xt xext ice xdmcp xau xcb xfixes xdamage xxf86vm xrender sm dri3proto USE_LDCONFIG= yes USE_GSTREAMER= yes -USES= alias desktop-file-utils cmake:outsource jpeg python:2.7 shebangfix + INSTALLS_ICONS= yes CMAKE_ARGS+= -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_USE_X="ON" \ -DVTK_HAVE_GETSOCKNAME_WITH_SOCKLEN_T=1 \ -DPARAVIEW_ENABLE_PYTHON:BOOL="ON" \ -DPARAVIEW_ENABLE_FFMPEG:BOOL="OFF" \ -DBUILD_TESTING:BOOL="OFF" \ -DExternalData_OBJECT_STORES="${WRKDIR}/VTK/ExternalData/MD5" \ -DFREETYPE_INCLUDE_DIRS="${LOCALBASE}/include/freetype2" MAKE_ENV= XDG_CONFIG_HOME=${WRKDIR} SHEBANG_FILES= Catalyst/catalyze.py VTK/Examples/SearchScript.sh \ VTK/Utilities/Maintenance/*.sh \ Plugins/SciberQuestToolKit/eigen-3.0.3/eigen-eigen-3.0.3/bench/basicbench.cxxlist \ Plugins/SciberQuestToolKit/eigen-3.0.3/eigen-eigen-3.0.3/bench/*.sh \ Plugins/SciberQuestToolKit/eigen-3.0.3/eigen-eigen-3.0.3/bench/bench_unrolling \ Plugins/SciberQuestToolKit/eigen-3.0.3/eigen-eigen-3.0.3/bench/benchmark_suite \ Plugins/SciberQuestToolKit/eigen-3.0.3/eigen-eigen-3.0.3/blas/testing/* \ Plugins/SciberQuestToolKit/eigen-3.0.3/eigen-eigen-3.0.3/scripts/* \ Plugins/SciberQuestToolKit/eigen-3.0.3/eigen-eigen-3.0.3/test/eigen2/* \ Plugins/SciberQuestToolKit/eigen-3.0.3/eigen-eigen-3.0.3/test/*.sh \ Plugins/SciberQuestToolKit/eigen-3.0.3/eigen-eigen-3.0.3/test/testsuite.cmake \ Plugins/SciberQuestToolKit/eigen-3.0.3/eigen-eigen-3.0.3/bench/btl/data/* OPTIONS_DEFINE= OSMESA GL2PS DOCS 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 .if ${PORT_OPTIONS:MOSMESA} LIB_DEPENDS+= libOSMesa32.so:graphics/libosmesa CMAKE_ARGS+= -DVTK_OPENGL_HAS_OSMESA:BOOL=ON \ -DOSMESA_INCLUDE_DIR:PATH=${LOCALBASE}/include/Mesa \ -DOSMESA_LIBRARY:FILEPATH=${LOCALBASE}/lib/libOSMesa32.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 PLIST_SUB+= VERMAJORMINOR=${VERMAJORMINOR} CMAKE2INST= ParaViewConfig.cmake \ cmake_install.cmake LIB_INSTDIR= ${PREFIX}/lib/${PORTNAME}-${VERMAJORMINOR} pre-configure: - ${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \ + @${REINPLACE_CMD} -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \ ${PATCH_WRKSRC}/VTK/IO/Image/vtkPNGReader.cxx - ${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|' \ + @${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}/bin/bash|' \ ${PATCH_WRKSRC}/VTK/Utilities/Maintenance/vtk_site_history.py post-install: .for c2f in ${CMAKE2INST} ${SED} -e 's|${BUILD_WRKSRC}|${LIB_INSTDIR}|g' \ -e 's|${PATCH_WRKSRC}|${LIB_INSTDIR}|g' \ ${BUILD_WRKSRC}/${c2f} > ${STAGEDIR}${LIB_INSTDIR}/`${BASENAME} ${c2f}` .endfor ${INSTALL_DATA} ${PATCH_WRKSRC}/CMake/UseParaView.cmake \ ${STAGEDIR}${PREFIX}/lib/${PORTNAME}-${VERMAJORMINOR} .include Index: head/science/paraview/files/patch-Plugins_CDIReader_cdilib.c =================================================================== --- head/science/paraview/files/patch-Plugins_CDIReader_cdilib.c (revision 456188) +++ head/science/paraview/files/patch-Plugins_CDIReader_cdilib.c (revision 456189) @@ -1,11 +1,11 @@ ---- Plugins/CDIReader/cdilib.c.orig 2016-11-19 09:40:46 UTC +--- Plugins/CDIReader/cdilib.c.orig 2016-11-14 15:41:57 UTC +++ Plugins/CDIReader/cdilib.c @@ -47,7 +47,7 @@ #define _XOPEN_SOURCE 600 #endif -#if defined(__linux__) || defined(__APPLE__) +#if defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__) #include #include #include Index: head/science/paraview/files/patch-VTK_ThirdParty_netcdf_vtknetcdf_cxx_ncvalues.h =================================================================== --- head/science/paraview/files/patch-VTK_ThirdParty_netcdf_vtknetcdf_cxx_ncvalues.h (nonexistent) +++ head/science/paraview/files/patch-VTK_ThirdParty_netcdf_vtknetcdf_cxx_ncvalues.h (revision 456189) @@ -0,0 +1,20 @@ +--- VTK/ThirdParty/netcdf/vtknetcdf/cxx/ncvalues.h.orig 2016-11-14 15:41:57 UTC ++++ VTK/ThirdParty/netcdf/vtknetcdf/cxx/ncvalues.h +@@ -65,7 +65,7 @@ static const double ncBad_double = NC_FI + #define NcVal(TYPE) makename2(NcValues_,TYPE) + + #define NcValuesdeclare(TYPE) \ +-class MSCPP_EXTRA NcVal(TYPE) : public NcValues \ ++class NcVal(TYPE) : public NcValues \ + { \ + public: \ + NcVal(TYPE)( void ); \ +@@ -237,7 +237,7 @@ char* NcVal(TYPE)::as_string( long n ) c + return s; \ + } + +-class MSCPP_EXTRA NcValues // ABC for value blocks ++class NcValues // ABC for value blocks + { + public: + NcValues( void ); Property changes on: head/science/paraview/files/patch-VTK_ThirdParty_netcdf_vtknetcdf_cxx_ncvalues.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/science/paraview/files/patch-VTK_ThirdParty_netcdf_vtknetcdf_cxx_netcdfcpp.h =================================================================== --- head/science/paraview/files/patch-VTK_ThirdParty_netcdf_vtknetcdf_cxx_netcdfcpp.h (nonexistent) +++ head/science/paraview/files/patch-VTK_ThirdParty_netcdf_vtknetcdf_cxx_netcdfcpp.h (revision 456189) @@ -0,0 +1,70 @@ +--- VTK/ThirdParty/netcdf/vtknetcdf/cxx/netcdfcpp.h.orig 2016-11-14 15:41:57 UTC ++++ VTK/ThirdParty/netcdf/vtknetcdf/cxx/netcdfcpp.h +@@ -21,17 +21,17 @@ + typedef const char* NcToken; // names for netCDF objects + typedef unsigned int NcBool; // many members return 0 on failure + +-class MSCPP_EXTRA NcDim; // dimensions +-class MSCPP_EXTRA NcVar; // variables +-class MSCPP_EXTRA NcAtt; // attributes +-class MSCPP_EXTRA NcError; ++class NcDim; // dimensions ++class NcVar; // variables ++class NcAtt; // attributes ++class NcError; + + /* + * *********************************************************************** + * A netCDF file. + * *********************************************************************** + */ +-class MSCPP_EXTRA NcFile ++class NcFile + { + public: + +@@ -146,7 +146,7 @@ class MSCPP_EXTRA NcFile + * of an open netCDF file. + * ********************************************************************** + */ +-class MSCPP_EXTRA NcDim ++class NcDim + { + public: + NcToken name( void ) const; +@@ -178,7 +178,7 @@ class MSCPP_EXTRA NcDim + * components of an open netCDF file. + * ********************************************************************** + */ +-class MSCPP_EXTRA NcTypedComponent ++class NcTypedComponent + { + public: + virtual ~NcTypedComponent( void ) {} +@@ -216,7 +216,7 @@ class MSCPP_EXTRA NcTypedComponent + * a shape, given by a list of dimensions + * ********************************************************************** + */ +-class MSCPP_EXTRA NcVar : public NcTypedComponent ++class NcVar : public NcTypedComponent + { + public: + virtual ~NcVar( void ); +@@ -414,7 +414,7 @@ class MSCPP_EXTRA NcVar : public NcTyped + * associated with a specific variable, or are global to the file. + * ********************************************************************** + */ +-class MSCPP_EXTRA NcAtt : public NcTypedComponent ++class NcAtt : public NcTypedComponent + { + public: + virtual ~NcAtt( void ); +@@ -447,7 +447,7 @@ class MSCPP_EXTRA NcAtt : public NcTyped + * which time the previous error-handling behavior is restored. + * ********************************************************************** + */ +-class MSCPP_EXTRA NcError { ++class NcError { + public: + enum Behavior { + silent_nonfatal = 0, Property changes on: head/science/paraview/files/patch-VTK_ThirdParty_netcdf_vtknetcdf_cxx_netcdfcpp.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/science/paraview/files/patch-VTK_ThirdParty_xdmf2_vtkxdmf2_libsrc_XdmfDsmComm.cxx =================================================================== --- head/science/paraview/files/patch-VTK_ThirdParty_xdmf2_vtkxdmf2_libsrc_XdmfDsmComm.cxx (nonexistent) +++ head/science/paraview/files/patch-VTK_ThirdParty_xdmf2_vtkxdmf2_libsrc_XdmfDsmComm.cxx (revision 456189) @@ -0,0 +1,20 @@ +--- VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfDsmComm.cxx.orig 2016-11-14 15:41:57 UTC ++++ VTK/ThirdParty/xdmf2/vtkxdmf2/libsrc/XdmfDsmComm.cxx +@@ -52,7 +52,7 @@ XdmfDsmComm::Receive(XdmfDsmMsg *Msg){ + XdmfErrorMessage("Cannot Receive Message of Length = " << Msg->Length); + return(XDMF_FAIL); + } +- if(Msg->Data <= 0 ){ ++ if(Msg->Data == 0 ){ + XdmfErrorMessage("Cannot Receive Message into Data Buffer = " << Msg->Length); + return(XDMF_FAIL); + } +@@ -66,7 +66,7 @@ XdmfDsmComm::Send(XdmfDsmMsg *Msg){ + XdmfErrorMessage("Cannot Send Message of Length = " << Msg->Length); + return(XDMF_FAIL); + } +- if(Msg->Data <= 0 ){ ++ if(Msg->Data == 0 ){ + XdmfErrorMessage("Cannot Send Message from Data Buffer = " << Msg->Length); + return(XDMF_FAIL); + } Property changes on: head/science/paraview/files/patch-VTK_ThirdParty_xdmf2_vtkxdmf2_libsrc_XdmfDsmComm.cxx ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property