[pkgsrc/trunk]: pkgsrc/math/octave octave: udpate to 6.2.0

[thor <thor%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6a8406c0fe98
branches:  trunk
changeset: 453530:6a8406c0fe98
user:      thor <thor%pkgsrc.org@localhost>
date:      Mon May 31 07:16:51 2021 +0000

description:
octave: udpate to 6.2.0

This updates octave and also gets some more recommened dependencies in,
namely qrupdate and Mesalib (for osmesa) and gl2ps as well as the
qscintilla editor. The glpk option is on by default again.

This version of octave comes rather close to a standard build, with
optimzied BLAS and GUI fluff. We are still missing SuiteSparse and
SUNDIALS solvers, see

  https://octave.org/doc/v6.2.0/External-Packages.html

PortAudio should also be considered, and LLVM be watched if that
experimental JIT settles in.

Upstream changes since 5.x:

Summary of important user-visible changes for version 6.1.0 (2020-11-26):
------------------------------------------------------------------------

### General improvements

- The `intersect`, `setdiff`, `setxor`, `union`, and `unique` functions
  accept a new sorting option `"stable"` which will return output values
  in the same order as the input, rather than in ascending order.

- Complex RESTful web services can now be accessed by the `webread` and
  `webwrite` functions alongside with the `weboptions` structure.  One
  major feature is the support for cookies to enable RESTful
  communication with the web service.

  Additionally, the system web browser can be opened by the `web`
  function.

- The `linspace` function now produces symmetrical sequences when the
  endpoints are symmetric.  This is more intuitive and also compatible
  with recent changes made in Matlab R2019b.

- The underlying algorithm of the `rand` function has been changed.
  For single precision outputs, the algorithm has been fixed so that it
  produces values strictly in the range (0, 1).  Previously, it could
  occasionally generate the right endpoint value of 1 (See bug #41742).
  In addition, the new implementation uses a uniform interval between
  floating point values in the range (0, 1) rather than targeting a
  uniform density (# of random integers / length along real number
  line).

- Numerical integration has been improved.  The `quadv` function has
  been re-written so that it can compute integrands of periodic
  functions.  At the same time, performance is better with ~3.5X fewer
  function evaluations required.  A bug in `quadgk` that caused complex
  path integrals specified with `"Waypoints"` to occasionally be
  calculated in the opposite direction was fixed.

- The `edit` function option `"editinplace"` now defaults to `true` and
  the option `"home"` now defaults to the empty matrix `[]`.  Files will
  no longer be copied to the user's HOME directory for editing.  The old
  behavior can be restored by setting `"editinplace"` to `false` and
  `"home"` to `"~/octave"`.

- The `format` command supports two new options: `uppercase` and
  `lowercase` (default).  With the default, print a lowercase 'e' for
  the exponent character in scientific notation and lowercase 'a-f' for
  the hex digits representing 10-15.  With `uppercase`, print 'E' and
  'A-F' instead.  The previous uppercase formats, `E` and `G`, no longer
  control the case of the output.

  Additionally, the `format` command can be called with multiple options
  for controlling the format, spacing, and case in arbitrary order.
  For example:

        format long e uppercase loose

  Note, in the case of multiple competing format options the rightmost
  one is used, and, in case of an error, the previous format remains
  unchanged.

- L-value references (e.g., increment (++), decrement (--), and all
  in-place assignment operators (+=, -=, *=, /=, etc.)) are no longer
  allowed in anonymous functions.

- New warnings have been added about questionable uses of the colon ':'
  range operator.  Each has a new warning ID so that it can be disabled
  if desired.

  >  `Octave:colon-complex-argument`   : when any arg is complex
  >  `Octave:colon-nonscalar-argument` : when any arg is non-scalar

- The `regexp` and related functions now correctly handle and *require*
  strings in UTF-8 encoding.  As with any other function that requires
  strings to be encoded in Octave's native encoding, you can use
  `native2unicode` to convert from your preferred locale.  For example,
  the copyright symbol in UTF-8 is `native2unicode (169, "latin1")`.

- The startup file `octaverc` can now be located in the platform
  dependent location for user local configuration files (e.g.,
  ${XDG_CONFIG_HOME}/octave/octaverc on Unix-like operating systems or
  %APPDATA%\octave\octaverc on Windows).

- `pkg describe` now lists dependencies and inverse dependencies
  (i.e., other installed packages that depend on the package in
  question).

- `pkg test` now tests all functions in a package.

- When unloading a package, `pkg` now checks if any remaining loaded
  packages depend on the one to be removed.  If this is the case `pkg`
  aborts with an explanatory error message.  This behavior can be
  overridden with the `-nodeps` option.

- The command

    dbstop in CLASS at METHOD

  now works to set breakpoints in classdef constructors and methods.

#### Graphics backend

- The use of Qt4 for graphics and the GUI is deprecated in Octave
  version 6 and no further bug fixes will be made.  Qt4 support will be
  removed completely in Octave version 7.

- The `legend` function has been entirely rewritten.  This fixes a
  number of historical bugs, and also implements new properties such as
  `"AutoUpdate"` and `"NumColumns"`.  The gnuplot toolkit---which is no
  longer actively maintained---still uses the old legend function.

- The `axis` function was updated which resolved 10 bugs affecting
  axes to which `"equal"` had been applied.

- Graphic primitives now accept a color property value of `"none"`
  which is useful when a particular primitive needs to be hidden
  (for example, the Y-axis of an axes object with `"ycolor" = "none"`)
  without hiding the entire primitive `"visibility" = "off"`.

- A new property `"FontSmoothing"` has been added to text and axes
  objects that controls whether anti-aliasing is used during the
  rendering of characters.  The default is `"on"` which produces smooth,
  more visually appealing text.

- The figure property `"windowscrollwheelfcn"`is now implemented.
  This makes it possible to provide a callback function to be executed
  when users manipulate the mouse wheel on a given figure.

- The figure properties `"pointer"`, `"pointershapecdata"`, and
  `"pointershapehotspot"` are now implemented.  This makes it possible
  to change the shape of the cursor (pointer in Matlab-speak) displayed
  in a plot window.

- The figure property `"paperpositionmode"` now has the default `"auto"`
  rather than `"manual"`.  This change is more intuitive and is
  Matlab compatible.

- The appearance of patterned lines `"LineStyle" = ":"|"--"|"-."` has
  been improved for small widths (`"LineWidth"` less than 1.5 pixels)
  which is a common scenario.

- Printing to EPS files now uses a tight bounding box (`"-tight"`
  argument to print) by default.  This makes more sense for EPS
  files which are normally embedded within other documents, and is
  Matlab compatible.  If necessary use the `"-loose"` option to
  reproduce figures as they appeared in previous versions of Octave.

- The following print devices are no longer officially supported: cdr,
  corel, aifm, ill, cgm, hpgl, mf and dxf.  A warning will be thrown
  when using those devices, and the code for supporting those formats
  will eventually be removed from a future version of Octave.

- The placement of text subscripts and superscripts has been
  re-engineered and now produces visually attractive results similar to
  Latex.

### Matlab compatibility

- The function `unique` now returns column index vectors for the second
  and third outputs.  When duplicate values are present, the default
  index to return is now the `"first"` occurrence.  The previous Octave
  behavior, or Matlab behavior from releases prior to R2012b, can be
  obtained by using the `"legacy"` flag.

- The function `setdiff` with the `"rows"` argument now returns Matlab
  compatible results.  The previous Octave behavior, or Matlab behavior
  from releases prior to R2012b, can be obtained by using the `"legacy"`
  flag.

- The functions `intersect`, `setxor`, and `union` now accept a
  `"legacy"` flag which changes the index values (second and third
  outputs) as well as the orientation of all outputs to match Matlab
  releases prior to R2012b.

- The function `streamtube` is Matlab compatible and plots tubes along
  streamlines which are scaled by the vector field divergence. The
  Octave-only extension `ostreamtube` can be used to visualize the flow
  expansion and contraction of the vector field due to the local
  crossflow divergence.

- The interpreter now supports handles to nested functions.

- The graphics properties `"LineWidth"` and `"MarkerSize"` are now
  measured in points, *not* pixels.  Compared to previous versions
  of Octave, some lines and markers will appear 4/3 larger.

- The meta.class property "SuperClassList" has been renamed
  "Superclasslist" for Matlab compatibility.  The original name will
  exist as an alias until Octave version 8.1.

- Inline functions created by the function `inline` are now of type
  "inline" when interrogated with the `class` function.  In previous
  versions of Octave, the class returned was "function_handle".  This
  change is Matlab compatible.  Inline functions are deprecated in
  both Matlab and Octave and support may eventually be removed.
  Anonymous functions can be used to replace all instances of inline
  functions.

- The function `javaaddpath` now prepends new directories to the
  existing dynamic classpath by default.  To append them instead, use
  the new `"-end"` argument.  Multiple directories may now be specified
  in a cell array of strings.

- An undocumented function `gui_mainfcn` has been added, for compatibility
  with figures created with Matlab's GUIDE.

- Several validator functions of type `mustBe*` have been added.  See
  the list of new functions below.

### Alphabetical list of new functions added in Octave 6

* `auto_repeat_debug_command`
* `commandhistory`
* `commandwindow`
* `filebrowser`
* `is_same_file`
* `lightangle`
* `mustBeFinite`
* `mustBeGreaterThan`
* `mustBeGreaterThanOrEqual`
* `mustBeInteger`
* `mustBeLessThan`
* `mustBeLessThanOrEqual`
* `mustBeMember`
* `mustBeNegative`
* `mustBeNonempty`
* `mustBeNonNan`
* `mustBeNonnegative`
* `mustBeNonpositive`
* `mustBeNonsparse`
* `mustBeNonzero`
* `mustBeNumeric`
* `mustBeNumericOrLogical`
* `mustBePositive`
* `mustBeReal`
* `namedargs2cell`
* `newline`
* `ode23s`
* `ostreamtube`
* `rescale`
* `rotx`
* `roty`
* `rotz`
* `stream2`
* `stream3`
* `streamline`
* `streamtube`
* `uisetfont`
* `verLessThan`
* `web`
* `weboptions`
* `webread`
* `webwrite`
* `workspace`


### Deprecated functions and properties

The following functions and properties have been deprecated in Octave 6
and will be removed from Octave 8 (or whatever version is the second
major release after 6):

- Functions

  Function               | Replacement
  -----------------------|------------------
  `runtests`             | `oruntests`

- Properties

  Object           | Property      | Value
  -----------------|---------------|------------
                   |               |

- The environment variable used by `mkoctfile` for linker flags is now
  `LDFLAGS` rather than `LFLAGS`.  `LFLAGS` is deprecated, and a warning
  is emitted if it is used, but it will continue to work.


### Removed functions and properties

The following functions and properties were deprecated in Octave 4.4
and have been removed from Octave 6.

- Functions

  Function             | Replacement
  ---------------------|------------------
  `chop`               | `sprintf` for visual results
  `desktop`            | `isguirunning`
  `tmpnam`             | `tempname`
  `toascii`            | `double`
  `java2mat`           | `__java2mat__`

- Properties

  Object               | Property                  | Value
  ---------------------|---------------------------|-----------------------
  `annotation`         | `edgecolor ("rectangle")` |
  `axes`               | `drawmode`                |
  `figure`             | `doublebuffer`            |
                       | `mincolormap`             |
                       | `wvisual`                 |
                       | `wvisualmode`             |
                       | `xdisplay`                |
                       | `xvisual`                 |
                       | `xvisualmode`             |
  `line`               | `interpreter`             |
  `patch`              | `interpreter`             |
  `surface`            | `interpreter`             |
  `text`               | `fontweight`              | `"demi"` and `"light"`
  `uibuttongroup`      | `fontweight`              | `"demi"` and `"light"`
  `uicontrol`          | `fontweight`              | `"demi"` and `"light"`
  `uipanel`            | `fontweight`              | `"demi"` and `"light"`
  `uitable`            | `fontweight`              | `"demi"` and `"light"`

diffstat:

 math/octave/Makefile                             |   31 +-
 math/octave/PLIST                                |  278 ++++++++++++++++------
 math/octave/buildlink3.mk                        |    7 +-
 math/octave/distinfo                             |   16 +-
 math/octave/options.mk                           |    4 +-
 math/octave/patches/patch-configure.ac           |   14 +-
 math/octave/patches/patch-libgnu_stdio.in.h      |   10 +-
 math/octave/patches/patch-liboctave_util_quit.cc |    8 +-
 8 files changed, 242 insertions(+), 126 deletions(-)

diffs (truncated from 991 to 300 lines):

diff -r 1fd778265f6f -r 6a8406c0fe98 math/octave/Makefile
--- a/math/octave/Makefile      Mon May 31 07:03:31 2021 +0000
+++ b/math/octave/Makefile      Mon May 31 07:16:51 2021 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.219 2021/05/24 19:52:56 wiz Exp $
+# $NetBSD: Makefile,v 1.220 2021/05/31 07:16:51 thor Exp $
 
-DISTNAME=      octave-5.2.0
-PKGREVISION=   16
+DISTNAME=      octave-6.2.0
 CATEGORIES=    math
 MASTER_SITES=  ${MASTER_SITE_GNU:=octave/}
 EXTRACT_SUFX=  .tar.xz
@@ -23,7 +22,7 @@
 
 USE_LANGUAGES=         c c++ fortran77
 USE_LIBTOOL=           yes
-USE_TOOLS+=            autoconf gsed gmake:run perl pkg-config bison bsdtar:run
+USE_TOOLS+=            gsed gmake:run perl pkg-config bison bsdtar:run
 USE_TOOLS+=            makeinfo:test
 GNU_CONFIGURE=         yes
 
@@ -36,6 +35,9 @@
 CONFIGURE_ARGS+=       --disable-java
 TEST_TARGET=           check
 
+CONFIGURE_ARGS+=       --with-blas=${BLAS_LIBS:Q}
+CONFIGURE_ARGS+=       --with-lapack=${LAPACK_LIBS:Q}
+
 # Provide a full path gfortran in MKOCTFILE for octave-forge
 CONFIGURE_ENV+=                MKOCTFILE_F77=${FCPATH}
 
@@ -70,14 +72,11 @@
 SUBST_FILES.fix-make=          scripts/pkg/private/configure_make.m
 SUBST_VARS.fix-make=           GMAKE
 
-SUBST_CLASSES+=                        qt5-pkg-config
-SUBST_STAGE.qt5-pkg-config=    pre-configure
-SUBST_MESSAGE.qt5-pkg-config=  Updating pkg-config calls for Qt5
-SUBST_FILES.qt5-pkg-config=    configure
-SUBST_SED.qt5-pkg-config=      -e 's,QtCore,Qt5Core,g'
-SUBST_SED.qt5-pkg-config+=     -e 's,QtGui,Qt5Widgets,g'
-SUBST_SED.qt5-pkg-config+=     -e 's,QtNetwork,Qt5Network,g'
-SUBST_SED.qt5-pkg-config+=     -e 's,QtOpenGL,Qt5OpenGL,g'
+SUBST_CLASSES+=                        qtchooser
+SUBST_STAGE.qtchooser=         pre-configure
+SUBST_MESSAGE.qtchooser=       Avoiding qtchooser assumption (-qt=x argument)
+SUBST_FILES.qtchooser=         configure
+SUBST_SED.qtchooser=           -e 's,-qt=\$$qt_version,,'
 
 # Matches reduce-relocations logic in x11/qt5-qtbase
 .if ${OPSYS} != "Darwin" && ${OPSYS} != "SunOS" && \
@@ -89,9 +88,6 @@
 
 CHECK_WRKREF_SKIP+=    lib/octave/${PKGVERSION_NOREV}/liboctinterp.so*
 
-pre-configure:
-        cd ${WRKSRC} && autoconf
-
 post-install:
 .for f in ${OCTAVE_DOC}
        ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/octave/${PKGVERSION_NOREV}/doc
@@ -105,9 +101,13 @@
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+# Also can use osmesa for plotting.
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../graphics/gl2ps/buildlink3.mk"
 .include "../../math/arpack-ng/buildlink3.mk"
 .include "../../mk/blas.buildlink3.mk"
 .include "../../math/fftw/buildlink3.mk"
+.include "../../math/qrupdate/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/fltk13/buildlink3.mk"
@@ -116,4 +116,5 @@
 .endif
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../x11/qt5-qttools/buildlink3.mk"
+.include "../../x11/qt5-qscintilla/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 1fd778265f6f -r 6a8406c0fe98 math/octave/PLIST
--- a/math/octave/PLIST Mon May 31 07:03:31 2021 +0000
+++ b/math/octave/PLIST Mon May 31 07:16:51 2021 +0000
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.34 2020/04/12 21:19:32 adam Exp $
-bin/${PKGNAME}
+@comment $NetBSD: PLIST,v 1.35 2021/05/31 07:16:51 thor Exp $
 bin/mkoctfile
 bin/mkoctfile-${PKGVERSION}
 bin/octave
+bin/${PKGNAME}
 bin/octave-cli
 bin/octave-cli-${PKGVERSION}
 bin/octave-config
@@ -58,6 +58,7 @@
 include/${PKGNAME}/octave/Sparse.h
 include/${PKGNAME}/octave/action-container.h
 include/${PKGNAME}/octave/aepbalance.h
+include/${PKGNAME}/octave/anon-fcn-validator.h
 include/${PKGNAME}/octave/base-dae.h
 include/${PKGNAME}/octave/base-de.h
 include/${PKGNAME}/octave/base-list.h
@@ -76,6 +77,13 @@
 include/${PKGNAME}/octave/c-file-ptr-stream.h
 include/${PKGNAME}/octave/call-stack.h
 include/${PKGNAME}/octave/caseless-str.h
+include/${PKGNAME}/octave/cdef-class.h
+include/${PKGNAME}/octave/cdef-manager.h
+include/${PKGNAME}/octave/cdef-method.h
+include/${PKGNAME}/octave/cdef-object.h
+include/${PKGNAME}/octave/cdef-package.h
+include/${PKGNAME}/octave/cdef-property.h
+include/${PKGNAME}/octave/cdef-utils.h
 include/${PKGNAME}/octave/cdisplay.h
 include/${PKGNAME}/octave/chMatrix.h
 include/${PKGNAME}/octave/chNDArray.h
@@ -98,13 +106,13 @@
 include/${PKGNAME}/octave/defun.h
 include/${PKGNAME}/octave/dim-vector.h
 include/${PKGNAME}/octave/dir-ops.h
-include/${PKGNAME}/octave/dirfns.h
 include/${PKGNAME}/octave/display.h
 include/${PKGNAME}/octave/dynamic-ld.h
 include/${PKGNAME}/octave/eigs-base.h
 include/${PKGNAME}/octave/environment.h
 include/${PKGNAME}/octave/error.h
 include/${PKGNAME}/octave/errwarn.h
+include/${PKGNAME}/octave/event-manager.h
 include/${PKGNAME}/octave/event-queue.h
 include/${PKGNAME}/octave/f77-fcn.h
 include/${PKGNAME}/octave/fCColVector.h
@@ -123,8 +131,8 @@
 include/${PKGNAME}/octave/file-io.h
 include/${PKGNAME}/octave/file-ops.h
 include/${PKGNAME}/octave/file-stat.h
+include/${PKGNAME}/octave/filepos.h
 include/${PKGNAME}/octave/ft-text-renderer.h
-include/${PKGNAME}/octave/functor.h
 include/${PKGNAME}/octave/gepbalance.h
 include/${PKGNAME}/octave/gl-render.h
 include/${PKGNAME}/octave/gl2ps-print.h
@@ -518,6 +526,7 @@
 include/${PKGNAME}/octave/mx-ui8nda-ui64.h
 include/${PKGNAME}/octave/mx-ui8nda-ui64nda.h
 include/${PKGNAME}/octave/mxarray.h
+include/${PKGNAME}/octave/oct-atomic.h
 include/${PKGNAME}/octave/oct-base64.h
 include/${PKGNAME}/octave/oct-binmap.h
 include/${PKGNAME}/octave/oct-cmplx.h
@@ -539,10 +548,10 @@
 include/${PKGNAME}/octave/oct-map.h
 include/${PKGNAME}/octave/oct-mutex.h
 include/${PKGNAME}/octave/oct-norm.h
-include/${PKGNAME}/octave/oct-obj.h
 include/${PKGNAME}/octave/oct-passwd.h
 include/${PKGNAME}/octave/oct-prcstrm.h
 include/${PKGNAME}/octave/oct-procbuf.h
+include/${PKGNAME}/octave/oct-process.h
 include/${PKGNAME}/octave/oct-rand.h
 include/${PKGNAME}/octave/oct-refcount.h
 include/${PKGNAME}/octave/oct-rl-edit.h
@@ -562,7 +571,6 @@
 include/${PKGNAME}/octave/octave-build-info.h
 include/${PKGNAME}/octave/octave-config.h
 include/${PKGNAME}/octave/octave-default-image.h
-include/${PKGNAME}/octave/octave-link.h
 include/${PKGNAME}/octave/octave-preserve-stream-state.h
 include/${PKGNAME}/octave/octave.h
 include/${PKGNAME}/octave/ops.h
@@ -588,7 +596,6 @@
 include/${PKGNAME}/octave/ov-cx-sparse.h
 include/${PKGNAME}/octave/ov-dld-fcn.h
 include/${PKGNAME}/octave/ov-fcn-handle.h
-include/${PKGNAME}/octave/ov-fcn-inline.h
 include/${PKGNAME}/octave/ov-fcn.h
 include/${PKGNAME}/octave/ov-float.h
 include/${PKGNAME}/octave/ov-flt-complex.h
@@ -649,7 +656,6 @@
 include/${PKGNAME}/octave/pt-except.h
 include/${PKGNAME}/octave/pt-exp.h
 include/${PKGNAME}/octave/pt-fcn-handle.h
-include/${PKGNAME}/octave/pt-funcall.h
 include/${PKGNAME}/octave/pt-id.h
 include/${PKGNAME}/octave/pt-idx.h
 include/${PKGNAME}/octave/pt-jit.h
@@ -699,6 +705,7 @@
 include/${PKGNAME}/octave/sparse-util.h
 include/${PKGNAME}/octave/sparse-xdiv.h
 include/${PKGNAME}/octave/sparse-xpow.h
+include/${PKGNAME}/octave/stack-frame.h
 include/${PKGNAME}/octave/str-vec.h
 include/${PKGNAME}/octave/svd.h
 include/${PKGNAME}/octave/syminfo.h
@@ -709,7 +716,6 @@
 include/${PKGNAME}/octave/text-engine.h
 include/${PKGNAME}/octave/text-renderer.h
 include/${PKGNAME}/octave/token.h
-include/${PKGNAME}/octave/toplev.h
 include/${PKGNAME}/octave/txt-eng.h
 include/${PKGNAME}/octave/uint16NDArray.h
 include/${PKGNAME}/octave/uint32NDArray.h
@@ -750,64 +756,44 @@
 include/${PKGNAME}/octave/xnorm.h
 include/${PKGNAME}/octave/xpow.h
 include/${PKGNAME}/octave/zfstream.h
+info/liboctave.info
+info/octave.info
 lib/octave/${PKGVERSION}/__delaunayn__.a
-lib/octave/${PKGVERSION}/__eigs__.a
 lib/octave/${PKGVERSION}/__fltk_uigetfile__.a
 lib/octave/${PKGVERSION}/__glpk__.a
 lib/octave/${PKGVERSION}/__init_fltk__.a
 lib/octave/${PKGVERSION}/__init_gnuplot__.a
-lib/octave/${PKGVERSION}/__init_qt__.a
 lib/octave/${PKGVERSION}/__ode15__.a
 lib/octave/${PKGVERSION}/__voronoi__.a
-lib/octave/${PKGVERSION}/amd.a
 lib/octave/${PKGVERSION}/audiodevinfo.a
 lib/octave/${PKGVERSION}/audioread.a
-lib/octave/${PKGVERSION}/ccolamd.a
-lib/octave/${PKGVERSION}/chol.a
-lib/octave/${PKGVERSION}/colamd.a
 lib/octave/${PKGVERSION}/convhulln.a
-lib/octave/${PKGVERSION}/dmperm.a
 lib/octave/${PKGVERSION}/fftw.a
 lib/octave/${PKGVERSION}/gzip.a
 lib/octave/${PKGVERSION}/liboctave.la
 lib/octave/${PKGVERSION}/liboctgui.la
 lib/octave/${PKGVERSION}/liboctinterp.la
-lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/PKG_ADD
-lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__delaunayn__.oct
-lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__eigs__.oct
-lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__fltk_uigetfile__.oct
-lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__glpk__.oct
-lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__init_fltk__.oct
-lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__init_gnuplot__.oct
-lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__init_qt__.oct
-lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__ode15__.oct
-lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__voronoi__.oct
-lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/amd.oct
-lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/audiodevinfo.oct
-lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/audioread.oct
-lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/ccolamd.oct
-lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/chol.oct
-lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/colamd.oct
-lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/convhulln.oct
-lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/dmperm.oct
-lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/fftw.oct
-lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/gzip.oct
-lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/qr.oct
-lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/symbfact.oct
-lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/symrcm.oct
-lib/octave/${PKGVERSION}/qr.a
-@pkgdir lib/octave/${PKGVERSION}/site/oct/${MACHINE_GNU_PLATFORM}
-lib/octave/${PKGVERSION}/symbfact.a
-lib/octave/${PKGVERSION}/symrcm.a
-@pkgdir lib/octave/site/oct/${MACHINE_GNU_PLATFORM}
-@pkgdir lib/octave/site/oct/api-v53/${MACHINE_GNU_PLATFORM}
+lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}-gnu/PKG_ADD
+lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}-gnu/__delaunayn__.oct
+lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}-gnu/__fltk_uigetfile__.oct
+lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}-gnu/__glpk__.oct
+lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}-gnu/__init_fltk__.oct
+lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}-gnu/__init_gnuplot__.oct
+lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}-gnu/__ode15__.oct
+lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}-gnu/__voronoi__.oct
+lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}-gnu/audiodevinfo.oct
+lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}-gnu/audioread.oct
+lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}-gnu/convhulln.oct
+lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}-gnu/fftw.oct
+lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}-gnu/gzip.oct
 lib/pkgconfig/octave.pc
 lib/pkgconfig/octinterp.pc
-libexec/octave/${PKGVERSION}/exec/${MACHINE_GNU_PLATFORM}/octave-gui
-libexec/octave/${PKGVERSION}/exec/${MACHINE_GNU_PLATFORM}/octave-svgconvert
-@pkgdir libexec/octave/${PKGVERSION}/site/exec/${MACHINE_GNU_PLATFORM}
-@pkgdir libexec/octave/api-v53/site/exec/${MACHINE_GNU_PLATFORM}
-@pkgdir libexec/octave/site/exec/${MACHINE_GNU_PLATFORM}
+libexec/octave/${PKGVERSION}/exec/${MACHINE_GNU_PLATFORM}-gnu/octave-gui
+libexec/octave/${PKGVERSION}/exec/${MACHINE_GNU_PLATFORM}-gnu/octave-svgconvert
+man/man1/mkoctfile.1
+man/man1/octave-cli.1
+man/man1/octave-config.1
+man/man1/octave.1
 share/applications/org.octave.Octave.desktop
 share/icons/hicolor/1024x1024/apps/octave.png
 share/icons/hicolor/128x128/apps/octave.png
@@ -872,8 +858,6 @@
 share/octave/${PKGVERSION}/etc/tests/fixed/bug-38236/bug-38236.tst
 share/octave/${PKGVERSION}/etc/tests/fixed/bug-38236/df_vr.m
 share/octave/${PKGVERSION}/etc/tests/fixed/bug-38236/u_vr.m
-share/octave/${PKGVERSION}/etc/tests/fixed/bug-38565.tst
-share/octave/${PKGVERSION}/etc/tests/fixed/bug-38576.tst
 share/octave/${PKGVERSION}/etc/tests/fixed/bug-38691/bug-38691.tst
 share/octave/${PKGVERSION}/etc/tests/fixed/bug-38691/dir1/func1.m
 share/octave/${PKGVERSION}/etc/tests/fixed/bug-38691/dir2/func1.m
@@ -883,11 +867,16 @@
 share/octave/${PKGVERSION}/etc/tests/fixed/bug-41723/class_bug41723.m