From owner-svn-ports-head@freebsd.org Wed Dec 13 03:34:38 2017 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DC8B8E8F609; Wed, 13 Dec 2017 03:34:38 +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 mx1.freebsd.org (Postfix) with ESMTPS id 98F9F805F2; Wed, 13 Dec 2017 03:34:38 +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 vBD3Yb17031137; Wed, 13 Dec 2017 03:34:37 GMT (envelope-from jwb@FreeBSD.org) Received: (from jwb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBD3Ybu8031132; Wed, 13 Dec 2017 03:34:37 GMT (envelope-from jwb@FreeBSD.org) Message-Id: <201712130334.vBD3Ybu8031132@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jwb set sender to jwb@FreeBSD.org using -f From: "Jason W. Bacon" Date: Wed, 13 Dec 2017 03:34:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r456189 - 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: 456189 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Dec 2017 03:34:39 -0000 Author: jwb Date: Wed Dec 13 03:34:37 2017 New Revision: 456189 URL: https://svnweb.freebsd.org/changeset/ports/456189 Log: science/paraview: Unbreak build with clang 4.0 PR: 216634 Submitted by: Jan Beich Approved by: jrm (mentor), maintainer timeout (3.5 months) Differential Revision: https://reviews.freebsd.org/D13462 Added: head/science/paraview/files/patch-VTK_ThirdParty_netcdf_vtknetcdf_cxx_ncvalues.h (contents, props changed) head/science/paraview/files/patch-VTK_ThirdParty_netcdf_vtknetcdf_cxx_netcdfcpp.h (contents, props changed) head/science/paraview/files/patch-VTK_ThirdParty_xdmf2_vtkxdmf2_libsrc_XdmfDsmComm.cxx (contents, props changed) Modified: head/science/paraview/Makefile head/science/paraview/files/patch-Plugins_CDIReader_cdilib.c Modified: head/science/paraview/Makefile ============================================================================== --- head/science/paraview/Makefile Wed Dec 13 02:16:28 2017 (r456188) +++ head/science/paraview/Makefile Wed Dec 13 03:34:37 2017 (r456189) @@ -2,8 +2,8 @@ # $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} @@ -16,7 +16,7 @@ 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 \ @@ -29,20 +29,21 @@ LIB_DEPENDS= libhdf5.so:science/hdf5 \ 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" \ @@ -104,9 +105,9 @@ CMAKE2INST= ParaViewConfig.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: Modified: head/science/paraview/files/patch-Plugins_CDIReader_cdilib.c ============================================================================== --- head/science/paraview/files/patch-Plugins_CDIReader_cdilib.c Wed Dec 13 02:16:28 2017 (r456188) +++ head/science/paraview/files/patch-Plugins_CDIReader_cdilib.c Wed Dec 13 03:34:37 2017 (r456189) @@ -1,4 +1,4 @@ ---- 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 Added: head/science/paraview/files/patch-VTK_ThirdParty_netcdf_vtknetcdf_cxx_ncvalues.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/paraview/files/patch-VTK_ThirdParty_netcdf_vtknetcdf_cxx_ncvalues.h Wed Dec 13 03:34:37 2017 (r456189) @@ -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 ); Added: head/science/paraview/files/patch-VTK_ThirdParty_netcdf_vtknetcdf_cxx_netcdfcpp.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/paraview/files/patch-VTK_ThirdParty_netcdf_vtknetcdf_cxx_netcdfcpp.h Wed Dec 13 03:34:37 2017 (r456189) @@ -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, Added: head/science/paraview/files/patch-VTK_ThirdParty_xdmf2_vtkxdmf2_libsrc_XdmfDsmComm.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/paraview/files/patch-VTK_ThirdParty_xdmf2_vtkxdmf2_libsrc_XdmfDsmComm.cxx Wed Dec 13 03:34:37 2017 (r456189) @@ -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); + }