vtk: fix for Darwin + cleanup

3 files changed, 180 insertions, 170 deletions

diff --git a/graphics/vtk/Makefile b/graphics/vtk/Makefile
index 96a8fd99ec7..2ac13802227 100644
--- a/graphics/vtk/Makefile
+++ b/graphics/vtk/Makefile
@@ -1,32 +1,23 @@
-# $NetBSD: Makefile,v 1.18 2021/12/08 16:02:13 adam Exp $
+# $NetBSD: Makefile,v 1.19 2022/04/13 10:09:20 adam Exp $
 
 DISTNAME=	VTK-9.0.3
-PKGNAME=	${DISTNAME:S/VTK/vtk/}
-PKGREVISION=	2
+PKGNAME=	${DISTNAME:tl}
 CATEGORIES=	graphics
-MASTER_SITES=	https://www.vtk.org/files/release/9.0/
+MASTER_SITES=	https://www.vtk.org/files/release/${PKGVERSION_NOREV:R}/
 
 MAINTAINER=	prlw1@cam.ac.uk
 HOMEPAGE=	https://vtk.org/
 COMMENT=	Visualization toolkit
 LICENSE=	modified-bsd
 
+BUILD_DEPENDS=	ninja-build-[0-9]*:../../devel/ninja-build
+
 USE_CMAKE=	yes
 USE_LANGUAGES=	c c++11
 
 CONFIGURE_DIRS=	build
 CMAKE_ARG_PATH=	..
 CMAKE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
-
-
-MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/build/lib
-#MAKE_ENV+=	CPPFLAGS=-I/usr/pkg/include
-
-post-extract:
-	mkdir ${WRKSRC}/build
-
-BUILD_DEPENDS=	ninja-build-[0-9]*:../../devel/ninja-build
-
 CMAKE_ARGS+=	-DVTK_LEGACY_REMOVE=ON
 CMAKE_ARGS+=	-DVTK_USE_MPI=OFF
 CMAKE_ARGS+=	-DVTK_USE_CUDA=OFF
@@ -43,6 +34,21 @@ CMAKE_ARGS+=	-DVTK_FORBID_DOWNLOADS=ON
 # https://discourse.vtk.org/t/9-0-0-rc1-contextopengl2-not-built/2933
 CMAKE_ARGS+=	-DVTK_MODULE_ENABLE_VTK_RenderingContextOpenGL2=YES
 
+MAKE_ENV+=	LD_LIBRARY_PATH=${WRKSRC}/build/lib
+
+PLIST_VARS+=	cocoa opengl
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Darwin"
+PLIST.cocoa=	yes
+.else
+PLIST.opengl=	yes
+.endif
+
+post-extract:
+	${MKDIR} ${WRKSRC}/build
+
 .include "options.mk"
 
 .include "../../archivers/lz4/buildlink3.mk"
diff --git a/graphics/vtk/PLIST b/graphics/vtk/PLIST
index a00c0106be6..101a6634a9e 100644
--- a/graphics/vtk/PLIST
+++ b/graphics/vtk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2021/07/08 14:59:24 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.7 2022/04/13 10:09:20 adam Exp $
 bin/vtkProbeOpenGLVersion-9.0
 include/vtk-9.0/DICOMAppHelper.h
 include/vtk-9.0/DICOMCMakeConfig.h
@@ -10,6 +10,16 @@ include/vtk-9.0/DICOMParserMap.h
 include/vtk-9.0/DICOMTypes.h
 include/vtk-9.0/LSDynaFamily.h
 include/vtk-9.0/LSDynaMetaData.h
+${PLIST.qt}include/vtk-9.0/QFilterTreeProxyModel.h
+${PLIST.qt}include/vtk-9.0/QVTKApplication.h
+${PLIST.qt}include/vtk-9.0/QVTKInteractor.h
+${PLIST.qt}include/vtk-9.0/QVTKInteractorAdapter.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
 include/vtk-9.0/octree/octree
 include/vtk-9.0/octree/octree.h
 include/vtk-9.0/octree/octree.txx
@@ -338,6 +348,10 @@ include/vtk-9.0/vtkClosedSurfacePointPlacer.h
 include/vtk-9.0/vtkClosestNPointsStrategy.h
 include/vtk-9.0/vtkClosestPointStrategy.h
 include/vtk-9.0/vtkClustering2DLayoutStrategy.h
+${PLIST.cocoa}include/vtk-9.0/vtkCocoaGLView.h
+${PLIST.cocoa}include/vtk-9.0/vtkCocoaMacOSXSDKCompatibility.h
+${PLIST.cocoa}include/vtk-9.0/vtkCocoaRenderWindow.h
+${PLIST.cocoa}include/vtk-9.0/vtkCocoaRenderWindowInteractor.h
 include/vtk-9.0/vtkCoincidentPoints.h
 include/vtk-9.0/vtkCollapseGraph.h
 include/vtk-9.0/vtkCollapseVerticesByArray.h
@@ -610,6 +624,7 @@ include/vtk-9.0/vtkEvenlySpacedStreamlines2D.h
 include/vtk-9.0/vtkEvent.h
 include/vtk-9.0/vtkEventData.h
 include/vtk-9.0/vtkEventForwarderCommand.h
+${PLIST.qt}include/vtk-9.0/vtkEventQtSlotConnect.h
 include/vtk-9.0/vtkExecutionTimer.h
 include/vtk-9.0/vtkExecutive.h
 include/vtk-9.0/vtkExodusIICache.h
@@ -757,6 +772,7 @@ include/vtk-9.0/vtkGPUInfo.h
 include/vtk-9.0/vtkGPUInfoList.h
 include/vtk-9.0/vtkGPUInfoListArray.h
 include/vtk-9.0/vtkGPUVolumeRayCastMapper.h
+${PLIST.qt}include/vtk-9.0/vtkGUISupportQtModule.h
 include/vtk-9.0/vtkGarbageCollector.h
 include/vtk-9.0/vtkGarbageCollectorManager.h
 include/vtk-9.0/vtkGaussianBlurPass.h
@@ -1799,6 +1815,28 @@ include/vtk-9.0/vtkProteinRibbonFilter.h
 include/vtk-9.0/vtkPruneTreeFilter.h
 include/vtk-9.0/vtkPyramid.h
 include/vtk-9.0/vtkPythagoreanQuadruples.h
+${PLIST.qt}include/vtk-9.0/vtkQImageToImageSource.h
+${PLIST.qt}include/vtk-9.0/vtkQWidgetRepresentation.h
+${PLIST.qt}include/vtk-9.0/vtkQWidgetTexture.h
+${PLIST.qt}include/vtk-9.0/vtkQWidgetWidget.h
+${PLIST.qt}include/vtk-9.0/vtkQtAbstractModelAdapter.h
+${PLIST.qt}include/vtk-9.0/vtkQtAnnotationLayersModelAdapter.h
+${PLIST.qt}include/vtk-9.0/vtkQtAnnotationView.h
+${PLIST.qt}include/vtk-9.0/vtkQtConnection.h
+${PLIST.qt}include/vtk-9.0/vtkQtDebugLeaksModel.h
+${PLIST.qt}include/vtk-9.0/vtkQtDebugLeaksView.h
+${PLIST.qt}include/vtk-9.0/vtkQtInitialization.h
+${PLIST.qt}include/vtk-9.0/vtkQtLabelRenderStrategy.h
+${PLIST.qt}include/vtk-9.0/vtkQtListView.h
+${PLIST.qt}include/vtk-9.0/vtkQtRecordView.h
+${PLIST.qt}include/vtk-9.0/vtkQtStringToImage.h
+${PLIST.qt}include/vtk-9.0/vtkQtTableModelAdapter.h
+${PLIST.qt}include/vtk-9.0/vtkQtTableRepresentation.h
+${PLIST.qt}include/vtk-9.0/vtkQtTableView.h
+${PLIST.qt}include/vtk-9.0/vtkQtTreeModelAdapter.h
+${PLIST.qt}include/vtk-9.0/vtkQtTreeRingLabelMapper.h
+${PLIST.qt}include/vtk-9.0/vtkQtTreeView.h
+${PLIST.qt}include/vtk-9.0/vtkQtView.h
 include/vtk-9.0/vtkQuad.h
 include/vtk-9.0/vtkQuadRotationalExtrusionFilter.h
 include/vtk-9.0/vtkQuadraticEdge.h
@@ -1910,6 +1948,7 @@ include/vtk-9.0/vtkRenderingLODModule.h
 include/vtk-9.0/vtkRenderingLabelModule.h
 include/vtk-9.0/vtkRenderingOpenGL2Module.h
 include/vtk-9.0/vtkRenderingOpenGLConfigure.h
+${PLIST.qt}include/vtk-9.0/vtkRenderingQtModule.h
 include/vtk-9.0/vtkRenderingSceneGraphModule.h
 include/vtk-9.0/vtkRenderingUIModule.h
 include/vtk-9.0/vtkRenderingVolumeModule.h
@@ -2389,6 +2428,7 @@ include/vtk-9.0/vtkViewport.h
 include/vtk-9.0/vtkViewsContext2DModule.h
 include/vtk-9.0/vtkViewsCoreModule.h
 include/vtk-9.0/vtkViewsInfovisModule.h
+${PLIST.qt}include/vtk-9.0/vtkViewsQtModule.h
 include/vtk-9.0/vtkVisibilitySort.h
 include/vtk-9.0/vtkVoidArray.h
 include/vtk-9.0/vtkVolume.h
@@ -2523,8 +2563,8 @@ include/vtk-9.0/vtkXMLUnstructuredGridWriter.h
 include/vtk-9.0/vtkXMLUtilities.h
 include/vtk-9.0/vtkXMLWriter.h
 include/vtk-9.0/vtkXMLWriterC.h
-include/vtk-9.0/vtkXOpenGLRenderWindow.h
-include/vtk-9.0/vtkXRenderWindowInteractor.h
+${PLIST.opengl}include/vtk-9.0/vtkXOpenGLRenderWindow.h
+${PLIST.opengl}include/vtk-9.0/vtkXRenderWindowInteractor.h
 include/vtk-9.0/vtkXYPlotActor.h
 include/vtk-9.0/vtkXYPlotWidget.h
 include/vtk-9.0/vtkXYZMolReader.h
@@ -2770,323 +2810,332 @@ lib/cmake/vtk-9.0/vtkTestingDriver.cmake
 lib/cmake/vtk-9.0/vtkTestingRenderingDriver.cmake
 lib/cmake/vtk-9.0/vtkTopologicalSort.cmake
 lib/libvtkChartsCore-9.0.so
-lib/libvtkChartsCore-9.0.so.1
 lib/libvtkChartsCore-9.0.so.${PKGVERSION}
+lib/libvtkChartsCore-9.0.so.1
 lib/libvtkCommonColor-9.0.so
-lib/libvtkCommonColor-9.0.so.1
 lib/libvtkCommonColor-9.0.so.${PKGVERSION}
+lib/libvtkCommonColor-9.0.so.1
 lib/libvtkCommonComputationalGeometry-9.0.so
-lib/libvtkCommonComputationalGeometry-9.0.so.1
 lib/libvtkCommonComputationalGeometry-9.0.so.${PKGVERSION}
+lib/libvtkCommonComputationalGeometry-9.0.so.1
 lib/libvtkCommonCore-9.0.so
-lib/libvtkCommonCore-9.0.so.1
 lib/libvtkCommonCore-9.0.so.${PKGVERSION}
+lib/libvtkCommonCore-9.0.so.1
 lib/libvtkCommonDataModel-9.0.so
-lib/libvtkCommonDataModel-9.0.so.1
 lib/libvtkCommonDataModel-9.0.so.${PKGVERSION}
+lib/libvtkCommonDataModel-9.0.so.1
 lib/libvtkCommonExecutionModel-9.0.so
-lib/libvtkCommonExecutionModel-9.0.so.1
 lib/libvtkCommonExecutionModel-9.0.so.${PKGVERSION}
+lib/libvtkCommonExecutionModel-9.0.so.1
 lib/libvtkCommonMath-9.0.so
-lib/libvtkCommonMath-9.0.so.1
 lib/libvtkCommonMath-9.0.so.${PKGVERSION}
+lib/libvtkCommonMath-9.0.so.1
 lib/libvtkCommonMisc-9.0.so
-lib/libvtkCommonMisc-9.0.so.1
 lib/libvtkCommonMisc-9.0.so.${PKGVERSION}
+lib/libvtkCommonMisc-9.0.so.1
 lib/libvtkCommonSystem-9.0.so
-lib/libvtkCommonSystem-9.0.so.1
 lib/libvtkCommonSystem-9.0.so.${PKGVERSION}
+lib/libvtkCommonSystem-9.0.so.1
 lib/libvtkCommonTransforms-9.0.so
-lib/libvtkCommonTransforms-9.0.so.1
 lib/libvtkCommonTransforms-9.0.so.${PKGVERSION}
+lib/libvtkCommonTransforms-9.0.so.1
 lib/libvtkDICOMParser-9.0.so
-lib/libvtkDICOMParser-9.0.so.1
 lib/libvtkDICOMParser-9.0.so.${PKGVERSION}
+lib/libvtkDICOMParser-9.0.so.1
 lib/libvtkDomainsChemistry-9.0.so
-lib/libvtkDomainsChemistry-9.0.so.1
 lib/libvtkDomainsChemistry-9.0.so.${PKGVERSION}
+lib/libvtkDomainsChemistry-9.0.so.1
 lib/libvtkDomainsChemistryOpenGL2-9.0.so
-lib/libvtkDomainsChemistryOpenGL2-9.0.so.1
 lib/libvtkDomainsChemistryOpenGL2-9.0.so.${PKGVERSION}
+lib/libvtkDomainsChemistryOpenGL2-9.0.so.1
 lib/libvtkFiltersAMR-9.0.so
-lib/libvtkFiltersAMR-9.0.so.1
 lib/libvtkFiltersAMR-9.0.so.${PKGVERSION}
+lib/libvtkFiltersAMR-9.0.so.1
 lib/libvtkFiltersCore-9.0.so
-lib/libvtkFiltersCore-9.0.so.1
 lib/libvtkFiltersCore-9.0.so.${PKGVERSION}
+lib/libvtkFiltersCore-9.0.so.1
 lib/libvtkFiltersExtraction-9.0.so
-lib/libvtkFiltersExtraction-9.0.so.1
 lib/libvtkFiltersExtraction-9.0.so.${PKGVERSION}
+lib/libvtkFiltersExtraction-9.0.so.1
 lib/libvtkFiltersFlowPaths-9.0.so
-lib/libvtkFiltersFlowPaths-9.0.so.1
 lib/libvtkFiltersFlowPaths-9.0.so.${PKGVERSION}
+lib/libvtkFiltersFlowPaths-9.0.so.1
 lib/libvtkFiltersGeneral-9.0.so
-lib/libvtkFiltersGeneral-9.0.so.1
 lib/libvtkFiltersGeneral-9.0.so.${PKGVERSION}
+lib/libvtkFiltersGeneral-9.0.so.1
 lib/libvtkFiltersGeneric-9.0.so
-lib/libvtkFiltersGeneric-9.0.so.1
 lib/libvtkFiltersGeneric-9.0.so.${PKGVERSION}
+lib/libvtkFiltersGeneric-9.0.so.1
 lib/libvtkFiltersGeometry-9.0.so
-lib/libvtkFiltersGeometry-9.0.so.1
 lib/libvtkFiltersGeometry-9.0.so.${PKGVERSION}
+lib/libvtkFiltersGeometry-9.0.so.1
 lib/libvtkFiltersHybrid-9.0.so
-lib/libvtkFiltersHybrid-9.0.so.1
 lib/libvtkFiltersHybrid-9.0.so.${PKGVERSION}
+lib/libvtkFiltersHybrid-9.0.so.1
 lib/libvtkFiltersHyperTree-9.0.so
-lib/libvtkFiltersHyperTree-9.0.so.1
 lib/libvtkFiltersHyperTree-9.0.so.${PKGVERSION}
+lib/libvtkFiltersHyperTree-9.0.so.1
 lib/libvtkFiltersImaging-9.0.so
-lib/libvtkFiltersImaging-9.0.so.1
 lib/libvtkFiltersImaging-9.0.so.${PKGVERSION}
+lib/libvtkFiltersImaging-9.0.so.1
 lib/libvtkFiltersModeling-9.0.so
-lib/libvtkFiltersModeling-9.0.so.1
 lib/libvtkFiltersModeling-9.0.so.${PKGVERSION}
+lib/libvtkFiltersModeling-9.0.so.1
 lib/libvtkFiltersParallel-9.0.so
-lib/libvtkFiltersParallel-9.0.so.1
 lib/libvtkFiltersParallel-9.0.so.${PKGVERSION}
+lib/libvtkFiltersParallel-9.0.so.1
 lib/libvtkFiltersParallelImaging-9.0.so
-lib/libvtkFiltersParallelImaging-9.0.so.1
 lib/libvtkFiltersParallelImaging-9.0.so.${PKGVERSION}
+lib/libvtkFiltersParallelImaging-9.0.so.1
 lib/libvtkFiltersPoints-9.0.so
-lib/libvtkFiltersPoints-9.0.so.1
 lib/libvtkFiltersPoints-9.0.so.${PKGVERSION}
+lib/libvtkFiltersPoints-9.0.so.1
 lib/libvtkFiltersProgrammable-9.0.so
-lib/libvtkFiltersProgrammable-9.0.so.1
 lib/libvtkFiltersProgrammable-9.0.so.${PKGVERSION}
+lib/libvtkFiltersProgrammable-9.0.so.1
 lib/libvtkFiltersSMP-9.0.so
-lib/libvtkFiltersSMP-9.0.so.1
 lib/libvtkFiltersSMP-9.0.so.${PKGVERSION}
+lib/libvtkFiltersSMP-9.0.so.1
 lib/libvtkFiltersSelection-9.0.so
-lib/libvtkFiltersSelection-9.0.so.1
 lib/libvtkFiltersSelection-9.0.so.${PKGVERSION}
+lib/libvtkFiltersSelection-9.0.so.1
 lib/libvtkFiltersSources-9.0.so
-lib/libvtkFiltersSources-9.0.so.1
 lib/libvtkFiltersSources-9.0.so.${PKGVERSION}
+lib/libvtkFiltersSources-9.0.so.1
 lib/libvtkFiltersStatistics-9.0.so
-lib/libvtkFiltersStatistics-9.0.so.1
 lib/libvtkFiltersStatistics-9.0.so.${PKGVERSION}
+lib/libvtkFiltersStatistics-9.0.so.1
 lib/libvtkFiltersTexture-9.0.so
-lib/libvtkFiltersTexture-9.0.so.1
 lib/libvtkFiltersTexture-9.0.so.${PKGVERSION}
+lib/libvtkFiltersTexture-9.0.so.1
 lib/libvtkFiltersTopology-9.0.so
-lib/libvtkFiltersTopology-9.0.so.1
 lib/libvtkFiltersTopology-9.0.so.${PKGVERSION}
+lib/libvtkFiltersTopology-9.0.so.1
 lib/libvtkFiltersVerdict-9.0.so
-lib/libvtkFiltersVerdict-9.0.so.1
 lib/libvtkFiltersVerdict-9.0.so.${PKGVERSION}
+lib/libvtkFiltersVerdict-9.0.so.1
+${PLIST.qt}lib/libvtkGUISupportQt-9.0.so
+${PLIST.qt}lib/libvtkGUISupportQt-9.0.so.${PKGVERSION}
+${PLIST.qt}lib/libvtkGUISupportQt-9.0.so.1
 lib/libvtkGeovisCore-9.0.so
-lib/libvtkGeovisCore-9.0.so.1
 lib/libvtkGeovisCore-9.0.so.${PKGVERSION}
+lib/libvtkGeovisCore-9.0.so.1
 lib/libvtkIOAMR-9.0.so
-lib/libvtkIOAMR-9.0.so.1
 lib/libvtkIOAMR-9.0.so.${PKGVERSION}
+lib/libvtkIOAMR-9.0.so.1
 lib/libvtkIOAsynchronous-9.0.so
-lib/libvtkIOAsynchronous-9.0.so.1
 lib/libvtkIOAsynchronous-9.0.so.${PKGVERSION}
+lib/libvtkIOAsynchronous-9.0.so.1
 lib/libvtkIOCityGML-9.0.so
-lib/libvtkIOCityGML-9.0.so.1
 lib/libvtkIOCityGML-9.0.so.${PKGVERSION}
+lib/libvtkIOCityGML-9.0.so.1
 lib/libvtkIOCore-9.0.so
-lib/libvtkIOCore-9.0.so.1
 lib/libvtkIOCore-9.0.so.${PKGVERSION}
+lib/libvtkIOCore-9.0.so.1
 lib/libvtkIOEnSight-9.0.so
-lib/libvtkIOEnSight-9.0.so.1
 lib/libvtkIOEnSight-9.0.so.${PKGVERSION}
+lib/libvtkIOEnSight-9.0.so.1
 lib/libvtkIOExodus-9.0.so
-lib/libvtkIOExodus-9.0.so.1
 lib/libvtkIOExodus-9.0.so.${PKGVERSION}
+lib/libvtkIOExodus-9.0.so.1
 lib/libvtkIOExport-9.0.so
-lib/libvtkIOExport-9.0.so.1
 lib/libvtkIOExport-9.0.so.${PKGVERSION}
+lib/libvtkIOExport-9.0.so.1
 lib/libvtkIOExportGL2PS-9.0.so
-lib/libvtkIOExportGL2PS-9.0.so.1
 lib/libvtkIOExportGL2PS-9.0.so.${PKGVERSION}
+lib/libvtkIOExportGL2PS-9.0.so.1
 lib/libvtkIOExportPDF-9.0.so
-lib/libvtkIOExportPDF-9.0.so.1
 lib/libvtkIOExportPDF-9.0.so.${PKGVERSION}
+lib/libvtkIOExportPDF-9.0.so.1
 lib/libvtkIOGeometry-9.0.so
-lib/libvtkIOGeometry-9.0.so.1
 lib/libvtkIOGeometry-9.0.so.${PKGVERSION}
+lib/libvtkIOGeometry-9.0.so.1
 lib/libvtkIOImage-9.0.so
-lib/libvtkIOImage-9.0.so.1
 lib/libvtkIOImage-9.0.so.${PKGVERSION}
+lib/libvtkIOImage-9.0.so.1
 lib/libvtkIOImport-9.0.so
-lib/libvtkIOImport-9.0.so.1
 lib/libvtkIOImport-9.0.so.${PKGVERSION}
+lib/libvtkIOImport-9.0.so.1
 lib/libvtkIOInfovis-9.0.so
-lib/libvtkIOInfovis-9.0.so.1
 lib/libvtkIOInfovis-9.0.so.${PKGVERSION}
+lib/libvtkIOInfovis-9.0.so.1
 lib/libvtkIOLSDyna-9.0.so
-lib/libvtkIOLSDyna-9.0.so.1
 lib/libvtkIOLSDyna-9.0.so.${PKGVERSION}
+lib/libvtkIOLSDyna-9.0.so.1
 lib/libvtkIOLegacy-9.0.so
-lib/libvtkIOLegacy-9.0.so.1
 lib/libvtkIOLegacy-9.0.so.${PKGVERSION}
+lib/libvtkIOLegacy-9.0.so.1
 lib/libvtkIOMINC-9.0.so
-lib/libvtkIOMINC-9.0.so.1
 lib/libvtkIOMINC-9.0.so.${PKGVERSION}
+lib/libvtkIOMINC-9.0.so.1
 lib/libvtkIOMotionFX-9.0.so
-lib/libvtkIOMotionFX-9.0.so.1
 lib/libvtkIOMotionFX-9.0.so.${PKGVERSION}
+lib/libvtkIOMotionFX-9.0.so.1
 lib/libvtkIOMovie-9.0.so
-lib/libvtkIOMovie-9.0.so.1
 lib/libvtkIOMovie-9.0.so.${PKGVERSION}
+lib/libvtkIOMovie-9.0.so.1
 lib/libvtkIONetCDF-9.0.so
-lib/libvtkIONetCDF-9.0.so.1
 lib/libvtkIONetCDF-9.0.so.${PKGVERSION}
+lib/libvtkIONetCDF-9.0.so.1
 lib/libvtkIOOggTheora-9.0.so
-lib/libvtkIOOggTheora-9.0.so.1
 lib/libvtkIOOggTheora-9.0.so.${PKGVERSION}
+lib/libvtkIOOggTheora-9.0.so.1
 lib/libvtkIOPLY-9.0.so
-lib/libvtkIOPLY-9.0.so.1
 lib/libvtkIOPLY-9.0.so.${PKGVERSION}
+lib/libvtkIOPLY-9.0.so.1
 lib/libvtkIOParallel-9.0.so
-lib/libvtkIOParallel-9.0.so.1
 lib/libvtkIOParallel-9.0.so.${PKGVERSION}
+lib/libvtkIOParallel-9.0.so.1
 lib/libvtkIOParallelXML-9.0.so
-lib/libvtkIOParallelXML-9.0.so.1
 lib/libvtkIOParallelXML-9.0.so.${PKGVERSION}
+lib/libvtkIOParallelXML-9.0.so.1
 lib/libvtkIOSQL-9.0.so
-lib/libvtkIOSQL-9.0.so.1
 lib/libvtkIOSQL-9.0.so.${PKGVERSION}
+lib/libvtkIOSQL-9.0.so.1
 lib/libvtkIOSegY-9.0.so
-lib/libvtkIOSegY-9.0.so.1
 lib/libvtkIOSegY-9.0.so.${PKGVERSION}
+lib/libvtkIOSegY-9.0.so.1
 lib/libvtkIOTecplotTable-9.0.so
-lib/libvtkIOTecplotTable-9.0.so.1
 lib/libvtkIOTecplotTable-9.0.so.${PKGVERSION}
+lib/libvtkIOTecplotTable-9.0.so.1
 lib/libvtkIOVeraOut-9.0.so
-lib/libvtkIOVeraOut-9.0.so.1
 lib/libvtkIOVeraOut-9.0.so.${PKGVERSION}
+lib/libvtkIOVeraOut-9.0.so.1
 lib/libvtkIOVideo-9.0.so
-lib/libvtkIOVideo-9.0.so.1
 lib/libvtkIOVideo-9.0.so.${PKGVERSION}
+lib/libvtkIOVideo-9.0.so.1
 lib/libvtkIOXML-9.0.so
-lib/libvtkIOXML-9.0.so.1
 lib/libvtkIOXML-9.0.so.${PKGVERSION}
+lib/libvtkIOXML-9.0.so.1
 lib/libvtkIOXMLParser-9.0.so
-lib/libvtkIOXMLParser-9.0.so.1
 lib/libvtkIOXMLParser-9.0.so.${PKGVERSION}
+lib/libvtkIOXMLParser-9.0.so.1
 lib/libvtkImagingColor-9.0.so
-lib/libvtkImagingColor-9.0.so.1
 lib/libvtkImagingColor-9.0.so.${PKGVERSION}
+lib/libvtkImagingColor-9.0.so.1
 lib/libvtkImagingCore-9.0.so
-lib/libvtkImagingCore-9.0.so.1
 lib/libvtkImagingCore-9.0.so.${PKGVERSION}
+lib/libvtkImagingCore-9.0.so.1
 lib/libvtkImagingFourier-9.0.so
-lib/libvtkImagingFourier-9.0.so.1
 lib/libvtkImagingFourier-9.0.so.${PKGVERSION}
+lib/libvtkImagingFourier-9.0.so.1
 lib/libvtkImagingGeneral-9.0.so
-lib/libvtkImagingGeneral-9.0.so.1
 lib/libvtkImagingGeneral-9.0.so.${PKGVERSION}
+lib/libvtkImagingGeneral-9.0.so.1
 lib/libvtkImagingHybrid-9.0.so
-lib/libvtkImagingHybrid-9.0.so.1
 lib/libvtkImagingHybrid-9.0.so.${PKGVERSION}
+lib/libvtkImagingHybrid-9.0.so.1
 lib/libvtkImagingMath-9.0.so
-lib/libvtkImagingMath-9.0.so.1
 lib/libvtkImagingMath-9.0.so.${PKGVERSION}
+lib/libvtkImagingMath-9.0.so.1
 lib/libvtkImagingMorphological-9.0.so
-lib/libvtkImagingMorphological-9.0.so.1
 lib/libvtkImagingMorphological-9.0.so.${PKGVERSION}
+lib/libvtkImagingMorphological-9.0.so.1
 lib/libvtkImagingSources-9.0.so
-lib/libvtkImagingSources-9.0.so.1
 lib/libvtkImagingSources-9.0.so.${PKGVERSION}
+lib/libvtkImagingSources-9.0.so.1
 lib/libvtkImagingStatistics-9.0.so
-lib/libvtkImagingStatistics-9.0.so.1
 lib/libvtkImagingStatistics-9.0.so.${PKGVERSION}
+lib/libvtkImagingStatistics-9.0.so.1
 lib/libvtkImagingStencil-9.0.so
-lib/libvtkImagingStencil-9.0.so.1
 lib/libvtkImagingStencil-9.0.so.${PKGVERSION}
+lib/libvtkImagingStencil-9.0.so.1
 lib/libvtkInfovisCore-9.0.so
-lib/libvtkInfovisCore-9.0.so.1
 lib/libvtkInfovisCore-9.0.so.${PKGVERSION}
+lib/libvtkInfovisCore-9.0.so.1
 lib/libvtkInfovisLayout-9.0.so
-lib/libvtkInfovisLayout-9.0.so.1
 lib/libvtkInfovisLayout-9.0.so.${PKGVERSION}
+lib/libvtkInfovisLayout-9.0.so.1
 lib/libvtkInteractionImage-9.0.so
-lib/libvtkInteractionImage-9.0.so.1
 lib/libvtkInteractionImage-9.0.so.${PKGVERSION}
+lib/libvtkInteractionImage-9.0.so.1
 lib/libvtkInteractionStyle-9.0.so
-lib/libvtkInteractionStyle-9.0.so.1
 lib/libvtkInteractionStyle-9.0.so.${PKGVERSION}
+lib/libvtkInteractionStyle-9.0.so.1
 lib/libvtkInteractionWidgets-9.0.so
-lib/libvtkInteractionWidgets-9.0.so.1
 lib/libvtkInteractionWidgets-9.0.so.${PKGVERSION}
+lib/libvtkInteractionWidgets-9.0.so.1
 lib/libvtkParallelCore-9.0.so
-lib/libvtkParallelCore-9.0.so.1
 lib/libvtkParallelCore-9.0.so.${PKGVERSION}
+lib/libvtkParallelCore-9.0.so.1
 lib/libvtkParallelDIY-9.0.so
-lib/libvtkParallelDIY-9.0.so.1
 lib/libvtkParallelDIY-9.0.so.${PKGVERSION}
+lib/libvtkParallelDIY-9.0.so.1
 lib/libvtkRenderingAnnotation-9.0.so
-lib/libvtkRenderingAnnotation-9.0.so.1
 lib/libvtkRenderingAnnotation-9.0.so.${PKGVERSION}
+lib/libvtkRenderingAnnotation-9.0.so.1
 lib/libvtkRenderingContext2D-9.0.so
-lib/libvtkRenderingContext2D-9.0.so.1
 lib/libvtkRenderingContext2D-9.0.so.${PKGVERSION}
+lib/libvtkRenderingContext2D-9.0.so.1
 lib/libvtkRenderingContextOpenGL2-9.0.so
-lib/libvtkRenderingContextOpenGL2-9.0.so.1
 lib/libvtkRenderingContextOpenGL2-9.0.so.${PKGVERSION}
+lib/libvtkRenderingContextOpenGL2-9.0.so.1
 lib/libvtkRenderingCore-9.0.so
-lib/libvtkRenderingCore-9.0.so.1
 lib/libvtkRenderingCore-9.0.so.${PKGVERSION}
+lib/libvtkRenderingCore-9.0.so.1
 lib/libvtkRenderingFreeType-9.0.so
-lib/libvtkRenderingFreeType-9.0.so.1
 lib/libvtkRenderingFreeType-9.0.so.${PKGVERSION}
+lib/libvtkRenderingFreeType-9.0.so.1
 lib/libvtkRenderingGL2PSOpenGL2-9.0.so
-lib/libvtkRenderingGL2PSOpenGL2-9.0.so.1
 lib/libvtkRenderingGL2PSOpenGL2-9.0.so.${PKGVERSION}
+lib/libvtkRenderingGL2PSOpenGL2-9.0.so.1
 lib/libvtkRenderingImage-9.0.so
-lib/libvtkRenderingImage-9.0.so.1
 lib/libvtkRenderingImage-9.0.so.${PKGVERSION}
+lib/libvtkRenderingImage-9.0.so.1
 lib/libvtkRenderingLOD-9.0.so
-lib/libvtkRenderingLOD-9.0.so.1
 lib/libvtkRenderingLOD-9.0.so.${PKGVERSION}
+lib/libvtkRenderingLOD-9.0.so.1
 lib/libvtkRenderingLabel-9.0.so
-lib/libvtkRenderingLabel-9.0.so.1
 lib/libvtkRenderingLabel-9.0.so.${PKGVERSION}
+lib/libvtkRenderingLabel-9.0.so.1
 lib/libvtkRenderingOpenGL2-9.0.so
-lib/libvtkRenderingOpenGL2-9.0.so.1
 lib/libvtkRenderingOpenGL2-9.0.so.${PKGVERSION}
+lib/libvtkRenderingOpenGL2-9.0.so.1
+${PLIST.qt}lib/libvtkRenderingQt-9.0.so
+${PLIST.qt}lib/libvtkRenderingQt-9.0.so.${PKGVERSION}
+${PLIST.qt}lib/libvtkRenderingQt-9.0.so.1
 lib/libvtkRenderingSceneGraph-9.0.so
-lib/libvtkRenderingSceneGraph-9.0.so.1
 lib/libvtkRenderingSceneGraph-9.0.so.${PKGVERSION}
+lib/libvtkRenderingSceneGraph-9.0.so.1
 lib/libvtkRenderingUI-9.0.so
-lib/libvtkRenderingUI-9.0.so.1
 lib/libvtkRenderingUI-9.0.so.${PKGVERSION}
+lib/libvtkRenderingUI-9.0.so.1
 lib/libvtkRenderingVolume-9.0.so
-lib/libvtkRenderingVolume-9.0.so.1
 lib/libvtkRenderingVolume-9.0.so.${PKGVERSION}
+lib/libvtkRenderingVolume-9.0.so.1
 lib/libvtkRenderingVolumeOpenGL2-9.0.so
-lib/libvtkRenderingVolumeOpenGL2-9.0.so.1
 lib/libvtkRenderingVolumeOpenGL2-9.0.so.${PKGVERSION}
+lib/libvtkRenderingVolumeOpenGL2-9.0.so.1
 lib/libvtkRenderingVtkJS-9.0.so
-lib/libvtkRenderingVtkJS-9.0.so.1
 lib/libvtkRenderingVtkJS-9.0.so.${PKGVERSION}
+lib/libvtkRenderingVtkJS-9.0.so.1
 lib/libvtkTestingRendering-9.0.so
-lib/libvtkTestingRendering-9.0.so.1
 lib/libvtkTestingRendering-9.0.so.${PKGVERSION}
+lib/libvtkTestingRendering-9.0.so.1
 lib/libvtkViewsContext2D-9.0.so
-lib/libvtkViewsContext2D-9.0.so.1
 lib/libvtkViewsContext2D-9.0.so.${PKGVERSION}
+lib/libvtkViewsContext2D-9.0.so.1
 lib/libvtkViewsCore-9.0.so
-lib/libvtkViewsCore-9.0.so.1
 lib/libvtkViewsCore-9.0.so.${PKGVERSION}
+lib/libvtkViewsCore-9.0.so.1
 lib/libvtkViewsInfovis-9.0.so
-lib/libvtkViewsInfovis-9.0.so.1
 lib/libvtkViewsInfovis-9.0.so.${PKGVERSION}
+lib/libvtkViewsInfovis-9.0.so.1
+${PLIST.qt}lib/libvtkViewsQt-9.0.so
+${PLIST.qt}lib/libvtkViewsQt-9.0.so.${PKGVERSION}
+${PLIST.qt}lib/libvtkViewsQt-9.0.so.1
 lib/libvtkexodusII-9.0.so
-lib/libvtkexodusII-9.0.so.1
 lib/libvtkexodusII-9.0.so.${PKGVERSION}
+lib/libvtkexodusII-9.0.so.1
 lib/libvtkmetaio-9.0.so
-lib/libvtkmetaio-9.0.so.1
 lib/libvtkmetaio-9.0.so.${PKGVERSION}
+lib/libvtkmetaio-9.0.so.1
 lib/libvtksys-9.0.so
-lib/libvtksys-9.0.so.1
 lib/libvtksys-9.0.so.${PKGVERSION}
+lib/libvtksys-9.0.so.1
 lib/libvtkverdict-9.0.so
-lib/libvtkverdict-9.0.so.1
 lib/libvtkverdict-9.0.so.${PKGVERSION}
+lib/libvtkverdict-9.0.so.1
 share/licenses/VTK/Copyright.txt
 share/licenses/VTK/vtkdiy2/LEGAL.txt
 share/licenses/VTK/vtkdiy2/LICENSE.txt
@@ -3095,48 +3144,3 @@ share/licenses/VTK/vtkkwiml/Copyright.txt
 share/licenses/VTK/vtkmetaio/License.txt
 share/licenses/VTK/vtksys/Copyright.txt
 share/licenses/VTK/vtkverdict/Copyright.txt
-${PLIST.qt}include/vtk-9.0/QFilterTreeProxyModel.h
-${PLIST.qt}include/vtk-9.0/QVTKApplication.h
-${PLIST.qt}include/vtk-9.0/QVTKInteractorAdapter.h
-${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
-${PLIST.qt}include/vtk-9.0/vtkGUISupportQtModule.h
-${PLIST.qt}include/vtk-9.0/vtkQImageToImageSource.h
-${PLIST.qt}include/vtk-9.0/vtkQtAbstractModelAdapter.h
-${PLIST.qt}include/vtk-9.0/vtkQtAnnotationLayersModelAdapter.h
-${PLIST.qt}include/vtk-9.0/vtkQtAnnotationView.h
-${PLIST.qt}include/vtk-9.0/vtkQtConnection.h
-${PLIST.qt}include/vtk-9.0/vtkQtDebugLeaksModel.h
-${PLIST.qt}include/vtk-9.0/vtkQtDebugLeaksView.h
-${PLIST.qt}include/vtk-9.0/vtkQtInitialization.h
-${PLIST.qt}include/vtk-9.0/vtkQtLabelRenderStrategy.h
-${PLIST.qt}include/vtk-9.0/vtkQtListView.h
-${PLIST.qt}include/vtk-9.0/vtkQtRecordView.h
-${PLIST.qt}include/vtk-9.0/vtkQtStringToImage.h
-${PLIST.qt}include/vtk-9.0/vtkQtTableModelAdapter.h
-${PLIST.qt}include/vtk-9.0/vtkQtTableRepresentation.h
-${PLIST.qt}include/vtk-9.0/vtkQtTableView.h
-${PLIST.qt}include/vtk-9.0/vtkQtTreeModelAdapter.h
-${PLIST.qt}include/vtk-9.0/vtkQtTreeRingLabelMapper.h
-${PLIST.qt}include/vtk-9.0/vtkQtTreeView.h
-${PLIST.qt}include/vtk-9.0/vtkQtView.h
-${PLIST.qt}include/vtk-9.0/vtkQWidgetRepresentation.h
-${PLIST.qt}include/vtk-9.0/vtkQWidgetTexture.h
-${PLIST.qt}include/vtk-9.0/vtkQWidgetWidget.h
-${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.${PKGVERSION}
-${PLIST.qt}lib/libvtkRenderingQt-9.0.so
-${PLIST.qt}lib/libvtkRenderingQt-9.0.so.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.${PKGVERSION}
diff --git a/graphics/vtk/buildlink3.mk b/graphics/vtk/buildlink3.mk
index b87964388c5..88a1323b840 100644
--- a/graphics/vtk/buildlink3.mk
+++ b/graphics/vtk/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2021/09/29 19:00:08 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2022/04/13 10:09:20 adam Exp $
 
 BUILDLINK_TREE+=	vtk
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	vtk
 VTK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.vtk+=	vtk>=9.0.1
-BUILDLINK_ABI_DEPENDS.vtk?=	vtk>=9.0.3nb1
+BUILDLINK_ABI_DEPENDS.vtk+=	vtk>=9.0.3nb1
 BUILDLINK_PKGSRCDIR.vtk?=	../../graphics/vtk
 
 .include "../../archivers/lz4/buildlink3.mk"