summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--math/octave/Makefile10
-rw-r--r--math/octave/PLIST117
-rw-r--r--math/octave/distinfo20
-rw-r--r--math/octave/patches/patch-configure389
-rw-r--r--math/octave/patches/patch-libgui_src_settings-dialog.h14
-rw-r--r--math/octave/patches/patch-libinterp_corefcn_input.cc15
-rw-r--r--math/octave/patches/patch-libinterp_dldfcn_config-module.awk12
-rw-r--r--math/octave/patches/patch-libinterp_dldfcn_module.mk10
-rw-r--r--math/octave/patches/patch-libinterp_module.mk15
-rw-r--r--math/octave/patches/patch-liboctave_operators_mx-inlines.cc20
-rw-r--r--math/octave/patches/patch-liboctave_wrappers_iconv-wrappers.h26
11 files changed, 154 insertions, 494 deletions
diff --git a/math/octave/Makefile b/math/octave/Makefile
index c196f682978..f2cdf8598e9 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.184 2018/12/26 10:45:46 adam Exp $
+# $NetBSD: Makefile,v 1.185 2019/03/05 11:11:12 ryoon Exp $
-DISTNAME= octave-4.4.1
-PKGREVISION= 6
+DISTNAME= octave-5.1.0
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_GNU:=octave/}
@@ -90,6 +89,11 @@ CFLAGS+= -fPIC
PREPEND_PATH+= ${QTDIR}/bin
+CHECK_WRKREF_SKIP+= lib/octave/5.1.0/liboctinterp.so*
+
+pre-configure:
+ cd ${WRKSRC} && autoconf
+
post-install:
.for f in ${OCTAVE_DOC}
${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/octave/${PKGVERSION_NOREV}/doc
diff --git a/math/octave/PLIST b/math/octave/PLIST
index 56d9f51e153..20ead58ed20 100644
--- a/math/octave/PLIST
+++ b/math/octave/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.32 2018/08/16 13:11:48 maya Exp $
+@comment $NetBSD: PLIST,v 1.33 2019/03/05 11:11:12 ryoon Exp $
bin/mkoctfile
bin/mkoctfile-${PKGVERSION}
bin/octave
@@ -133,7 +133,6 @@ include/${PKGNAME}/octave/graphics-handle.h
include/${PKGNAME}/octave/graphics-props.cc
include/${PKGNAME}/octave/graphics-toolkit.h
include/${PKGNAME}/octave/graphics.h
-include/${PKGNAME}/octave/gripes.h
include/${PKGNAME}/octave/gsvd.h
include/${PKGNAME}/octave/gtk-manager.h
include/${PKGNAME}/octave/help.h
@@ -157,11 +156,9 @@ 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
@@ -634,6 +631,7 @@ include/${PKGNAME}/octave/pr-output.h
include/${PKGNAME}/octave/procstream.h
include/${PKGNAME}/octave/profiler.h
include/${PKGNAME}/octave/pt-all.h
+include/${PKGNAME}/octave/pt-anon-scopes.h
include/${PKGNAME}/octave/pt-arg-list.h
include/${PKGNAME}/octave/pt-array-list.h
include/${PKGNAME}/octave/pt-assign.h
@@ -673,6 +671,7 @@ include/${PKGNAME}/octave/randgamma.h
include/${PKGNAME}/octave/randmtzig.h
include/${PKGNAME}/octave/randpoisson.h
include/${PKGNAME}/octave/schur.h
+include/${PKGNAME}/octave/settings.h
include/${PKGNAME}/octave/sighandlers.h
include/${PKGNAME}/octave/singleton-cleanup.h
include/${PKGNAME}/octave/smx-bm-sbm.h
@@ -702,10 +701,12 @@ include/${PKGNAME}/octave/sparse-xdiv.h
include/${PKGNAME}/octave/sparse-xpow.h
include/${PKGNAME}/octave/str-vec.h
include/${PKGNAME}/octave/svd.h
+include/${PKGNAME}/octave/syminfo.h
include/${PKGNAME}/octave/symrec.h
include/${PKGNAME}/octave/symscope.h
include/${PKGNAME}/octave/symtab.h
include/${PKGNAME}/octave/sysdep.h
+include/${PKGNAME}/octave/text-engine.h
include/${PKGNAME}/octave/text-renderer.h
include/${PKGNAME}/octave/token.h
include/${PKGNAME}/octave/toplev.h
@@ -755,8 +756,8 @@ lib/octave/${PKGVERSION}/__fltk_uigetfile__.a
lib/octave/${PKGVERSION}/__glpk__.a
lib/octave/${PKGVERSION}/__init_fltk__.a
lib/octave/${PKGVERSION}/__init_gnuplot__.a
+lib/octave/${PKGVERSION}/__init_qt__.a
lib/octave/${PKGVERSION}/__ode15__.a
-lib/octave/${PKGVERSION}/__osmesa_print__.a
lib/octave/${PKGVERSION}/__voronoi__.a
lib/octave/${PKGVERSION}/amd.a
lib/octave/${PKGVERSION}/audiodevinfo.a
@@ -778,8 +779,8 @@ lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__fltk_uigetfile__.oct
lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__glpk__.oct
lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__init_fltk__.oct
lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__init_gnuplot__.oct
+lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__init_qt__.oct
lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__ode15__.oct
-lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__osmesa_print__.oct
lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/__voronoi__.oct
lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/amd.oct
lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/audiodevinfo.oct
@@ -797,7 +798,10 @@ lib/octave/${PKGVERSION}/oct/${MACHINE_GNU_PLATFORM}/symrcm.oct
lib/octave/${PKGVERSION}/qr.a
lib/octave/${PKGVERSION}/symbfact.a
lib/octave/${PKGVERSION}/symrcm.a
+lib/pkgconfig/octave.pc
+lib/pkgconfig/octinterp.pc
libexec/octave/${PKGVERSION}/exec/${MACHINE_GNU_PLATFORM}/octave-gui
+libexec/octave/${PKGVERSION}/exec/${MACHINE_GNU_PLATFORM}/octave-svgconvert
share/applications/org.octave.Octave.desktop
share/icons/hicolor/128x128/apps/octave.png
share/icons/hicolor/16x16/apps/octave.png
@@ -872,9 +876,13 @@ share/octave/${PKGVERSION}/etc/tests/fixed/bug-41723/bug-41723.tst
share/octave/${PKGVERSION}/etc/tests/fixed/bug-41723/class_bug41723.m
share/octave/${PKGVERSION}/etc/tests/fixed/bug-44940/bug-44940.tst
share/octave/${PKGVERSION}/etc/tests/fixed/bug-44940/class_bug44940.m
+share/octave/${PKGVERSION}/etc/tests/fixed/bug-45969.tst
+share/octave/${PKGVERSION}/etc/tests/fixed/bug-45972.tst
share/octave/${PKGVERSION}/etc/tests/fixed/bug-46330.tst
share/octave/${PKGVERSION}/etc/tests/fixed/bug-46660/bug-46660.tst
share/octave/${PKGVERSION}/etc/tests/fixed/bug-46660/class_bug46660.m
+share/octave/${PKGVERSION}/etc/tests/fixed/bug-49379/bug-49379.tst
+share/octave/${PKGVERSION}/etc/tests/fixed/bug-49379/class_bug49379.m
share/octave/${PKGVERSION}/etc/tests/fixed/bug-49904.tst
share/octave/${PKGVERSION}/etc/tests/fixed/bug-50014/bug-50014.tst
share/octave/${PKGVERSION}/etc/tests/fixed/bug-50014/duplicate_nested_function.m
@@ -913,8 +921,19 @@ share/octave/${PKGVERSION}/etc/tests/fixed/bug-53027/gtest53027.m
share/octave/${PKGVERSION}/etc/tests/fixed/bug-53027/ntest53027a.m
share/octave/${PKGVERSION}/etc/tests/fixed/bug-53027/ntest53027b.m
share/octave/${PKGVERSION}/etc/tests/fixed/bug-53027/ntest53027c.m
+share/octave/${PKGVERSION}/etc/tests/fixed/bug-53468/bug-53468.tst
+share/octave/${PKGVERSION}/etc/tests/fixed/bug-53468/ofig403.ofig
+share/octave/${PKGVERSION}/etc/tests/fixed/bug-53468/ofig421.ofig
+share/octave/${PKGVERSION}/etc/tests/fixed/bug-53468/ofig51.ofig
share/octave/${PKGVERSION}/etc/tests/fixed/bug-53579.tst
share/octave/${PKGVERSION}/etc/tests/fixed/bug-53599.tst
+share/octave/${PKGVERSION}/etc/tests/fixed/bug-54490.tst
+share/octave/${PKGVERSION}/etc/tests/fixed/bug-54995/@testclass54995/subsref.m
+share/octave/${PKGVERSION}/etc/tests/fixed/bug-54995/@testclass54995/testclass54995.m
+share/octave/${PKGVERSION}/etc/tests/fixed/bug-54995/bug-54995.tst
+share/octave/${PKGVERSION}/etc/tests/fixed/bug-55308.tst
+share/octave/${PKGVERSION}/etc/tests/fixed/bug-55321.tst
+share/octave/${PKGVERSION}/etc/tests/fixed/bug-55322.tst
share/octave/${PKGVERSION}/etc/tests/fixed/class-concat/@foo/foo.m
share/octave/${PKGVERSION}/etc/tests/fixed/class-concat/class-concat.tst
share/octave/${PKGVERSION}/etc/tests/fixed/classdef-multiple-inheritance/base_1.m
@@ -925,6 +944,7 @@ share/octave/${PKGVERSION}/etc/tests/fixed/classdef-multiple-inheritance/classde
share/octave/${PKGVERSION}/etc/tests/fixed/classdef/classdef.tst
share/octave/${PKGVERSION}/etc/tests/fixed/classdef/foo_method_changes_property_size.m
share/octave/${PKGVERSION}/etc/tests/fixed/classdef/foo_static_method_constant_property.m
+share/octave/${PKGVERSION}/etc/tests/fixed/classdef/foo_subsref_subsasgn.m
share/octave/${PKGVERSION}/etc/tests/fixed/classdef/foo_value_class.m
share/octave/${PKGVERSION}/etc/tests/fixed/classdef/plist_t1.m
share/octave/${PKGVERSION}/etc/tests/fixed/classdef/plist_t2.m
@@ -936,10 +956,16 @@ share/octave/${PKGVERSION}/etc/tests/fixed/classes/@Blork/display.m
share/octave/${PKGVERSION}/etc/tests/fixed/classes/@Blork/get.m
share/octave/${PKGVERSION}/etc/tests/fixed/classes/@Blork/set.m
share/octave/${PKGVERSION}/etc/tests/fixed/classes/@CPrecedenceTester1/CPrecedenceTester1.m
+share/octave/${PKGVERSION}/etc/tests/fixed/classes/@CPrecedenceTester1/double.m
+share/octave/${PKGVERSION}/etc/tests/fixed/classes/@CPrecedenceTester1/plus.m
share/octave/${PKGVERSION}/etc/tests/fixed/classes/@CPrecedenceTester1/tattack.m
share/octave/${PKGVERSION}/etc/tests/fixed/classes/@CPrecedenceTester2/CPrecedenceTester2.m
+share/octave/${PKGVERSION}/etc/tests/fixed/classes/@CPrecedenceTester2/double.m
+share/octave/${PKGVERSION}/etc/tests/fixed/classes/@CPrecedenceTester2/plus.m
share/octave/${PKGVERSION}/etc/tests/fixed/classes/@CPrecedenceTester2/tattack.m
share/octave/${PKGVERSION}/etc/tests/fixed/classes/@CPrecedenceTester3/CPrecedenceTester3.m
+share/octave/${PKGVERSION}/etc/tests/fixed/classes/@CPrecedenceTester3/double.m
+share/octave/${PKGVERSION}/etc/tests/fixed/classes/@CPrecedenceTester3/plus.m
share/octave/${PKGVERSION}/etc/tests/fixed/classes/@CPrecedenceTester3/tattack.m
share/octave/${PKGVERSION}/etc/tests/fixed/classes/@Cork/Cork.m
share/octave/${PKGVERSION}/etc/tests/fixed/classes/@Cork/click.m
@@ -1050,6 +1076,7 @@ share/octave/${PKGVERSION}/etc/tests/fixed/func.tst
share/octave/${PKGVERSION}/etc/tests/fixed/global.tst
share/octave/${PKGVERSION}/etc/tests/fixed/if.tst
share/octave/${PKGVERSION}/etc/tests/fixed/index.tst
+share/octave/${PKGVERSION}/etc/tests/fixed/integer.tst
share/octave/${PKGVERSION}/etc/tests/fixed/io.tst
share/octave/${PKGVERSION}/etc/tests/fixed/jit.tst
share/octave/${PKGVERSION}/etc/tests/fixed/leftdiv.tst
@@ -1076,6 +1103,17 @@ 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/pkg/mfile_basic_test/COPYING
+share/octave/${PKGVERSION}/etc/tests/fixed/pkg/mfile_basic_test/DESCRIPTION
+share/octave/${PKGVERSION}/etc/tests/fixed/pkg/mfile_basic_test/INDEX
+share/octave/${PKGVERSION}/etc/tests/fixed/pkg/mfile_basic_test/NEWS
+share/octave/${PKGVERSION}/etc/tests/fixed/pkg/mfile_basic_test/doc/example-package.txi
+share/octave/${PKGVERSION}/etc/tests/fixed/pkg/mfile_basic_test/doc/macros.texi
+share/octave/${PKGVERSION}/etc/tests/fixed/pkg/mfile_basic_test/inst/example_mfile.m
+share/octave/${PKGVERSION}/etc/tests/fixed/pkg/mfile_minimal_test/COPYING
+share/octave/${PKGVERSION}/etc/tests/fixed/pkg/mfile_minimal_test/DESCRIPTION
+share/octave/${PKGVERSION}/etc/tests/fixed/pkg/mfile_minimal_test/inst/example_mfile.m
+share/octave/${PKGVERSION}/etc/tests/fixed/pkg/pkg.tst
share/octave/${PKGVERSION}/etc/tests/fixed/prefer.tst
share/octave/${PKGVERSION}/etc/tests/fixed/publish/publish.tst
share/octave/${PKGVERSION}/etc/tests/fixed/publish/test_script.m
@@ -1166,9 +1204,9 @@ share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/regexp.cc-tst
share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/schur.cc-tst
share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/sighandlers.cc-tst
share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/sparse-xpow.cc-tst
+share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/sparse.cc-tst
share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/spparms.cc-tst
share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/sqrtm.cc-tst
-share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/str2double.cc-tst
share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/strfind.cc-tst
share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/strfns.cc-tst
share/octave/${PKGVERSION}/etc/tests/libinterp/corefcn/sub2ind.cc-tst
@@ -1190,12 +1228,12 @@ 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
share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/audiodevinfo.cc-tst
share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/audioread.cc-tst
share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/chol.cc-tst
+share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/colamd.cc-tst
share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/convhulln.cc-tst
share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/dmperm.cc-tst
share/octave/${PKGVERSION}/etc/tests/libinterp/dldfcn/fftw.cc-tst
@@ -1219,12 +1257,12 @@ 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
share/octave/${PKGVERSION}/etc/tests/libinterp/parse-tree/lex.ll-tst
-share/octave/${PKGVERSION}/etc/tests/libinterp/parse-tree/oct-parse.in.yy-tst
+share/octave/${PKGVERSION}/etc/tests/libinterp/parse-tree/oct-parse.yy-tst
share/octave/${PKGVERSION}/etc/tests/libinterp/parse-tree/pt-assign.cc-tst
share/octave/${PKGVERSION}/etc/tests/libinterp/parse-tree/pt-eval.cc-tst
share/octave/${PKGVERSION}/etc/tests/libinterp/parse-tree/pt-fcn-handle.cc-tst
share/octave/${PKGVERSION}/etc/tests/libinterp/parse-tree/pt-idx.cc-tst
-share/octave/${PKGVERSION}/etc/tests/libinterp/parse-tree/pt-mat.cc-tst
+share/octave/${PKGVERSION}/etc/tests/libinterp/parse-tree/pt-tm-const.cc-tst
share/octave/${PKGVERSION}/etc/tests/liboctave/array/Array.cc-tst
share/octave/${PKGVERSION}/etc/tests/liboctave/array/CMatrix.cc-tst
share/octave/${PKGVERSION}/etc/tests/liboctave/array/CSparse.cc-tst
@@ -1252,6 +1290,7 @@ 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
+share/octave/${PKGVERSION}/locale/lt_LT.qm
share/octave/${PKGVERSION}/locale/nl_NL.qm
share/octave/${PKGVERSION}/locale/pt_BR.qm
share/octave/${PKGVERSION}/locale/pt_PT.qm
@@ -1259,6 +1298,8 @@ share/octave/${PKGVERSION}/locale/ru_RU.qm
share/octave/${PKGVERSION}/locale/uk_UA.qm
share/octave/${PKGVERSION}/locale/zh_CN.qm
share/octave/${PKGVERSION}/m/+containers/Map.m
+share/octave/${PKGVERSION}/m/+matlab/+lang/makeUniqueStrings.m
+share/octave/${PKGVERSION}/m/+matlab/+lang/makeValidName.m
share/octave/${PKGVERSION}/m/@ftp/ascii.m
share/octave/${PKGVERSION}/m/@ftp/binary.m
share/octave/${PKGVERSION}/m/@ftp/cd.m
@@ -1308,25 +1349,15 @@ share/octave/${PKGVERSION}/m/audio/mu2lin.m
share/octave/${PKGVERSION}/m/audio/record.m
share/octave/${PKGVERSION}/m/audio/sound.m
share/octave/${PKGVERSION}/m/audio/soundsc.m
-share/octave/${PKGVERSION}/m/deprecated/bitmax.m
share/octave/${PKGVERSION}/m/deprecated/chop.m
share/octave/${PKGVERSION}/m/deprecated/comma.m
share/octave/${PKGVERSION}/m/deprecated/desktop.m
-share/octave/${PKGVERSION}/m/deprecated/isstr.m
share/octave/${PKGVERSION}/m/deprecated/java2mat.m
-share/octave/${PKGVERSION}/m/deprecated/mahalanobis.m
-share/octave/${PKGVERSION}/m/deprecated/md5sum.m
-share/octave/${PKGVERSION}/m/deprecated/octave_config_info.m
-share/octave/${PKGVERSION}/m/deprecated/onenormest.m
+share/octave/${PKGVERSION}/m/deprecated/output_max_field_width.m
share/octave/${PKGVERSION}/m/deprecated/paren.m
share/octave/${PKGVERSION}/m/deprecated/semicolon.m
-share/octave/${PKGVERSION}/m/deprecated/setstr.m
-share/octave/${PKGVERSION}/m/deprecated/sleep.m
share/octave/${PKGVERSION}/m/deprecated/tmpnam.m
share/octave/${PKGVERSION}/m/deprecated/toascii.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
@@ -1374,7 +1405,6 @@ share/octave/${PKGVERSION}/m/general/deg2rad.m
share/octave/${PKGVERSION}/m/general/del2.m
share/octave/${PKGVERSION}/m/general/divergence.m
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/gradient.m
@@ -1440,6 +1470,7 @@ share/octave/${PKGVERSION}/m/gui/helpdlg.m
share/octave/${PKGVERSION}/m/gui/inputdlg.m
share/octave/${PKGVERSION}/m/gui/isappdata.m
share/octave/${PKGVERSION}/m/gui/listdlg.m
+share/octave/${PKGVERSION}/m/gui/movegui.m
share/octave/${PKGVERSION}/m/gui/msgbox.m
share/octave/${PKGVERSION}/m/gui/private/__file_filter__.m
share/octave/${PKGVERSION}/m/gui/private/__fltk_file_filter__.m
@@ -1462,6 +1493,7 @@ share/octave/${PKGVERSION}/m/gui/uipanel.m
share/octave/${PKGVERSION}/m/gui/uipushtool.m
share/octave/${PKGVERSION}/m/gui/uiputfile.m
share/octave/${PKGVERSION}/m/gui/uiresume.m
+share/octave/${PKGVERSION}/m/gui/uitable.m
share/octave/${PKGVERSION}/m/gui/uitoggletool.m
share/octave/${PKGVERSION}/m/gui/uitoolbar.m
share/octave/${PKGVERSION}/m/gui/uiwait.m
@@ -1520,6 +1552,7 @@ share/octave/${PKGVERSION}/m/image/ind2rgb.m
share/octave/${PKGVERSION}/m/image/iscolormap.m
share/octave/${PKGVERSION}/m/image/jet.m
share/octave/${PKGVERSION}/m/image/lines.m
+share/octave/${PKGVERSION}/m/image/movie.m
share/octave/${PKGVERSION}/m/image/ocean.m
share/octave/${PKGVERSION}/m/image/pink.m
share/octave/${PKGVERSION}/m/image/prism.m
@@ -1549,8 +1582,6 @@ share/octave/${PKGVERSION}/m/io/dlmwrite.m
share/octave/${PKGVERSION}/m/io/fileread.m
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/java/javaArray.m
share/octave/${PKGVERSION}/m/java/java_get.m
share/octave/${PKGVERSION}/m/java/java_set.m
@@ -1560,6 +1591,16 @@ share/octave/${PKGVERSION}/m/java/javaclasspath.m
share/octave/${PKGVERSION}/m/java/javamem.m
share/octave/${PKGVERSION}/m/java/javarmpath.m
share/octave/${PKGVERSION}/m/java/usejava.m
+share/octave/${PKGVERSION}/m/legacy/findstr.m
+share/octave/${PKGVERSION}/m/legacy/flipdim.m
+share/octave/${PKGVERSION}/m/legacy/genvarname.m
+share/octave/${PKGVERSION}/m/legacy/isdir.m
+share/octave/${PKGVERSION}/m/legacy/isequalwithequalnans.m
+share/octave/${PKGVERSION}/m/legacy/isstr.m
+share/octave/${PKGVERSION}/m/legacy/setstr.m
+share/octave/${PKGVERSION}/m/legacy/strmatch.m
+share/octave/${PKGVERSION}/m/legacy/strread.m
+share/octave/${PKGVERSION}/m/legacy/textread.m
share/octave/${PKGVERSION}/m/linear-algebra/bandwidth.m
share/octave/${PKGVERSION}/m/linear-algebra/commutation_matrix.m
share/octave/${PKGVERSION}/m/linear-algebra/cond.m
@@ -1585,6 +1626,7 @@ 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/ols.m
+share/octave/${PKGVERSION}/m/linear-algebra/ordeig.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
@@ -1598,6 +1640,7 @@ share/octave/${PKGVERSION}/m/miscellaneous/bug_report.m
share/octave/${PKGVERSION}/m/miscellaneous/bunzip2.m
share/octave/${PKGVERSION}/m/miscellaneous/cast.m
share/octave/${PKGVERSION}/m/miscellaneous/citation.m
+share/octave/${PKGVERSION}/m/miscellaneous/clearvars.m
share/octave/${PKGVERSION}/m/miscellaneous/compare_versions.m
share/octave/${PKGVERSION}/m/miscellaneous/computer.m
share/octave/${PKGVERSION}/m/miscellaneous/copyfile.m
@@ -1610,7 +1653,6 @@ share/octave/${PKGVERSION}/m/miscellaneous/fieldnames.m
share/octave/${PKGVERSION}/m/miscellaneous/fileattrib.m
share/octave/${PKGVERSION}/m/miscellaneous/fileparts.m
share/octave/${PKGVERSION}/m/miscellaneous/fullfile.m
-share/octave/${PKGVERSION}/m/miscellaneous/genvarname.m
share/octave/${PKGVERSION}/m/miscellaneous/getfield.m
share/octave/${PKGVERSION}/m/miscellaneous/grabcode.m
share/octave/${PKGVERSION}/m/miscellaneous/gunzip.m
@@ -1618,7 +1660,8 @@ share/octave/${PKGVERSION}/m/miscellaneous/info.m
share/octave/${PKGVERSION}/m/miscellaneous/inputParser.m
share/octave/${PKGVERSION}/m/miscellaneous/inputname.m
share/octave/${PKGVERSION}/m/miscellaneous/isdeployed.m
-share/octave/${PKGVERSION}/m/miscellaneous/isdir.m
+share/octave/${PKGVERSION}/m/miscellaneous/isfile.m
+share/octave/${PKGVERSION}/m/miscellaneous/isfolder.m
share/octave/${PKGVERSION}/m/miscellaneous/ismac.m
share/octave/${PKGVERSION}/m/miscellaneous/ispc.m
share/octave/${PKGVERSION}/m/miscellaneous/isunix.m
@@ -1924,6 +1967,7 @@ share/octave/${PKGVERSION}/m/plot/util/linkprop.m
share/octave/${PKGVERSION}/m/plot/util/meshgrid.m
share/octave/${PKGVERSION}/m/plot/util/ndgrid.m
share/octave/${PKGVERSION}/m/plot/util/newplot.m
+share/octave/${PKGVERSION}/m/plot/util/openfig.m
share/octave/${PKGVERSION}/m/plot/util/pan.m
share/octave/${PKGVERSION}/m/plot/util/print.m
share/octave/${PKGVERSION}/m/plot/util/printd.m
@@ -1946,6 +1990,7 @@ share/octave/${PKGVERSION}/m/plot/util/refreshdata.m
share/octave/${PKGVERSION}/m/plot/util/rotate.m
share/octave/${PKGVERSION}/m/plot/util/rotate3d.m
share/octave/${PKGVERSION}/m/plot/util/saveas.m
+share/octave/${PKGVERSION}/m/plot/util/savefig.m
share/octave/${PKGVERSION}/m/plot/util/shg.m
share/octave/${PKGVERSION}/m/plot/util/struct2hdl.m
share/octave/${PKGVERSION}/m/plot/util/subplot.m
@@ -2000,6 +2045,7 @@ share/octave/${PKGVERSION}/m/set/setdiff.m
share/octave/${PKGVERSION}/m/set/setxor.m
share/octave/${PKGVERSION}/m/set/union.m
share/octave/${PKGVERSION}/m/set/unique.m
+share/octave/${PKGVERSION}/m/signal/__parse_movargs__.m
share/octave/${PKGVERSION}/m/signal/arch_fit.m
share/octave/${PKGVERSION}/m/signal/arch_rnd.m
share/octave/${PKGVERSION}/m/signal/arch_test.m
@@ -2021,6 +2067,8 @@ share/octave/${PKGVERSION}/m/signal/hamming.m
share/octave/${PKGVERSION}/m/signal/hanning.m
share/octave/${PKGVERSION}/m/signal/hurst.m
share/octave/${PKGVERSION}/m/signal/ifftshift.m
+share/octave/${PKGVERSION}/m/signal/movfun.m
+share/octave/${PKGVERSION}/m/signal/movslice.m
share/octave/${PKGVERSION}/m/signal/periodogram.m
share/octave/${PKGVERSION}/m/signal/private/rectangle_lw.m
share/octave/${PKGVERSION}/m/signal/private/rectangle_sw.m
@@ -2128,6 +2176,15 @@ share/octave/${PKGVERSION}/m/statistics/meansq.m
share/octave/${PKGVERSION}/m/statistics/median.m
share/octave/${PKGVERSION}/m/statistics/mode.m
share/octave/${PKGVERSION}/m/statistics/moment.m
+share/octave/${PKGVERSION}/m/statistics/movmad.m
+share/octave/${PKGVERSION}/m/statistics/movmax.m
+share/octave/${PKGVERSION}/m/statistics/movmean.m
+share/octave/${PKGVERSION}/m/statistics/movmedian.m
+share/octave/${PKGVERSION}/m/statistics/movmin.m
+share/octave/${PKGVERSION}/m/statistics/movprod.m
+share/octave/${PKGVERSION}/m/statistics/movstd.m
+share/octave/${PKGVERSION}/m/statistics/movsum.m
+share/octave/${PKGVERSION}/m/statistics/movvar.m
share/octave/${PKGVERSION}/m/statistics/prctile.m
share/octave/${PKGVERSION}/m/statistics/quantile.m
share/octave/${PKGVERSION}/m/statistics/range.m
@@ -2149,7 +2206,6 @@ share/octave/${PKGVERSION}/m/strings/dec2base.m
share/octave/${PKGVERSION}/m/strings/dec2bin.m
share/octave/${PKGVERSION}/m/strings/dec2hex.m
share/octave/${PKGVERSION}/m/strings/erase.m
-share/octave/${PKGVERSION}/m/strings/findstr.m
share/octave/${PKGVERSION}/m/strings/hex2dec.m
share/octave/${PKGVERSION}/m/strings/index.m
share/octave/${PKGVERSION}/m/strings/isletter.m
@@ -2165,7 +2221,6 @@ share/octave/${PKGVERSION}/m/strings/strcat.m
share/octave/${PKGVERSION}/m/strings/strchr.m
share/octave/${PKGVERSION}/m/strings/strjoin.m
share/octave/${PKGVERSION}/m/strings/strjust.m
-share/octave/${PKGVERSION}/m/strings/strmatch.m
share/octave/${PKGVERSION}/m/strings/strsplit.m
share/octave/${PKGVERSION}/m/strings/strtok.m
share/octave/${PKGVERSION}/m/strings/strtrim.m
@@ -2205,11 +2260,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-v52/m
+@pkgdir share/octave/site/api-v53/m
@pkgdir share/octave/${PKGVERSION}/site/m
@pkgdir libexec/octave/site/exec/${MACHINE_GNU_PLATFORM}
-@pkgdir libexec/octave/api-v52/site/exec/${MACHINE_GNU_PLATFORM}
+@pkgdir libexec/octave/api-v53/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-v52/${MACHINE_GNU_PLATFORM}
+@pkgdir lib/octave/site/oct/api-v53/${MACHINE_GNU_PLATFORM}
@pkgdir lib/octave/${PKGVERSION}/site/oct/${MACHINE_GNU_PLATFORM}
diff --git a/math/octave/distinfo b/math/octave/distinfo
index 34933c19726..294a518d510 100644
--- a/math/octave/distinfo
+++ b/math/octave/distinfo
@@ -1,19 +1,17 @@
-$NetBSD: distinfo,v 1.55 2018/12/26 10:45:46 adam Exp $
+$NetBSD: distinfo,v 1.56 2019/03/05 11:11:12 ryoon Exp $
-SHA1 (octave-4.4.1.tar.gz) = 693fe46fdf49c62dec9f81100050ba2d2c1e4067
-RMD160 (octave-4.4.1.tar.gz) = 45d1efbd217308ff9a7b3354ccc004f37785a270
-SHA512 (octave-4.4.1.tar.gz) = 21a1f13e2145fa530f2169254d19442b572745d65b91453ba1f552f6eda6aecfead57dbe0260b3293a29db0aa0f27cfd4f26df332e6d640848a822b20c1232f8
-Size (octave-4.4.1.tar.gz) = 28626462 bytes
-SHA1 (patch-configure) = f10abb7c15d7181da775fd8ccc824ef616cc2a32
+SHA1 (octave-5.1.0.tar.gz) = 75a5ec450473e4c39290fdab9feade4a5739e465
+RMD160 (octave-5.1.0.tar.gz) = b8b4469d70f1b67be688e12ff551e6b614c70213
+SHA512 (octave-5.1.0.tar.gz) = a842fb50c13f25e9d425fe9a2c71d9433d7e125747d2175efe0c9b2a780c799d9ce1ee085b5a13fbfedb7990b0ba5d11079d880ddb3bdb66782efc321390eebb
+Size (octave-5.1.0.tar.gz) = 32034788 bytes
SHA1 (patch-configure.ac) = df35493bc99f8b133865d96f079f603a33ef5cc4
SHA1 (patch-doc_interpreter_module.mk) = 66389cceddbe71fca0c8197275a839170d64ad5b
SHA1 (patch-fseeko-fpos_t.c) = b38e7a38be2e0b323cd7f168f1d22d3df998691c
SHA1 (patch-libgnu_stdio.in.h) = 112a424655d46c75fb68531fe7a84d9a0e97a984
-SHA1 (patch-libgui_src_settings-dialog.h) = 5bf82e5d313e06ec470a1da1a615c39f74bb880f
-SHA1 (patch-libinterp_dldfcn_config-module.awk) = 4a6c7ee86a626a43b1c0c3514a5909cb6b663719
-SHA1 (patch-libinterp_dldfcn_module.mk) = 1ec48eb2115da9095a8d8fe9497b25c2bc41bd91
-SHA1 (patch-libinterp_module.mk) = 26889c064497eb2bcbd77199e96925f61359c128
-SHA1 (patch-liboctave_operators_mx-inlines.cc) = 67e9c8e9a3afe0339343087d68967ac6d9159bd5
+SHA1 (patch-libinterp_corefcn_input.cc) = 1dc78f00ffbb41f493ebc0889cc0a37d598507c5
+SHA1 (patch-libinterp_dldfcn_config-module.awk) = 54b64357b1ef80c5e55eb5eccf742d2267eb277d
+SHA1 (patch-libinterp_dldfcn_module.mk) = 2362d824497a8892078437c24757ae1e40e2e556
+SHA1 (patch-liboctave_wrappers_iconv-wrappers.h) = 9995e784844ae2c2d7a77f975cd8b8954ab8a773
SHA1 (patch-m4_acinclude.m4) = 16dfa3a47403b0c6bc5935fdb5f1162a393b3f25
SHA1 (patch-scripts_miscellaneous_unpack.m) = 82c9ca170762e223c8e5a6f88a7dd9fe2a2a33d0
SHA1 (patch-scripts_pkg_private_configure__make.m) = 7d4b620f889faa66c4c9c581ef8a7e7692b68c94
diff --git a/math/octave/patches/patch-configure b/math/octave/patches/patch-configure
deleted file mode 100644
index 4e22fb0c106..00000000000
--- a/math/octave/patches/patch-configure
+++ /dev/null
@@ -1,389 +0,0 @@
-$NetBSD: patch-configure,v 1.8 2018/12/26 10:45:46 adam Exp $
-
-Regen.
-
-install .oct loadable modules with INSTALL_LIB to avoid stripping them
-
-we pass and assume a given MACHINE_GNU_PLATFORM, but this package did not
-use this value due to an error.
-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
-
-Allow overriding MKOCTFILE_F77 so we can provide the full path to gfortran
-(for building octave-forge packages like control)
-
-Additional changes are due to autoconf changes.
-
---- configure.orig 2018-08-09 18:20:32.000000000 +0000
-+++ configure
-@@ -761,10 +761,6 @@ ac_ct_QHELPGENERATOR
- QHELPGENERATOR
- ac_ct_QHELPGENERATOR_QTVER
- QHELPGENERATOR_QTVER
--ac_ct_QCOLLECTIONGENERATOR
--QCOLLECTIONGENERATOR
--ac_ct_QCOLLECTIONGENERATOR_QTVER
--QCOLLECTIONGENERATOR_QTVER
- ac_ct_LRELEASE
- LRELEASE
- ac_ct_LRELEASE_QTVER
-@@ -1733,6 +1729,7 @@ INCLUDE_NEXT_AS_FIRST_DIRECTIVE
- INCLUDE_NEXT
- LIB_CRYPTO
- pkglibexecdir
-+runstatedir
- lispdir
- REPLACE_FDOPENDIR
- REPLACE_DIRFD
-@@ -2092,6 +2089,7 @@ PYTHON
- DEFAULT_PAGER
- GNUPLOT
- GHOSTSCRIPT
-+INSTALL_LIB
- LN_S
- REPRODUCIBLE_TAR_FLAGS
- TEXI2PDF
-@@ -2221,7 +2219,6 @@ infodir
- docdir
- oldincludedir
- includedir
--runstatedir
- localstatedir
- sharedstatedir
- sysconfdir
-@@ -2446,7 +2443,6 @@ datadir='${datarootdir}'
- sysconfdir='${prefix}/etc'
- sharedstatedir='${prefix}/com'
- localstatedir='${prefix}/var'
--runstatedir='${localstatedir}/run'
- includedir='${prefix}/include'
- oldincludedir='/usr/include'
- docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
-@@ -2699,15 +2695,6 @@ do
- | -silent | --silent | --silen | --sile | --sil)
- silent=yes ;;
-
-- -runstatedir | --runstatedir | --runstatedi | --runstated \
-- | --runstate | --runstat | --runsta | --runst | --runs \
-- | --run | --ru | --r)
-- ac_prev=runstatedir ;;
-- -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
-- | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
-- | --run=* | --ru=* | --r=*)
-- runstatedir=$ac_optarg ;;
--
- -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
- ac_prev=sbindir ;;
- -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-@@ -2845,7 +2832,7 @@ fi
- for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
- datadir sysconfdir sharedstatedir localstatedir includedir \
- oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-- libdir localedir mandir runstatedir
-+ libdir localedir mandir
- do
- eval ac_val=\$$ac_var
- # Remove trailing slashes.
-@@ -2998,7 +2985,6 @@ Fine tuning of the installation director
- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
-- --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
- --libdir=DIR object code libraries [EPREFIX/lib]
- --includedir=DIR C header files [PREFIX/include]
- --oldincludedir=DIR C header files for non-gcc [/usr/include]
-@@ -6043,7 +6029,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
-- canonical_host_type=$host
-+ canonical_host_type=$host_alias
-
- if test -z "$host_cpu"; then
- host_cpu=unknown
-@@ -9414,7 +9400,10 @@ fi
-
-
-
--INSTALL_SCRIPT="${INSTALL}"
-+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-+
-+test -z "$INSTALL_LIB" && INSTALL_LIB='${INSTALL_SCRIPT}'
-+
-
-
- ## Programs used when running Octave.
-@@ -12974,6 +12963,11 @@ fi
- done
- ;;
- -[lLR]*)
-+ case $ac_arg in
-+ -R*)
-+ ac_arg="-Wl,$ac_arg"
-+ ;;
-+ esac
- ac_exists=false
- for ac_i in $ac_cv_f77_libs; do
- if test x"$ac_arg" = x"$ac_i"; then
-@@ -34971,13 +34965,13 @@ if test "$cross_compiling" = yes && test
- MKOCTFILE_LD_CXX=`echo "$LD_CXX" | $SED "s,$CROSS_TOOL_PREFIX,,"`
- MKOCTFILE_RANLIB=`echo "$RANLIB" | $SED "s,$CROSS_TOOL_PREFIX,,"`
- else
-- MKOCTFILE_AR="$AR"
-- MKOCTFILE_CC="$CC"
-- MKOCTFILE_CXX="$CXX"
-- MKOCTFILE_DL_LD="$DL_LD"
-- MKOCTFILE_F77="$F77"
-- MKOCTFILE_LD_CXX="$LD_CXX"
-- MKOCTFILE_RANLIB="$RANLIB"
-+ MKOCTFILE_AR="${MKOCTFILE_AR-$AR}"
-+ MKOCTFILE_CC="${MKOCTFILE_CC-$CC}"
-+ MKOCTFILE_CXX="${MKOCTFILE_CXX-$CXX}"
-+ MKOCTFILE_DL_LD="${MKOCTFILE_DL_LD-$DL_LD}"
-+ MKOCTFILE_F77="${MKOCTFILE_F77-$F77}"
-+ MKOCTFILE_LD_CXX="${MKOCTFILE_LD_CXX-$LD_CXX}"
-+ MKOCTFILE_RANLIB="${MKOCTFILE_RANLIB-$RANLIB}"
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: defining CROSS_TOOL_PREFIX to be $CROSS_TOOL_PREFIX" >&5
- $as_echo "$as_me: defining CROSS_TOOL_PREFIX to be $CROSS_TOOL_PREFIX" >&6;}
-@@ -36091,6 +36085,8 @@ else
- # ifdef _MSC_VER
- # include <malloc.h>
- # define alloca _alloca
-+# elif defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__OpenBSD__)
-+# include <stdlib.h>
- # else
- # ifdef HAVE_ALLOCA_H
- # include <alloca.h>
-@@ -71654,221 +71650,6 @@ fi
-
-
- if test -n "$ac_tool_prefix"; then
-- for ac_prog in qcollectiongenerator-qt$qt_version
-- do
-- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
--set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_prog_QCOLLECTIONGENERATOR_QTVER+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- if test -n "$QCOLLECTIONGENERATOR_QTVER"; then
-- ac_cv_prog_QCOLLECTIONGENERATOR_QTVER="$QCOLLECTIONGENERATOR_QTVER" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_prog_QCOLLECTIONGENERATOR_QTVER="$ac_tool_prefix$ac_prog"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
-- done
--IFS=$as_save_IFS
--
--fi
--fi
--QCOLLECTIONGENERATOR_QTVER=$ac_cv_prog_QCOLLECTIONGENERATOR_QTVER
--if test -n "$QCOLLECTIONGENERATOR_QTVER"; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QCOLLECTIONGENERATOR_QTVER" >&5
--$as_echo "$QCOLLECTIONGENERATOR_QTVER" >&6; }
--else
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
-- test -n "$QCOLLECTIONGENERATOR_QTVER" && break
-- done
--fi
--if test -z "$QCOLLECTIONGENERATOR_QTVER"; then
-- ac_ct_QCOLLECTIONGENERATOR_QTVER=$QCOLLECTIONGENERATOR_QTVER
-- for ac_prog in qcollectiongenerator-qt$qt_version
--do
-- # Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_prog_ac_ct_QCOLLECTIONGENERATOR_QTVER+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- if test -n "$ac_ct_QCOLLECTIONGENERATOR_QTVER"; then
-- ac_cv_prog_ac_ct_QCOLLECTIONGENERATOR_QTVER="$ac_ct_QCOLLECTIONGENERATOR_QTVER" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_prog_ac_ct_QCOLLECTIONGENERATOR_QTVER="$ac_prog"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
-- done
--IFS=$as_save_IFS
--
--fi
--fi
--ac_ct_QCOLLECTIONGENERATOR_QTVER=$ac_cv_prog_ac_ct_QCOLLECTIONGENERATOR_QTVER
--if test -n "$ac_ct_QCOLLECTIONGENERATOR_QTVER"; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_QCOLLECTIONGENERATOR_QTVER" >&5
--$as_echo "$ac_ct_QCOLLECTIONGENERATOR_QTVER" >&6; }
--else
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
-- test -n "$ac_ct_QCOLLECTIONGENERATOR_QTVER" && break
--done
--
-- if test "x$ac_ct_QCOLLECTIONGENERATOR_QTVER" = x; then
-- QCOLLECTIONGENERATOR_QTVER=""
-- else
-- case $cross_compiling:$ac_tool_warned in
--yes:)
--{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
--ac_tool_warned=yes ;;
--esac
-- QCOLLECTIONGENERATOR_QTVER=$ac_ct_QCOLLECTIONGENERATOR_QTVER
-- fi
--fi
--
-- if test -z "$QCOLLECTIONGENERATOR_QTVER"; then
-- if test -n "$ac_tool_prefix"; then
-- for ac_prog in qcollectiongenerator
-- do
-- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
--set dummy $ac_tool_prefix$ac_prog; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_prog_QCOLLECTIONGENERATOR+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- if test -n "$QCOLLECTIONGENERATOR"; then
-- ac_cv_prog_QCOLLECTIONGENERATOR="$QCOLLECTIONGENERATOR" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_prog_QCOLLECTIONGENERATOR="$ac_tool_prefix$ac_prog"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
-- done
--IFS=$as_save_IFS
--
--fi
--fi
--QCOLLECTIONGENERATOR=$ac_cv_prog_QCOLLECTIONGENERATOR
--if test -n "$QCOLLECTIONGENERATOR"; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $QCOLLECTIONGENERATOR" >&5
--$as_echo "$QCOLLECTIONGENERATOR" >&6; }
--else
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
-- test -n "$QCOLLECTIONGENERATOR" && break
-- done
--fi
--if test -z "$QCOLLECTIONGENERATOR"; then
-- ac_ct_QCOLLECTIONGENERATOR=$QCOLLECTIONGENERATOR
-- for ac_prog in qcollectiongenerator
--do
-- # Extract the first word of "$ac_prog", so it can be a program name with args.
--set dummy $ac_prog; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_prog_ac_ct_QCOLLECTIONGENERATOR+:} false; then :
-- $as_echo_n "(cached) " >&6
--else
-- if test -n "$ac_ct_QCOLLECTIONGENERATOR"; then
-- ac_cv_prog_ac_ct_QCOLLECTIONGENERATOR="$ac_ct_QCOLLECTIONGENERATOR" # Let the user override the test.
--else
--as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-- ac_cv_prog_ac_ct_QCOLLECTIONGENERATOR="$ac_prog"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
-- fi
--done
-- done
--IFS=$as_save_IFS
--
--fi
--fi
--ac_ct_QCOLLECTIONGENERATOR=$ac_cv_prog_ac_ct_QCOLLECTIONGENERATOR
--if test -n "$ac_ct_QCOLLECTIONGENERATOR"; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_QCOLLECTIONGENERATOR" >&5
--$as_echo "$ac_ct_QCOLLECTIONGENERATOR" >&6; }
--else
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
--fi
--
--
-- test -n "$ac_ct_QCOLLECTIONGENERATOR" && break
--done
--
-- if test "x$ac_ct_QCOLLECTIONGENERATOR" = x; then
-- QCOLLECTIONGENERATOR=""
-- else
-- case $cross_compiling:$ac_tool_warned in
--yes:)
--{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
--$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
--ac_tool_warned=yes ;;
--esac
-- QCOLLECTIONGENERATOR=$ac_ct_QCOLLECTIONGENERATOR
-- fi
--fi
--
-- if test -n "$QCOLLECTIONGENERATOR"; then
-- if test -n "$QTCHOOSER"; then
-- QCOLLECTIONGENERATORFLAGS="-qt$qt_version"
-- fi
-- QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE qcollectiongenerator"
-- else
-- QT_TOOLS_MISSING="$QT_TOOLS_MISSING qcollectiongenerator"
-- fi
-- else
-- QCOLLECTIONGENERATOR="$QCOLLECTIONGENERATOR_QTVER"
-- QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE qcollectiongenerator"
-- fi
--
--
-- if test -n "$ac_tool_prefix"; then
- for ac_prog in qhelpgenerator-qt$qt_version
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-@@ -72084,7 +71865,7 @@ fi
-
-
- if test -n "$QT_TOOLS_MISSING"; then
-- warn_qt_tools="one or more of the Qt utilities moc, uic, rcc, lrelease, qcollectiongenerator, and qhelpgenerator not found; disabling Qt GUI"
-+ warn_qt_tools="one or more of the Qt utilities moc, uic, rcc, lrelease, and qhelpgenerator not found; disabling Qt GUI"
- build_qt_gui=no
- MOC_QTVER=
- UIC_QTVER=
diff --git a/math/octave/patches/patch-libgui_src_settings-dialog.h b/math/octave/patches/patch-libgui_src_settings-dialog.h
deleted file mode 100644
index 00e3b02a5bb..00000000000
--- a/math/octave/patches/patch-libgui_src_settings-dialog.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-libgui_src_settings-dialog.h,v 1.1 2018/07/17 09:55:37 maya Exp $
-
-Build fix.
-
---- libgui/src/settings-dialog.h.orig 2016-11-13 15:16:10.000000000 +0000
-+++ libgui/src/settings-dialog.h
-@@ -23,6 +23,7 @@ along with Octave; see the file COPYING.
- #if ! defined (octave_settings_dialog_h)
- #define octave_settings_dialog_h 1
-
-+#include <QButtonGroup>
- #include <QDialog>
- #include <QSettings>
- #include <QLineEdit>
diff --git a/math/octave/patches/patch-libinterp_corefcn_input.cc b/math/octave/patches/patch-libinterp_corefcn_input.cc
new file mode 100644
index 00000000000..10f79a61a4e
--- /dev/null
+++ b/math/octave/patches/patch-libinterp_corefcn_input.cc
@@ -0,0 +1,15 @@
+$NetBSD: patch-libinterp_corefcn_input.cc,v 1.1 2019/03/05 11:11:12 ryoon Exp $
+
+* Do not conflict between header and body
+
+--- libinterp/corefcn/input.cc.orig 2019-02-23 17:33:37.000000000 +0000
++++ libinterp/corefcn/input.cc
+@@ -521,7 +521,7 @@ namespace octave
+ ? octave_locale_charset_wrapper () : m_mfile_encoding;
+
+ // Check for valid codepage.
+- void *codec
++ iconv_t codec
+ = octave_iconv_open_wrapper (codepage.c_str (), "utf-8");
+
+ if (errno == EINVAL)
diff --git a/math/octave/patches/patch-libinterp_dldfcn_config-module.awk b/math/octave/patches/patch-libinterp_dldfcn_config-module.awk
index 3ded8d68d5e..40aeae8356a 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.3 2018/08/12 08:33:55 maya Exp $
+$NetBSD: patch-libinterp_dldfcn_config-module.awk,v 1.4 2019/03/05 11:11:12 ryoon Exp $
install .oct loadable modules with INSTALL_LIB to avoid stripping them
---- libinterp/dldfcn/config-module.awk.orig 2018-08-09 18:20:32.000000000 +0000
+--- libinterp/dldfcn/config-module.awk.orig 2019-02-23 17:33:37.000000000 +0000
+++ libinterp/dldfcn/config-module.awk
-@@ -57,7 +57,7 @@ BEGIN {
+@@ -55,7 +55,7 @@ BEGIN {
print "## of symbolic links";
print "";
print "%.oct : %.la"
- print "\t$(AM_V_GEN)$(INSTALL_PROGRAM) %reldir%/.libs/$(shell $(SED) -n -e \"s/dlname='\\([^']*\\)'/\\1/p\" < $<) $@"
+ print "\t$(AM_V_GEN)$(INSTALL_LIB) %reldir%/.libs/$(shell $(SED) -n -e \"s/dlname='\\([^']*\\)'/\\1/p\" < $<) $@"
- print ""
- print "else";
- print "";
+
+ for (i = 1; i <= nfiles; i++) {
+ basename = files[i];
diff --git a/math/octave/patches/patch-libinterp_dldfcn_module.mk b/math/octave/patches/patch-libinterp_dldfcn_module.mk
index c6e2b4ca4d7..81b6f657a53 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.3 2018/08/12 08:33:55 maya Exp $
+$NetBSD: patch-libinterp_dldfcn_module.mk,v 1.4 2019/03/05 11:11:12 ryoon Exp $
install .oct loadable modules with INSTALL_LIB to avoid stripping them
---- libinterp/dldfcn/module.mk.orig 2018-08-09 18:20:32.000000000 +0000
+--- libinterp/dldfcn/module.mk.orig 2019-02-23 17:33:37.000000000 +0000
+++ libinterp/dldfcn/module.mk
-@@ -40,7 +40,7 @@ octlib_LTLIBRARIES += $(DLDFCN_LIBS)
+@@ -37,7 +37,7 @@ octlib_LTLIBRARIES += $(DLDFCN_LIBS)
## of symbolic links
%.oct : %.la
- $(AM_V_GEN)$(INSTALL_PROGRAM) %reldir%/.libs/$(shell $(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $<) $@
+ $(AM_V_GEN)$(INSTALL_LIB) %reldir%/.libs/$(shell $(SED) -n -e "s/dlname='\([^']*\)'/\1/p" < $<) $@
- else
-
+ %canon_reldir%___delaunayn___la_SOURCES = %reldir%/__delaunayn__.cc
+ %canon_reldir%___delaunayn___la_CPPFLAGS = $(libinterp_liboctinterp_la_CPPFLAGS) $(QHULL_CPPFLAGS)
diff --git a/math/octave/patches/patch-libinterp_module.mk b/math/octave/patches/patch-libinterp_module.mk
deleted file mode 100644
index 088a550cf76..00000000000
--- a/math/octave/patches/patch-libinterp_module.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-$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/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 \
-- $(INSTALL_PROGRAM) $$dl $(DESTDIR)$(octfiledir)/`echo $$f | $(SED) 's,^lib,,; s,\.la$$,.oct,'`; \
-+ $(INSTALL_LIB) $$dl $(DESTDIR)$(octfiledir)/`echo $$f | $(SED) 's,^lib,,; s,\.la$$,.oct,'`; \
- else \
- echo "error: dlname is empty in $$ltlib!"; \
- exit 1; \
diff --git a/math/octave/patches/patch-liboctave_operators_mx-inlines.cc b/math/octave/patches/patch-liboctave_operators_mx-inlines.cc
deleted file mode 100644
index 515daf0b7e7..00000000000
--- a/math/octave/patches/patch-liboctave_operators_mx-inlines.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-liboctave_operators_mx-inlines.cc,v 1.4 2018/08/12 08:33:55 maya Exp $
-
-std::pow is required to promote numeric arguments to the smallest
-common float type. octave_int<> provides another test of template
-specializations for pow() as well as explicit cast operators.
-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 2018-08-09 18:20:32.000000000 +0000
-+++ liboctave/operators/mx-inlines.cc
-@@ -412,7 +412,6 @@ template <typename R, typename X, typena
- inline void
- mx_inline_pow (size_t n, R *r, const X *x, const Y *y)
- {
-- using std::pow;
-
- for (size_t i = 0; i < n; i++)
- r[i] = pow (x[i], y[i]);
diff --git a/math/octave/patches/patch-liboctave_wrappers_iconv-wrappers.h b/math/octave/patches/patch-liboctave_wrappers_iconv-wrappers.h
new file mode 100644
index 00000000000..c029298275b
--- /dev/null
+++ b/math/octave/patches/patch-liboctave_wrappers_iconv-wrappers.h
@@ -0,0 +1,26 @@
+$NetBSD: patch-liboctave_wrappers_iconv-wrappers.h,v 1.1 2019/03/05 11:11:12 ryoon Exp $
+
+* Do not conflict between header and body
+
+--- liboctave/wrappers/iconv-wrappers.h.orig 2019-02-23 17:33:37.000000000 +0000
++++ liboctave/wrappers/iconv-wrappers.h
+@@ -23,15 +23,17 @@ along with Octave; see the file COPYING.
+ #if ! defined (octave_iconv_wrappers_h)
+ #define octave_iconv_wrappers_h 1
+
++#include <iconv.h>
++
+ #if defined __cplusplus
+ extern "C" {
+ #endif
+
+-extern void *
++extern iconv_t
+ octave_iconv_open_wrapper (const char *tocode, const char *fromcode);
+
+ extern int
+-octave_iconv_close_wrapper (void *cd);
++octave_iconv_close_wrapper (iconv_t cd);
+
+ #if defined __cplusplus
+ }
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-11 02:15:13 +0000