<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6d31fd8e7db8e5cdfb8123babb73c5a7f233da0f">https://github.com/macports/macports-ports/commit/6d31fd8e7db8e5cdfb8123babb73c5a7f233da0f</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 6d31fd8 octave: update version 4.4.1->5.1.0
</span>6d31fd8 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6d31fd8e7db8e5cdfb8123babb73c5a7f233da0f
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Mar 9 14:06:06 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> octave: update version 4.4.1->5.1.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * mark octave-devel as obsolete as it is behind octave version
</span><span style='display:block; white-space:pre;color:#404040;'> * update dependencies
</span><span style='display:block; white-space:pre;color:#404040;'> * fix dependencies that rely on removed Octave features
</span>---
math/DSDP/Portfile | 2 +-
math/octave-audio/Portfile | 2 +-
math/octave-benchmark/Portfile | 2 +-
math/octave-bim/Portfile | 2 +-
math/octave-bioinfo/Portfile | 2 +-
math/octave-bsltl/Portfile | 1 +
math/octave-cgi/Portfile | 2 +-
math/octave-civil-engineering/Portfile | 2 +-
math/octave-communications/Portfile | 5 +-
.../files/patch-fixes_for_4.2.diff | 3 +-
.../octave-communications/files/patch-octave5.diff | 350 +++++++++++++++++++
math/octave-control/Portfile | 2 +-
math/octave-data-smoothing/Portfile | 2 +-
math/octave-database/Portfile | 5 +-
math/octave-database/files/patch-octave5.diff | 10 +
math/octave-dataframe/Portfile | 2 +-
math/octave-divand/Portfile | 2 +-
math/octave-doctest/Portfile | 2 +-
math/octave-econometrics/Portfile | 2 +-
math/octave-financial/Portfile | 1 +
math/octave-fits/Portfile | 5 +-
math/octave-fits/files/patch-octave5.diff | 33 ++
math/octave-fl-core/Portfile | 2 +-
math/octave-fpl/Portfile | 2 +-
math/octave-fuzzy-logic-toolkit/Portfile | 2 +-
math/octave-ga/Portfile | 2 +-
math/octave-general/Portfile | 2 +-
math/octave-generate_html/Portfile | 2 +-
math/octave-geometry/Portfile | 2 +-
math/octave-gsl/Portfile | 2 +-
math/octave-ident/Portfile | 2 +-
math/octave-image/Portfile | 1 +
math/octave-informationtheory/Portfile | 2 +-
math/octave-integration/Portfile | 2 +-
math/octave-interval/Portfile | 2 +-
math/octave-io/Portfile | 1 +
math/octave-irsa/Portfile | 2 +-
math/octave-linear-algebra/Portfile | 5 +-
.../files/patch-DESCRIPTION.diff | 11 -
.../octave-linear-algebra/files/patch-octave5.diff | 22 ++
math/octave-ltfat/Portfile | 2 +-
math/octave-mapping/Portfile | 2 +-
math/octave-mechanics/Portfile | 2 +-
math/octave-miscellaneous/Portfile | 2 +-
math/octave-missing-functions/Portfile | 2 +-
math/octave-msh/Portfile | 2 +-
math/octave-multicore/Portfile | 2 +-
math/octave-mvn/Portfile | 2 +-
math/octave-nan/Portfile | 2 +-
math/octave-ncarray/Portfile | 2 +-
math/octave-netcdf/Portfile | 2 +-
math/octave-nnet/Portfile | 2 +-
math/octave-ocs/Portfile | 2 +-
math/octave-octclip/Portfile | 2 +-
math/octave-octproj/Portfile | 2 +-
math/octave-odebvp/Portfile | 2 +-
math/octave-optics/Portfile | 2 +-
math/octave-optim/Portfile | 5 +-
math/octave-optim/files/patch-octave5.diff | 11 +
math/octave-optiminterp/Portfile | 2 +-
math/octave-outliers/Portfile | 2 +-
math/octave-parallel/Portfile | 5 +-
math/octave-parallel/files/patch-octave5.diff | 56 +++
math/octave-plot/Portfile | 2 +-
math/octave-printpgf/Portfile | 2 +-
math/octave-quaternion/Portfile | 2 +-
math/octave-queueing/Portfile | 1 +
math/octave-secs1d/Portfile | 2 +-
math/octave-signal/Portfile | 5 +-
math/octave-signal/files/patch-octave5.diff | 167 +++++++++
math/octave-sockets/Portfile | 2 +-
math/octave-specfun/Portfile | 2 +-
math/octave-special-matrix/Portfile | 2 +-
math/octave-spline-gcvspl/Portfile | 2 +-
math/octave-splines/Portfile | 2 +-
math/octave-statistics/Portfile | 1 +
math/octave-stk/Portfile | 2 +-
math/octave-strings/Portfile | 5 +-
math/octave-strings/files/patch-octave5.diff | 24 ++
math/octave-struct/Portfile | 5 +-
math/octave-struct/files/patch-octave5.diff | 125 +++++++
math/octave-symband/Portfile | 2 +-
math/octave-symbolic/Portfile | 1 +
math/octave-tcl-octave/Portfile | 2 +-
math/octave-tisean/Portfile | 2 +-
math/octave-tsa/Portfile | 2 +-
math/octave-video/Portfile | 7 +-
math/octave-video/files/patch-octave5.diff | 14 +
math/octave-vrml/Portfile | 2 +-
math/octave-windows/Portfile | 2 +-
math/octave-zenity/Portfile | 2 +-
math/octave-zeromq/Portfile | 2 +-
math/octave/Portfile | 167 +++------
math/octave/files/clang-libcxx-fix.patch | 135 --------
math/octave/files/patch-arch_arg-devel.diff | 22 --
math/octave/files/patch-arch_arg.diff | 2 +-
math/octave/files/patch-bsdtar-devel.diff | 36 --
math/octave/files/patch-bsdtar.diff | 4 +-
math/octave/files/patch-crash_on_exit-devel.diff | 22 --
math/octave/files/patch-crash_on_exit.diff | 7 +-
math/octave/files/patch-etree.diff | 20 --
math/octave/files/patch-figures.diff | 380 ---------------------
math/octave/files/patch-force_cxx-devel.diff | 22 --
math/octave/files/patch-force_cxx.diff | 30 +-
math/octave/files/patch-iconsize-devel.diff | 16 -
math/octave/files/patch-iconsize.diff | 16 -
math/octave/files/patch-link-devel.diff | 23 --
math/octave/files/patch-link.diff | 23 --
math/octave/files/patch-link_location.diff | 10 +
math/octave/files/patch-run-octave.diff | 4 +-
math/octave/files/patch-undefined-devel.diff | 73 ----
math/octave/files/patch-versions-devel.diff | 59 ----
math/octave/files/patch-versions.diff | 16 +-
pure/pure-octave/Portfile | 2 +-
python/py-oct2py/Portfile | 2 +-
python/py-octave_kernel/Portfile | 1 +
science/gmt4/Portfile | 2 +-
science/lal/Portfile | 2 +-
science/lalburst/Portfile | 2 +-
science/lalframe/Portfile | 2 +-
science/lalinference/Portfile | 2 +-
science/lalinspiral/Portfile | 2 +-
science/lalmetaio/Portfile | 2 +-
science/lalpulsar/Portfile | 2 +-
science/lalsimulation/Portfile | 2 +-
science/limesuite/Portfile | 4 +-
science/nds2-client-swig/Portfile | 1 +
127 files changed, 1022 insertions(+), 1104 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/DSDP/Portfile b/math/DSDP/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cbcc760..aecbd3b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/DSDP/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/DSDP/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup muniversal 1.0
</span>
name DSDP
version 5.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span> categories math science
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-audio/Portfile b/math/octave-audio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7ad9146..7572f96 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-audio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-audio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup octave 1.0
</span>
octave.setup audio 1.1.4
octave.config_h yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> platforms darwin
license GPL-2+ public-domain
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-benchmark/Portfile b/math/octave-benchmark/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 454f0cf..fe5fa17 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-benchmark/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-benchmark/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup benchmark 1.1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
license GPL-2
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-bim/Portfile b/math/octave-bim/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c687f32..09588bc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-bim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-bim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup bim 1.1.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
license GPL-2+
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-bioinfo/Portfile b/math/octave-bioinfo/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c19067f..b80f980 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-bioinfo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-bioinfo/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup bioinfo 0.1.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
license GPL-2+
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-bsltl/Portfile b/math/octave-bsltl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6bef68a..c440b95 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-bsltl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-bsltl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup bsltl 1.1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-cgi/Portfile b/math/octave-cgi/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6cdee14..f5d47d3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-cgi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-cgi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup cgi 0.1.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-civil-engineering/Portfile b/math/octave-civil-engineering/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 734acae..b76250c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-civil-engineering/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-civil-engineering/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup civil-engineering 1.0.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
license GPL-2+
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-communications/Portfile b/math/octave-communications/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fba1851..4def6f6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-communications/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-communications/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup octave 1.0
</span>
octave.setup communications 1.2.1
octave.config_h yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 7
</span> platforms darwin
license GPL-3+
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,3 +22,6 @@ depends_lib-append port:octave-signal
</span>
patchfiles-append patch-fixes_for_4.2.diff
patch.pre_args -p1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# compensate for Octave 5 changes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-octave5.diff
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-communications/files/patch-fixes_for_4.2.diff b/math/octave-communications/files/patch-fixes_for_4.2.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5c871bb..d256d5f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-communications/files/patch-fixes_for_4.2.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-communications/files/patch-fixes_for_4.2.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -359,7 +359,7 @@ new file mode 100644
</span> index 0000000..985d53a
--- /dev/null
+++ b/src/ls-oct-ascii.cc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,433 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -0,0 +1,432 @@
</span> +/*
+
+Copyright (C) 1996-2015 John W. Eaton
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -411,7 +411,6 @@ index 0000000..985d53a
</span> +#include "Cell.h"
+#include "defun.h"
+#include "error.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "gripes.h"
</span> +#include "load-save.h"
+#include "ls-ascii-helper.h"
+#include "ls-oct-ascii.h"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-communications/files/patch-octave5.diff b/math/octave-communications/files/patch-octave5.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5bec468
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-communications/files/patch-octave5.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,350 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/genqamdemod.cc.orig 2015-04-04 09:28:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/genqamdemod.cc 2019-03-09 03:46:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,7 +36,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int nr1 (args(0).rows ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int nc1 (args(0).columns ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int arg_is_empty1 = empty_arg ("genqamdemod", nr1, nc1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int arg_is_empty1 = args(0).isempty();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Matrix y (nr1,nc1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int nr2 (args(1).rows ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/gf.cc.orig 2015-04-04 09:28:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/gf.cc 2019-03-09 04:20:21.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -971,7 +971,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int nr = arg.rows ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int nc = arg.columns ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int arg_is_empty = empty_arg ("glu", nr, nc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int arg_is_empty = arg.isempty();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (arg_is_empty < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1055,7 +1055,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ galois m = ((const octave_galois&) arg.get_rep ()).galois_value ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int arg_is_empty = empty_arg ("ginverse", nr, nc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int arg_is_empty = arg.isempty();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (arg_is_empty < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1152,7 +1152,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ galois m = ((const octave_galois&) arg.get_rep ()).galois_value ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int arg_is_empty = empty_arg ("gdet", nr, nc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int arg_is_empty = arg.isempty();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (arg_is_empty < 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1212,7 +1212,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ galois m = ((const octave_galois&) arg.get_rep ()).galois_value ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int arg_is_empty = empty_arg ("grank", nr, nc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int arg_is_empty = arg.isempty();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (arg_is_empty > 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ retval = 0.0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/galois-def.h.orig 2015-04-04 09:28:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/galois-def.h 2019-03-09 04:09:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -137,7 +137,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ r(i, j) = (int)m1(i, j) ^ (int)m2(0, 0); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_nonconformant (#OP, m1_nr, m1_nc, m2_nr, m2_nc); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ octave::err_nonconformant (#OP, m1_nr, m1_nc, m2_nr, m2_nc); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -221,7 +221,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (m1_nr > 0 && m1_nc > 0) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -289,7 +289,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ r(i, j) = C1 (m1(i, j)) OP C2 (m2(0, 0)); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return r; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -350,7 +350,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OP (m2(0, 0) != ZERO); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if ((m1_nr != 0 || m1_nc != 0) && (m2_nr != 0 || m2_nc != 0)) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ octave::err_nonconformant (#F, m1_nr, m1_nc, m2_nr, m2_nc); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return r; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/galois.cc.orig 2019-03-09 03:59:21.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/galois.cc 2019-03-09 04:04:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,7 +20,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <octave/config.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <octave/error.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <octave/gripes.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <octave/errwarn.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <octave/mx-op-defs.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "galois.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -216,7 +216,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (nr != a_nr || nc != a_nc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_nonconformant ("operator +=", nr, nc, a_nr, a_nc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ octave::err_nonconformant ("operator +=", nr, nc, a_nr, a_nc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return *this;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -252,7 +252,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (nr != a_nr || nc != a_nc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_nonconformant ("operator -=", nr, nc, a_nr, a_nc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ octave::err_nonconformant ("operator -=", nr, nc, a_nr, a_nc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return *this;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -518,7 +518,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (a_nr != b_nr || a_nc != b_nc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_nonconformant ("operator .^", a_nr, a_nc, a_nr, a_nc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ octave::err_nonconformant ("operator .^", a_nr, a_nc, a_nr, a_nc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return galois ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -549,7 +549,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (a_nr != b_nr || a_nc != b_nc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_nonconformant ("operator .^", a_nr, a_nc, b_nr, b_nc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ octave::err_nonconformant ("operator .^", a_nr, a_nc, b_nr, b_nc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return galois ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -758,7 +758,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return product (a, b);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (a_nc != b_nr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ octave::err_nonconformant ("operator *", a_nr, a_nc, b_nr, b_nc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return galois ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1420,7 +1420,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int a_nr = a.rows ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int b_nr = b.rows ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_nonconformant ("operator /", a_nr, a_nc, b_nr, b_nc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ octave::err_nonconformant ("operator /", a_nr, a_nc, b_nr, b_nc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return galois ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1464,7 +1464,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int a_nc = a.cols ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int b_nc = b.cols ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_nonconformant ("operator \\", a_nr, a_nc, b_nr, b_nc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ octave::err_nonconformant ("operator \\", a_nr, a_nc, b_nr, b_nc);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return galois ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/gf.cc.orig 2015-04-04 09:28:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/gf.cc 2019-03-09 04:16:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,7 +31,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <octave/config.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <octave/defun-dld.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <octave/gripes.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <octave/errwarn.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <octave/oct-locbuf.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <octave/ov.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <octave/utils.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -142,7 +142,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((!galois_type_loaded) || (a.type_id () !=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ octave_galois::static_type_id ()))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_wrong_type_arg ("gdiag", a);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_wrong_type_arg ("gdiag", a);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ galois m = ((const octave_galois&) a.get_rep ()).galois_value ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -196,7 +196,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_wrong_type_arg ("gdiag", a);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_wrong_type_arg ("gdiag", a);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -302,7 +302,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((!galois_type_loaded) || (args(0).type_id () !=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ octave_galois::static_type_id ()))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_wrong_type_arg ("greshape", args(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_wrong_type_arg ("greshape", args(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ galois a = ((const octave_galois&) args(0).get_rep ()).galois_value ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -372,7 +372,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_wrong_type_arg (#FCN, arg); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_wrong_type_arg (#FCN, arg); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -469,7 +469,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!galois_type_loaded || (args(0).type_id () !=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ octave_galois::static_type_id ()))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_wrong_type_arg ("gsqrt", args(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_wrong_type_arg ("gsqrt", args(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -508,7 +508,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!galois_type_loaded || (args(0).type_id () !=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ octave_galois::static_type_id ()))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_wrong_type_arg ("glog", args(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_wrong_type_arg ("glog", args(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -547,7 +547,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!galois_type_loaded || (args(0).type_id () !=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ octave_galois::static_type_id ()))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_wrong_type_arg ("gexp", args(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_wrong_type_arg ("gexp", args(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -962,7 +962,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!galois_type_loaded || (arg.type_id () !=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ octave_galois::static_type_id ()))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_wrong_type_arg ("glu", arg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_wrong_type_arg ("glu", arg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1049,7 +1049,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!galois_type_loaded || (arg.type_id () !=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ octave_galois::static_type_id ()))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_wrong_type_arg ("ginverse", arg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_wrong_type_arg ("ginverse", arg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1066,7 +1066,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (nr != nc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_square_matrix_required ("ginverse");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_square_matrix_required ("ginverse", "A");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1143,7 +1143,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!galois_type_loaded || (arg.type_id () !=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ octave_galois::static_type_id ()))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_wrong_type_arg ("gdet", arg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_wrong_type_arg ("gdet", arg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1164,7 +1164,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (nr != nc)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_square_matrix_required ("det");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_square_matrix_required ("det", "A");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1203,7 +1203,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!galois_type_loaded || (arg.type_id () !=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ octave_galois::static_type_id ()))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_wrong_type_arg ("grank", arg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_wrong_type_arg ("grank", arg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1333,7 +1333,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!galois_type_loaded || (args(0).type_id () !=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ octave_galois::static_type_id ()))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_wrong_type_arg ("rsenc", args(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_wrong_type_arg ("rsenc", args(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1874,7 +1874,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!galois_type_loaded || (args(0).type_id () !=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ octave_galois::static_type_id ()))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_wrong_type_arg ("rsdec", args(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_wrong_type_arg ("rsdec", args(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/ov-galois.cc.orig 2019-03-09 04:33:21.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/ov-galois.cc 2019-03-09 04:37:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -22,7 +22,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <octave/config.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <octave/byte-swap.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <octave/gripes.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <octave/errwarn.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <octave/lo-ieee.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <octave/oct-locbuf.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <octave/oct-obj.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -328,13 +328,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (rows () > 0 && columns () > 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_implicit_conversion ("Octave:array-as-scalar",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ warn_implicit_conversion ("Octave:array-as-scalar",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "real matrix", "real scalar");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ retval = (double) gval (0, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_invalid_conversion ("galois", "real scalar");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_invalid_conversion ("galois", "real scalar");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -348,13 +348,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (rows () > 0 && columns () > 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_implicit_conversion ("Octave:array-as-scalar",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ warn_implicit_conversion ("Octave:array-as-scalar",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "real matrix", "real scalar");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ retval = (double) gval (0, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_invalid_conversion ("galois", "complex scalar");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_invalid_conversion ("galois", "complex scalar");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-control/Portfile b/math/octave-control/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 84b45ae..c9342d6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-control/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-control/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup octave 1.0
</span> PortGroup compilers 1.0
octave.setup control 3.1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> platforms darwin
license GPL-3+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-data-smoothing/Portfile b/math/octave-data-smoothing/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9b9edce..bf353f6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-data-smoothing/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-data-smoothing/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup data-smoothing 1.3.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
license GPL-3+
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-database/Portfile b/math/octave-database/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 94e21fa7..98bbf4b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-database/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-database/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup database 2.4.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> platforms darwin
license GPL-3+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,6 +19,9 @@ checksums rmd160 f46fb94db490d239cce5f34a22de6983577de0e0 \
</span> depends_lib-append port:octave-struct \
port:swig-octave
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# compensate for Octave 5 changes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-octave5.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # set postgresql variants
set postgresql_suffixes {83 84 90 91 92 93 94 95 96}
set default_postgresql_suffix 95
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-database/files/patch-octave5.diff b/math/octave-database/files/patch-octave5.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..f07b29a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-database/files/patch-octave5.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/error-helpers.cc.orig 2018-05-18 08:48:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/error-helpers.cc 2019-03-09 05:15:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,6 +20,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <octave/oct.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "error-helpers.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <iostream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // call verror
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_OCTAVE_VERROR_ARG_EXC
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-dataframe/Portfile b/math/octave-dataframe/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a19f89c..2a50181 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-dataframe/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-dataframe/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup dataframe 1.2.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-divand/Portfile b/math/octave-divand/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 437c674..ee10448 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-divand/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-divand/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup divand 1.1.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-doctest/Portfile b/math/octave-doctest/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8f0998e..a2c9a80 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-doctest/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-doctest/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup doctest 0.6.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-econometrics/Portfile b/math/octave-econometrics/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ef2c547..e8e9ff5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-econometrics/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-econometrics/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup econometrics 1.1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> platforms darwin
license GPL-3+
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-financial/Portfile b/math/octave-financial/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2b2aea9..05421e7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-financial/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-financial/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup financial 0.5.3
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> platforms darwin
license GPL-3+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-fits/Portfile b/math/octave-fits/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6af46dd..c707398 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-fits/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-fits/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup fits 1.0.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,3 +16,6 @@ checksums rmd160 16ed71497646b441df4ab65d83e23be3c64d43c1 \
</span> sha256 95124173f852498cb71acc97712af104027669f60c4f972bbcd8c59b2b2f4b49
depends_lib-append port:cfitsio
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# compensate for Octave 5 changes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-octave5.diff
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-fits/files/patch-octave5.diff b/math/octave-fits/files/patch-octave5.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3c843ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-fits/files/patch-octave5.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,33 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/save_fits_image.cc.orig 2015-06-11 04:19:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/save_fits_image.cc 2019-03-08 05:23:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -81,7 +81,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if( args(2).is_scalar_type() )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double val = args(2).double_value();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if( (D_NINT( val ) == val) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if( (octave::math::x_nint( val ) == val) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( BYTE_IMG == val )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bitperpixel = BYTE_IMG;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/save_fits_image_multi_ext.cc.orig 2015-06-11 04:19:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/save_fits_image_multi_ext.cc 2019-03-08 05:24:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -78,7 +78,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if( args(2).is_scalar_type() )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double val = args(2).double_value();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if( (D_NINT( val ) == val) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if( (octave::math::x_nint( val ) == val) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if( BYTE_IMG == val )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bitperpixel = BYTE_IMG;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/read_fits_image.cc.orig 2015-06-11 04:19:38.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/read_fits_image.cc 2019-03-08 05:24:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -194,7 +194,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return true;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double val = args(1).double_value();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if( (D_NINT( val ) != val) || (val < 0) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if( (octave::math::x_nint( val ) != val) || (val < 0) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error( "read_fits_image: second argument must be a non-negative scalar integer value" );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return true;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-fl-core/Portfile b/math/octave-fl-core/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 71ef894..6062665 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-fl-core/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-fl-core/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup fl-core 1.0.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-fpl/Portfile b/math/octave-fpl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cd59da2..0923371 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-fpl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-fpl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup fpl 1.3.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
license GPL-3+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-fuzzy-logic-toolkit/Portfile b/math/octave-fuzzy-logic-toolkit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 084e2eb..b84cea1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-fuzzy-logic-toolkit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-fuzzy-logic-toolkit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup fuzzy-logic-toolkit 0.4.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-ga/Portfile b/math/octave-ga/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a61c80d..dd34bf6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-ga/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-ga/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup ga 0.10.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
license GPL-2+
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-general/Portfile b/math/octave-general/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f8e84c6..3c5d709 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-general/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-general/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup general 2.1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> platforms darwin
license GPL-3+ BSD public-domain
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-generate_html/Portfile b/math/octave-generate_html/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 813373d..59d6e15 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-generate_html/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-generate_html/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup generate_html 0.3.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-geometry/Portfile b/math/octave-geometry/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0c628c2..72c43cc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-geometry/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-geometry/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup geometry 3.0.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span> platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-gsl/Portfile b/math/octave-gsl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 541ffab..319b698 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-gsl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-gsl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup gsl 2.1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-ident/Portfile b/math/octave-ident/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b7fb905..735aa13 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-ident/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-ident/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup ident 1.0.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
license GPL-2+
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-image/Portfile b/math/octave-image/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 66d53a2..3cc0bb7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-image/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-image/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,7 @@ PortGroup cxx11 1.1
</span> PortGroup octave 1.0
octave.setup image 2.10.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> platforms darwin
license GPL-3+ MIT FreeBSD
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-informationtheory/Portfile b/math/octave-informationtheory/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9b43319..7f5b169 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-informationtheory/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-informationtheory/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup informationtheory 0.1.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
license GPL-2+
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-integration/Portfile b/math/octave-integration/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 23fb4f6..a39125e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-integration/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-integration/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup integration 1.0.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
license GPL-2+
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-interval/Portfile b/math/octave-interval/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c585292..ed656d8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-interval/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-interval/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup octave 1.0
</span> PortGroup compiler_blacklist_versions 1.0
octave.setup interval 3.2.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> platforms darwin
license GPL-3+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-io/Portfile b/math/octave-io/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6f2052d..64ec7c6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-io/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-io/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup io 2.4.12
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> platforms darwin
license GPL-3+ BSD
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-irsa/Portfile b/math/octave-irsa/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 649ac36..7c702a7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-irsa/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-irsa/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup irsa 1.0.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
license GPL-2+
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-linear-algebra/Portfile b/math/octave-linear-algebra/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 63e51f7..1346f27 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-linear-algebra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-linear-algebra/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup octave 1.0
</span>
octave.setup linear-algebra 2.2.2
octave.config_h yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 7
</span> platforms darwin
license GPL-3+ LGPL-3+ FreeBSD
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,6 +19,7 @@ checksums rmd160 73807f63512d82dab9e225065283a553b891bfbf \
</span>
depends_lib-append port:octave-general
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-DESCRIPTION.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# compensate for Octave 5 changes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-octave5.diff
</span>
configure.env-append "PREFIX_BIN=${prefix}/bin"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-linear-algebra/files/patch-DESCRIPTION.diff b/math/octave-linear-algebra/files/patch-DESCRIPTION.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bdae898..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-linear-algebra/files/patch-DESCRIPTION.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- DESCRIPTION.orig 2015-04-11 15:08:34.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ DESCRIPTION 2015-04-11 15:08:46.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6,7 +6,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Title: Linear algebra.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Description: Additional linear algebra code, including general SVD and matrix functions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Categories: Linear algebra
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--Depends: octave (>= 4.0.0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+Depends: octave (>= 3.8.2)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Autoload: no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- License: GPLv3+, LGPLv3+, FreeBSD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Url: http://octave.sf.net
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-linear-algebra/files/patch-octave5.diff b/math/octave-linear-algebra/files/patch-octave5.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a6af920
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-linear-algebra/files/patch-octave5.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gsvd.cc.orig 2015-01-24 12:54:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gsvd.cc 2019-03-09 02:48:41.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,7 +23,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "defun-dld.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "error.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include "gripes.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include "errwarn.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "oct-obj.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "pr-output.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "utils.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -296,8 +296,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_wrong_type_arg ("gsvd", argA);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_wrong_type_arg ("gsvd", argB);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_wrong_type_arg ("gsvd", argA);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_wrong_type_arg ("gsvd", argB);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-ltfat/Portfile b/math/octave-ltfat/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 456ce2e..11ee611 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-ltfat/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-ltfat/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup octave 1.0
</span> PortGroup compilers 1.0
octave.setup ltfat 2.3.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span>
checksums rmd160 cf4d59beba504a3000ba63becceb600425f4f45d \
sha256 3063eced0aa185162f3049e37c2ca8076985b76b7173738e7389184e5481f03d \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-mapping/Portfile b/math/octave-mapping/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e7eedb6..159f4c0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-mapping/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-mapping/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup mapping 1.2.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-mechanics/Portfile b/math/octave-mechanics/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 22ee7f8..2da0db5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-mechanics/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-mechanics/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup mechanics 1.3.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-miscellaneous/Portfile b/math/octave-miscellaneous/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f76317b..06f56f4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-miscellaneous/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-miscellaneous/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup miscellaneous 1.2.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span> platforms darwin
license GPL-3+
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-missing-functions/Portfile b/math/octave-missing-functions/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a82659c..4eb6c85 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-missing-functions/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-missing-functions/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup missing-functions 1.0.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
license GPL-2+
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-msh/Portfile b/math/octave-msh/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 845c0db..f36259c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-msh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-msh/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup msh 1.0.10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> platforms darwin
license GPL-2+
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-multicore/Portfile b/math/octave-multicore/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e2dd2d5..2806e14 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-multicore/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-multicore/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup multicore 0.2.15
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> platforms darwin
license GPL-2+
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-mvn/Portfile b/math/octave-mvn/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a25048a..13e8e08 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-mvn/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-mvn/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup mvn 1.1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-nan/Portfile b/math/octave-nan/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 10b357a..01114b5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-nan/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-nan/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup nan 3.1.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
license GPL-3+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-ncarray/Portfile b/math/octave-ncarray/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e2590d9..2b7f8d8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-ncarray/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-ncarray/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup ncarray 1.0.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-netcdf/Portfile b/math/octave-netcdf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8481cf3..6540b9d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-netcdf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-netcdf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup netcdf 1.0.12
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span> platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-nnet/Portfile b/math/octave-nnet/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3e64ddf..f2a4657 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-nnet/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-nnet/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup nnet 0.1.13
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
license GPL-2+
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-ocs/Portfile b/math/octave-ocs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3cc8420..534010d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-ocs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-ocs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup ocs 0.1.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-octclip/Portfile b/math/octave-octclip/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 15fc119..467ed61 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-octclip/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-octclip/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup octclip 1.0.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-octproj/Portfile b/math/octave-octproj/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 98eae96..fcc4826 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-octproj/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-octproj/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup octproj 1.1.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 11
</span> platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-odebvp/Portfile b/math/octave-odebvp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d2c0cc3..94d5893 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-odebvp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-odebvp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup odebvp 1.0.6
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
license GPL-2+
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-optics/Portfile b/math/octave-optics/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8a0b850..fabb426 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-optics/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-optics/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup optics 0.1.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-optim/Portfile b/math/octave-optim/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 69fbf36..24f41ca 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-optim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-optim/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup octave 1.0
</span> PortGroup compilers 1.0
octave.setup optim 1.5.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> platforms darwin
license GFDL GPL-3+ BSD public-domain
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,5 +19,8 @@ checksums rmd160 534966eaabf00a153aff558e1c0a49acc922cb74 \
</span> depends_lib-append port:octave-miscellaneous \
port:octave-struct
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# compensate for Octave 5 changes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-octave5.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> compilers.choose fc f77 f90
compilers.setup require_fortran
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-optim/files/patch-octave5.diff b/math/octave-optim/files/patch-octave5.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..ddea28e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-optim/files/patch-octave5.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/error-helpers.cc.orig 2018-08-01 13:52:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/error-helpers.cc 2019-03-09 09:25:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,6 +21,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "error-helpers.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <iostream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // call verror
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_OCTAVE_VERROR_ARG_EXC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-optiminterp/Portfile b/math/octave-optiminterp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ce60b11..73a17a2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-optiminterp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-optiminterp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup optiminterp 0.3.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> platforms darwin
license GPL-3+
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-outliers/Portfile b/math/octave-outliers/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 89943f7..c2f43c3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-outliers/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-outliers/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup outliers 0.13.9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
license GPL-2+
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-parallel/Portfile b/math/octave-parallel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4de505c..3e237ed 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-parallel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-parallel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup parallel 3.1.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> platforms darwin
license GPL-2+ GPL-3+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,3 +17,6 @@ checksums rmd160 ce9ccc6aa3bc44bcceeebdbabf6c2aee4c9186b4 \
</span>
depends_lib-append port:gnutls \
port:octave-struct
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# compensate for Octave 5 changes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-octave5.diff
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-parallel/files/patch-octave5.diff b/math/octave-parallel/files/patch-octave5.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9ee0dab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-parallel/files/patch-octave5.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,56 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/pserver.cc.orig 2018-08-03 00:41:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/pserver.cc 2019-03-09 09:50:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -169,7 +169,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (octave_completion_matches_called)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ octave_completion_matches_called = false;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- command_editor::increment_current_command_number ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ octave::command_editor::increment_current_command_number ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dsprintf ("reval loop, no error, after caring for Octave command number\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1116,10 +1116,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OCTAVE__INTERPRETER__SYMBOL_TABLE__ASSIGN ("sockets", sockets);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dsprintf ("'sockets' installed\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int cd_ok = octave_env::chdir (directory.c_str ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int cd_ok = octave::sys::env::chdir (directory.c_str ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (! cd_ok)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- octave_env::chdir ("/tmp");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ octave::sys::env::chdir ("/tmp");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dsprintf ("performed chdir to /tmp\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/minimal-load-save.cc.orig 2018-08-03 00:41:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/minimal-load-save.cc 2019-03-09 09:59:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -58,7 +58,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ flt_fmt = mopt_digit_to_float_format (tmp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (flt_fmt == OCTAVE__MACH_INFO::flt_fmt_unknown)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (flt_fmt == OCTAVE__MACH_INFO::float_format::flt_fmt_unknown)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _p_error ("unrecognized binary format");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/pconnect.cc.orig 2018-08-03 00:41:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/pconnect.cc 2019-03-09 09:50:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -533,7 +533,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dcprintf ("hostname %i written (%s)\n", j, hosts(j).c_str ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- std::string directory = octave_env::get_current_directory ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ std::string directory = octave::sys::env::get_current_directory ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conn->get_cmd_stream ()->network_send_string (directory.c_str ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dcprintf ("directory written (%s)\n", directory.c_str ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/error-helpers.cc.orig 2018-08-03 00:41:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/error-helpers.cc 2019-03-09 09:49:55.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,6 +20,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <octave/oct.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "error-helpers.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <iostream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // call verror
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_OCTAVE_VERROR_ARG_EXC
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-plot/Portfile b/math/octave-plot/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0042d02..cb12a25 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-plot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-plot/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup plot 1.1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
license GPL-2+
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-printpgf/Portfile b/math/octave-printpgf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0773023..fb9e905 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-printpgf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-printpgf/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup printpgf 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span>
platforms darwin
license GPL-2+
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-quaternion/Portfile b/math/octave-quaternion/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 750c44b..908004d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-quaternion/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-quaternion/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup quaternion 2.4.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-queueing/Portfile b/math/octave-queueing/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3cdc18e..2ee7c36 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-queueing/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-queueing/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup queueing 1.2.6
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-secs1d/Portfile b/math/octave-secs1d/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ae8ad35..928d7ff 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-secs1d/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-secs1d/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup secs1d 0.0.9
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
license GPL-2+
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-signal/Portfile b/math/octave-signal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ae66b6c..1256d26 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-signal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-signal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup signal 1.4.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> platforms darwin
license GPL-3+ public-domain
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,3 +18,6 @@ checksums rmd160 9d63ca9b94b3e6649f01964639e2eea40a4f0d8d \
</span>
depends_lib-append port:octave-control \
port:octave-specfun
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# compensate for Octave 5 changes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-octave5.diff
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-signal/files/patch-octave5.diff b/math/octave-signal/files/patch-octave5.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..fd178a0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-signal/files/patch-octave5.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,167 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/upfirdn.cc.orig 2018-04-30 13:48:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/upfirdn.cc 2019-03-09 03:05:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,7 +21,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <octave/oct.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <octave/defun-dld.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <octave/error.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <octave/gripes.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <octave/errwarn.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <octave/pager.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <octave/quit.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <octave/variables.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -109,7 +109,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (error_state)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_wrong_type_arg ("upfirdn", args(1));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_wrong_type_arg ("upfirdn", args(1));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -117,7 +117,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (error_state)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_wrong_type_arg ("upfirdn", args(2));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_wrong_type_arg ("upfirdn", args(2));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -125,7 +125,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (error_state)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_wrong_type_arg ("upfirdn", args(3));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_wrong_type_arg ("upfirdn", args(3));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -135,7 +135,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Matrix x = args (0).matrix_value ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (error_state)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_wrong_type_arg ("upfirdn", args(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_wrong_type_arg ("upfirdn", args(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -147,7 +147,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ComplexMatrix x = args (0).complex_matrix_value ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (error_state)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_wrong_type_arg ("upfirdn", args(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_wrong_type_arg ("upfirdn", args(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -156,7 +156,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_wrong_type_arg ("upfirdn", args(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_wrong_type_arg ("upfirdn", args(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/cl2bp.cc.orig 2018-04-30 13:48:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/cl2bp.cc 2019-03-09 03:07:05.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -89,27 +89,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const int m = args(0).int_value(true);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (error_state) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_wrong_type_arg ("cl2bp", args(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_wrong_type_arg ("cl2bp", args(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const double w1 = args(1).double_value();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (error_state) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_wrong_type_arg ("cl2bp", args(1));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_wrong_type_arg ("cl2bp", args(1));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const double w2 = args(2).double_value();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (error_state) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_wrong_type_arg ("cl2bp", args(2));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_wrong_type_arg ("cl2bp", args(2));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const ColumnVector up_vector(args(3).vector_value());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (error_state) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_wrong_type_arg ("cl2bp", args(3));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_wrong_type_arg ("cl2bp", args(3));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const ColumnVector lo_vector(args(4).vector_value());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (error_state) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_wrong_type_arg ("cl2bp", args(4));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_wrong_type_arg ("cl2bp", args(4));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (up_vector.numel() != 3 || lo_vector.numel() != 3) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -126,7 +126,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const int L = args(5).int_value(true);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (error_state) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_wrong_type_arg ("cl2bp", args(5));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_wrong_type_arg ("cl2bp", args(5));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (L > 1000000) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/sosfilt.cc.orig 2018-04-30 13:48:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/sosfilt.cc 2019-03-09 03:07:54.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,7 +21,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <octave/oct.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <octave/defun-dld.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <octave/error.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <octave/gripes.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <octave/errwarn.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <octave/pager.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <octave/quit.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <octave/variables.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -56,7 +56,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (error_state)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_wrong_type_arg ("sosfilt", args(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_wrong_type_arg ("sosfilt", args(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -70,7 +70,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (error_state)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_wrong_type_arg ("sosfilt", args(1));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_wrong_type_arg ("sosfilt", args(1));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/remez.cc.orig 2018-04-30 13:48:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/remez.cc 2019-03-09 03:16:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -789,7 +789,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int numtaps = NINT (args(0).double_value()) + 1; // #coeff = filter order+1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ int numtaps = octave::math::nint (args(0).double_value()) + 1; // #coeff = filter order+1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (numtaps < 4) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error("remez: number of taps must be an integer greater than 3");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -846,7 +846,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (args(4).is_string() && !args(3).is_string())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ stype = args(4).string_value();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else if (args(4).is_real_scalar())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- density = NINT (args(4).double_value());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ density = octave::math::nint (args(4).double_value());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error("remez: incorrect argument list");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -855,7 +855,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (nargin > 5) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (args(5).is_real_scalar()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ && !args(4).is_real_scalar())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- density = NINT (args(5).double_value());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ density = octave::math::nint (args(5).double_value());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error("remez: incorrect argument list");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-sockets/Portfile b/math/octave-sockets/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5105c26..c1595aa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-sockets/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-sockets/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup sockets 1.2.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> platforms darwin
license GPL-3+
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-specfun/Portfile b/math/octave-specfun/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9a0fa3e..f3978b6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-specfun/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-specfun/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup specfun 1.1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span> platforms darwin
license GPL-3+ BSD
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-special-matrix/Portfile b/math/octave-special-matrix/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4b453e1..d80f330 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-special-matrix/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-special-matrix/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup special-matrix 1.0.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
license GPL-2+
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-spline-gcvspl/Portfile b/math/octave-spline-gcvspl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9848c49..50cef53 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-spline-gcvspl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-spline-gcvspl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup octave 1.0
</span> PortGroup obsolete 1.0
octave.setup spline-gcvspl 1.0.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span> license public-domain
# Remove after June 2, 2019
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-splines/Portfile b/math/octave-splines/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f31e5fb..7c0f40c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-splines/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-splines/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup splines 1.3.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> platforms darwin
license GPL-3+ public-domain
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-statistics/Portfile b/math/octave-statistics/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8130154..9a9b889 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-statistics/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-statistics/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup statistics 1.4.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> platforms darwin
license GPL-3+ public-domain
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-stk/Portfile b/math/octave-stk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index da77140..e3ee7df 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-stk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-stk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup stk 2.5.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-strings/Portfile b/math/octave-strings/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 64c3bf8..ed63bec 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-strings/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-strings/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup strings 1.2.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> platforms darwin
license GPL-3+ BSD public-domain
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,3 +15,6 @@ checksums rmd160 7acbca2d81e16c489f0f8f30f207bc81a2c2de8e \
</span> sha256 cfe2702d9e1b69e1fc6bee9a8fab8bb3d63a42d74e763538687d0dbcdd5619ac
depends_lib-append port:pcre
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# compensate for Octave 5 changes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-octave5.diff
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-strings/files/patch-octave5.diff b/math/octave-strings/files/patch-octave5.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9d389dc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-strings/files/patch-octave5.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,24 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/pcregexp.cc.orig 2015-06-06 14:40:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/pcregexp.cc 2019-03-09 04:56:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -49,7 +49,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::string pattern = args(0).string_value();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::string input = args(1).string_value();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (error_state) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gripe_wrong_type_arg("pcregexp", args(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ err_wrong_type_arg("pcregexp", args(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.orig 2015-06-06 14:40:45.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile 2019-03-09 04:55:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,8 +3,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PCRE_SWITCHES := $(shell $(OCTAVE) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --no-gui --no-init-file --no-site-file --silent --no-history \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- --eval 'disp (octave_config_info ("PCRE_LIBS"));' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- --eval 'disp (octave_config_info ("PCRE_CPPFLAGS"));' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ --eval 'disp (__octave_config_info__ ("PCRE_LIBS"));' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ --eval 'disp (__octave_config_info__ ("PCRE_CPPFLAGS"));' \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pcregexp.oct: %.oct: %.cc
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-struct/Portfile b/math/octave-struct/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9bf90b7..9288fd4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-struct/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-struct/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup struct 1.0.15
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> platforms darwin
license GPL-3+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,3 +14,6 @@ long_description ${description}
</span> checksums rmd160 64b2f8763fbb7955ddad09f93f36a797ee2e0aaa \
sha256 d9123792291233af037f8d6b9eedc9a7170cc8534b8c8d580f30105cddaababb \
size 61073
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# compensate for Octave 5 changes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-octave5.diff
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-struct/files/patch-octave5.diff b/math/octave-struct/files/patch-octave5.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..20ddc8e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-struct/files/patch-octave5.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,125 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/error-helpers.cc.orig 2018-05-11 01:42:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/error-helpers.cc 2019-03-09 05:07:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,6 +20,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <octave/oct.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "error-helpers.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <iostream>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // call verror
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_OCTAVE_VERROR_ARG_EXC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/error-helpers.h.orig 2018-05-11 01:42:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/error-helpers.h 2019-03-09 05:02:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,9 +26,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // call verror, for _linking_ also against Octave versions who have no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // verror() with these arguments
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_OCTAVE_VERROR_ARG_EXC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void c_verror (octave_execution_exception&, const char *, ...);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void c_verror (octave::execution_exception&, const char *, ...);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-void c_verror (const octave_execution_exception&, const char *, ...);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++void c_verror (const octave::execution_exception&, const char *, ...);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void _p_error (const char *fmt, ...);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,7 +37,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // both if Octave uses exceptions for errors and if it still uses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // error_state. In the latter case return 'retval'.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_OCTAVE_ERROR_STATE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // can throw octave_execution_exception despite of this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // can throw octave::execution_exception despite of this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define CHECK_ERROR(code, retval, ...) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ try \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -50,7 +50,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return retval; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- catch (octave_execution_exception& e) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ catch (octave::execution_exception& e) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c_verror (e, __VA_ARGS__); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,7 +60,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ code ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- catch (octave_execution_exception& e) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ catch (octave::execution_exception& e) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ verror (e, __VA_ARGS__); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -70,7 +70,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Octave doesn't throw exceptions for errors but still uses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // error_state.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_OCTAVE_ERROR_STATE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // can throw octave_execution_exception despite of this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // can throw octave::execution_exception despite of this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define CHECK_ERROR_EXIT1(code, ...) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ try \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -83,7 +83,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ exit (1); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- catch (octave_execution_exception&) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ catch (octave::execution_exception&) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _p_error (__VA_ARGS__); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -95,7 +95,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ code ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- catch (octave_execution_exception&) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ catch (octave::execution_exception&) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ _p_error (__VA_ARGS__); \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -107,7 +107,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Octave uses exceptions for errors and if it still uses
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // error_state. In the latter case reset error_state to 0.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_OCTAVE_ERROR_STATE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // can throw octave_execution_exception despite of this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // can throw octave::execution_exception despite of this
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define SET_ERR(code, err) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err = false; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -120,7 +120,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err = true; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- catch (octave_execution_exception&) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ catch (octave::execution_exception&) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err = true; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -132,7 +132,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ code ; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- catch (octave_execution_exception&) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ catch (octave::execution_exception&) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err = true; \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/error-helpers.cc.orig 2018-05-11 01:42:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/error-helpers.cc 2019-03-09 05:04:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,7 +24,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // call verror
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_OCTAVE_VERROR_ARG_EXC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-c_verror (octave_execution_exception& e, const char *fmt, ...)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++c_verror (octave::execution_exception& e, const char *fmt, ...)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ va_list args;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ va_start (args, fmt);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,7 +33,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-c_verror (const octave_execution_exception&, const char *fmt, ...)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++c_verror (const octave::execution_exception&, const char *fmt, ...)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ va_list args;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ va_start (args, fmt);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-symband/Portfile b/math/octave-symband/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9ca81f5..74ad3b6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-symband/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-symband/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup symband 1.0.10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> platforms darwin
license GPL-2+
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-symbolic/Portfile b/math/octave-symbolic/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d7bb4cd..51bac55 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-symbolic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-symbolic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup symbolic 2.7.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> platforms darwin
license GPL-3
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-tcl-octave/Portfile b/math/octave-tcl-octave/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e40a799..67c0712 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-tcl-octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-tcl-octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup tcl-octave 0.1.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
license public-domain
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-tisean/Portfile b/math/octave-tisean/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4a62b12..81c7656 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-tisean/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-tisean/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup octave 1.0
</span> PortGroup compilers 1.0
octave.setup tisean 0.2.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 6
</span> platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-tsa/Portfile b/math/octave-tsa/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3e9ce72..fdb49df 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-tsa/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-tsa/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup tsa 4.4.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> platforms darwin
license GPL-3+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-video/Portfile b/math/octave-video/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d9c24a9..47aad33 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-video/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-video/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup video 1.2.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> platforms darwin
license FreeBSD
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,4 +18,7 @@ checksums rmd160 2aa0bebfc8dfea08f29fb7bfd85777b5b7a34ead \
</span>
depends_lib-append path:lib/libavcodec.dylib:ffmpeg
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-ffmpeg-4.0.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# compensate for FFmpeg 4 changes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# compensate for Octave 5 changes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-ffmpeg-4.0.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-octave5.diff
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-video/files/patch-octave5.diff b/math/octave-video/files/patch-octave5.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..8cf0327
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-video/files/patch-octave5.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/aviinfo.cc.orig 2017-05-28 07:27:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/aviinfo.cc 2019-03-09 08:50:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,9 +39,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // remove -Wno-deprecated-delarations from src/Makefile.in; remember
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // to adjust 'Depends' to Octave >= 4.2 in DESCRIPTION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- octave_time file_mod = file_stat (fn).mtime ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ octave::sys::time file_mod = octave::sys::file_stat (fn).mtime ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return octave_localtime (file_mod).strftime ("%d-%b-%Y %H:%M:%S");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return octave::sys::localtime (file_mod).strftime ("%d-%b-%Y %H:%M:%S");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFUN_DLD(aviinfo, args, ,
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-vrml/Portfile b/math/octave-vrml/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3e14aff..412c378 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-vrml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-vrml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup vrml 1.0.13
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
license GPL-3+ GFDL
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-windows/Portfile b/math/octave-windows/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index da393e6..98d4a38 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-windows/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-windows/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup windows 1.3.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#revision 1
</span> platforms darwin
license GPL-2+
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-zenity/Portfile b/math/octave-zenity/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0213559..8804380 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-zenity/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-zenity/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup zenity 0.5.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> platforms darwin
maintainers nomaintainer
license GPL-2+
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-zeromq/Portfile b/math/octave-zeromq/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index efcf31a..82aa9ce 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-zeromq/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-zeromq/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup zeromq 1.3.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> platforms darwin
license GPL-2+
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/Portfile b/math/octave/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index edeeabb..dc48bab 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,13 +7,11 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup linear_algebra 1.0
# see https://lists.gnu.org/archive/html/octave-maintainers/2016-05/msg00286.html
PortGroup cxx11 1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# See https://trac.macports.org/ticket/53044 for restricting versions further than the cxx11 PortGroup
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append {*gcc-4.6} {clang < 700}
</span>
name octave
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.4.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set package_version 4.x.x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set package_version 5.x.x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories math science
platforms darwin
license GPL-3+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,11 +26,9 @@ homepage https://www.gnu.org/software/octave
</span>
master_sites gnu:octave
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 45d1efbd217308ff9a7b3354ccc004f37785a270 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 09fbd0f212f4ef21e53f1d9c41cf30ce3d7f9450fb44911601e21ed64c67ae97 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 28626462
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts-append ${name}-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b8b4469d70f1b67be688e12ff551e6b614c70213 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e36b1124cac27c7caa51cc57de408c31676d5f0096349b4d50b57bfe1bcd7495 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 32034788
</span>
# if there is an error bulding octave package, avoid
# error: structure has no member 'dir'
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,31 +43,28 @@ if { ${os.major} >= 10 } {
</span> # facilitate universal builds of packages
patchfiles-append patch-configure_make.m.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# do not link in all dependencies when building packages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-link.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # allow mkoctfile to recognize and pass along -arch compiler switch
patchfiles-append patch-arch_arg.diff
# see https://savannah.gnu.org/bugs/?50025
patchfiles-append patch-crash_on_exit.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# octave compiles in the hostname value and its own full version number
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# they are used to determine installation locations
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# octave compiles in the hostname value
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# it is used to determine installation locations
</span> # of architecture-dependent package files
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# this means the build is dependent on the minor numbers of the OS and Octave
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this means the build is dependent on the minor number of the OS
</span> # the following patch attempts to prevent this
patchfiles-append patch-versions.diff
# reports of `__opengl_info__` not working the first time
patchfiles-append patch-__opengl_info__.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# apply upstream fix: https://hg.savannah.gnu.org/hgweb/octave/rev/0c7a9fa16998
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-etree.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # see https://trac.macports.org/ticket/57288
patchfiles-append patch-run-octave.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# find MacPorts Qt libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-link_location.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
if { ${os.arch} eq "i386" } {
if { ${os.major} >= 9 && [sysctl hw.cpu64bit_capable] == 1 } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,19 +79,12 @@ post-patch {
</span> set short_host_name powerpc-apple-${os.platform}${os.major}.x.x
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set configure_file configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set sust_config_vale_file subst-default-vals.in.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set configure_file configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set sust_config_vale_file subst-config-vals.in.sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> reinplace \
"s|__MACPORTS_canonical_host_type__|${short_host_name}|g" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${configure_file}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure
</span> reinplace \
"s|__MACPORTS_canonical_host_type__|${short_host_name}|g" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build-aux/${sust_config_vale_file}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build-aux/subst-config-vals.in.sh
</span> }
pre-configure {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,30 +110,24 @@ pre-configure {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Block compilers: Some older versions of CLANG do not honor the CPATH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Some older versions of CLANG do not honor the CPATH
</span> # environment variables, which is required for compiling this port
# when using MacPorts. The versions seem to be: MacPorts CLANG 2.9 or
# earlier, and Apple CLANG 318.0.58 or older.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://bugs.llvm.org/show_bug.cgi?id=8971
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/40250
</span> #
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# See also < http://llvm.org/bugs/show_bug.cgi?id=8971 >
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# < https://trac.macports.org/ticket/40250 >.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append { clang <= 318.0.61 }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # code located in pre-patch because variants from PortGroup compilers must
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # be evaluated before it can be determined if clang is being used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see http://trac.macports.org/ticket/45011
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://savannah.gnu.org/bugs/?43298
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set libcxxbug no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${configure.cc} eq "/usr/bin/clang" && [lindex [split ${xcodeversion} .] 0] eq 6 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set libcxxbug yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${libcxxbug} } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- clang-libcxx-fix.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Clang must be able to use cstdint.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/53044
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Clang must be able to handle VLA extension.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://clang.llvm.org/compatibility.html#vla
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/57270
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append {clang <= 802}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see see https://trac.macports.org/ticket/53044
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist-append {*gcc-4.6}
</span>
# see https://wiki.octave.org/Building for a list of dependencies
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -267,16 +247,6 @@ compilers.setup \
</span> -clang34 \
-clang33
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# offscreen rendering with OpenGL via osmesa would be nice to have, but the following
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# causes a segmentation fault:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# h = figure ("visible", "off"); fn = tempname (); sombrero (); __osmesa_print__ (h, fn, "svg");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# solution is ???
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#depends_lib-append port:mesa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-osmesa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> #configure.args-append --with-shell=???
configure.args-append \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -298,6 +268,12 @@ configure.args-append \
</span> --without-magick \
--disable-docs
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# avoid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Undefined symbols for architecture x86_64:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# "print_usage()", referenced from: ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-link-all-dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # in configure.ac, listed as one of "[p]rograms used when running Octave"
depends_lib-append port:python27
configure.python ${prefix}/bin/python2.7
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -428,12 +404,6 @@ variant qt5 conflicts qt4 description {build the GUI using Qt5} {
</span> qt5.depends_component qttools sqlite-plugin
depends_lib-append port:qscintilla-qt5
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://savannah.gnu.org/bugs/?46723
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://savannah.gnu.org/bugs/?49053
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-iconsize.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-figures.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # location of libqscintilla2.dylib
configure.ldflags-append \
-L${qt_libs_dir}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -458,14 +428,14 @@ if { ![variant_isset qt4] && ![variant_isset qt5] } {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant fltk_toolkit description {enable fltk as a graphics toolkit for plotting} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant fltk description {enable fltk as a graphics toolkit for plotting} {
</span> depends_lib-append path:lib/libfltk.dylib:fltk
configure.args-replace --without-fltk --with-fltk
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://github.com/macports/macports-ports/pull/1865 for a discussion on fltk_toolkit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#default_variants-append +fltk_toolkit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://github.com/macports/macports-ports/pull/1865 for a discussion on fltk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#default_variants-append +fltk
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset fltk_toolkit] || [variant_isset qt4] || [variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset fltk] || [variant_isset qt4] || [variant_isset qt5]} {
</span> # native_graphics (fltk) and gui (Qt) require OpenGL and font and printing capabilities
depends_lib-append \
port:fontconfig \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -475,13 +445,13 @@ if {[variant_isset fltk_toolkit] || [variant_isset qt4] || [variant_isset qt5]}
</span> configure.args-replace --without-opengl --with-framework-opengl
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ([variant_isset fltk_toolkit] && [variant_isset qt4]) || ([variant_isset fltk_toolkit] && [variant_isset qt5]) } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ([variant_isset fltk] && [variant_isset qt4]) || ([variant_isset fltk] && [variant_isset qt5]) } {
</span> notes-append "unless octave is run with --no-gui-libs, graphics_toolkit(\"fltk\") will cause a crash"
}
variant jit description {enable JIT compiler (EXPERIMENTAL)} {
# JIT requires LLVM, so select a version to use
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set llvm_ver 6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set llvm_ver 7.0
</span>
# prevent multiple versions of llvm being required
# if clangXY compiler is requested, use llvm-X.Y
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -665,7 +635,7 @@ post-destroot {
</span> }
# do not force upgrade of every dependency every time the version changes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach lib {liboctave.6.dylib liboctgui.4.dylib liboctinterp.6.dylib} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach lib {liboctave.7.dylib liboctgui.5.dylib liboctinterp.7.dylib} {
</span> xinstall -d -m 0755 ${destroot}${prefix}/lib/octave/${package_version}
ln -s ../${version}/${lib} ${destroot}${prefix}/lib/octave/${package_version}/${lib}
system "install_name_tool -id ${prefix}/lib/octave/${package_version}/${lib} ${destroot}${prefix}/lib/octave/${version}/${lib}"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -709,57 +679,6 @@ test.run yes
</span> test.target check
subport ${name}-devel {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # http://hg.savannah.gnu.org/hgweb/octave/archive has the ability to download snapshots.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This would be preferable to using mercurial.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The generated files, however, are currently corrupted.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fetch.type hg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hg.url http://hg.savannah.gnu.org/hgweb/octave/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hg.tag ea5182364e5f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 5.0.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://trac.macports.org/ticket/57270
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.blacklist-append {clang < 802}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts-replace ${name}-devel ${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_autoconf yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- autoconf.cmd ./bootstrap
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- autoconf.args --gnulib-srcdir=gnulib --no-git
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # need for autoconf
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:automake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # create links in case patch-force_cxx-devel.diff is included in the patchfiles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # otherwise, they do no harm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s cdisplay.c ${worksrcpath}/libinterp/corefcn/cdisplay.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s display-available.c ${worksrcpath}/src/display-available.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://savannah.gnu.org/bugs/index.php?53627
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-undefined-devel.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-delete \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-figures.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-bsdtar.diff patch-bsdtar-devel.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-versions.diff patch-versions-devel.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-force_cxx.diff patch-force_cxx-devel.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-iconsize.diff patch-iconsize-devel.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-link.diff patch-link-devel.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-arch_arg.diff patch-arch_arg-devel.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-crash_on_exit.diff patch-crash_on_exit-devel.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type regexm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.url http://hg.savannah.gnu.org/hgweb/octave/tags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.version ${hg.tag}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex "<a href=\"/hgweb/octave/rev/(\[a-zA-Z0-9.\]+)\">\ntip"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ replaced_by ${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup obsolete 1.0
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/clang-libcxx-fix.patch b/math/octave/files/clang-libcxx-fix.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index db2a96f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/clang-libcxx-fix.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,135 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# HG changeset patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# User Kefu Chai <tchaikov@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Date 1413043255 -28800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Sun Oct 12 00:00:55 2014 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Node ID 1433cd4f7b7bda0b0e0a04f990b55ffc3cbaf701
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Parent 91a6f06c505220d269de3a0dab8cc898d03d91a0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fix the build error on clang 3.5 and libc++ (bug #43298)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* liboctave/operators/mx-inlines.cc:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use the workaround if libc++ with this issue is detected.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* liboctave/operators/libcxx-fix.cc:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-add a workaround for http://llvm.org/bugs/show_bug.cgi?id=21083, so that only
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-the arithmetic types are accepted for the function template "libcxx_fix::pow()".
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -r 91a6f06c5052 -r 1433cd4f7b7b liboctave/operators/libcxx-fix.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /dev/null Thu Jan 01 00:00:00 1970 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ liboctave/operators/libcxx-fix.h Sun Oct 12 00:00:55 2014 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -0,0 +1,69 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef _LIBCPP_VERSION
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#error "for libc++ only"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+namespace libcxx_fix {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+using std::is_integral;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+using std::is_same;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+using std::enable_if;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template <class _Tp, class _Tn = void>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+struct numeric_type
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ typedef void type;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static const bool value = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template <class _Tp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+struct numeric_type<_Tp, typename enable_if<is_integral<_Tp>::value ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ is_same<_Tp, double>::value>::type>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ typedef double type;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static const bool value = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template <class _Tp>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+struct numeric_type<_Tp, typename enable_if<is_same<_Tp, long double>::value ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ is_same<_Tp, float>::value>::type>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ typedef _Tp type;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static const bool value = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template <>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+struct numeric_type<void, void>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static const bool value = true;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template <class _A1, class _A2,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bool = numeric_type<_A1>::value &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ numeric_type<_A2>::value>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+class promote
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template <class _A1, class _A2>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+class promote<_A1, _A2, true>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ typedef typename numeric_type<_A1>::type __type1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ typedef typename numeric_type<_A2>::type __type2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ typedef decltype(__type1() + __type2()) type;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+template <class _A1, class _A2>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+inline _LIBCPP_INLINE_VISIBILITY
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+typename promote<_A1, _A2>::type
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+pow(_A1 __x, _A2 __y) _NOEXCEPT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ typedef typename promote<_A1, _A2>::type __result_type;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if _LIBCPP_STD_VER > 11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static_assert((!(is_same<_A1, __result_type>::value &&
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ is_same<_A2, __result_type>::value)), "");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return ::pow(static_cast<__result_type>(__x), static_cast<__result_type>(__y));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- liboctave/operators/mx-inlines.cc.orig 2018-08-09 13:20:32.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ liboctave/operators/mx-inlines.cc 2018-10-06 12:03:38.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -408,11 +408,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Let the compiler decide which pow to use, whichever best matches the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // arguments provided.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(_LIBCPP_VERSION) && (_LIBCPP_VERSION >= 1101)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Workaround http://llvm.org/bugs/show_bug.cgi?id=21083
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include "libcxx-fix.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- template <typename R, typename X, typename Y>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inline void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mx_inline_pow (size_t n, R *r, const X *x, const Y *y)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(_LIBCPP_VERSION) && (_LIBCPP_VERSION >= 1101)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ using libcxx_fix::pow;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using std::pow;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (size_t i = 0; i < n; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- r[i] = pow (x[i], y[i]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -422,7 +431,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inline void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mx_inline_pow (size_t n, R *r, const X *x, Y y)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(_LIBCPP_VERSION) && (_LIBCPP_VERSION >= 1101)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ using libcxx_fix::pow;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using std::pow;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (size_t i = 0; i < n; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- r[i] = pow (x[i], y);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -432,7 +445,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- inline void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mx_inline_pow (size_t n, R *r, X x, const Y *y)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(_LIBCPP_VERSION) && (_LIBCPP_VERSION >= 1101)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ using libcxx_fix::pow;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using std::pow;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (size_t i = 0; i < n; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- r[i] = pow (x, y[i]);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-arch_arg-devel.diff b/math/octave/files/patch-arch_arg-devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3d4ef95..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-arch_arg-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/mkoctfile.in.cc.orig 2016-11-13 08:16:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/mkoctfile.in.cc 2016-11-26 14:03:33.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -814,6 +814,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pass_on_options += (' ' + arg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined __APPLE__ && defined __MACH__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else if (arg == "-arch")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (i < argc-1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ arg = argv[++i];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pass_on_options += (" -arch " + arg);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::cerr << "mkoctfile: arch type missing"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ << std::endl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else if (starts_with (arg, "-"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Pass through any unrecognized options.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-arch_arg.diff b/math/octave/files/patch-arch_arg.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 78866b7..499d570 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-arch_arg.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/files/patch-arch_arg.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- src/mkoctfile.in.cc.orig 2016-11-13 08:16:10.000000000 -0700
+++ src/mkoctfile.in.cc 2016-11-26 14:03:33.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -634,6 +634,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -810,6 +810,19 @@
</span> {
pass_on_options += (' ' + arg);
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-bsdtar-devel.diff b/math/octave/files/patch-bsdtar-devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 414efca..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-bsdtar-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,36 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scripts/miscellaneous/unpack.m.orig 2016-11-20 04:39:35.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scripts/miscellaneous/unpack.m 2016-11-20 04:39:10.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -187,15 +187,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'bzip2 -d -f "%s"', ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @__parse_bzip2__, true};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- commandlist.bz = commandlist.bz2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- commandlist.tar = {'tar xvf "%s"', ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'tar xf "%s"', ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ commandlist.tar = {'bsdtar xvf "%s"', ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'bsdtar xf "%s"', ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @__parse_tar__, false};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- commandlist.targz = {'gzip -d -c "%s" | tar xvf -', ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'gzip -d -c "%s" | tar xf -', ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ commandlist.targz = {'gzip -d -c "%s" | bsdtar xvf -', ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'gzip -d -c "%s" | bsdtar xf -', ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @__parse_tar__, false};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- commandlist.tgz = commandlist.targz;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- commandlist.tarbz2 = {'bzip2 -d -c "%s" | tar xvf -', ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'bzip2 -d -c "%s" | tar xf -', ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ commandlist.tarbz2 = {'bzip2 -d -c "%s" | bsdtar xvf -', ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'bzip2 -d -c "%s" | bsdtar xf -', ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @__parse_tar__, false};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- commandlist.tarbz = commandlist.tarbz2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- commandlist.tbz2 = commandlist.tarbz2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -303,8 +303,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- files = cellstr (files(:,14:end));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endfunction
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--function output = __parse_tar__ (output)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+function files = __parse_tar__ (output)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## This is a no-op, but it makes things simpler for other cases.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ files = regexprep (output, '^x (.*)$', '$1');
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endfunction
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- function files = __parse_gzip__ (output)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-bsdtar.diff b/math/octave/files/patch-bsdtar.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index ca239fc..f9a4358 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-bsdtar.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/files/patch-bsdtar.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- scripts/miscellaneous/unpack.m.orig 2016-11-20 04:39:35.000000000 -0700
+++ scripts/miscellaneous/unpack.m 2016-11-20 04:39:10.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -174,15 +174,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -191,15 +191,15 @@
</span> 'bzip2 -d -f "%s"', ...
@__parse_bzip2__, true};
commandlist.bz = commandlist.bz2;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@
</span> @__parse_tar__, false};
commandlist.tarbz = commandlist.tarbz2;
commandlist.tbz2 = commandlist.tarbz2;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -290,8 +290,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -307,8 +307,10 @@
</span> files = cellstr (files(:,14:end));
endfunction
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-crash_on_exit-devel.diff b/math/octave/files/patch-crash_on_exit-devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 93c7520..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-crash_on_exit-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgui/src/main-window.cc.orig 2018-04-30 10:03:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgui/src/main-window.cc 2018-05-18 05:50:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -234,9 +234,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- connect (m_interpreter, SIGNAL (octave_finished_signal (int)),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- this, SLOT (handle_octave_finished (int)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- connect (m_interpreter, SIGNAL (octave_finished_signal (int)),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_main_thread, SLOT (quit (void)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- connect (m_main_thread, SIGNAL (finished (void)),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_main_thread, SLOT (deleteLater (void)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1570,6 +1567,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void main_window::handle_octave_finished (int exit_status)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* fprintf to stderr is needed by macOS */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fprintf(stderr, "\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_main_thread->quit();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- qApp->exit (exit_status);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-crash_on_exit.diff b/math/octave/files/patch-crash_on_exit.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5921907..e56783d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-crash_on_exit.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/files/patch-crash_on_exit.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- libgui/src/main-window.cc.orig 2018-04-30 10:03:56.000000000 -0700
+++ libgui/src/main-window.cc 2018-05-18 05:50:20.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -216,9 +216,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2867,9 +2867,6 @@ namespace octave
</span> connect (m_interpreter, SIGNAL (octave_finished_signal (int)),
this, SLOT (handle_octave_finished (int)));
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,13 +10,12 @@
</span> connect (m_main_thread, SIGNAL (finished (void)),
m_main_thread, SLOT (deleteLater (void)));
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1533,6 +1530,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2935,6 +2932,9 @@ namespace octave
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- void main_window::handle_octave_finished (int exit_status)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void octave_qt_app::handle_octave_finished (int exit_status)
</span> {
+ /* fprintf to stderr is needed by macOS */
+ fprintf(stderr, "\n");
+ m_main_thread->quit();
qApp->exit (exit_status);
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-etree.diff b/math/octave/files/patch-etree.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 29afa82..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-etree.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libinterp/dldfcn/colamd.cc.orig 2018-08-09 11:20:32.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libinterp/dldfcn/colamd.cc 2019-01-14 09:23:27.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,7 +68,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (octave_idx_type p = cidx[kk] ; p < p2 ; p++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // A (i,k) is nonzero (original or permuted A)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- octave_idx_type i = (Pinv) ? (Pinv[ridx[p]]) : (ridx[p]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave_idx_type i = (P ? Pinv[ridx[p]] : ridx[p]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (i < k)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // follow path from i to root of etree, stop at flagged node
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -675,7 +675,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- octave_idx_type *ridx = nullptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- octave_idx_type *cidx = nullptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (args(0).issparse ())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (! args(0).issparse ())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error ("etree: S must be a sparse matrix");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (args(0).iscomplex ())
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-figures.diff b/math/octave/files/patch-figures.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0c12e82..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-figures.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,380 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -r bb43ec3a304e libgui/graphics/Figure.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgui/graphics/Figure.cc Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgui/graphics/Figure.cc Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -41,6 +41,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QtDebug>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QTimer>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QToolBar>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <QWindow>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <QScreen>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Canvas.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "Container.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -133,6 +135,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- figure::properties& fp = properties<figure> ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Register for the signal that indicates when a window has moved
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // to a different screen
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ connect (win, SIGNAL (figureWindowShown ()),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ this, SLOT (figureWindowShown ()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Status bar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_statusBar = win->statusBar ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int boffset = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1079,6 +1086,39 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Figure::figureWindowShown ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined (Q_OS_MAC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ figure::properties& fp = properties<figure> ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QMainWindow *win = qWidget<QMainWindow> ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QWindow* window = win->windowHandle ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QScreen* screen = window->screen ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fp.set___device_pixel_ratio__ (screen->devicePixelRatio ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Make sure the figure gets redrawn after the devicePixelRatio is updated
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ graphics_object go = gh_manager::get_object (fp.get___myhandle__ ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fp.get_toolkit ().redraw_figure (go);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ connect (window, SIGNAL (screenChanged (QScreen*)),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ this, SLOT (screenChanged (QScreen*)));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Figure::screenChanged (QScreen* screen)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined (Q_OS_MAC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ figure::properties& fp = properties<figure> ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ float old_device_pixel_ratio = fp.get___device_pixel_ratio__ ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fp.set___device_pixel_ratio__ (screen->devicePixelRatio ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Make sure the figure gets redrawn after the devicePixelRatio is updated
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ graphics_object go = gh_manager::get_object (fp.get___myhandle__ ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fp.get_toolkit ().redraw_figure (go);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Figure::enableMouseTracking (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Enable mouse tracking on every widgets
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -r bb43ec3a304e libgui/graphics/Figure.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgui/graphics/Figure.h Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgui/graphics/Figure.h Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,6 +32,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class QMainWindow;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class QToolBar;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+class QScreen;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- namespace QtHandles
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -128,6 +129,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void toggleAxes (void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void toggleGrid (void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void autoAxes (void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void figureWindowShown ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void screenChanged (QScreen*);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public slots:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uint8NDArray slotGetPixels (void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -r bb43ec3a304e libgui/graphics/FigureWindow.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgui/graphics/FigureWindow.cc Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgui/graphics/FigureWindow.cc Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,4 +48,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return nullptr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void FigureWindow::showEvent (QShowEvent* ev)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QMainWindow::showEvent (ev);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ emit figureWindowShown();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -r bb43ec3a304e libgui/graphics/FigureWindow.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgui/graphics/FigureWindow.h Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgui/graphics/FigureWindow.h Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -37,10 +37,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Q_OBJECT
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FigureWindow (QWidget *parent = nullptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ explicit FigureWindow (QWidget *parent = nullptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ~FigureWindow (void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QMenu * createPopupMenu (void);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ protected:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void showEvent(QShowEvent *ev);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ signals:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void figureWindowShown();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -r bb43ec3a304e libgui/graphics/GLCanvas.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgui/graphics/GLCanvas.cc Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgui/graphics/GLCanvas.cc Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,7 +68,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- octave::opengl_renderer r;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- r.set_viewport (width (), height ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ graphics_object fig = go.get_ancestor ("figure");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ double dpr = fig.get ("__device_pixel_ratio__").double_value ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ r.set_viewport (dpr * width (), dpr * height ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- r.draw (go);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -173,7 +176,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- octave::opengl_selector s;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- s.set_viewport (width (), height ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ graphics_object fig = ax.get_ancestor ("figure");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ double dpr = fig.get ("__device_pixel_ratio__").double_value ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ s.set_viewport (dpr * width (), dpr * height ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return s.select (ax, pt.x (), height () - pt.y (),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- octave::select_ignore_hittest);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -r bb43ec3a304e libinterp/corefcn/gl-render.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libinterp/corefcn/gl-render.cc Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libinterp/corefcn/gl-render.cc Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -593,7 +593,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- : toolkit (), xform (), xmin (), xmax (), ymin (), ymax (),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- zmin (), zmax (), xZ1 (), xZ2 (), marker_id (), filled_marker_id (),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- camera_pos (), camera_dir (), interpreter ("none"), txt_renderer (),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- selecting (false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ selecting (false), m_devpixfactor (1.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // This constructor will fail if we don't have OpenGL or if the data
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // types we assumed in our public interface aren't compatible with the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -694,8 +694,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- opengl_renderer::draw_figure (const figure::properties& props)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Current physical-pixel to toolkit-pixel factor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_devpixfactor = props.get___device_pixel_ratio__ ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Initialize OpenGL context
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- init_gl_context (props.is_graphicssmoothing (), props.get_color_rgb ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined (HAVE_OPENGL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1123,6 +1126,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glMultMatrixd (x_mat1.data ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glMatrixMode (GL_PROJECTION);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glLoadIdentity ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Use abstract Octave-pixels for transformation, not physical-pixels
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vw[2] = octave::math::round (static_cast<float> (vw[2]) / m_devpixfactor);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vw[3] = octave::math::round (static_cast<float> (vw[3]) / m_devpixfactor);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glOrtho (0, vw[2], vw[3], 0, xZ1, xZ2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glMultMatrixd (x_mat2.data ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glMatrixMode (GL_MODELVIEW);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3528,6 +3536,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glMatrixMode (GL_PROJECTION);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glPushMatrix ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glLoadIdentity ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vp[2] = octave::math::round (static_cast<float> (vp[2]) / m_devpixfactor);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vp[3] = octave::math::round (static_cast<float> (vp[3]) / m_devpixfactor);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glOrtho (0, vp[2], vp[3], 0, xZ1, xZ2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glMatrixMode (GL_MODELVIEW);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glPushMatrix ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3697,10 +3709,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // FIXME: actually add the code to do it!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (i0 >= i1 || j0 >= j1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- glPixelZoom (pix_dx, -pix_dy);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ glPixelZoom (m_devpixfactor * pix_dx,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ - m_devpixfactor * pix_dy);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glRasterPos3d (im_xmin + nor_dx*j0, im_ymin + nor_dy*i0, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // by default this is 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3953,7 +3967,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined (HAVE_OPENGL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- glLineWidth (w);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ glLineWidth (w * m_devpixfactor);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4103,6 +4117,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glMatrixMode (GL_PROJECTION);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glPushMatrix ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glLoadIdentity ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vw[2] = octave::math::round (static_cast<float> (vw[2]) / m_devpixfactor);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vw[3] = octave::math::round (static_cast<float> (vw[3]) / m_devpixfactor);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glOrtho (0, vw[2], vw[3], 0, xZ1, xZ2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glMatrixMode (GL_MODELVIEW);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glPushMatrix ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -r bb43ec3a304e libinterp/corefcn/gl-render.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libinterp/corefcn/gl-render.h Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libinterp/corefcn/gl-render.h Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -222,6 +222,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Indicate we are drawing for selection purpose
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bool selecting;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Factor used for translating Octave pixels to actual device pixels
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ double m_devpixfactor;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- private:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- class patch_tesselator;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -r bb43ec3a304e libinterp/corefcn/graphics.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libinterp/corefcn/graphics.cc Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libinterp/corefcn/graphics.cc Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -869,6 +869,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sz.extract_n (0, 2, 1, 2)).extract_n (0, 2, 1, 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static double
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+device_pixel_ratio (graphics_handle h)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ double retval = 1.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ graphics_object fig = gh_manager::get_object (h).get_ancestor ("figure");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (fig.valid_object ())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ retval = fig.get ("__device_pixel_ratio__").double_value ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return retval;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- convert_cdata_2 (bool is_scaled, bool is_real, double clim_0, double clim_1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- const double *cmapv, double x, octave_idx_type lda,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6581,11 +6594,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ double dpr = device_pixel_ratio (get___myhandle__ ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gh_manager::auto_lock guard;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- txt_renderer.set_font (get ("fontname").string_value (),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- get ("fontweight").string_value (),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- get ("fontangle").string_value (),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- get ("__fontsize_points__").double_value ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ get ("__fontsize_points__").double_value () * dpr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // The INTERNAL flag defines whether position or outerposition is used.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7654,6 +7669,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Matrix ext (1, 2, 0.0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double wmax, hmax;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ double dpr = device_pixel_ratio (get___myhandle__ ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wmax = hmax = 0.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int n = std::min (ticklabels.numel (), ticks.numel ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for (int i = 0; i < n; i++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7671,8 +7687,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ext = txt_renderer.get_extent (label, 0.0,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- get_ticklabelinterpreter ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- wmax = std::max (wmax, ext(0));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- hmax = std::max (hmax, ext(1));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ wmax = std::max (wmax, ext(0) / dpr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ hmax = std::max (hmax, ext(1) / dpr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8699,7 +8715,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m(0) += p(0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m(1) += p(1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return convert_text_position (m, *this, "pixels", get_units ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Matrix bbox = convert_text_position (m, *this, "pixels", get_units ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ double dpr = device_pixel_ratio (get___myhandle__ ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ for (octave_idx_type ii = 0; ii < bbox.numel (); ii++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ bbox(ii) = bbox(ii) / dpr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return bbox;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8737,11 +8770,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- text::properties::update_font (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ double dpr = device_pixel_ratio (get___myhandle__ ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gh_manager::auto_lock guard;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- txt_renderer.set_font (get ("fontname").string_value (),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- get ("fontweight").string_value (),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- get ("fontangle").string_value (),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- get ("__fontsize_points__").double_value ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ get ("__fontsize_points__").double_value () * dpr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- txt_renderer.set_color (get_color_rgb ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8781,7 +8806,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // The bbox is relative to the text's position. We'll leave it that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // way, because get_position does not return valid results when the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // text is first constructed. Conversion to proper coordinates is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // performed in get_extent.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // performed in get_extent.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_extent (bbox);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (__autopos_tag___is ("xlabel") || __autopos_tag___is ("ylabel")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8838,9 +8863,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double fontsz = get_fontsize ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- double parent_height = box_pix_height;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ graphics_object go (gh_manager::get_object (get___myhandle__ ()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (fontunits_is ("normalized") && parent_height <= 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- graphics_object go (gh_manager::get_object (get___myhandle__ ()));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- graphics_object ax (go.get_ancestor ("axes"));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- parent_height = ax.get_properties ().get_boundingbox (true).elem (3);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -r bb43ec3a304e libinterp/corefcn/graphics.in.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libinterp/corefcn/graphics.in.h Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libinterp/corefcn/graphics.in.h Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3178,6 +3178,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- any_property __plot_stream__ h , Matrix ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- any_property __rotate_mode__ h , Matrix ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- any_property __zoom_mode__ h , Matrix ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ double_property __device_pixel_ratio__ h , 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Obsolete properties: doublebuffer, mincolormap, wvisual, wvisualmode,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // xdisplay, xvisual, xvisualmode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -r bb43ec3a304e scripts/plot/util/print.m
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- scripts/plot/util/print.m Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ scripts/plot/util/print.m Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -382,6 +382,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nfig += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endfor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ## Don't account for the actual pixel density
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (strcmp (tk, "qt"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ props(end+1).h = opts.figure;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ props(end).name = "__device_pixel_ratio__";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ props(end).value = {get(opts.figure, "__device_pixel_ratio__")};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set (opts.figure, "__device_pixel_ratio__", 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ nfig += 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## print() requires axes units = "normalized"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hax = findall (opts.figure, "-depth", 1, "type", "axes", ...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-not", "units", "normalized");
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-force_cxx-devel.diff b/math/octave/files/patch-force_cxx-devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f5838c0..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-force_cxx-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libinterp/corefcn/module.mk.orig 2017-11-08 15:10:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libinterp/corefcn/module.mk 2017-11-10 02:35:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -125,7 +125,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %reldir%/bsxfun.cc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %reldir%/c-file-ptr-stream.cc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %reldir%/call-stack.cc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- %reldir%/cdisplay.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ %reldir%/cdisplay.cc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %reldir%/cellfun.cc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %reldir%/colloc.cc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %reldir%/coct-hdf5-types.c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/module.mk.orig 2017-11-08 15:10:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/module.mk 2017-11-10 02:36:17.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,7 +56,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nodist_%canon_reldir%_octave_SOURCES = %reldir%/main.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--%canon_reldir%_octave_SOURCES = %reldir%/display-available.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+%canon_reldir%_octave_SOURCES = %reldir%/display-available.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- %canon_reldir%_octave_LDADD = \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- liboctave/wrappers/libwrappers.la \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-force_cxx.diff b/math/octave/files/patch-force_cxx.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0491490..81a0eea 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-force_cxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/files/patch-force_cxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +1,20 @@
</span> --- Makefile.in.orig 2016-11-13 08:23:00.000000000 -0700
+++ Makefile.in 2016-12-10 06:52:04.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16136,7 +16136,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libinterp/corefcn/libinterp_corefcn_libcorefcn_la-cdisplay.lo: libinterp/corefcn/cdisplay.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libinterp_corefcn_libcorefcn_la_CPPFLAGS) $(CPPFLAGS) $(libinterp_corefcn_libcorefcn_la_CFLAGS) $(CFLAGS) -MT libinterp/corefcn/libinterp_corefcn_libcorefcn_la-cdisplay.lo -MD -MP -MF libinterp/corefcn/$(DEPDIR)/libinterp_corefcn_libcorefcn_la-cdisplay.Tpo -c -o libinterp/corefcn/libinterp_corefcn_libcorefcn_la-cdisplay.lo `test [...]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) -x c++ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libinterp_corefcn_libcorefcn_la_CPPFLAGS) $(CPPFLAGS) $(libinterp_corefcn_libcorefcn_la_CFLAGS) $(CFLAGS) -MT libinterp/corefcn/libinterp_corefcn_libcorefcn_la-cdisplay.lo -MD -MP -MF libinterp/corefcn/$(DEPDIR)/libinterp_corefcn_libcorefcn_la-cdisplay.Tpo -c -o libinterp/corefcn/libinterp_corefcn_libcorefcn_la-cdisplay.lo [...]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libinterp/corefcn/$(DEPDIR)/libinterp_corefcn_libcorefcn_la-cdisplay.Tpo libinterp/corefcn/$(DEPDIR)/libinterp_corefcn_libcorefcn_la-cdisplay.Plo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libinterp/corefcn/cdisplay.c' object='libinterp/corefcn/libinterp_corefcn_libcorefcn_la-cdisplay.lo' libtool=yes @AMDEPBACKSLASH@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16690,7 +16690,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) libinterp/corefcn/$(DEPDIR)/libcorefcn_la-cdisplay.Tpo libinterp/corefcn/$(DEPDIR)/libcorefcn_la-cdisplay.Plo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libinterp/corefcn/cdisplay.c' object='libinterp/corefcn/libcorefcn_la-cdisplay.lo' libtool=yes @AMDEPBACKSLASH@
</span> @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16458,7 +16458,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liboctave_wrappers_libwrappers_la_CPPFLAGS) $(CPPFLAGS) $(liboctave_wrappers_libwrappers_la_CFLAGS) $(CFLAGS) -c -o liboctave/wrappers/liboctave_wrappers_libwrappers_la-wait-wrappers.lo `test -f 'liboctave/wrappers/wait-wrappers.c' || echo '$(srcdir)/'`liboctave/wrappers/wait-wrappers.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libinterp_corefcn_libcorefcn_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libinterp/corefcn/libcorefcn_la-cdisplay.lo `test -f 'libinterp/corefcn/cdisplay.c' || echo '$(srcdir)/'`libinterp/corefcn/cdisplay.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) -x c++ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libinterp_corefcn_libcorefcn_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libinterp/corefcn/libcorefcn_la-cdisplay.lo `test -f 'libinterp/corefcn/cdisplay.c' || echo '$(srcdir)/'`libinterp/corefcn/cdisplay.c
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- src/src_octave-display-available.o: src/display-available.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_octave_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_octave-display-available.o -MD -MP -MF src/$(DEPDIR)/src_octave-display-available.Tpo -c -o src/src_octave-display-available.o `test -f 'src/display-available.c' || echo '$(srcdir)/'`src/display-available.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) -x c++ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_octave_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/src_octave-display-available.o -MD -MP -MF src/$(DEPDIR)/src_octave-display-available.Tpo -c -o src/src_octave-display-available.o `test -f 'src/display-available.c' || echo '$(srcdir)/'`src/display-available.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/src_octave-display-available.Tpo src/$(DEPDIR)/src_octave-display-available.Po
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/display-available.c' object='src/src_octave-display-available.o' libtool=no @AMDEPBACKSLASH@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libinterp/corefcn/libcorefcn_la-coct-hdf5-types.lo: libinterp/corefcn/coct-hdf5-types.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libinterp_corefcn_libcorefcn_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libinterp/corefcn/libcorefcn_la-coct-hdf5-types.lo -MD -MP -MF libinterp/corefcn/$(DEPDIR)/libcorefcn_la-coct-hdf5-types.Tpo -c -o libinterp/corefcn/libcorefcn_la-coct-hdf5-types.lo `test -f 'libinterp/corefcn/coct-hdf5-types.c' || echo '$(srcdir)/'` [...]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -17047,7 +17047,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) src/$(DEPDIR)/octave-display-available.Tpo src/$(DEPDIR)/octave-display-available.Po
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='src/display-available.c' object='src/octave-display-available.o' libtool=no @AMDEPBACKSLASH@
</span> @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
<span style='display:block; white-space:pre;background:#e0ffe0;'>+-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_octave_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/octave-display-available.o `test -f 'src/display-available.c' || echo '$(srcdir)/'`src/display-available.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) -x c++ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_octave_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o src/octave-display-available.o `test -f 'src/display-available.c' || echo '$(srcdir)/'`src/display-available.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/octave-display-available.obj: src/display-available.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_octave_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT src/octave-display-available.obj -MD -MP -MF src/$(DEPDIR)/octave-display-available.Tpo -c -o src/octave-display-available.obj `if test -f 'src/display-available.c'; then $(CYGPATH_W) 'src/display-available.c'; else $(CYGPATH_W) '$(srcdir)/src/display-available.c'; fi`
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-iconsize-devel.diff b/math/octave/files/patch-iconsize-devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9b9c5a2..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-iconsize-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgui/src/octave-dock-widget.cc.orig 2016-10-27 11:48:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgui/src/octave-dock-widget.cc 2016-11-10 04:08:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -43,7 +43,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_default_close_button (nullptr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QStyle *st = style ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_icon_size = 0.75*st->pixelMetric (QStyle::PM_SmallIconSize);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined (Q_OS_MAC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // fix retina scaling for Mac (bug #46723)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_icon_size = 2*st->pixelMetric (QStyle::PM_SmallIconSize) / p->devicePixelRatio();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_icon_size = st->pixelMetric (QStyle::PM_SmallIconSize);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // keep track of the original buttons on the default title bar,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // the button further left is considered "float"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-iconsize.diff b/math/octave/files/patch-iconsize.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 95124c6..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-iconsize.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgui/src/octave-dock-widget.cc.orig 2016-10-27 11:48:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgui/src/octave-dock-widget.cc 2016-11-10 04:08:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,7 +42,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- : QDockWidget (p)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- QStyle *st = style ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_icon_size = 0.75*st->pixelMetric (QStyle::PM_SmallIconSize);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined (Q_OS_MAC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // fix retina scaling for Mac (bug #46723)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_icon_size = 2*st->pixelMetric (QStyle::PM_SmallIconSize) / p->devicePixelRatio();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_icon_size = st->pixelMetric (QStyle::PM_SmallIconSize);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // the custom (extra) title bar of the widget
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_title_widget = new QWidget ();
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-link-devel.diff b/math/octave/files/patch-link-devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b4b0fb3..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-link-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/mkoctfile.in.cc.orig 2017-11-08 15:10:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/mkoctfile.in.cc 2017-11-08 16:16:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -298,16 +298,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vars["FLIBS"] = get_variable ("FLIBS", %OCTAVE_CONF_FLIBS%);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vars["OCTAVE_LINK_DEPS"] = get_variable ("OCTAVE_LINK_DEPS",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- %OCTAVE_CONF_MKOCTFILE_OCTAVE_LINK_DEPS%);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vars["OCTAVE_LINK_OPTS"] = get_variable ("OCTAVE_LINK_OPTS",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- %OCTAVE_CONF_OCTAVE_LINK_OPTS%);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vars["OCT_LINK_DEPS"] = get_variable ("OCT_LINK_DEPS",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- %OCTAVE_CONF_MKOCTFILE_OCT_LINK_DEPS%);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vars["OCT_LINK_OPTS"] = get_variable ("OCT_LINK_OPTS",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- %OCTAVE_CONF_OCT_LINK_OPTS%);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vars["LD_CXX"] = get_variable ("LD_CXX", %OCTAVE_CONF_MKOCTFILE_LD_CXX%);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-link.diff b/math/octave/files/patch-link.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 80c86ed..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-link.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/mkoctfile.in.cc.orig 2017-11-08 15:10:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/mkoctfile.in.cc 2017-11-08 16:16:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -238,16 +238,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vars["FLIBS"] = get_variable ("FLIBS", %OCTAVE_CONF_FLIBS%);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vars["OCTAVE_LINK_DEPS"] = get_variable ("OCTAVE_LINK_DEPS",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- %OCTAVE_CONF_MKOCTFILE_OCTAVE_LINK_DEPS%);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vars["OCTAVE_LINK_OPTS"] = get_variable ("OCTAVE_LINK_OPTS",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- %OCTAVE_CONF_OCTAVE_LINK_OPTS%);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vars["OCT_LINK_DEPS"] = get_variable ("OCT_LINK_DEPS",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- %OCTAVE_CONF_MKOCTFILE_OCT_LINK_DEPS%);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vars["OCT_LINK_OPTS"] = get_variable ("OCT_LINK_OPTS",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- %OCTAVE_CONF_OCT_LINK_OPTS%);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ "");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vars["LD_CXX"] = get_variable ("LD_CXX", %OCTAVE_CONF_MKOCTFILE_LD_CXX%);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-link_location.diff b/math/octave/files/patch-link_location.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..dcbbe21
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/files/patch-link_location.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.in.orig 2019-02-23 10:33:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.in 2019-03-03 21:41:51.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8705,6 +8705,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @AMCOND_BUILD_QT_GRAPHICS_TRUE@@AMCOND_BUILD_QT_GUI_TRUE@DLD_LIBOCTGUI_LIBADD = $(OCT_GUI_LINK_DEPS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @AMCOND_BUILD_QT_GRAPHICS_TRUE@@AMCOND_BUILD_QT_GUI_TRUE@libgui_graphics___init_qt___la_LIBADD = \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @AMCOND_BUILD_QT_GRAPHICS_TRUE@@AMCOND_BUILD_QT_GUI_TRUE@ $(DLD_LIBOCTGUI_LIBADD) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@AMCOND_BUILD_QT_GRAPHICS_TRUE@@AMCOND_BUILD_QT_GUI_TRUE@ $(OCTAVE_GUI_LINK_OPTS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @AMCOND_BUILD_QT_GRAPHICS_TRUE@@AMCOND_BUILD_QT_GUI_TRUE@ $(QT_OPENGL_LIBS) \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @AMCOND_BUILD_QT_GRAPHICS_TRUE@@AMCOND_BUILD_QT_GUI_TRUE@ $(OPENGL_LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-run-octave.diff b/math/octave/files/patch-run-octave.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 594b63e..850b656 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-run-octave.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/files/patch-run-octave.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span> --- run-octave.in.orig 2018-10-17 06:25:16.000000000 -0700
+++ run-octave.in 2018-10-17 06:29:11.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -46,7 +46,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,7 +47,7 @@
</span> d3_path=`echo "$d3_list" | $AWK '{ t = (s $0); s = t; } END { sub (/:$/, "", s); print s; }'`
d4_path=`echo "$d4_list" | $AWK '{ t = (s $0); s = t; } END { sub (/:$/, "", s); print s; }'`
-octave_executable="$builddir/src/octave"
+octave_executable="$builddir/src/octave-cli"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- LOADPATH="$d1_path:$d2_path:$d3_path:$d4_path"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LOADPATH="$d1_path:$d2_path:$d3_path:$d4_path:$d5"
</span> IMAGEPATH=".:$top_srcdir/scripts/image"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-undefined-devel.diff b/math/octave/files/patch-undefined-devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 89c35f6..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-undefined-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,73 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# HG changeset patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# User Andrew Janke <andrew@apjanke.net>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Date 1531967648 14400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Wed Jul 18 22:34:08 2018 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Branch octfile-no-link-deps
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Node ID 6203a9fa669398b2f5087b0550634e77e18d7b90
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Parent 39fd627b2c5da4aa10d40be3b4f0f87d81814cca
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Use -bundle -undefined dynamic_lookup for DLLs on macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git configure.ac configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -650,25 +650,33 @@ AC_ARG_ENABLE([dl],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test $STATIC_LIBS = no && test $SHARED_LIBS = no; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_ERROR([You can't disable building both static AND shared libraries!])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ### More configure argument checking related to linking
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+case $host_os in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ msdosmsvc | mingw* | AIX | BeOS | OS/2 )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DEFAULT_NO_UNDEFINED_LDFLAG="-no-undefined"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DEFAULT_NO_UNDEFINED_LDFLAG=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_ARG_ENABLE([no-undefined],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [AS_HELP_STRING([--disable-no-undefined],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [don't pass -no-undefined to libtool when linking Octave and its shared libraries])],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [case $enableval in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- yes) NO_UNDEFINED_LDFLAG="-no-undefined" ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- no) NO_UNDEFINED_LDFLAG="" ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *) AC_MSG_ERROR([bad value $enableval for --disable-no-undefined]) ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [NO_UNDEFINED_LDFLAG="-no-undefined"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [NO_UNDEFINED_LDFLAG="$DEFAULT_NO_UNDEFINED_LDFLAG"])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST(NO_UNDEFINED_LDFLAG)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_ARG_ENABLE([link-all-dependencies],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [AS_HELP_STRING([--enable-link-all-dependencies],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [link Octave and its shared libraries with all dependencies, not just those immediately referenced (should not be needed on most systems)])],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [case $enableval in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- yes) link_all_deps=yes ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- no) link_all_deps=no ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/m4/acinclude.m4 b/m4/acinclude.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- m4/acinclude.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ m4/acinclude.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2880,20 +2880,20 @@ AC_DEFUN_ONCE([OCTAVE_DEFINE_MKOCTFILE_D
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- alpha*-dec-osf*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPICFLAG=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXPICFLAG=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FPICFLAG=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SH_LDFLAGS="-shared -Wl,-expect_unresolved -Wl,'*'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *-*-darwin*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- DL_LDFLAGS="-bundle -bundle_loader ${ac_top_build_prefix}libinterp/octave ${LDFLAGS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ DL_LDFLAGS="-bundle -undefined dynamic_lookup -bind_at_load -bundle_loader ${ac_top_build_prefix}libinterp/octave ${LDFLAGS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl Contains variables that are defined and undefined at this point, so use
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl appropriate quoting to defer expansion of ${bindir} and ${version}.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- MKOCTFILE_DL_LDFLAGS='-bundle -bundle_loader ${bindir}/octave-${version}'"${EXEEXT}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ MKOCTFILE_DL_LDFLAGS='-bundle -undefined dynamic_lookup -bind_at_load -bundle_loader ${bindir}/octave-${version}'"${EXEEXT}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SH_LDFLAGS="-dynamiclib -single_module ${LDFLAGS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case $canonical_host_type in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- powerpc-*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXPICFLAG=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPICFLAG=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FPICFLAG=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-versions-devel.diff b/math/octave/files/patch-versions-devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index be13c7e..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-versions-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,59 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build-aux/subst-config-vals.in.sh.orig 2018-05-18 22:11:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build-aux/subst-config-vals.in.sh 2018-05-19 05:21:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,7 +20,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- : ${SED=@SED@}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--canonical_host_type="@canonical_host_type@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+canonical_host_type="__MACPORTS_canonical_host_type__"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEFAULT_PAGER="@DEFAULT_PAGER@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- EXEEXT="@EXEEXT@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- man1ext="@man1ext@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2018-05-20 10:22:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2018-05-20 10:24:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -101,37 +101,37 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## This path usually includes the Octave version and configuration name, so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## that configurations for multiple versions of Octave may be installed at once.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCTAVE_SET_DEFAULT([archlibdir],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- '${libexecdir}/octave/${version}/exec/${canonical_host_type}')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ '${libexecdir}/octave/${version}/exec/__MACPORTS_canonical_host_type__')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## Where to put executables to be run by Octave, rather than the user, that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## are specific to this site.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCTAVE_SET_DEFAULT([localarchlibdir],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- '${libexecdir}/octave/site/exec/${canonical_host_type}')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ '${libexecdir}/octave/site/exec/__MACPORTS_canonical_host_type__')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCTAVE_SET_DEFAULT([localapiarchlibdir],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- '${libexecdir}/octave/${api_version}/site/exec/${canonical_host_type}')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ '${libexecdir}/octave/${api_version}/site/exec/__MACPORTS_canonical_host_type__')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCTAVE_SET_DEFAULT([localverarchlibdir],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- '${libexecdir}/octave/${version}/site/exec/${canonical_host_type}')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ '${libexecdir}/octave/${version}/site/exec/__MACPORTS_canonical_host_type__')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## Where to put object files that will by dynamically loaded.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## This path includes the Octave version and configuration name, so that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## configurations for multiple versions of Octave may be installed at once.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCTAVE_SET_DEFAULT([octfiledir],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- '${libdir}/octave/${version}/oct/${canonical_host_type}')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ '${libdir}/octave/${version}/oct/__MACPORTS_canonical_host_type__')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## Directories that Octave should search for object files that will be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## dynamically loaded and that are specific to this site (i.e. customizations),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## before consulting ${octfiledir}. This should be a colon-separated list of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## directories.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCTAVE_SET_DEFAULT([localoctfiledir],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- '${libdir}/octave/site/oct/${canonical_host_type}')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ '${libdir}/octave/site/oct/__MACPORTS_canonical_host_type__')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCTAVE_SET_DEFAULT([localapioctfiledir],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- '${libdir}/octave/site/oct/${api_version}/${canonical_host_type}')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ '${libdir}/octave/site/oct/${api_version}/__MACPORTS_canonical_host_type__')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCTAVE_SET_DEFAULT([localveroctfiledir],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- '${libdir}/octave/${version}/site/oct/${canonical_host_type}')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ '${libdir}/octave/${version}/site/oct/__MACPORTS_canonical_host_type__')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## Where to install Octave's include files.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCTAVE_SET_DEFAULT([octincludedir], '${includedir}/octave-${version}/octave')
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-versions.diff b/math/octave/files/patch-versions.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a7543f3..821b13c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-versions.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/files/patch-versions.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build-aux/subst-default-vals.in.sh.orig 2018-05-18 22:11:31.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build-aux/subst-default-vals.in.sh 2018-05-19 05:21:58.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- build-aux/subst-config-vals.in.sh.orig 2019-02-23 10:33:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ build-aux/subst-config-vals.in.sh 2019-03-03 07:11:28.000000000 -0700
</span> @@ -20,7 +20,7 @@
: ${SED=@SED@}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,9 +9,9 @@
</span> DEFAULT_PAGER="@DEFAULT_PAGER@"
EXEEXT="@EXEEXT@"
man1ext="@man1ext@"
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2018-04-30 10:03:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2018-05-20 10:18:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8109,7 +8109,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2019-03-03 07:08:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2019-03-03 07:12:49.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8201,7 +8201,7 @@
</span> ## This path usually includes the Octave version and configuration name, so
## that configurations for multiple versions of Octave may be installed at once.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining archlibdir to be $archlibdir" >&5
$as_echo "defining archlibdir to be $archlibdir" >&6; }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8118,21 +8118,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8210,21 +8210,21 @@
</span> ## Where to put executables to be run by Octave, rather than the user, that
## are specific to this site.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +45,7 @@
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining localverarchlibdir to be $localverarchlibdir" >&5
$as_echo "defining localverarchlibdir to be $localverarchlibdir" >&6; }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8142,7 +8142,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8234,7 +8234,7 @@
</span> ## This path includes the Octave version and configuration name, so that
## configurations for multiple versions of Octave may be installed at once.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +54,7 @@
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining octfiledir to be $octfiledir" >&5
$as_echo "defining octfiledir to be $octfiledir" >&6; }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8153,21 +8153,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8245,21 +8245,21 @@
</span> ## before consulting ${octfiledir}. This should be a colon-separated list of
## directories.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/pure/pure-octave/Portfile b/pure/pure-octave/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2d64801..053c37e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/pure/pure-octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/pure/pure-octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup pure 1.0
pure.setup pure-octave 0.10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories-append math science
platforms darwin
maintainers {ryandesign @ryandesign} {gmail.com:aggraef @agraef}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-oct2py/Portfile b/python/py-oct2py/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7a13cc2..8f31a31 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-oct2py/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-oct2py/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ python.versions 27 34 35 36
</span> python.default_version 27
github.setup blink1073 oct2py 4.0.6 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> checksums rmd160 5ac719697b3f044d1479b709cf2c9c41f1f99689 \
sha256 46a6b430973bb9d893b29fc538ee74d9962bb8a19c132e67c7a321cf8c1af49e
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-octave_kernel/Portfile b/python/py-octave_kernel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d439b95..170d5e1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-octave_kernel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-octave_kernel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,7 @@ PortGroup github 1.0
</span> PortGroup python 1.0
github.setup Calysto octave_kernel 0.28.5 v
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> set real_name octave_kernel
name py-${real_name}
license BSD
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmt4/Portfile b/science/gmt4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1110599..12535fc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gmt4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gmt4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name gmt4
version 4.5.18
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> categories science
platforms darwin
maintainers {takeshi @tenomoto}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lal/Portfile b/science/lal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b11abd5..53ddbc4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/lal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,7 +34,7 @@ if {[string match "py*" ${subport}]} {
</span> if {[string match "octave-*" ${subport}]} {
# octave, and C-library port are automatically added below
depends_lib port:octave-lal
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> }
###############################################################################
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lalburst/Portfile b/science/lalburst/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 86f112f..b919c24 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lalburst/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/lalburst/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,7 @@ if {[string match "py*" ${subport}]} {
</span> if {[string match "octave-*" ${subport}]} {
# octave, and C-library port are automatically added below
depends_lib port:octave-lal port:octave-lalmetaio port:octave-lalsimulation
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span> }
###############################################################################
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lalframe/Portfile b/science/lalframe/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6901bf0..788a294 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lalframe/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/lalframe/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,7 +32,7 @@ if {[string match "py*" ${subport}]} {
</span> if {[string match "octave-*" ${subport}]} {
# octave, and C-library port are automatically added below
depends_lib port:octave-lal
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span> }
###############################################################################
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lalinference/Portfile b/science/lalinference/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 236de38..b51cd63 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lalinference/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/lalinference/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +56,7 @@ if {[string match "octave-*" ${subport}]} {
</span> # octave, and C-library port are automatically added below
depends_lib port:octave-lal port:octave-lalmetaio port:octave-lalsimulation \
port:octave-lalburst port:lalinspiral port:lalpulsar
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> }
configure.args --enable-openmp \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lalinspiral/Portfile b/science/lalinspiral/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0aeec8f..27fc2cc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lalinspiral/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/lalinspiral/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@ if {[string match "octave-*" ${subport}]} {
</span> # octave, and C-library port are automatically added below
depends_lib port:octave-lal port:octave-lalframe port:octave-lalmetaio \
port:octave-lalsimulation
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span> }
###############################################################################
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lalmetaio/Portfile b/science/lalmetaio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index acc00a4..55bd209 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lalmetaio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/lalmetaio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@ if {[string match "py*" ${subport}]} {
</span> if {[string match "octave-*" ${subport}]} {
# octave, and C-library port are automatically added below
depends_lib port:octave-lal
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span> }
###############################################################################
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lalpulsar/Portfile b/science/lalpulsar/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a45d9a8..8406be3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lalpulsar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/lalpulsar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@ if {[string match "py*" ${subport}]} {
</span> if {[string match "octave-*" ${subport}]} {
# octave, and C-library port are automatically added below
depends_lib port:octave-lal
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span> }
###############################################################################
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lalsimulation/Portfile b/science/lalsimulation/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 19fc7e1..628e9a0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lalsimulation/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/lalsimulation/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@ if {[string match "py*" ${subport}]} {
</span> if {[string match "octave-*" ${subport}]} {
# octave, and C-library port are automatically added below
depends_lib port:octave-lal
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> }
###############################################################################
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/limesuite/Portfile b/science/limesuite/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cd91af6..48990d7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/limesuite/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/limesuite/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,7 +25,7 @@ if {[string first "-devel" $subport] > 0} {
</span> checksums rmd160 69c1207c89d9f6fff983e3ca81782befe910e530 \
sha256 dddcea1813d99b45d692ce1f59f758a9709e44076f427e9cd2b16980e9a36aca \
size 5347844
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
name limesuite-devel
long_description ${long_description} This port is kept up with the LimeSuite \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +38,7 @@ if {[string first "-devel" $subport] > 0} {
</span> checksums rmd160 6286e1ec881b5944d9913f802cba2b8236908917 \
sha256 bf0ca8225e9eacf44cee7383504e699eb9be5cc47293fb9c08baaf8d5e3163c9 \
size 5347689
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 2
</span>
conflicts limesuite-devel
configure.args-append -DLIME_SUITE_EXTVER=release
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/nds2-client-swig/Portfile b/science/nds2-client-swig/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 61f6551..9885f52 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/nds2-client-swig/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/nds2-client-swig/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -112,6 +112,7 @@ subport ${basename}-matlab {
</span> #========================================================================
subport ${basename}-octave {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> categories-append octave
description Octave bindings for ${description}
long_description ${long_description} This package provides Octave \
</pre><pre style='margin:0'>
</pre>