tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

PLIST generation/management issues, graphics/vtk (tools discussion, not a real problem)



I just updated vtk from 9.4.1 to 9.5.2 and 98% of the effort was dealing with the PLIST.
Upstream changed a lot so I wanted to use print-PLIST.  That had
multiple problems:

  Lots of libs use VERSION_MINOR, now 9.5, so I added a PRINT_PLIST_AWK.

  print-PLIST sorts libfoo.so.${VTKVER} after libfoo.so.1, which is
  different than how plist-sort does.  The reason is surely that
  print-PLIST generates libfoo.so.9.5 and then transforms it.  But it's
  messy that print-PLIST and plist-sort disagree.   I wonder if
  print-PLIST should sort after awk, rather than before, and if that
  would resolve the problem.

  plist-sort is apparently confused by lines with two guards.  diff from
  running plist-sort appended.

  It would be great to preserve/generate PLIST.foo guards, but it seems
  hard.  It might be doable to keep the guard if the file is in the old
  PLIST, sort of like keeping patch comments.


I'm sending this for multiple reasons:

  - it might provoke someone into spiffing up some of the above
  - if I'm confused, I might receive a clue
  - it might help somebody else




--- PLIST	2025-11-01 19:47:40.000000000 -0400
+++ A	2025-11-01 19:53:32.321092502 -0400
@@ -1,3 +1,9 @@
+${PLIST.opengl}${PLIST.qt}include/vtk-${VTKVER}/vtkEGLRenderWindow.h
+${PLIST.opengl}${PLIST.qt}include/vtk-${VTKVER}/vtkglad/include/EGL/eglplatform.h
+${PLIST.opengl}${PLIST.qt}include/vtk-${VTKVER}/vtkglad/include/glad/egl.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}${PLIST.qt}include/vtk-${VTKVER}/vtkglad/include/glad/vtk_glx_mangle.h
 @comment $NetBSD: PLIST,v 1.13 2025/11/01 23:47:40 gdt Exp $
 bin/vtkProbeOpenGLVersion-${VTKVER}
 include/vtk-${VTKVER}/DICOMAppHelper.h
@@ -805,7 +811,6 @@
 include/vtk-${VTKVER}/vtkDynamic2DLabelMapper.h
 include/vtk-${VTKVER}/vtkDynamicLoader.h
 include/vtk-${VTKVER}/vtkEDLShading.h
-${PLIST.opengl}${PLIST.qt}include/vtk-${VTKVER}/vtkEGLRenderWindow.h
 include/vtk-${VTKVER}/vtkERFReader.h
 include/vtk-${VTKVER}/vtkEarthSource.h
 include/vtk-${VTKVER}/vtkEdgeCenters.h
@@ -3221,14 +3226,9 @@
 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
 include/vtk-${VTKVER}/vtkglad/include/KHR/khrplatform.h
-${PLIST.opengl}${PLIST.qt}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
 include/vtk-${VTKVER}/vtkglad/include/glad/vtk_gl_mangle.h
-${PLIST.opengl}${PLIST.qt}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



Home | Main Index | Thread Index | Old Index