CVS commit: pkgsrc/graphics/vtk

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Sun Nov  2 01:04:48 UTC 2025

Modified Files:
        pkgsrc/graphics/vtk: Makefile PLIST options.mk

Log Message:
graphics/vtk: Rampage on PLIST_AWK, fix qt PLIST

  - Add many PRINT_PLIST_AWK to regenerate the PLIST mostly as is.
  - Fix the PLIST when building without qt - nothing interesting just
    missing and spurious PLIST.qt guards.


To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 pkgsrc/graphics/vtk/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/graphics/vtk/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/vtk/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/vtk/Makefile
diff -u pkgsrc/graphics/vtk/Makefile:1.60 pkgsrc/graphics/vtk/Makefile:1.61
--- pkgsrc/graphics/vtk/Makefile:1.60   Sat Nov  1 23:49:30 2025
+++ pkgsrc/graphics/vtk/Makefile        Sun Nov  2 01:04:48 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2025/11/01 23:49:30 gdt Exp $
+# $NetBSD: Makefile,v 1.61 2025/11/02 01:04:48 gdt Exp $
 
 DISTNAME=      VTK-9.5.2
 PKGNAME=       ${DISTNAME:tl}
@@ -50,7 +50,7 @@ MAKE_ENV+=    DYLD_LIBRARY_PATH=${WRKSRC}/$
 
 PLIST_VARS+=           cocoa opengl
 PLIST_SUBST+=          VTKVER=${VERSION_MINOR}
-PRINT_PLIST_AWK+=      gsub(/${VERSION_MINOR}/, "$${VTKVER}")
+PRINT_PLIST_AWK+=      { gsub(/${VERSION_MINOR}/, "$${VTKVER}"); }
 
 CHECK_PORTABILITY_SKIP+=       Examples/Build/vtkMy/Utilities/Doxygen/doc_makeall.sh.in
 
@@ -58,8 +58,13 @@ CHECK_PORTABILITY_SKIP+=     Examples/Build/
 
 .if ${OPSYS} == "Darwin"
 PLIST.cocoa=   yes
+PRINT_PLIST_AWK+=     /Cocoa/ { $$0 = "$${PLIST.cocoa}"$$0 }
 .else
 PLIST.opengl=  yes
+PRINT_PLIST_AWK+=     /EGL|egl/ { $$0 = "$${PLIST.opengl}"$$0 }
+PRINT_PLIST_AWK+=     /XOpenGL/ { $$0 = "$${PLIST.opengl}"$$0 }
+PRINT_PLIST_AWK+=     /XRender/ { $$0 = "$${PLIST.opengl}"$$0 }
+PRINT_PLIST_AWK+=     /glx/ { $$0 = "$${PLIST.opengl}"$$0 }
 .endif
 
 .include "options.mk"

Index: pkgsrc/graphics/vtk/PLIST
diff -u pkgsrc/graphics/vtk/PLIST:1.13 pkgsrc/graphics/vtk/PLIST:1.14
--- pkgsrc/graphics/vtk/PLIST:1.13      Sat Nov  1 23:47:40 2025
+++ pkgsrc/graphics/vtk/PLIST   Sun Nov  2 01:04:48 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2025/11/01 23:47:40 gdt Exp $
+@comment $NetBSD: PLIST,v 1.14 2025/11/02 01:04:48 gdt Exp $
 bin/vtkProbeOpenGLVersion-${VTKVER}
 include/vtk-${VTKVER}/DICOMAppHelper.h
 include/vtk-${VTKVER}/DICOMCMakeConfig.h
@@ -805,7 +805,7 @@ include/vtk-${VTKVER}/vtkDuplicatePolyDa
 include/vtk-${VTKVER}/vtkDynamic2DLabelMapper.h
 include/vtk-${VTKVER}/vtkDynamicLoader.h
 include/vtk-${VTKVER}/vtkEDLShading.h
-${PLIST.opengl}${PLIST.qt}include/vtk-${VTKVER}/vtkEGLRenderWindow.h
+${PLIST.opengl}include/vtk-${VTKVER}/vtkEGLRenderWindow.h
 include/vtk-${VTKVER}/vtkERFReader.h
 include/vtk-${VTKVER}/vtkEarthSource.h
 include/vtk-${VTKVER}/vtkEdgeCenters.h
@@ -2383,7 +2383,7 @@ include/vtk-${VTKVER}/vtkRenderingLODMod
 include/vtk-${VTKVER}/vtkRenderingLabelModule.h
 include/vtk-${VTKVER}/vtkRenderingOpenGL2Module.h
 include/vtk-${VTKVER}/vtkRenderingOpenGLConfigure.h
-include/vtk-${VTKVER}/vtkRenderingQtModule.h
+${PLIST.qt}include/vtk-${VTKVER}/vtkRenderingQtModule.h
 include/vtk-${VTKVER}/vtkRenderingSceneGraphModule.h
 include/vtk-${VTKVER}/vtkRenderingUIModule.h
 include/vtk-${VTKVER}/vtkRenderingVolumeModule.h
@@ -2913,7 +2913,7 @@ include/vtk-${VTKVER}/vtkViewport.h
 include/vtk-${VTKVER}/vtkViewsContext2DModule.h
 include/vtk-${VTKVER}/vtkViewsCoreModule.h
 include/vtk-${VTKVER}/vtkViewsInfovisModule.h
-include/vtk-${VTKVER}/vtkViewsQtModule.h
+${PLIST.qt}include/vtk-${VTKVER}/vtkViewsQtModule.h
 include/vtk-${VTKVER}/vtkVisibilitySort.h
 include/vtk-${VTKVER}/vtkVoidArray.h
 include/vtk-${VTKVER}/vtkVolume.h
@@ -3221,14 +3221,14 @@ include/vtk-${VTKVER}/vtkfmt/vtkfmt/prin
 include/vtk-${VTKVER}/vtkfmt/vtkfmt/ranges.h
 include/vtk-${VTKVER}/vtkfmt/vtkfmt/std.h
 include/vtk-${VTKVER}/vtkfmt/vtkfmt/xchar.h
-${PLIST.opengl}${PLIST.qt}include/vtk-${VTKVER}/vtkglad/include/EGL/eglplatform.h
+${PLIST.opengl}include/vtk-${VTKVER}/vtkglad/include/EGL/eglplatform.h
 include/vtk-${VTKVER}/vtkglad/include/KHR/khrplatform.h
-${PLIST.opengl}${PLIST.qt}include/vtk-${VTKVER}/vtkglad/include/glad/egl.h
+${PLIST.opengl}include/vtk-${VTKVER}/vtkglad/include/glad/egl.h
 include/vtk-${VTKVER}/vtkglad/include/glad/gl.h
-${PLIST.opengl}${PLIST.qt}include/vtk-${VTKVER}/vtkglad/include/glad/glx.h
-${PLIST.opengl}${PLIST.qt}include/vtk-${VTKVER}/vtkglad/include/glad/vtk_egl_mangle.h
+${PLIST.opengl}include/vtk-${VTKVER}/vtkglad/include/glad/glx.h
+${PLIST.opengl}include/vtk-${VTKVER}/vtkglad/include/glad/vtk_egl_mangle.h
 include/vtk-${VTKVER}/vtkglad/include/glad/vtk_gl_mangle.h
-${PLIST.opengl}${PLIST.qt}include/vtk-${VTKVER}/vtkglad/include/glad/vtk_glx_mangle.h
+${PLIST.opengl}include/vtk-${VTKVER}/vtkglad/include/glad/vtk_glx_mangle.h
 include/vtk-${VTKVER}/vtkioss/Ioss_Assembly.h
 include/vtk-${VTKVER}/vtkioss/Ioss_BasisVariableType.h
 include/vtk-${VTKVER}/vtkioss/Ioss_Blob.h
@@ -4006,7 +4006,7 @@ share/licenses/VTK/vtkFiltersParallelIma
 share/licenses/VTK/vtkFiltersSources/LICENSE
 share/licenses/VTK/vtkFiltersStatistics/LICENSE
 share/licenses/VTK/vtkFiltersVerdict/LICENSE
-share/licenses/VTK/vtkGUISupportQt/LICENSE
+${PLIST.qt}share/licenses/VTK/vtkGUISupportQt/LICENSE
 share/licenses/VTK/vtkGeovisCore/LICENSE
 share/licenses/VTK/vtkIOCore/LICENSE
 share/licenses/VTK/vtkIOExport/LICENSE
@@ -4023,11 +4023,11 @@ share/licenses/VTK/vtkInteractionStyle/L
 share/licenses/VTK/vtkInteractionWidgets/LICENSE
 share/licenses/VTK/vtkRenderingCore/LICENSE
 share/licenses/VTK/vtkRenderingLabel/LICENSE
-share/licenses/VTK/vtkRenderingQt/LICENSE
+${PLIST.qt}share/licenses/VTK/vtkRenderingQt/LICENSE
 share/licenses/VTK/vtkRenderingVolume/LICENSE
 share/licenses/VTK/vtkViewsCore/LICENSE
 share/licenses/VTK/vtkViewsInfovis/LICENSE
-share/licenses/VTK/vtkViewsQt/LICENSE
+${PLIST.qt}share/licenses/VTK/vtkViewsQt/LICENSE
 share/licenses/VTK/vtkdiy2/LEGAL.txt
 share/licenses/VTK/vtkdiy2/LICENSE.txt
 share/licenses/VTK/vtkexodusII/COPYRIGHT

Index: pkgsrc/graphics/vtk/options.mk
diff -u pkgsrc/graphics/vtk/options.mk:1.4 pkgsrc/graphics/vtk/options.mk:1.5
--- pkgsrc/graphics/vtk/options.mk:1.4  Mon Feb 24 17:22:44 2025
+++ pkgsrc/graphics/vtk/options.mk      Sun Nov  2 01:04:48 2025
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2025/02/24 17:22:44 adam Exp $
+# $NetBSD: options.mk,v 1.5 2025/11/02 01:04:48 gdt Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.vtk
 PKG_OPTIONS_OPTIONAL_GROUPS=   gui
@@ -10,6 +10,9 @@ PKG_SUGGESTED_OPTIONS=                qt6
 PLIST_VARS+=   qt
 .if !empty(PKG_OPTIONS:Mqt5) || !empty(PKG_OPTIONS:Mqt6)
 PLIST.qt=      yes
+PRINT_PLIST_AWK+=     /Qt/ { $$0 = "$${PLIST.qt}"$$0 }
+PRINT_PLIST_AWK+=     /\/Q/ { $$0 = "$${PLIST.qt}"$$0 }
+PRINT_PLIST_AWK+=     /include.*\/vtkQ[IW]/ { $$0 = "$${PLIST.qt}"$$0 }
 CMAKE_CONFIGURE_ARGS+= -DVTK_GROUP_ENABLE_Qt=YES
 CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_ENABLE_VTK_GUISupportQt=YES
 CMAKE_CONFIGURE_ARGS+= -DVTK_MODULE_ENABLE_VTK_GUISupportQtSQL=NO