From owner-svn-ports-all@freebsd.org  Fri Jul 29 23:45:42 2016
Return-Path: <owner-svn-ports-all@freebsd.org>
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 4036DBA7D01;
 Fri, 29 Jul 2016 23:45:42 +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 1290C1587;
 Fri, 29 Jul 2016 23:45:42 +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 u6TNjfHx030156;
 Fri, 29 Jul 2016 23:45:41 GMT (envelope-from stephen@FreeBSD.org)
Received: (from stephen@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6TNjfg1030154;
 Fri, 29 Jul 2016 23:45:41 GMT (envelope-from stephen@FreeBSD.org)
Message-Id: <201607292345.u6TNjfg1030154@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: stephen set sender to
 stephen@FreeBSD.org using -f
From: Stephen Montgomery-Smith <stephen@FreeBSD.org>
Date: Fri, 29 Jul 2016 23:45:41 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r419283 - head/math/vtk6
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.22
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 29 Jul 2016 23:45:42 -0000

Author: stephen
Date: Fri Jul 29 23:45:41 2016
New Revision: 419283
URL: https://svnweb.freebsd.org/changeset/ports/419283

Log:
  - Don't install share/cmake/hdf5/libhdf5.settings to avoid clash with
    science/paraview
  
  PR:		ports/211334
  Submitted by:	Chen Xie <xiechen96@gmail.com>

Modified:
  head/math/vtk6/Makefile
  head/math/vtk6/pkg-plist

Modified: head/math/vtk6/Makefile
==============================================================================
--- head/math/vtk6/Makefile	Fri Jul 29 23:39:33 2016	(r419282)
+++ head/math/vtk6/Makefile	Fri Jul 29 23:45:41 2016	(r419283)
@@ -3,7 +3,7 @@
 
 PORTNAME=	vtk
 PORTVERSION=	6.2.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math graphics
 MASTER_SITES=	http://www.vtk.org/files/release/${VTK_SHORT_VER}/
 PKGNAMESUFFIX=	6
@@ -217,4 +217,8 @@ 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>

Modified: head/math/vtk6/pkg-plist
==============================================================================
--- head/math/vtk6/pkg-plist	Fri Jul 29 23:39:33 2016	(r419282)
+++ head/math/vtk6/pkg-plist	Fri Jul 29 23:45:41 2016	(r419283)
@@ -4519,4 +4519,3 @@ lib/cmake/vtk-%%VER2%%/vtkWrapPythonSIP.
 lib/cmake/vtk-%%VER2%%/vtkWrapTcl.cmake
 lib/cmake/vtk-%%VER2%%/vtkWrapperInit.data.in
 lib/cmake/vtk-%%VER2%%/vtkWrapping.cmake
-share/cmake/hdf5/libhdf5.settings