macports/macports-ports
0
0
Fork 0
mirror of https://github.com/macports/macports-ports.git synced 2026-07-12 18:20:25 -07:00
Code Issues Packages Projects Releases Wiki Activity

octave: update version 4.4.1->5.1.0

Browse Source 
* mark octave-devel as obsolete as it is behind octave version
* update dependencies
* fix dependencies that rely on removed Octave features
This commit is contained in:
Marcus Calhoun-Lopez
2019-03-09 14:06:06 -07:00
committed by MarcusCalhoun-Lopez
parent 070e50ffe4
commit 6d31fd8e7d
127 changed files with 1021 additions and 1103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
math/DSDP/Portfile
+1 -1
View File
@@ -5,7 +5,7 @@ PortGroup muniversal 1.0
name DSDP
version 5.8
revision 5
revision 6
categories math science
platforms darwin
maintainers nomaintainer
math/octave-audio/Portfile
+1 -1
View File
@@ -5,7 +5,7 @@ PortGroup octave 1.0
octave.setup audio 1.1.4
octave.config_h yes
revision 4
revision 5
platforms darwin
license GPL-2+ public-domain
maintainers nomaintainer
math/octave-benchmark/Portfile
+1 -1
View File
@@ -4,7 +4,7 @@ PortSystem 1.0
PortGroup octave 1.0
octave.setup benchmark 1.1.1
revision 3
revision 4
platforms darwin
license GPL-2
maintainers nomaintainer
math/octave-bim/Portfile
+1 -1
View File
@@ -4,7 +4,7 @@ PortSystem 1.0
PortGroup octave 1.0
octave.setup bim 1.1.5
revision 3
revision 4
platforms darwin
license GPL-2+
maintainers nomaintainer
math/octave-bioinfo/Portfile
+1 -1
View File
@@ -4,7 +4,7 @@ PortSystem 1.0
PortGroup octave 1.0
octave.setup bioinfo 0.1.2
revision 3
revision 4
platforms darwin
license GPL-2+
maintainers nomaintainer
math/octave-bsltl/Portfile
+1
View File
@@ -4,6 +4,7 @@ PortSystem 1.0
PortGroup octave 1.0
octave.setup bsltl 1.1.1
revision 1
platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
math/octave-cgi/Portfile
+1 -1
View File
@@ -4,7 +4,7 @@ PortSystem 1.0
PortGroup octave 1.0
octave.setup cgi 0.1.2
revision 3
revision 4
platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
math/octave-civil-engineering/Portfile
+1 -1
View File
@@ -4,7 +4,7 @@ PortSystem 1.0
PortGroup octave 1.0
octave.setup civil-engineering 1.0.7
revision 3
revision 4
platforms darwin
license GPL-2+
maintainers nomaintainer
math/octave-communications/Portfile
+4 -1
View File
@@ -5,7 +5,7 @@ PortGroup octave 1.0
octave.setup communications 1.2.1
octave.config_h yes
revision 6
revision 7
platforms darwin
license GPL-3+
maintainers nomaintainer
@@ -22,3 +22,6 @@ depends_lib-append port:octave-signal
patchfiles-append patch-fixes_for_4.2.diff
patch.pre_args -p1
# compensate for Octave 5 changes
patchfiles-append patch-octave5.diff
math/octave-communications/files/patch-fixes_for_4.2.diff
+1 -2
View File
@@ -359,7 +359,7 @@ new file mode 100644
index 0000000..985d53a
--- /dev/null
+++ b/src/ls-oct-ascii.cc
@@ -0,0 +1,433 @@
@@ -0,0 +1,432 @@
+/*
+
+Copyright (C) 1996-2015 John W. Eaton
@@ -411,7 +411,6 @@ index 0000000..985d53a
+#include "Cell.h"
+#include "defun.h"
+#include "error.h"
+#include "gripes.h"
+#include "load-save.h"
+#include "ls-ascii-helper.h"
+#include "ls-oct-ascii.h"
math/octave-communications/files/patch-octave5.diff
+350
View File
@@ -0,0 +1,350 @@
--- a/src/genqamdemod.cc.orig 2015-04-04 09:28:43.000000000 -0700
+++ b/src/genqamdemod.cc 2019-03-09 03:46:43.000000000 -0700
@@ -36,7 +36,7 @@
int nr1 (args(0).rows ());
int nc1 (args(0).columns ());
- int arg_is_empty1 = empty_arg ("genqamdemod", nr1, nc1);
+ int arg_is_empty1 = args(0).isempty();
Matrix y (nr1,nc1);
int nr2 (args(1).rows ());
--- a/src/gf.cc.orig 2015-04-04 09:28:43.000000000 -0700
+++ b/src/gf.cc 2019-03-09 04:20:21.000000000 -0700
@@ -971,7 +971,7 @@
int nr = arg.rows ();
int nc = arg.columns ();
- int arg_is_empty = empty_arg ("glu", nr, nc);
+ int arg_is_empty = arg.isempty();
if (arg_is_empty < 0)
return retval;
@@ -1055,7 +1055,7 @@
galois m = ((const octave_galois&) arg.get_rep ()).galois_value ();
- int arg_is_empty = empty_arg ("ginverse", nr, nc);
+ int arg_is_empty = arg.isempty();
if (arg_is_empty < 0)
return retval;
@@ -1152,7 +1152,7 @@
galois m = ((const octave_galois&) arg.get_rep ()).galois_value ();
- int arg_is_empty = empty_arg ("gdet", nr, nc);
+ int arg_is_empty = arg.isempty();
if (arg_is_empty < 0)
return retval;
@@ -1212,7 +1212,7 @@
galois m = ((const octave_galois&) arg.get_rep ()).galois_value ();
- int arg_is_empty = empty_arg ("grank", nr, nc);
+ int arg_is_empty = arg.isempty();
if (arg_is_empty > 0)
retval = 0.0;
--- a/src/galois-def.h.orig 2015-04-04 09:28:43.000000000 -0700
+++ b/src/galois-def.h 2019-03-09 04:09:06.000000000 -0700
@@ -137,7 +137,7 @@
r(i, j) = (int)m1(i, j) ^ (int)m2(0, 0); \
} \
else \
- gripe_nonconformant (#OP, m1_nr, m1_nc, m2_nr, m2_nc); \
+ octave::err_nonconformant (#OP, m1_nr, m1_nc, m2_nr, m2_nc); \
} \
else \
{ \
@@ -221,7 +221,7 @@
} \
} \
else \
- gripe_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \
+ octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \
} \
else \
if (m1_nr > 0 && m1_nc > 0) \
@@ -289,7 +289,7 @@
r(i, j) = C1 (m1(i, j)) OP C2 (m2(0, 0)); \
} \
else \
- gripe_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \
+ octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \
} \
\
return r; \
@@ -350,7 +350,7 @@
OP (m2(0, 0) != ZERO); \
} \
else if ((m1_nr != 0 || m1_nc != 0) && (m2_nr != 0 || m2_nc != 0)) \
- gripe_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \
+ octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \
} \
\
return r; \
--- a/src/galois.cc.orig 2019-03-09 03:59:21.000000000 -0700
+++ b/src/galois.cc 2019-03-09 04:04:39.000000000 -0700
@@ -20,7 +20,7 @@
#include <octave/config.h>
#include <octave/error.h>
-#include <octave/gripes.h>
+#include <octave/errwarn.h>
#include <octave/mx-op-defs.h>
#include "galois.h"
@@ -216,7 +216,7 @@
if (nr != a_nr || nc != a_nc)
{
- gripe_nonconformant ("operator +=", nr, nc, a_nr, a_nc);
+ octave::err_nonconformant ("operator +=", nr, nc, a_nr, a_nc);
return *this;
}
@@ -252,7 +252,7 @@
if (nr != a_nr || nc != a_nc)
{
- gripe_nonconformant ("operator -=", nr, nc, a_nr, a_nc);
+ octave::err_nonconformant ("operator -=", nr, nc, a_nr, a_nc);
return *this;
}
@@ -518,7 +518,7 @@
{
if (a_nr != b_nr || a_nc != b_nc)
{
- gripe_nonconformant ("operator .^", a_nr, a_nc, a_nr, a_nc);
+ octave::err_nonconformant ("operator .^", a_nr, a_nc, a_nr, a_nc);
return galois ();
}
@@ -549,7 +549,7 @@
if (a_nr != b_nr || a_nc != b_nc)
{
- gripe_nonconformant ("operator .^", a_nr, a_nc, b_nr, b_nc);
+ octave::err_nonconformant ("operator .^", a_nr, a_nc, b_nr, b_nc);
return galois ();
}
@@ -758,7 +758,7 @@
return product (a, b);
else if (a_nc != b_nr)
{
- gripe_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc);
+ octave::err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc);
return galois ();
}
else
@@ -1420,7 +1420,7 @@
int a_nr = a.rows ();
int b_nr = b.rows ();
- gripe_nonconformant ("operator /", a_nr, a_nc, b_nr, b_nc);
+ octave::err_nonconformant ("operator /", a_nr, a_nc, b_nr, b_nc);
return galois ();
}
@@ -1464,7 +1464,7 @@
int a_nc = a.cols ();
int b_nc = b.cols ();
- gripe_nonconformant ("operator \\", a_nr, a_nc, b_nr, b_nc);
+ octave::err_nonconformant ("operator \\", a_nr, a_nc, b_nr, b_nc);
return galois ();
}
--- a/src/gf.cc.orig 2015-04-04 09:28:43.000000000 -0700
+++ b/src/gf.cc 2019-03-09 04:16:02.000000000 -0700
@@ -31,7 +31,7 @@
#include <octave/config.h>
#include <octave/defun-dld.h>
-#include <octave/gripes.h>
+#include <octave/errwarn.h>
#include <octave/oct-locbuf.h>
#include <octave/ov.h>
#include <octave/utils.h>
@@ -142,7 +142,7 @@
if ((!galois_type_loaded) || (a.type_id () !=
octave_galois::static_type_id ()))
- gripe_wrong_type_arg ("gdiag", a);
+ err_wrong_type_arg ("gdiag", a);
else
{
galois m = ((const octave_galois&) a.get_rep ()).galois_value ();
@@ -196,7 +196,7 @@
}
}
else
- gripe_wrong_type_arg ("gdiag", a);
+ err_wrong_type_arg ("gdiag", a);
}
return retval;
}
@@ -302,7 +302,7 @@
if ((!galois_type_loaded) || (args(0).type_id () !=
octave_galois::static_type_id ()))
{
- gripe_wrong_type_arg ("greshape", args(0));
+ err_wrong_type_arg ("greshape", args(0));
return retval;
}
galois a = ((const octave_galois&) args(0).get_rep ()).galois_value ();
@@ -372,7 +372,7 @@
} \
else \
{ \
- gripe_wrong_type_arg (#FCN, arg); \
+ err_wrong_type_arg (#FCN, arg); \
return retval; \
} \
} \
@@ -469,7 +469,7 @@
if (!galois_type_loaded || (args(0).type_id () !=
octave_galois::static_type_id ()))
{
- gripe_wrong_type_arg ("gsqrt", args(0));
+ err_wrong_type_arg ("gsqrt", args(0));
return retval;
}
@@ -508,7 +508,7 @@
if (!galois_type_loaded || (args(0).type_id () !=
octave_galois::static_type_id ()))
{
- gripe_wrong_type_arg ("glog", args(0));
+ err_wrong_type_arg ("glog", args(0));
return retval;
}
@@ -547,7 +547,7 @@
if (!galois_type_loaded || (args(0).type_id () !=
octave_galois::static_type_id ()))
{
- gripe_wrong_type_arg ("gexp", args(0));
+ err_wrong_type_arg ("gexp", args(0));
return retval;
}
@@ -962,7 +962,7 @@
if (!galois_type_loaded || (arg.type_id () !=
octave_galois::static_type_id ()))
{
- gripe_wrong_type_arg ("glu", arg);
+ err_wrong_type_arg ("glu", arg);
return retval;
}
@@ -1049,7 +1049,7 @@
if (!galois_type_loaded || (arg.type_id () !=
octave_galois::static_type_id ()))
{
- gripe_wrong_type_arg ("ginverse", arg);
+ err_wrong_type_arg ("ginverse", arg);
return retval;
}
@@ -1066,7 +1066,7 @@
}
if (nr != nc)
{
- gripe_square_matrix_required ("ginverse");
+ err_square_matrix_required ("ginverse", "A");
return retval;
}
@@ -1143,7 +1143,7 @@
if (!galois_type_loaded || (arg.type_id () !=
octave_galois::static_type_id ()))
{
- gripe_wrong_type_arg ("gdet", arg);
+ err_wrong_type_arg ("gdet", arg);
return retval;
}
@@ -1164,7 +1164,7 @@
if (nr != nc)
{
- gripe_square_matrix_required ("det");
+ err_square_matrix_required ("det", "A");
return retval;
}
@@ -1203,7 +1203,7 @@
if (!galois_type_loaded || (arg.type_id () !=
octave_galois::static_type_id ()))
{
- gripe_wrong_type_arg ("grank", arg);
+ err_wrong_type_arg ("grank", arg);
return retval;
}
@@ -1333,7 +1333,7 @@
if (!galois_type_loaded || (args(0).type_id () !=
octave_galois::static_type_id ()))
{
- gripe_wrong_type_arg ("rsenc", args(0));
+ err_wrong_type_arg ("rsenc", args(0));
return retval;
}
@@ -1874,7 +1874,7 @@
if (!galois_type_loaded || (args(0).type_id () !=
octave_galois::static_type_id ()))
{
- gripe_wrong_type_arg ("rsdec", args(0));
+ err_wrong_type_arg ("rsdec", args(0));
return retval;
}
--- a/src/ov-galois.cc.orig 2019-03-09 04:33:21.000000000 -0700
+++ b/src/ov-galois.cc 2019-03-09 04:37:36.000000000 -0700
@@ -22,7 +22,7 @@
#include <octave/config.h>
#include <octave/byte-swap.h>
-#include <octave/gripes.h>
+#include <octave/errwarn.h>
#include <octave/lo-ieee.h>
#include <octave/oct-locbuf.h>
#include <octave/oct-obj.h>
@@ -328,13 +328,13 @@
if (rows () > 0 && columns () > 0)
{
- gripe_implicit_conversion ("Octave:array-as-scalar",
+ warn_implicit_conversion ("Octave:array-as-scalar",
"real matrix", "real scalar");
retval = (double) gval (0, 0);
}
else
- gripe_invalid_conversion ("galois", "real scalar");
+ err_invalid_conversion ("galois", "real scalar");
return retval;
}
@@ -348,13 +348,13 @@
if (rows () > 0 && columns () > 0)
{
- gripe_implicit_conversion ("Octave:array-as-scalar",
+ warn_implicit_conversion ("Octave:array-as-scalar",
"real matrix", "real scalar");
retval = (double) gval (0, 0);
}
else
- gripe_invalid_conversion ("galois", "complex scalar");
+ err_invalid_conversion ("galois", "complex scalar");
return retval;
}
math/octave-control/Portfile
+1 -1
View File
@@ -5,7 +5,7 @@ PortGroup octave 1.0
PortGroup compilers 1.0
octave.setup control 3.1.0
revision 4
revision 5
platforms darwin
license GPL-3+
maintainers {mps @Schamschula} openmaintainer
math/octave-data-smoothing/Portfile
+1 -1
View File
@@ -4,7 +4,7 @@ PortSystem 1.0
PortGroup octave 1.0
octave.setup data-smoothing 1.3.0
revision 3
revision 4
platforms darwin
license GPL-3+
maintainers nomaintainer
math/octave-database/Portfile
+4 -1
View File
@@ -4,7 +4,7 @@ PortSystem 1.0
PortGroup octave 1.0
octave.setup database 2.4.3
revision 2
revision 3
platforms darwin
license GPL-3+
maintainers {mps @Schamschula} openmaintainer
@@ -19,6 +19,9 @@ checksums rmd160 f46fb94db490d239cce5f34a22de6983577de0e0 \
depends_lib-append port:octave-struct \
port:swig-octave
# compensate for Octave 5 changes
patchfiles-append patch-octave5.diff
# set postgresql variants
set postgresql_suffixes {83 84 90 91 92 93 94 95 96}
set default_postgresql_suffix 95
math/octave-database/files/patch-octave5.diff
+10
View File
@@ -0,0 +1,10 @@
--- src/error-helpers.cc.orig 2018-05-18 08:48:08.000000000 -0700
+++ src/error-helpers.cc 2019-03-09 05:15:43.000000000 -0700
@@ -20,6 +20,7 @@
#include <octave/oct.h>
#include "error-helpers.h"
+#include <iostream>
// call verror
#ifdef HAVE_OCTAVE_VERROR_ARG_EXC
math/octave-dataframe/Portfile
+1 -1
View File
@@ -4,7 +4,7 @@ PortSystem 1.0
PortGroup octave 1.0
octave.setup dataframe 1.2.0
revision 1
revision 2
platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
math/octave-divand/Portfile
+1 -1
View File
@@ -4,7 +4,7 @@ PortSystem 1.0
PortGroup octave 1.0
octave.setup divand 1.1.2
revision 3
revision 4
platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
math/octave-doctest/Portfile
+1 -1
View File
@@ -4,7 +4,7 @@ PortSystem 1.0
PortGroup octave 1.0
octave.setup doctest 0.6.0
revision 2
revision 3
platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
math/octave-econometrics/Portfile
+1 -1
View File
@@ -4,7 +4,7 @@ PortSystem 1.0
PortGroup octave 1.0
octave.setup econometrics 1.1.1
revision 4
revision 5
platforms darwin
license GPL-3+
maintainers nomaintainer
math/octave-financial/Portfile
+1
View File
@@ -4,6 +4,7 @@ PortSystem 1.0
PortGroup octave 1.0
octave.setup financial 0.5.3
revision 1
platforms darwin
license GPL-3+
maintainers {mps @Schamschula} openmaintainer

Some files were not shown because too many files have changed in this diff Show More