CVS commit: pkgsrc/math/octave

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Mar 24 12:46:23 UTC 2024

Modified Files:
        pkgsrc/math/octave: Makefile PLIST distinfo options.mk
        pkgsrc/math/octave/patches: patch-configure.ac patch-m4_acinclude.m4
Removed Files:
        pkgsrc/math/octave/patches: patch-liboctave_util_quit.cc

Log Message:
octave: updated to 9.1.0

Octave 9.1.0

This major release improves the graphics backend, compatibility with Matlab and contains many new and improved functions. A list of important user-visible changes is available by selecting the 
Release Notes item in the News menu of the GUI or by typing news at the Octave command prompt.


To generate a diff of this commit:
cvs rdiff -u -r1.251 -r1.252 pkgsrc/math/octave/Makefile
cvs rdiff -u -r1.41 -r1.42 pkgsrc/math/octave/PLIST
cvs rdiff -u -r1.69 -r1.70 pkgsrc/math/octave/distinfo
cvs rdiff -u -r1.7 -r1.8 pkgsrc/math/octave/options.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/math/octave/patches/patch-configure.ac \
    pkgsrc/math/octave/patches/patch-m4_acinclude.m4
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/math/octave/patches/patch-liboctave_util_quit.cc

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

Modified files:

Index: pkgsrc/math/octave/Makefile
diff -u pkgsrc/math/octave/Makefile:1.251 pkgsrc/math/octave/Makefile:1.252
--- pkgsrc/math/octave/Makefile:1.251   Tue Jan 30 14:22:15 2024
+++ pkgsrc/math/octave/Makefile Sun Mar 24 12:46:23 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.251 2024/01/30 14:22:15 ryoon Exp $
+# $NetBSD: Makefile,v 1.252 2024/03/24 12:46:23 adam Exp $
 
-DISTNAME=      octave-8.4.0
-PKGREVISION=   1
+DISTNAME=      octave-9.1.0
 CATEGORIES=    math
 MASTER_SITES=  ${MASTER_SITE_GNU:=octave/}
 EXTRACT_SUFX=  .tar.xz
@@ -17,7 +16,7 @@ LICENSE=      gnu-gpl-v3
 #TOOL_DEPENDS+=        tex-epsf-[0-9]*:../../print/tex-epsf
 #TOOL_DEPENDS+=        tex-tex-[0-9]*:../../print/tex-tex
 #TOOL_DEPENDS+=        tex-pdftex-[0-9]*:../../print/tex-pdftex
-#TOOL_DEPENDS+=                gtexinfo>=5.1:../../devel/gtexinfo
+#TOOL_DEPENDS+=        gtexinfo>=5.1:../../devel/gtexinfo
 
 DEPENDS+=      gnuplot>=3.7:../../graphics/gnuplot
 
@@ -129,8 +128,5 @@ post-install:
 .include "../../textproc/rapidjson/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/fltk13/buildlink3.mk"
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qttools/buildlink3.mk"
-.include "../../x11/qt5-qscintilla/buildlink3.mk"
 .include "../../mk/blas.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/math/octave/PLIST
diff -u pkgsrc/math/octave/PLIST:1.41 pkgsrc/math/octave/PLIST:1.42
--- pkgsrc/math/octave/PLIST:1.41       Fri Nov 17 09:54:20 2023
+++ pkgsrc/math/octave/PLIST    Sun Mar 24 12:46:23 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.41 2023/11/17 09:54:20 adam Exp $
+@comment $NetBSD: PLIST,v 1.42 2024/03/24 12:46:23 adam Exp $
 bin/${PKGNAME}
 bin/mkoctfile
 bin/mkoctfile-${PKGVERSION}
@@ -766,11 +766,13 @@ include/${PKGNAME}/octave/vx-s-crv.h
 include/${PKGNAME}/octave/xdiv.h
 include/${PKGNAME}/octave/xnorm.h
 include/${PKGNAME}/octave/xpow.h
+include/octave-${PKGVERSION}/octave/gh-manager.h
 include/octave-${PKGVERSION}/octave/ov-base-diag.cc
 include/octave-${PKGVERSION}/octave/ov-base-int.cc
 include/octave-${PKGVERSION}/octave/ov-base-mat.cc
 include/octave-${PKGVERSION}/octave/ov-base-scalar.cc
 include/octave-${PKGVERSION}/octave/ov-base-sparse.cc
+include/octave-${PKGVERSION}/octave/ov-inline.h
 info/liboctave.info
 info/octave.info
 lib/octave/${PKGVERSION}/__delaunayn__.a
@@ -827,7 +829,7 @@ share/icons/hicolor/48x48/apps/octave.pn
 share/icons/hicolor/512x512/apps/octave.png
 share/icons/hicolor/64x64/apps/octave.png
 share/icons/hicolor/scalable/apps/octave.svg
-share/metainfo/org.octave.Octave.appdata.xml
+share/metainfo/org.octave.Octave.metainfo.xml
 share/octave/${PKGVERSION}/data/penny.mat
 share/octave/${PKGVERSION}/data/west0479.mat
 share/octave/${PKGVERSION}/doc/liboctave.pdf
@@ -863,6 +865,7 @@ share/octave/${PKGVERSION}/etc/tests/fix
 share/octave/${PKGVERSION}/etc/tests/fixed/@uint32/tbcover.m
 share/octave/${PKGVERSION}/etc/tests/fixed/@uint64/tbcover.m
 share/octave/${PKGVERSION}/etc/tests/fixed/@uint8/tbcover.m
+share/octave/${PKGVERSION}/etc/tests/fixed/anonymous-function.tst
 share/octave/${PKGVERSION}/etc/tests/fixed/args.tst
 share/octave/${PKGVERSION}/etc/tests/fixed/bc-overloads.tst
 share/octave/${PKGVERSION}/etc/tests/fixed/bug-31371.tst
@@ -899,6 +902,8 @@ share/octave/${PKGVERSION}/etc/tests/fix
 share/octave/${PKGVERSION}/etc/tests/fixed/bug-47680/bug-47680.tst
 share/octave/${PKGVERSION}/etc/tests/fixed/bug-47680/sub_bug47680.m
 share/octave/${PKGVERSION}/etc/tests/fixed/bug-47680/super_bug47680.m
+share/octave/${PKGVERSION}/etc/tests/fixed/bug-48693/bug-48693.tst
+share/octave/${PKGVERSION}/etc/tests/fixed/bug-48693/bug48693.m
 share/octave/${PKGVERSION}/etc/tests/fixed/bug-49379/bug-49379.tst
 share/octave/${PKGVERSION}/etc/tests/fixed/bug-49379/class_bug49379.m
 share/octave/${PKGVERSION}/etc/tests/fixed/bug-49904.tst
@@ -998,8 +1003,21 @@ share/octave/${PKGVERSION}/etc/tests/fix
 share/octave/${PKGVERSION}/etc/tests/fixed/bug-61191/bug-61191.tst
 share/octave/${PKGVERSION}/etc/tests/fixed/bug-61191/subdir/bug_61191.m
 share/octave/${PKGVERSION}/etc/tests/fixed/bug-61201.tst
+share/octave/${PKGVERSION}/etc/tests/fixed/bug-63841/@cls2_b63841/cls2_b63841.m
+share/octave/${PKGVERSION}/etc/tests/fixed/bug-63841/@cls2_b63841/subsref.m
+share/octave/${PKGVERSION}/etc/tests/fixed/bug-63841/bug-63841.tst
+share/octave/${PKGVERSION}/etc/tests/fixed/bug-63841/cls_b63841.m
+share/octave/${PKGVERSION}/etc/tests/fixed/bug-65037/bug-65037.tst
+share/octave/${PKGVERSION}/etc/tests/fixed/bug-65037/bug65037_base.m
+share/octave/${PKGVERSION}/etc/tests/fixed/bug-65037/bug65037_derived.m
+share/octave/${PKGVERSION}/etc/tests/fixed/bug-65153.tst
+share/octave/${PKGVERSION}/etc/tests/fixed/bug-65220/bug-65220.tst
+share/octave/${PKGVERSION}/etc/tests/fixed/bug-65220/cdefdir/cdef_help1.m
+share/octave/${PKGVERSION}/etc/tests/fixed/bug-65220/cdefdir/cdef_help2.m
 share/octave/${PKGVERSION}/etc/tests/fixed/class-concat/@foo/foo.m
 share/octave/${PKGVERSION}/etc/tests/fixed/class-concat/class-concat.tst
+share/octave/${PKGVERSION}/etc/tests/fixed/classdef-debug/classdef_breakpoints.m
+share/octave/${PKGVERSION}/etc/tests/fixed/classdef-debug/test_classdef_breakpoints.tst
 share/octave/${PKGVERSION}/etc/tests/fixed/classdef-multiple-inheritance/base_1.m
 share/octave/${PKGVERSION}/etc/tests/fixed/classdef-multiple-inheritance/base_2.m
 share/octave/${PKGVERSION}/etc/tests/fixed/classdef-multiple-inheritance/child_from_base_1.m
@@ -1189,6 +1207,9 @@ share/octave/${PKGVERSION}/etc/tests/fix
 share/octave/${PKGVERSION}/etc/tests/fixed/jupyter-notebook/plot_magic_and_errors.ipynb
 share/octave/${PKGVERSION}/etc/tests/fixed/leftdiv.tst
 share/octave/${PKGVERSION}/etc/tests/fixed/line-continue.tst
+share/octave/${PKGVERSION}/etc/tests/fixed/load-path/in-load-path/load_path_fcn.m
+share/octave/${PKGVERSION}/etc/tests/fixed/load-path/not-in-load-path/load_path_fcn.m
+share/octave/${PKGVERSION}/etc/tests/fixed/load-path/refresh-load-path.tst
 share/octave/${PKGVERSION}/etc/tests/fixed/local-functions/local_function_eval.m
 share/octave/${PKGVERSION}/etc/tests/fixed/local-functions/local_functions.tst
 share/octave/${PKGVERSION}/etc/tests/fixed/logical-index.tst
@@ -1301,6 +1322,7 @@ share/octave/${PKGVERSION}/etc/tests/lib
 share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/find.cc-tst
 share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/gcd.cc-tst
 share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/getrusage.cc-tst
+share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/gh-manager.cc-tst
 share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/givens.cc-tst
 share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/graphics.cc-tst
 share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/gsvd.cc-tst
@@ -1326,6 +1348,7 @@ share/octave/${PKGVERSION}/etc/tests/lib
 share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/oct-map.cc-tst
 share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/ordqz.cc-tst
 share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/ordschur.cc-tst
+share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/perms.cc-tst
 share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/pinv.cc-tst
 share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/pow2.cc-tst
 share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/pr-output.cc-tst
@@ -1349,6 +1372,7 @@ share/octave/${PKGVERSION}/etc/tests/lib
 share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/svd.cc-tst
 share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/sylvester.cc-tst
 share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/symbfact.cc-tst
+share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/symrcm.cc-tst
 share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/symtab.cc-tst
 share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/syscalls.cc-tst
 share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/sysdep.cc-tst
@@ -1495,9 +1519,6 @@ share/octave/${PKGVERSION}/m/audio/recor
 share/octave/${PKGVERSION}/m/audio/sound.m
 share/octave/${PKGVERSION}/m/audio/soundsc.m
 share/octave/${PKGVERSION}/m/deprecated/.oct-config
-share/octave/${PKGVERSION}/m/deprecated/disable_diagonal_matrix.m
-share/octave/${PKGVERSION}/m/deprecated/disable_permutation_matrix.m
-share/octave/${PKGVERSION}/m/deprecated/disable_range.m
 share/octave/${PKGVERSION}/m/deprecated/shift.m
 share/octave/${PKGVERSION}/m/deprecated/sparse_auto_mutate.m
 share/octave/${PKGVERSION}/m/elfun/.oct-config
@@ -1566,6 +1587,7 @@ share/octave/${PKGVERSION}/m/general/int
 share/octave/${PKGVERSION}/m/general/interpn.m
 share/octave/${PKGVERSION}/m/general/isequal.m
 share/octave/${PKGVERSION}/m/general/isequaln.m
+share/octave/${PKGVERSION}/m/general/isuniform.m
 share/octave/${PKGVERSION}/m/general/logspace.m
 share/octave/${PKGVERSION}/m/general/nextpow2.m
 share/octave/${PKGVERSION}/m/general/num2str.m
@@ -1817,6 +1839,7 @@ share/octave/${PKGVERSION}/m/linear-alge
 share/octave/${PKGVERSION}/m/linear-algebra/rank.m
 share/octave/${PKGVERSION}/m/linear-algebra/rref.m
 share/octave/${PKGVERSION}/m/linear-algebra/subspace.m
+share/octave/${PKGVERSION}/m/linear-algebra/tensorprod.m
 share/octave/${PKGVERSION}/m/linear-algebra/trace.m
 share/octave/${PKGVERSION}/m/linear-algebra/vech.m
 share/octave/${PKGVERSION}/m/linear-algebra/vecnorm.m
@@ -2282,6 +2305,7 @@ share/octave/${PKGVERSION}/m/profiler/pr
 share/octave/${PKGVERSION}/m/set/.oct-config
 share/octave/${PKGVERSION}/m/set/intersect.m
 share/octave/${PKGVERSION}/m/set/ismember.m
+share/octave/${PKGVERSION}/m/set/ismembertol.m
 share/octave/${PKGVERSION}/m/set/powerset.m
 share/octave/${PKGVERSION}/m/set/private/validsetargs.m
 share/octave/${PKGVERSION}/m/set/setdiff.m
@@ -2379,7 +2403,6 @@ share/octave/${PKGVERSION}/m/specfun/lcm
 share/octave/${PKGVERSION}/m/specfun/legendre.m
 share/octave/${PKGVERSION}/m/specfun/nchoosek.m
 share/octave/${PKGVERSION}/m/specfun/nthroot.m
-share/octave/${PKGVERSION}/m/specfun/perms.m
 share/octave/${PKGVERSION}/m/specfun/primes.m
 share/octave/${PKGVERSION}/m/specfun/reallog.m
 share/octave/${PKGVERSION}/m/specfun/realpow.m

Index: pkgsrc/math/octave/distinfo
diff -u pkgsrc/math/octave/distinfo:1.69 pkgsrc/math/octave/distinfo:1.70
--- pkgsrc/math/octave/distinfo:1.69    Fri Nov 17 09:54:20 2023
+++ pkgsrc/math/octave/distinfo Sun Mar 24 12:46:23 2024
@@ -1,17 +1,16 @@
-$NetBSD: distinfo,v 1.69 2023/11/17 09:54:20 adam Exp $
+$NetBSD: distinfo,v 1.70 2024/03/24 12:46:23 adam Exp $
 
-BLAKE2s (octave-8.4.0.tar.xz) = 500ebebccfed70d44c39b9f578e44fb4cfea15ac24e9db961bf663a82f4f5ec1
-SHA512 (octave-8.4.0.tar.xz) = 9d9e6103105cd98298083c9f8b7ba07265cddb689189d03347c5e85cbee782084a93e1829994e410464651925c8bfd9d30a54d9519069a586e498bcdf91cd80e
-Size (octave-8.4.0.tar.xz) = 26941864 bytes
+BLAKE2s (octave-9.1.0.tar.xz) = 8ae5e70560422c9815a94fd9adaa1677a2b5a0b0d8dd654a6db5caef7433f3bd
+SHA512 (octave-9.1.0.tar.xz) = 95799fc3f8217b11316926570874bf0e25cdac8cead416ae000ecfeba2643d3a688c015fa07935671a9f8a338f2f070ea75d452a36b295400f177c5a13890905
+Size (octave-9.1.0.tar.xz) = 27393912 bytes
 SHA1 (patch-Makefile.in) = 7fe47cf88e4dff2eba360600f086f8361ec11535
-SHA1 (patch-configure.ac) = 48a2dee11b33ce80a477367479ad348056c2c1f9
+SHA1 (patch-configure.ac) = d3eef6a5b37fcdd010865af7732eb25e51df6ff7
 SHA1 (patch-doc_interpreter_module.mk) = 66389cceddbe71fca0c8197275a839170d64ad5b
 SHA1 (patch-libgnu_fseeko.c) = b38e7a38be2e0b323cd7f168f1d22d3df998691c
 SHA1 (patch-libgnu_stdio.in.h) = 83c8fbecba26868fe9db70a7fb08f67353c982ea
 SHA1 (patch-libinterp_dldfcn_config-module.awk) = a9b6ed5580d670ab0a3632780d90bbeb36f9197c
 SHA1 (patch-libinterp_dldfcn_module.mk) = 8975e881cade802cf1b14bd8256f9fced6c50e38
-SHA1 (patch-liboctave_util_quit.cc) = 17ace431c53de1e5b72b86bb2bf4e15bdc6d4db9
-SHA1 (patch-m4_acinclude.m4) = 8ad44e92906b8185e63bd6cf7242fcf58a1dd077
+SHA1 (patch-m4_acinclude.m4) = 0454e36cf7214a08448d80d33214f5caeece3ca5
 SHA1 (patch-scripts_miscellaneous_unpack.m) = 0f979fd4bcef8926a5d64149d9cc925ef1d2d727
 SHA1 (patch-scripts_pkg_private_configure__make.m) = 7a73a32322a9ba39a2c9597b3e406c2b5a9c8b40
 SHA1 (patch-scripts_plot_util_____gnuplot__drawnow____.m) = 449b178aefd78c5c1b03ffd960f2e8be3874efc2

Index: pkgsrc/math/octave/options.mk
diff -u pkgsrc/math/octave/options.mk:1.7 pkgsrc/math/octave/options.mk:1.8
--- pkgsrc/math/octave/options.mk:1.7   Mon May 31 07:16:51 2021
+++ pkgsrc/math/octave/options.mk       Sun Mar 24 12:46:23 2024
@@ -1,8 +1,10 @@
-# $NetBSD: options.mk,v 1.7 2021/05/31 07:16:51 thor Exp $
+# $NetBSD: options.mk,v 1.8 2024/03/24 12:46:23 adam Exp $
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.octave
-PKG_SUPPORTED_OPTIONS= glpk graphicsmagick hdf5 qhull
-PKG_SUGGESTED_OPTIONS= hdf5 qhull glpk
+PKG_OPTIONS_VAR=               PKG_OPTIONS.octave
+PKG_SUPPORTED_OPTIONS=         glpk graphicsmagick hdf5 qhull
+PKG_OPTIONS_REQUIRED_GROUPS=   gui
+PKG_OPTIONS_GROUP.gui=         qt5 qt6
+PKG_SUGGESTED_OPTIONS=         hdf5 glpk qhull qt6
 
 .include "../../mk/bsd.options.mk"
 
@@ -29,3 +31,18 @@ CONFIGURE_ARGS+=     --without-hdf5
 .else
 CONFIGURE_ARGS+=       --without-qhull
 .endif
+
+.if !empty(PKG_OPTIONS:Mqt5)
+CONFIGURE_ARGS+=       --with-qt=5
+.include "../../x11/qt5-qscintilla/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qttools/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mqt6)
+CONFIGURE_ARGS+=       --with-qt=6
+.include "../../devel/qt6-qt5compat/buildlink3.mk"
+.include "../../devel/qt6-qttools/buildlink3.mk"
+.include "../../x11/qt6-qscintilla/buildlink3.mk"
+.include "../../x11/qt6-qtbase/buildlink3.mk"
+.endif

Index: pkgsrc/math/octave/patches/patch-configure.ac
diff -u pkgsrc/math/octave/patches/patch-configure.ac:1.6 pkgsrc/math/octave/patches/patch-configure.ac:1.7
--- pkgsrc/math/octave/patches/patch-configure.ac:1.6   Mon May 31 07:16:51 2021
+++ pkgsrc/math/octave/patches/patch-configure.ac       Sun Mar 24 12:46:23 2024
@@ -1,13 +1,15 @@
-$NetBSD: patch-configure.ac,v 1.6 2021/05/31 07:16:51 thor Exp $
+$NetBSD: patch-configure.ac,v 1.7 2024/03/24 12:46:23 adam Exp $
 
 install .oct loadable modules with INSTALL_LIB to avoid stripping them
 
 Allow overriding MKOCTFILE_F77 so we can install a full path gfortran
 (for building octave-forge packages like control)
 
---- configure.ac.orig  2021-02-19 17:36:34.000000000 +0000
+Portability fixes.
+
+--- configure.ac.orig  2024-03-12 18:00:23.000000000 +0000
 +++ configure.ac
-@@ -230,8 +230,11 @@ AC_PROG_LN_S
+@@ -238,8 +238,11 @@ AC_PROG_LN_S
  AC_PROG_MKDIR_P
  
  AC_PROG_INSTALL
@@ -20,7 +22,7 @@ Allow overriding MKOCTFILE_F77 so we can
  
  ## Programs used when running Octave.
  OCTAVE_PROG_GHOSTSCRIPT
-@@ -897,11 +900,11 @@ if test "$cross_compiling" = yes && test
+@@ -933,11 +936,11 @@ if test "$cross_compiling" = yes && test
    MKOCTFILE_F77=`echo "$F77" | $SED "s,$CROSS_TOOL_PREFIX,,"`
    MKOCTFILE_RANLIB=`echo "$RANLIB" | $SED "s,$CROSS_TOOL_PREFIX,,"`
  else
@@ -37,3 +39,21 @@ Allow overriding MKOCTFILE_F77 so we can
  fi
  AC_MSG_NOTICE([defining CROSS_TOOL_PREFIX to be $CROSS_TOOL_PREFIX])
  AC_MSG_NOTICE([defining MKOCTFILE_AR to be $MKOCTFILE_AR])
+@@ -2365,7 +2368,7 @@ fi
+ 
+ ### Check for SUNDIALS library features, some required, some optional.
+ 
+-if test "x$octave_have_sundials_libs" == xyes; then
++if test "x$octave_have_sundials_libs" = xyes; then
+ 
+   CPPFLAGS="$SUNDIALS_IDA_CPPFLAGS $SUNDIALS_NVECSERIAL_CPPFLAGS $KLU_CPPFLAGS $BLAS_CPPFLAGS $CPPFLAGS"
+   LDFLAGS="$SUNDIALS_IDA_LDFLAGS $SUNDIALS_NVECSERIAL_LDFLAGS $KLU_LDFLAGS $BLAS_LDFLAGS $LDFLAGS"
+@@ -2405,7 +2408,7 @@ dnl FIXME: The test on the sunlinsol_klu
+ dnl How can we do a better job here?  Do we need to disable sundials
+ dnl any tests fail, or can we fix __ode15__.cc so that it still partially
+ dnl works when some things are missing (for example, KLU)?
+-if test "x$octave_have_sundials_libs" == xyes; then
++if test "x$octave_have_sundials_libs" = xyes; then
+   if test "x$octave_cv_sundials_sunlinsol_dense" = xyes \
+       && test "x$octave_cv_sundials_realtype_is_double" = xyes \
+       && test "x$octave_have_sundials_compatible_api" = xyes; then
Index: pkgsrc/math/octave/patches/patch-m4_acinclude.m4
diff -u pkgsrc/math/octave/patches/patch-m4_acinclude.m4:1.6 pkgsrc/math/octave/patches/patch-m4_acinclude.m4:1.7
--- pkgsrc/math/octave/patches/patch-m4_acinclude.m4:1.6        Wed May 31 21:37:51 2023
+++ pkgsrc/math/octave/patches/patch-m4_acinclude.m4    Sun Mar 24 12:46:23 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-m4_acinclude.m4,v 1.6 2023/05/31 21:37:51 adam Exp $
+$NetBSD: patch-m4_acinclude.m4,v 1.7 2024/03/24 12:46:23 adam Exp $
 
 we pass and assume a given MACHINE_GNU_PLATFORM, but this package did not
 use this value due to an error.
@@ -10,7 +10,7 @@ Do not look for qcollectiongenerator; it
 
 On Darwin, do not produce a mach-o bundle.
 
---- m4/acinclude.m4.orig       2023-04-13 16:43:35.000000000 +0000
+--- m4/acinclude.m4.orig       2024-03-12 18:00:23.000000000 +0000
 +++ m4/acinclude.m4
 @@ -36,7 +36,7 @@ AC_DEFUN([OCTAVE_CANONICAL_HOST], [
      host=unknown-unknown-unknown
@@ -21,12 +21,19 @@ On Darwin, do not produce a mach-o bundl
    AC_SUBST(canonical_host_type)
    if test -z "$host_cpu"; then
      host_cpu=unknown
-@@ -2259,11 +2259,10 @@ AC_DEFUN([OCTAVE_CHECK_QT_VERSION], [AC_
-     OCTAVE_CHECK_QT_TOOL([uic])
+@@ -2149,17 +2149,10 @@ AC_DEFUN([OCTAVE_CHECK_QT_VERSION], [AC_
      OCTAVE_CHECK_QT_TOOL([rcc])
      OCTAVE_CHECK_QT_TOOL([lrelease])
--    OCTAVE_CHECK_QT_TOOL([qcollectiongenerator])
      OCTAVE_CHECK_QT_TOOL([qhelpgenerator])
+-    case "$qt_version" in
+-      5)
+-        OCTAVE_CHECK_QT_TOOL([qcollectiongenerator])
+-      ;;
+-      6)
+-        QCOLLECTIONGENERATOR="$QHELPGENERATOR"
+-      ;;
+-    esac
++    QCOLLECTIONGENERATOR="$QHELPGENERATOR"
  
      if test -n "$QT_TOOLS_MISSING"; then
 -      warn_qt_tools="one or more of the Qt utilities moc, uic, rcc, lrelease, qcollectiongenerator, and qhelpgenerator not found; disabling Qt GUI"
@@ -34,7 +41,7 @@ On Darwin, do not produce a mach-o bundl
        build_qt_gui=no
        MOC_QTVER=
        UIC_QTVER=
-@@ -2793,8 +2792,6 @@ AC_DEFUN_ONCE([OCTAVE_DEFINE_MKOCTFILE_D
+@@ -2749,8 +2742,6 @@ AC_DEFUN_ONCE([OCTAVE_DEFINE_MKOCTFILE_D
        dnl Contains variables that are defined and undefined at this point,
        dnl so use appropriate quoting to defer expansion of
        dnl ${abs_top_builddir}, ${bindir}, and ${version}.