mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-06 11:41:52 +00:00
Code Issues Releases Activity

- Update math/octave to 6.2.0.

Browse Source 
- Bump portrevision of dependent ports.
- Add patches to dependent ports math/octave-forge-* if I can figure them out.
- Mark broken dependent ports I couldn't figure out.
This commit is contained in:
Stephen Montgomery-Smith 2021-02-21 22:41:34 +00:00
parent e906f6434c
commit 6473aac25b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=566249
106 changed files with 532 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
benchmarks/octave-forge-benchmark/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-benchmark
PORTVERSION= 1.1.1
PORTREVISION= 24
PORTREVISION= 25
CATEGORIES= benchmarks math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-actuarial/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-actuarial
PORTVERSION= 1.1.0
PORTREVISION= 21
PORTREVISION= 22
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

1
math/octave-forge-audio/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-audio
PORTVERSION= 2.0.2
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-bim/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-bim
PORTVERSION= 1.1.5
PORTREVISION= 13
PORTREVISION= 14
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-bioinfo/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-bioinfo
PORTVERSION= 0.1.2
PORTREVISION= 24
PORTREVISION= 25
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

1
math/octave-forge-bsltl/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-bsltl
PORTVERSION= 1.3.1
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-cgi/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-cgi
PORTVERSION= 0.1.2
PORTREVISION= 12
PORTREVISION= 13
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-civil-engineering/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-civil-engineering
PORTVERSION= 1.0.7
PORTREVISION= 24
PORTREVISION= 25
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

1
math/octave-forge-communications/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-communications
PORTVERSION= 1.2.2
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-control/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-control
PORTVERSION= 3.2.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-data-smoothing/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-data-smoothing
PORTVERSION= 1.3.0
PORTREVISION= 18
PORTREVISION= 19
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-database/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-database
PORTVERSION= 2.4.4
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-dataframe/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-dataframe
PORTVERSION= 1.2.0
PORTREVISION= 10
PORTREVISION= 11
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

1
math/octave-forge-dicom/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-dicom
PORTVERSION= 0.4.0
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-divand/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-divand
PORTVERSION= 1.1.2
PORTREVISION= 14
PORTREVISION= 15
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-doctest/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-doctest
PORTVERSION= 0.7.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

1
math/octave-forge-econometrics/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-econometrics
PORTVERSION= 1.1.2
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-fenv/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-fenv
PORTVERSION= 0.1.0
PORTREVISION= 21
PORTREVISION= 22
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-financial/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-financial
PORTVERSION= 0.5.3
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-fits/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-fits
PORTVERSION= 1.0.7
PORTREVISION= 13
PORTREVISION= 14
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-fpl/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-fpl
PORTVERSION= 1.3.5
PORTREVISION= 13
PORTREVISION= 14
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

1
math/octave-forge-fuzzy-logic-toolkit/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-fuzzy-logic-toolkit
PORTVERSION= 0.4.6
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

1
math/octave-forge-ga/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-ga
PORTVERSION= 0.10.2
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

1
math/octave-forge-general/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-general
PORTVERSION= 2.1.1
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

1
math/octave-forge-generate_html/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-generate_html
PORTVERSION= 0.3.2
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

1
math/octave-forge-geometry/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-geometry
PORTVERSION= 4.0.0
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-gnuplot/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-gnuplot
PORTVERSION= 1.0.1
PORTREVISION= 21
PORTREVISION= 22
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-gsl/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-gsl
PORTVERSION= 2.1.1
PORTREVISION= 7
PORTREVISION= 8
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

26
math/octave-forge-gsl/files/patch-gsl__sf.cc Normal file
View File

@ -0,0 +1,26 @@
--- gsl_sf.cc.orig 2021-02-21 21:41:43 UTC
+++ gsl_sf.cc
@@ -26,11 +26,7 @@
#include <gsl/gsl_errno.h>
#include <gsl/gsl_version.h>
-#ifdef OCTAVE_HAS_OV_ISREAL_METHOD
#define ISREAL(x) ((x).isreal ())
-#else
-#define ISREAL(x) ((x).is_real_type ())
-#endif
void octave_gsl_errorhandler (const char * reason, const char * file,
int line, int gsl_errno)
@@ -47,11 +43,7 @@ special functions of the GNU Scientific Library (GSL).
\n\
@end deftypefn\n")
{
-#ifdef OCTAVE_HAS_FEVAL_IN_OCTAVE_NAMESPACE
octave::feval ("help", octave_value ("gsl_sf"));
-#else
- feval ("help", octave_value ("gsl_sf"));
-#endif
return octave_value();
}

2
math/octave-forge-ident/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-ident
PORTVERSION= 1.0.7
PORTREVISION= 24
PORTREVISION= 25
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

1
math/octave-forge-image/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-image
PORTVERSION= 2.12.0
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-informationtheory/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-informationtheory
PORTVERSION= 0.1.8
PORTREVISION= 24
PORTREVISION= 25
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-integration/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-integration
PORTVERSION= 1.0.7
PORTREVISION= 24
PORTREVISION= 25
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-interval/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-interval
PORTVERSION= 3.2.0
PORTREVISION= 6
PORTREVISION= 7
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

1
math/octave-forge-io/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-io
PORTVERSION= 2.6.3
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= math

2
math/octave-forge-irsa/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-irsa
PORTVERSION= 1.0.7
PORTREVISION= 24
PORTREVISION= 25
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-level-set/Makefile
View File

@ -15,6 +15,8 @@ ALL_TARGET= oct
USES= compiler:c++0x
GNU_CONFIGURE= yes
BROKEN= does not build with octave-6.2.0
# OCTSRC is the name of the directory of the package.
# It is usually ${OCTAVE_PKGNAME} or ${DISTNAME}.
OCTSRC= ${OCTAVE_PKGNAME}

1
math/octave-forge-linear-algebra/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-linear-algebra
PORTVERSION= 2.2.3
PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= math

1
math/octave-forge-lssa/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-lssa
PORTVERSION= 0.1.4
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

3
math/octave-forge-ltfat/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-ltfat
PORTVERSION= 2.3.1
PORTREVISION= 8
PORTREVISION= 9
PORTEPOCH= 1
CATEGORIES= math
@ -13,6 +13,7 @@ COMMENT= Octave-forge package ${OCTAVE_PKGNAME}
LICENSE= GPLv3
LICENSE_FILE= ${WRKDIR}/${OCTSRC}/COPYING
BROKEN= does not install properly with octave-6.2.0
BROKEN_FreeBSD_12_powerpc64= fails to compile: modules/libltfat/src/dgt_multi.c:47:31: 'cexpl' undeclared (first use in this function); did you mean 'cexpf'?
LIB_DEPENDS= libfftw3.so:math/fftw3 \

1
math/octave-forge-mapping/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-mapping
PORTVERSION= 1.4.1
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

1
math/octave-forge-matgeom/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-matgeom
PORTVERSION= 1.2.2
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-mechanics/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-mechanics
PORTVERSION= 1.3.1
PORTREVISION= 17
PORTREVISION= 18
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

32
math/octave-forge-mechanics/files/patch-verletstep.cc Normal file
View File

@ -0,0 +1,32 @@
--- verletstep.cc.orig 2021-02-21 22:24:16 UTC
+++ verletstep.cc
@@ -45,12 +45,12 @@ DEFUN_DLD (verletstep, args, nargout, "Verlet velocity
newargs(3) = V.row(jpart);
if (fcn_str)
- retval = feval (args (4).string_value (), newargs, nargout);
+ retval = octave::feval (args (4).string_value (), newargs, nargout);
else
{
fcn = args(4).function_value ();
if (! error_state)
- retval = feval (fcn, newargs, nargout);
+ retval = octave::feval (fcn, newargs, nargout);
}
A.insert (retval(0).row_vector_value () +
@@ -82,12 +82,12 @@ DEFUN_DLD (verletstep, args, nargout, "Verlet velocity
newargs(3) = V.row(jpart);
if (fcn_str)
- retval = feval (args (4).string_value (), newargs, nargout);
+ retval = octave::feval (args (4).string_value (), newargs, nargout);
else
{
fcn = args(4).function_value ();
if (! error_state)
- retval = feval (fcn, newargs, nargout);
+ retval = octave::feval (fcn, newargs, nargout);
}
A.insert (retval(0).row_vector_value () +

32
math/octave-forge-mechanics/files/patch-verletstep__boxed.cc Normal file
View File

@ -0,0 +1,32 @@
--- verletstep_boxed.cc.orig 2021-02-21 22:23:14 UTC
+++ verletstep_boxed.cc
@@ -65,12 +65,12 @@ DEFUN_DLD (verletstep_boxed, args, nargout, "Verlet ve
newargs(1) = V.row(ipart) - V.row(jpart);
if (fcn_str)
- retval = feval (args (4).string_value (), newargs, nargout);
+ retval = octave::feval (args (4).string_value (), newargs, nargout);
else
{
fcn = args(4).function_value ();
if (! error_state)
- retval = feval (fcn, newargs, nargout);
+ retval = octave::feval (fcn, newargs, nargout);
}
A.insert (retval(0).row_vector_value () +
@@ -101,12 +101,12 @@ DEFUN_DLD (verletstep_boxed, args, nargout, "Verlet ve
newargs(1) = V.row(ipart) - V.row(jpart);
if (fcn_str)
- retval = feval (args (4).string_value (), newargs, nargout);
+ retval = octave::feval (args (4).string_value (), newargs, nargout);
else
{
fcn = args(4).function_value ();
if (! error_state)
- retval = feval (fcn, newargs, nargout);
+ retval = octave::feval (fcn, newargs, nargout);
}
A.insert (retval(0).row_vector_value () +

1
math/octave-forge-miscellaneous/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-miscellaneous
PORTVERSION= 1.3.0
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-missing-functions/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-missing-functions
PORTVERSION= 1.0.2
PORTREVISION= 24
PORTREVISION= 25
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-msh/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-msh
PORTVERSION= 1.0.10
PORTREVISION= 15
PORTREVISION= 16
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-multicore/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-multicore
PORTVERSION= 0.2.15
PORTREVISION= 24
PORTREVISION= 25
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-mvn/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-mvn
PORTVERSION= 1.1.0
PORTREVISION= 16
PORTREVISION= 17
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

1
math/octave-forge-nan/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-nan
PORTVERSION= 3.5.3
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-ncarray/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-ncarray
PORTVERSION= 1.0.4
PORTREVISION= 10
PORTREVISION= 11
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-netcdf/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-netcdf
PORTVERSION= 1.0.14
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-nlwing2/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-nlwing2
PORTVERSION= 1.2.0
PORTREVISION= 21
PORTREVISION= 22
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

20
math/octave-forge-nlwing2/files/patch-biotsavart.cc Normal file
View File

@ -0,0 +1,20 @@
--- biotsavart.cc.orig 2021-02-21 21:52:50 UTC
+++ biotsavart.cc
@@ -128,7 +128,7 @@ by a vortex segment joining @code{@var{x}(j,1:3)} and
Matrix X = args(1).matrix_value ();
RowVector dir = args(2).row_vector_value ();
if (CP.cols () == 3
- && X.cols () == 3 && dir.length () == 3)
+ && X.cols () == 3 && dir.numel () == 3)
{
octave_idx_type m = CP.rows (), n = X.rows ();
NDArray vi (dim_vector (m, n, 3));
@@ -148,7 +148,7 @@ by a vortex segment joining @code{@var{x}(j,1:3)} and
Matrix X = args(2).matrix_value ();
RowVector dir = args(3).row_vector_value ();
if (CP.cols () == 3 && CN.cols () == 3 && CP.rows () == CN.rows ()
- && X.cols () == 3 && dir.length () == 3)
+ && X.cols () == 3 && dir.numel () == 3)
{
octave_idx_type m = CP.rows (), n = X.rows ();
Matrix vn (m, n);

2
math/octave-forge-nnet/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-nnet
PORTVERSION= 0.1.13
PORTREVISION= 21
PORTREVISION= 22
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-nurbs/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-nurbs
PORTVERSION= 1.3.13
PORTREVISION= 10
PORTREVISION= 11
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

11
math/octave-forge-nurbs/files/patch-bspeval.cc Normal file
View File

@ -0,0 +1,11 @@
--- bspeval.cc.orig 2021-02-21 22:35:52 UTC
+++ bspeval.cc
@@ -113,7 +113,7 @@ static bool bspeval_bad_arguments (const octave_value_
error("bspeval: the knot vector should be a real vector.");
return true;
}
- if (!args(3).is_real_type())
+ if (!args(3).isreal())
{
error("bspeval: the set of parametric points should be an array of doubles.");
return true;

20
math/octave-forge-nurbs/files/patch-nrb__srf__basisfun____.cc Normal file
View File

@ -0,0 +1,20 @@
--- nrb_srf_basisfun__.cc.orig 2021-02-21 22:34:12 UTC
+++ nrb_srf_basisfun__.cc
@@ -66,7 +66,7 @@ DEFUN_DLD(nrb_srf_basisfun__, args, nargout,"\
} // spu = findspan (m, p, u, U);
newargs(3) = U; newargs(2) = p; newargs(1) = u; newargs(0) = spu;
- Matrix Ik = feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Ik = numbasisfun (spu, u, p, U);
+ Matrix Ik = octave::feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Ik = numbasisfun (spu, u, p, U);
RowVector spv(v);
for (octave_idx_type ii(0); ii < v.numel (); ii++)
@@ -75,7 +75,7 @@ DEFUN_DLD(nrb_srf_basisfun__, args, nargout,"\
} // spv = findspan (n, q, v, V);
newargs(3) = V; newargs(2) = q; newargs(1) = v; newargs(0) = spv;
- Matrix Jk = feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Jk = numbasisfun (spv, v, q, V);
+ Matrix Jk = octave::feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Jk = numbasisfun (spv, v, q, V);
Matrix NuIkuk(npt, p+1, 0.0);
for (octave_idx_type ii(0); ii < npt; ii++)

34
math/octave-forge-nurbs/files/patch-nrb__srf__basisfun__der____.cc Normal file
View File

@ -0,0 +1,34 @@
--- nrb_srf_basisfun_der__.cc.orig 2021-02-21 22:32:34 UTC
+++ nrb_srf_basisfun_der__.cc
@@ -73,7 +73,7 @@ DEFUN_DLD(nrb_srf_basisfun_der__, args, nargout,"\
} // spu = findspan (m, p, u, U);
newargs(3) = U; newargs(2) = p; newargs(1) = u; newargs(0) = spu;
- Matrix Ik = feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Ik = numbasisfun (spu, u, p, U);
+ Matrix Ik = octave::feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Ik = numbasisfun (spu, u, p, U);
RowVector spv(v);
for (octave_idx_type ii(0); ii < v.numel (); ii++)
@@ -82,7 +82,7 @@ DEFUN_DLD(nrb_srf_basisfun_der__, args, nargout,"\
} // spv = findspan (n, q, v, V);
newargs(3) = V; newargs(2) = q; newargs(1) = v; newargs(0) = spv;
- Matrix Jk = feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Jk = numbasisfun (spv, v, q, V);
+ Matrix Jk = octave::feval (std::string("numbasisfun"), newargs, 1)(0).matrix_value (); // Jk = numbasisfun (spv, v, q, V);
Matrix NuIkuk(npt, p+1, 0.0);
for (octave_idx_type ii(0); ii < npt; ii++)
@@ -100,11 +100,11 @@ DEFUN_DLD(nrb_srf_basisfun_der__, args, nargout,"\
newargs(4) = 1; newargs(3) = U; newargs(2) = u; newargs(1) = p; newargs(0) = spu;
- NDArray NuIkukprime = feval (std::string("basisfunder"), newargs, 1)(0).array_value (); // NuIkukprime = basisfunder (spu, p, u, U, 1);
+ NDArray NuIkukprime = octave::feval (std::string("basisfunder"), newargs, 1)(0).array_value (); // NuIkukprime = basisfunder (spu, p, u, U, 1);
// NuIkukprime = squeeze(NuJkukprime(:,2,:));
newargs(4) = 1; newargs(3) = V; newargs(2) = v; newargs(1) = q; newargs(0) = spv;
- NDArray NvJkvkprime = feval (std::string("basisfunder"), newargs, 1)(0).array_value (); // NvJkvkprime = basisfunder (spv, q, v, V, 1);
+ NDArray NvJkvkprime = octave::feval (std::string("basisfunder"), newargs, 1)(0).array_value (); // NvJkvkprime = basisfunder (spv, q, v, V, 1);
// NvJkvkprime = squeeze(NvJkvkprime(:,2,:));
for (octave_idx_type k(0); k < npt; k++)

11
math/octave-forge-nurbs/files/patch-tbasisfun.cc Normal file
View File

@ -0,0 +1,11 @@
--- tbasisfun.cc.orig 2021-02-21 22:37:09 UTC
+++ tbasisfun.cc
@@ -156,7 +156,7 @@ TBASISFUN: Compute a B- or T-Spline basis function, an
RowVector N(u.cols ());
double *Nptr = N.fortran_vec ();
- if (! args(2).is_cell ())
+ if (! args(2).iscell ())
{
double p = args(1).idx_type_value ();

2
math/octave-forge-oct2mat/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-oct2mat
PORTVERSION= 1.0.7
PORTREVISION= 24
PORTREVISION= 25
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

1
math/octave-forge-octclip/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-octclip
PORTVERSION= 2.0.1
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-octproj/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-octproj
PORTVERSION= 2.0.1
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-odebvp/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-odebvp
PORTVERSION= 1.0.6
PORTREVISION= 24
PORTREVISION= 25
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

1
math/octave-forge-optics/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-optics
PORTVERSION= 0.1.4
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

1
math/octave-forge-optim/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-optim
PORTVERSION= 1.6.1
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

1
math/octave-forge-optiminterp/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-optiminterp
PORTVERSION= 0.3.6
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-outliers/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-outliers
PORTVERSION= 0.13.9
PORTREVISION= 24
PORTREVISION= 25
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-plot/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-plot
PORTVERSION= 1.1.0
PORTREVISION= 19
PORTREVISION= 20
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-quaternion/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-quaternion
PORTVERSION= 2.4.0
PORTREVISION= 13
PORTREVISION= 14
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

13
math/octave-forge-quaternion/files/patch-is__real__array.cc Normal file
View File

@ -0,0 +1,13 @@
--- is_real_array.cc.orig 2021-02-21 22:03:11 UTC
+++ is_real_array.cc
@@ -46,8 +46,8 @@ Avoid nasty stuff like @code{true = isreal (\"a\")}.\n
{
// args(i).ndims () should be always >= 2
if (args(i).ndims () < 2
- || ! ((args(i).is_numeric_type () && args(i).is_real_type ())
- || args(i).is_bool_type ()))
+ || ! ((args(i).isnumeric () && args(i).isreal ())
+ || args(i).islogical ()))
{
retval = false;
break;

1
math/octave-forge-queueing/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-queueing
PORTVERSION= 1.2.7
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-secs1d/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-secs1d
PORTVERSION= 0.0.9
PORTREVISION= 18
PORTREVISION= 19
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-secs2d/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-secs2d
PORTVERSION= 0.0.8
PORTREVISION= 24
PORTREVISION= 25
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

11
math/octave-forge-secs2d/files/patch-src_Ubern.cc Normal file
View File

@ -0,0 +1,11 @@
--- src/Ubern.cc.orig 2021-02-21 22:27:49 UTC
+++ src/Ubern.cc
@@ -115,7 +115,7 @@ B(-Z)=Z+B(Z)\n")
NDArray X ( args(0).array_value() );
- octave_idx_type lx = X.length();
+ octave_idx_type lx = X.numel();
NDArray BP(X),BN(X);

2
math/octave-forge-secs3d/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-secs3d
PORTVERSION= 0.0.1
PORTREVISION= 20
PORTREVISION= 21
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-signal/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-signal
PORTVERSION= 1.4.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-simp/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-simp
PORTVERSION= 1.1.0
PORTREVISION= 24
PORTREVISION= 25
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

1
math/octave-forge-sockets/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-sockets
PORTVERSION= 1.2.1
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

1
math/octave-forge-sparsersb/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-sparsersb
PORTVERSION= 1.0.8
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-specfun/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-specfun
PORTVERSION= 1.1.0
PORTREVISION= 19
PORTREVISION= 20
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

29
math/octave-forge-specfun/files/patch-ellipj.cc Normal file
View File

@ -0,0 +1,29 @@
--- ellipj.cc.orig 2021-02-21 22:11:36 UTC
+++ ellipj.cc
@@ -190,7 +190,7 @@ return @code{NaN}.\n\
if (u_arg.is_scalar_type ()) { /* u scalar */
/*{{{*/
- if (u_arg.is_real_type ()) { // u real
+ if (u_arg.isreal ()) { // u real
double u = args(0).double_value ();
if (! error_state) {
@@ -265,7 +265,7 @@ return @code{NaN}.\n\
int nc = m.cols ();
Matrix err (nr, nc);
- if (u_arg.is_real_type ()) {
+ if (u_arg.isreal ()) {
double u = u_arg.double_value ();
Matrix sn (nr, nc), cn (nr, nc), dn (nr, nc);
if (! error_state) {
@@ -296,7 +296,7 @@ return @code{NaN}.\n\
/*}}}*/
} else { // u is matrix (m is matrix)
/*{{{*/
- if (u_arg.is_real_type ()) { // u real matrix
+ if (u_arg.isreal ()) { // u real matrix
Matrix u = u_arg.matrix_value ();
if (! error_state) {

2
math/octave-forge-special-matrix/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-special-matrix
PORTVERSION= 1.0.7
PORTREVISION= 24
PORTREVISION= 25
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

1
math/octave-forge-splines/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-splines
PORTVERSION= 1.3.3
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

1
math/octave-forge-statistics/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-statistics
PORTVERSION= 1.4.2
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

1
math/octave-forge-stk/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-stk
PORTVERSION= 2.6.1
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

1
math/octave-forge-struct/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-struct
PORTVERSION= 1.0.17
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-symband/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-symband
PORTVERSION= 1.0.10
PORTREVISION= 24
PORTREVISION= 25
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

11
math/octave-forge-symband/files/patch-src_SymBand.cc Normal file
View File

@ -0,0 +1,11 @@
--- src/SymBand.cc.orig 2021-02-21 22:29:47 UTC
+++ src/SymBand.cc
@@ -366,7 +366,7 @@ DEFUN_DLD (SBSolve, args, , "[...] = SBSolve (...)\n\
return retval;
}
- if ( A_arg.is_real_type() && B_arg.is_real_type() ) {
+ if ( A_arg.isreal() && B_arg.isreal() ) {
Matrix A= A_arg.matrix_value();
Matrix B= B_arg.matrix_value();

1
math/octave-forge-symbolic/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-symbolic
PORTVERSION= 2.9.0
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-tcl-octave/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-tcl-octave
PORTVERSION= 0.1.8
PORTREVISION= 24
PORTREVISION= 25
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

1
math/octave-forge-tsa/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-tsa
PORTVERSION= 4.6.2
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

2
math/octave-forge-zenity/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= octave-forge-zenity
PORTVERSION= 0.5.7
PORTREVISION= 24
PORTREVISION= 25
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

1
math/octave-forge-zeromq/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge-zeromq
PORTVERSION= 1.5.2
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org

3
math/octave-forge/Makefile
View File

@ -3,6 +3,7 @@
PORTNAME= octave-forge
PORTVERSION= 20200519
PORTREVISION= 1
CATEGORIES= math
MAINTAINER= stephen@FreeBSD.org
@ -27,7 +28,7 @@ OPTIONS_DEFINE= AUDIO ACTUARIAL BENCHMARK BIM BIOINFO BSLTL CGI \
STRUCT SYMBAND SYMBOLIC TCL_OCTAVE TISEAN TSA VIDEO \
ZENITY ZEROMQ
OPTIONS_DEFAULT= ${OPTIONS_DEFINE:NDATA_SMOOTHING:NPARALLEL:NSTRINGS:NTISEAN:NVIDEO}
OPTIONS_DEFAULT= ${OPTIONS_DEFINE:NPARALLEL:NSTRINGS:NTISEAN:NVIDEO:NLEVEL_SET:NLTFAT}
TARBALLS_DIR= ${LOCALBASE}/share/octave/tarballs

10
math/octave/Makefile
View File

@ -3,7 +3,6 @@
PORTNAME= octave
PORTVERSION= ${OCTAVE_VERSION}
PORTREVISION= 7
CATEGORIES= math
MASTER_SITES= GNU
@ -36,9 +35,10 @@ LIB_DEPENDS= libGraphicsMagick.so:graphics/GraphicsMagick \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libdrm.so:graphics/libdrm \
libsndfile.so:audio/libsndfile \
libOSMesa.so:graphics/libosmesa \
libsundials_arkode.so:math/sundials \
libportaudio.so:audio/portaudio
# libsndfile.so:audio/libsndfile # Commented out until this port no longer has vulnerabilities.
USES= charsetfix fortran gmake libtool perl5 pkgconfig readline \
tar:xz compiler:c++14-lang \
@ -72,10 +72,10 @@ CONFIGURE_ENV= GPERF="${LOCALBASE}/bin/gperf" \
CONFIGURE_ARGS= --host=${GNU_HOST} \
--with-blas="-L${LOCALBASE}/lib ${BLASLIB}" \
--with-lapack="${LAPACKLIB}" \
--with-sndfile \
--enable-shared \
--disable-jit \
--disable-openmp
--disable-openmp \
--with-osmesa
INFO= octave liboctave
@ -103,7 +103,7 @@ ATLAS_USES= blaslapack:atlas
post-patch:
${REINPLACE_CMD} 's+"makeinfo"+"${LOCALBASE}/bin/makeinfo"+' ${WRKSRC}/libinterp/corefcn/help.cc
${REINPLACE_CMD} 's/"-qt$$qt_version"/"-qt=qt$$qt_version"/' ${WRKSRC}/configure
${REINPLACE_CMD} 's/"-qt=$$qt_version"/"-qt=qt$$qt_version"/' ${WRKSRC}/configure
post-install:
(cd ${STAGEDIR}${DATADIR} && ${LN} -s ${PORTVERSION}/imagelib .)

3
math/octave/Makefile.version
View File

@ -1,5 +1,4 @@
# $FreeBSD$
# Version to share with ports depending on octave
OCTAVE_VERSION= 5.2.0
OCTAVE_VERSION= 6.2.0

6
math/octave/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1580939397
SHA256 (octave-5.2.0.tar.xz) = 2757b5cc1854c9326d6c99d2900c7cec2909ac7ed500212d170d0df592bfd26b
SIZE (octave-5.2.0.tar.xz) = 25439716
TIMESTAMP = 1613932990
SHA256 (octave-6.2.0.tar.xz) = 7b721324cccb3eaeb4efb455508201ac8ccbd200f77106f52342f9ab7f022d1a
SIZE (octave-6.2.0.tar.xz) = 25131148

4
math/octave/files/patch-build-aux_find-defun-files.sh
View File

@ -1,6 +1,6 @@
--- build-aux/find-defun-files.sh.orig 2018-04-30 17:03:56 UTC
--- build-aux/find-defun-files.sh.orig 2020-11-26 18:20:44 UTC
+++ build-aux/find-defun-files.sh
@@ -20,7 +20,7 @@
@@ -27,7 +27,7 @@
set -e

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