Date: Fri, 10 Mar 2017 15:10:58 +0900 From: Tomoaki AOKI <junchoon@dec.sakura.ne.jp> To: svn-ports-head@freebsd.org Cc: stephen@FreeBSD.org Subject: Re: svn commit: r435819 - in head/math/vtk6: . files Message-ID: <20170310151058.29f2ea30f9d724eca1a52735@dec.sakura.ne.jp>
next in thread | raw e-mail | index | archive | help
This broke INDEX build, as devel/libc++ was removed at r434738. [1] Hunk 1 for Makefile should be reverted. [1] https://lists.freebsd.org/pipermail/svn-ports-head/2017-February/141237.html > 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 <tcberner at freebsd.org> > > 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 <bsd.port.mk> > > 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 -- Tomoaki AOKI <junchoon@dec.sakura.ne.jp>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20170310151058.29f2ea30f9d724eca1a52735>