Don't install the cmake build setting file. It directly references

the wrkdir and is therefore not useful without. It is unclear whether
anything actually depends on it being present, so don't bother
faking it for now. Bump revision.

5 files changed, 31 insertions, 5 deletions

diff --git a/graphics/vtk/Makefile b/graphics/vtk/Makefile
index 048271b84ba..81e30584f33 100644
--- a/graphics/vtk/Makefile
+++ b/graphics/vtk/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2007/05/18 07:50:11 obache Exp $
+# $NetBSD: Makefile,v 1.10 2007/06/18 17:58:35 joerg Exp $
 #
 
 PKGNAME=	vtk-${VTKDIST_VERSION}
-PKGREVISION=	4
+PKGREVISION=	5
 
 COMMENT=	Visualization toolkit
 
diff --git a/graphics/vtk/PLIST b/graphics/vtk/PLIST
index ea968d906b4..6442a98d1e0 100644
--- a/graphics/vtk/PLIST
+++ b/graphics/vtk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/08/02 13:13:40 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/06/18 17:58:35 joerg Exp $
 include/vtk/expat.h
 include/vtk/expatDllConfig.h
 include/vtk/png.h
@@ -772,7 +772,6 @@ lib/vtk/CMake/libcmVTK_WRAP_PYTHON2.so
 lib/vtk/CMake/libcmVTK_WRAP_TCL2.so
 lib/vtk/CMake/vtkLoadCMakeExtensions.cmake
 lib/vtk/UseVTK.cmake
-lib/vtk/VTKBuildSettings.cmake
 lib/vtk/VTKConfig.cmake
 lib/vtk/VTKLibraryDepends.cmake
 lib/vtk/doxygen/authors.txt
diff --git a/graphics/vtk/distinfo b/graphics/vtk/distinfo
index 245f8591324..3c98ff56823 100644
--- a/graphics/vtk/distinfo
+++ b/graphics/vtk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2007/02/23 20:21:09 drochner Exp $
+$NetBSD: distinfo,v 1.5 2007/06/18 17:58:35 joerg Exp $
 
 SHA1 (VTK-4.2.6/VTK-4.2-LatestRelease.tar.gz) = 31ab01c16b3d44ce201d8180af431833cf6527d8
 RMD160 (VTK-4.2.6/VTK-4.2-LatestRelease.tar.gz) = 71a092cf929cfaeeb8f297334cadb829209b9ad7
@@ -7,3 +7,5 @@ SHA1 (patch-aa) = dbda07f15a60a0e66ce50e50addcf85d4c2b840c
 SHA1 (patch-ab) = 83d063aaf1924daff17a45fb92316743fbb448f3
 SHA1 (patch-ac) = 59977568e92ba01344447c0c0b1c770d26e460bb
 SHA1 (patch-ad) = efc49225d42953bb2fd0e099130e415a78b5b522
+SHA1 (patch-ae) = c3267339ebf7231cc2a4859b31a0f27ff6746255
+SHA1 (patch-af) = bdac3992a39dc19b4a231f02cc3eae4cd4b1f403
diff --git a/graphics/vtk/patches/patch-ae b/graphics/vtk/patches/patch-ae
new file mode 100644
index 00000000000..e2ae43869fa
--- /dev/null
+++ b/graphics/vtk/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2007/06/18 17:58:36 joerg Exp $
+
+--- cmake_install.cmake.orig	2007-06-17 16:02:44.000000000 +0000
++++ cmake_install.cmake
+@@ -36,7 +36,6 @@ FILE(INSTALL DESTINATION "${CMAKE_INSTAL
+ FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/include/vtk" TYPE FILE FILES "/scratch/graphics/vtk/work/VTK/vtkHybridInstantiator.h")
+ FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/include/vtk" TYPE FILE FILES "/scratch/graphics/vtk/work/VTK/vtkConfigure.h")
+ FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/include/vtk" TYPE FILE FILES "/scratch/graphics/vtk/work/VTK/vtkToolkits.h")
+-FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/vtk" TYPE FILE FILES "/scratch/graphics/vtk/work/VTK/VTKBuildSettings.cmake")
+ FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/vtk" TYPE FILE FILES "/scratch/graphics/vtk/work/VTK/UseVTK.cmake")
+ FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/vtk" TYPE FILE FILES "/scratch/graphics/vtk/work/VTK/VTKLibraryDepends.cmake")
+ FILE(INSTALL DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/vtk/CMake" TYPE FILE FILES "/scratch/graphics/vtk/work/VTK/CMake/vtkLoadCMakeExtensions.cmake")
diff --git a/graphics/vtk/patches/patch-af b/graphics/vtk/patches/patch-af
new file mode 100644
index 00000000000..61f09f72ac8
--- /dev/null
+++ b/graphics/vtk/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2007/06/18 17:58:36 joerg Exp $
+
+--- VTKConfig.cmake.in.orig	2007-06-17 16:07:21.000000000 +0000
++++ VTKConfig.cmake.in
+@@ -25,7 +25,7 @@ SET(VTK_BUILD_VERSION "@VTK_BUILD_VERSIO
+ SET(VTK_USE_FILE "@VTK_USE_FILE@")
+ 
+ # The build settings file.
+-SET(VTK_BUILD_SETTINGS_FILE "@VTK_BUILD_SETTINGS_FILE@")
++#SET(VTK_BUILD_SETTINGS_FILE "@VTK_BUILD_SETTINGS_FILE@")
+ 
+ # The wrapping hints file.
+ SET(VTK_WRAP_HINTS "@VTK_WRAP_HINTS_CONFIG@")