<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/aec14792b8457e3c77b5c90a3c402a88ba9eb41b">https://github.com/macports/macports-ports/commit/aec14792b8457e3c77b5c90a3c402a88ba9eb41b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit aec14792b8457e3c77b5c90a3c402a88ba9eb41b
</span>Author: Marcus Calhoun-Lopez <marcuscalhounlopez@gmail.com>
AuthorDate: Wed May 23 10:25:10 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> octave: update version 4.2.2->4.4.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/56480
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/51707
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://github.com/macports/macports-ports/pull/1827
</span><span style='display:block; white-space:pre;color:#404040;'> for all of the initial work on this issue
</span>---
_resources/port1.0/group/octave-1.0.tcl | 35 +-
aqua/qtoctave-mac/Portfile | 2 +-
audio/libsndfile/Portfile | 1 +
math/DSDP/Portfile | 2 +-
math/octave-audio/Portfile | 3 +-
math/octave-audio/files/patch-configure.diff | 20 +
math/octave-communications/Portfile | 3 +-
math/octave-control/Portfile | 2 +-
math/octave-database/Portfile | 1 +
math/octave-doctest/Portfile | 4 +-
math/octave-econometrics/Portfile | 2 +-
math/octave-fits/Portfile | 2 +-
math/octave-fl-core/Portfile | 2 +-
.../files/patch-src-fl_compose.cc.diff | 19 +-
math/octave-fuzzy-logic-toolkit/Portfile | 5 +-
.../files/patch-anonymous.diff | 61 +++
math/octave-general/Portfile | 1 +
math/octave-geometry/Portfile | 4 +-
math/octave-gsl/Portfile | 2 +-
math/octave-image/Portfile | 2 +-
math/octave-interval/Portfile | 2 +-
math/octave-io/Portfile | 1 +
math/octave-linear-algebra/Portfile | 3 +-
math/octave-ltfat/Portfile | 1 +
math/octave-mapping/Portfile | 2 +-
math/octave-mechanics/Portfile | 2 +-
math/octave-miscellaneous/Portfile | 2 +-
math/octave-msh/Portfile | 4 +-
math/octave-multicore/Portfile | 2 +-
math/octave-nan/Portfile | 2 +-
math/octave-netcdf/Portfile | 1 +
math/octave-ocs/Portfile | 8 +-
math/octave-ocs/files/patch-no_break.diff | 254 ++++++++++++
math/octave-octclip/Portfile | 2 +-
math/octave-octproj/Portfile | 2 +-
math/octave-optim/Portfile | 2 +-
math/octave-optiminterp/Portfile | 1 +
math/octave-parallel/Portfile | 2 +-
math/octave-printpgf/Portfile | 1 -
math/octave-quaternion/Portfile | 2 +-
math/octave-signal/Portfile | 1 +
math/octave-sockets/Portfile | 2 +-
math/octave-specfun/Portfile | 2 +-
math/octave-spline-gcvspl/Portfile | 3 +-
math/octave-stk/Portfile | 2 +-
math/octave-strings/Portfile | 2 +-
math/octave-struct/Portfile | 1 +
math/octave-symband/Portfile | 2 +-
math/octave-tisean/Portfile | 2 +-
math/octave-tsa/Portfile | 8 +-
math/octave-video/Portfile | 2 +-
math/octave-windows/Portfile | 11 +-
math/octave-zeromq/Portfile | 1 +
math/octave/Portfile | 188 ++++-----
math/octave/files/clang-libcxx-fix-devel.patch | 135 -------
math/octave/files/clang-libcxx-fix.patch | 46 ++-
math/octave/files/patch-__opengl_info__.diff | 11 +
math/octave/files/patch-arch_arg-devel.diff | 22 --
math/octave/files/patch-arch_arg.diff | 6 +-
math/octave/files/patch-bsdtar-devel.diff | 36 --
math/octave/files/patch-bsdtar.diff | 2 +-
math/octave/files/patch-crash_on_exit-devel.diff | 37 --
math/octave/files/patch-crash_on_exit.diff | 22 ++
math/octave/files/patch-figures-devel.diff | 440 ++++++++++++++++++---
math/octave/files/patch-figures.diff | 396 ++++++++++++++++---
math/octave/files/patch-force_cxx.diff | 4 +-
math/octave/files/patch-host_name-devel.diff | 11 -
math/octave/files/patch-host_name.diff | 11 -
math/octave/files/patch-iconsize-devel.diff | 18 -
math/octave/files/patch-iconsize.diff | 22 +-
math/octave/files/patch-java-devel.diff | 40 --
math/octave/files/patch-java.diff | 51 ---
math/octave/files/patch-link-devel.diff | 23 --
math/octave/files/patch-link.diff | 19 +-
math/octave/files/patch-makeinfo.diff | 11 +
math/octave/files/patch-versions-devel.diff | 79 ++++
math/octave/files/patch-versions.diff | 101 +++++
pure/pure-octave/Portfile | 1 +
python/py-oct2py/Portfile | 1 +
python/py-octave_kernel/Portfile | 2 +-
science/gmt4/Portfile | 1 +
science/lal/Portfile | 2 +-
science/lalburst/Portfile | 2 +-
science/laldetchar/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/lalstochastic/Portfile | 2 +-
science/lalxml/Portfile | 2 +-
science/nds2-client/Portfile | 2 +-
93 files changed, 1569 insertions(+), 699 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/octave-1.0.tcl b/_resources/port1.0/group/octave-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index bbc0508..dc45e9b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/octave-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/octave-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,12 @@
</span> #
# where module is the name of the module (e.g. communications)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-options octave.module
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+options octave.module octave.config_h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# do not use this option unless absolutely necessary
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see comments below
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this should eventually be removed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default octave.config_h {no}
</span>
# some header files from Octave require C++-11
PortGroup cxx11 1.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -205,3 +210,31 @@ post-activate {
</span> set octave_install_lib ${prefix}/lib/octave/packages
system "${prefix}/bin/octave-cli -q -f -H --eval 'try; pkg prefix ${octave_install_share} ${octave_install_lib}; pkg -verbose -global rebuild; disp(lasterror.message); catch; exit(1); end_try_catch;'"
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# octave/config.h was removed from octave 4.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# some packages, however, still depend on it for information
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://savannah.gnu.org/bugs/?41027
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# eventually, this code should be removed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default compiler.cpath {[octave._cpath]}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+proc octave._cpath {} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ global prefix octave.config_h worksrcpath
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${octave.config_h}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return "${prefix}/include ${worksrcpath}/macports_compat ${worksrcpath}/macports_compat/octave"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ${prefix}/include
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${octave.config_h}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d -m 0755 ${worksrcpath}/macports_compat/octave
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set configf [open "${worksrcpath}/macports_compat/octave/config.h" w 0644]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${configf} "#include <octave/octave-config.h>"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach v {LOCALVERFCNFILEDIR LOCALVEROCTFILEDIR LOCALVERARCHLIBDIR CANONICAL_HOST_TYPE} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mv [exec ${prefix}/bin/octave-config -p ${v}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${configf} "#define OCTAVE_${v} \"${mv}\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close ${configf}
</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/aqua/qtoctave-mac/Portfile b/aqua/qtoctave-mac/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 68f4faf..4e12db6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/qtoctave-mac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/qtoctave-mac/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,7 +6,7 @@ PortGroup cmake 1.0
</span>
name qtoctave-mac
version 0.10.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> categories aqua math
license GPL-2+
platforms darwin
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/libsndfile/Portfile b/audio/libsndfile/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 281399e..9327a3d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/libsndfile/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/libsndfile/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
name libsndfile
version 1.0.28
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories audio
maintainers {stare.cz:hans @janstary}
platforms darwin
<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 b1f7647..cbcc760 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 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</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 6276e68..7ad9146 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;'>@@ -4,7 +4,8 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup audio 1.1.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+octave.config_h yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
license GPL-2+ public-domain
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-audio/files/patch-configure.diff b/math/octave-audio/files/patch-configure.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..4733734
</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-audio/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/configure.orig 2009-06-07 04:26:53.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/configure 2018-05-21 05:24:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2867,7 +2867,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if test -z "$mpath" || test -z "$opath" || test -z "$xpath" || test -z "$altmpath" || test -z "$altopath" || test -z "$ver" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test -z "$mpath" || test -z "$opath" || test -z "$xpath" || test -z "$ver" ; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat > conftest.cc <<EOF
</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/octave-config.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <octave/version.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <octave/defaults.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2956,7 +2956,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:$LINENO: checking for F77_FUNC" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo_n "checking for F77_FUNC... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat > conftest.cc << EOF
</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/octave-config.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int F77_FUNC (hello, HELLO) (const int &n);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_try="$MKOCTFILE -c conftest.cc"
</span><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 15d80d2..368b72b 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;'>@@ -4,7 +4,8 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup communications 1.2.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+octave.config_h yes
</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-control/Portfile b/math/octave-control/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a9f6413..7816a13 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 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-database/Portfile b/math/octave-database/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 076bb17..f7e16cb 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,6 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup database 2.4.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-doctest/Portfile b/math/octave-doctest/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 529b233..8f0998e 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 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;background:#e0e0e0;'>@@ -15,3 +15,5 @@ long_description ${description} It then executes the code and confirms the ou
</span>
checksums rmd160 1540310ae8daf66db9560412865143a97a380af8 \
sha256 b23f697e5386dacd7cf0a4ad654a982199faa96b52db6d5b0b1c912592b77570
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs noarch
</span><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 2cba25e..ef2c547 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 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-fits/Portfile b/math/octave-fits/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3f4222d..6af46dd 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 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-fl-core/Portfile b/math/octave-fl-core/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 00b0c6e..71ef894 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 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-fl-core/files/patch-src-fl_compose.cc.diff b/math/octave-fl-core/files/patch-src-fl_compose.cc.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 782981b..76e336e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-fl-core/files/patch-src-fl_compose.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-fl-core/files/patch-src-fl_compose.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/fl_compose.cc.orig 2011-02-06 13:09:03.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/fl_compose.cc 2014-11-26 15:09:20.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,7 +20,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/fl_compose.cc.orig 2011-02-06 12:09:03.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/fl_compose.cc 2018-05-21 14:23:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,6 +21,7 @@
</span> #include <octave/oct.h>
#include <octave/parse.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <pthread.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <pthread.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <pthread.h>
</span> +#include <unistd.h>
#define HELP \
"-*- texinfo -*-\n\
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -465,7 +466,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ float tnorm_val;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Initialize the result sparse matrix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sparseC = SparseMatrix((int)colsB, (int)rowsA, (int)(colsB*rowsA));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sparseC = SparseMatrix((octave_idx_type)colsB, (octave_idx_type)rowsA, (octave_idx_type)(colsB*rowsA));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Initialize the number of nonzero elements in the sparse matrix c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int nel = 0;
</span><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 e68d894..084e2eb 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 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;background:#e0e0e0;'>@@ -15,3 +15,6 @@ checksums rmd160 8539fa54e2b9977981914fd585ce4c0b59dc1c8d \
</span> sha256 b4c24ac48662ce413599721d2565e9eabf23ead6b9b36863d33740920aec4133
supported_archs noarch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://savannah.gnu.org/bugs/?53549
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-anonymous.diff
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-fuzzy-logic-toolkit/files/patch-anonymous.diff b/math/octave-fuzzy-logic-toolkit/files/patch-anonymous.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..44ba35c
</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-fuzzy-logic-toolkit/files/patch-anonymous.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,61 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- inst/defuzz.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ inst/defuzz.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-## Copyright (C) 2011-2014 L. Markowsky <lmarkov@users.sourceforge.net>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++## Copyright (C) 2011-2018 L. Markowsky <lmarkov@users.sourceforge.net>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ##
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## This file is part of the fuzzy-logic-toolkit.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ##
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -162,7 +162,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ function crisp_x = mom (x, y)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ max_y = max (y);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- y_val = @(y_val) if (y_val == max_y) 1 else 0 endif;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ function y_val = calc_yval(y_val)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (y_val == max_y)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ y_val = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ y_val = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endfunction
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ y_val = @(y_val) calc_yval(y_val);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ max_y_locations = arrayfun (y_val, y);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ crisp_x = sum (x .* max_y_locations) / sum (max_y_locations);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -185,7 +194,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ function crisp_x = som (x, y)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ max_y = max (y);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- y_val = @(y_val) if (y_val == max_y) 1 else (NaN) endif;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ function y_val = calc_yval(y_val)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (y_val == max_y)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ y_val = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ y_val = (NaN);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endfunction
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ y_val = @(y_val) calc_yval(y_val);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ max_y_locations = arrayfun (y_val, y);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ crisp_x = min (x .* max_y_locations);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -207,7 +225,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ function crisp_x = lom (x, y)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ max_y = max (y);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- y_val = @(y_val) if (y_val == max_y) 1 else (NaN) endif;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ function y_val = calc_yval(y_val)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (y_val == max_y)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ y_val = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ y_val = (NaN);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endfunction
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ y_val = @(y_val) calc_yval(y_val);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ max_y_locations = arrayfun (y_val, y);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ crisp_x = max (x .* max_y_locations);
</span><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 24d993e..d5b4424 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,6 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup general 2.1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</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-geometry/Portfile b/math/octave-geometry/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6bab8a3..c50ff24 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 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;background:#e0e0e0;'>@@ -17,5 +17,3 @@ checksums rmd160 60ac95bca886646229483e8c940b1f7d80bef4f4 \
</span> sha256 76014bf3477b8c23b173dfe0e57a7e191f2318722123028d70f2ce0ea23ec8a8
depends_lib-append port:octave-general
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs noarch
</span><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 4b5d13d..6394540 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.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-image/Portfile b/math/octave-image/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a7d82b0..47b275f 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,7 +5,7 @@ PortGroup cxx11 1.1
</span> PortGroup octave 1.0
octave.setup image 2.6.2
<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+ MIT FreeBSD
maintainers {mps @Schamschula} openmaintainer
<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 2706ffb..86c545e 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.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+
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 9f64d29..4bfdad2 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.11
<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-linear-algebra/Portfile b/math/octave-linear-algebra/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ac5a0cf..47b17df 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;'>@@ -4,7 +4,8 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup linear-algebra 2.2.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+octave.config_h yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> platforms darwin
license GPL-3+ LGPL-3+ FreeBSD
maintainers {mps @Schamschula} openmaintainer
<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 05d74c1..1dd9f4b 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,6 +5,7 @@ PortGroup octave 1.0
</span> PortGroup compilers 1.0
octave.setup ltfat 2.3.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> checksums rmd160 e2cef3751741523a93abbf0a615e51151ea056d1 \
sha256 57207cd922a7a52725fc9e3a24e651c2407d288265b93e43040f33821e23212a
<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 d92309b..e7eedb6 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 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-mechanics/Portfile b/math/octave-mechanics/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 74ae6ab..22ee7f8 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 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-miscellaneous/Portfile b/math/octave-miscellaneous/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a676afe..4307f84 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 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-msh/Portfile b/math/octave-msh/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9e0db85..845c0db 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 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;background:#e0e0e0;'>@@ -21,5 +21,3 @@ checksums rmd160 bd13e148fca05cfa2092f041ee1a542394ec0498 \
</span> depends_lib-append port:octave-splines
patchfiles-append patch-src_Makefile.in.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs noarch
</span><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 cfd09e2..e2dd2d5 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 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-nan/Portfile b/math/octave-nan/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2575207..4999794 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 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-netcdf/Portfile b/math/octave-netcdf/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5613b28..f51f9d6 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,6 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup netcdf 1.0.12
<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-ocs/Portfile b/math/octave-ocs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 52d83d2..3cc8420 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 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;background:#e0e0e0;'>@@ -15,6 +15,6 @@ long_description ${description}
</span> checksums rmd160 fcc669049503009e52ac7b7595c7a4248c779b72 \
sha256 1370bcde11871e96272216fffc3a5f5b3cc989fe8302456c127d3eb105d02013
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append port:octave-odepkg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-src-Mshichmanhodgesmosfet.cc.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://savannah.gnu.org/bugs/?51510
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-src-Mshichmanhodgesmosfet.cc.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-no_break.diff
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-ocs/files/patch-no_break.diff b/math/octave-ocs/files/patch-no_break.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..745fe54
</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-ocs/files/patch-no_break.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,254 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 5df16dfd3522c2d1c4fdf7ed28f9efefc1b64df5 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: JohnD <john.donoghue@ieee.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 4 May 2018 08:41:26 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] remove 'break' statement from switch statements (Bug #51510)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* inst/sbn/Mcapacitors.m, inst/sbn/Mcurrentsources.m,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inst/sbn/Mdiode.m, inst/sbn/Mnmosfet.m, inst/sbn/Mpmosfet.m,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inst/sbn/Mresistors.m, inst/sbn/Mshichmanhodgesmosfet.m,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inst/sbn/Mvoltagesources.m: remove break; from switch statements
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inst/sbn/Mcapacitors.m | 6 +-----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inst/sbn/Mcurrentsources.m | 2 --
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inst/sbn/Mdiode.m | 3 ---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inst/sbn/Mnmosfet.m | 2 --
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inst/sbn/Mpmosfet.m | 3 ---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inst/sbn/Mresistors.m | 5 -----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inst/sbn/Mshichmanhodgesmosfet.m | 7 +------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inst/sbn/Mvoltagesources.m | 8 ++------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 8 files changed, 4 insertions(+), 32 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/inst/sbn/Mcapacitors.m b/inst/sbn/Mcapacitors.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index fdb22b1..7c3784e 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- inst/sbn/Mcapacitors.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ inst/sbn/Mcapacitors.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -72,7 +72,6 @@ function [a,b,c] = Mcapacitors(string,parameters,parameternames,extvar,intvar,t)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a = [0 0 1; 0 0 -1; 0 0 0];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b = [0 0 0;0 0 0;-C C 1];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c = [0 0 0]';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "MULTICAP"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -83,8 +82,6 @@ function [a,b,c] = Mcapacitors(string,parameters,parameternames,extvar,intvar,t)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b = [zeros(n) zeros(n); -C eye(n)];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c = [zeros(2*n,1)]';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ##NLC part
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "PDE_NMOS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -111,7 +108,6 @@ function [a,b,c] = Mcapacitors(string,parameters,parameternames,extvar,intvar,t)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a = [0 0 1; 0 0 -1; 0 0 0];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b = [0 0 0;0 0 0;C -C -1];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c = [0 0 Q-q]';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ otherwise
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error (["unknown section:" string])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -175,4 +171,4 @@ function [Q,C]=Mnmoscap(tbulk,tox,Area,Vg,Na,Nnodes,toll,maxit);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ C = Area*C*(q*ns*xs/Vs);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q = Area*Q*(q*ns*xs);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endfunction
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endfunction
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/inst/sbn/Mcurrentsources.m b/inst/sbn/Mcurrentsources.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 707aa75..e65078c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- inst/sbn/Mcurrentsources.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ inst/sbn/Mcurrentsources.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -71,7 +71,6 @@ function [a,b,c] = Mcurrentsources (string,parameters,parameternames,extvar,intv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a = zeros(2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b = a;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c = [I -I]';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "VCCS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## Voltage controlled current source
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -96,7 +95,6 @@ function [a,b,c] = Mcurrentsources (string,parameters,parameternames,extvar,intv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a = zeros(2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b = a;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c = [I -I]';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "VCPS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## Voltage controlled power source
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/inst/sbn/Mdiode.m b/inst/sbn/Mdiode.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 9db5410..44a4b00 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- inst/sbn/Mdiode.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ inst/sbn/Mdiode.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -74,7 +74,6 @@ function [a,b,c] = Mdiode (string,parameters,parameternames,extvar,intvar,t)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a = zeros(2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b = [geq -geq; -geq geq];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c = [I ; -I] ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "PDEsymmetric"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -102,8 +101,6 @@ function [a,b,c] = Mdiode (string,parameters,parameternames,extvar,intvar,t)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b = [g -g; -g g];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c = [I ; -I] ;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ otherwise
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error(["unknown section:" string])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endswitch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/inst/sbn/Mnmosfet.m b/inst/sbn/Mnmosfet.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 5fe4962..e2b9504 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- inst/sbn/Mnmosfet.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ inst/sbn/Mnmosfet.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -112,7 +112,6 @@ function [a,b,c]=Mnmosfet(string,parameters,parameternames,extvar,intvar,t)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0 0 0 0];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c = [0 -id id 0]';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "lincap"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -153,7 +152,6 @@ function [a,b,c]=Mnmosfet(string,parameters,parameternames,extvar,intvar,t)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b = B+Jac;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c = res + B*[extvar;intvar] + C;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ otherwise
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error(["unknown option:" string]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endswitch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/inst/sbn/Mpmosfet.m b/inst/sbn/Mpmosfet.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c4fbae3..58ef919 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- inst/sbn/Mpmosfet.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ inst/sbn/Mpmosfet.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -108,7 +108,6 @@ function [a,b,c]= Mpmosfet (string,parameters,parameternames,extvar,intvar,t)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0 0 0 0 ];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c =[0 -id id 0]';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "lincap"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -144,8 +143,6 @@ function [a,b,c]= Mpmosfet (string,parameters,parameternames,extvar,intvar,t)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b = B+Jac;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c = res + B*[extvar;intvar] + C;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ otherwise
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error(["unknown option:" string]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endswitch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/inst/sbn/Mresistors.m b/inst/sbn/Mresistors.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e8862b9..e0d43d4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- inst/sbn/Mresistors.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ inst/sbn/Mresistors.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -75,7 +75,6 @@ function [a,b,c] = Mresistors (string, parameters, parameternames,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b = [1 -1 ;-1 1]/R;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c = -[0; 0];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ##NLCpart
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "THERMAL"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -100,8 +99,6 @@ function [a,b,c] = Mresistors (string, parameters, parameternames,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -2*(v1-v2)/RT -2*(v2-v1)/RT (v1-v2)^2*dRdT/RT^2];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c = [i1 i2 P]';
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "THERMAL1D"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for ii=1:length(parameternames)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -123,8 +120,6 @@ function [a,b,c] = Mresistors (string, parameters, parameternames,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b = k*(S/h)*[B(ext,ext), B(ext,int); B(int,ext), B(int,int)];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c = zeros(N+1,1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ otherwise
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error (["unknown section:" string])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endswitch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/inst/sbn/Mshichmanhodgesmosfet.m b/inst/sbn/Mshichmanhodgesmosfet.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index d5a2c93..893872d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- inst/sbn/Mshichmanhodgesmosfet.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ inst/sbn/Mshichmanhodgesmosfet.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -140,9 +140,6 @@ function [a,b,c]= Mshichmanhodgesmosfet (string,parameters,parameternames,extvar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c = [c1;c2];
</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;'>+- break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "PMOS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rd = 1e6;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -218,8 +215,6 @@ function [a,b,c]= Mshichmanhodgesmosfet (string,parameters,parameternames,extvar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c = [c1;c2];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ otherwise
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error(["unknown option:" string]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endswitch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -329,4 +324,4 @@ function [gm,gd,ids,didT,P,dPdT,dPdvgs,dPdvds] = pmos(extvar,mu0,Cox,W,L,Vth,rd,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dPdvgs = -(gm*vds);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dPdvds = -(gd*vds + ids);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-endfunction
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+\ No newline at end of file
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++endfunction
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/inst/sbn/Mvoltagesources.m b/inst/sbn/Mvoltagesources.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b0a9819..e0a2408 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- inst/sbn/Mvoltagesources.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ inst/sbn/Mvoltagesources.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -92,7 +92,7 @@ function [a,b,c] = Mvoltagesources (string,parameters,parameternames,extvar,intv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a = zeros(3);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b = [0 0 1;0 0 -1;1 -1 0];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c = [0 0 -V];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## NLC part
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "sinwave"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for ii=1:length(parameternames)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -105,7 +105,6 @@ function [a,b,c] = Mvoltagesources (string,parameters,parameternames,extvar,intv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a = zeros(3);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b = [0 0 1;0 0 -1;1 -1 0];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c = [0 0 -DV]' + b * [extvar;intvar];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "pwl"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -118,7 +117,6 @@ function [a,b,c] = Mvoltagesources (string,parameters,parameternames,extvar,intv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a = zeros(3);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b = [0 0 1;0 0 -1;1 -1 0];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c = [0 0 -DV]' + b * [extvar;intvar];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "squarewave"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for ii=1:length(parameternames)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -144,7 +142,6 @@ function [a,b,c] = Mvoltagesources (string,parameters,parameternames,extvar,intv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a = zeros(3);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b = [0 0 1;0 0 -1;1 -1 0];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c = [0 0 -DV]' + b * [extvar;intvar];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "step"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for ii=1:length(parameternames)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -162,7 +159,6 @@ function [a,b,c] = Mvoltagesources (string,parameters,parameternames,extvar,intv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a = zeros(3);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b = [0 0 1;0 0 -1;1 -1 0];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c = [0 0 -DV]' + b * [extvar;intvar];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "VCVS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ K = 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -175,7 +171,7 @@ function [a,b,c] = Mvoltagesources (string,parameters,parameternames,extvar,intv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a = zeros(5);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ b = [0 0 0 0 1;0 0 0 0 -1;0 0 0 0 0;0 0 0 0 0;1 -1 -K K 0];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ c = zeros(5,1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- break
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ otherwise
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error (["unknown section:" string])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endswitch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.14.3
</span><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 076bbf9..15fc119 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 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-octproj/Portfile b/math/octave-octproj/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 987009d..7eed786 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 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 9
</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 eb9a6e1..eb0bc68 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.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 GFDL GPL-3+ BSD public-domain
maintainers {mps @Schamschula} openmaintainer
<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 9634aed..45bf3c2 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,6 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup optiminterp 0.3.5
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> platforms darwin
license GPL-3+
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 d3b36c7..7853462 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;'>@@ -1,10 +1,10 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cxx11 1.1
</span> PortGroup octave 1.0
octave.setup parallel 3.1.2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> platforms darwin
license GPL-2+ GPL-3+
maintainers {mps @Schamschula} openmaintainer
<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 a14dad7..0773023 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;'>@@ -6,7 +6,6 @@ PortGroup octave 1.0
</span> octave.setup printpgf 1.0
revision 3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-categories math science
</span> platforms darwin
license GPL-2+
maintainers nomaintainer
<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 abcf986..750c44b 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 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-signal/Portfile b/math/octave-signal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 70c77cb..a7e7a39 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,6 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup signal 1.4.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> platforms darwin
license GPL-3+ public-domain
maintainers nomaintainer
<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 fbd70cd..5105c26 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 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-specfun/Portfile b/math/octave-specfun/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c9cdef7..e782cd1 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 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
license GPL-3+ BSD
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 1b79c96..26acb74 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;'>@@ -4,7 +4,8 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup spline-gcvspl 1.0.8
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+octave.config_h yes
</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-stk/Portfile b/math/octave-stk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4e38835..d297ea0 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.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-strings/Portfile b/math/octave-strings/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 71ec956..64c3bf8 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 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span> platforms darwin
license GPL-3+ BSD public-domain
maintainers nomaintainer
<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 c2954d2..19ed041 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,6 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup struct 1.0.15
<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-symband/Portfile b/math/octave-symband/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 802fb9c..9ca81f5 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 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-tisean/Portfile b/math/octave-tisean/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8abb770..e3cc3f0 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 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-tsa/Portfile b/math/octave-tsa/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fb92643..3e9ce72 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;'>@@ -2,10 +2,9 @@
</span>
PortSystem 1.0
PortGroup octave 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compilers 1.0
</span>
octave.setup tsa 4.4.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;background:#e0e0e0;'>@@ -16,7 +15,6 @@ long_description ${description}
</span> checksums rmd160 75267e3df5f2667f20bb3243cc2687565fa70e13 \
sha256 c9eb377fc9006e9764f3b152f7bd4725cb6025699bfab0d6a68f26fe2484d6ef
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append "PREFIX_BIN=${prefix}/bin"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:octave-nan
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-compilers.choose fc f77 f90
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compilers.setup require_fortran
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+supported_archs noarch
</span><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 278937e..b128292 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 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</span> platforms darwin
license FreeBSD
maintainers {mps @Schamschula} openmaintainer
<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 bd972f8..da393e6 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;'>@@ -3,8 +3,8 @@
</span> PortSystem 1.0
PortGroup octave 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-octave.setup windows 1.2.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+octave.setup windows 1.3.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#revision 0
</span> platforms darwin
license GPL-2+
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,6 @@ description Provides COM interface and additional \
</span> functionality on Windows.
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 eb68a15cb1eb8cccc02ccb950b3a856c00d9acc1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 cee6c88a0dd241afe170fec59b450927722f8c6d76cc034bf0ea1bece6e5bdf1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-supported_archs noarch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3c2bf7a66516e9589168cc757cadcd2b0ac1258f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8dda7f30ff293eb9cc85baf928f5c2c21a56cd2701d9b3276c30e4cfb1497c0d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 165949
</span><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 20a0976..b72663b 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,6 +4,7 @@ PortSystem 1.0
</span> PortGroup octave 1.0
octave.setup zeromq 1.3.0
<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/Portfile b/math/octave/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 32dc5f4..acf91d7 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;'>@@ -11,8 +11,9 @@ PortGroup cxx11 1.1
</span> compiler.blacklist-append {*gcc-4.6} {clang < 700}
name octave
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.2.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set package_version 4.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;'>@@ -27,8 +28,9 @@ homepage https://www.gnu.org/software/octave
</span>
master_sites gnu:octave
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a54feb50c7ddf00539ba9b928c3570b5cd08e99c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 77b84395d8e7728a1ab223058fe5e92dc38c03bc13f7358e6533aab36f76726e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2ddea0d4d28b153ecf294982620bd7799d1fa058 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 72f846379fcec7e813d46adcbacd069d72c4f4d8f6003bcd92c3513aafcd6e96 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 29009355
</span>
conflicts-append ${name}-devel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,15 +53,18 @@ patchfiles-append patch-link.diff
</span> # allow mkoctfile to recognize and pass along -arch compiler switch
patchfiles-append patch-arch_arg.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# octave compiles in the hostname value
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# it is used to determine installation location
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://savannah.gnu.org/bugs/?50025
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-crash_on_exit.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# octave compiles in the hostname value and its own full version number
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# they are 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 OS number
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# this means the build is dependent on the minor numbers of the OS and Octave
</span> # the following patch attempts to prevent this
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-host_name.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-versions.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://savannah.gnu.org/patch/index.php?9439
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-java.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# reports of `__opengl_info__` not working the first time
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-__opengl_info__.diff
</span>
post-patch {
if { ${os.arch} eq "i386" } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,11 +80,48 @@ post-patch {
</span> set short_host_name powerpc-apple-${os.platform}${os.major}.x.x
}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set configure_file configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set configure_file configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS__PACKAGE_VERSION|${package_version}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${configure_file}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_canonical_host_type__|${short_host_name}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${configure_file}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS__PACKAGE_VERSION|${package_version}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/main.in.cc
</span> reinplace \
"s|__MACPORTS_canonical_host_type__|${short_host_name}|g" \
build-aux/subst-default-vals.in.sh
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/51707
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fc_full [lindex [split ${configure.fc} /] end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fc [lindex [split ${fc_full} -] 0]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ switch ${fc} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gfortran {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fcv [lindex [split ${fc_full} -] end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set gccdir gcc[join [split ${fcv} .] ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${prefix}/lib/${gccdir}/libquadmath.dylib]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append FLIBS="-L${prefix}/lib/${gccdir} -lgfortran -lquadmath -lm"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append FLIBS="-L${prefix}/lib/${gccdir} -lgfortran -lm"
</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;'>+ g95 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append FLIBS="-L${prefix}/lib -lf95 -lm"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ui_warn "Unknown Fortran compiler: ${configure.fc}"
</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;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # Block compilers: Some older versions of CLANG do not honor the CPATH
# environment variables, which is required for compiling this port
# when using MacPorts. The versions seem to be: MacPorts CLANG 2.9 or
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,6 +147,8 @@ pre-patch {
</span> }
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://wiki.octave.org/Building for a list of dependencies
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # avoid depends_build-append port:coreutils
configure.env-append MKDIR_P="/bin/mkdir -p"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -194,12 +238,22 @@ compilers.choose fc f77 f90 cc cxx
</span> # even if configure.cxx_stdlib is libc++
compiler.blacklist-delete *gcc*
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# GCC 6 fails in several ways
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# in order to use the Carbon framework, -fpermissive is required
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# GCC does not understand Xcode's use of __attribute__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://trac.macports.org/ticket/53021
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# as of Octave 4.4, GCC 6 also fails with
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# error: call of overloaded 'abs(signed char)' is ambiguous
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://lists.gnu.org/archive/html/octave-maintainers/2016-02/msg00168.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+compiler.blacklist macports-gcc-6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> compilers.clear_archflags no
# for now, limit the number of variants
# some of these compilers may work fine
compilers.setup \
require_fortran \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -gcc6 \
</span> -gcc5 \
-gcc49 \
-gcc48 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -207,7 +261,6 @@ compilers.setup \
</span> -gcc46 \
-gcc45 \
-gcc44 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -g95 \
</span> -clang34 \
-clang33
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -219,7 +272,7 @@ compilers.setup \
</span> #
#depends_lib-append port:mesa
configure.args-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-OSMesa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-osmesa
</span>
#configure.args-append --with-shell=???
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -282,6 +335,11 @@ depends_lib-append port:zlib
</span>
#--without-hdf5
depends_lib-append port:hdf5
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# avoid configure error
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fatal error: 'mpi.h' file not found
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+foreach mpi {mpich mpich_devel openmpi openmpi_devel} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants hdf5 "" ${mpi}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
#--disable-fftw-threads
#--without-fftw3
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -305,6 +363,10 @@ depends_lib-append port:arpack
</span> configure.args-append --without-openssl
#depends_lib-append path:lib/libssl.dylib:openssl
<span style='display:block; white-space:pre;background:#e0ffe0;'>+#--without-sundials_nvecserial
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#--without-sundials_ida
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append port:sundials2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # see etc/README.MacOS
depends_run-append \
port:epstool \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -312,6 +374,16 @@ depends_run-append \
</span> port:fig2dev \
port:pstoedit
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://savannah.gnu.org/bugs/?53473
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:texinfo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-makeinfo.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "s|__MACPORTS_prefix__|${prefix}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libinterp/corefcn/help.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> pre-configure {
configure.args-append --with-blas="-L${prefix}/lib ${linalglib}" --with-lapack=""
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -319,17 +391,10 @@ pre-configure {
</span> variant java description {enable Java interface} {
PortGroup java 1.0
configure.args-replace --disable-java --enable-java
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${java_home} eq "/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ||
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${java_home} eq "/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # patch is not needed (harmful?) for older Java versions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-delete patch-java.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
# java variant seems to cause problems for both users and build bots
# https://lists.macosforge.org/pipermail/macports-users/2016-May/thread.html#41052
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# #51480
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://trac.macports.org/ticket/51480
</span> #default_variants-append +java
variant qt4 conflicts qt5 description {build the GUI using Qt4} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -357,6 +422,7 @@ variant qt5 conflicts qt4 description {build the GUI using Qt5} {
</span>
configure.env-append PATH=${qt_dir}/bin:$env(PATH)
build.env-append PATH=${qt_dir}/bin:$env(PATH)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append PATH=${qt_dir}/bin:$env(PATH)
</span> }
if { ![variant_isset qt4] && ![variant_isset qt5] } {
# a somewhat arbitrary cutoff for default values
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -393,7 +459,7 @@ if { ([variant_isset fltk] && [variant_isset qt4]) || ([variant_isset fltk] && [
</span>
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 5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set llvm_ver 6.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;'>@@ -439,11 +505,11 @@ variant app description "build application bundle to launch ${subport}" {
</span> if { [variant_isset qt4] || [variant_isset qt5] } {
puts ${script} "#!/bin/sh"
puts ${script} ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${script} "${prefix}/bin/octave-${version} --force-gui"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${script} "${prefix}/bin/octave-${package_version} --gui \"\$@\""
</span> } else {
puts ${script} "#!/usr/bin/osascript"
puts ${script} ""
<span style='display:block; white-space:pre;background:#ffe0e0;'>- puts ${script} "tell application \"Terminal\" to do script \"${prefix}/bin/octave-${version} --no-gui-libs; exit\""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ puts ${script} "tell application \"Terminal\" to do script \"${prefix}/bin/octave-${package_version} --no-gui-libs; exit\""
</span> }
close ${script}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -554,36 +620,12 @@ if {${magickDefault}} {
</span> default_variants-append +graphicsmagick
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# in order to use Carbon framework, -fpermissive is required on macports-gcc-6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ${configure.compiler} eq "macports-gcc-6" && [vercmp 4.0 ${xcodeversion}] <= 0 && [vercmp ${xcodeversion} 5.0] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append -fpermissive
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # see https://trac.macports.org/ticket/53021
foreach gccVar ${compilers.gcc_variants} {
if {[variant_exists ${gccVar}] && [variant_isset ${gccVar}] } {
if {[vercmp ${xcodeversion} 7.0] >= 0} {
patchfiles-append patch-force_cxx.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gccMajor [string range ${gccVar} 3 end]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${gccMajor} == 6 && [vercmp 4.0 ${xcodeversion}] <= 0 && [vercmp ${xcodeversion} 5.0] < 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # in order to use Carbon framework, -fpermissive is required on macports-gcc-6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cxxflags-append -fpermissive
</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 {${gccMajor} < 7 && [vercmp ${xcodeversion} 8.0] >= 0} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-append "-isystem ${worksrcpath}/Availability"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [file exists /usr/include/AvailabilityInternal.h] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 -d ${worksrcpath}/Availability
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 /usr/include/AvailabilityInternal.h ${worksrcpath}/Availability/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/Availability "/usr/bin/sed -i -e 's|__attribute__((availability(.*)))||g' AvailabilityInternal.h"
</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> break
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -597,7 +639,7 @@ post-destroot {
</span> # install the libc++ fix, no matter if used or not, since it is
# required for projects including these headers.
xinstall -m 644 ${worksrcpath}/liboctave/operators/libcxx-fix.h \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/include/${name}-${version}/${name}/libcxx-fix.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/include/${name}-${package_version}/${name}/libcxx-fix.h
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -637,23 +679,15 @@ post-activate {
</span> test.run yes
test.target check
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# the file octave_packages is now generated by Octave Portfile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# the following code may be removed in December of 2017
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-activate {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [file exists ${prefix}/share/octave/octave_packages] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${prefix}/share/octave/octave_packages
</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> subport ${name}-devel {
# http://hg.savannah.gnu.org/hgweb/octave/archive has the ability to download snapshots.
# This would be preferable to using mercurial.
# The generated files, however, are currently corrupted.
fetch.type hg
hg.url http://hg.savannah.gnu.org/hgweb/octave/
<span style='display:block; white-space:pre;background:#ffe0e0;'>- hg.tag b8cb5a05955e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 4.3.0+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hg.tag 2cf750f5cb7d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 4.5.0+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #revision 0
</span>
conflicts-replace ${name}-devel ${name}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -667,16 +701,6 @@ subport ${name}-devel {
</span> port:automake \
port:libtool
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-OSMesa \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-osmesa
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #--without-sundials_nvecserial
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #--without-sundials_ida
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:sundials2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-sundials_ida-includedir=${prefix}/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-sundials_ida-libdir=${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # create links in case patch-force_cxx-devel.diff is included in the patchfiles
# otherwise, they do no harm
post-extract {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -685,32 +709,10 @@ subport ${name}-devel {
</span> }
pre-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # fixed
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-delete patch-qscintilla2.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-delete patch-file-stat.cc.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # fixed? (different bug report)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://savannah.gnu.org/bugs/?50025
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # see https://github.com/macports/macports-ports/pull/987
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-replace patch-crash_on_exit.diff patch-crash_on_exit-devel.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # format and variable name changes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-replace patch-link.diff patch-link-devel.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-replace patch-java.diff patch-java-devel.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-replace patch-iconsize.diff patch-iconsize-devel.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-replace patch-figures.diff patch-figures-devel.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-replace patch-host_name.diff patch-host_name-devel.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-replace patch-bsdtar.diff patch-bsdtar-devel.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-replace patch-arch_arg.diff patch-arch_arg-devel.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-replace patch-versions.diff patch-versions-devel.diff
</span> patchfiles-replace patch-force_cxx.diff patch-force_cxx-devel.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-replace clang-libcxx-fix.patch clang-libcxx-fix-devel.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:#ffe0e0;'>- if {[variant_exists gcc6] && [variant_isset gcc6] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "GCC 6 does not currently work with the development version of Octave"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "invalid variant"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-replace patch-figures.diff patch-figures-devel.diff
</span> }
livecheck.type regexm
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/clang-libcxx-fix-devel.patch b/math/octave/files/clang-libcxx-fix-devel.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f846413..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/clang-libcxx-fix-devel.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 2017-11-10 03:50:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ liboctave/operators/mx-inlines.cc 2017-11-10 04:24:07.000000000 -0700
</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/clang-libcxx-fix.patch b/math/octave/files/clang-libcxx-fix.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index c464ba1..a045580 100644
</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;'>+++ b/math/octave/files/clang-libcxx-fix.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,20 +86,50 @@ diff -r 91a6f06c5052 -r 1433cd4f7b7b liboctave/operators/libcxx-fix.h
</span> +}
+
+}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -r 91a6f06c5052 -r 1433cd4f7b7b liboctave/operators/mx-inlines.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/liboctave/operators/mx-inlines.cc Thu Oct 09 20:38:04 2014 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ liboctave/operators/mx-inlines.cc Sun Oct 12 00:00:55 2014 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -398,7 +398,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- liboctave/operators/mx-inlines.cc.orig 2017-11-10 03:50:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ liboctave/operators/mx-inlines.cc 2017-11-10 04:24:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -408,11 +408,20 @@
</span> // Let the compiler decide which pow to use, whichever best matches the
// arguments provided.
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> +#if defined(_LIBCPP_VERSION) && (_LIBCPP_VERSION >= 1101)
+// Workaround http://llvm.org/bugs/show_bug.cgi?id=21083
+#include "libcxx-fix.h"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+using libcxx_fix::pow;
</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;'>+ template <typename R, typename X, typename Y>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mx_inline_pow (size_t n, R *r, const X *x, const Y *y)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(_LIBCPP_VERSION) && (_LIBCPP_VERSION >= 1101)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ using libcxx_fix::pow;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using std::pow;
</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;'>+ for (size_t i = 0; i < n; i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ r[i] = pow (x[i], y[i]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -422,7 +431,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mx_inline_pow (size_t n, R *r, const X *x, Y y)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(_LIBCPP_VERSION) && (_LIBCPP_VERSION >= 1101)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ using libcxx_fix::pow;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ using std::pow;
</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;'>+ for (size_t i = 0; i < n; i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ r[i] = pow (x[i], y);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -432,7 +445,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ inline void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mx_inline_pow (size_t n, R *r, X x, const Y *y)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(_LIBCPP_VERSION) && (_LIBCPP_VERSION >= 1101)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ using libcxx_fix::pow;
</span> +#else
using std::pow;
+#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>- DEFMXMAPPER2X (mx_inline_pow, pow)
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- // Arbitrary function appliers.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (size_t i = 0; i < n; i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ r[i] = pow (x, y[i]);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-__opengl_info__.diff b/math/octave/files/patch-__opengl_info__.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2d79392
</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-__opengl_info__.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;'>+--- scripts/plot/util/__opengl_info__.m.~1~ 2018-04-30 13:03:56.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scripts/plot/util/__opengl_info__.m 2018-05-21 07:25:49.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -113,7 +113,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hf = figure ("position", [0,0,1,1], "toolbar", "none", "menubar", "none");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hax = axes ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## FIXME: Race condition means this delay may not always work.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pause (0.1 * attempts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pause (1 * attempts);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ refresh (hf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ info = fig_gl_info (hf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ close (hf);
</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 ef6ae65..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 2017-11-08 15:10:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/mkoctfile.in.cc 2017-11-09 06:09:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -630,6 +630,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 e4c6374..78866b7 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,8 +1,8 @@
</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;'>-@@ -586,6 +586,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -634,6 +634,19 @@
</span> {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pass_on_options += (" " + arg);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pass_on_options += (' ' + arg);
</span> }
+#if defined __APPLE__ && defined __MACH__
+ else if (arg == "-arch")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,4 +19,4 @@
</span> +#endif
else if (starts_with (arg, "-"))
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- // Pass through any unrecognized options
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Pass through any unrecognized options.
</span><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 ca239fc..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;'>-@@ -174,15 +174,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;'>-@@ -290,8 +290,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 290bf87..ca239fc 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;'>@@ -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;'>-@@ -284,8 +284,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -290,8 +290,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 a8bf913..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,37 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-exporting patch:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# HG changeset patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# User Daniel J Sebald <daniel.sebald@ieee.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Date 1506287098 18000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Sun Sep 24 16:04:58 2017 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Node ID fbbbbddc5dd836c35f9dad704062de8eb4328837
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Parent 1265c7f0119a75356f1b4950e9a2f8ec819d81bc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Move worker thread shutdown to main window handling finish (bug #50025)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-* main-window.cc (main_window::main_window): Remove octave_finished_signal()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- connection from m_interpreter--which runs in m_main_thread--to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- m_main_thread's quit().
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (main_window::handle_octave_finished): Quit and wait on the worker thread.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/libgui/src/main-window.cc b/libgui/src/main-window.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgui/src/main-window.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgui/src/main-window.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -217,9 +217,6 @@ main_window::main_window (QWidget *p, oc
</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;'>-@@ -1579,6 +1576,9 @@ main_window::handle_octave_ready (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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;'>-+ m_main_thread->quit();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_main_thread->wait();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5921907
</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-crash_on_exit.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;'>+--- libgui/src/main-window.cc.orig 2018-04-30 10:03:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgui/src/main-window.cc 2018-05-18 05:50:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -216,9 +216,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ connect (m_interpreter, SIGNAL (octave_finished_signal (int)),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ this, SLOT (handle_octave_finished (int)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- connect (m_interpreter, SIGNAL (octave_finished_signal (int)),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- m_main_thread, SLOT (quit (void)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ connect (m_main_thread, SIGNAL (finished (void)),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_main_thread, SLOT (deleteLater (void)));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1533,6 +1530,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void main_window::handle_octave_finished (int exit_status)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* fprintf to stderr is needed by macOS */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fprintf(stderr, "\n");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m_main_thread->quit();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qApp->exit (exit_status);
</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/files/patch-figures-devel.diff b/math/octave/files/patch-figures-devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 3768727..b17d749 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-figures-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/files/patch-figures-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,100 +1,428 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgui/graphics/GLCanvas.cc.orig 2017-11-08 15:10:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgui/graphics/GLCanvas.cc 2017-11-09 05:34:09.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,6 +30,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "GLCanvas.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "gl-select.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <qapplication.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -r bb43ec3a304e libgui/graphics/Figure.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgui/graphics/Figure.cc Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgui/graphics/Figure.cc Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,6 +41,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QtDebug>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QTimer>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QToolBar>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QWindow>
</span> +#include <QScreen>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "Canvas.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "Container.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -133,6 +135,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ figure::properties& fp = properties<figure> ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Register for the signal that indicates when a window has moved
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // to a different screen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ connect (win, SIGNAL (figureWindowShown ()),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ this, SLOT (figureWindowShown ()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Status bar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_statusBar = win->statusBar ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int boffset = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1079,6 +1086,39 @@
</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;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Figure::figureWindowShown ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined (HAVE_QSCREEN_DEVICEPIXELRATIO)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ figure::properties& fp = properties<figure> ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QMainWindow *win = qWidget<QMainWindow> ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QWindow* window = win->windowHandle ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QScreen* screen = window->screen ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fp.set___device_pixel_ratio__ (screen->devicePixelRatio ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Make sure the figure gets redrawn after the devicePixelRatio is updated
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ graphics_object go = gh_manager::get_object (fp.get___myhandle__ ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fp.get_toolkit ().redraw_figure (go);
</span> +
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ connect (window, SIGNAL (screenChanged (QScreen*)),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ this, SLOT (screenChanged (QScreen*)));
</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;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Figure::screenChanged (QScreen* screen)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined (HAVE_QSCREEN_DEVICEPIXELRATIO)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ figure::properties& fp = properties<figure> ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ float old_device_pixel_ratio = fp.get___device_pixel_ratio__ ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fp.set___device_pixel_ratio__ (screen->devicePixelRatio ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Make sure the figure gets redrawn after the devicePixelRatio is updated
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ graphics_object go = gh_manager::get_object (fp.get___myhandle__ ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fp.get_toolkit ().redraw_figure (go);
</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;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Figure::enableMouseTracking (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Enable mouse tracking on every widgets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -r bb43ec3a304e libgui/graphics/Figure.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgui/graphics/Figure.h Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgui/graphics/Figure.h Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,6 +32,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class QMainWindow;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class QToolBar;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++class QScreen;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> namespace QtHandles
{
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined (HAVE_QOPENGLWIDGET)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -51,6 +54,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -128,6 +129,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void toggleAxes (void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void toggleGrid (void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void autoAxes (void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void figureWindowShown ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void screenChanged (QScreen*);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public slots:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8NDArray slotGetPixels (void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -r bb43ec3a304e libgui/graphics/FigureWindow.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgui/graphics/FigureWindow.cc Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgui/graphics/FigureWindow.cc Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,4 +48,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return nullptr;
</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;'>++ void FigureWindow::showEvent (QShowEvent* ev)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QMainWindow::showEvent (ev);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ emit figureWindowShown();
</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;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -r bb43ec3a304e libgui/graphics/FigureWindow.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgui/graphics/FigureWindow.h Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgui/graphics/FigureWindow.h Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,10 +37,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q_OBJECT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FigureWindow (QWidget *parent = nullptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ explicit FigureWindow (QWidget *parent = nullptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ~FigureWindow (void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMenu * createPopupMenu (void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ protected:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void showEvent(QShowEvent *ev);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ signals:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void figureWindowShown();
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -r bb43ec3a304e libgui/graphics/GLCanvas.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgui/graphics/GLCanvas.cc Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgui/graphics/GLCanvas.cc Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,7 +68,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ octave::opengl_renderer r;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- r.set_viewport (width (), height ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ graphics_object fig = go.get_ancestor ("figure");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ double dpr = fig.get ("__device_pixel_ratio__").double_value ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ r.set_viewport (dpr * width (), dpr * height ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ r.draw (go);
</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;'>+@@ -173,7 +176,10 @@
</span> {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- setFocusPolicy (Qt::ClickFocus);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setFocus ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ octave::opengl_selector s;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- s.set_viewport (width (), height ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ graphics_object fig = ax.get_ancestor ("figure");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ double dpr = fig.get ("__device_pixel_ratio__").double_value ();
</span> +
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QScreen *screen = QApplication::screens().at(0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gh_manager::screen_scale = screen->devicePixelRatio();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ s.set_viewport (dpr * width (), dpr * height ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return s.select (ax, pt.x (), height () - pt.y (),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ octave::select_ignore_hittest);
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -r bb43ec3a304e libinterp/corefcn/gl-render.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libinterp/corefcn/gl-render.cc Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libinterp/corefcn/gl-render.cc Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -593,7 +593,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : toolkit (), xform (), xmin (), xmax (), ymin (), ymax (),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zmin (), zmax (), xZ1 (), xZ2 (), marker_id (), filled_marker_id (),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ camera_pos (), camera_dir (), interpreter ("none"), txt_renderer (),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- selecting (false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ selecting (false), m_devpixfactor (1.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // This constructor will fail if we don't have OpenGL or if the data
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // types we assumed in our public interface aren't compatible with the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -694,8 +694,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ opengl_renderer::draw_figure (const figure::properties& props)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Current physical-pixel to toolkit-pixel factor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m_devpixfactor = props.get___device_pixel_ratio__ ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Initialize OpenGL context
</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;'>+ init_gl_context (props.is_graphicssmoothing (), props.get_color_rgb ());
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- GLCanvas::~GLCanvas (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libinterp/corefcn/gl-render.cc.orig 2017-11-08 15:10:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libinterp/corefcn/gl-render.cc 2017-11-09 05:37:41.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1155,7 +1155,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined (HAVE_OPENGL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1123,6 +1126,11 @@
</span> glMultMatrixd (x_mat1.data ());
glMatrixMode (GL_PROJECTION);
glLoadIdentity ();
<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;'>-+ glOrtho (0, roundf((1./gh_manager::screen_scale)*(float)vw[2]), roundf((1./gh_manager::screen_scale)*(float)vw[3]), 0, xZ1, xZ2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Use abstract Octave-pixels for transformation, not physical-pixels
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vw[2] = octave::math::round (static_cast<float> (vw[2]) / m_devpixfactor);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vw[3] = octave::math::round (static_cast<float> (vw[3]) / m_devpixfactor);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glOrtho (0, vw[2], vw[3], 0, xZ1, xZ2);
</span> glMultMatrixd (x_mat2.data ());
glMatrixMode (GL_MODELVIEW);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3528,6 +3536,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glMatrixMode (GL_PROJECTION);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glPushMatrix ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glLoadIdentity ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vp[2] = octave::math::round (static_cast<float> (vp[2]) / m_devpixfactor);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vp[3] = octave::math::round (static_cast<float> (vp[3]) / m_devpixfactor);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glOrtho (0, vp[2], vp[3], 0, xZ1, xZ2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glMatrixMode (GL_MODELVIEW);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glPushMatrix ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3697,10 +3709,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // FIXME: actually add the code to do it!
</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;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (i0 >= i1 || j0 >= j1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3785,7 +3785,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- glPixelZoom (pix_dx, -pix_dy);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ glPixelZoom (m_devpixfactor * pix_dx,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ - m_devpixfactor * pix_dy);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glRasterPos3d (im_xmin + nor_dx*j0, im_ymin + nor_dy*i0, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // by default this is 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3953,7 +3967,7 @@
</span> {
#if defined (HAVE_OPENGL)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- glViewport (0, 0, w, h);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ glViewport (0.0, 0.0, gh_manager::screen_scale*w, gh_manager::screen_scale*h);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- glLineWidth (w);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ glLineWidth (w * m_devpixfactor);
</span>
#else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3890,7 +3890,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- txt_renderer.set_font (props.get ("fontname").string_value (),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- props.get ("fontweight").string_value (),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- props.get ("fontangle").string_value (),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- props.get ("__fontsize_points__").double_value ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gh_manager::screen_scale*props.get ("__fontsize_points__").double_value ());
</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;'>-@@ -4078,7 +4078,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4103,6 +4117,10 @@
</span> glMatrixMode (GL_PROJECTION);
glPushMatrix ();
glLoadIdentity ();
<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;'>-+ glOrtho (0, roundf((1./gh_manager::screen_scale)*(float)vw[2]), roundf((1./gh_manager::screen_scale)*(float)vw[3]), 0, xZ1, xZ2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vw[2] = octave::math::round (static_cast<float> (vw[2]) / m_devpixfactor);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vw[3] = octave::math::round (static_cast<float> (vw[3]) / m_devpixfactor);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glOrtho (0, vw[2], vw[3], 0, xZ1, xZ2);
</span> glMatrixMode (GL_MODELVIEW);
glPushMatrix ();
<span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -r bb43ec3a304e libinterp/corefcn/gl-render.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libinterp/corefcn/gl-render.h Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libinterp/corefcn/gl-render.h Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -222,6 +222,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Indicate we are drawing for selection purpose
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool selecting;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Factor used for translating Octave pixels to actual device pixels
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ double m_devpixfactor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class patch_tesselator;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -r bb43ec3a304e libinterp/corefcn/graphics.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libinterp/corefcn/graphics.cc Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libinterp/corefcn/graphics.cc Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -869,6 +869,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sz.extract_n (0, 2, 1, 2)).extract_n (0, 2, 1, 2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- libinterp/corefcn/graphics.cc.orig 2017-11-08 15:10:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libinterp/corefcn/graphics.cc 2017-11-09 05:40:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6500,7 +6500,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static double
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++device_pixel_ratio (graphics_handle h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ double retval = 1.0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ graphics_object fig = gh_manager::get_object (h).get_ancestor ("figure");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (fig.valid_object ())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ retval = fig.get ("__device_pixel_ratio__").double_value ();
</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;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ convert_cdata_2 (bool is_scaled, bool is_real, double clim_0, double clim_1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const double *cmapv, double x, octave_idx_type lda,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6581,11 +6594,13 @@
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ double dpr = device_pixel_ratio (get___myhandle__ ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gh_manager::auto_lock guard;
</span> txt_renderer.set_font (get ("fontname").string_value (),
get ("fontweight").string_value (),
get ("fontangle").string_value (),
- get ("__fontsize_points__").double_value ());
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gh_manager::screen_scale*get ("__fontsize_points__").double_value ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ get ("__fontsize_points__").double_value () * dpr);
</span> }
// The INTERNAL flag defines whether position or outerposition is used.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8637,7 +8637,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7654,6 +7669,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Matrix ext (1, 2, 0.0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double wmax, hmax;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ double dpr = device_pixel_ratio (get___myhandle__ ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wmax = hmax = 0.0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int n = std::min (ticklabels.numel (), ticks.numel ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (int i = 0; i < n; i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7671,8 +7687,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ext = txt_renderer.get_extent (label, 0.0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ get_ticklabelinterpreter ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wmax = std::max (wmax, ext(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- hmax = std::max (hmax, ext(1));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ wmax = std::max (wmax, ext(0) / dpr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hmax = std::max (hmax, ext(1) / dpr);
</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;'>+@@ -8699,7 +8715,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m(0) += p(0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m(1) += p(1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return convert_text_position (m, *this, "pixels", get_units ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Matrix bbox = convert_text_position (m, *this, "pixels", get_units ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ double dpr = device_pixel_ratio (get___myhandle__ ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (octave_idx_type ii = 0; ii < bbox.numel (); ii++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bbox(ii) = bbox(ii) / dpr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return bbox;
</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;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8737,11 +8770,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ text::properties::update_font (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ double dpr = device_pixel_ratio (get___myhandle__ ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gh_manager::auto_lock guard;
</span> txt_renderer.set_font (get ("fontname").string_value (),
get ("fontweight").string_value (),
get ("fontangle").string_value (),
- get ("__fontsize_points__").double_value ());
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gh_manager::screen_scale*get ("__fontsize_points__").double_value ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ get ("__fontsize_points__").double_value () * dpr);
</span>
txt_renderer.set_color (get_color_rgb ());
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9831,6 +9831,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return parent_go.get_factory_default (type () + name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8781,7 +8806,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // The bbox is relative to the text's position. We'll leave it that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // way, because get_position does not return valid results when the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // text is first constructed. Conversion to proper coordinates is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // performed in get_extent.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // performed in get_extent.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_extent (bbox);
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+float gh_manager::screen_scale = 1.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // We use a random value for the handle to avoid issues with plots and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // scalar values for the first argument.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gh_manager::gh_manager (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libinterp/corefcn/graphics.in.h.orig 2017-11-08 15:10:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libinterp/corefcn/graphics.in.h 2017-11-09 05:41:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6047,6 +6047,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (__autopos_tag___is ("xlabel") || __autopos_tag___is ("ylabel")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8838,9 +8863,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double fontsz = get_fontsize ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double parent_height = box_pix_height;
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ graphics_object go (gh_manager::get_object (get___myhandle__ ()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (fontunits_is ("normalized") && parent_height <= 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- graphics_object go (gh_manager::get_object (get___myhandle__ ()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ graphics_object ax (go.get_ancestor ("axes"));
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static float screen_scale;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void create_instance (void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ parent_height = ax.get_properties ().get_boundingbox (true).elem (3);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -r bb43ec3a304e libinterp/corefcn/graphics.in.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libinterp/corefcn/graphics.in.h Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libinterp/corefcn/graphics.in.h Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3178,6 +3178,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ any_property __plot_stream__ h , Matrix ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ any_property __rotate_mode__ h , Matrix ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ any_property __zoom_mode__ h , Matrix ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ double_property __device_pixel_ratio__ h , 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- static bool instance_ok (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Obsolete properties: doublebuffer, mincolormap, wvisual, wvisualmode,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // xdisplay, xvisual, xvisualmode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -r bb43ec3a304e m4/acinclude.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- m4/acinclude.m4 Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ m4/acinclude.m4 Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -666,6 +666,36 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dnl Check whether the Qt class QScreen has the devicePixelRatio member function.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dnl This member function was introduced in Qt 5.5.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dnl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++AC_DEFUN([OCTAVE_CHECK_FUNC_QSCREEN_DEVICEPIXELRATIO], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_CACHE_CHECK([for QScreen::devicePixelRatio in <QScreen>],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [octave_cv_func_qscreen_devicepixelratio],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [AC_LANG_PUSH(C++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ac_octave_save_CPPFLAGS="$CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ac_octave_save_CXXFLAGS="$CXXFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CXXFLAGS="$CXXPICFLAG $CXXFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include <QApplication>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #include <QScreen>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ]], [[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QScreen *screen = QApplication::primaryScreen ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ qreal ratio = screen->devicePixelRatio ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ]])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ octave_cv_func_qscreen_devicepixelratio=yes,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ octave_cv_func_qscreen_devicepixelratio=no)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CPPFLAGS="$ac_octave_save_CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CXXFLAGS="$ac_octave_save_CXXFLAGS"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_LANG_POP(C++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if test $octave_cv_func_qscreen_devicepixelratio = yes; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_DEFINE(HAVE_QSCREEN_DEVICEPIXELRATIO, 1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ [Define to 1 if you have the `QScreen::devicePixelRatio' member function.])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++dnl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl Check whether the Qt class QTabWidget has the setMovable member function.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl This member function was introduced in Qt 4.5.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2104,6 +2134,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OCTAVE_CHECK_FUNC_QHELPSEARCHQUERYWIDGET_SEARCHINPUT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OCTAVE_CHECK_FUNC_QINSTALLMESSAGEHANDLER
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OCTAVE_CHECK_FUNC_QLINEEDIT_SETPLACEHOLDERTEXT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ OCTAVE_CHECK_FUNC_QSCREEN_DEVICEPIXELRATIO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OCTAVE_CHECK_FUNC_QMOUSEEVENT_LOCALPOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OCTAVE_CHECK_FUNC_QOBJECT_FINDCHILDREN_ACCEPTS_FINDCHILDOPTIONS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OCTAVE_CHECK_FUNC_QTABWIDGET_SETMOVABLE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -r bb43ec3a304e scripts/plot/util/print.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scripts/plot/util/print.m Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scripts/plot/util/print.m Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -382,6 +382,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nfig += 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endfor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ## Don't account for the actual pixel density
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (strcmp (tk, "qt"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ props(end+1).h = opts.figure;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ props(end).name = "__device_pixel_ratio__";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ props(end).value = {get(opts.figure, "__device_pixel_ratio__")};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set (opts.figure, "__device_pixel_ratio__", 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ nfig += 1;
</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;'>+ ## print() requires axes units = "normalized"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hax = findall (opts.figure, "-depth", 1, "type", "axes", ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-not", "units", "normalized");
</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><span style='display:block; white-space:pre;color:#808080;'>index 61612e2..0c12e82 100644
</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;'>+++ b/math/octave/files/patch-figures.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,100 +1,380 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgui/graphics/GLCanvas.cc Mon Nov 07 15:48:46 2016 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgui/graphics/GLCanvas.cc Mon Nov 07 23:45:41 2016 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30,6 +30,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "GLCanvas.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "gl-select.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <qapplication.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -r bb43ec3a304e libgui/graphics/Figure.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgui/graphics/Figure.cc Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgui/graphics/Figure.cc Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -41,6 +41,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QtDebug>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QTimer>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QToolBar>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <QWindow>
</span> +#include <QScreen>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "Canvas.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "Container.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -133,6 +135,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ figure::properties& fp = properties<figure> ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Register for the signal that indicates when a window has moved
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // to a different screen
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ connect (win, SIGNAL (figureWindowShown ()),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ this, SLOT (figureWindowShown ()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Status bar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_statusBar = win->statusBar ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int boffset = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1079,6 +1086,39 @@
</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;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Figure::figureWindowShown ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined (Q_OS_MAC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ figure::properties& fp = properties<figure> ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QMainWindow *win = qWidget<QMainWindow> ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QWindow* window = win->windowHandle ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QScreen* screen = window->screen ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fp.set___device_pixel_ratio__ (screen->devicePixelRatio ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Make sure the figure gets redrawn after the devicePixelRatio is updated
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ graphics_object go = gh_manager::get_object (fp.get___myhandle__ ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fp.get_toolkit ().redraw_figure (go);
</span> +
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ connect (window, SIGNAL (screenChanged (QScreen*)),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ this, SLOT (screenChanged (QScreen*)));
</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;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Figure::screenChanged (QScreen* screen)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined (Q_OS_MAC)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ figure::properties& fp = properties<figure> ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ float old_device_pixel_ratio = fp.get___device_pixel_ratio__ ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fp.set___device_pixel_ratio__ (screen->devicePixelRatio ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Make sure the figure gets redrawn after the devicePixelRatio is updated
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ graphics_object go = gh_manager::get_object (fp.get___myhandle__ ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fp.get_toolkit ().redraw_figure (go);
</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;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Figure::enableMouseTracking (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Enable mouse tracking on every widgets
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -r bb43ec3a304e libgui/graphics/Figure.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgui/graphics/Figure.h Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgui/graphics/Figure.h Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,6 +32,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class QMainWindow;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class QToolBar;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++class QScreen;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> namespace QtHandles
{
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -128,6 +129,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void toggleAxes (void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void toggleGrid (void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void autoAxes (void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void figureWindowShown ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void screenChanged (QScreen*);
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -47,6 +50,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setFocusPolicy (Qt::ClickFocus);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- setFocus();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public slots:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ uint8NDArray slotGetPixels (void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -r bb43ec3a304e libgui/graphics/FigureWindow.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgui/graphics/FigureWindow.cc Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgui/graphics/FigureWindow.cc Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -48,4 +48,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return nullptr;
</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;'>++ void FigureWindow::showEvent (QShowEvent* ev)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ QMainWindow::showEvent (ev);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ emit figureWindowShown();
</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;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -r bb43ec3a304e libgui/graphics/FigureWindow.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgui/graphics/FigureWindow.h Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgui/graphics/FigureWindow.h Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -37,10 +37,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Q_OBJECT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FigureWindow (QWidget *parent = nullptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ explicit FigureWindow (QWidget *parent = nullptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ~FigureWindow (void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QMenu * createPopupMenu (void);
</span> +
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QScreen *screen = QApplication::screens().at(0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gh_manager::screen_scale = screen->devicePixelRatio();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ protected:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void showEvent(QShowEvent *ev);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ signals:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ void figureWindowShown();
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -r bb43ec3a304e libgui/graphics/GLCanvas.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgui/graphics/GLCanvas.cc Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgui/graphics/GLCanvas.cc Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,7 +68,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ octave::opengl_renderer r;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- r.set_viewport (width (), height ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ graphics_object fig = go.get_ancestor ("figure");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ double dpr = fig.get ("__device_pixel_ratio__").double_value ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ r.set_viewport (dpr * width (), dpr * height ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ r.draw (go);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -173,7 +176,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ octave::opengl_selector s;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- s.set_viewport (width (), height ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ graphics_object fig = ax.get_ancestor ("figure");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ double dpr = fig.get ("__device_pixel_ratio__").double_value ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ s.set_viewport (dpr * width (), dpr * height ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return s.select (ax, pt.x (), height () - pt.y (),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ octave::select_ignore_hittest);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -r bb43ec3a304e libinterp/corefcn/gl-render.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libinterp/corefcn/gl-render.cc Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libinterp/corefcn/gl-render.cc Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -593,7 +593,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : toolkit (), xform (), xmin (), xmax (), ymin (), ymax (),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ zmin (), zmax (), xZ1 (), xZ2 (), marker_id (), filled_marker_id (),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ camera_pos (), camera_dir (), interpreter ("none"), txt_renderer (),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- selecting (false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ selecting (false), m_devpixfactor (1.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // This constructor will fail if we don't have OpenGL or if the data
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // types we assumed in our public interface aren't compatible with the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -694,8 +694,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ opengl_renderer::draw_figure (const figure::properties& props)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Current physical-pixel to toolkit-pixel factor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m_devpixfactor = props.get___device_pixel_ratio__ ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Initialize OpenGL context
</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;'>+ init_gl_context (props.is_graphicssmoothing (), props.get_color_rgb ());
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- GLCanvas::~GLCanvas (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libinterp/corefcn/gl-render.cc Mon Nov 07 15:48:46 2016 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libinterp/corefcn/gl-render.cc Mon Nov 07 23:45:41 2016 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1119,7 +1119,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined (HAVE_OPENGL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1123,6 +1126,11 @@
</span> glMultMatrixd (x_mat1.data ());
glMatrixMode (GL_PROJECTION);
glLoadIdentity ();
<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;'>-+ glOrtho (0, roundf((1./gh_manager::screen_scale)*(float)vw[2]), roundf((1./gh_manager::screen_scale)*(float)vw[3]), 0, xZ1, xZ2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Use abstract Octave-pixels for transformation, not physical-pixels
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vw[2] = octave::math::round (static_cast<float> (vw[2]) / m_devpixfactor);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vw[3] = octave::math::round (static_cast<float> (vw[3]) / m_devpixfactor);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glOrtho (0, vw[2], vw[3], 0, xZ1, xZ2);
</span> glMultMatrixd (x_mat2.data ());
glMatrixMode (GL_MODELVIEW);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3528,6 +3536,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glMatrixMode (GL_PROJECTION);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glPushMatrix ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glLoadIdentity ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vp[2] = octave::math::round (static_cast<float> (vp[2]) / m_devpixfactor);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vp[3] = octave::math::round (static_cast<float> (vp[3]) / m_devpixfactor);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glOrtho (0, vp[2], vp[3], 0, xZ1, xZ2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glMatrixMode (GL_MODELVIEW);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glPushMatrix ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3697,10 +3709,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // FIXME: actually add the code to do it!
</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;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (i0 >= i1 || j0 >= j1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3482,7 +3482,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- glPixelZoom (pix_dx, -pix_dy);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ glPixelZoom (m_devpixfactor * pix_dx,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ - m_devpixfactor * pix_dy);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glRasterPos3d (im_xmin + nor_dx*j0, im_ymin + nor_dy*i0, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // by default this is 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3953,7 +3967,7 @@
</span> {
#if defined (HAVE_OPENGL)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- glViewport (0, 0, w, h);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ glViewport (0.0, 0.0, gh_manager::screen_scale*w, gh_manager::screen_scale*h);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- glLineWidth (w);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ glLineWidth (w * m_devpixfactor);
</span>
#else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3587,7 +3587,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- txt_renderer.set_font (props.get ("fontname").string_value (),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- props.get ("fontweight").string_value (),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- props.get ("fontangle").string_value (),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- props.get ("fontsize_points").double_value ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gh_manager::screen_scale*props.get ("fontsize_points").double_value ());
</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;'>-@@ -3775,7 +3775,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4103,6 +4117,10 @@
</span> glMatrixMode (GL_PROJECTION);
glPushMatrix ();
glLoadIdentity ();
<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;'>-+ glOrtho (0, roundf((1./gh_manager::screen_scale)*(float)vw[2]), roundf((1./gh_manager::screen_scale)*(float)vw[3]), 0, xZ1, xZ2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vw[2] = octave::math::round (static_cast<float> (vw[2]) / m_devpixfactor);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vw[3] = octave::math::round (static_cast<float> (vw[3]) / m_devpixfactor);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ glOrtho (0, vw[2], vw[3], 0, xZ1, xZ2);
</span> glMatrixMode (GL_MODELVIEW);
glPushMatrix ();
<span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -r bb43ec3a304e libinterp/corefcn/gl-render.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libinterp/corefcn/gl-render.h Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libinterp/corefcn/gl-render.h Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -222,6 +222,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Indicate we are drawing for selection purpose
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bool selecting;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Factor used for translating Octave pixels to actual device pixels
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ double m_devpixfactor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ private:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ class patch_tesselator;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -r bb43ec3a304e libinterp/corefcn/graphics.cc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libinterp/corefcn/graphics.cc Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libinterp/corefcn/graphics.cc Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -869,6 +869,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sz.extract_n (0, 2, 1, 2)).extract_n (0, 2, 1, 2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- libinterp/corefcn/graphics.cc Mon Nov 07 15:48:46 2016 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libinterp/corefcn/graphics.cc Mon Nov 07 23:45:41 2016 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6271,7 +6271,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static double
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++device_pixel_ratio (graphics_handle h)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ double retval = 1.0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ graphics_object fig = gh_manager::get_object (h).get_ancestor ("figure");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (fig.valid_object ())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ retval = fig.get ("__device_pixel_ratio__").double_value ();
</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;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ convert_cdata_2 (bool is_scaled, bool is_real, double clim_0, double clim_1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const double *cmapv, double x, octave_idx_type lda,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6581,11 +6594,13 @@
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ double dpr = device_pixel_ratio (get___myhandle__ ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gh_manager::auto_lock guard;
</span> txt_renderer.set_font (get ("fontname").string_value (),
get ("fontweight").string_value (),
get ("fontangle").string_value (),
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- get ("fontsize_points").double_value ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gh_manager::screen_scale*get ("fontsize_points").double_value ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- get ("__fontsize_points__").double_value ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ get ("__fontsize_points__").double_value () * dpr);
</span> }
// The INTERNAL flag defines whether position or outerposition is used.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8048,7 +8048,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7654,6 +7669,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Matrix ext (1, 2, 0.0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double wmax, hmax;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ double dpr = device_pixel_ratio (get___myhandle__ ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ wmax = hmax = 0.0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int n = std::min (ticklabels.numel (), ticks.numel ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ for (int i = 0; i < n; i++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7671,8 +7687,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ext = txt_renderer.get_extent (label, 0.0,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ get_ticklabelinterpreter ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- wmax = std::max (wmax, ext(0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- hmax = std::max (hmax, ext(1));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ wmax = std::max (wmax, ext(0) / dpr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ hmax = std::max (hmax, ext(1) / dpr);
</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;'>+@@ -8699,7 +8715,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m(0) += p(0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m(1) += p(1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return convert_text_position (m, *this, "pixels", get_units ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Matrix bbox = convert_text_position (m, *this, "pixels", get_units ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ double dpr = device_pixel_ratio (get___myhandle__ ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ for (octave_idx_type ii = 0; ii < bbox.numel (); ii++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ bbox(ii) = bbox(ii) / dpr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return bbox;
</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;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8737,11 +8770,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ text::properties::update_font (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ double dpr = device_pixel_ratio (get___myhandle__ ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gh_manager::auto_lock guard;
</span> txt_renderer.set_font (get ("fontname").string_value (),
get ("fontweight").string_value (),
get ("fontangle").string_value (),
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- get ("fontsize_points").double_value ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gh_manager::screen_scale*get ("fontsize_points").double_value ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- get ("__fontsize_points__").double_value ());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ get ("__fontsize_points__").double_value () * dpr);
</span>
txt_renderer.set_color (get_color_rgb ());
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9239,6 +9239,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return parent_go.get_factory_default (type () + name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8781,7 +8806,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // The bbox is relative to the text's position. We'll leave it that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // way, because get_position does not return valid results when the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // text is first constructed. Conversion to proper coordinates is
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- // performed in get_extent.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // performed in get_extent.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set_extent (bbox);
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+float gh_manager::screen_scale = 1.0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // We use a random value for the handle to avoid issues with plots and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // scalar values for the first argument.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gh_manager::gh_manager (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libinterp/corefcn/graphics.in.h Mon Nov 07 15:48:46 2016 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libinterp/corefcn/graphics.in.h Mon Nov 07 23:45:41 2016 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6054,6 +6054,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (__autopos_tag___is ("xlabel") || __autopos_tag___is ("ylabel")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8838,9 +8863,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double fontsz = get_fontsize ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ double parent_height = box_pix_height;
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- public:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ graphics_object go (gh_manager::get_object (get___myhandle__ ()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (fontunits_is ("normalized") && parent_height <= 0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- graphics_object go (gh_manager::get_object (get___myhandle__ ()));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ graphics_object ax (go.get_ancestor ("axes"));
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static float screen_scale;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static void create_instance (void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ parent_height = ax.get_properties ().get_boundingbox (true).elem (3);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -r bb43ec3a304e libinterp/corefcn/graphics.in.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libinterp/corefcn/graphics.in.h Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libinterp/corefcn/graphics.in.h Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3178,6 +3178,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ any_property __plot_stream__ h , Matrix ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ any_property __rotate_mode__ h , Matrix ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ any_property __zoom_mode__ h , Matrix ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ double_property __device_pixel_ratio__ h , 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- static bool instance_ok (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Obsolete properties: doublebuffer, mincolormap, wvisual, wvisualmode,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // xdisplay, xvisual, xvisualmode
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -r bb43ec3a304e scripts/plot/util/print.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scripts/plot/util/print.m Thu Apr 26 06:49:06 2018 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scripts/plot/util/print.m Thu Apr 26 17:46:49 2018 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -382,6 +382,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nfig += 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endfor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ## Don't account for the actual pixel density
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (strcmp (tk, "qt"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ props(end+1).h = opts.figure;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ props(end).name = "__device_pixel_ratio__";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ props(end).value = {get(opts.figure, "__device_pixel_ratio__")};
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set (opts.figure, "__device_pixel_ratio__", 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ nfig += 1;
</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;'>+ ## print() requires axes units = "normalized"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hax = findall (opts.figure, "-depth", 1, "type", "axes", ...
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "-not", "units", "normalized");
</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 5e3bcdc..0491490 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,6 +1,6 @@
</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;'>-@@ -15871,7 +15871,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16136,7 +16136,7 @@
</span> @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
libinterp/corefcn/libinterp_corefcn_libcorefcn_la-cdisplay.lo: libinterp/corefcn/cdisplay.c
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span> @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
@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@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16172,7 +16172,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -16458,7 +16458,7 @@
</span> @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
src/src_octave-display-available.o: src/display-available.c
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-host_name-devel.diff b/math/octave/files/patch-host_name-devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7b97b40..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-host_name-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,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- build-aux/subst-default-vals.in.sh.orig 2017-11-09 05:47:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build-aux/subst-default-vals.in.sh 2017-11-09 05:48:34.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;color:#808080;'>diff --git a/math/octave/files/patch-host_name.diff b/math/octave/files/patch-host_name.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8654acd..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-host_name.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;'>---- build-aux/subst-default-vals.in.sh.orig 2016-11-13 08:20:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ build-aux/subst-default-vals.in.sh 2016-11-24 08:20:55.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,7 +22,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- archlibdir="@archlibdir@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bindir="@bindir@"
</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;'>- datadir="@datadir@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- datarootdir="@datarootdir@"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEFAULT_PAGER="@DEFAULT_PAGER@"
</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 7caca69..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,18 +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;'>-@@ -55,8 +55,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- this, SLOT (handle_active_dock_changed (octave_dock_widget*,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- octave_dock_widget*)));
</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;'>-+ QStyle *st = p->style ();
</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;'>- #if defined (Q_OS_WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // windows: add an extra title bar that persists when floating
</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><span style='display:block; white-space:pre;color:#808080;'>index ec68286..95124c6 100644
</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;'>+++ b/math/octave/files/patch-iconsize.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +1,16 @@
</span> --- libgui/src/octave-dock-widget.cc.orig 2016-10-27 11:48:37.000000000 -0700
+++ libgui/src/octave-dock-widget.cc 2016-11-10 04:08:42.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -55,8 +55,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- this, SLOT (handle_active_dock_changed (octave_dock_widget*,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- octave_dock_widget*)));
</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;'>-- _icon_size = 0.75*st->pixelMetric (QStyle::PM_SmallIconSize);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ QStyle *st = p->style ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,7 +42,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : QDockWidget (p)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ QStyle *st = style ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- m_icon_size = 0.75*st->pixelMetric (QStyle::PM_SmallIconSize);
</span> +#if defined (Q_OS_MAC)
<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;'>-+ _icon_size = 2*st->pixelMetric (QStyle::PM_SmallIconSize) / p->devicePixelRatio();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // fix retina scaling for Mac (bug #46723)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m_icon_size = 2*st->pixelMetric (QStyle::PM_SmallIconSize) / p->devicePixelRatio();
</span> +#else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _icon_size = st->pixelMetric (QStyle::PM_SmallIconSize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m_icon_size = st->pixelMetric (QStyle::PM_SmallIconSize);
</span> +#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined (Q_OS_WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // windows: add an extra title bar that persists when floating
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // the custom (extra) title bar of the widget
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_title_widget = new QWidget ();
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-java-devel.diff b/math/octave/files/patch-java-devel.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 19d5150..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-java-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,40 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libinterp/octave-value/ov-java.cc.orig 2017-11-08 15:10:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libinterp/octave-value/ov-java.cc 2017-11-08 16:29:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -641,7 +641,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //! The number of created jvm's.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- jsize nVMs = 0;
</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;'>-+#if 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- octave::dynamic_library lib (jvm_lib_path);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -717,7 +717,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- octave::sys::file_ops::dir_sep_str () +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "java.opts");
</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;'>-+#if 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (create_vm (&jvm, ¤t_env, vm_args.to_args ()) != JNI_OK)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error ("unable to start Java VM in %s", jvm_lib_path.c_str ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2017-11-08 15:10:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2017-11-08 16:31:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2714,7 +2714,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case $host_os in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- darwin*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## Sneak the -framework flag into mkoctfile via LDFLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LDFLAGS="$LDFLAGS -framework JavaVM"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #LDFLAGS="$LDFLAGS -framework JavaVM"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## According to: http://developer.apple.com/unix/crossplatform.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## one must explicitly set the include path.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## Unfortunately, the include path keeps moving around.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2723,7 +2723,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- JAVA_CPPFLAGS="-I${JAVA_HOME}/include -I/System/Library/Frameworks/JavaVM.framework/Home/include -I/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers -I/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- JAVA_LIBS="-framework JavaVM"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ JAVA_LIBS=""
</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 test -n "$JAVA_CPPFLAGS"; then
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-java.diff b/math/octave/files/patch-java.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bed8981..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-java.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,51 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libinterp/octave-value/ov-java.cc.orig 2017-02-22 11:01:55.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libinterp/octave-value/ov-java.cc 2017-10-19 17:42:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -555,7 +555,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- jsize nVMs = 0;
</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;'>-+#if 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- octave::dynamic_library lib (jvm_lib_path);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -628,7 +628,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- octave::sys::file_ops::dir_sep_str () +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "java.opts");
</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;'>-+#if 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (create_vm (&jvm, ¤t_env, vm_args.to_args ()) != JNI_OK)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error ("unable to start Java VM in %s", jvm_lib_path.c_str ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2017-02-22 11:18:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2017-10-19 17:45:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -74347,7 +74347,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case $host_os in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- darwin*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## Sneak the -framework flag into mkoctfile via LDFLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LDFLAGS="$LDFLAGS -framework JavaVM"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #LDFLAGS="$LDFLAGS -framework JavaVM"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## According to: http://developer.apple.com/unix/crossplatform.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## one must explicitly set the include path.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## Unfortunately, the include path keeps moving around.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -74356,7 +74356,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- JAVA_CPPFLAGS="-I${JAVA_HOME}/include -I/System/Library/Frameworks/JavaVM.framework/Home/include -I/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Headers -I/System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- JAVA_LIBS="-framework JavaVM"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ JAVA_LIBS=""
</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 test -n "$JAVA_CPPFLAGS"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.in.orig 2017-02-22 11:18:46.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.in 2017-10-20 19:52:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27350,7 +27350,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(scripts_java_JAVA_CLASSES) : %.class : %.java | scripts/java/$(octave_dirstamp)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(AM_V_GEN)$(MKDIR_P) scripts/java/$(org_octave_dir) && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ( cd $(srcdir)/scripts/java; "$(JAVAC)" -source 1.3 -target 1.3 -Xlint:-options -d $(abs_top_builddir)/scripts/java $(org_octave_dir)/$(<F) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ( cd $(srcdir)/scripts/java; "$(JAVAC)" -Xlint:-options -d $(abs_top_builddir)/scripts/java $(org_octave_dir)/$(<F) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @AMCOND_HAVE_JAVA_TRUE@scripts/java/octave.jar: $(scripts_java_JAVA_CLASSES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @AMCOND_HAVE_JAVA_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \
</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 80c86ed..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;'>-@@ -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.diff b/math/octave/files/patch-link.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 73b95a3..80c86ed 100644
</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;'>+++ b/math/octave/files/patch-link.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +1,23 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/mkoctfile.in.cc.orig 2016-11-13 08:20:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/mkoctfile.in.cc 2016-11-23 20:38:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -201,13 +201,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vars["LIBS"] = get_variable ("LIBS", %OCTAVE_CONF_LIBS%);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/mkoctfile.in.cc.orig 2017-11-08 15:10:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/mkoctfile.in.cc 2017-11-08 16:16:44.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -238,16 +238,16 @@
</span> vars["FLIBS"] = get_variable ("FLIBS", %OCTAVE_CONF_FLIBS%);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> vars["OCTAVE_LINK_DEPS"] = get_variable ("OCTAVE_LINK_DEPS",
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- %OCTAVE_CONF_OCTAVE_LINK_DEPS%);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- %OCTAVE_CONF_MKOCTFILE_OCTAVE_LINK_DEPS%);
</span> + "");
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> vars["OCTAVE_LINK_OPTS"] = get_variable ("OCTAVE_LINK_OPTS",
- %OCTAVE_CONF_OCTAVE_LINK_OPTS%);
+ "");
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> vars["OCT_LINK_DEPS"] = get_variable ("OCT_LINK_DEPS",
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- %OCTAVE_CONF_OCT_LINK_DEPS%);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- %OCTAVE_CONF_MKOCTFILE_OCT_LINK_DEPS%);
</span> + "");
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> vars["OCT_LINK_OPTS"] = get_variable ("OCT_LINK_OPTS",
- %OCTAVE_CONF_OCT_LINK_OPTS%);
+ "");
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> vars["LD_CXX"] = get_variable ("LD_CXX", %OCTAVE_CONF_MKOCTFILE_LD_CXX%);
<span style='display:block; white-space:pre;background:#ffe0e0;'>- vars["LDFLAGS"] = get_variable ("LDFLAGS", %OCTAVE_CONF_LDFLAGS%);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vars["LD_STATIC_FLAG"] = get_variable ("LD_STATIC_FLAG",
</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-makeinfo.diff b/math/octave/files/patch-makeinfo.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..8fa1e1f
</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-makeinfo.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;'>+--- libinterp/corefcn/help.h.orig 2018-04-30 10:03:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libinterp/corefcn/help.h 2018-05-19 09:36:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -47,7 +47,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_doc_cache_file (init_doc_cache_file ()),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_info_file (init_info_file ()),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_info_program (init_info_program ()),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- m_makeinfo_program ("makeinfo"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ m_makeinfo_program ("__MACPORTS_prefix__/bin/makeinfo"),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_suppress_verbose_help_message (false),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ m_texi_macros_file (init_texi_macros_file ())
</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-versions-devel.diff b/math/octave/files/patch-versions-devel.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..bc76091
</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-versions-devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,79 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 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:#e0ffe0;'>++++ 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;'>+@@ -20,7 +20,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : ${SED=@SED@}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-canonical_host_type="@canonical_host_type@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++canonical_host_type="__MACPORTS_canonical_host_type__"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFAULT_PAGER="@DEFAULT_PAGER@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXEEXT="@EXEEXT@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ man1ext="@man1ext@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/main.in.cc.orig 2018-04-30 10:03:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/main.in.cc 2018-05-19 10:32:26.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -211,7 +211,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::string octave_bindir = get_octave_bindir ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::string octave_archlibdir = get_octave_archlibdir ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::string octave_cli
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- = octave_bindir + dir_sep_char + "octave-cli-" OCTAVE_VERSION;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ = octave_bindir + dir_sep_char + "octave-cli-__MACPORTS__PACKAGE_VERSION";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::string octave_gui = octave_archlibdir + dir_sep_char + "octave-gui";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined (HAVE_OCTAVE_QT_GUI)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2018-05-20 10:22:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2018-05-20 10:24:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,7 +33,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OCTAVE_PATCH_VERSION=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl PACKAGE_VERSION is set by the AC_INIT VERSION argument.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-OCTAVE_VERSION="$PACKAGE_VERSION"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++OCTAVE_VERSION="__MACPORTS__PACKAGE_VERSION"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OCTAVE_COPYRIGHT="Copyright (C) 2018 John W. Eaton and others."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -97,37 +97,37 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## This path usually includes the Octave version and configuration name, so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## that configurations for multiple versions of Octave may be installed at once.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OCTAVE_SET_DEFAULT([archlibdir],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '${libexecdir}/octave/${version}/exec/${canonical_host_type}')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ '${libexecdir}/octave/${version}/exec/__MACPORTS_canonical_host_type__')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## Where to put executables to be run by Octave, rather than the user, that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## are specific to this site.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OCTAVE_SET_DEFAULT([localarchlibdir],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '${libexecdir}/octave/site/exec/${canonical_host_type}')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ '${libexecdir}/octave/site/exec/__MACPORTS_canonical_host_type__')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OCTAVE_SET_DEFAULT([localapiarchlibdir],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '${libexecdir}/octave/${api_version}/site/exec/${canonical_host_type}')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ '${libexecdir}/octave/${api_version}/site/exec/__MACPORTS_canonical_host_type__')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OCTAVE_SET_DEFAULT([localverarchlibdir],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '${libexecdir}/octave/${version}/site/exec/${canonical_host_type}')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ '${libexecdir}/octave/${version}/site/exec/__MACPORTS_canonical_host_type__')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## Where to put object files that will by dynamically loaded.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## This path includes the Octave version and configuration name, so that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## configurations for multiple versions of Octave may be installed at once.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OCTAVE_SET_DEFAULT([octfiledir],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '${libdir}/octave/${version}/oct/${canonical_host_type}')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ '${libdir}/octave/${version}/oct/__MACPORTS_canonical_host_type__')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## Directories that Octave should search for object files that will be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## dynamically loaded and that are specific to this site (i.e. customizations),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## before consulting ${octfiledir}. This should be a colon-separated list of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## directories.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OCTAVE_SET_DEFAULT([localoctfiledir],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '${libdir}/octave/site/oct/${canonical_host_type}')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ '${libdir}/octave/site/oct/__MACPORTS_canonical_host_type__')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OCTAVE_SET_DEFAULT([localapioctfiledir],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '${libdir}/octave/site/oct/${api_version}/${canonical_host_type}')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ '${libdir}/octave/site/oct/${api_version}/__MACPORTS_canonical_host_type__')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OCTAVE_SET_DEFAULT([localveroctfiledir],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '${libdir}/octave/${version}/site/oct/${canonical_host_type}')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ '${libdir}/octave/${version}/site/oct/__MACPORTS_canonical_host_type__')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## Where to install Octave's include files.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..7e397b9
</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-versions.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,101 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- 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:#e0ffe0;'>++++ 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;'>+@@ -20,7 +20,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : ${SED=@SED@}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-canonical_host_type="@canonical_host_type@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++canonical_host_type="__MACPORTS_canonical_host_type__"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DEFAULT_PAGER="@DEFAULT_PAGER@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ EXEEXT="@EXEEXT@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ man1ext="@man1ext@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/main.in.cc.orig 2018-04-30 10:03:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/main.in.cc 2018-05-19 10:32:26.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -211,7 +211,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::string octave_bindir = get_octave_bindir ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::string octave_archlibdir = get_octave_archlibdir ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::string octave_cli
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- = octave_bindir + dir_sep_char + "octave-cli-" OCTAVE_VERSION;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ = octave_bindir + dir_sep_char + "octave-cli-__MACPORTS__PACKAGE_VERSION";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::string octave_gui = octave_archlibdir + dir_sep_char + "octave-gui";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined (HAVE_OCTAVE_QT_GUI)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2018-04-30 10:03:56.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2018-05-20 10:18:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5110,7 +5110,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OCTAVE_MINOR_VERSION=4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OCTAVE_PATCH_VERSION=0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-OCTAVE_VERSION="$PACKAGE_VERSION"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++OCTAVE_VERSION="__MACPORTS__PACKAGE_VERSION"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OCTAVE_COPYRIGHT="Copyright (C) 2018 John W. Eaton and others."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8051,7 +8051,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## This path usually includes the Octave version and configuration name, so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## that configurations for multiple versions of Octave may be installed at once.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- : ${archlibdir='${libexecdir}/octave/${version}/exec/${canonical_host_type}'}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : ${archlibdir='${libexecdir}/octave/${version}/exec/__MACPORTS_canonical_host_type__'}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining archlibdir to be $archlibdir" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "defining archlibdir to be $archlibdir" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8060,21 +8060,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## Where to put executables to be run by Octave, rather than the user, that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## are specific to this site.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- : ${localarchlibdir='${libexecdir}/octave/site/exec/${canonical_host_type}'}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : ${localarchlibdir='${libexecdir}/octave/site/exec/__MACPORTS_canonical_host_type__'}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining localarchlibdir to be $localarchlibdir" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "defining localarchlibdir to be $localarchlibdir" >&6; }
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- : ${localapiarchlibdir='${libexecdir}/octave/${api_version}/site/exec/${canonical_host_type}'}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : ${localapiarchlibdir='${libexecdir}/octave/${api_version}/site/exec/__MACPORTS_canonical_host_type__'}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining localapiarchlibdir to be $localapiarchlibdir" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "defining localapiarchlibdir to be $localapiarchlibdir" >&6; }
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- : ${localverarchlibdir='${libexecdir}/octave/${version}/site/exec/${canonical_host_type}'}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : ${localverarchlibdir='${libexecdir}/octave/${version}/site/exec/__MACPORTS_canonical_host_type__'}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining localverarchlibdir to be $localverarchlibdir" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "defining localverarchlibdir to be $localverarchlibdir" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8084,7 +8084,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## This path includes the Octave version and configuration name, so that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## configurations for multiple versions of Octave may be installed at once.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- : ${octfiledir='${libdir}/octave/${version}/oct/${canonical_host_type}'}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : ${octfiledir='${libdir}/octave/${version}/oct/__MACPORTS_canonical_host_type__'}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining octfiledir to be $octfiledir" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "defining octfiledir to be $octfiledir" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8095,21 +8095,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## before consulting ${octfiledir}. This should be a colon-separated list of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ## directories.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- : ${localoctfiledir='${libdir}/octave/site/oct/${canonical_host_type}'}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : ${localoctfiledir='${libdir}/octave/site/oct/__MACPORTS_canonical_host_type__'}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining localoctfiledir to be $localoctfiledir" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "defining localoctfiledir to be $localoctfiledir" >&6; }
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- : ${localapioctfiledir='${libdir}/octave/site/oct/${api_version}/${canonical_host_type}'}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : ${localapioctfiledir='${libdir}/octave/site/oct/${api_version}/__MACPORTS_canonical_host_type__'}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining localapioctfiledir to be $localapioctfiledir" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "defining localapioctfiledir to be $localapioctfiledir" >&6; }
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- : ${localveroctfiledir='${libdir}/octave/${version}/site/oct/${canonical_host_type}'}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : ${localveroctfiledir='${libdir}/octave/${version}/site/oct/__MACPORTS_canonical_host_type__'}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining localveroctfiledir to be $localveroctfiledir" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $as_echo "defining localveroctfiledir to be $localveroctfiledir" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><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 cae1f23..2d64801 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,6 +4,7 @@ PortSystem 1.0
</span> PortGroup pure 1.0
pure.setup pure-octave 0.10
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</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 3269f48..7a13cc2 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,6 +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:#e0ffe0;'>+revision 1
</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 708820e..9fddeba 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,7 +5,7 @@ PortGroup github 1.0
</span> PortGroup python 1.0
github.setup Calysto octave_kernel 0.28.3 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 3
</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 4a6fbbd..2ea2685 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,6 +4,7 @@ PortSystem 1.0
</span>
name gmt4
version 4.5.17
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</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 b416a8b..2f3c9ca 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;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name lal
version 6.18.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>
description LSC Algorithm Library
long_description \
<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 08a58b4..992ca55 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;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name lalburst
version 1.4.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 8
</span>
description LSC Algorithm Library - Burst
long_description \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/laldetchar/Portfile b/science/laldetchar/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3118b4f..9b0b0da 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/laldetchar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/laldetchar/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name laldetchar
version 0.3.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>
description LSC Algorithm Library - DetChar
long_description \
<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 891e5ed..ee411e0 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;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name lalframe
version 1.4.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>
description LSC Algorithm Library - Frame
long_description \
<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 346bf69..03dbe96 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;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name lalinference
version 1.9.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span>
description LSC Algorithm Library - Inference
long_description \
<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 d28d191..082d049 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;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name lalinspiral
version 1.7.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>
description LSC Algorithm Library - Inspiral
long_description \
<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 d7d49e7..4a9001e 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;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name lalmetaio
version 1.3.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>
description LSC Algorithm Library - MetaIO
long_description \
<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 6e1e8cb..f655e57 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;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name lalpulsar
version 1.16.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>
description LSC Algorithm Library - Pulsar
long_description \
<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 554f371..0d83a5a 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;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name lalsimulation
version 1.7.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span>
description LSC Algorithm Library - Simulation
long_description \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lalstochastic/Portfile b/science/lalstochastic/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7097040..7a29b08 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lalstochastic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/lalstochastic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name lalstochastic
version 1.1.20
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 4
</span>
description LSC Algorithm Library - Stochastic
long_description \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/lalxml/Portfile b/science/lalxml/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0e7a69e..3700a50 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/lalxml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/lalxml/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span>
name lalxml
version 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>
description LSC Algorithm Library - XML
long_description \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/nds2-client/Portfile b/science/nds2-client/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4412d35..6aa824e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/nds2-client/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/nds2-client/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup cmake 1.0
</span>
name nds2-client
version 0.15.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories science
platforms darwin
license GPL-2
</pre><pre style='margin:0'>
</pre>