Date: Sat, 28 Nov 2015 05:30:18 +0000 (UTC) From: Stephen Montgomery-Smith <stephen@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r402509 - head/math/vtk6 Message-ID: <201511280530.tAS5UIcn018200@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: stephen Date: Sat Nov 28 05:30:18 2015 New Revision: 402509 URL: https://svnweb.freebsd.org/changeset/ports/402509 Log: - Add name mangling so that it will build when science/netcdf is installed. - Bump portrevision. Modified: head/math/vtk6/Makefile head/math/vtk6/pkg-plist Modified: head/math/vtk6/Makefile ============================================================================== --- head/math/vtk6/Makefile Sat Nov 28 04:24:16 2015 (r402508) +++ head/math/vtk6/Makefile Sat Nov 28 05:30:18 2015 (r402509) @@ -3,6 +3,7 @@ PORTNAME= vtk PORTVERSION= 6.2.0 +PORTREVISION= 1 CATEGORIES= math graphics MASTER_SITES= http://www.vtk.org/files/release/${VTK_SHORT_VER}/ PKGNAMESUFFIX= 6 @@ -81,6 +82,16 @@ CMAKE_ARGS+= -DVTK_INSTALL_LIBRARY_DIR=l SHARED_CMAKE_ON= -DBUILD_SHARED_LIBS:BOOL=ON SHARED_CMAKE_OFF= -DBUILD_SHARED_LIBS:BOOL=OFF +# Mangling so that port will build when science/netcdf is installed. +post-patch: + ${MV} ${WRKSRC}/ThirdParty/netcdf/vtknetcdf/include/netcdf.h \ + ${WRKSRC}/ThirdParty/netcdf/vtknetcdf/include/xxxnetcdf.h + ${FIND} ${WRKSRC}/ThirdParty/netcdf -type f | ${XARGS} ${REINPLACE_CMD} \ + -E 's/[[:<:]]netcdf\.h[[:>:]]/xxxnetcdf.h/' +# ${FIND} ${WRKSRC}/ThirdParty/netcdf -type f | ${XARGS} ${REINPLACE_CMD} \ +# -E 's/[[:<:]]libnetcdf[[:>:]]/libxxxnetcdf/' +# ${FIND} ${WRKSRC}/ThirdParty/netcdf -type f | ${XARGS} ${REINPLACE_CMD} \ +# -E 's/[[:<:]]-lnetcdf[[:>:]]/-lxxxnetcdf/' .include <bsd.port.options.mk> Modified: head/math/vtk6/pkg-plist ============================================================================== --- head/math/vtk6/pkg-plist Sat Nov 28 04:24:16 2015 (r402508) +++ head/math/vtk6/pkg-plist Sat Nov 28 05:30:18 2015 (r402509) @@ -4306,7 +4306,7 @@ include/vtk-%%VER2%%/vtkmetaio/metaTypes include/vtk-%%VER2%%/vtkmetaio/metaUtils.h include/vtk-%%VER2%%/vtkmetaio/metaVesselTube.h include/vtk-%%VER2%%/vtknetcdf/include/ncvalues.h -include/vtk-%%VER2%%/vtknetcdf/include/netcdf.h +include/vtk-%%VER2%%/vtknetcdf/include/xxxnetcdf.h include/vtk-%%VER2%%/vtknetcdf/include/netcdf.hh include/vtk-%%VER2%%/vtknetcdf/include/netcdfcpp.h include/vtk-%%VER2%%/vtknetcdf/include/vtk_netcdf_config.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511280530.tAS5UIcn018200>