5 files changed, 18 insertions, 50 deletions
diff --git a/graphics/vtk/Makefile b/graphics/vtk/Makefile
index 2e9b035dfbd..4ccd32b4a2d 100644
--- a/graphics/vtk/Makefile
+++ b/graphics/vtk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2021/05/08 13:55:19 thor Exp $
+# $NetBSD: Makefile,v 1.16 2021/07/08 14:59:24 prlw1 Exp $
 
-DISTNAME=	VTK-9.0.1
+DISTNAME=	VTK-9.0.3
 PKGNAME=	${DISTNAME:S/VTK/vtk/}
-PKGREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://www.vtk.org/files/release/9.0/
 
diff --git a/graphics/vtk/PLIST b/graphics/vtk/PLIST
index 2a2f0290d0b..a00c0106be6 100644
--- a/graphics/vtk/PLIST
+++ b/graphics/vtk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2021/05/08 13:55:19 thor Exp $
+@comment $NetBSD: PLIST,v 1.6 2021/07/08 14:59:24 prlw1 Exp $
 bin/vtkProbeOpenGLVersion-9.0
 include/vtk-9.0/DICOMAppHelper.h
 include/vtk-9.0/DICOMCMakeConfig.h
@@ -566,6 +566,7 @@ include/vtk-9.0/vtkDistanceWidget.h
 include/vtk-9.0/vtkDistributedDataFilter.h
 include/vtk-9.0/vtkDistributedGraphHelper.h
 include/vtk-9.0/vtkDomainsChemistryModule.h
+include/vtk-9.0/vtkDomainsChemistryOpenGL2Module.h
 include/vtk-9.0/vtkDotProductSimilarity.h
 include/vtk-9.0/vtkDoubleArray.h
 include/vtk-9.0/vtkDoubleDispatcher.h
@@ -1048,6 +1049,7 @@ include/vtk-9.0/vtkImagePermute.h
 include/vtk-9.0/vtkImagePlaneWidget.h
 include/vtk-9.0/vtkImagePointDataIterator.h
 include/vtk-9.0/vtkImagePointIterator.h
+include/vtk-9.0/vtkImageProbeFilter.h
 include/vtk-9.0/vtkImageProcessingPass.h
 include/vtk-9.0/vtkImageProgressIterator.h
 include/vtk-9.0/vtkImageProperty.h
@@ -1479,6 +1481,7 @@ include/vtk-9.0/vtkOpenGLIndexBufferObject.h
 include/vtk-9.0/vtkOpenGLInstanceCulling.h
 include/vtk-9.0/vtkOpenGLLabeledContourMapper.h
 include/vtk-9.0/vtkOpenGLLight.h
+include/vtk-9.0/vtkOpenGLMoleculeMapper.h
 include/vtk-9.0/vtkOpenGLPointGaussianMapper.h
 include/vtk-9.0/vtkOpenGLPolyDataMapper.h
 include/vtk-9.0/vtkOpenGLPolyDataMapper2D.h
@@ -2693,10 +2696,6 @@ include/vtk-9.0/vtksys/String.hxx
 include/vtk-9.0/vtksys/System.h
 include/vtk-9.0/vtksys/SystemInformation.hxx
 include/vtk-9.0/vtksys/SystemTools.hxx
-include/vtk-9.0/vtksys/hash_fun.hxx
-include/vtk-9.0/vtksys/hash_map.hxx
-include/vtk-9.0/vtksys/hash_set.hxx
-include/vtk-9.0/vtksys/hashtable.hxx
 lib/cmake/vtk-9.0/FindEXPAT.cmake
 lib/cmake/vtk-9.0/FindEigen3.cmake
 lib/cmake/vtk-9.0/FindFFMPEG.cmake
@@ -2806,6 +2805,9 @@ lib/libvtkDICOMParser-9.0.so.${PKGVERSION}
 lib/libvtkDomainsChemistry-9.0.so
 lib/libvtkDomainsChemistry-9.0.so.1
 lib/libvtkDomainsChemistry-9.0.so.${PKGVERSION}
+lib/libvtkDomainsChemistryOpenGL2-9.0.so
+lib/libvtkDomainsChemistryOpenGL2-9.0.so.1
+lib/libvtkDomainsChemistryOpenGL2-9.0.so.${PKGVERSION}
 lib/libvtkFiltersAMR-9.0.so
 lib/libvtkFiltersAMR-9.0.so.1
 lib/libvtkFiltersAMR-9.0.so.${PKGVERSION}
@@ -3100,6 +3102,7 @@ ${PLIST.qt}include/vtk-9.0/QVTKInteractor.h
 ${PLIST.qt}include/vtk-9.0/QVTKOpenGLNativeWidget.h
 ${PLIST.qt}include/vtk-9.0/QVTKOpenGLStereoWidget.h
 ${PLIST.qt}include/vtk-9.0/QVTKOpenGLWindow.h
+${PLIST.qt}include/vtk-9.0/QVTKRenderWidget.h
 ${PLIST.qt}include/vtk-9.0/QVTKRenderWindowAdapter.h
 ${PLIST.qt}include/vtk-9.0/QVTKWin32Header.h
 ${PLIST.qt}include/vtk-9.0/vtkEventQtSlotConnect.h
@@ -3130,10 +3133,10 @@ ${PLIST.qt}include/vtk-9.0/vtkRenderingQtModule.h
 ${PLIST.qt}include/vtk-9.0/vtkViewsQtModule.h
 ${PLIST.qt}lib/libvtkGUISupportQt-9.0.so
 ${PLIST.qt}lib/libvtkGUISupportQt-9.0.so.1
-${PLIST.qt}lib/libvtkGUISupportQt-9.0.so.9.0.1
+${PLIST.qt}lib/libvtkGUISupportQt-9.0.so.${PKGVERSION}
 ${PLIST.qt}lib/libvtkRenderingQt-9.0.so
 ${PLIST.qt}lib/libvtkRenderingQt-9.0.so.1
-${PLIST.qt}lib/libvtkRenderingQt-9.0.so.9.0.1
+${PLIST.qt}lib/libvtkRenderingQt-9.0.so.${PKGVERSION}
 ${PLIST.qt}lib/libvtkViewsQt-9.0.so
 ${PLIST.qt}lib/libvtkViewsQt-9.0.so.1
-${PLIST.qt}lib/libvtkViewsQt-9.0.so.9.0.1
+${PLIST.qt}lib/libvtkViewsQt-9.0.so.${PKGVERSION}
diff --git a/graphics/vtk/distinfo b/graphics/vtk/distinfo
index 1a06c24526e..e2739778e3c 100644
--- a/graphics/vtk/distinfo
+++ b/graphics/vtk/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.10 2021/05/04 14:48:34 prlw1 Exp $
+$NetBSD: distinfo,v 1.11 2021/07/08 14:59:24 prlw1 Exp $
 
-SHA1 (VTK-9.0.1.tar.gz) = 578be3303b6ee5bb7ad23c2a87f02475f407bccb
-RMD160 (VTK-9.0.1.tar.gz) = 1c9eaf59f37ebbdf5871276a61c579a1f00dce6b
-SHA512 (VTK-9.0.1.tar.gz) = eb2508e2409ad302cc5db65282a9c1ff4477ac8a93e0fee898ad8f0974d72decc7d5d444dc825a3c2f7952ebf59853616097ebe0d134649cab0d49a9619065bf
-Size (VTK-9.0.1.tar.gz) = 34687900 bytes
-SHA1 (patch-Rendering_FreeTypeFontConfig_vtkFontConfigFreeTypeTools.cxx) = 4d2b14198d5bf5c8a3251332c28ce290c875848f
-SHA1 (patch-Rendering_FreeType_vtkFreeTypeTools.cxx) = bce6587f9367cff77624283eb5c9f47776246ec1
+SHA1 (VTK-9.0.3.tar.gz) = ccba6377369f43f5811c96384092eb7d6d40634d
+RMD160 (VTK-9.0.3.tar.gz) = 50bf13836ebd4d3ca7dce8de77382ef222980257
+SHA512 (VTK-9.0.3.tar.gz) = 00528011f9206444d09fc6cea05c46930745bb70ea02be6244ab3eb510ae82af772157c025157b1761dc4c6a9ab538b57f814c03a708f30aa3598a421fdc6ae2
+Size (VTK-9.0.3.tar.gz) = 34684378 bytes
diff --git a/graphics/vtk/patches/patch-Rendering_FreeTypeFontConfig_vtkFontConfigFreeTypeTools.cxx b/graphics/vtk/patches/patch-Rendering_FreeTypeFontConfig_vtkFontConfigFreeTypeTools.cxx
deleted file mode 100644
index a4d986347d7..00000000000
--- a/graphics/vtk/patches/patch-Rendering_FreeTypeFontConfig_vtkFontConfigFreeTypeTools.cxx
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-Rendering_FreeTypeFontConfig_vtkFontConfigFreeTypeTools.cxx,v 1.1 2021/05/04 14:48:34 prlw1 Exp $
-
-Nice explanation here:
-https://bugs.ghostscript.com/show_bug.cgi?id=702985
-
---- Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx.orig	2020-06-26 13:24:40.000000000 +0000
-+++ Rendering/FreeTypeFontConfig/vtkFontConfigFreeTypeTools.cxx
-@@ -29,7 +29,7 @@ vtkStandardNewMacro(vtkFontConfigFreeTyp
- namespace
- {
- // The FreeType face requester callback:
--FT_CALLBACK_DEF(FT_Error)
-+extern "C" FT_Error
- vtkFontConfigFreeTypeToolsFaceRequester(
-   FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face)
- {
diff --git a/graphics/vtk/patches/patch-Rendering_FreeType_vtkFreeTypeTools.cxx b/graphics/vtk/patches/patch-Rendering_FreeType_vtkFreeTypeTools.cxx
deleted file mode 100644
index bdd1ff043b5..00000000000
--- a/graphics/vtk/patches/patch-Rendering_FreeType_vtkFreeTypeTools.cxx
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-Rendering_FreeType_vtkFreeTypeTools.cxx,v 1.1 2021/05/04 14:48:34 prlw1 Exp $
-
-Nice explanation here:
-https://bugs.ghostscript.com/show_bug.cgi?id=702985
-
---- Rendering/FreeType/vtkFreeTypeTools.cxx.orig	2020-06-26 13:24:40.000000000 +0000
-+++ Rendering/FreeType/vtkFreeTypeTools.cxx
-@@ -378,7 +378,7 @@ FTC_CMapCache* vtkFreeTypeTools::GetCMap
- }
- 
- //----------------------------------------------------------------------------
--FT_CALLBACK_DEF(FT_Error)
-+extern "C" FT_Error
- vtkFreeTypeToolsFaceRequester(
-   FTC_FaceID face_id, FT_Library lib, FT_Pointer request_data, FT_Face* face)
- {