From owner-svn-ports-head@freebsd.org Fri Jul 20 21:23:17 2018 Return-Path: Delivered-To: svn-ports-head@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 5A0951052E5E; Fri, 20 Jul 2018 21:23:17 +0000 (UTC) (envelope-from tcberner@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 0AF9F8DB84; Fri, 20 Jul 2018 21:23:17 +0000 (UTC) (envelope-from tcberner@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 E01DA15A2E; Fri, 20 Jul 2018 21:23:16 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w6KLNGJl018099; Fri, 20 Jul 2018 21:23:16 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w6KLNGZT018098; Fri, 20 Jul 2018 21:23:16 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <201807202123.w6KLNGZT018098@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Fri, 20 Jul 2018 21:23:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r475037 - in head/science/paraview: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head/science/paraview: . files X-SVN-Commit-Revision: 475037 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.27 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: Fri, 20 Jul 2018 21:23:17 -0000 Author: tcberner Date: Fri Jul 20 21:23:16 2018 New Revision: 475037 URL: https://svnweb.freebsd.org/changeset/ports/475037 Log: science/paraview: Add patch to fix build with upcomeing cmake-3.12 The behaviour of cmake's copy_directory was changed, so that it now fails if the source directory does not exist. Further add missing dependency on xmlpatterns. PR: 229854 Reported by: antoine Added: head/science/paraview/files/patch-CMake_ParaViewMacros.cmake (contents, props changed) Modified: head/science/paraview/Makefile Modified: head/science/paraview/Makefile ============================================================================== --- head/science/paraview/Makefile Fri Jul 20 20:54:12 2018 (r475036) +++ head/science/paraview/Makefile Fri Jul 20 21:23:16 2018 (r475037) @@ -3,6 +3,7 @@ PORTNAME= paraview DISTVERSION= 5.5.1 +PORTREVISION= 1 CATEGORIES= science graphics MASTER_SITES= http://www.paraview.org/files/v${VERMAJORMINOR}/ DISTNAME= ParaView-v${PORTVERSION} @@ -32,7 +33,7 @@ RUN_DEPENDS= bash:shells/bash \ ${PYTHON_SITELIBDIR}/matplotlib/pyplot.py:math/py-matplotlib@${PY_FLAVOR} USES= alias cmake:outsource jpeg localbase python:2.7 qt:5 shebangfix -USE_QT= core gui help network sql widgets x11extras buildtools_build qmake_build +USE_QT= core gui help network sql widgets x11extras xmlpatterns buildtools_build qmake_build USE_GL= gl glu USE_XORG= x11 xt xext ice xdmcp xau xcb xfixes xdamage xxf86vm xrender sm dri3proto USE_LDCONFIG= yes Added: head/science/paraview/files/patch-CMake_ParaViewMacros.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/paraview/files/patch-CMake_ParaViewMacros.cmake Fri Jul 20 21:23:16 2018 (r475037) @@ -0,0 +1,12 @@ +Prior to 3.12 cmake silently created an empty destination directory if the origin of the copy_directory does not exist. + +--- CMake/ParaViewMacros.cmake.orig 2018-07-20 20:59:05 UTC ++++ CMake/ParaViewMacros.cmake +@@ -382,6 +382,7 @@ function(build_help_project name) + set (copy_directory_command + # copy all htmls from source to destination directory (same location where the + # qhp file is present. ++ COMMAND ${CMAKE_COMMAND} -E make_directory "${arg_DOCUMENTATION_SOURCE_DIR}" + COMMAND ${CMAKE_COMMAND} -E copy_directory + "${arg_DOCUMENTATION_SOURCE_DIR}" + "${arg_DESTINATION_DIRECTORY}"