diff options
Diffstat (limited to 'math')
-rw-r--r-- | math/octave/Makefile | 31 | ||||
-rw-r--r-- | math/octave/PLIST | 278 | ||||
-rw-r--r-- | math/octave/buildlink3.mk | 7 | ||||
-rw-r--r-- | math/octave/distinfo | 16 | ||||
-rw-r--r-- | math/octave/options.mk | 4 | ||||
-rw-r--r-- | math/octave/patches/patch-configure.ac | 14 | ||||
-rw-r--r-- | math/octave/patches/patch-libgnu_stdio.in.h | 10 | ||||
-rw-r--r-- | math/octave/patches/patch-liboctave_util_quit.cc | 8 |
8 files changed, 242 insertions, 126 deletions
diff --git a/math/octave/Makefile b/math/octave/Makefile index b6a433e2e10..67043ece7ed 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -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 @@ DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot 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+= --enable-shared 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_MESSAGE.fix-make= Fixing path to gmake. 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 @@ PREPEND_PATH+= ${QTDIR}/bin 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 @@ post-install: .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 @@ post-install: .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 --git a/math/octave/PLIST b/math/octave/PLIST index 47b6074bd8c..63d8e748f47 100644 --- a/math/octave/PLIST +++ b/math/octave/PLIST @@ -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.cc 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/byte-swap.h 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-int.h 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-info.h 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-ui32nda.h 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-lvalue.h 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/oct.h 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-mat.h 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-eval.h 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-sort.h 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/sysdep.h 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/xdiv.h 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-36025/bug-36025.tst 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/bug-41723.tst share/octave/${PKGVERSION}/etc/tests/fixed/bug-41723/class_bug41723.m share/octave/${PKGVERSION}/etc/tests/fixed/bug-44940/bug-44940.tst share/octave/${PKGVERSION}/etc/tests/fixed/bug-44940/class_bug44940.m +share/octave/${PKGVERSION}/etc/tests/fixed/bug-45351/bug-45351.tst +share/octave/${PKGVERSION}/etc/tests/fixed/bug-45351/bug45351.m share/octave/${PKGVERSION}/etc/tests/fixed/bug-45969.tst share/octave/${PKGVERSION}/etc/tests/fixed/bug-45972.tst share/octave/${PKGVERSION}/etc/tests/fixed/bug-46330.tst share/octave/${PKGVERSION}/etc/tests/fixed/bug-46660/bug-46660.tst share/octave/${PKGVERSION}/etc/tests/fixed/bug-46660/class_bug46660.m +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-49379/bug-49379.tst share/octave/${PKGVERSION}/etc/tests/fixed/bug-49379/class_bug49379.m share/octave/${PKGVERSION}/etc/tests/fixed/bug-49904.tst @@ -908,6 +897,7 @@ share/octave/${PKGVERSION}/etc/tests/fixed/bug-50035/@bug50035/display.m share/octave/${PKGVERSION}/etc/tests/fixed/bug-50035/bug-50035.tst share/octave/${PKGVERSION}/etc/tests/fixed/bug-50716/bug-50716.tst share/octave/${PKGVERSION}/etc/tests/fixed/bug-50716/myclass.m +share/octave/${PKGVERSION}/etc/tests/fixed/bug-50831/bug-50831.tst share/octave/${PKGVERSION}/etc/tests/fixed/bug-51192/bug-51192.tst share/octave/${PKGVERSION}/etc/tests/fixed/bug-51192/class_bug51192.m share/octave/${PKGVERSION}/etc/tests/fixed/bug-51532/+package_bug51532/foo.m @@ -922,6 +912,11 @@ share/octave/${PKGVERSION}/etc/tests/fixed/bug-52075/class_bug52075.m share/octave/${PKGVERSION}/etc/tests/fixed/bug-52722/bug-52722.tst share/octave/${PKGVERSION}/etc/tests/fixed/bug-52722/define_globals.m share/octave/${PKGVERSION}/etc/tests/fixed/bug-52722/include_globals.m +share/octave/${PKGVERSION}/etc/tests/fixed/bug-52851/bug-52851.tst +share/octave/${PKGVERSION}/etc/tests/fixed/bug-52851/script1.m +share/octave/${PKGVERSION}/etc/tests/fixed/bug-52851/script2.m +share/octave/${PKGVERSION}/etc/tests/fixed/bug-52851/script3.m +share/octave/${PKGVERSION}/etc/tests/fixed/bug-52851/script4.m share/octave/${PKGVERSION}/etc/tests/fixed/bug-53027/bug-53027.tst share/octave/${PKGVERSION}/etc/tests/fixed/bug-53027/globals53027.m share/octave/${PKGVERSION}/etc/tests/fixed/bug-53027/gtest53027.m @@ -934,6 +929,10 @@ share/octave/${PKGVERSION}/etc/tests/fixed/bug-53468/ofig421.ofig share/octave/${PKGVERSION}/etc/tests/fixed/bug-53468/ofig51.ofig share/octave/${PKGVERSION}/etc/tests/fixed/bug-53579.tst share/octave/${PKGVERSION}/etc/tests/fixed/bug-53599.tst +share/octave/${PKGVERSION}/etc/tests/fixed/bug-53956/bug-53956.tst +share/octave/${PKGVERSION}/etc/tests/fixed/bug-53956/bug53956_class_2.m +share/octave/${PKGVERSION}/etc/tests/fixed/bug-53956/bug53956_class_3.m +share/octave/${PKGVERSION}/etc/tests/fixed/bug-53956/bug53956_class_4.m share/octave/${PKGVERSION}/etc/tests/fixed/bug-54490.tst share/octave/${PKGVERSION}/etc/tests/fixed/bug-54995/@testclass54995/subsref.m share/octave/${PKGVERSION}/etc/tests/fixed/bug-54995/@testclass54995/testclass54995.m @@ -941,6 +940,28 @@ share/octave/${PKGVERSION}/etc/tests/fixed/bug-54995/bug-54995.tst share/octave/${PKGVERSION}/etc/tests/fixed/bug-55308.tst share/octave/${PKGVERSION}/etc/tests/fixed/bug-55321.tst share/octave/${PKGVERSION}/etc/tests/fixed/bug-55322.tst +share/octave/${PKGVERSION}/etc/tests/fixed/bug-55758/bug-55758.tst +share/octave/${PKGVERSION}/etc/tests/fixed/bug-55758/class_bug_55758.m +share/octave/${PKGVERSION}/etc/tests/fixed/bug-58572/bug-58572.tst +share/octave/${PKGVERSION}/etc/tests/fixed/bug-58572/bug58572.m +share/octave/${PKGVERSION}/etc/tests/fixed/bug-58593/bug-58593.tst +share/octave/${PKGVERSION}/etc/tests/fixed/bug-58593/myclass1.m +share/octave/${PKGVERSION}/etc/tests/fixed/bug-58593/myclass2.m +share/octave/${PKGVERSION}/etc/tests/fixed/bug-59451/bug-59451.tst +share/octave/${PKGVERSION}/etc/tests/fixed/bug-59451/bug59451.m +share/octave/${PKGVERSION}/etc/tests/fixed/bug-59451/foo/@double/bug59451.m +share/octave/${PKGVERSION}/etc/tests/fixed/bug-59451/foo/@single/bug59451.m +share/octave/${PKGVERSION}/etc/tests/fixed/bug-59617/@bug59617/bug59617.m +share/octave/${PKGVERSION}/etc/tests/fixed/bug-59617/@bug59617/max.m +share/octave/${PKGVERSION}/etc/tests/fixed/bug-59617/bug-59617.tst +share/octave/${PKGVERSION}/etc/tests/fixed/bug-59661/bug-59661.tst +share/octave/${PKGVERSION}/etc/tests/fixed/bug-59661/bug59661.m +share/octave/${PKGVERSION}/etc/tests/fixed/bug-59704/bug-59704.tst +share/octave/${PKGVERSION}/etc/tests/fixed/bug-59704/bug59704_1.m +share/octave/${PKGVERSION}/etc/tests/fixed/bug-59704/bug59704_1_test.m +share/octave/${PKGVERSION}/etc/tests/fixed/bug-59704/bug59704_2.m +share/octave/${PKGVERSION}/etc/tests/fixed/bug-59937/bug-59937.tst +share/octave/${PKGVERSION}/etc/tests/fixed/bug-59937/eval_global_script.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-multiple-inheritance/base_1.m @@ -948,6 +969,9 @@ share/octave/${PKGVERSION}/etc/tests/fixed/classdef-multiple-inheritance/base_2. share/octave/${PKGVERSION}/etc/tests/fixed/classdef-multiple-inheritance/child_from_base_1.m share/octave/${PKGVERSION}/etc/tests/fixed/classdef-multiple-inheritance/child_from_base_1_and_2.m share/octave/${PKGVERSION}/etc/tests/fixed/classdef-multiple-inheritance/classdef-multiple-inheritance.tst +share/octave/${PKGVERSION}/etc/tests/fixed/classdef/class_bug52614A.m +share/octave/${PKGVERSION}/etc/tests/fixed/classdef/class_bug52614B.m +share/octave/${PKGVERSION}/etc/tests/fixed/classdef/class_bug55766.m share/octave/${PKGVERSION}/etc/tests/fixed/classdef/classdef.tst share/octave/${PKGVERSION}/etc/tests/fixed/classdef/foo_method_changes_property_size.m share/octave/${PKGVERSION}/etc/tests/fixed/classdef/foo_static_method_constant_property.m @@ -1072,19 +1096,40 @@ share/octave/${PKGVERSION}/etc/tests/fixed/deprecate-props.tst share/octave/${PKGVERSION}/etc/tests/fixed/diag-perm.tst share/octave/${PKGVERSION}/etc/tests/fixed/error.tst share/octave/${PKGVERSION}/etc/tests/fixed/eval-catch.tst -share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle-derived-resolution/@fhdr_derived/fhdr_derived.m -share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle-derived-resolution/@fhdr_other/fhdr_other.m -share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle-derived-resolution/@fhdr_other/getsize_arrayfun.m -share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle-derived-resolution/@fhdr_other/getsize_cellfun.m -share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle-derived-resolution/@fhdr_other/getsize_loop.m -share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle-derived-resolution/@fhdr_parent/fhdr_parent.m -share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle-derived-resolution/@fhdr_parent/numel.m -share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle-derived-resolution/fcn-handle-derived-resolution.tst +share/octave/${PKGVERSION}/etc/tests/fixed/eval-command.tst +share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/+pkga/+pkgb/bug51709_a.m +share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/+pkga/+pkgb/bug51709_b.m +share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/+pkga/+pkgb/f1.m +share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/+pkga/+pkgb/f2.m +share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/@fhdr_derived/fhdr_derived.m +share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/@fhdr_other/fhdr_other.m +share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/@fhdr_other/getsize_arrayfun.m +share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/@fhdr_other/getsize_cellfun.m +share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/@fhdr_other/getsize_loop.m +share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/@fhdr_parent/fhdr_parent.m +share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/@fhdr_parent/numel.m +share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/bug-51567.tst +share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/bug-57941.tst +share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/bug51567.m +share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/bug51709_a.m +share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/bug51709_c.m +share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/bug57941a.m +share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/bug57941b.m +share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/bug58519.tst +share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/derived-resolution.tst +share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/f1.m +share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/keyword.tst +share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/object-method.tst +share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/package-function.tst +share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/shared-ctx.tst +share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/shared_ctx.m +share/octave/${PKGVERSION}/etc/tests/fixed/fcn-handle/static-method.tst share/octave/${PKGVERSION}/etc/tests/fixed/for.tst share/octave/${PKGVERSION}/etc/tests/fixed/func.tst share/octave/${PKGVERSION}/etc/tests/fixed/global.tst share/octave/${PKGVERSION}/etc/tests/fixed/if.tst share/octave/${PKGVERSION}/etc/tests/fixed/index.tst +share/octave/${PKGVERSION}/etc/tests/fixed/inline-fcn.tst share/octave/${PKGVERSION}/etc/tests/fixed/integer.tst share/octave/${PKGVERSION}/etc/tests/fixed/io.tst share/octave/${PKGVERSION}/etc/tests/fixed/jit.tst @@ -1095,9 +1140,14 @@ share/octave/${PKGVERSION}/etc/tests/fixed/local-functions/local_functions.tst share/octave/${PKGVERSION}/etc/tests/fixed/logical-index.tst share/octave/${PKGVERSION}/etc/tests/fixed/nest/arg_nest.m share/octave/${PKGVERSION}/etc/tests/fixed/nest/arg_ret.m +share/octave/${PKGVERSION}/etc/tests/fixed/nest/bug_59989.m +share/octave/${PKGVERSION}/etc/tests/fixed/nest/counter.m share/octave/${PKGVERSION}/etc/tests/fixed/nest/nest.tst share/octave/${PKGVERSION}/etc/tests/fixed/nest/nest_eval.m share/octave/${PKGVERSION}/etc/tests/fixed/nest/no_closure.m +share/octave/${PKGVERSION}/etc/tests/fixed/nest/nst1.m +share/octave/${PKGVERSION}/etc/tests/fixed/nest/nst2.m +share/octave/${PKGVERSION}/etc/tests/fixed/nest/nst3.m share/octave/${PKGVERSION}/etc/tests/fixed/nest/persistent_nest.m share/octave/${PKGVERSION}/etc/tests/fixed/nest/recursive_nest.m share/octave/${PKGVERSION}/etc/tests/fixed/nest/recursive_nest2.m @@ -1107,7 +1157,9 @@ share/octave/${PKGVERSION}/etc/tests/fixed/nest/scope1.m share/octave/${PKGVERSION}/etc/tests/fixed/nest/scope2.m share/octave/${PKGVERSION}/etc/tests/fixed/nest/scope3.m share/octave/${PKGVERSION}/etc/tests/fixed/nest/script_nest.m +share/octave/${PKGVERSION}/etc/tests/fixed/nest/script_nest_2.m share/octave/${PKGVERSION}/etc/tests/fixed/nest/script_nest_script.m +share/octave/${PKGVERSION}/etc/tests/fixed/nest/script_nest_script_2.m share/octave/${PKGVERSION}/etc/tests/fixed/nest/varg_nest.m share/octave/${PKGVERSION}/etc/tests/fixed/nest/varg_nest2.m share/octave/${PKGVERSION}/etc/tests/fixed/null-assign.tst @@ -1124,6 +1176,12 @@ share/octave/${PKGVERSION}/etc/tests/fixed/pkg/mfile_minimal_test/DESCRIPTION share/octave/${PKGVERSION}/etc/tests/fixed/pkg/mfile_minimal_test/inst/example_mfile.m share/octave/${PKGVERSION}/etc/tests/fixed/pkg/pkg.tst share/octave/${PKGVERSION}/etc/tests/fixed/prefer.tst +share/octave/${PKGVERSION}/etc/tests/fixed/private-functions/fcn.m +share/octave/${PKGVERSION}/etc/tests/fixed/private-functions/private-functions.tst +share/octave/${PKGVERSION}/etc/tests/fixed/private-functions/private/ascript.m +share/octave/${PKGVERSION}/etc/tests/fixed/private-functions/private/bscript.m +share/octave/${PKGVERSION}/etc/tests/fixed/private-functions/private/pfcn1.m +share/octave/${PKGVERSION}/etc/tests/fixed/private-functions/private/pfcn2.m share/octave/${PKGVERSION}/etc/tests/fixed/publish/publish.tst share/octave/${PKGVERSION}/etc/tests/fixed/publish/test_script.m share/octave/${PKGVERSION}/etc/tests/fixed/publish/test_script_code_only.m @@ -1147,17 +1205,21 @@ share/octave/${PKGVERSION}/etc/tests/fixed/while.tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/Cell.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/__contourc__.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/__dsearchn__.cc-tst +share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/__eigs__.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/__ichol__.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/__ilu__.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/__lin_interpn__.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/__magick_read__.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/__pchip_deriv__.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/__qp__.cc-tst +share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/amd.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/besselj.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/bitfcns.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/bsxfun.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/call-stack.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/cellfun.cc-tst +share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/chol.cc-tst +share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/colamd.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/colloc.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/conv2.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/dassl.cc-tst @@ -1167,12 +1229,15 @@ share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/defaults.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/det.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/dirfns.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/dlmread.cc-tst +share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/dmperm.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/dot.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/eig.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/ellipj.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/environment.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/error.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/errwarn.cc-tst +share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/event-manager.cc-tst +share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/fcn-info.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/fft.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/fft2.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/file-io.cc-tst @@ -1198,12 +1263,13 @@ share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/matrix_type.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/max.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/mgorth.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/nproc.cc-tst +share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/oct-hist.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/oct-map.cc-tst -share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/octave-link.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/ordschur.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/pinv.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/pr-output.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/psi.cc-tst +share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/qr.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/quad.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/quadcc.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/qz.cc-tst @@ -1221,6 +1287,7 @@ share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/strfns.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/sub2ind.cc-tst 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/symtab.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/syscalls.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/sysdep.cc-tst @@ -1232,30 +1299,24 @@ share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/typecast.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/utils.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/variables.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/__delaunayn__.cc-tst -share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/__eigs__.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/__fltk_uigetfile__.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/__glpk__.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/__init_fltk__.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/__init_gnuplot__.cc-tst +share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/__ode15__.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/__voronoi__.cc-tst -share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/amd.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/audiodevinfo.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/audioread.cc-tst -share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/chol.cc-tst -share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/colamd.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/convhulln.cc-tst -share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/dmperm.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/fftw.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/gzip.cc-tst -share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/qr.cc-tst -share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/symbfact.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/octave-value/ov-base.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/octave-value/ov-bool-mat.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/octave-value/ov-cell.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/octave-value/ov-class.cc-tst +share/octave/${PKGVERSION}/etc/tests/libinterp/octave-value/ov-classdef.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/octave-value/ov-cx-diag.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/octave-value/ov-fcn-handle.cc-tst -share/octave/${PKGVERSION}/etc/tests/libinterp/octave-value/ov-fcn-inline.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/octave-value/ov-java.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/octave-value/ov-lazy-idx.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/octave-value/ov-null-mat.cc-tst @@ -1359,15 +1420,8 @@ share/octave/${PKGVERSION}/m/audio/mu2lin.m share/octave/${PKGVERSION}/m/audio/record.m share/octave/${PKGVERSION}/m/audio/sound.m share/octave/${PKGVERSION}/m/audio/soundsc.m -share/octave/${PKGVERSION}/m/deprecated/chop.m -share/octave/${PKGVERSION}/m/deprecated/comma.m -share/octave/${PKGVERSION}/m/deprecated/desktop.m -share/octave/${PKGVERSION}/m/deprecated/java2mat.m share/octave/${PKGVERSION}/m/deprecated/output_max_field_width.m -share/octave/${PKGVERSION}/m/deprecated/paren.m -share/octave/${PKGVERSION}/m/deprecated/semicolon.m -share/octave/${PKGVERSION}/m/deprecated/tmpnam.m -share/octave/${PKGVERSION}/m/deprecated/toascii.m +share/octave/${PKGVERSION}/m/deprecated/runtests.m share/octave/${PKGVERSION}/m/elfun/acosd.m share/octave/${PKGVERSION}/m/elfun/acot.m share/octave/${PKGVERSION}/m/elfun/acotd.m @@ -1447,6 +1501,7 @@ share/octave/${PKGVERSION}/m/general/randi.m share/octave/${PKGVERSION}/m/general/rat.m share/octave/${PKGVERSION}/m/general/repelem.m share/octave/${PKGVERSION}/m/general/repmat.m +share/octave/${PKGVERSION}/m/general/rescale.m share/octave/${PKGVERSION}/m/general/rot90.m share/octave/${PKGVERSION}/m/general/rotdim.m share/octave/${PKGVERSION}/m/general/shift.m @@ -1468,6 +1523,9 @@ share/octave/${PKGVERSION}/m/geometry/griddata3.m share/octave/${PKGVERSION}/m/geometry/griddatan.m share/octave/${PKGVERSION}/m/geometry/inpolygon.m share/octave/${PKGVERSION}/m/geometry/rectint.m +share/octave/${PKGVERSION}/m/geometry/rotx.m +share/octave/${PKGVERSION}/m/geometry/roty.m +share/octave/${PKGVERSION}/m/geometry/rotz.m share/octave/${PKGVERSION}/m/geometry/tsearchn.m share/octave/${PKGVERSION}/m/geometry/voronoi.m share/octave/${PKGVERSION}/m/geometry/voronoin.m @@ -1486,6 +1544,7 @@ share/octave/${PKGVERSION}/m/gui/private/__file_filter__.m share/octave/${PKGVERSION}/m/gui/private/__fltk_file_filter__.m share/octave/${PKGVERSION}/m/gui/private/__get_funcname__.m share/octave/${PKGVERSION}/m/gui/private/__is_function__.m +share/octave/${PKGVERSION}/m/gui/private/__ok_cancel_dlg__.m share/octave/${PKGVERSION}/m/gui/private/__uigetdir_fltk__.m share/octave/${PKGVERSION}/m/gui/private/__uigetfile_fltk__.m share/octave/${PKGVERSION}/m/gui/private/__uiobject_split_args__.m @@ -1503,6 +1562,7 @@ share/octave/${PKGVERSION}/m/gui/uipanel.m share/octave/${PKGVERSION}/m/gui/uipushtool.m share/octave/${PKGVERSION}/m/gui/uiputfile.m share/octave/${PKGVERSION}/m/gui/uiresume.m +share/octave/${PKGVERSION}/m/gui/uisetfont.m share/octave/${PKGVERSION}/m/gui/uitable.m share/octave/${PKGVERSION}/m/gui/uitoggletool.m share/octave/${PKGVERSION}/m/gui/uitoolbar.m @@ -1601,6 +1661,14 @@ share/octave/${PKGVERSION}/m/java/javaclasspath.m share/octave/${PKGVERSION}/m/java/javamem.m share/octave/${PKGVERSION}/m/java/javarmpath.m share/octave/${PKGVERSION}/m/java/usejava.m +share/octave/${PKGVERSION}/m/legacy/@inline/argnames.m +share/octave/${PKGVERSION}/m/legacy/@inline/char.m +share/octave/${PKGVERSION}/m/legacy/@inline/feval.m +share/octave/${PKGVERSION}/m/legacy/@inline/formula.m +share/octave/${PKGVERSION}/m/legacy/@inline/inline.m +share/octave/${PKGVERSION}/m/legacy/@inline/subsref.m +share/octave/${PKGVERSION}/m/legacy/@inline/vectorize.m +share/octave/${PKGVERSION}/m/legacy/__vectorize__.m share/octave/${PKGVERSION}/m/legacy/findstr.m share/octave/${PKGVERSION}/m/legacy/flipdim.m share/octave/${PKGVERSION}/m/legacy/genvarname.m @@ -1611,6 +1679,7 @@ share/octave/${PKGVERSION}/m/legacy/setstr.m share/octave/${PKGVERSION}/m/legacy/strmatch.m share/octave/${PKGVERSION}/m/legacy/strread.m share/octave/${PKGVERSION}/m/legacy/textread.m +share/octave/${PKGVERSION}/m/legacy/vectorize.m share/octave/${PKGVERSION}/m/linear-algebra/bandwidth.m share/octave/${PKGVERSION}/m/linear-algebra/commutation_matrix.m share/octave/${PKGVERSION}/m/linear-algebra/cond.m @@ -1658,7 +1727,6 @@ share/octave/${PKGVERSION}/m/miscellaneous/delete.m share/octave/${PKGVERSION}/m/miscellaneous/dir.m share/octave/${PKGVERSION}/m/miscellaneous/dos.m share/octave/${PKGVERSION}/m/miscellaneous/edit.m -share/octave/${PKGVERSION}/m/miscellaneous/fact.m share/octave/${PKGVERSION}/m/miscellaneous/fieldnames.m share/octave/${PKGVERSION}/m/miscellaneous/fileattrib.m share/octave/${PKGVERSION}/m/miscellaneous/fileparts.m @@ -1673,6 +1741,7 @@ share/octave/${PKGVERSION}/m/miscellaneous/isdeployed.m share/octave/${PKGVERSION}/m/miscellaneous/isfile.m share/octave/${PKGVERSION}/m/miscellaneous/isfolder.m share/octave/${PKGVERSION}/m/miscellaneous/ismac.m +share/octave/${PKGVERSION}/m/miscellaneous/ismethod.m share/octave/${PKGVERSION}/m/miscellaneous/ispc.m share/octave/${PKGVERSION}/m/miscellaneous/isunix.m share/octave/${PKGVERSION}/m/miscellaneous/license.m @@ -1687,6 +1756,25 @@ share/octave/${PKGVERSION}/m/miscellaneous/mexext.m share/octave/${PKGVERSION}/m/miscellaneous/mkdir.m share/octave/${PKGVERSION}/m/miscellaneous/mkoctfile.m share/octave/${PKGVERSION}/m/miscellaneous/movefile.m +share/octave/${PKGVERSION}/m/miscellaneous/mustBeFinite.m +share/octave/${PKGVERSION}/m/miscellaneous/mustBeGreaterThan.m +share/octave/${PKGVERSION}/m/miscellaneous/mustBeGreaterThanOrEqual.m +share/octave/${PKGVERSION}/m/miscellaneous/mustBeInteger.m +share/octave/${PKGVERSION}/m/miscellaneous/mustBeLessThan.m +share/octave/${PKGVERSION}/m/miscellaneous/mustBeLessThanOrEqual.m +share/octave/${PKGVERSION}/m/miscellaneous/mustBeMember.m +share/octave/${PKGVERSION}/m/miscellaneous/mustBeNegative.m +share/octave/${PKGVERSION}/m/miscellaneous/mustBeNonNan.m +share/octave/${PKGVERSION}/m/miscellaneous/mustBeNonempty.m +share/octave/${PKGVERSION}/m/miscellaneous/mustBeNonnegative.m +share/octave/${PKGVERSION}/m/miscellaneous/mustBeNonpositive.m +share/octave/${PKGVERSION}/m/miscellaneous/mustBeNonsparse.m +share/octave/${PKGVERSION}/m/miscellaneous/mustBeNonzero.m +share/octave/${PKGVERSION}/m/miscellaneous/mustBeNumeric.m +share/octave/${PKGVERSION}/m/miscellaneous/mustBeNumericOrLogical.m +share/octave/${PKGVERSION}/m/miscellaneous/mustBePositive.m +share/octave/${PKGVERSION}/m/miscellaneous/mustBeReal.m +share/octave/${PKGVERSION}/m/miscellaneous/namedargs2cell.m share/octave/${PKGVERSION}/m/miscellaneous/namelengthmax.m share/octave/${PKGVERSION}/m/miscellaneous/nargchk.m share/octave/${PKGVERSION}/m/miscellaneous/narginchk.m @@ -1702,6 +1790,7 @@ share/octave/${PKGVERSION}/m/miscellaneous/private/__publish_html_output__.m share/octave/${PKGVERSION}/m/miscellaneous/private/__publish_latex_output__.m share/octave/${PKGVERSION}/m/miscellaneous/private/__w2mpth__.m share/octave/${PKGVERSION}/m/miscellaneous/private/display_info_file.m +share/octave/${PKGVERSION}/m/miscellaneous/private/tar_is_bsd.m share/octave/${PKGVERSION}/m/miscellaneous/publish.m share/octave/${PKGVERSION}/m/miscellaneous/python.m share/octave/${PKGVERSION}/m/miscellaneous/recycle.m @@ -1719,6 +1808,7 @@ share/octave/${PKGVERSION}/m/miscellaneous/untar.m share/octave/${PKGVERSION}/m/miscellaneous/unzip.m share/octave/${PKGVERSION}/m/miscellaneous/validateattributes.m share/octave/${PKGVERSION}/m/miscellaneous/ver.m +share/octave/${PKGVERSION}/m/miscellaneous/verLessThan.m share/octave/${PKGVERSION}/m/miscellaneous/version.m share/octave/${PKGVERSION}/m/miscellaneous/what.m share/octave/${PKGVERSION}/m/miscellaneous/zip.m @@ -1726,6 +1816,7 @@ share/octave/${PKGVERSION}/m/ode/decic.m share/octave/${PKGVERSION}/m/ode/ode15i.m share/octave/${PKGVERSION}/m/ode/ode15s.m share/octave/${PKGVERSION}/m/ode/ode23.m +share/octave/${PKGVERSION}/m/ode/ode23s.m share/octave/${PKGVERSION}/m/ode/ode45.m share/octave/${PKGVERSION}/m/ode/odeget.m share/octave/${PKGVERSION}/m/ode/odeplot.m @@ -1738,6 +1829,7 @@ share/octave/${PKGVERSION}/m/ode/private/ode_event_handler.m share/octave/${PKGVERSION}/m/ode/private/odedefaults.m share/octave/${PKGVERSION}/m/ode/private/odemergeopts.m share/octave/${PKGVERSION}/m/ode/private/runge_kutta_23.m +share/octave/${PKGVERSION}/m/ode/private/runge_kutta_23s.m share/octave/${PKGVERSION}/m/ode/private/runge_kutta_45_dorpri.m share/octave/${PKGVERSION}/m/ode/private/runge_kutta_interpolate.m share/octave/${PKGVERSION}/m/ode/private/starting_stepsize.m @@ -1768,9 +1860,11 @@ share/octave/${PKGVERSION}/m/pkg/private/configure_make.m share/octave/${PKGVERSION}/m/pkg/private/default_prefix.m share/octave/${PKGVERSION}/m/pkg/private/describe.m share/octave/${PKGVERSION}/m/pkg/private/dirempty.m +share/octave/${PKGVERSION}/m/pkg/private/expand_rel_paths.m share/octave/${PKGVERSION}/m/pkg/private/get_description.m share/octave/${PKGVERSION}/m/pkg/private/get_forge_download.m share/octave/${PKGVERSION}/m/pkg/private/get_forge_pkg.m +share/octave/${PKGVERSION}/m/pkg/private/get_inverse_dependencies.m share/octave/${PKGVERSION}/m/pkg/private/get_unsatisfied_deps.m share/octave/${PKGVERSION}/m/pkg/private/getarch.m share/octave/${PKGVERSION}/m/pkg/private/getarchdir.m @@ -1779,8 +1873,10 @@ share/octave/${PKGVERSION}/m/pkg/private/installed_packages.m share/octave/${PKGVERSION}/m/pkg/private/list_forge_packages.m share/octave/${PKGVERSION}/m/pkg/private/load_packages.m share/octave/${PKGVERSION}/m/pkg/private/load_packages_and_dependencies.m +share/octave/${PKGVERSION}/m/pkg/private/make_rel_paths.m share/octave/${PKGVERSION}/m/pkg/private/rebuild.m share/octave/${PKGVERSION}/m/pkg/private/save_order.m +share/octave/${PKGVERSION}/m/pkg/private/standardize_paths.m share/octave/${PKGVERSION}/m/pkg/private/uninstall.m share/octave/${PKGVERSION}/m/pkg/private/unload_packages.m share/octave/${PKGVERSION}/m/plot/appearance/__clabel__.m @@ -1812,6 +1908,7 @@ share/octave/${PKGVERSION}/m/plot/appearance/orient.m share/octave/${PKGVERSION}/m/plot/appearance/pbaspect.m share/octave/${PKGVERSION}/m/plot/appearance/private/__axis_label__.m share/octave/${PKGVERSION}/m/plot/appearance/private/__axis_limits__.m +share/octave/${PKGVERSION}/m/plot/appearance/private/__gnuplot_legend__.m share/octave/${PKGVERSION}/m/plot/appearance/rticks.m share/octave/${PKGVERSION}/m/plot/appearance/shading.m share/octave/${PKGVERSION}/m/plot/appearance/specular.m @@ -1865,12 +1962,14 @@ share/octave/${PKGVERSION}/m/plot/draw/isocolors.m share/octave/${PKGVERSION}/m/plot/draw/isonormals.m share/octave/${PKGVERSION}/m/plot/draw/isosurface.m share/octave/${PKGVERSION}/m/plot/draw/light.m +share/octave/${PKGVERSION}/m/plot/draw/lightangle.m share/octave/${PKGVERSION}/m/plot/draw/line.m share/octave/${PKGVERSION}/m/plot/draw/loglog.m share/octave/${PKGVERSION}/m/plot/draw/loglogerr.m share/octave/${PKGVERSION}/m/plot/draw/mesh.m share/octave/${PKGVERSION}/m/plot/draw/meshc.m share/octave/${PKGVERSION}/m/plot/draw/meshz.m +share/octave/${PKGVERSION}/m/plot/draw/ostreamtube.m share/octave/${PKGVERSION}/m/plot/draw/pareto.m share/octave/${PKGVERSION}/m/plot/draw/patch.m share/octave/${PKGVERSION}/m/plot/draw/pcolor.m @@ -1920,6 +2019,10 @@ share/octave/${PKGVERSION}/m/plot/draw/stairs.m share/octave/${PKGVERSION}/m/plot/draw/stem.m share/octave/${PKGVERSION}/m/plot/draw/stem3.m share/octave/${PKGVERSION}/m/plot/draw/stemleaf.m +share/octave/${PKGVERSION}/m/plot/draw/stream2.m +share/octave/${PKGVERSION}/m/plot/draw/stream3.m +share/octave/${PKGVERSION}/m/plot/draw/streamline.m +share/octave/${PKGVERSION}/m/plot/draw/streamtube.m share/octave/${PKGVERSION}/m/plot/draw/surf.m share/octave/${PKGVERSION}/m/plot/draw/surface.m share/octave/${PKGVERSION}/m/plot/draw/surfc.m @@ -1960,6 +2063,7 @@ share/octave/${PKGVERSION}/m/plot/util/ginput.m share/octave/${PKGVERSION}/m/plot/util/gnuplot_binary.m share/octave/${PKGVERSION}/m/plot/util/graphics_toolkit.m share/octave/${PKGVERSION}/m/plot/util/groot.m +share/octave/${PKGVERSION}/m/plot/util/gui_mainfcn.m share/octave/${PKGVERSION}/m/plot/util/hdl2struct.m share/octave/${PKGVERSION}/m/plot/util/hggroup.m share/octave/${PKGVERSION}/m/plot/util/hgload.m @@ -2160,7 +2264,6 @@ share/octave/${PKGVERSION}/m/special-matrix/rosser.m share/octave/${PKGVERSION}/m/special-matrix/toeplitz.m share/octave/${PKGVERSION}/m/special-matrix/vander.m share/octave/${PKGVERSION}/m/special-matrix/wilkinson.m -share/octave/${PKGVERSION}/m/startup/__finish__.m share/octave/${PKGVERSION}/m/startup/inputrc share/octave/${PKGVERSION}/m/startup/octaverc share/octave/${PKGVERSION}/m/statistics/bounds.m @@ -2239,6 +2342,7 @@ share/octave/${PKGVERSION}/m/strings/substr.m share/octave/${PKGVERSION}/m/strings/unicode2native.m share/octave/${PKGVERSION}/m/strings/untabify.m share/octave/${PKGVERSION}/m/strings/validatestring.m +share/octave/${PKGVERSION}/m/testfun/__debug_octave__.m share/octave/${PKGVERSION}/m/testfun/__have_feature__.m share/octave/${PKGVERSION}/m/testfun/__printf_assert__.m share/octave/${PKGVERSION}/m/testfun/__prog_output_assert__.m @@ -2247,12 +2351,12 @@ share/octave/${PKGVERSION}/m/testfun/assert.m share/octave/${PKGVERSION}/m/testfun/demo.m share/octave/${PKGVERSION}/m/testfun/example.m share/octave/${PKGVERSION}/m/testfun/fail.m +share/octave/${PKGVERSION}/m/testfun/oruntests.m share/octave/${PKGVERSION}/m/testfun/private/compare_plot_demos.m share/octave/${PKGVERSION}/m/testfun/private/dump_demos.m share/octave/${PKGVERSION}/m/testfun/private/html_compare_plot_demos.m share/octave/${PKGVERSION}/m/testfun/private/html_plot_demos_template.html share/octave/${PKGVERSION}/m/testfun/rundemos.m -share/octave/${PKGVERSION}/m/testfun/runtests.m share/octave/${PKGVERSION}/m/testfun/speed.m share/octave/${PKGVERSION}/m/testfun/test.m share/octave/${PKGVERSION}/m/time/addtodate.m @@ -2269,6 +2373,16 @@ share/octave/${PKGVERSION}/m/time/etime.m share/octave/${PKGVERSION}/m/time/is_leap_year.m share/octave/${PKGVERSION}/m/time/now.m share/octave/${PKGVERSION}/m/time/weekday.m -@pkgdir share/octave/${PKGVERSION}/site/m -@pkgdir share/octave/site/api-v53/m +share/octave/${PKGVERSION}/m/web/web.m +share/octave/${PKGVERSION}/m/web/weboptions.m +share/octave/${PKGVERSION}/m/web/webread.m +share/octave/${PKGVERSION}/m/web/webwrite.m share/octave/site/m/startup/octaverc +@pkgdir share/octave/site/api-v55/m +@pkgdir share/octave/${PKGVERSION}/site/m +@pkgdir lib/octave/site/oct/${MACHINE_GNU_PLATFORM}-gnu +@pkgdir lib/octave/site/oct/api-v55/${MACHINE_GNU_PLATFORM}-gnu +@pkgdir lib/octave/${PKGVERSION}/site/oct/${MACHINE_GNU_PLATFORM}-gnu +@pkgdir libexec/octave/site/exec/${MACHINE_GNU_PLATFORM}-gnu +@pkgdir libexec/octave/api-v55/site/exec/${MACHINE_GNU_PLATFORM}-gnu +@pkgdir libexec/octave/${PKGVERSION}/site/exec/${MACHINE_GNU_PLATFORM}-gnu diff --git a/math/octave/buildlink3.mk b/math/octave/buildlink3.mk index b7408eda11e..9144884c83a 100644 --- a/math/octave/buildlink3.mk +++ b/math/octave/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.22 2020/10/12 21:51:58 bacon Exp $ +# $NetBSD: buildlink3.mk,v 1.23 2021/05/31 07:16:51 thor Exp $ BUILDLINK_TREE+= octave @@ -18,12 +18,17 @@ pkgbase := octave . include "../../devel/hdf5/buildlink3.mk" .endif +.if ${PKG_BUILD_OPTIONS.octave:Mqhull} +. include "../../math/qhull/buildlink3.mk" +.endif + .include "../../audio/libsndfile/buildlink3.mk" .include "../../devel/readline/buildlink3.mk" .include "../../devel/ncurses/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../mk/blas.buildlink3.mk" .include "../../math/fftw/buildlink3.mk" +.include "../../math/qrupdate/buildlink3.mk" .endif # OCTAVE_BUILDLINK3_MK BUILDLINK_TREE+= -octave diff --git a/math/octave/distinfo b/math/octave/distinfo index 67905b92153..c7fba9d2af3 100644 --- a/math/octave/distinfo +++ b/math/octave/distinfo @@ -1,17 +1,17 @@ -$NetBSD: distinfo,v 1.58 2020/04/12 21:19:32 adam Exp $ +$NetBSD: distinfo,v 1.59 2021/05/31 07:16:51 thor Exp $ -SHA1 (octave-5.2.0.tar.xz) = ae719ca7043f8662f932a41bb8d9c7ea32ff9cc9 -RMD160 (octave-5.2.0.tar.xz) = 31fc99a3bb9731be5ea4ecfa5b9913b43768e429 -SHA512 (octave-5.2.0.tar.xz) = 1d88e9f7aec4306cad676ba1ccfcd2ac561aa12c3da0769d3a375deff742c4924c8f8660a949db23ad4011495907bfbb856ce05d2f95b3450d8b2a4da4ef2361 -Size (octave-5.2.0.tar.xz) = 25439716 bytes -SHA1 (patch-configure.ac) = df35493bc99f8b133865d96f079f603a33ef5cc4 +SHA1 (octave-6.2.0.tar.xz) = 0b6826ebf4174fee1f3dd87907e5cd0fa9a3d481 +RMD160 (octave-6.2.0.tar.xz) = 0dd692760091d1144f157209c5af3aa893d34ff6 +SHA512 (octave-6.2.0.tar.xz) = 7a0d9ee5fd739bd9bd5d2d57faf9e800ccc760afbb840ec5e3371d1e1564163a6190587e31b16d22ae834162917049a0e2789663294030aa84ee86430127eade +Size (octave-6.2.0.tar.xz) = 25131148 bytes +SHA1 (patch-configure.ac) = 48a2dee11b33ce80a477367479ad348056c2c1f9 SHA1 (patch-doc_interpreter_module.mk) = 66389cceddbe71fca0c8197275a839170d64ad5b SHA1 (patch-fseeko-fpos_t.c) = b38e7a38be2e0b323cd7f168f1d22d3df998691c -SHA1 (patch-libgnu_stdio.in.h) = 112a424655d46c75fb68531fe7a84d9a0e97a984 +SHA1 (patch-libgnu_stdio.in.h) = 952e8683a70615b5219d034b9232420998cef44a SHA1 (patch-libinterp_corefcn_input.cc) = 865fe4e50f2658d2d221cf8d30d778fa9a632f5f SHA1 (patch-libinterp_dldfcn_config-module.awk) = 54b64357b1ef80c5e55eb5eccf742d2267eb277d SHA1 (patch-libinterp_dldfcn_module.mk) = 2362d824497a8892078437c24757ae1e40e2e556 -SHA1 (patch-liboctave_util_quit.cc) = 47d7c20c34e7474cd302bc28aca438ee3c3b0f57 +SHA1 (patch-liboctave_util_quit.cc) = 17ace431c53de1e5b72b86bb2bf4e15bdc6d4db9 SHA1 (patch-liboctave_wrappers_iconv-wrappers.h) = 9995e784844ae2c2d7a77f975cd8b8954ab8a773 SHA1 (patch-m4_acinclude.m4) = 2c5b2fc9bfe3b9b1e1feec805338ed92ed3953e1 SHA1 (patch-scripts_miscellaneous_unpack.m) = 82c9ca170762e223c8e5a6f88a7dd9fe2a2a33d0 diff --git a/math/octave/options.mk b/math/octave/options.mk index 761deefa2c9..9e6c8d3b111 100644 --- a/math/octave/options.mk +++ b/math/octave/options.mk @@ -1,8 +1,8 @@ -# $NetBSD: options.mk,v 1.6 2013/08/01 18:44:06 riastradh Exp $ +# $NetBSD: options.mk,v 1.7 2021/05/31 07:16:51 thor Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.octave PKG_SUPPORTED_OPTIONS= glpk graphicsmagick hdf5 qhull -PKG_SUGGESTED_OPTIONS= hdf5 qhull +PKG_SUGGESTED_OPTIONS= hdf5 qhull glpk .include "../../mk/bsd.options.mk" diff --git a/math/octave/patches/patch-configure.ac b/math/octave/patches/patch-configure.ac index 423c4abce62..5390e3c4e39 100644 --- a/math/octave/patches/patch-configure.ac +++ b/math/octave/patches/patch-configure.ac @@ -1,13 +1,13 @@ -$NetBSD: patch-configure.ac,v 1.5 2018/08/12 08:33:55 maya Exp $ +$NetBSD: patch-configure.ac,v 1.6 2021/05/31 07:16:51 thor 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 2016-11-13 15:19:37.000000000 +0000 +--- configure.ac.orig 2021-02-19 17:36:34.000000000 +0000 +++ configure.ac -@@ -215,8 +215,11 @@ AC_PROG_LN_S +@@ -230,8 +230,11 @@ AC_PROG_LN_S AC_PROG_MKDIR_P AC_PROG_INSTALL @@ -20,23 +20,19 @@ Allow overriding MKOCTFILE_F77 so we can install a full path gfortran ## Programs used when running Octave. OCTAVE_PROG_GHOSTSCRIPT -@@ -933,13 +936,13 @@ if test "$cross_compiling" = yes && test - MKOCTFILE_LD_CXX=`echo "$LD_CXX" | $SED "s,$CROSS_TOOL_PREFIX,,"` +@@ -897,11 +900,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 - MKOCTFILE_AR="$AR" - MKOCTFILE_CC="$CC" - MKOCTFILE_CXX="$CXX" -- MKOCTFILE_DL_LD="$DL_LD" - MKOCTFILE_F77="$F77" -- MKOCTFILE_LD_CXX="$LD_CXX" - MKOCTFILE_RANLIB="$RANLIB" + MKOCTFILE_AR="${MKOCTFILE_AR-$AR}" + MKOCTFILE_CC="${MKOCTFILE_CC-$CC}" + MKOCTFILE_CXX="${MKOCTFILE_CXX-$CXX}" -+ MKOCTFILE_DL_LD="${MKOCTFILE_DL_LD-$DL_LD}" + MKOCTFILE_F77="${MKOCTFILE_F77-$F77}" -+ MKOCTFILE_LD_CXX="${MKOCTFILE_LD_CXX-$LD_CXX}" + MKOCTFILE_RANLIB="${MKOCTFILE_RANLIB-$RANLIB}" fi AC_MSG_NOTICE([defining CROSS_TOOL_PREFIX to be $CROSS_TOOL_PREFIX]) diff --git a/math/octave/patches/patch-libgnu_stdio.in.h b/math/octave/patches/patch-libgnu_stdio.in.h index 006b48b0af1..d3e13289f16 100644 --- a/math/octave/patches/patch-libgnu_stdio.in.h +++ b/math/octave/patches/patch-libgnu_stdio.in.h @@ -1,10 +1,10 @@ -$NetBSD: patch-libgnu_stdio.in.h,v 1.3 2016/08/06 13:03:35 prlw1 Exp $ +$NetBSD: patch-libgnu_stdio.in.h,v 1.4 2021/05/31 07:16:51 thor Exp $ Do not re-define gets() on SunOS, incompatible prototype. ---- libgnu/stdio.in.h.orig 2016-07-01 18:43:45.000000000 +0000 +--- libgnu/stdio.in.h.orig 2021-02-19 17:36:34.000000000 +0000 +++ libgnu/stdio.in.h -@@ -722,10 +722,12 @@ _GL_WARN_ON_USE (getline, "getline is un +@@ -838,10 +838,12 @@ _GL_WARN_ON_USE (getline, "getline is un /* It is very rare that the developer ever has full control of stdin, so any use of gets warrants an unconditional warning; besides, C11 removed it. */ @@ -15,5 +15,5 @@ Do not re-define gets() on SunOS, incompatible prototype. #endif +#endif - #if @GNULIB_OBSTACK_PRINTF@ || @GNULIB_OBSTACK_PRINTF_POSIX@ - struct obstack; + #if defined _WIN32 && !defined __CYGWIN__ + # undef getw diff --git a/math/octave/patches/patch-liboctave_util_quit.cc b/math/octave/patches/patch-liboctave_util_quit.cc index 812558f38c9..732b76e0930 100644 --- a/math/octave/patches/patch-liboctave_util_quit.cc +++ b/math/octave/patches/patch-liboctave_util_quit.cc @@ -1,14 +1,14 @@ -$NetBSD: patch-liboctave_util_quit.cc,v 1.2 2020/04/12 21:24:11 adam Exp $ +$NetBSD: patch-liboctave_util_quit.cc,v 1.3 2021/05/31 07:16:51 thor Exp $ Make sure exit() is defined. ---- liboctave/util/quit.cc.orig 2019-06-15 20:18:59.699714202 +0000 +--- liboctave/util/quit.cc.orig 2021-02-19 17:36:34.000000000 +0000 +++ liboctave/util/quit.cc -@@ -24,6 +24,7 @@ along with Octave; see the file COPYING. +@@ -27,6 +27,7 @@ # include "config.h" #endif +#include <cstdlib> #include <cstring> - #include <new> + #include <ostream> |