On Thu, Jan 10, 2019 at 09:42:48PM +0100, Steven Mestdagh wrote:
> maintenance update, seems to work fine on amd64.
> test suite shows 2 failures less than with the previous version.
>
> comments / ok?
OK (with the fixes from kn@)
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/math/octave/Makefile,v
> retrieving revision 1.105
> diff -u -p -u -r1.105 Makefile
> --- Makefile 11 Aug 2018 04:58:47 -0000 1.105
> +++ Makefile 10 Jan 2019 20:39:00 -0000
> @@ -2,14 +2,13 @@
>
> COMMENT = high-level language for numerical computations
>
> -VERSION = 4.4.0
> +VERSION = 4.4.1
> DISTNAME = octave-${VERSION}
> CATEGORIES = math
> -REVISION = 1
>
> -SHARED_LIBS += octave 10.0
> -SHARED_LIBS += octgui 4.0
> -SHARED_LIBS += octinterp 9.0
> +SHARED_LIBS += octave 11.0
> +SHARED_LIBS += octgui 5.0
> +SHARED_LIBS += octinterp 10.0
>
> HOMEPAGE = https://www.gnu.org/software/octave/
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/math/octave/distinfo,v
> retrieving revision 1.20
> diff -u -p -u -r1.20 distinfo
> --- distinfo 24 May 2018 21:23:50 -0000 1.20
> +++ distinfo 10 Jan 2019 20:39:00 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (octave-4.4.0.tar.gz) = cvhGN5/Ox+gT1Grcus0GnXLE9Nj2ADvNksNROq/NbpY=
> -SIZE (octave-4.4.0.tar.gz) = 29009355
> +SHA256 (octave-4.4.1.tar.gz) = CfvQ8hL07yHlPx2cQc8wzj1/lFD7RJEWAeIe1kxnrpc=
> +SIZE (octave-4.4.1.tar.gz) = 28626462
> Index: patches/patch-configure
> ===================================================================
> RCS file: /cvs/ports/math/octave/patches/patch-configure,v
> retrieving revision 1.12
> diff -u -p -u -r1.12 patch-configure
> --- patches/patch-configure 24 May 2018 21:23:50 -0000 1.12
> +++ patches/patch-configure 10 Jan 2019 20:39:00 -0000
> @@ -5,7 +5,7 @@ Use GNU readline as our base readline la
> Index: configure
> --- configure.orig
> +++ configure
> -@@ -66013,13 +66013,13 @@ fi
> +@@ -66327,13 +66327,13 @@ fi
>
> ac_octave_save_LIBS="$LIBS"
> LIBS="$TERM_LIBS"
> @@ -22,7 +22,7 @@ Index: configure
> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
> /* end confdefs.h. */
>
> -@@ -66058,7 +66058,7 @@ fi
> +@@ -66372,7 +66372,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-scripts_pkg_private_configure_make_m
> ===================================================================
> RCS file:
> /cvs/ports/math/octave/patches/patch-scripts_pkg_private_configure_make_m,v
> retrieving revision 1.2
> diff -u -p -u -r1.2 patch-scripts_pkg_private_configure_make_m
> --- patches/patch-scripts_pkg_private_configure_make_m 3 Nov 2017
> 12:28:53 -0000 1.2
> +++ patches/patch-scripts_pkg_private_configure_make_m 10 Jan 2019
> 20:39:00 -0000
> @@ -1,8 +1,8 @@
> -$OpenBSD: patch-scripts_pkg_private_configure_make_m,v 1.2 2017/11/03
> 12:28:53 steven Exp $
> +$OpenBSD$
> Index: scripts/pkg/private/configure_make.m
> --- scripts/pkg/private/configure_make.m.orig
> +++ scripts/pkg/private/configure_make.m
> -@@ -87,7 +87,7 @@ function configure_make (desc, packdir, verbose)
> +@@ -91,7 +91,7 @@ function configure_make (desc, packdir, verbose)
> endif
>
> if (exist (fullfile (src, "Makefile"), "file"))
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/math/octave/pkg/PLIST,v
> retrieving revision 1.24
> diff -u -p -u -r1.24 PLIST
> --- pkg/PLIST 27 Jun 2018 21:03:57 -0000 1.24
> +++ pkg/PLIST 10 Jan 2019 20:39:00 -0000
> @@ -703,7 +703,6 @@ include/octave-${VERSION}/octave/sparse-
> include/octave-${VERSION}/octave/sparse-xdiv.h
> include/octave-${VERSION}/octave/sparse-xpow.h
> include/octave-${VERSION}/octave/str-vec.h
> -include/octave-${VERSION}/octave/sun-utils.h
> include/octave-${VERSION}/octave/svd.h
> include/octave-${VERSION}/octave/symrec.h
> include/octave-${VERSION}/octave/symscope.h
> @@ -944,9 +943,6 @@ share/octave/${VERSION}/etc/tests/fixed/
> share/octave/${VERSION}/etc/tests/fixed/bug-44940/bug-44940.tst
> share/octave/${VERSION}/etc/tests/fixed/bug-44940/class_bug44940.m
> share/octave/${VERSION}/etc/tests/fixed/bug-46330.tst
> -share/octave/${VERSION}/etc/tests/fixed/bug-46497/
> -share/octave/${VERSION}/etc/tests/fixed/bug-46497/bug-46497.tst
> -share/octave/${VERSION}/etc/tests/fixed/bug-46497/class_bug46497.m
> share/octave/${VERSION}/etc/tests/fixed/bug-46660/
> share/octave/${VERSION}/etc/tests/fixed/bug-46660/bug-46660.tst
> share/octave/${VERSION}/etc/tests/fixed/bug-46660/class_bug46660.m
> @@ -1457,6 +1453,7 @@ share/octave/${VERSION}/m/deprecated/oct
> share/octave/${VERSION}/m/deprecated/onenormest.m
> share/octave/${VERSION}/m/deprecated/paren.m
> share/octave/${VERSION}/m/deprecated/semicolon.m
> +share/octave/${VERSION}/m/deprecated/setstr.m
> share/octave/${VERSION}/m/deprecated/sleep.m
> share/octave/${VERSION}/m/deprecated/tmpnam.m
> share/octave/${VERSION}/m/deprecated/toascii.m
> @@ -2398,3 +2395,4 @@ share/octave/site/m/
> share/octave/site/m/startup/
> share/octave/site/m/startup/octaverc
> @tag update-desktop-database
> +@tag gtk-update-icon-cache %D/share/icons/hicolor