diff options
30 files changed, 258 insertions, 847 deletions
diff --git a/math/octave/Makefile b/math/octave/Makefile index d638c6eac71..acecfd68ea7 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -1,10 +1,8 @@ -# $NetBSD: Makefile,v 1.141 2016/10/07 18:26:00 adam Exp $ +# $NetBSD: Makefile,v 1.142 2016/11/19 21:53:12 maya Exp $ -DISTNAME= octave-4.0.3 -PKGREVISION= 2 +DISTNAME= octave-4.2.0 CATEGORIES= math MASTER_SITES= ${MASTER_SITE_GNU:=octave/} -EXTRACT_SUFX= .tar.xz MAINTAINER= adam@NetBSD.org HOMEPAGE= http://www.octave.org/ diff --git a/math/octave/PLIST b/math/octave/PLIST index 0602807b6b6..ee73fe3b839 100644 --- a/math/octave/PLIST +++ b/math/octave/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.28 2016/08/08 12:24:45 prlw1 Exp $ +@comment $NetBSD: PLIST,v 1.29 2016/11/19 21:53:12 maya Exp $ bin/mkoctfile bin/mkoctfile-${PKGVERSION} bin/octave @@ -17,15 +17,6 @@ include/${PKGNAME}/octave/CNDArray.h include/${PKGNAME}/octave/CRowVector.h include/${PKGNAME}/octave/CSparse.h include/${PKGNAME}/octave/Cell.h -include/${PKGNAME}/octave/CmplxAEPBAL.h -include/${PKGNAME}/octave/CmplxCHOL.h -include/${PKGNAME}/octave/CmplxGEPBAL.h -include/${PKGNAME}/octave/CmplxHESS.h -include/${PKGNAME}/octave/CmplxLU.h -include/${PKGNAME}/octave/CmplxQR.h -include/${PKGNAME}/octave/CmplxQRP.h -include/${PKGNAME}/octave/CmplxSCHUR.h -include/${PKGNAME}/octave/CmplxSVD.h include/${PKGNAME}/octave/CollocWt.h include/${PKGNAME}/octave/DAE.h include/${PKGNAME}/octave/DAEFunc.h @@ -43,13 +34,10 @@ include/${PKGNAME}/octave/DiagArray2.h include/${PKGNAME}/octave/EIG.h include/${PKGNAME}/octave/LSODE-opts.h include/${PKGNAME}/octave/LSODE.h -include/${PKGNAME}/octave/MArray-decl.h -include/${PKGNAME}/octave/MArray-defs.h include/${PKGNAME}/octave/MArray.cc include/${PKGNAME}/octave/MArray.h include/${PKGNAME}/octave/MDiagArray2.cc include/${PKGNAME}/octave/MDiagArray2.h -include/${PKGNAME}/octave/MSparse-defs.h include/${PKGNAME}/octave/MSparse.cc include/${PKGNAME}/octave/MSparse.h include/${PKGNAME}/octave/Matrix.h @@ -68,41 +56,35 @@ include/${PKGNAME}/octave/Sparse-op-defs.h include/${PKGNAME}/octave/Sparse-perm-op-defs.h include/${PKGNAME}/octave/Sparse.cc include/${PKGNAME}/octave/Sparse.h -include/${PKGNAME}/octave/SparseCmplxCHOL.h -include/${PKGNAME}/octave/SparseCmplxLU.h -include/${PKGNAME}/octave/SparseCmplxQR.h -include/${PKGNAME}/octave/SparseQR.h -include/${PKGNAME}/octave/SparsedbleCHOL.h -include/${PKGNAME}/octave/SparsedbleLU.h include/${PKGNAME}/octave/action-container.h -include/${PKGNAME}/octave/base-aepbal.h +include/${PKGNAME}/octave/aepbalance.h include/${PKGNAME}/octave/base-dae.h include/${PKGNAME}/octave/base-de.h include/${PKGNAME}/octave/base-list.h -include/${PKGNAME}/octave/base-lu.cc -include/${PKGNAME}/octave/base-lu.h include/${PKGNAME}/octave/base-min.h -include/${PKGNAME}/octave/base-qr.cc -include/${PKGNAME}/octave/base-qr.h +include/${PKGNAME}/octave/base-text-renderer.h include/${PKGNAME}/octave/boolMatrix.h include/${PKGNAME}/octave/boolNDArray.h include/${PKGNAME}/octave/boolSparse.h include/${PKGNAME}/octave/bsxfun-decl.h include/${PKGNAME}/octave/bsxfun-defs.cc include/${PKGNAME}/octave/bsxfun.h +include/${PKGNAME}/octave/build-env.h include/${PKGNAME}/octave/builtin-defun-decls.h include/${PKGNAME}/octave/builtins.h 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/cdisplay.h include/${PKGNAME}/octave/chMatrix.h include/${PKGNAME}/octave/chNDArray.h +include/${PKGNAME}/octave/child-list.h +include/${PKGNAME}/octave/chol.h include/${PKGNAME}/octave/cmd-edit.h include/${PKGNAME}/octave/cmd-hist.h include/${PKGNAME}/octave/comment-list.h include/${PKGNAME}/octave/config.h -include/${PKGNAME}/octave/cutils.h include/${PKGNAME}/octave/dColVector.h include/${PKGNAME}/octave/dDiagMatrix.h include/${PKGNAME}/octave/dMatrix.h @@ -111,15 +93,6 @@ include/${PKGNAME}/octave/dRowVector.h include/${PKGNAME}/octave/dSparse.h include/${PKGNAME}/octave/data-conv.h include/${PKGNAME}/octave/data.h -include/${PKGNAME}/octave/dbleAEPBAL.h -include/${PKGNAME}/octave/dbleCHOL.h -include/${PKGNAME}/octave/dbleGEPBAL.h -include/${PKGNAME}/octave/dbleHESS.h -include/${PKGNAME}/octave/dbleLU.h -include/${PKGNAME}/octave/dbleQR.h -include/${PKGNAME}/octave/dbleQRP.h -include/${PKGNAME}/octave/dbleSCHUR.h -include/${PKGNAME}/octave/dbleSVD.h include/${PKGNAME}/octave/debug.h include/${PKGNAME}/octave/defaults.h include/${PKGNAME}/octave/defun-dld.h @@ -130,8 +103,9 @@ 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.cc +include/${PKGNAME}/octave/eigs-base.h include/${PKGNAME}/octave/error.h +include/${PKGNAME}/octave/errwarn.h include/${PKGNAME}/octave/event-queue.h include/${PKGNAME}/octave/f77-fcn.h include/${PKGNAME}/octave/fCColVector.h @@ -139,15 +113,6 @@ include/${PKGNAME}/octave/fCDiagMatrix.h include/${PKGNAME}/octave/fCMatrix.h include/${PKGNAME}/octave/fCNDArray.h include/${PKGNAME}/octave/fCRowVector.h -include/${PKGNAME}/octave/fCmplxAEPBAL.h -include/${PKGNAME}/octave/fCmplxCHOL.h -include/${PKGNAME}/octave/fCmplxGEPBAL.h -include/${PKGNAME}/octave/fCmplxHESS.h -include/${PKGNAME}/octave/fCmplxLU.h -include/${PKGNAME}/octave/fCmplxQR.h -include/${PKGNAME}/octave/fCmplxQRP.h -include/${PKGNAME}/octave/fCmplxSCHUR.h -include/${PKGNAME}/octave/fCmplxSVD.h include/${PKGNAME}/octave/fColVector.h include/${PKGNAME}/octave/fDiagMatrix.h include/${PKGNAME}/octave/fEIG.h @@ -157,23 +122,17 @@ include/${PKGNAME}/octave/fRowVector.h include/${PKGNAME}/octave/file-io.h include/${PKGNAME}/octave/file-ops.h include/${PKGNAME}/octave/file-stat.h -include/${PKGNAME}/octave/floatAEPBAL.h -include/${PKGNAME}/octave/floatCHOL.h -include/${PKGNAME}/octave/floatGEPBAL.h -include/${PKGNAME}/octave/floatHESS.h -include/${PKGNAME}/octave/floatLU.h -include/${PKGNAME}/octave/floatQR.h -include/${PKGNAME}/octave/floatQRP.h -include/${PKGNAME}/octave/floatSCHUR.h -include/${PKGNAME}/octave/floatSVD.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-renderer.h +include/${PKGNAME}/octave/gl2ps-print.h include/${PKGNAME}/octave/glob-match.h include/${PKGNAME}/octave/graphics-props.cc include/${PKGNAME}/octave/graphics.h include/${PKGNAME}/octave/gripes.h include/${PKGNAME}/octave/help.h +include/${PKGNAME}/octave/hess.h include/${PKGNAME}/octave/hook-fcn.h include/${PKGNAME}/octave/idx-vector.h include/${PKGNAME}/octave/input.h @@ -183,19 +142,31 @@ include/${PKGNAME}/octave/int64NDArray.h include/${PKGNAME}/octave/int8NDArray.h include/${PKGNAME}/octave/intNDArray.cc include/${PKGNAME}/octave/intNDArray.h +include/${PKGNAME}/octave/interpreter.h include/${PKGNAME}/octave/jit-ir.h include/${PKGNAME}/octave/jit-typeinfo.h include/${PKGNAME}/octave/jit-util.h -include/${PKGNAME}/octave/kpse.cc include/${PKGNAME}/octave/lex.h +include/${PKGNAME}/octave/liboctave-build-info.h +include/${PKGNAME}/octave/liboctinterp-build-info.h +include/${PKGNAME}/octave/lo-amos-proto.h +include/${PKGNAME}/octave/lo-arpack-proto.h +include/${PKGNAME}/octave/lo-array-errwarn.h include/${PKGNAME}/octave/lo-array-gripes.h +include/${PKGNAME}/octave/lo-blas-proto.h include/${PKGNAME}/octave/lo-cutils.h include/${PKGNAME}/octave/lo-error.h +include/${PKGNAME}/octave/lo-fftpack-proto.h +include/${PKGNAME}/octave/lo-hash.h include/${PKGNAME}/octave/lo-ieee.h +include/${PKGNAME}/octave/lo-lapack-proto.h include/${PKGNAME}/octave/lo-macros.h include/${PKGNAME}/octave/lo-mappers.h include/${PKGNAME}/octave/lo-math.h +include/${PKGNAME}/octave/lo-qrupdate-proto.h +include/${PKGNAME}/octave/lo-ranlib-proto.h include/${PKGNAME}/octave/lo-regexp.h +include/${PKGNAME}/octave/lo-slatec-proto.h include/${PKGNAME}/octave/lo-specfun.h include/${PKGNAME}/octave/lo-sysdep.h include/${PKGNAME}/octave/lo-traits.h @@ -207,9 +178,10 @@ include/${PKGNAME}/octave/ls-hdf5.h include/${PKGNAME}/octave/ls-mat-ascii.h include/${PKGNAME}/octave/ls-mat4.h include/${PKGNAME}/octave/ls-mat5.h -include/${PKGNAME}/octave/ls-oct-ascii.h include/${PKGNAME}/octave/ls-oct-binary.h +include/${PKGNAME}/octave/ls-oct-text.h include/${PKGNAME}/octave/ls-utils.h +include/${PKGNAME}/octave/lu.h include/${PKGNAME}/octave/mach-info.h include/${PKGNAME}/octave/mex.h include/${PKGNAME}/octave/mexproto.h @@ -549,30 +521,25 @@ include/${PKGNAME}/octave/oct-alloc.h include/${PKGNAME}/octave/oct-base64.h include/${PKGNAME}/octave/oct-binmap.h include/${PKGNAME}/octave/oct-cmplx.h -include/${PKGNAME}/octave/oct-conf-post.h -include/${PKGNAME}/octave/oct-conf.h include/${PKGNAME}/octave/oct-convn.h include/${PKGNAME}/octave/oct-env.h include/${PKGNAME}/octave/oct-errno.h include/${PKGNAME}/octave/oct-fftw.h include/${PKGNAME}/octave/oct-fstrm.h include/${PKGNAME}/octave/oct-glob.h -include/${PKGNAME}/octave/oct-gperf.h include/${PKGNAME}/octave/oct-group.h include/${PKGNAME}/octave/oct-handle.h -include/${PKGNAME}/octave/oct-hdf5-id.h -include/${PKGNAME}/octave/oct-hdf5.h +include/${PKGNAME}/octave/oct-hdf5-types.h include/${PKGNAME}/octave/oct-hist.h +include/${PKGNAME}/octave/oct-inttypes-fwd.h include/${PKGNAME}/octave/oct-inttypes.h include/${PKGNAME}/octave/oct-iostrm.h include/${PKGNAME}/octave/oct-locbuf.h include/${PKGNAME}/octave/oct-lvalue.h include/${PKGNAME}/octave/oct-map.h -include/${PKGNAME}/octave/oct-md5.h include/${PKGNAME}/octave/oct-mutex.h include/${PKGNAME}/octave/oct-norm.h include/${PKGNAME}/octave/oct-obj.h -include/${PKGNAME}/octave/oct-openmp.h include/${PKGNAME}/octave/oct-passwd.h include/${PKGNAME}/octave/oct-prcstrm.h include/${PKGNAME}/octave/oct-procbuf.h @@ -583,36 +550,29 @@ include/${PKGNAME}/octave/oct-rl-hist.h include/${PKGNAME}/octave/oct-shlib.h include/${PKGNAME}/octave/oct-sort.cc include/${PKGNAME}/octave/oct-sort.h -include/${PKGNAME}/octave/oct-sparse.h include/${PKGNAME}/octave/oct-spparms.h include/${PKGNAME}/octave/oct-stdstrm.h include/${PKGNAME}/octave/oct-stream.h +include/${PKGNAME}/octave/oct-string.h include/${PKGNAME}/octave/oct-strstrm.h include/${PKGNAME}/octave/oct-syscalls.h -include/${PKGNAME}/octave/oct-tex-parser.h include/${PKGNAME}/octave/oct-time.h include/${PKGNAME}/octave/oct-uname.h 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/op-dm-template.cc -include/${PKGNAME}/octave/op-dms-template.cc -include/${PKGNAME}/octave/op-int.h -include/${PKGNAME}/octave/op-pm-template.cc include/${PKGNAME}/octave/ops.h include/${PKGNAME}/octave/options-usage.h -include/${PKGNAME}/octave/ov-base-diag.cc include/${PKGNAME}/octave/ov-base-diag.h -include/${PKGNAME}/octave/ov-base-int.cc include/${PKGNAME}/octave/ov-base-int.h -include/${PKGNAME}/octave/ov-base-mat.cc include/${PKGNAME}/octave/ov-base-mat.h -include/${PKGNAME}/octave/ov-base-scalar.cc include/${PKGNAME}/octave/ov-base-scalar.h include/${PKGNAME}/octave/ov-base-sparse.h include/${PKGNAME}/octave/ov-base.h -include/${PKGNAME}/octave/ov-bool-mat.cc include/${PKGNAME}/octave/ov-bool-mat.h include/${PKGNAME}/octave/ov-bool-sparse.h include/${PKGNAME}/octave/ov-bool.h @@ -656,7 +616,6 @@ include/${PKGNAME}/octave/ov-re-sparse.h include/${PKGNAME}/octave/ov-scalar.h include/${PKGNAME}/octave/ov-str-mat.h include/${PKGNAME}/octave/ov-struct.h -include/${PKGNAME}/octave/ov-type-conv.h include/${PKGNAME}/octave/ov-typeinfo.h include/${PKGNAME}/octave/ov-uint16.h include/${PKGNAME}/octave/ov-uint32.h @@ -664,9 +623,9 @@ include/${PKGNAME}/octave/ov-uint64.h include/${PKGNAME}/octave/ov-uint8.h include/${PKGNAME}/octave/ov-usr-fcn.h include/${PKGNAME}/octave/ov.h +include/${PKGNAME}/octave/ovl.h include/${PKGNAME}/octave/pager.h include/${PKGNAME}/octave/parse.h -include/${PKGNAME}/octave/pathlen.h include/${PKGNAME}/octave/pathsearch.h include/${PKGNAME}/octave/pr-output.h include/${PKGNAME}/octave/procstream.h @@ -703,12 +662,14 @@ include/${PKGNAME}/octave/pt-stmt.h include/${PKGNAME}/octave/pt-unop.h include/${PKGNAME}/octave/pt-walk.h include/${PKGNAME}/octave/pt.h +include/${PKGNAME}/octave/qr.h +include/${PKGNAME}/octave/qrp.h include/${PKGNAME}/octave/quit.h include/${PKGNAME}/octave/randgamma.h include/${PKGNAME}/octave/randmtzig.h include/${PKGNAME}/octave/randpoisson.h +include/${PKGNAME}/octave/schur.h include/${PKGNAME}/octave/sighandlers.h -include/${PKGNAME}/octave/siglist.h include/${PKGNAME}/octave/singleton-cleanup.h include/${PKGNAME}/octave/smx-bm-sbm.h include/${PKGNAME}/octave/smx-cm-scm.h @@ -716,6 +677,7 @@ include/${PKGNAME}/octave/smx-cm-sm.h include/${PKGNAME}/octave/smx-cs-sm.h include/${PKGNAME}/octave/smx-m-scm.h include/${PKGNAME}/octave/smx-m-sm.h +include/${PKGNAME}/octave/smx-ops.h include/${PKGNAME}/octave/smx-s-scm.h include/${PKGNAME}/octave/smx-sbm-bm.h include/${PKGNAME}/octave/smx-scm-cm.h @@ -726,25 +688,22 @@ include/${PKGNAME}/octave/smx-sm-cm.h include/${PKGNAME}/octave/smx-sm-cs.h include/${PKGNAME}/octave/smx-sm-m.h include/${PKGNAME}/octave/smx-sm-scm.h -include/${PKGNAME}/octave/sparse-base-chol.cc -include/${PKGNAME}/octave/sparse-base-chol.h -include/${PKGNAME}/octave/sparse-base-lu.cc -include/${PKGNAME}/octave/sparse-base-lu.h -include/${PKGNAME}/octave/sparse-dmsolve.cc +include/${PKGNAME}/octave/sparse-chol.h +include/${PKGNAME}/octave/sparse-dmsolve.h +include/${PKGNAME}/octave/sparse-lu.h +include/${PKGNAME}/octave/sparse-qr.h 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/statdefs.h include/${PKGNAME}/octave/str-vec.h include/${PKGNAME}/octave/sun-utils.h +include/${PKGNAME}/octave/svd.h include/${PKGNAME}/octave/symtab.h include/${PKGNAME}/octave/sysdep.h -include/${PKGNAME}/octave/sysdir.h -include/${PKGNAME}/octave/syswait.h +include/${PKGNAME}/octave/text-renderer.h include/${PKGNAME}/octave/token.h include/${PKGNAME}/octave/toplev.h -include/${PKGNAME}/octave/txt-eng-ft.h include/${PKGNAME}/octave/txt-eng.h include/${PKGNAME}/octave/uint16NDArray.h include/${PKGNAME}/octave/uint32NDArray.h @@ -775,6 +734,7 @@ include/${PKGNAME}/octave/vx-frv-fcrv.h include/${PKGNAME}/octave/vx-frv-fcs.h include/${PKGNAME}/octave/vx-fs-fccv.h include/${PKGNAME}/octave/vx-fs-fcrv.h +include/${PKGNAME}/octave/vx-ops.h include/${PKGNAME}/octave/vx-rv-crv.h include/${PKGNAME}/octave/vx-rv-cs.h include/${PKGNAME}/octave/vx-s-ccv.h @@ -786,6 +746,7 @@ include/${PKGNAME}/octave/xpow.h include/${PKGNAME}/octave/zfstream.h info/liboctave.info info/octave.info +lib/charset.alias lib/octave/${PKGVERSION}/__delaunayn__.a lib/octave/${PKGVERSION}/__eigs__.a lib/octave/${PKGVERSION}/__fltk_uigetfile__.a @@ -803,6 +764,7 @@ 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 @@ -824,6 +786,7 @@ 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 @@ -859,6 +822,12 @@ share/octave/${PKGVERSION}/etc/built-in-docstrings share/octave/${PKGVERSION}/etc/default-qt-settings share/octave/${PKGVERSION}/etc/doc-cache share/octave/${PKGVERSION}/etc/macros.texi +share/octave/${PKGVERSION}/etc/profiler/flat.html +share/octave/${PKGVERSION}/etc/profiler/flat_entry.html +share/octave/${PKGVERSION}/etc/profiler/function.html +share/octave/${PKGVERSION}/etc/profiler/hierarchical.html +share/octave/${PKGVERSION}/etc/profiler/hierarchical_entry.html +share/octave/${PKGVERSION}/etc/profiler/style.css share/octave/${PKGVERSION}/etc/tests/fixed/@cell/tbcover.m share/octave/${PKGVERSION}/etc/tests/fixed/@char/tbcover.m share/octave/${PKGVERSION}/etc/tests/fixed/@double/tbcover.m @@ -888,12 +857,16 @@ 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 share/octave/${PKGVERSION}/etc/tests/fixed/bug-38691/dir2/func2.m share/octave/${PKGVERSION}/etc/tests/fixed/bug-38691/dir2/func3.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-46330.tst 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/classdef.tst @@ -992,7 +965,9 @@ share/octave/${PKGVERSION}/etc/tests/fixed/classes/@Spork/saveobj.m share/octave/${PKGVERSION}/etc/tests/fixed/classes/@Spork/set.m share/octave/${PKGVERSION}/etc/tests/fixed/classes/classes.tst share/octave/${PKGVERSION}/etc/tests/fixed/colormaps.tst +share/octave/${PKGVERSION}/etc/tests/fixed/command.tst share/octave/${PKGVERSION}/etc/tests/fixed/complex.tst +share/octave/${PKGVERSION}/etc/tests/fixed/conv.tst share/octave/${PKGVERSION}/etc/tests/fixed/ctor-vs-method/@derived/derived.m share/octave/${PKGVERSION}/etc/tests/fixed/ctor-vs-method/@derived/parent.m share/octave/${PKGVERSION}/etc/tests/fixed/ctor-vs-method/@other/other.m @@ -1021,9 +996,32 @@ share/octave/${PKGVERSION}/etc/tests/fixed/io.tst share/octave/${PKGVERSION}/etc/tests/fixed/jit.tst share/octave/${PKGVERSION}/etc/tests/fixed/line-continue.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/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/persistent_nest.m +share/octave/${PKGVERSION}/etc/tests/fixed/nest/recursive_nest.m +share/octave/${PKGVERSION}/etc/tests/fixed/nest/recursive_nest2.m +share/octave/${PKGVERSION}/etc/tests/fixed/nest/recursive_nest3.m +share/octave/${PKGVERSION}/etc/tests/fixed/nest/scope0.m +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_script.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 share/octave/${PKGVERSION}/etc/tests/fixed/parser.tst share/octave/${PKGVERSION}/etc/tests/fixed/prefer.tst +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 +share/octave/${PKGVERSION}/etc/tests/fixed/publish/test_script_empty.m +share/octave/${PKGVERSION}/etc/tests/fixed/publish/test_script_example.m +share/octave/${PKGVERSION}/etc/tests/fixed/publish/test_script_head_only.m share/octave/${PKGVERSION}/etc/tests/fixed/range.tst share/octave/${PKGVERSION}/etc/tests/fixed/recursion.tst share/octave/${PKGVERSION}/etc/tests/fixed/return.tst @@ -1055,6 +1053,7 @@ share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/cellfun.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/conv2.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/dassl.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/data.cc-tst +share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/debug.cc-tst 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 @@ -1063,6 +1062,7 @@ 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/error.cc-tst +share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/errwarn.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 @@ -1070,26 +1070,29 @@ share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/filter.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/find.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/gammainc.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/gcd.cc-tst +share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/getrusage.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/givens.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/graphics.cc-tst +share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/hash.cc-tst +share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/help.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/hess.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/hex2num.cc-tst +share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/input.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/inv.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/kron.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/lookup.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/lsode.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/lu.cc-tst -share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/luinc.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/mappers.cc-tst 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/md5sum.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-map.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/quad.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/quadcc.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/qz.cc-tst @@ -1114,11 +1117,15 @@ share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/time.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/toplev.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/tril.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/tsearch.cc-tst +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/__osmesa_print__.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/__voronoi__.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/amd.cc-tst @@ -1127,7 +1134,9 @@ share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/chol.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 @@ -1135,22 +1144,12 @@ share/octave/${PKGVERSION}/etc/tests/libinterp/octave-value/ov-class.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-flt-re-mat.cc-tst -share/octave/${PKGVERSION}/etc/tests/libinterp/octave-value/ov-int16.cc-tst -share/octave/${PKGVERSION}/etc/tests/libinterp/octave-value/ov-int32.cc-tst -share/octave/${PKGVERSION}/etc/tests/libinterp/octave-value/ov-int64.cc-tst -share/octave/${PKGVERSION}/etc/tests/libinterp/octave-value/ov-int8.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/octave-value/ov-java.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/octave-value/ov-null-mat.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/octave-value/ov-oncleanup.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/octave-value/ov-range.cc-tst -share/octave/${PKGVERSION}/etc/tests/libinterp/octave-value/ov-re-mat.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/octave-value/ov-struct.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/octave-value/ov-typeinfo.cc-tst -share/octave/${PKGVERSION}/etc/tests/libinterp/octave-value/ov-uint16.cc-tst -share/octave/${PKGVERSION}/etc/tests/libinterp/octave-value/ov-uint32.cc-tst -share/octave/${PKGVERSION}/etc/tests/libinterp/octave-value/ov-uint64.cc-tst -share/octave/${PKGVERSION}/etc/tests/libinterp/octave-value/ov-uint8.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/octave-value/ov-usr-fcn.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/octave-value/ov.cc-tst share/octave/${PKGVERSION}/etc/tests/libinterp/octave.cc-tst @@ -1180,6 +1179,7 @@ share/octave/${PKGVERSION}/locale/be_BY.qm share/octave/${PKGVERSION}/locale/de_DE.qm share/octave/${PKGVERSION}/locale/en_US.qm share/octave/${PKGVERSION}/locale/es_ES.qm +share/octave/${PKGVERSION}/locale/eu_ES.qm share/octave/${PKGVERSION}/locale/fr_FR.qm share/octave/${PKGVERSION}/locale/it_IT.qm share/octave/${PKGVERSION}/locale/ja_JP.qm @@ -1238,42 +1238,37 @@ 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/audio/wavread.m -share/octave/${PKGVERSION}/m/audio/wavwrite.m -share/octave/${PKGVERSION}/m/deprecated/PKG_ADD share/octave/${PKGVERSION}/m/deprecated/bicubic.m -share/octave/${PKGVERSION}/m/deprecated/default_save_options.m +share/octave/${PKGVERSION}/m/deprecated/bitmax.m +share/octave/${PKGVERSION}/m/deprecated/comma.m share/octave/${PKGVERSION}/m/deprecated/delaunay3.m share/octave/${PKGVERSION}/m/deprecated/dump_prefs.m share/octave/${PKGVERSION}/m/deprecated/find_dir_in_path.m share/octave/${PKGVERSION}/m/deprecated/finite.m share/octave/${PKGVERSION}/m/deprecated/fmod.m share/octave/${PKGVERSION}/m/deprecated/fnmatch.m -share/octave/${PKGVERSION}/m/deprecated/gen_doc_cache.m share/octave/${PKGVERSION}/m/deprecated/gmap40.m -share/octave/${PKGVERSION}/m/deprecated/interp1q.m -share/octave/${PKGVERSION}/m/deprecated/isequalwithequalnans.m share/octave/${PKGVERSION}/m/deprecated/isstr.m -share/octave/${PKGVERSION}/m/deprecated/java_convert_matrix.m -share/octave/${PKGVERSION}/m/deprecated/java_debug.m -share/octave/${PKGVERSION}/m/deprecated/java_invoke.m -share/octave/${PKGVERSION}/m/deprecated/java_new.m -share/octave/${PKGVERSION}/m/deprecated/java_unsigned_conversion.m -share/octave/${PKGVERSION}/m/deprecated/javafields.m -share/octave/${PKGVERSION}/m/deprecated/javamethods.m share/octave/${PKGVERSION}/m/deprecated/loadaudio.m share/octave/${PKGVERSION}/m/deprecated/luinc.m +share/octave/${PKGVERSION}/m/deprecated/mahalanobis.m +share/octave/${PKGVERSION}/m/deprecated/md5sum.m share/octave/${PKGVERSION}/m/deprecated/mouse_wheel_zoom.m share/octave/${PKGVERSION}/m/deprecated/nfields.m +share/octave/${PKGVERSION}/m/deprecated/octave_config_info.m share/octave/${PKGVERSION}/m/deprecated/octave_tmp_file_name.m +share/octave/${PKGVERSION}/m/deprecated/onenormest.m +share/octave/${PKGVERSION}/m/deprecated/paren.m share/octave/${PKGVERSION}/m/deprecated/playaudio.m -share/octave/${PKGVERSION}/m/deprecated/re_read_readline_init_file.m -share/octave/${PKGVERSION}/m/deprecated/read_readline_init_file.m share/octave/${PKGVERSION}/m/deprecated/saveaudio.m -share/octave/${PKGVERSION}/m/deprecated/saving_history.m +share/octave/${PKGVERSION}/m/deprecated/semicolon.m share/octave/${PKGVERSION}/m/deprecated/setaudio.m +share/octave/${PKGVERSION}/m/deprecated/sleep.m share/octave/${PKGVERSION}/m/deprecated/syl.m share/octave/${PKGVERSION}/m/deprecated/usage.m +share/octave/${PKGVERSION}/m/deprecated/usleep.m +share/octave/${PKGVERSION}/m/deprecated/wavread.m +share/octave/${PKGVERSION}/m/deprecated/wavwrite.m share/octave/${PKGVERSION}/m/elfun/acosd.m share/octave/${PKGVERSION}/m/elfun/acot.m share/octave/${PKGVERSION}/m/elfun/acotd.m @@ -1318,6 +1313,7 @@ share/octave/${PKGVERSION}/m/general/cumtrapz.m share/octave/${PKGVERSION}/m/general/curl.m share/octave/${PKGVERSION}/m/general/dblquad.m share/octave/${PKGVERSION}/m/general/deal.m +share/octave/${PKGVERSION}/m/general/deg2rad.m share/octave/${PKGVERSION}/m/general/del2.m share/octave/${PKGVERSION}/m/general/display.m share/octave/${PKGVERSION}/m/general/divergence.m @@ -1326,6 +1322,7 @@ share/octave/${PKGVERSION}/m/general/flip.m share/octave/${PKGVERSION}/m/general/flipdim.m share/octave/${PKGVERSION}/m/general/fliplr.m share/octave/${PKGVERSION}/m/general/flipud.m +share/octave/${PKGVERSION}/m/general/grabcode.m share/octave/${PKGVERSION}/m/general/gradient.m share/octave/${PKGVERSION}/m/general/idivide.m share/octave/${PKGVERSION}/m/general/inputParser.m @@ -1352,13 +1349,14 @@ share/octave/${PKGVERSION}/m/general/polyarea.m share/octave/${PKGVERSION}/m/general/postpad.m share/octave/${PKGVERSION}/m/general/prepad.m share/octave/${PKGVERSION}/m/general/private/__isequal__.m +share/octave/${PKGVERSION}/m/general/private/__publish_html_output__.m +share/octave/${PKGVERSION}/m/general/private/__publish_latex_output__.m share/octave/${PKGVERSION}/m/general/private/__splinen__.m -share/octave/${PKGVERSION}/m/general/profexplore.m -share/octave/${PKGVERSION}/m/general/profile.m -share/octave/${PKGVERSION}/m/general/profshow.m +share/octave/${PKGVERSION}/m/general/publish.m share/octave/${PKGVERSION}/m/general/quadgk.m share/octave/${PKGVERSION}/m/general/quadl.m share/octave/${PKGVERSION}/m/general/quadv.m +share/octave/${PKGVERSION}/m/general/rad2deg.m share/octave/${PKGVERSION}/m/general/randi.m share/octave/${PKGVERSION}/m/general/rat.m share/octave/${PKGVERSION}/m/general/repmat.m @@ -1387,6 +1385,7 @@ share/octave/${PKGVERSION}/m/geometry/rectint.m share/octave/${PKGVERSION}/m/geometry/tsearchn.m share/octave/${PKGVERSION}/m/geometry/voronoi.m share/octave/${PKGVERSION}/m/geometry/voronoin.m +share/octave/${PKGVERSION}/m/gui/dialog.m share/octave/${PKGVERSION}/m/gui/errordlg.m share/octave/${PKGVERSION}/m/gui/guidata.m share/octave/${PKGVERSION}/m/gui/guihandles.m @@ -1402,8 +1401,8 @@ 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 share/octave/${PKGVERSION}/m/gui/private/__uiputfile_fltk__.m -share/octave/${PKGVERSION}/m/gui/private/message_dialog.m share/octave/${PKGVERSION}/m/gui/questdlg.m +share/octave/${PKGVERSION}/m/gui/uibuttongroup.m share/octave/${PKGVERSION}/m/gui/uicontextmenu.m share/octave/${PKGVERSION}/m/gui/uicontrol.m share/octave/${PKGVERSION}/m/gui/uigetdir.m @@ -1422,8 +1421,10 @@ share/octave/${PKGVERSION}/m/gui/warndlg.m share/octave/${PKGVERSION}/m/help/__gripe_missing_component__.m share/octave/${PKGVERSION}/m/help/__makeinfo__.m share/octave/${PKGVERSION}/m/help/__unimplemented__.m +share/octave/${PKGVERSION}/m/help/ans.m share/octave/${PKGVERSION}/m/help/doc.m share/octave/${PKGVERSION}/m/help/doc_cache_create.m +share/octave/${PKGVERSION}/m/help/error_ids.m share/octave/${PKGVERSION}/m/help/get_first_help_sentence.m share/octave/${PKGVERSION}/m/help/help.m share/octave/${PKGVERSION}/m/help/lookfor.m @@ -1431,8 +1432,8 @@ share/octave/${PKGVERSION}/m/help/print_usage.m share/octave/${PKGVERSION}/m/help/private/__additional_help_message__.m share/octave/${PKGVERSION}/m/help/private/__strip_html_tags__.m share/octave/${PKGVERSION}/m/help/type.m +share/octave/${PKGVERSION}/m/help/warning_ids.m share/octave/${PKGVERSION}/m/help/which.m -share/octave/${PKGVERSION}/m/image/PKG_ADD share/octave/${PKGVERSION}/m/image/autumn.m share/octave/${PKGVERSION}/m/image/bone.m share/octave/${PKGVERSION}/m/image/brighten.m @@ -1450,6 +1451,7 @@ share/octave/${PKGVERSION}/m/image/gray2ind.m share/octave/${PKGVERSION}/m/image/hot.m share/octave/${PKGVERSION}/m/image/hsv.m share/octave/${PKGVERSION}/m/image/hsv2rgb.m +share/octave/${PKGVERSION}/m/image/im2double.m share/octave/${PKGVERSION}/m/image/image.m share/octave/${PKGVERSION}/m/image/imagesc.m share/octave/${PKGVERSION}/m/image/imfinfo.m @@ -1469,6 +1471,8 @@ share/octave/${PKGVERSION}/m/image/prism.m share/octave/${PKGVERSION}/m/image/private/__imfinfo__.m share/octave/${PKGVERSION}/m/image/private/__imread__.m share/octave/${PKGVERSION}/m/image/private/__imwrite__.m +share/octave/${PKGVERSION}/m/image/private/colorspace_conversion_input_check.m +share/octave/${PKGVERSION}/m/image/private/colorspace_conversion_revert.m share/octave/${PKGVERSION}/m/image/private/imageIO.m share/octave/${PKGVERSION}/m/image/private/imwrite_filename.m share/octave/${PKGVERSION}/m/image/private/ind2x.m @@ -1480,6 +1484,7 @@ share/octave/${PKGVERSION}/m/image/rgbplot.m share/octave/${PKGVERSION}/m/image/spinmap.m share/octave/${PKGVERSION}/m/image/spring.m share/octave/${PKGVERSION}/m/image/summer.m +share/octave/${PKGVERSION}/m/image/viridis.m share/octave/${PKGVERSION}/m/image/white.m share/octave/${PKGVERSION}/m/image/winter.m share/octave/${PKGVERSION}/m/io/beep.m @@ -1491,7 +1496,6 @@ share/octave/${PKGVERSION}/m/io/importdata.m share/octave/${PKGVERSION}/m/io/is_valid_file_id.m share/octave/${PKGVERSION}/m/io/strread.m share/octave/${PKGVERSION}/m/io/textread.m -share/octave/${PKGVERSION}/m/io/textscan.m share/octave/${PKGVERSION}/m/java/javaArray.m share/octave/${PKGVERSION}/m/java/java_get.m share/octave/${PKGVERSION}/m/java/java_set.m @@ -1504,6 +1508,7 @@ share/octave/${PKGVERSION}/m/java/usejava.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 +share/octave/${PKGVERSION}/m/linear-algebra/condeig.m share/octave/${PKGVERSION}/m/linear-algebra/condest.m share/octave/${PKGVERSION}/m/linear-algebra/cross.m share/octave/${PKGVERSION}/m/linear-algebra/duplication_matrix.m @@ -1520,8 +1525,8 @@ share/octave/${PKGVERSION}/m/linear-algebra/krylov.m share/octave/${PKGVERSION}/m/linear-algebra/linsolve.m share/octave/${PKGVERSION}/m/linear-algebra/logm.m share/octave/${PKGVERSION}/m/linear-algebra/normest.m +share/octave/${PKGVERSION}/m/linear-algebra/normest1.m share/octave/${PKGVERSION}/m/linear-algebra/null.m -share/octave/${PKGVERSION}/m/linear-algebra/onenormest.m share/octave/${PKGVERSION}/m/linear-algebra/orth.m share/octave/${PKGVERSION}/m/linear-algebra/planerot.m share/octave/${PKGVERSION}/m/linear-algebra/qzhess.m @@ -1530,13 +1535,10 @@ share/octave/${PKGVERSION}/m/linear-algebra/rref.m share/octave/${PKGVERSION}/m/linear-algebra/subspace.m share/octave/${PKGVERSION}/m/linear-algebra/trace.m share/octave/${PKGVERSION}/m/linear-algebra/vech.m -share/octave/${PKGVERSION}/m/miscellaneous/ans.m share/octave/${PKGVERSION}/m/miscellaneous/bug_report.m share/octave/${PKGVERSION}/m/miscellaneous/bunzip2.m -share/octave/${PKGVERSION}/m/miscellaneous/bzip2.m share/octave/${PKGVERSION}/m/miscellaneous/cast.m share/octave/${PKGVERSION}/m/miscellaneous/citation.m -share/octave/${PKGVERSION}/m/miscellaneous/comma.m share/octave/${PKGVERSION}/m/miscellaneous/compare_versions.m share/octave/${PKGVERSION}/m/miscellaneous/computer.m share/octave/${PKGVERSION}/m/miscellaneous/copyfile.m @@ -1546,7 +1548,6 @@ share/octave/${PKGVERSION}/m/miscellaneous/desktop.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/error_ids.m share/octave/${PKGVERSION}/m/miscellaneous/fact.m share/octave/${PKGVERSION}/m/miscellaneous/fileattrib.m share/octave/${PKGVERSION}/m/miscellaneous/fileparts.m @@ -1555,7 +1556,6 @@ share/octave/${PKGVERSION}/m/miscellaneous/genvarname.m share/octave/${PKGVERSION}/m/miscellaneous/getappdata.m share/octave/${PKGVERSION}/m/miscellaneous/getfield.m share/octave/${PKGVERSION}/m/miscellaneous/gunzip.m -share/octave/${PKGVERSION}/m/miscellaneous/gzip.m share/octave/${PKGVERSION}/m/miscellaneous/info.m share/octave/${PKGVERSION}/m/miscellaneous/inputname.m share/octave/${PKGVERSION}/m/miscellaneous/isappdata.m @@ -1570,6 +1570,7 @@ share/octave/${PKGVERSION}/m/miscellaneous/ls_command.m share/octave/${PKGVERSION}/m/miscellaneous/menu.m share/octave/${PKGVERSION}/m/miscellaneous/mex.m 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/namelengthmax.m @@ -1577,17 +1578,14 @@ share/octave/${PKGVERSION}/m/miscellaneous/news.m share/octave/${PKGVERSION}/m/miscellaneous/open.m share/octave/${PKGVERSION}/m/miscellaneous/orderfields.m share/octave/${PKGVERSION}/m/miscellaneous/pack.m -share/octave/${PKGVERSION}/m/miscellaneous/paren.m share/octave/${PKGVERSION}/m/miscellaneous/parseparams.m share/octave/${PKGVERSION}/m/miscellaneous/perl.m share/octave/${PKGVERSION}/m/miscellaneous/private/__w2mpth__.m -share/octave/${PKGVERSION}/m/miscellaneous/private/__xzip__.m share/octave/${PKGVERSION}/m/miscellaneous/private/display_info_file.m share/octave/${PKGVERSION}/m/miscellaneous/python.m share/octave/${PKGVERSION}/m/miscellaneous/recycle.m share/octave/${PKGVERSION}/m/miscellaneous/rmappdata.m share/octave/${PKGVERSION}/m/miscellaneous/run.m -share/octave/${PKGVERSION}/m/miscellaneous/semicolon.m share/octave/${PKGVERSION}/m/miscellaneous/setappdata.m share/octave/${PKGVERSION}/m/miscellaneous/setfield.m share/octave/${PKGVERSION}/m/miscellaneous/substruct.m @@ -1602,10 +1600,24 @@ share/octave/${PKGVERSION}/m/miscellaneous/untar.m share/octave/${PKGVERSION}/m/miscellaneous/unzip.m share/octave/${PKGVERSION}/m/miscellaneous/ver.m share/octave/${PKGVERSION}/m/miscellaneous/version.m -share/octave/${PKGVERSION}/m/miscellaneous/warning_ids.m share/octave/${PKGVERSION}/m/miscellaneous/what.m share/octave/${PKGVERSION}/m/miscellaneous/xor.m share/octave/${PKGVERSION}/m/miscellaneous/zip.m +share/octave/${PKGVERSION}/m/ode/ode23.m +share/octave/${PKGVERSION}/m/ode/ode45.m +share/octave/${PKGVERSION}/m/ode/odeget.m +share/octave/${PKGVERSION}/m/ode/odeplot.m +share/octave/${PKGVERSION}/m/ode/odeset.m +share/octave/${PKGVERSION}/m/ode/private/AbsRel_norm.m +share/octave/${PKGVERSION}/m/ode/private/integrate_adaptive.m +share/octave/${PKGVERSION}/m/ode/private/kahan.m +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_45_dorpri.m +share/octave/${PKGVERSION}/m/ode/private/runge_kutta_interpolate.m +share/octave/${PKGVERSION}/m/ode/private/starting_stepsize.m share/octave/${PKGVERSION}/m/optimization/PKG_ADD share/octave/${PKGVERSION}/m/optimization/__all_opts__.m share/octave/${PKGVERSION}/m/optimization/fminbnd.m @@ -1628,42 +1640,24 @@ share/octave/${PKGVERSION}/m/path/savepath.m share/octave/${PKGVERSION}/m/pkg/pkg.m share/octave/${PKGVERSION}/m/pkg/private/build.m share/octave/${PKGVERSION}/m/pkg/private/configure_make.m -share/octave/${PKGVERSION}/m/pkg/private/copy_files.m -share/octave/${PKGVERSION}/m/pkg/private/create_pkgadddel.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/extract_pkg.m -share/octave/${PKGVERSION}/m/pkg/private/finish_installation.m -share/octave/${PKGVERSION}/m/pkg/private/fix_depends.m -share/octave/${PKGVERSION}/m/pkg/private/fix_version.m -share/octave/${PKGVERSION}/m/pkg/private/generate_lookfor_cache.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_unsatisfied_deps.m share/octave/${PKGVERSION}/m/pkg/private/getarch.m share/octave/${PKGVERSION}/m/pkg/private/getarchdir.m -share/octave/${PKGVERSION}/m/pkg/private/getarchprefix.m share/octave/${PKGVERSION}/m/pkg/private/install.m share/octave/${PKGVERSION}/m/pkg/private/installed_packages.m -share/octave/${PKGVERSION}/m/pkg/private/is_architecture_dependent.m share/octave/${PKGVERSION}/m/pkg/private/list_forge_packages.m -share/octave/${PKGVERSION}/m/pkg/private/load_package_dirs.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/packinfo_copy_file.m -share/octave/${PKGVERSION}/m/pkg/private/parse_pkg_idx.m -share/octave/${PKGVERSION}/m/pkg/private/prepare_installation.m -share/octave/${PKGVERSION}/m/pkg/private/print_package_description.m share/octave/${PKGVERSION}/m/pkg/private/rebuild.m -share/octave/${PKGVERSION}/m/pkg/private/repackage.m share/octave/${PKGVERSION}/m/pkg/private/save_order.m -share/octave/${PKGVERSION}/m/pkg/private/shell.m share/octave/${PKGVERSION}/m/pkg/private/uninstall.m share/octave/${PKGVERSION}/m/pkg/private/unload_packages.m -share/octave/${PKGVERSION}/m/pkg/private/verify_directory.m -share/octave/${PKGVERSION}/m/pkg/private/write_index.m share/octave/${PKGVERSION}/m/plot/appearance/__clabel__.m share/octave/${PKGVERSION}/m/plot/appearance/__getlegenddata__.m share/octave/${PKGVERSION}/m/plot/appearance/annotation.m @@ -1678,6 +1672,8 @@ share/octave/${PKGVERSION}/m/plot/appearance/grid.m share/octave/${PKGVERSION}/m/plot/appearance/gtext.m share/octave/${PKGVERSION}/m/plot/appearance/hidden.m share/octave/${PKGVERSION}/m/plot/appearance/legend.m +share/octave/${PKGVERSION}/m/plot/appearance/lighting.m +share/octave/${PKGVERSION}/m/plot/appearance/material.m 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 @@ -1697,6 +1693,7 @@ share/octave/${PKGVERSION}/m/plot/appearance/zlim.m share/octave/${PKGVERSION}/m/plot/draw/area.m share/octave/${PKGVERSION}/m/plot/draw/bar.m share/octave/${PKGVERSION}/m/plot/draw/barh.m +share/octave/${PKGVERSION}/m/plot/draw/camlight.m share/octave/${PKGVERSION}/m/plot/draw/colorbar.m share/octave/${PKGVERSION}/m/plot/draw/comet.m share/octave/${PKGVERSION}/m/plot/draw/comet3.m @@ -1721,9 +1718,11 @@ share/octave/${PKGVERSION}/m/plot/draw/feather.m share/octave/${PKGVERSION}/m/plot/draw/fill.m share/octave/${PKGVERSION}/m/plot/draw/fplot.m share/octave/${PKGVERSION}/m/plot/draw/hist.m +share/octave/${PKGVERSION}/m/plot/draw/isocaps.m 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/line.m share/octave/${PKGVERSION}/m/plot/draw/loglog.m share/octave/${PKGVERSION}/m/plot/draw/loglogerr.m @@ -1743,8 +1742,8 @@ share/octave/${PKGVERSION}/m/plot/draw/plotyy.m share/octave/${PKGVERSION}/m/plot/draw/polar.m share/octave/${PKGVERSION}/m/plot/draw/private/__add_datasource__.m share/octave/${PKGVERSION}/m/plot/draw/private/__bar__.m +share/octave/${PKGVERSION}/m/plot/draw/private/__calc_isovalue_from_data__.m share/octave/${PKGVERSION}/m/plot/draw/private/__contour__.m -share/octave/${PKGVERSION}/m/plot/draw/private/__errcomm__.m share/octave/${PKGVERSION}/m/plot/draw/private/__errplot__.m share/octave/${PKGVERSION}/m/plot/draw/private/__ezplot__.m share/octave/${PKGVERSION}/m/plot/draw/private/__interp_cube__.m @@ -1754,11 +1753,15 @@ share/octave/${PKGVERSION}/m/plot/draw/private/__patch__.m share/octave/${PKGVERSION}/m/plot/draw/private/__pie__.m share/octave/${PKGVERSION}/m/plot/draw/private/__plt__.m share/octave/${PKGVERSION}/m/plot/draw/private/__quiver__.m +share/octave/${PKGVERSION}/m/plot/draw/private/__rotate_around_axis__.m share/octave/${PKGVERSION}/m/plot/draw/private/__scatter__.m share/octave/${PKGVERSION}/m/plot/draw/private/__stem__.m +share/octave/${PKGVERSION}/m/plot/draw/private/__unite_shared_vertices__.m share/octave/${PKGVERSION}/m/plot/draw/quiver.m share/octave/${PKGVERSION}/m/plot/draw/quiver3.m share/octave/${PKGVERSION}/m/plot/draw/rectangle.m +share/octave/${PKGVERSION}/m/plot/draw/reducepatch.m +share/octave/${PKGVERSION}/m/plot/draw/reducevolume.m share/octave/${PKGVERSION}/m/plot/draw/ribbon.m share/octave/${PKGVERSION}/m/plot/draw/rose.m share/octave/${PKGVERSION}/m/plot/draw/scatter.m @@ -1769,6 +1772,7 @@ share/octave/${PKGVERSION}/m/plot/draw/semilogy.m share/octave/${PKGVERSION}/m/plot/draw/semilogyerr.m share/octave/${PKGVERSION}/m/plot/draw/shrinkfaces.m share/octave/${PKGVERSION}/m/plot/draw/slice.m +share/octave/${PKGVERSION}/m/plot/draw/smooth3.m share/octave/${PKGVERSION}/m/plot/draw/sombrero.m share/octave/${PKGVERSION}/m/plot/draw/sphere.m share/octave/${PKGVERSION}/m/plot/draw/stairs.m @@ -1790,6 +1794,7 @@ share/octave/${PKGVERSION}/m/plot/util/__default_plot_options__.m share/octave/${PKGVERSION}/m/plot/util/__gnuplot_drawnow__.m share/octave/${PKGVERSION}/m/plot/util/__next_line_color__.m share/octave/${PKGVERSION}/m/plot/util/__next_line_style__.m +share/octave/${PKGVERSION}/m/plot/util/__opengl_info__.m share/octave/${PKGVERSION}/m/plot/util/__plt_get_axis_arg__.m share/octave/${PKGVERSION}/m/plot/util/__pltopt__.m share/octave/${PKGVERSION}/m/plot/util/allchild.m @@ -1835,6 +1840,8 @@ share/octave/${PKGVERSION}/m/plot/util/print.m share/octave/${PKGVERSION}/m/plot/util/printd.m share/octave/${PKGVERSION}/m/plot/util/private/__add_default_menu__.m share/octave/${PKGVERSION}/m/plot/util/private/__ghostscript__.m +share/octave/${PKGVERSION}/m/plot/util/private/__gnuplot_draw_axes__.m +share/octave/${PKGVERSION}/m/plot/util/private/__gnuplot_draw_figure__.m share/octave/${PKGVERSION}/m/plot/util/private/__gnuplot_get_var__.m share/octave/${PKGVERSION}/m/plot/util/private/__gnuplot_ginput__.m share/octave/${PKGVERSION}/m/plot/util/private/__gnuplot_has_feature__.m @@ -1842,11 +1849,8 @@ share/octave/${PKGVERSION}/m/plot/util/private/__gnuplot_has_terminal__.m share/octave/${PKGVERSION}/m/plot/util/private/__gnuplot_open_stream__.m share/octave/${PKGVERSION}/m/plot/util/private/__gnuplot_print__.m share/octave/${PKGVERSION}/m/plot/util/private/__gnuplot_version__.m -share/octave/${PKGVERSION}/m/plot/util/private/__go_draw_axes__.m -share/octave/${PKGVERSION}/m/plot/util/private/__go_draw_figure__.m share/octave/${PKGVERSION}/m/plot/util/private/__opengl_print__.m share/octave/${PKGVERSION}/m/plot/util/private/__print_parse_opts__.m -share/octave/${PKGVERSION}/m/plot/util/private/__tight_eps_bbox__.m share/octave/${PKGVERSION}/m/plot/util/refresh.m share/octave/${PKGVERSION}/m/plot/util/refreshdata.m share/octave/${PKGVERSION}/m/plot/util/rotate.m @@ -1861,6 +1865,7 @@ share/octave/${PKGVERSION}/m/polynomial/conv.m share/octave/${PKGVERSION}/m/polynomial/deconv.m share/octave/${PKGVERSION}/m/polynomial/mkpp.m share/octave/${PKGVERSION}/m/polynomial/mpoles.m +share/octave/${PKGVERSION}/m/polynomial/padecoef.m share/octave/${PKGVERSION}/m/polynomial/pchip.m share/octave/${PKGVERSION}/m/polynomial/poly.m share/octave/${PKGVERSION}/m/polynomial/polyaffine.m @@ -1893,6 +1898,10 @@ share/octave/${PKGVERSION}/m/prefs/private/prefsfile.m share/octave/${PKGVERSION}/m/prefs/private/saveprefs.m share/octave/${PKGVERSION}/m/prefs/rmpref.m share/octave/${PKGVERSION}/m/prefs/setpref.m +share/octave/${PKGVERSION}/m/profiler/profexplore.m +share/octave/${PKGVERSION}/m/profiler/profexport.m +share/octave/${PKGVERSION}/m/profiler/profile.m +share/octave/${PKGVERSION}/m/profiler/profshow.m share/octave/${PKGVERSION}/m/set/intersect.m share/octave/${PKGVERSION}/m/set/ismember.m share/octave/${PKGVERSION}/m/set/powerset.m @@ -1950,7 +1959,7 @@ share/octave/${PKGVERSION}/m/sparse/ilu.m share/octave/${PKGVERSION}/m/sparse/nonzeros.m share/octave/${PKGVERSION}/m/sparse/pcg.m share/octave/${PKGVERSION}/m/sparse/pcr.m -share/octave/${PKGVERSION}/m/sparse/private/__sprand_impl__.m +share/octave/${PKGVERSION}/m/sparse/private/__sprand__.m share/octave/${PKGVERSION}/m/sparse/qmr.m share/octave/${PKGVERSION}/m/sparse/spaugment.m share/octave/${PKGVERSION}/m/sparse/spconvert.m @@ -2009,7 +2018,6 @@ share/octave/${PKGVERSION}/m/statistics/base/kendall.m share/octave/${PKGVERSION}/m/statistics/base/kurtosis.m share/octave/${PKGVERSION}/m/statistics/base/logit.m share/octave/${PKGVERSION}/m/statistics/base/lscov.m -share/octave/${PKGVERSION}/m/statistics/base/mahalanobis.m share/octave/${PKGVERSION}/m/statistics/base/mean.m share/octave/${PKGVERSION}/m/statistics/base/meansq.m share/octave/${PKGVERSION}/m/statistics/base/median.m @@ -2188,6 +2196,10 @@ 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/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 @@ -2207,11 +2219,11 @@ share/octave/${PKGVERSION}/m/time/is_leap_year.m share/octave/${PKGVERSION}/m/time/now.m share/octave/${PKGVERSION}/m/time/weekday.m share/octave/site/m/startup/octaverc -@pkgdir share/octave/site/api-v50+/m +@pkgdir share/octave/site/api-v51/m @pkgdir share/octave/${PKGVERSION}/site/m @pkgdir libexec/octave/site/exec/${MACHINE_GNU_PLATFORM} -@pkgdir libexec/octave/api-v50+/site/exec/${MACHINE_GNU_PLATFORM} +@pkgdir libexec/octave/api-v51/site/exec/${MACHINE_GNU_PLATFORM} @pkgdir libexec/octave/${PKGVERSION}/site/exec/${MACHINE_GNU_PLATFORM} @pkgdir lib/octave/site/oct/${MACHINE_GNU_PLATFORM} -@pkgdir lib/octave/site/oct/api-v50+/${MACHINE_GNU_PLATFORM} +@pkgdir lib/octave/site/oct/api-v51/${MACHINE_GNU_PLATFORM} @pkgdir lib/octave/${PKGVERSION}/site/oct/${MACHINE_GNU_PLATFORM} diff --git a/math/octave/distinfo b/math/octave/distinfo index be7caa4c3f6..c9c1dce1f77 100644 --- a/math/octave/distinfo +++ b/math/octave/distinfo @@ -1,35 +1,20 @@ -$NetBSD: distinfo,v 1.49 2016/11/19 00:47:08 maya Exp $ +$NetBSD: distinfo,v 1.50 2016/11/19 21:53:12 maya Exp $ -SHA1 (octave-4.0.3.tar.xz) = c798346a8271e0141d9dbe5610584dabb8311277 -RMD160 (octave-4.0.3.tar.xz) = 32bad5cdb6b832d651183b92f59b396940d6ec04 -SHA512 (octave-4.0.3.tar.xz) = bad009235b04be09c051dd27ebef7df2542adec0a0b57c070662deebe33a0cdceb7d6816653f5afc3fc0cc1287ba1ca1a5c50858169004210224039374c9c55d -Size (octave-4.0.3.tar.xz) = 15697064 bytes -SHA1 (patch-configure) = 95ba2b79dc816fdc912c19d04a3e5e1cee94089b -SHA1 (patch-configure.ac) = d70f77d12a660bf9542725c8085fb525f138ce75 -SHA1 (patch-fflush-fpos_t.c) = 83d3d731042862920de68f0457fea4f95568125c +SHA1 (octave-4.2.0.tar.gz) = 9fac578c08a7efabd79ccc38bc196b9627e3212f +RMD160 (octave-4.2.0.tar.gz) = 07ff9bae3a0128c93f9113ebf952dea129b58284 +SHA512 (octave-4.2.0.tar.gz) = 5d16665d4ef8f218320f471704f8702f3a2911cc4a083cae318c1df0f787d50dddbc511dc91e11379314d65cecac6d521abac026860feca19d11ffdb52d3e678 +Size (octave-4.2.0.tar.gz) = 25320153 bytes +SHA1 (patch-configure) = 3d12daef0412a6d1c248ca85a0c3a1370fd6c921 +SHA1 (patch-configure.ac) = 23f6a0d617429aeb9f92038d475a817978904445 SHA1 (patch-fseeko-fpos_t.c) = b38e7a38be2e0b323cd7f168f1d22d3df998691c SHA1 (patch-libgnu_stdio.in.h) = 112a424655d46c75fb68531fe7a84d9a0e97a984 -SHA1 (patch-libgui_graphics_Canvas.cc) = b8161fc9248af2160c6fea012bac85e2128dbad7 -SHA1 (patch-libgui_graphics_Object.cc) = f0c0064793d4650e845e217806597bb956cb49fd -SHA1 (patch-libgui_qterminal_libqterminal_QTerminal.cc) = 48827b415a142518a6d764f670db0ce640cf4da4 -SHA1 (patch-libgui_qterminal_libqterminal_unix_TerminalView.cpp) = 45c425a0305915eaba1a60c811c2aa52bb84890e -SHA1 (patch-libgui_qterminal_libqterminal_unix_Vt102Emulation.cpp) = 36aaf960d0fc8c9809ef5937c82fc394a0ded8ac -SHA1 (patch-libgui_qterminal_libqterminal_unix_konsole__wcwidth.h) = 6f12b058cb10e3a01306e9973f4e2574cf596da7 -SHA1 (patch-libgui_src_find-files-dialog.cc) = 438694fc44a9fe8393ccb2606de71b32196f7058 -SHA1 (patch-libgui_src_octave-gui.cc) = 7b596955210052bde684bb5420743d74728c0735 -SHA1 (patch-libgui_src_resource-manager.cc) = 09560d42bdf4c00f4e438f40ffb3ae0b9037ee85 -SHA1 (patch-libgui_src_shortcut-manager.cc) = 2faf15cc4c779eb3cf32152abd369bf968e1bf18 -SHA1 (patch-libgui_src_workspace-model.cc) = bb5a875fcb09064c37572d066a25bb2011ee91cc -SHA1 (patch-libgui_src_workspace-view.cc) = 4be02918359fbb6d4b0dcbc1fcddb63bb3d00b4d -SHA1 (patch-libinterp_Makefile.am) = 29a8b034c743bed2570c90e8ef7a17bc2cf70dfe -SHA1 (patch-libinterp_Makefile.in) = 7fb118b9e2969b54b2510c57a4a7beb16f679bcd -SHA1 (patch-libinterp_corefcn_rand.cc) = e2a33ee323e904e4f3980f49ac363c4a42e5641d -SHA1 (patch-libinterp_dldfcn_config-module.awk) = 50d7173114f597038b01ed4479583c86ed78c3fe -SHA1 (patch-libinterp_dldfcn_module.mk) = 7627fa6132036f26b77743d30dbbe99ed6442b42 -SHA1 (patch-libinterp_oct-conf.in.h) = 9a6b0e8d38bc2f9da916cb3d8145307e7a415f4f -SHA1 (patch-liboctave_numeric_oct-fftw.h) = b152566ad3fcf6c5c1808f4428e6d51966ca1daf -SHA1 (patch-liboctave_operators_mx-inlines.cc) = 3002122937942a4a2bbcc6fff90398d082971d53 -SHA1 (patch-liboctave_system_oct-time.cc) = 7b8a33911c69861572e35320e13c6c777048bc6c +SHA1 (patch-libinterp_build-env.in.cc) = 09431962403996d0f979c7dcd080b721dad55055 +SHA1 (patch-libinterp_dldfcn_config-module.awk) = 0746cca7f69995abbe3af793181b96a99cf866c3 +SHA1 (patch-libinterp_dldfcn_module.mk) = a38b2b70780d33ed7e5c0f586fc9521367be0e28 +SHA1 (patch-libinterp_module.mk) = 26889c064497eb2bcbd77199e96925f61359c128 +SHA1 (patch-liboctave_operators_mx-inlines.cc) = e74ea202f89c1a6a394f8fd3d86397dfa2121d7e +SHA1 (patch-liboctave_wrappers_strftime-wrapper.c) = ca69583ec200f3bcbe02d9b7f8b6b7d001fae5a9 +SHA1 (patch-liboctave_wrappers_strftime-wrapper.h) = 54307cc5678f6654cde29530cb65902ab607550f SHA1 (patch-m4_acinclude.m4) = 194b8c3cf6f5e45a0251b229af9b3a47c12aa608 SHA1 (patch-scripts_pkg_private_configure__make.m) = 7d4b620f889faa66c4c9c581ef8a7e7692b68c94 SHA1 (patch-scripts_plot_util_____gnuplot__drawnow____.m) = 449b178aefd78c5c1b03ffd960f2e8be3874efc2 diff --git a/math/octave/patches/patch-configure b/math/octave/patches/patch-configure index f5e41b6b463..10e55e831c8 100644 --- a/math/octave/patches/patch-configure +++ b/math/octave/patches/patch-configure @@ -1,4 +1,4 @@ -$NetBSD: patch-configure,v 1.4 2016/09/28 02:54:15 maya Exp $ +$NetBSD: patch-configure,v 1.5 2016/11/19 21:53:12 maya Exp $ install .oct loadable modules with INSTALL_LIB to avoid stripping them @@ -8,9 +8,9 @@ the guess it had for linux (x86_64-unknown-linux-gnu), seems to trample over our own tools: https://mail-index.netbsd.org/pkgsrc-users/2014/03/26/msg019464.html ---- configure.orig 2015-05-26 16:21:37.000000000 +0000 +--- configure.orig 2016-11-13 15:22:50.000000000 +0000 +++ configure -@@ -1952,6 +1952,7 @@ DEFAULT_PAGER +@@ -1971,6 +1971,7 @@ DEFAULT_PAGER GNUPLOT GHOSTSCRIPT DESKTOP_FILE_INSTALL @@ -18,7 +18,7 @@ https://mail-index.netbsd.org/pkgsrc-users/2014/03/26/msg019464.html LN_S TEXI2PDF TEXI2DVI -@@ -5870,7 +5871,7 @@ case $host_os in *\ *) host_os=`echo "$h +@@ -5938,7 +5939,7 @@ case $host_os in *\ *) host_os=`echo "$h { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: configuring Octave for unknown system type" >&5 $as_echo "$as_me: WARNING: configuring Octave for unknown system type" >&2;} fi @@ -27,18 +27,18 @@ https://mail-index.netbsd.org/pkgsrc-users/2014/03/26/msg019464.html if test -z "$host_cpu"; then host_cpu=unknown -@@ -8620,7 +8621,9 @@ fi +@@ -9211,8 +9212,9 @@ fi --INSTALL_SCRIPT='${INSTALL}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' -+ + +-INSTALL_SCRIPT="${INSTALL}" +test -z "$INSTALL_LIB" && INSTALL_LIB='${INSTALL_SCRIPT}' -@@ -14005,7 +14008,12 @@ else +@@ -28323,7 +28325,12 @@ else fi done ;; diff --git a/math/octave/patches/patch-configure.ac b/math/octave/patches/patch-configure.ac index bcd2f701d86..43dc9a8345e 100644 --- a/math/octave/patches/patch-configure.ac +++ b/math/octave/patches/patch-configure.ac @@ -1,18 +1,19 @@ -$NetBSD: patch-configure.ac,v 1.2 2016/02/16 04:21:40 dbj Exp $ +$NetBSD: patch-configure.ac,v 1.3 2016/11/19 21:53:12 maya Exp $ install .oct loadable modules with INSTALL_LIB to avoid stripping them ---- configure.ac.orig 2015-05-26 16:16:39.000000000 +0000 +--- configure.ac.orig 2016-11-13 15:19:37.000000000 +0000 +++ configure.ac -@@ -149,8 +149,10 @@ AC_PROG_LN_S +@@ -208,8 +208,11 @@ AC_PROG_LN_S AC_PROG_MKDIR_P AC_PROG_INSTALL --INSTALL_SCRIPT='${INSTALL}' +-INSTALL_SCRIPT="${INSTALL}" +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' AC_SUBST(INSTALL_SCRIPT) +test -z "$INSTALL_LIB" && INSTALL_LIB='${INSTALL_SCRIPT}' +AC_SUBST(INSTALL_LIB) ++ OCTAVE_PROG_DESKTOP_FILE_INSTALL diff --git a/math/octave/patches/patch-fflush-fpos_t.c b/math/octave/patches/patch-fflush-fpos_t.c deleted file mode 100644 index 041fefe8210..00000000000 --- a/math/octave/patches/patch-fflush-fpos_t.c +++ /dev/null @@ -1,36 +0,0 @@ -$NetBSD: patch-fflush-fpos_t.c,v 1.2 2016/02/16 04:21:40 dbj Exp $ - ---- libgnu/fflush.c.orig 2015-05-23 14:36:16.000000000 +0000 -+++ libgnu/fflush.c -@@ -22,6 +22,7 @@ - #include <stdio.h> - - #include <errno.h> -+#include <string.h> - #include <unistd.h> - - #include "freading.h" -@@ -103,17 +104,12 @@ update_fpos_cache (FILE *fp _GL_UNUSED_P - /* 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; - # endif diff --git a/math/octave/patches/patch-libgui_graphics_Canvas.cc b/math/octave/patches/patch-libgui_graphics_Canvas.cc deleted file mode 100644 index fb7842362f1..00000000000 --- a/math/octave/patches/patch-libgui_graphics_Canvas.cc +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-libgui_graphics_Canvas.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $ - -Changes for compiling with Qt5 instead of Qt4 - ---- libgui/graphics/Canvas.cc.orig 2015-05-23 14:21:53.000000000 +0000 -+++ libgui/graphics/Canvas.cc -@@ -527,7 +527,7 @@ Canvas::canvasMousePressEvent (QMouseEve - QRectF r (bb(0), bb(1), bb(2), bb(3)); - - r.adjust (-5, -5, 5, 5); -- if (r.contains (event->posF ())) -+ if (r.contains (event->localPos ())) - { - currentObj = childObj; - break; -@@ -554,7 +554,7 @@ Canvas::canvasMousePressEvent (QMouseEve - Matrix bb = it->get_properties ().get_boundingbox (true); - QRectF r (bb(0), bb(1), bb(2), bb(3)); - -- if (r.contains (event->posF ())) -+ if (r.contains (event->localPos ())) - axesObj = *it; - } - diff --git a/math/octave/patches/patch-libgui_graphics_Object.cc b/math/octave/patches/patch-libgui_graphics_Object.cc deleted file mode 100644 index 9d92abda07b..00000000000 --- a/math/octave/patches/patch-libgui_graphics_Object.cc +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-libgui_graphics_Object.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $ - -Changes for compiling with Qt5 instead of Qt4 - ---- libgui/graphics/Object.cc.orig 2015-05-23 14:21:53.000000000 +0000 -+++ libgui/graphics/Object.cc -@@ -183,7 +183,7 @@ Object::fromQObject (QObject* obj) - QVariant v = obj->property ("QtHandles::Object"); - - if (v.isValid ()) -- return reinterpret_cast<Object*> (qVariantValue<void*> (v)); -+ return reinterpret_cast<Object*> (qvariant_cast<void*> (v)); - - return 0; - } diff --git a/math/octave/patches/patch-libgui_qterminal_libqterminal_QTerminal.cc b/math/octave/patches/patch-libgui_qterminal_libqterminal_QTerminal.cc deleted file mode 100644 index 58d5c6bf871..00000000000 --- a/math/octave/patches/patch-libgui_qterminal_libqterminal_QTerminal.cc +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-libgui_qterminal_libqterminal_QTerminal.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $ - -Changes for compiling with Qt5 instead of Qt4 - ---- libgui/qterminal/libqterminal/QTerminal.cc.orig 2015-05-23 14:21:53.000000000 +0000 -+++ libgui/qterminal/libqterminal/QTerminal.cc -@@ -144,10 +144,10 @@ QTerminal::notice_settings (const QSetti - copy = QKeySequence::Copy; // settings->value () does not work! - - // dis- or enable extra interrupt action -- QKeySequence ctrl; -+ Qt::KeyboardModifiers ctrl; - ctrl = Qt::ControlModifier; - -- bool extra_ir_action = (copy != QKeySequence (ctrl + Qt::Key_C)); -+ bool extra_ir_action = (copy != QKeySequence (ctrl | Qt::Key_C)); - - _interrupt_action->setEnabled (extra_ir_action); - has_extra_interrupt (extra_ir_action); diff --git a/math/octave/patches/patch-libgui_qterminal_libqterminal_unix_TerminalView.cpp b/math/octave/patches/patch-libgui_qterminal_libqterminal_unix_TerminalView.cpp deleted file mode 100644 index 4680a845b3a..00000000000 --- a/math/octave/patches/patch-libgui_qterminal_libqterminal_unix_TerminalView.cpp +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-libgui_qterminal_libqterminal_unix_TerminalView.cpp,v 1.1 2016/02/16 04:21:40 dbj Exp $ - -Changes for compiling with Qt5 instead of Qt4 - ---- libgui/qterminal/libqterminal/unix/TerminalView.cpp.orig 2015-05-23 14:21:53.000000000 +0000 -+++ libgui/qterminal/libqterminal/unix/TerminalView.cpp -@@ -41,6 +41,7 @@ - #include <QPixmap> - #include <QScrollBar> - #include <QStyle> -+#include <QToolTip> - #include <QtCore> - #include <QtGui> - diff --git a/math/octave/patches/patch-libgui_qterminal_libqterminal_unix_Vt102Emulation.cpp b/math/octave/patches/patch-libgui_qterminal_libqterminal_unix_Vt102Emulation.cpp deleted file mode 100644 index 4177d6cdc68..00000000000 --- a/math/octave/patches/patch-libgui_qterminal_libqterminal_unix_Vt102Emulation.cpp +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-libgui_qterminal_libqterminal_unix_Vt102Emulation.cpp,v 1.1 2016/02/16 04:21:40 dbj Exp $ - -Changes for compiling with Qt5 instead of Qt4 - ---- libgui/qterminal/libqterminal/unix/Vt102Emulation.cpp.orig 2015-05-23 14:21:53.000000000 +0000 -+++ libgui/qterminal/libqterminal/unix/Vt102Emulation.cpp -@@ -994,7 +994,7 @@ void Vt102Emulation::sendKeyEvent( QKeyE - "is missing."); - - reset(); -- receiveData( translatorError.toAscii().constData() , translatorError.count() ); -+ receiveData( translatorError.toLatin1().constData() , translatorError.count() ); - } - } - diff --git a/math/octave/patches/patch-libgui_qterminal_libqterminal_unix_konsole__wcwidth.h b/math/octave/patches/patch-libgui_qterminal_libqterminal_unix_konsole__wcwidth.h deleted file mode 100644 index 99f2179a06c..00000000000 --- a/math/octave/patches/patch-libgui_qterminal_libqterminal_unix_konsole__wcwidth.h +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-libgui_qterminal_libqterminal_unix_konsole__wcwidth.h,v 1.1 2016/02/16 04:21:40 dbj Exp $ - -Changes for compiling with Qt5 instead of Qt4 - ---- libgui/qterminal/libqterminal/unix/konsole_wcwidth.h.orig 2015-05-23 14:21:53.000000000 +0000 -+++ libgui/qterminal/libqterminal/unix/konsole_wcwidth.h -@@ -11,7 +11,6 @@ - #define _KONSOLE_WCWIDTH_H_ - - // Qt --#include <QtCore/QBool> - #include <QtCore/QString> - - int konsole_wcwidth(quint16 ucs); diff --git a/math/octave/patches/patch-libgui_src_find-files-dialog.cc b/math/octave/patches/patch-libgui_src_find-files-dialog.cc deleted file mode 100644 index b190bffc23f..00000000000 --- a/math/octave/patches/patch-libgui_src_find-files-dialog.cc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-libgui_src_find-files-dialog.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $ - ---- libgui/src/find-files-dialog.cc.orig 2015-05-23 14:21:53.000000000 +0000 -+++ libgui/src/find-files-dialog.cc -@@ -125,7 +125,7 @@ find_files_dialog::find_files_dialog (QW - _file_list->horizontalHeader ()->restoreState ( - settings->value ("findfiles/column_state").toByteArray ()); - _file_list->horizontalHeader ()->setSortIndicatorShown (true); -- _file_list->horizontalHeader ()->setClickable (true); -+ _file_list->horizontalHeader ()->setSectionsClickable (true); - _file_list->horizontalHeader ()->setStretchLastSection (true); - _file_list->sortByColumn ( - settings->value ("findfiles/sort_files_by_column",0).toInt (), diff --git a/math/octave/patches/patch-libgui_src_octave-gui.cc b/math/octave/patches/patch-libgui_src_octave-gui.cc deleted file mode 100644 index 64f721cdfa2..00000000000 --- a/math/octave/patches/patch-libgui_src_octave-gui.cc +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-libgui_src_octave-gui.cc,v 1.2 2016/08/06 13:03:35 prlw1 Exp $ - -Changes for compiling with Qt5 instead of Qt4 - ---- libgui/src/octave-gui.cc.orig 2016-04-20 18:23:57.000000000 +0000 -+++ libgui/src/octave-gui.cc -@@ -92,7 +92,7 @@ private: - // Disable all Qt messages by default. - - static void --message_handler (QtMsgType, const char *) -+message_handler (QtMsgType, const QMessageLogContext &, const QString &) - { - } - -@@ -108,7 +108,7 @@ octave_start_gui (int argc, char *argv[] - - // Installing our handler suppresses the messages. - if (show_gui_msgs.empty ()) -- qInstallMsgHandler (message_handler); -+ qInstallMessageHandler (message_handler); - - install___init_qt___functions (); - -@@ -119,7 +119,7 @@ octave_start_gui (int argc, char *argv[] - - // Set the codec for all strings (before wizard) - #if ! defined (Q_OS_WIN32) -- QTextCodec::setCodecForCStrings (QTextCodec::codecForName ("UTF-8")); -+ QTextCodec::setCodecForLocale (QTextCodec::codecForName ("UTF-8")); - #endif - - // show wizard if this is the first run diff --git a/math/octave/patches/patch-libgui_src_resource-manager.cc b/math/octave/patches/patch-libgui_src_resource-manager.cc deleted file mode 100644 index bfa5e9cc3fd..00000000000 --- a/math/octave/patches/patch-libgui_src_resource-manager.cc +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-libgui_src_resource-manager.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $ - -Changes for compiling with Qt5 instead of Qt4 - ---- libgui/src/resource-manager.cc.orig 2015-05-23 14:21:54.000000000 +0000 -+++ libgui/src/resource-manager.cc -@@ -61,10 +61,8 @@ resource_manager::resource_manager (void - : settings_directory (), settings_file (), settings (0), - default_settings (0) - { -- QDesktopServices desktopServices; -- - QString home_path -- = desktopServices.storageLocation (QDesktopServices::HomeLocation); -+ = QStandardPaths::writableLocation (QStandardPaths::HomeLocation); - - settings_directory = home_path + "/.config/octave"; - diff --git a/math/octave/patches/patch-libgui_src_shortcut-manager.cc b/math/octave/patches/patch-libgui_src_shortcut-manager.cc deleted file mode 100644 index be5aeee67f3..00000000000 --- a/math/octave/patches/patch-libgui_src_shortcut-manager.cc +++ /dev/null @@ -1,297 +0,0 @@ -$NetBSD: patch-libgui_src_shortcut-manager.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $ - -Changes for compiling with Qt5 instead of Qt4 - ---- libgui/src/shortcut-manager.cc.orig 2015-05-23 14:21:53.000000000 +0000 -+++ libgui/src/shortcut-manager.cc -@@ -86,8 +86,8 @@ shortcut_manager::instance_ok (void) - void - shortcut_manager::do_init_data () - { -- QKeySequence ctrl; -- int prefix; -+ Qt::KeyboardModifiers ctrl; -+ Qt::KeyboardModifiers prefix; - #if defined (Q_OS_MAC) - // Use CMD key as an equivalent of Ctrl key on other platforms - ctrl = Qt::MetaModifier; -@@ -100,15 +100,15 @@ shortcut_manager::do_init_data () - prefix = Qt::NoModifier; - #endif - -- QKeySequence ctrl_shift = ctrl + Qt::ShiftModifier; -- QKeySequence ctrl_alt = ctrl + Qt::AltModifier; -+ Qt::KeyboardModifiers ctrl_shift = ctrl | Qt::ShiftModifier; -+ Qt::KeyboardModifiers ctrl_alt = ctrl | Qt::AltModifier; - - // actions of the main window - - // file - init (tr ("New File"), "main_file:new_file", QKeySequence::New); - init (tr ("New Function"), "main_file:new_function", -- QKeySequence (ctrl_shift + Qt::Key_N)); -+ QKeySequence (ctrl_shift | Qt::Key_N)); - init (tr ("New Figure"), "main_file:new_figure", QKeySequence ()); - init (tr ("Open File"), "main_file:open_file", QKeySequence::Open); - init (tr ("Load Workspace"), "main_file:load_workspace", QKeySequence ()); -@@ -122,7 +122,7 @@ shortcut_manager::do_init_data () - init (tr ("Select All"), "main_edit:select_all", QKeySequence ()); - init (tr ("Clear Clipboard"), "main_edit:clear_clipboard", QKeySequence ()); - init (tr ("Find in Files"), "main_edit:find_in_files", -- QKeySequence (ctrl_shift + Qt::Key_F)); -+ QKeySequence (ctrl_shift | Qt::Key_F)); - init (tr ("Clear Command Window"), "main_edit:clear_command_window", - QKeySequence ()); - init (tr ("Clear Command History"), "main_edit:clear_history", -@@ -132,41 +132,41 @@ shortcut_manager::do_init_data () - - // debug - init (tr ("Step"), "main_debug:step_over", -- QKeySequence (prefix + Qt::Key_F10)); -+ QKeySequence (prefix | Qt::Key_F10)); - init (tr ("Step Into"), "main_debug:step_into", -- QKeySequence (prefix + Qt::Key_F11)); -+ QKeySequence (prefix | Qt::Key_F11)); - init (tr ("Step Out"), "main_debug:step_out", -- QKeySequence (prefix + Qt::ShiftModifier + Qt::Key_F11)); -+ QKeySequence (prefix | Qt::ShiftModifier | Qt::Key_F11)); - init (tr ("Continue"), "main_debug:continue", -- QKeySequence (prefix + Qt::Key_F5)); -+ QKeySequence (prefix | Qt::Key_F5)); - init (tr ("Quit Debug Mode"), "main_debug:quit", -- QKeySequence (prefix + Qt::ShiftModifier + Qt::Key_F5)); -+ QKeySequence (prefix | Qt::ShiftModifier | Qt::Key_F5)); - - // window - init (tr ("Show Command Window"), "main_window:show_command", -- prefix + ctrl_shift + Qt::Key_0); -+ QKeySequence (prefix | ctrl_shift | Qt::Key_0)); - init (tr ("Show Command History"), "main_window:show_history", -- prefix + ctrl_shift + Qt::Key_1); -+ QKeySequence (prefix | ctrl_shift | Qt::Key_1)); - init (tr ("Show File Browser"), "main_window:show_file_browser", -- prefix + ctrl_shift + Qt::Key_2); -+ QKeySequence (prefix | ctrl_shift | Qt::Key_2)); - init (tr ("Show Workspace"), "main_window:show_workspace", -- prefix + ctrl_shift + Qt::Key_3); -+ QKeySequence (prefix | ctrl_shift | Qt::Key_3)); - init (tr ("Show Editor"), "main_window:show_editor", -- prefix + ctrl_shift + Qt::Key_4); -+ QKeySequence (prefix | ctrl_shift | Qt::Key_4)); - init (tr ("Show Documentation"), "main_window:show_doc", -- prefix + ctrl_shift + Qt::Key_5); -+ QKeySequence (prefix | ctrl_shift | Qt::Key_5)); - init (tr ("Command Window"), "main_window:command", -- prefix + ctrl + Qt::Key_0); -+ QKeySequence (prefix | ctrl | Qt::Key_0)); - init (tr ("Command History"), "main_window:history", -- prefix + ctrl + Qt::Key_1); -+ QKeySequence (prefix | ctrl | Qt::Key_1)); - init (tr ("File Browser"), "main_window:file_browser", -- prefix + ctrl + Qt::Key_2); -+ QKeySequence (prefix | ctrl | Qt::Key_2)); - init (tr ("Workspace"), "main_window:workspace", -- prefix + ctrl + Qt::Key_3); -+ QKeySequence (prefix | ctrl | Qt::Key_3)); - init (tr ("Editor"), "main_window:editor", -- prefix + ctrl + Qt::Key_4); -+ QKeySequence (prefix | ctrl | Qt::Key_4)); - init (tr ("Documentation"), "main_window:doc", -- prefix + ctrl + Qt::Key_5); -+ QKeySequence (prefix | ctrl | Qt::Key_5)); - init (tr ("Reset Default Window Layout"), "main_window:reset", QKeySequence ()); - - // help -@@ -190,7 +190,7 @@ shortcut_manager::do_init_data () - - // file - init (tr ("Edit Function"), "editor_file:edit_function", -- QKeySequence (ctrl + Qt::Key_E)); -+ QKeySequence (ctrl | Qt::Key_E)); - init (tr ("Save File"), "editor_file:save", QKeySequence::Save); - init (tr ("Save File As"), "editor_file:save_as", QKeySequence::SaveAs); - init (tr ("Close"), "editor_file:close", QKeySequence::Close); -@@ -212,41 +212,41 @@ shortcut_manager::do_init_data () - init (tr ("Delete to End of Word"), "editor_edit:delete_end_word", - QKeySequence::DeleteEndOfWord); - init (tr ("Delete to Start of Line"), "editor_edit:delete_start_line", -- QKeySequence (ctrl_shift + Qt::Key_Backspace)); -+ QKeySequence (ctrl_shift | Qt::Key_Backspace)); - init (tr ("Delete to End of Line"), "editor_edit:delete_end_line", -- QKeySequence (ctrl_shift + Qt::Key_Delete)); -+ QKeySequence (ctrl_shift | Qt::Key_Delete)); - init (tr ("Delete Line"), "editor_edit:delete_line", -- QKeySequence (ctrl_shift + Qt::Key_L)); -+ QKeySequence (ctrl_shift | Qt::Key_L)); - init (tr ("Copy Line"), "editor_edit:copy_line", -- QKeySequence (ctrl_shift + Qt::Key_C)); -+ QKeySequence (ctrl_shift | Qt::Key_C)); - init (tr ("Cut Line"), "editor_edit:cut_line", -- QKeySequence (ctrl_shift + Qt::Key_X)); -+ QKeySequence (ctrl_shift | Qt::Key_X)); - init (tr ("Duplicate Selection/Line"), "editor_edit:duplicate_selection", -- QKeySequence (ctrl + Qt::Key_D)); -+ QKeySequence (ctrl | Qt::Key_D)); - init (tr ("Transpose Line"), "editor_edit:transpose_line", -- QKeySequence (ctrl + Qt::Key_T)); -+ QKeySequence (ctrl | Qt::Key_T)); - init (tr ("Show Completion List"), "editor_edit:completion_list", -- QKeySequence (ctrl + Qt::Key_Space)); -+ QKeySequence (ctrl | Qt::Key_Space)); - - init (tr ("Comment Selection"), "editor_edit:comment_selection", -- QKeySequence (ctrl + Qt::Key_R)); -+ QKeySequence (ctrl | Qt::Key_R)); - init (tr ("Uncomment Selection"), "editor_edit:uncomment_selection", -- QKeySequence (ctrl_shift + Qt::Key_R)); -+ QKeySequence (ctrl_shift | Qt::Key_R)); - init (tr ("Uppercase Selection"), "editor_edit:upper_case", -- QKeySequence (ctrl + Qt::Key_U)); -+ QKeySequence (ctrl | Qt::Key_U)); - init (tr ("Lowercase Selection"), "editor_edit:lower_case", -- QKeySequence (ctrl_alt + Qt::Key_U)); -+ QKeySequence (ctrl_alt | Qt::Key_U)); - - #if defined (Q_OS_MAC) - init (tr ("Indent Selection"), "editor_edit:indent_selection", -- QKeySequence (prefix + Qt::Key_Tab)); -+ QKeySequence (prefix | Qt::Key_Tab)); - init (tr ("Unindent Selection"), "editor_edit:unindent_selection", -- QKeySequence (prefix + Qt::ShiftModifier + Qt::Key_Tab)); -+ QKeySequence (prefix | Qt::ShiftModifier | Qt::Key_Tab)); - #else - init (tr ("Indent Selection"), "editor_edit:indent_selection", -- QKeySequence (ctrl + Qt::Key_Tab)); -+ QKeySequence (ctrl | Qt::Key_Tab)); - init (tr ("Unindent Selection"), "editor_edit:unindent_selection", -- QKeySequence (ctrl_shift + Qt::Key_Tab)); -+ QKeySequence (ctrl_shift | Qt::Key_Tab)); - #endif - - init (tr ("Convert Line Endings to Windows"), "editor_edit:conv_eol_winows", -@@ -257,17 +257,17 @@ shortcut_manager::do_init_data () - QKeySequence ()); - - init (tr ("Goto Line"), "editor_edit:goto_line", -- QKeySequence (ctrl + Qt::Key_G)); -+ QKeySequence (ctrl | Qt::Key_G)); - init (tr ("Move to Matching Brace"), "editor_edit:move_to_brace", -- QKeySequence (ctrl + Qt::Key_M)); -+ QKeySequence (ctrl | Qt::Key_M)); - init (tr ("Select to Matching Brace"), "editor_edit:select_to_brace", -- QKeySequence (ctrl_shift + Qt::Key_M)); -+ QKeySequence (ctrl_shift | Qt::Key_M)); - init (tr ("Toggle Bookmark"), "editor_edit:toggle_bookmark", -- QKeySequence (prefix + Qt::Key_F7)); -+ QKeySequence (prefix | Qt::Key_F7)); - init (tr ("Next Bookmark"), "editor_edit:next_bookmark", -- QKeySequence (prefix + Qt::Key_F2)); -+ QKeySequence (prefix | Qt::Key_F2)); - init (tr ("Previous Bookmark"), "editor_edit:previous_bookmark", -- QKeySequence (prefix + Qt::SHIFT + Qt::Key_F2)); -+ QKeySequence (prefix | Qt::SHIFT | Qt::Key_F2)); - init (tr ("Remove All Bookmark"), "editor_edit:remove_bookmark", - QKeySequence ()); - -@@ -289,10 +289,10 @@ shortcut_manager::do_init_data () - init (tr ("Zoom Out"), "editor_view:zoom_out", QKeySequence::ZoomOut); - #if defined (Q_OS_MAC) - init (tr ("Zoom Normal"), "editor_view:zoom_normal", -- QKeySequence (ctrl + Qt::Key_Underscore)); -+ QKeySequence (ctrl | Qt::Key_Underscore)); - #else - init (tr ("Zoom Normal"), "editor_view:zoom_normal", -- QKeySequence (ctrl + Qt::Key_Period)); -+ QKeySequence (ctrl | Qt::Key_Period)); - #endif - - // debug -@@ -307,15 +307,15 @@ shortcut_manager::do_init_data () - - // run - init (tr ("Run File"), "editor_run:run_file", -- QKeySequence (prefix + Qt::Key_F5) ); -+ QKeySequence (prefix | Qt::Key_F5) ); - init (tr ("Run Selection"), "editor_run:run_selection", -- QKeySequence (prefix + Qt::Key_F9) ); -+ QKeySequence (prefix | Qt::Key_F9) ); - - // help - init (tr ("Help on Keyword"), "editor_help:help_keyword", - QKeySequence::HelpContents); - init (tr ("Document on Keyword"), "editor_help:doc_keyword", -- QKeySequence (Qt::SHIFT + Qt::Key_F1)); -+ QKeySequence (Qt::SHIFT | Qt::Key_F1)); - } - - void -@@ -353,7 +353,7 @@ shortcut_manager::do_fill_treewidget (QT - _dialog = 0; - _level_hash.clear (); - -- tree_view->header ()->setResizeMode (QHeaderView::ResizeToContents); -+ tree_view->header ()->sectionResizeMode (QHeaderView::ResizeToContents); - - QTreeWidgetItem *main = new QTreeWidgetItem (tree_view); - main->setText (0, tr ("Main")); -@@ -419,10 +419,10 @@ shortcut_manager::do_fill_treewidget (QT - - // write the shortcuts - tree_item->setText (0, sc.description); -- tree_item->setText (1, sc.default_sc [0]); -- tree_item->setText (2, sc.actual_sc [0]); -- tree_item->setText (3, sc.default_sc [1]); -- tree_item->setText (4, sc.actual_sc [1]); -+ tree_item->setText (1, sc.default_sc [0].toString(QKeySequence::NativeText)); -+ tree_item->setText (2, sc.actual_sc [0].toString(QKeySequence::NativeText)); -+ tree_item->setText (3, sc.default_sc [1].toString(QKeySequence::NativeText)); -+ tree_item->setText (4, sc.actual_sc [1].toString(QKeySequence::NativeText)); - - _item_index_hash[tree_item] = i + 1; // index+1 to avoid 0 - _index_item_hash[i] = tree_item; -@@ -569,8 +569,8 @@ shortcut_manager::shortcut_dialog (int i - - } - -- _edit_actual->setText (_sc.at (index).actual_sc[_selected_set]); -- _label_default->setText (_sc.at (index).default_sc[_selected_set]); -+ _edit_actual->setText (_sc.at (index).actual_sc[_selected_set].toString(QKeySequence::NativeText)); -+ _label_default->setText (_sc.at (index).default_sc[_selected_set].toString(QKeySequence::NativeText)); - _handled_index = index; - - _edit_actual->setFocus (); -@@ -611,7 +611,7 @@ shortcut_manager::shortcut_dialog_finish - shortcut_t double_shortcut = _sc.at (double_index); - double_shortcut.actual_sc[_selected_set] = QKeySequence (); - _sc.replace (double_index, double_shortcut); -- _index_item_hash[double_index]->setText ((_selected_set + 1)*2, QKeySequence ()); -+ _index_item_hash[double_index]->setText ((_selected_set + 1)*2, QKeySequence ().toString(QKeySequence::NativeText)); - } - else - return; -@@ -625,7 +625,7 @@ shortcut_manager::shortcut_dialog_finish - _sc.replace (_handled_index, shortcut); - - _index_item_hash[_handled_index]->setText ((_selected_set + 1)*2, -- shortcut.actual_sc[_selected_set]); -+ shortcut.actual_sc[_selected_set].toString(QKeySequence::NativeText)); - - if (! shortcut.actual_sc[_selected_set].isEmpty ()) - _shortcut_hash[widget + sep + shortcut.actual_sc[_selected_set].toString ()] = -@@ -653,7 +653,7 @@ shortcut_manager::import_shortcuts (int - - // update the tree view - QTreeWidgetItem* tree_item = _index_item_hash[i]; // get related tree item -- tree_item->setText (2*set, sc.actual_sc [set-1]); // display new shortcut -+ tree_item->setText (2*set, sc.actual_sc [set-1].toString(QKeySequence::NativeText)); // display new shortcut - } - } - -@@ -744,6 +744,6 @@ enter_shortcut::keyPressEvent (QKeyEvent - if (modifiers & Qt::MetaModifier) - key += Qt::META; - -- setText (QKeySequence(key)); -+ setText (QKeySequence(key).toString(QKeySequence::NativeText)); - } - } diff --git a/math/octave/patches/patch-libgui_src_workspace-model.cc b/math/octave/patches/patch-libgui_src_workspace-model.cc deleted file mode 100644 index 39697810daf..00000000000 --- a/math/octave/patches/patch-libgui_src_workspace-model.cc +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-libgui_src_workspace-model.cc,v 1.2 2016/08/06 13:03:35 prlw1 Exp $ - -Changes for compiling with Qt5 instead of Qt4 - ---- libgui/src/workspace-model.cc.orig 2015-05-23 14:21:53.000000000 +0000 -+++ libgui/src/workspace-model.cc -@@ -132,7 +132,7 @@ workspace_model::data (const QModelIndex - { - QString class_chars = resource_manager::storage_class_chars (); - int actual_class -- = class_chars.indexOf (_scopes[idx.row ()].toAscii ()); -+ = class_chars.indexOf (_scopes[idx.row ()].toLatin1 ()); - if (actual_class >= 0) - return QVariant (_storage_class_colors.at (actual_class)); - else -@@ -172,7 +172,7 @@ workspace_model::data (const QModelIndex - QString class_chars = resource_manager::storage_class_chars (); - - int actual_class -- = class_chars.indexOf (_scopes[idx.row ()].toAscii ()); -+ = class_chars.indexOf (_scopes[idx.row ()].toLatin1 ()); - - if (actual_class >= 0) - { diff --git a/math/octave/patches/patch-libgui_src_workspace-view.cc b/math/octave/patches/patch-libgui_src_workspace-view.cc deleted file mode 100644 index 4fbf5702f37..00000000000 --- a/math/octave/patches/patch-libgui_src_workspace-view.cc +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-libgui_src_workspace-view.cc,v 1.1 2016/08/06 13:03:35 prlw1 Exp $ - -Changes for compiling with Qt5 instead of Qt4 - ---- libgui/src/workspace-view.cc.orig 2016-04-20 18:23:57.000000000 +0000 -+++ libgui/src/workspace-view.cc -@@ -98,8 +98,8 @@ workspace_view::workspace_view (QWidget - view->horizontalHeader ()->restoreState ( - settings->value ("workspaceview/column_state").toByteArray ()); - // Set header properties for sorting -- view->horizontalHeader ()->setClickable (true); -- view->horizontalHeader ()->setMovable (true); -+ view->horizontalHeader ()->setSectionsClickable (true); -+ view->horizontalHeader ()->setSectionsMovable (true); - view->horizontalHeader ()->setSortIndicator ( - settings->value ("workspaceview/sort_by_column",0).toInt (), - static_cast<Qt::SortOrder> diff --git a/math/octave/patches/patch-libinterp_Makefile.in b/math/octave/patches/patch-libinterp_Makefile.in deleted file mode 100644 index bea094443a3..00000000000 --- a/math/octave/patches/patch-libinterp_Makefile.in +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-libinterp_Makefile.in,v 1.1 2016/02/16 04:21:40 dbj Exp $ - -install .oct loadable modules with INSTALL_LIB to avoid stripping them - ---- libinterp/Makefile.in.orig 2015-05-26 16:21:46.000000000 +0000 -+++ libinterp/Makefile.in -@@ -2009,6 +2009,7 @@ INCLUDE_NEXT = @INCLUDE_NEXT@ - INCLUDE_NEXT_AS_FIRST_DIRECTIVE = @INCLUDE_NEXT_AS_FIRST_DIRECTIVE@ - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ -+INSTALL_LIB = @INSTALL_LIB@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -@@ -8760,7 +8761,7 @@ corefcn/oct-tex-parser.yy: corefcn/oct-t - $(AM_V_GEN)$(call subst-bison-api-decls,octave_tex_) - - @AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@%.oct : %.la --@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ $(AM_V_GEN)$(INSTALL_PROGRAM) dldfcn/.libs/$(shell $(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $<) $@ -+@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ $(AM_V_GEN)$(INSTALL_LIB) dldfcn/.libs/$(shell $(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $<) $@ - dldfcn/__delaunayn__.df: CPPFLAGS += $(QHULL_CPPFLAGS) - dldfcn/__eigs__.df: CPPFLAGS += $(ARPACK_CPPFLAGS) $(SPARSE_XCPPFLAGS) - dldfcn/__fltk_uigetfile__.df: CPPFLAGS += $(FLTK_CPPFLAGS) $(FT2_CPPFLAGS) -@@ -8868,7 +8869,7 @@ uninstall-local: uninstall-oct uninstall - @AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ f=`echo $$ltlib | $(SED) 's,.*/,,'`; \ - @AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ dl=`$(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $$f`; \ - @AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ if [ -n "$$dl" ]; then \ --@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ $(INSTALL_PROGRAM) $$dl $(DESTDIR)$(octfiledir)/`echo $$f | $(SED) 's,^lib,,; s,\.la$$,.oct,'`; \ -+@AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ $(INSTALL_LIB) $$dl $(DESTDIR)$(octfiledir)/`echo $$f | $(SED) 's,^lib,,; s,\.la$$,.oct,'`; \ - @AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ else \ - @AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ echo "error: dlname is empty in $$ltlib!"; \ - @AMCOND_ENABLE_DYNAMIC_LINKING_TRUE@ exit 1; \ diff --git a/math/octave/patches/patch-libinterp_build-env.in.cc b/math/octave/patches/patch-libinterp_build-env.in.cc new file mode 100644 index 00000000000..b58b85249e4 --- /dev/null +++ b/math/octave/patches/patch-libinterp_build-env.in.cc @@ -0,0 +1,13 @@ +$NetBSD: patch-libinterp_build-env.in.cc,v 1.1 2016/11/19 21:53:12 maya Exp $ + +--- libinterp/build-env.in.cc.orig 2016-11-13 15:16:10.000000000 +0000 ++++ libinterp/build-env.in.cc +@@ -305,7 +305,7 @@ namespace octave + + const char *Z_LIBS = %OCTAVE_CONF_Z_LIBS%; + +- const char *config_opts = %OCTAVE_CONF_config_opts%; ++ const char *config_opts = ""; + } + } + diff --git a/math/octave/patches/patch-libinterp_corefcn_rand.cc b/math/octave/patches/patch-libinterp_corefcn_rand.cc deleted file mode 100644 index 765aab961ff..00000000000 --- a/math/octave/patches/patch-libinterp_corefcn_rand.cc +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-libinterp_corefcn_rand.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $ - ---- libinterp/corefcn/rand.cc.orig 2015-05-23 14:21:53.000000000 +0000 -+++ libinterp/corefcn/rand.cc -@@ -1139,10 +1139,10 @@ likely.\n\ - @end deftypefn") - { - --#ifdef USE_UNORDERED_MAP_WITH_TR1 --using std::tr1::unordered_map; --#else -+#if defined (HAVE_UNORDERED_MAP) - using std::unordered_map; -+#else -+using std::tr1::unordered_map; - #endif - - int nargin = args.length (); diff --git a/math/octave/patches/patch-libinterp_dldfcn_config-module.awk b/math/octave/patches/patch-libinterp_dldfcn_config-module.awk index 33d533dc7e9..ebbb01cd1ce 100644 --- a/math/octave/patches/patch-libinterp_dldfcn_config-module.awk +++ b/math/octave/patches/patch-libinterp_dldfcn_config-module.awk @@ -1,15 +1,15 @@ -$NetBSD: patch-libinterp_dldfcn_config-module.awk,v 1.1 2016/02/16 04:21:40 dbj Exp $ +$NetBSD: patch-libinterp_dldfcn_config-module.awk,v 1.2 2016/11/19 21:53:12 maya Exp $ install .oct loadable modules with INSTALL_LIB to avoid stripping them ---- libinterp/dldfcn/config-module.awk.orig 2015-05-23 14:21:53.000000000 +0000 +--- libinterp/dldfcn/config-module.awk.orig 2016-11-13 15:16:10.000000000 +0000 +++ libinterp/dldfcn/config-module.awk @@ -39,7 +39,7 @@ BEGIN { print "## of symbolic links"; print ""; print "%.oct : %.la" -- print " $(AM_V_GEN)$(INSTALL_PROGRAM) dldfcn/.libs/$(shell $(SED) -n -e \"s/dlname='\\([^']*\\)'/\\1/p\" < $<) $@" -+ print " $(AM_V_GEN)$(INSTALL_LIB) dldfcn/.libs/$(shell $(SED) -n -e \"s/dlname='\\([^']*\\)'/\\1/p\" < $<) $@" +- print " $(AM_V_GEN)$(INSTALL_PROGRAM) libinterp/dldfcn/.libs/$(shell $(SED) -n -e \"s/dlname='\\([^']*\\)'/\\1/p\" < $<) $@" ++ print " $(AM_V_GEN)$(INSTALL_LIB) libinterp/dldfcn/.libs/$(shell $(SED) -n -e \"s/dlname='\\([^']*\\)'/\\1/p\" < $<) $@" print "" print "else"; print ""; diff --git a/math/octave/patches/patch-libinterp_dldfcn_module.mk b/math/octave/patches/patch-libinterp_dldfcn_module.mk index 165d09cc90c..2bd8d9d7265 100644 --- a/math/octave/patches/patch-libinterp_dldfcn_module.mk +++ b/math/octave/patches/patch-libinterp_dldfcn_module.mk @@ -1,15 +1,15 @@ -$NetBSD: patch-libinterp_dldfcn_module.mk,v 1.1 2016/02/16 04:21:40 dbj Exp $ +$NetBSD: patch-libinterp_dldfcn_module.mk,v 1.2 2016/11/19 21:53:12 maya Exp $ install .oct loadable modules with INSTALL_LIB to avoid stripping them ---- libinterp/dldfcn/module.mk.orig 2015-05-23 14:36:42.000000000 +0000 +--- libinterp/dldfcn/module.mk.orig 2016-11-13 15:22:17.000000000 +0000 +++ libinterp/dldfcn/module.mk @@ -39,7 +39,7 @@ octlib_LTLIBRARIES += $(DLDFCN_LIBS) ## of symbolic links %.oct : %.la -- $(AM_V_GEN)$(INSTALL_PROGRAM) dldfcn/.libs/$(shell $(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $<) $@ -+ $(AM_V_GEN)$(INSTALL_LIB) dldfcn/.libs/$(shell $(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $<) $@ +- $(AM_V_GEN)$(INSTALL_PROGRAM) libinterp/dldfcn/.libs/$(shell $(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $<) $@ ++ $(AM_V_GEN)$(INSTALL_LIB) libinterp/dldfcn/.libs/$(shell $(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $<) $@ else diff --git a/math/octave/patches/patch-libinterp_Makefile.am b/math/octave/patches/patch-libinterp_module.mk index 07645efd5ed..088a550cf76 100644 --- a/math/octave/patches/patch-libinterp_Makefile.am +++ b/math/octave/patches/patch-libinterp_module.mk @@ -1,10 +1,10 @@ -$NetBSD: patch-libinterp_Makefile.am,v 1.1 2016/02/16 04:21:40 dbj Exp $ +$NetBSD: patch-libinterp_module.mk,v 1.1 2016/11/19 21:53:12 maya Exp $ install .oct loadable modules with INSTALL_LIB to avoid stripping them ---- libinterp/Makefile.am.orig 2015-05-23 14:21:53.000000000 +0000 -+++ libinterp/Makefile.am -@@ -351,7 +351,7 @@ install-oct: +--- libinterp/module.mk.orig 2016-11-13 15:16:10.000000000 +0000 ++++ libinterp/module.mk +@@ -306,7 +306,7 @@ install-oct: f=`echo $$ltlib | $(SED) 's,.*/,,'`; \ dl=`$(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $$f`; \ if [ -n "$$dl" ]; then \ diff --git a/math/octave/patches/patch-libinterp_oct-conf.in.h b/math/octave/patches/patch-libinterp_oct-conf.in.h deleted file mode 100644 index e194fdc4915..00000000000 --- a/math/octave/patches/patch-libinterp_oct-conf.in.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-libinterp_oct-conf.in.h,v 1.1 2016/02/16 04:21:40 dbj Exp $ - ---- libinterp/oct-conf.in.h.orig 2015-05-23 14:21:53.000000000 +0000 -+++ libinterp/oct-conf.in.h -@@ -631,7 +631,7 @@ along with Octave; see the file COPYING. - #endif - - #ifndef OCTAVE_CONF_config_opts --#define OCTAVE_CONF_config_opts %OCTAVE_CONF_config_opts% -+#define OCTAVE_CONF_config_opts "" - #endif - - #endif diff --git a/math/octave/patches/patch-liboctave_numeric_oct-fftw.h b/math/octave/patches/patch-liboctave_numeric_oct-fftw.h deleted file mode 100644 index d4c13e28f5f..00000000000 --- a/math/octave/patches/patch-liboctave_numeric_oct-fftw.h +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-liboctave_numeric_oct-fftw.h,v 1.1 2016/02/16 04:21:40 dbj Exp $ - ---- liboctave/numeric/oct-fftw.h.orig 2015-05-23 14:21:53.000000000 +0000 -+++ liboctave/numeric/oct-fftw.h -@@ -99,7 +99,7 @@ public: - return instance_ok () ? instance->do_method (_meth) : dummy; - } - --#if defined (HAVE_FFTW3F_THREADS) -+#if defined (HAVE_FFTW3_THREADS) - static void threads (int _nthreads) - { - if (instance_ok () && _nthreads != threads ()) diff --git a/math/octave/patches/patch-liboctave_operators_mx-inlines.cc b/math/octave/patches/patch-liboctave_operators_mx-inlines.cc index da22ca77448..071e3a5393c 100644 --- a/math/octave/patches/patch-liboctave_operators_mx-inlines.cc +++ b/math/octave/patches/patch-liboctave_operators_mx-inlines.cc @@ -1,4 +1,4 @@ -$NetBSD: patch-liboctave_operators_mx-inlines.cc,v 1.2 2016/11/19 00:47:08 maya Exp $ +$NetBSD: patch-liboctave_operators_mx-inlines.cc,v 1.3 2016/11/19 21:53:12 maya Exp $ std::pow is required to promote numeric arguments to the smallest common float type. octave_int<> provides another test of template @@ -8,13 +8,13 @@ The combination of both leads to ambiguous resolutions. https://savannah.gnu.org/bugs/?43298 https://llvm.org/bugs/show_bug.cgi?id=21083 ---- liboctave/operators/mx-inlines.cc.orig 2015-05-23 14:21:53.000000000 +0000 +--- liboctave/operators/mx-inlines.cc.orig 2016-11-13 15:16:10.000000000 +0000 +++ liboctave/operators/mx-inlines.cc -@@ -307,7 +307,6 @@ inline void F (size_t n, R *r, X x, cons +@@ -398,7 +398,6 @@ DEFMINMAXSPEC (float, mx_inline_xmax, >= // Let the compiler decide which pow to use, whichever best matches the // arguments provided. -using std::pow; DEFMXMAPPER2X (mx_inline_pow, pow) - // Arbitrary function appliers. The function is a template parameter to enable + // Arbitrary function appliers. diff --git a/math/octave/patches/patch-liboctave_system_oct-time.cc b/math/octave/patches/patch-liboctave_system_oct-time.cc deleted file mode 100644 index 97ebea3a28e..00000000000 --- a/math/octave/patches/patch-liboctave_system_oct-time.cc +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-liboctave_system_oct-time.cc,v 1.1 2016/02/16 04:21:40 dbj Exp $ - ---- liboctave/system/oct-time.cc.orig 2015-05-23 14:21:53.000000000 +0000 -+++ liboctave/system/oct-time.cc -@@ -85,7 +85,7 @@ octave_time::stamp (void) - { - struct timeval tp; - -- gnulib::gettimeofday (&tp, 0); -+ gettimeofday (&tp, 0); - - ot_unix_time = tp.tv_sec; - ot_usec = tp.tv_usec; diff --git a/math/octave/patches/patch-liboctave_wrappers_strftime-wrapper.c b/math/octave/patches/patch-liboctave_wrappers_strftime-wrapper.c new file mode 100644 index 00000000000..0afb7ee11b4 --- /dev/null +++ b/math/octave/patches/patch-liboctave_wrappers_strftime-wrapper.c @@ -0,0 +1,15 @@ +$NetBSD: patch-liboctave_wrappers_strftime-wrapper.c,v 1.1 2016/11/19 21:53:12 maya Exp $ + +Don't have struct tm_zone (in netbsd), instead use timezone_t as libgnu does + +--- liboctave/wrappers/strftime-wrapper.c.orig 2016-11-13 15:16:10.000000000 +0000 ++++ liboctave/wrappers/strftime-wrapper.c +@@ -36,7 +36,7 @@ along with Octave; see the file COPYING. + + size_t + octave_strftime_wrapper (char *buf, size_t len, const char *fmt, +- const struct tm *t, struct tm_zone *tz, int ns) ++ const struct tm *t, timezone_t *tz, int ns) + { + return nstrftime (buf, len, fmt, t, tz, ns); + } diff --git a/math/octave/patches/patch-liboctave_wrappers_strftime-wrapper.h b/math/octave/patches/patch-liboctave_wrappers_strftime-wrapper.h new file mode 100644 index 00000000000..cd4f983b5ad --- /dev/null +++ b/math/octave/patches/patch-liboctave_wrappers_strftime-wrapper.h @@ -0,0 +1,15 @@ +$NetBSD: patch-liboctave_wrappers_strftime-wrapper.h,v 1.1 2016/11/19 21:53:12 maya Exp $ + +Don't have struct tm_zone (in netbsd), instead use timezone_t as libgnu does + +--- liboctave/wrappers/strftime-wrapper.h.orig 2016-11-13 15:16:10.000000000 +0000 ++++ liboctave/wrappers/strftime-wrapper.h +@@ -35,7 +35,7 @@ extern "C" { + + extern size_t + octave_strftime_wrapper (char *buf, size_t len, const char *fmt, +- const struct tm *t, struct tm_zone *tz, int ns); ++ const struct tm *t, timezone_t *tz, int ns); + + #if defined __cplusplus + } |