From owner-svn-ports-all@freebsd.org Fri Mar 10 04:02:57 2017 Return-Path: Delivered-To: svn-ports-all@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 E82AED05AA7; Fri, 10 Mar 2017 04:02:57 +0000 (UTC) (envelope-from stephen@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 9B30B112C; Fri, 10 Mar 2017 04:02:57 +0000 (UTC) (envelope-from stephen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2A42uoc030100; Fri, 10 Mar 2017 04:02:56 GMT (envelope-from stephen@FreeBSD.org) Received: (from stephen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2A42uW5030098; Fri, 10 Mar 2017 04:02:56 GMT (envelope-from stephen@FreeBSD.org) Message-Id: <201703100402.v2A42uW5030098@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: stephen set sender to stephen@FreeBSD.org using -f From: Stephen Montgomery-Smith Date: Fri, 10 Mar 2017 04:02:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r435819 - in head/math/vtk6: . files X-SVN-Group: ports-head 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.23 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: Fri, 10 Mar 2017 04:02:58 -0000 Author: stephen Date: Fri Mar 10 04:02:56 2017 New Revision: 435819 URL: https://svnweb.freebsd.org/changeset/ports/435819 Log: - Rather than rm share/cmake/hdf5/libhdf5.settings, have cmake not install it. PR: ports/216330 Submitted by: Tobias C. Berner Added: head/math/vtk6/files/patch-ThirdParty_hdf5_vtkhdf5_CMakeInstallation.cmake (contents, props changed) Modified: head/math/vtk6/Makefile Modified: head/math/vtk6/Makefile ============================================================================== --- head/math/vtk6/Makefile Fri Mar 10 02:20:51 2017 (r435818) +++ head/math/vtk6/Makefile Fri Mar 10 04:02:56 2017 (r435819) @@ -17,7 +17,8 @@ LICENSE= BSD3CLAUSE LIB_DEPENDS= libtiff.so:graphics/tiff \ libpng.so:graphics/png \ libfreetype.so:print/freetype2 \ - libexpat.so:textproc/expat2 + libexpat.so:textproc/expat2 \ + libc++.so:devel/libc++ # # TODO @@ -217,8 +218,4 @@ BUILD_DEPENDS+= doxygen:devel/doxygen CMAKE_ARGS+= -DBUILD_DOCUMENTATION:BOOL=OFF .endif -post-install: -# So that this port doesn't clash with science/paraview: - ${RM} ${STAGEDIR}${PREFIX}/share/cmake/hdf5/libhdf5.settings - .include Added: head/math/vtk6/files/patch-ThirdParty_hdf5_vtkhdf5_CMakeInstallation.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/math/vtk6/files/patch-ThirdParty_hdf5_vtkhdf5_CMakeInstallation.cmake Fri Mar 10 04:02:56 2017 (r435819) @@ -0,0 +1,16 @@ +So that this port doesn't clash with science/paraview: + +--- ThirdParty/hdf5/vtkhdf5/CMakeInstallation.cmake.orig 2017-01-20 17:51:20 UTC ++++ ThirdParty/hdf5/vtkhdf5/CMakeInstallation.cmake +@@ -105,11 +105,6 @@ configure_file ( + ${HDF5_RESOURCES_DIR}/libhdf5.settings.cmake.in + ${HDF5_BINARY_DIR}/libhdf5.settings @ONLY + ) +-install ( +- FILES ${HDF5_BINARY_DIR}/libhdf5.settings +- DESTINATION ${HDF5_INSTALL_CMAKE_DIR}/${HDF5_PACKAGE} +- COMPONENT libraries +-) + + #----------------------------------------------------------------------------- + # Configure the HDF518_Examples.cmake file and the examples