Wed Dec 15 17:20:58 2021 UTC ()
octave: updated to 6.4.0

Summary of bugs fixed for version 6.4.0 (2021-10-30)
----------------------------------------------------

Improvements and fixes

- Reduce memory usage in BISTs for `copyobj`, `hgsave`.
- `hgsave.m`, `copyobj.m`: Use `'qt'` graphics toolkit in BISTs.
- `main.cc`: Use `getopt` to parse command line arguments.
- `main.cc`: Remove invalid case.
- Disable `getopt` error reporting in wrapper program.
- `interp1.m`: Don't interpret later numeric input as `xi`.
- `pkg`: Improve similar package name suggestion.
- Store parent name in function object when caching parents in scope.
- Avoid internal error and segfault with `eval` and scripts.
- `rmpath`: Prevent removing the current directory from the load path.

GUI

- Fix missing interpreter event in `octave-scintilla`.
- Fix opening a file in a custom editor.

Documentation

- Improve docstring for `disable_diagonal_matrix`, `disable_diagonal_matrix`,
  and `disable_range`.
- `cbrt`: Clarify that function errors for non-real input.
- `dsearchn.m`: Added optional distance output description.
- Add Hungarian translation for project description files.
- Document fsolve output "info" -2.

Build system

- Correct error message for incompatible CXSparse.

Summary of bugs fixed for version 6.3.0 (2021-07-11)
----------------------------------------------------

Important notice

- This bug fix release breaks ABI compatiblity with Octave 6.2.0. Re-build
  binaries (like .oct or .mex files) when updating to this version.

Improvements and fixes

- `ls-hdf5.cc`: Avoid throwing inside HDF5 function.
- `ls-hdf5.cc`: Handle non-zero terminated type strings.
- Fix occasional segfault in `symbfact`.
- `fsolve.m`: Fix undefined output error when using `Output` function.
- Fix compilation error with `iconv_t` on Solaris.
- build: Check for `stropts.h`.
- Avoid ambiguous call to `pow`.
- Fix context link when creating handle to nested function.
- `print.m`: Warn when figure is too large to be printed to output page.
- Defer clearing function vars until stack frame is deleted.
- Avoid memory leaks when returning handles to nested functions.
- Hold references to closure frames in anon functions if needed.
- `eigs`: Prevent possible segmentation fault at exit.
- Issue warning when gnuplot graphics toolkit is initialized.
- mpoles.m: Fix detection of pole multiplicity.
- Perform shutdown actions in interpreter destructor.
- build: Make relocation of dependencies with Octave optional.
- `qz.cc`: Return correct number of eigenvalues.
- `qz.cc`: Let test pass with LAPACK 3.9.1 and earlier versions.
- `pkg.m`: Use default prefixes unless otherwise set previously.
- `betaincinv.m`: Correctly handle small inputs.
- `betaincinv.m`: Correctly handle inputs very close to 1.0.
- `unistd-wrappers.c`: Allocate sufficient memory for `new_argv`.
- Mark system functions correctly if `OCTAVE_HOME` is non-canonical.
- Mark compiled system functions correctly if `OCTAVE_HOME` is non-canonical.
- Fix error if test suite is run before Octave is installed.
- `lo-array-errwarn.cc`: Include `<limits>`.
- Use `std::size_t` and `std::ptrdiff_t` in C++ code.
- Use `std::size_t` in more instances.
- Return proper number of stack frames for `dbstack (N)` call.
- Avoid ambiguous match of overloaded function.
- `lscov.m`: Relax BIST tolerance to pass with OpenBLAS.
- `print`: Fix error when `"px"` word is present in a figure.
- `logm.m`: Fix check for real negative values in complex vector.
- build: Set necessary flags to allow execution on Windows Vista.
- Declare base_parser destructor virtual.
- `hist.m`: Improve handling and docstring for third parameter "norm".
- `logm.m`: Allow tolerance in check for real negative values in complex vector.
- `expm.m`, `logm.m`: Use function `isdiag` to detect if input is a diagonal matrix.
- tests: Relax tolerance for some tests on macOS.
- `logspace.m`: Mark tests as known to fail on macOS.
- `hist.m`: Use deterministic test.
- `rgb2ind.m`: Reduce memory usage and eliminate randomness in test.
- `logm.m`: Allow larger tolerance for test on macOS.
- build: Use correct path to `octave` binary in build tree on macOS.
- build: Fix typo in folder to libraries when building `.oct` or `.mex` files.
- build: Set DL_LDFLAGS in the build rules for .oct or .mex files.
- `rgb2ind.m`: Suppress output in test.
- Improve documentation for `log2` function.
- `ind2sub`: Fix typo in "see also" section of docstring.
- `mrdivide`, `mldivide`: Document that functions might return minimum norm solutions.
- Fix scoping issue for handles to sibling nested functions.
- `ls-mat5.cc`: Avoid integer overflow in calculation of buffer size for zlib.
- Move top-level REPL from interpreter to evaluator.
- Avoid crash with `dbquit` when executing command in terminal from GUI.

GUI

- Fix calling external editor.
- Fix missing file suffix .m when saving a new script.
- Do not run files that are not saved as Octave files.
- Fix confirm overwrite for native editor file "save as" dialogs.
- Fix crash when GUI tries to restore missing previous Octave dir.
- Fix restoring the horizontal position of docked GUI widgets.
- Prevent floating widgets from re-opening after restart.
- Avoid crash in GUI for `rmdir("")`.
- Fix EOL mode when saving files under new names.
- Fix auto indentation of switch-structure in GUI editor.
- Avoid crash when closing GUI with open editor tabs.
- `octave-qscintilla.cc` (`contextmenu_run`): Fix keyboard command handling.

Documentation

- Improve Differential Equations chapter and example for lsode.
- Clarify usage of "Depends" keyword in package `DESCRIPTION` file.
- Add note that wildcard patterns for `save` are glob patterns.
- Change example for Delaunay triangulation to match the generating code.
- Document single precision issues with OpenGL graphics toolkits.
- Minor changes to documentation of single precision issues with OpenGL.
- Expand on documentation for command syntax.
- `isprop.m`: Document that function only works on graphics objects in Octave 6.X.
- Explain how to write dual-purpose executable scripts and Octave functions.
- Update keyword docstrings.
- Use Texinfo commands to improve `transpose()` docstring rendering.
- `betainc.m`, `betaincinv.m`: Correct non-TeX definition of beta incomplete integral.
- Grammarcheck documentation ahead of 6.3 release.
- Spellcheck documentation ahead of 6.3 release.


(adam)
diff -r1.225 -r1.226 pkgsrc/math/octave/Makefile
diff -r1.36 -r1.37 pkgsrc/math/octave/PLIST
diff -r1.63 -r1.64 pkgsrc/math/octave/distinfo
diff -r1.2 -r0 pkgsrc/math/octave/patches/patch-fseeko-fpos_t.c
diff -r1.2 -r0 pkgsrc/math/octave/patches/patch-liboctave_wrappers_iconv-wrappers.c
diff -r0 -r1.1 pkgsrc/math/octave/patches/patch-libgnu_fseeko.c
diff -r1.3 -r1.4 pkgsrc/math/octave/patches/patch-m4_acinclude.m4

cvs diff -r1.225 -r1.226 pkgsrc/math/octave/Makefile (expand / switch to unified diff)

--- pkgsrc/math/octave/Makefile 2021/12/08 16:05:35 1.225
+++ pkgsrc/math/octave/Makefile 2021/12/15 17:20:57 1.226
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.225 2021/12/08 16:05:35 adam Exp $ 1# $NetBSD: Makefile,v 1.226 2021/12/15 17:20:57 adam Exp $
2 2
3DISTNAME= octave-6.2.0 3DISTNAME= octave-6.4.0
4PKGREVISION= 5 
5CATEGORIES= math 4CATEGORIES= math
6MASTER_SITES= ${MASTER_SITE_GNU:=octave/} 5MASTER_SITES= ${MASTER_SITE_GNU:=octave/}
7EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
8 7
9MAINTAINER= adam@NetBSD.org 8MAINTAINER= adam@NetBSD.org
10HOMEPAGE= https://www.gnu.org/software/octave/ 9HOMEPAGE= https://www.gnu.org/software/octave/
11COMMENT= High-level language, intended for numerical computations 10COMMENT= High-level language, intended for numerical computations
12LICENSE= gnu-gpl-v3 11LICENSE= gnu-gpl-v3
13 12
14# These BUILD_DEPENDS are only needed if we need to rebuild the documentation 13# These BUILD_DEPENDS are only needed if we need to rebuild the documentation
15#BUILD_DEPENDS+= tex-latex-fonts-[0-9]*:../../fonts/tex-latex-fonts 14#BUILD_DEPENDS+= tex-latex-fonts-[0-9]*:../../fonts/tex-latex-fonts
16#BUILD_DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk 15#BUILD_DEPENDS+= dvipsk-[0-9]*:../../print/dvipsk
17#BUILD_DEPENDS+= tex-epsf-[0-9]*:../../print/tex-epsf 16#BUILD_DEPENDS+= tex-epsf-[0-9]*:../../print/tex-epsf
@@ -21,34 +20,31 @@ LICENSE= gnu-gpl-v3 @@ -21,34 +20,31 @@ LICENSE= gnu-gpl-v3
21 20
22DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot 21DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot
23 22
24USE_LANGUAGES= c c++ fortran77 23USE_LANGUAGES= c c++ fortran77
25USE_LIBTOOL= yes 24USE_LIBTOOL= yes
26USE_TOOLS+= autoconf gsed gmake:run perl pkg-config bison bsdtar:run 25USE_TOOLS+= autoconf gsed gmake:run perl pkg-config bison bsdtar:run
27USE_TOOLS+= makeinfo:test 26USE_TOOLS+= makeinfo:test
28GNU_CONFIGURE= yes 27GNU_CONFIGURE= yes
29 28
30# needed for loading of shared objects such as those in the 29# needed for loading of shared objects such as those in the
31# octave-forge package or user written ones compiled with mkoctfile 30# octave-forge package or user written ones compiled with mkoctfile
32CONFIGURE_ARGS+= --enable-static 31CONFIGURE_ARGS+= --enable-static
33CONFIGURE_ARGS+= --enable-shared 32CONFIGURE_ARGS+= --enable-shared
34#CONFIGURE_ARGS+= --without-opengl 
35#CONFIGURE_ARGS+= --with-framework-opengl=no 
36CONFIGURE_ARGS+= --disable-java 33CONFIGURE_ARGS+= --disable-java
37CONFIGURE_ARGS+= --disable-docs 34CONFIGURE_ARGS+= --disable-docs
38TEST_TARGET= check 
39 
40CONFIGURE_ARGS+= --with-blas=${BLAS_LIBS:Q} 35CONFIGURE_ARGS+= --with-blas=${BLAS_LIBS:Q}
41CONFIGURE_ARGS+= --with-lapack=${LAPACK_LIBS:Q} 36CONFIGURE_ARGS+= --with-lapack=${LAPACK_LIBS:Q}
 37TEST_TARGET= check
42 38
43# Provide a full path gfortran in MKOCTFILE for octave-forge 39# Provide a full path gfortran in MKOCTFILE for octave-forge
44CONFIGURE_ENV+= MKOCTFILE_F77=${FCPATH} 40CONFIGURE_ENV+= MKOCTFILE_F77=${FCPATH}
45 41
46.include "../../mk/bsd.prefs.mk" 42.include "../../mk/bsd.prefs.mk"
47 43
48# When __APPLE__ is defined, fltk headers typedef an alternate version of Window 44# When __APPLE__ is defined, fltk headers typedef an alternate version of Window
49# which conflicts with the one in the X11 headers, so avoid pulling in X11. 45# which conflicts with the one in the X11 headers, so avoid pulling in X11.
50CONFIGURE_ARGS.Darwin+= --without-x 46CONFIGURE_ARGS.Darwin+= --without-x
51 47
52# This is needed on Darwin or we get link failures on modules. 48# This is needed on Darwin or we get link failures on modules.
53CONFIGURE_ARGS.Darwin+= --enable-link-all-dependencies 49CONFIGURE_ARGS.Darwin+= --enable-link-all-dependencies
54 50
@@ -99,40 +95,39 @@ CHECK_WRKREF_SKIP+= lib/octave/${PKGVERS @@ -99,40 +95,39 @@ CHECK_WRKREF_SKIP+= lib/octave/${PKGVERS
99pre-configure: 95pre-configure:
100 cd ${WRKSRC} && autoconf 96 cd ${WRKSRC} && autoconf
101 97
102post-install: 98post-install:
103.for f in ${OCTAVE_DOC} 99.for f in ${OCTAVE_DOC}
104 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/octave/${PKGVERSION_NOREV}/doc 100 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/octave/${PKGVERSION_NOREV}/doc
105.endfor 101.endfor
106.for f in ${OCTAVE_MAN} 102.for f in ${OCTAVE_MAN}
107 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 103 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
108.endfor 104.endfor
109.for f in ${OCTAVE_INFO} 105.for f in ${OCTAVE_INFO}
110 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${PKGINFODIR} 106 ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/${PKGINFODIR}
111.endfor 107.endfor
112 
113 ${RM} -f ${DESTDIR}/${PREFIX}/lib/charset.alias 108 ${RM} -f ${DESTDIR}/${PREFIX}/lib/charset.alias
114 109
 110.if ${OPSYS} != "Darwin"
 111# Also can use osmesa for plotting.
 112.include "../../graphics/MesaLib/buildlink3.mk"
 113.include "../../x11/libX11/buildlink3.mk"
 114.endif
115.include "../../audio/libsndfile/buildlink3.mk" 115.include "../../audio/libsndfile/buildlink3.mk"
116.include "../../devel/gperf/buildlink3.mk" 116.include "../../devel/gperf/buildlink3.mk"
117.include "../../devel/ncurses/buildlink3.mk" 117.include "../../devel/ncurses/buildlink3.mk"
118.include "../../devel/pcre/buildlink3.mk" 118.include "../../devel/pcre/buildlink3.mk"
119.include "../../devel/readline/buildlink3.mk" 119.include "../../devel/readline/buildlink3.mk"
120.include "../../devel/zlib/buildlink3.mk" 120.include "../../devel/zlib/buildlink3.mk"
121.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 121.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
122# Also can use osmesa for plotting. 
123.include "../../graphics/MesaLib/buildlink3.mk" 
124.include "../../graphics/gl2ps/buildlink3.mk" 122.include "../../graphics/gl2ps/buildlink3.mk"
125.include "../../math/arpack-ng/buildlink3.mk" 123.include "../../math/arpack-ng/buildlink3.mk"
126.include "../../mk/blas.buildlink3.mk" 
127.include "../../math/fftw/buildlink3.mk" 124.include "../../math/fftw/buildlink3.mk"
128.include "../../math/qrupdate/buildlink3.mk" 125.include "../../math/qrupdate/buildlink3.mk"
129.include "../../sysutils/desktop-file-utils/desktopdb.mk" 126.include "../../sysutils/desktop-file-utils/desktopdb.mk"
130.include "../../www/curl/buildlink3.mk" 127.include "../../www/curl/buildlink3.mk"
131.include "../../x11/fltk13/buildlink3.mk" 128.include "../../x11/fltk13/buildlink3.mk"
132.if ${OPSYS} != "Darwin" 
133.include "../../x11/libX11/buildlink3.mk" 
134.endif 
135.include "../../x11/qt5-qtbase/buildlink3.mk" 129.include "../../x11/qt5-qtbase/buildlink3.mk"
136.include "../../x11/qt5-qttools/buildlink3.mk" 130.include "../../x11/qt5-qttools/buildlink3.mk"
137.include "../../x11/qt5-qscintilla/buildlink3.mk" 131.include "../../x11/qt5-qscintilla/buildlink3.mk"
 132.include "../../mk/blas.buildlink3.mk"
138.include "../../mk/bsd.pkg.mk" 133.include "../../mk/bsd.pkg.mk"

cvs diff -r1.36 -r1.37 pkgsrc/math/octave/PLIST (expand / switch to unified diff)

--- pkgsrc/math/octave/PLIST 2021/06/14 22:16:33 1.36
+++ pkgsrc/math/octave/PLIST 2021/12/15 17:20:57 1.37
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1@comment $NetBSD: PLIST,v 1.36 2021/06/14 22:16:33 nros Exp $ 1@comment $NetBSD: PLIST,v 1.37 2021/12/15 17:20:57 adam Exp $
 2bin/${PKGNAME}
2bin/mkoctfile 3bin/mkoctfile
3bin/mkoctfile-${PKGVERSION} 4bin/mkoctfile-${PKGVERSION}
4bin/octave 5bin/octave
5bin/${PKGNAME} 
6bin/octave-cli 6bin/octave-cli
7bin/octave-cli-${PKGVERSION} 7bin/octave-cli-${PKGVERSION}
8bin/octave-config 8bin/octave-config
9bin/octave-config-${PKGVERSION} 9bin/octave-config-${PKGVERSION}
10include/${PKGNAME}/octave/Array-util.h 10include/${PKGNAME}/octave/Array-util.h
11include/${PKGNAME}/octave/Array.cc 11include/${PKGNAME}/octave/Array.cc
12include/${PKGNAME}/octave/Array.h 12include/${PKGNAME}/octave/Array.h
13include/${PKGNAME}/octave/CColVector.h 13include/${PKGNAME}/octave/CColVector.h
14include/${PKGNAME}/octave/CDiagMatrix.h 14include/${PKGNAME}/octave/CDiagMatrix.h
15include/${PKGNAME}/octave/CMatrix.h 15include/${PKGNAME}/octave/CMatrix.h
16include/${PKGNAME}/octave/CNDArray.h 16include/${PKGNAME}/octave/CNDArray.h
17include/${PKGNAME}/octave/CRowVector.h 17include/${PKGNAME}/octave/CRowVector.h
18include/${PKGNAME}/octave/CSparse.h 18include/${PKGNAME}/octave/CSparse.h
@@ -776,30 +776,36 @@ lib/octave/${PKGVERSION}/liboctinterp.la @@ -776,30 +776,36 @@ lib/octave/${PKGVERSION}/liboctinterp.la
776lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/PKG_ADD 776lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/PKG_ADD
777lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__delaunayn__.oct 777lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__delaunayn__.oct
778lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__fltk_uigetfile__.oct 778lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__fltk_uigetfile__.oct
779lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__glpk__.oct 779lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__glpk__.oct
780lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__init_fltk__.oct 780lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__init_fltk__.oct
781lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__init_gnuplot__.oct 781lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__init_gnuplot__.oct
782lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__ode15__.oct 782lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__ode15__.oct
783lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__voronoi__.oct 783lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__voronoi__.oct
784lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/audiodevinfo.oct 784lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/audiodevinfo.oct
785lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/audioread.oct 785lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/audioread.oct
786lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/convhulln.oct 786lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/convhulln.oct
787lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/fftw.oct 787lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/fftw.oct
788lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/gzip.oct 788lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/gzip.oct
 789@pkgdir lib/octave/${PKGVERSION}/site/oct/${MACHINE_GNU_PLATFORM}
 790@pkgdir lib/octave/site/oct/${MACHINE_GNU_PLATFORM}
 791@pkgdir lib/octave/site/oct/api-v55/${MACHINE_GNU_PLATFORM}
789lib/pkgconfig/octave.pc 792lib/pkgconfig/octave.pc
790lib/pkgconfig/octinterp.pc 793lib/pkgconfig/octinterp.pc
791libexec/octave/${PKGVERSION}/exec/${MACHINE_GNU_PLATFORM}/octave-gui 794libexec/octave/${PKGVERSION}/exec/${MACHINE_GNU_PLATFORM}/octave-gui
792libexec/octave/${PKGVERSION}/exec/${MACHINE_GNU_PLATFORM}/octave-svgconvert 795libexec/octave/${PKGVERSION}/exec/${MACHINE_GNU_PLATFORM}/octave-svgconvert
 796@pkgdir libexec/octave/${PKGVERSION}/site/exec/${MACHINE_GNU_PLATFORM}
 797@pkgdir libexec/octave/api-v55/site/exec/${MACHINE_GNU_PLATFORM}
 798@pkgdir libexec/octave/site/exec/${MACHINE_GNU_PLATFORM}
793man/man1/mkoctfile.1 799man/man1/mkoctfile.1
794man/man1/octave-cli.1 800man/man1/octave-cli.1
795man/man1/octave-config.1 801man/man1/octave-config.1
796man/man1/octave.1 802man/man1/octave.1
797share/applications/org.octave.Octave.desktop 803share/applications/org.octave.Octave.desktop
798share/icons/hicolor/1024x1024/apps/octave.png 804share/icons/hicolor/1024x1024/apps/octave.png
799share/icons/hicolor/128x128/apps/octave.png 805share/icons/hicolor/128x128/apps/octave.png
800share/icons/hicolor/16x16/apps/octave.png 806share/icons/hicolor/16x16/apps/octave.png
801share/icons/hicolor/22x22/apps/octave.png 807share/icons/hicolor/22x22/apps/octave.png
802share/icons/hicolor/24x24/apps/octave.png 808share/icons/hicolor/24x24/apps/octave.png
803share/icons/hicolor/256x256/apps/octave.png 809share/icons/hicolor/256x256/apps/octave.png
804share/icons/hicolor/32x32/apps/octave.png 810share/icons/hicolor/32x32/apps/octave.png
805share/icons/hicolor/48x48/apps/octave.png 811share/icons/hicolor/48x48/apps/octave.png
@@ -952,26 +958,34 @@ share/octave/${PKGVERSION}/etc/tests/fix @@ -952,26 +958,34 @@ share/octave/${PKGVERSION}/etc/tests/fix
952share/octave/${PKGVERSION}/etc/tests/fixed/bug-59451/foo/@double/bug59451.m 958share/octave/${PKGVERSION}/etc/tests/fixed/bug-59451/foo/@double/bug59451.m
953share/octave/${PKGVERSION}/etc/tests/fixed/bug-59451/foo/@single/bug59451.m 959share/octave/${PKGVERSION}/etc/tests/fixed/bug-59451/foo/@single/bug59451.m
954share/octave/${PKGVERSION}/etc/tests/fixed/bug-59617/@bug59617/bug59617.m 960share/octave/${PKGVERSION}/etc/tests/fixed/bug-59617/@bug59617/bug59617.m
955share/octave/${PKGVERSION}/etc/tests/fixed/bug-59617/@bug59617/max.m 961share/octave/${PKGVERSION}/etc/tests/fixed/bug-59617/@bug59617/max.m
956share/octave/${PKGVERSION}/etc/tests/fixed/bug-59617/bug-59617.tst 962share/octave/${PKGVERSION}/etc/tests/fixed/bug-59617/bug-59617.tst
957share/octave/${PKGVERSION}/etc/tests/fixed/bug-59661/bug-59661.tst 963share/octave/${PKGVERSION}/etc/tests/fixed/bug-59661/bug-59661.tst
958share/octave/${PKGVERSION}/etc/tests/fixed/bug-59661/bug59661.m 964share/octave/${PKGVERSION}/etc/tests/fixed/bug-59661/bug59661.m
959share/octave/${PKGVERSION}/etc/tests/fixed/bug-59704/bug-59704.tst 965share/octave/${PKGVERSION}/etc/tests/fixed/bug-59704/bug-59704.tst
960share/octave/${PKGVERSION}/etc/tests/fixed/bug-59704/bug59704_1.m 966share/octave/${PKGVERSION}/etc/tests/fixed/bug-59704/bug59704_1.m
961share/octave/${PKGVERSION}/etc/tests/fixed/bug-59704/bug59704_1_test.m 967share/octave/${PKGVERSION}/etc/tests/fixed/bug-59704/bug59704_1_test.m
962share/octave/${PKGVERSION}/etc/tests/fixed/bug-59704/bug59704_2.m 968share/octave/${PKGVERSION}/etc/tests/fixed/bug-59704/bug59704_2.m
963share/octave/${PKGVERSION}/etc/tests/fixed/bug-59937/bug-59937.tst 969share/octave/${PKGVERSION}/etc/tests/fixed/bug-59937/bug-59937.tst
964share/octave/${PKGVERSION}/etc/tests/fixed/bug-59937/eval_global_script.m 970share/octave/${PKGVERSION}/etc/tests/fixed/bug-59937/eval_global_script.m
 971share/octave/${PKGVERSION}/etc/tests/fixed/bug-60237/bug-60237.tst
 972share/octave/${PKGVERSION}/etc/tests/fixed/bug-60237/bug_60237.m
 973share/octave/${PKGVERSION}/etc/tests/fixed/bug-61105/bug-61105.tst
 974share/octave/${PKGVERSION}/etc/tests/fixed/bug-61105/nested_test_1.m
 975share/octave/${PKGVERSION}/etc/tests/fixed/bug-61105/nested_test_2.m
 976share/octave/${PKGVERSION}/etc/tests/fixed/bug-61105/nested_test_3.m
 977share/octave/${PKGVERSION}/etc/tests/fixed/bug-61191/bug-61191.tst
 978share/octave/${PKGVERSION}/etc/tests/fixed/bug-61191/subdir/bug_61191.m
965share/octave/${PKGVERSION}/etc/tests/fixed/class-concat/@foo/foo.m 979share/octave/${PKGVERSION}/etc/tests/fixed/class-concat/@foo/foo.m
966share/octave/${PKGVERSION}/etc/tests/fixed/class-concat/class-concat.tst 980share/octave/${PKGVERSION}/etc/tests/fixed/class-concat/class-concat.tst
967share/octave/${PKGVERSION}/etc/tests/fixed/classdef-multiple-inheritance/base_1.m 981share/octave/${PKGVERSION}/etc/tests/fixed/classdef-multiple-inheritance/base_1.m
968share/octave/${PKGVERSION}/etc/tests/fixed/classdef-multiple-inheritance/base_2.m 982share/octave/${PKGVERSION}/etc/tests/fixed/classdef-multiple-inheritance/base_2.m
969share/octave/${PKGVERSION}/etc/tests/fixed/classdef-multiple-inheritance/child_from_base_1.m 983share/octave/${PKGVERSION}/etc/tests/fixed/classdef-multiple-inheritance/child_from_base_1.m
970share/octave/${PKGVERSION}/etc/tests/fixed/classdef-multiple-inheritance/child_from_base_1_and_2.m 984share/octave/${PKGVERSION}/etc/tests/fixed/classdef-multiple-inheritance/child_from_base_1_and_2.m
971share/octave/${PKGVERSION}/etc/tests/fixed/classdef-multiple-inheritance/classdef-multiple-inheritance.tst 985share/octave/${PKGVERSION}/etc/tests/fixed/classdef-multiple-inheritance/classdef-multiple-inheritance.tst
972share/octave/${PKGVERSION}/etc/tests/fixed/classdef/class_bug52614A.m 986share/octave/${PKGVERSION}/etc/tests/fixed/classdef/class_bug52614A.m
973share/octave/${PKGVERSION}/etc/tests/fixed/classdef/class_bug52614B.m 987share/octave/${PKGVERSION}/etc/tests/fixed/classdef/class_bug52614B.m
974share/octave/${PKGVERSION}/etc/tests/fixed/classdef/class_bug55766.m 988share/octave/${PKGVERSION}/etc/tests/fixed/classdef/class_bug55766.m
975share/octave/${PKGVERSION}/etc/tests/fixed/classdef/classdef.tst 989share/octave/${PKGVERSION}/etc/tests/fixed/classdef/classdef.tst
976share/octave/${PKGVERSION}/etc/tests/fixed/classdef/foo_method_changes_property_size.m 990share/octave/${PKGVERSION}/etc/tests/fixed/classdef/foo_method_changes_property_size.m
977share/octave/${PKGVERSION}/etc/tests/fixed/classdef/foo_static_method_constant_property.m 991share/octave/${PKGVERSION}/etc/tests/fixed/classdef/foo_static_method_constant_property.m
@@ -1106,28 +1120,30 @@ share/octave/${PKGVERSION}/etc/tests/fix @@ -1106,28 +1120,30 @@ share/octave/${PKGVERSION}/etc/tests/fix
1106share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/@fhdr_other/getsize_arrayfun.m 1120share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/@fhdr_other/getsize_arrayfun.m
1107share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/@fhdr_other/getsize_cellfun.m 1121share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/@fhdr_other/getsize_cellfun.m
1108share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/@fhdr_other/getsize_loop.m 1122share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/@fhdr_other/getsize_loop.m
1109share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/@fhdr_parent/fhdr_parent.m 1123share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/@fhdr_parent/fhdr_parent.m
1110share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/@fhdr_parent/numel.m 1124share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/@fhdr_parent/numel.m
1111share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/bug-51567.tst 1125share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/bug-51567.tst
1112share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/bug-57941.tst 1126share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/bug-57941.tst
1113share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/bug51567.m 1127share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/bug51567.m
1114share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/bug51709_a.m 1128share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/bug51709_a.m
1115share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/bug51709_c.m 1129share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/bug51709_c.m
1116share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/bug57941a.m 1130share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/bug57941a.m
1117share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/bug57941b.m 1131share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/bug57941b.m
1118share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/bug58519.tst 1132share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/bug58519.tst
 1133share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/bug60845.m
1119share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/derived-resolution.tst 1134share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/derived-resolution.tst
1120share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/f1.m 1135share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/f1.m
 1136share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/handle-to-sibling.tst
1121share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/keyword.tst 1137share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/keyword.tst
1122share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/object-method.tst 1138share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/object-method.tst
1123share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/package-function.tst 1139share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/package-function.tst
1124share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/shared-ctx.tst 1140share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/shared-ctx.tst
1125share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/shared_ctx.m 1141share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/shared_ctx.m
1126share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/static-method.tst 1142share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/static-method.tst
1127share/octave/${PKGVERSION}/etc/tests/fixed/for.tst 1143share/octave/${PKGVERSION}/etc/tests/fixed/for.tst
1128share/octave/${PKGVERSION}/etc/tests/fixed/func.tst 1144share/octave/${PKGVERSION}/etc/tests/fixed/func.tst
1129share/octave/${PKGVERSION}/etc/tests/fixed/global.tst 1145share/octave/${PKGVERSION}/etc/tests/fixed/global.tst
1130share/octave/${PKGVERSION}/etc/tests/fixed/if.tst 1146share/octave/${PKGVERSION}/etc/tests/fixed/if.tst
1131share/octave/${PKGVERSION}/etc/tests/fixed/index.tst 1147share/octave/${PKGVERSION}/etc/tests/fixed/index.tst
1132share/octave/${PKGVERSION}/etc/tests/fixed/inline-fcn.tst 1148share/octave/${PKGVERSION}/etc/tests/fixed/inline-fcn.tst
1133share/octave/${PKGVERSION}/etc/tests/fixed/integer.tst 1149share/octave/${PKGVERSION}/etc/tests/fixed/integer.tst
@@ -2367,22 +2383,16 @@ share/octave/${PKGVERSION}/m/time/ctime. @@ -2367,22 +2383,16 @@ share/octave/${PKGVERSION}/m/time/ctime.
2367share/octave/${PKGVERSION}/m/time/date.m 2383share/octave/${PKGVERSION}/m/time/date.m
2368share/octave/${PKGVERSION}/m/time/datenum.m 2384share/octave/${PKGVERSION}/m/time/datenum.m
2369share/octave/${PKGVERSION}/m/time/datestr.m 2385share/octave/${PKGVERSION}/m/time/datestr.m
2370share/octave/${PKGVERSION}/m/time/datevec.m 2386share/octave/${PKGVERSION}/m/time/datevec.m
2371share/octave/${PKGVERSION}/m/time/eomday.m 2387share/octave/${PKGVERSION}/m/time/eomday.m
2372share/octave/${PKGVERSION}/m/time/etime.m 2388share/octave/${PKGVERSION}/m/time/etime.m
2373share/octave/${PKGVERSION}/m/time/is_leap_year.m 2389share/octave/${PKGVERSION}/m/time/is_leap_year.m
2374share/octave/${PKGVERSION}/m/time/now.m 2390share/octave/${PKGVERSION}/m/time/now.m
2375share/octave/${PKGVERSION}/m/time/weekday.m 2391share/octave/${PKGVERSION}/m/time/weekday.m
2376share/octave/${PKGVERSION}/m/web/web.m 2392share/octave/${PKGVERSION}/m/web/web.m
2377share/octave/${PKGVERSION}/m/web/weboptions.m 2393share/octave/${PKGVERSION}/m/web/weboptions.m
2378share/octave/${PKGVERSION}/m/web/webread.m 2394share/octave/${PKGVERSION}/m/web/webread.m
2379share/octave/${PKGVERSION}/m/web/webwrite.m 2395share/octave/${PKGVERSION}/m/web/webwrite.m
2380share/octave/site/m/startup/octaverc 
2381@pkgdir share/octave/site/api-v55/m 
2382@pkgdir share/octave/${PKGVERSION}/site/m 2396@pkgdir share/octave/${PKGVERSION}/site/m
2383@pkgdir lib/octave/site/oct/${MACHINE_GNU_PLATFORM} 2397@pkgdir share/octave/site/api-v55/m
2384@pkgdir lib/octave/site/oct/api-v55/${MACHINE_GNU_PLATFORM} 2398share/octave/site/m/startup/octaverc
2385@pkgdir lib/octave/${PKGVERSION}/site/oct/${MACHINE_GNU_PLATFORM} 
2386@pkgdir libexec/octave/site/exec/${MACHINE_GNU_PLATFORM} 
2387@pkgdir libexec/octave/api-v55/site/exec/${MACHINE_GNU_PLATFORM} 
2388@pkgdir libexec/octave/${PKGVERSION}/site/exec/${MACHINE_GNU_PLATFORM} 

cvs diff -r1.63 -r1.64 pkgsrc/math/octave/distinfo (expand / switch to unified diff)

--- pkgsrc/math/octave/distinfo 2021/10/26 10:55:50 1.63
+++ pkgsrc/math/octave/distinfo 2021/12/15 17:20:57 1.64
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1$NetBSD: distinfo,v 1.63 2021/10/26 10:55:50 nia Exp $ 1$NetBSD: distinfo,v 1.64 2021/12/15 17:20:57 adam Exp $
2 2
3BLAKE2s (octave-6.2.0.tar.xz) = 4ad5851b1c5fe3f07bc3c887bd3f554b7403bdac0049f559f75bcc27922c749f 3BLAKE2s (octave-6.4.0.tar.xz) = 633559d461a1bcadb70419620cb7321bac3de673984e689e140133eff6abcda9
4SHA512 (octave-6.2.0.tar.xz) = 7a0d9ee5fd739bd9bd5d2d57faf9e800ccc760afbb840ec5e3371d1e1564163a6190587e31b16d22ae834162917049a0e2789663294030aa84ee86430127eade 4SHA512 (octave-6.4.0.tar.xz) = d239edde22877f0669314a66eb0d5ae787c387b1601a18e38d0b6971fe25b934801d1050679126974b716a6b7b27a3b51ecbfcff14a4ea529e51291f4028318b
5Size (octave-6.2.0.tar.xz) = 25131148 bytes 5Size (octave-6.4.0.tar.xz) = 25354780 bytes
6SHA1 (patch-configure.ac) = 48a2dee11b33ce80a477367479ad348056c2c1f9 6SHA1 (patch-configure.ac) = 48a2dee11b33ce80a477367479ad348056c2c1f9
7SHA1 (patch-doc_interpreter_module.mk) = 66389cceddbe71fca0c8197275a839170d64ad5b 7SHA1 (patch-doc_interpreter_module.mk) = 66389cceddbe71fca0c8197275a839170d64ad5b
8SHA1 (patch-fseeko-fpos_t.c) = b38e7a38be2e0b323cd7f168f1d22d3df998691c 8SHA1 (patch-libgnu_fseeko.c) = b38e7a38be2e0b323cd7f168f1d22d3df998691c
9SHA1 (patch-libgnu_stdio.in.h) = 952e8683a70615b5219d034b9232420998cef44a 9SHA1 (patch-libgnu_stdio.in.h) = 952e8683a70615b5219d034b9232420998cef44a
10SHA1 (patch-libinterp_dldfcn_config-module.awk) = 54b64357b1ef80c5e55eb5eccf742d2267eb277d 10SHA1 (patch-libinterp_dldfcn_config-module.awk) = 54b64357b1ef80c5e55eb5eccf742d2267eb277d
11SHA1 (patch-libinterp_dldfcn_module.mk) = 2362d824497a8892078437c24757ae1e40e2e556 11SHA1 (patch-libinterp_dldfcn_module.mk) = 2362d824497a8892078437c24757ae1e40e2e556
12SHA1 (patch-liboctave_util_quit.cc) = 17ace431c53de1e5b72b86bb2bf4e15bdc6d4db9 12SHA1 (patch-liboctave_util_quit.cc) = 17ace431c53de1e5b72b86bb2bf4e15bdc6d4db9
13SHA1 (patch-liboctave_wrappers_iconv-wrappers.c) = e179580abfda1183dbf6c4768d9a92fde960e283 13SHA1 (patch-m4_acinclude.m4) = 8d684f3036e25714738379156e766af9cd34afd8
14SHA1 (patch-m4_acinclude.m4) = 2c5b2fc9bfe3b9b1e1feec805338ed92ed3953e1 
15SHA1 (patch-scripts_miscellaneous_unpack.m) = 82c9ca170762e223c8e5a6f88a7dd9fe2a2a33d0 14SHA1 (patch-scripts_miscellaneous_unpack.m) = 82c9ca170762e223c8e5a6f88a7dd9fe2a2a33d0
16SHA1 (patch-scripts_pkg_private_configure__make.m) = 7d4b620f889faa66c4c9c581ef8a7e7692b68c94 15SHA1 (patch-scripts_pkg_private_configure__make.m) = 7d4b620f889faa66c4c9c581ef8a7e7692b68c94
17SHA1 (patch-scripts_plot_util_____gnuplot__drawnow____.m) = 449b178aefd78c5c1b03ffd960f2e8be3874efc2 16SHA1 (patch-scripts_plot_util_____gnuplot__drawnow____.m) = 449b178aefd78c5c1b03ffd960f2e8be3874efc2

File Deleted: pkgsrc/math/octave/patches/Attic/patch-fseeko-fpos_t.c

File Deleted: pkgsrc/math/octave/patches/Attic/patch-liboctave_wrappers_iconv-wrappers.c

File Added: pkgsrc/math/octave/patches/patch-libgnu_fseeko.c
$NetBSD: patch-libgnu_fseeko.c,v 1.1 2021/12/15 17:20:57 adam Exp $

--- libgnu/fseeko.c.orig	2015-05-23 14:36:16.000000000 +0000
+++ libgnu/fseeko.c
@@ -22,6 +22,9 @@
 /* Get off_t, lseek, _POSIX_VERSION.  */
 #include <unistd.h>
 
+/* mem* */
+#include <string.h>
+
 #include "stdio-impl.h"
 
 int
@@ -132,19 +135,12 @@ fseeko (FILE *fp, off_t offset, int when
       /* fp_->_offset is typed as an integer.  */
       fp_->_offset = pos;
 # else
-      /* fp_->_offset is an fpos_t.  */
-      {
-        /* Use a union, since on NetBSD, the compilation flags
-           determine whether fpos_t is typedef'd to off_t or a struct
-           containing a single off_t member.  */
-        union
-          {
-            fpos_t f;
-            off_t o;
-          } u;
-        u.o = pos;
-        fp_->_offset = u.f;
-      }
+      /*
+       * fp_->_offset is an fpos_t or off_t
+       * in either case the off_t part is the first member of it.
+       */
+      memset(&fp_->_offset, 0, sizeof(fp_->_offset));
+      memcpy(&fp_->_offset, &pos, sizeof(pos));
 # endif
       fp_->_flags |= __SOFF;
       fp_->_flags &= ~__SEOF;

cvs diff -r1.3 -r1.4 pkgsrc/math/octave/patches/patch-m4_acinclude.m4 (expand / switch to unified diff)

--- pkgsrc/math/octave/patches/patch-m4_acinclude.m4 2020/04/12 21:19:32 1.3
+++ pkgsrc/math/octave/patches/patch-m4_acinclude.m4 2021/12/15 17:20:57 1.4
@@ -1,47 +1,47 @@ @@ -1,47 +1,47 @@
1$NetBSD: patch-m4_acinclude.m4,v 1.3 2020/04/12 21:19:32 adam Exp $ 1$NetBSD: patch-m4_acinclude.m4,v 1.4 2021/12/15 17:20:57 adam Exp $
2 2
3we pass and assume a given MACHINE_GNU_PLATFORM, but this package did not 3we pass and assume a given MACHINE_GNU_PLATFORM, but this package did not
4use this value due to an error. 4use this value due to an error.
5the guess it had for linux (x86_64-unknown-linux-gnu), seems to trample 5the guess it had for linux (x86_64-unknown-linux-gnu), seems to trample
6over our own tools: 6over our own tools:
7https://mail-index.netbsd.org/pkgsrc-users/2014/03/26/msg019464.html 7https://mail-index.netbsd.org/pkgsrc-users/2014/03/26/msg019464.html
8 8
9Do not look for qcollectiongenerator; it is now part of qhelpgenerator. 9Do not look for qcollectiongenerator; it is now part of qhelpgenerator.
10 10
11On Darwin, do not produce a mach-o bundle. 11On Darwin, do not produce a mach-o bundle.
12 12
13--- m4/acinclude.m4.orig 2019-02-23 17:33:37.000000000 +0000 13--- m4/acinclude.m4.orig 2021-10-30 14:20:24.000000000 +0000
14+++ m4/acinclude.m4 14+++ m4/acinclude.m4
15@@ -31,7 +31,7 @@ AC_DEFUN([OCTAVE_CANONICAL_HOST], [ 15@@ -37,7 +37,7 @@ AC_DEFUN([OCTAVE_CANONICAL_HOST], [
16 host=unknown-unknown-unknown 16 host=unknown-unknown-unknown
17 AC_MSG_WARN([configuring Octave for unknown system type]) 17 AC_MSG_WARN([configuring Octave for unknown system type])
18 fi 18 fi
19- canonical_host_type=$host 19- canonical_host_type=$host
20+ canonical_host_type=$host_alias 20+ canonical_host_type=$host_alias
21 AC_SUBST(canonical_host_type) 21 AC_SUBST(canonical_host_type)
22 if test -z "$host_cpu"; then 22 if test -z "$host_cpu"; then
23 host_cpu=unknown 23 host_cpu=unknown
24@@ -2045,11 +2045,10 @@ AC_DEFUN([OCTAVE_CHECK_QT_VERSION], [AC_ 24@@ -2496,11 +2496,10 @@ AC_DEFUN([OCTAVE_CHECK_QT_VERSION], [AC_
25 OCTAVE_CHECK_QT_TOOL([uic]) 25 OCTAVE_CHECK_QT_TOOL([uic])
26 OCTAVE_CHECK_QT_TOOL([rcc]) 26 OCTAVE_CHECK_QT_TOOL([rcc])
27 OCTAVE_CHECK_QT_TOOL([lrelease]) 27 OCTAVE_CHECK_QT_TOOL([lrelease])
28- OCTAVE_CHECK_QT_TOOL([qcollectiongenerator]) 28- OCTAVE_CHECK_QT_TOOL([qcollectiongenerator])
29 OCTAVE_CHECK_QT_TOOL([qhelpgenerator]) 29 OCTAVE_CHECK_QT_TOOL([qhelpgenerator])
30  30
31 if test -n "$QT_TOOLS_MISSING"; then 31 if test -n "$QT_TOOLS_MISSING"; then
32- warn_qt_tools="one or more of the Qt utilities moc, uic, rcc, lrelease, qcollectiongenerator, and qhelpgenerator not found; disabling Qt GUI" 32- warn_qt_tools="one or more of the Qt utilities moc, uic, rcc, lrelease, qcollectiongenerator, and qhelpgenerator not found; disabling Qt GUI"
33+ warn_qt_tools="one or more of the Qt utilities moc, uic, rcc, lrelease, and qhelpgenerator not found; disabling Qt GUI" 33+ warn_qt_tools="one or more of the Qt utilities moc, uic, rcc, lrelease, and qhelpgenerator not found; disabling Qt GUI"
34 build_qt_gui=no 34 build_qt_gui=no
35 MOC_QTVER= 35 MOC_QTVER=
36 UIC_QTVER= 36 UIC_QTVER=
37@@ -2979,10 +2978,8 @@ AC_DEFUN_ONCE([OCTAVE_DEFINE_MKOCTFILE_D 37@@ -3523,10 +3522,8 @@ AC_DEFUN_ONCE([OCTAVE_DEFINE_MKOCTFILE_D
38 SH_LDFLAGS="-shared -Wl,-expect_unresolved -Wl,'*'" 38 SH_LDFLAGS="-shared -Wl,-expect_unresolved -Wl,'*'"
39 ;; 39 ;;
40 *-*-darwin*) 40 *-*-darwin*)
41- DL_LDFLAGS="-bundle -bundle_loader ${ac_top_build_prefix}libinterp/octave ${LDFLAGS}" 41- DL_LDFLAGS="-bundle -bundle_loader ${ac_top_build_prefix}src/octave${EXEEXT} ${LDFLAGS}"
42 dnl Contains variables that are defined and undefined at this point, so use 42 dnl Contains variables that are defined and undefined at this point, so use
43 dnl appropriate quoting to defer expansion of ${bindir} and ${version}. 43 dnl appropriate quoting to defer expansion of ${bindir} and ${version}.
44- MKOCTFILE_DL_LDFLAGS='-bundle -bundle_loader ${bindir}/octave-${version}'"${EXEEXT}" 44- MKOCTFILE_DL_LDFLAGS='-bundle -bundle_loader ${bindir}/octave-${version}'"${EXEEXT}"
45 SH_LDFLAGS="-dynamiclib -single_module ${LDFLAGS}" 45 SH_LDFLAGS="-dynamiclib -single_module ${LDFLAGS}"
46 case $canonical_host_type in 46 case $canonical_host_type in
47 powerpc-*) 47 powerpc-*)