UPDATE: math/octave

please test/comment/ok this update for octave.
it seems to work fine on amd64.

note that I've just committed a change to qrupdate that prevents octave
from linking in the g2c library and crashing on some computations.


Index: Makefile
===================================================================
RCS file: /cvs/ports/math/octave/Makefile,v
retrieving revision 1.101
diff -u -p -u -r1.101 Makefile
--- Makefile 28 Feb 2018 19:23:56 -0000 1.101
+++ Makefile 31 Mar 2018 06:44:49 -0000
@@ -2,14 +2,13 @@

COMMENT = high-level language for numerical computations

-VERSION = 4.2.1
+VERSION = 4.2.2
DISTNAME = octave-${VERSION}
-REVISION = 2
CATEGORIES = math

-SHARED_LIBS += octave 8.0
-SHARED_LIBS += octgui 2.0
-SHARED_LIBS += octinterp 7.0
+SHARED_LIBS += octave 9.0
+SHARED_LIBS += octgui 3.0
+SHARED_LIBS += octinterp 8.0

HOMEPAGE = https://www.gnu.org/software/octave/

@@ -27,7 +26,7 @@ WANTLIB += Xext Xfixes Xft Xi Xinerama X
WANTLIB += arpack blas bz2 c camd ccolamd cholmod colamd crypto curl
WANTLIB += cxsparse drm ereadline expat fftw3 fftw3_threads fftw3f
WANTLIB += fftw3f_threads fltk fltk_gl fontconfig freetype gl2ps glapi
-WANTLIB += glpk glut gmp hdf5 iconv intl lapack lcms2 ltdl lzma m ncurses
+WANTLIB += glpk glut gmp hdf5 iconv intl lapack lcms2 ltdl lzma m curses
WANTLIB += nghttp2 ogg pcre png portaudio pthread qhull qrupdate
WANTLIB += sndfile sndio ssl ${COMPILER_LIBCXX} suitesparseconfig
WANTLIB += umfpack util vorbis vorbisenc xcb xcb-dri2 xcb-glx z
Index: distinfo
===================================================================
RCS file: /cvs/ports/math/octave/distinfo,v
retrieving revision 1.18
diff -u -p -u -r1.18 distinfo
--- distinfo 3 Nov 2017 12:28:53 -0000 1.18
+++ distinfo 31 Mar 2018 06:44:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (octave-4.2.1.tar.gz) = gMKPY5hXa1D6yg5gLe+5WY1vcwiwkDckRCwqNaYFMzs=
-SIZE (octave-4.2.1.tar.gz) = 25409651
+SHA256 (octave-4.2.2.tar.gz) = d7hDldjncooasiMFj+XpLcOMA7wT9zWOZTOqs292cm4=
+SIZE (octave-4.2.2.tar.gz) = 25624087
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/math/octave/patches/patch-configure,v
retrieving revision 1.10
diff -u -p -u -r1.10 patch-configure
--- patches/patch-configure 3 Nov 2017 12:28:53 -0000 1.10
+++ patches/patch-configure 31 Mar 2018 06:44:49 -0000
@@ -5,16 +5,7 @@ Use GNU readline as our base readline la
Index: configure
--- configure.orig
+++ configure
-@@ -34701,7 +34701,7 @@ $as_echo_n "checking Qt version $ver... " >&6; }
- ;;
- 5)
- QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport"
-- octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2"
-+ octave_qscintilla_libnames="qscintilla2_qt5 qt5scintilla2"
- ;;
- *)
- as_fn_error $? "Unrecognized Qt version $qt_version" "$LINENO" 5
-@@ -44617,13 +44617,13 @@ fi
+@@ -44777,13 +44777,13 @@ fi

ac_octave_save_LIBS="$LIBS"
LIBS="$TERM_LIBS"
@@ -31,7 +22,7 @@ Index: configure
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */

-@@ -44662,7 +44662,7 @@ fi
+@@ -44822,7 +44822,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&5
$as_echo "$ac_cv_lib_readline_rl_set_keyboard_input_timeout" >&6; }
if test "x$ac_cv_lib_readline_rl_set_keyboard_input_timeout" = xyes; then :
Index: patches/patch-liboctave_system_file-stat_cc
===================================================================
RCS file: patches/patch-liboctave_system_file-stat_cc
diff -N patches/patch-liboctave_system_file-stat_cc
--- patches/patch-liboctave_system_file-stat_cc 3 Nov 2017 12:28:53 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-liboctave_system_file-stat_cc,v 1.1 2017/11/03 12:28:53 steven Exp $
-
-Index: liboctave/system/file-stat.cc
---- liboctave/system/file-stat.cc.orig
-+++ liboctave/system/file-stat.cc
-@@ -174,7 +174,7 @@ namespace octave
- update_internal ();
- }
-
-- inline file_stat::~file_stat () { }
-+ file_stat::~file_stat () { }
-
- void
- file_stat::update_internal (bool force)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/math/octave/pkg/PLIST,v
retrieving revision 1.21
diff -u -p -u -r1.21 PLIST
--- pkg/PLIST 3 Nov 2017 12:28:53 -0000 1.21
+++ pkg/PLIST 31 Mar 2018 06:44:50 -0000
@@ -940,6 +940,7 @@ share/octave/${VERSION}/etc/tests/fixed/
share/octave/${VERSION}/etc/tests/fixed/classdef/plist_t1.m
share/octave/${VERSION}/etc/tests/fixed/classdef/plist_t2.m
share/octave/${VERSION}/etc/tests/fixed/classdef/plist_t3.m
+share/octave/${VERSION}/etc/tests/fixed/classdef/struct_wrapper.m
share/octave/${VERSION}/etc/tests/fixed/classes/
share/octave/${VERSION}/etc/tests/fixed/classes/@Blork/
share/octave/${VERSION}/etc/tests/fixed/classes/@Blork/Blork.m