<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/4f7c309264f1e7f94a967c282e6cb2475f566e01">https://github.com/macports/macports-ports/commit/4f7c309264f1e7f94a967c282e6cb2475f566e01</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4f7c309264f1e7f94a967c282e6cb2475f566e01
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Thu Feb 6 19:57:34 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> octave: update version 5.1.0->5.2.0
</span>---
math/octave/Portfile | 10 +++++-----
math/octave/files/patch-arch_arg.diff | 2 +-
math/octave/files/patch-crash_on_exit.diff | 5 +++--
math/octave/files/patch-java_version.diff | 2 +-
math/octave/files/patch-link_location.diff | 2 +-
math/octave/files/patch-qt5-cxxflags.diff | 16 ++++++++--------
math/octave/files/patch-versions.diff | 24 ++++++++++++------------
7 files changed, 31 insertions(+), 30 deletions(-)
<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 fef0282..13c43b8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,9 +7,9 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup linear_algebra 1.0
name octave
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.2.0
</span> set package_version 5.x.x
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</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;'>@@ -24,9 +24,9 @@ homepage https://www.gnu.org/software/octave
</span>
master_sites gnu:octave
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b8b4469d70f1b67be688e12ff551e6b614c70213 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e36b1124cac27c7caa51cc57de408c31676d5f0096349b4d50b57bfe1bcd7495 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 32034788
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 2877818d2bb06d99bfbb24f93c0f743d73047969 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 33360285
</span>
# see https://lists.gnu.org/archive/html/octave-maintainers/2016-05/msg00286.html
compiler.cxx_standard \
<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 499d570..8778155 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-arch_arg.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/files/patch-arch_arg.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- src/mkoctfile.in.cc.orig 2016-11-13 08:16:10.000000000 -0700
+++ src/mkoctfile.in.cc 2016-11-26 14:03:33.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -810,6 +810,19 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -811,6 +811,19 @@
</span> {
pass_on_options += (' ' + arg);
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-crash_on_exit.diff b/math/octave/files/patch-crash_on_exit.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e56783d..1d72231 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-crash_on_exit.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/files/patch-crash_on_exit.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- libgui/src/main-window.cc.orig 2018-04-30 10:03:56.000000000 -0700
+++ libgui/src/main-window.cc 2018-05-18 05:50:20.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2867,9 +2867,6 @@ namespace octave
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2874,9 +2874,6 @@
</span> connect (m_interpreter, SIGNAL (octave_finished_signal (int)),
this, SLOT (handle_octave_finished (int)));
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@
</span> connect (m_main_thread, SIGNAL (finished (void)),
m_main_thread, SLOT (deleteLater (void)));
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2935,6 +2932,9 @@ namespace octave
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2942,6 +2939,9 @@
</span>
void octave_qt_app::handle_octave_finished (int exit_status)
{
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,3 +19,4 @@
</span> + m_main_thread->quit();
qApp->exit (exit_status);
}
<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-java_version.diff b/math/octave/files/patch-java_version.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index e0d93dc..2d21cd4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-java_version.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/files/patch-java_version.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- Makefile.in.orig 2019-08-28 15:33:26.000000000 -0700
+++ Makefile.in 2019-08-28 15:47:15.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -30416,7 +30416,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27127,7 +27127,7 @@
</span> $(scripts_java_JAVA_CLASSES) : %.class : %.java | scripts/java/$(octave_dirstamp)
$(OCT_V_JAVAC)$(MKDIR_P) scripts/java/$(org_octave_dir) && \
( cd $(srcdir)/scripts/java; \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-link_location.diff b/math/octave/files/patch-link_location.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index dcbbe21..9980634 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-link_location.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/files/patch-link_location.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- Makefile.in.orig 2019-02-23 10:33:37.000000000 -0700
+++ Makefile.in 2019-03-03 21:41:51.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8705,6 +8705,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -7599,6 +7599,7 @@
</span> @AMCOND_BUILD_QT_GRAPHICS_TRUE@@AMCOND_BUILD_QT_GUI_TRUE@DLD_LIBOCTGUI_LIBADD = $(OCT_GUI_LINK_DEPS)
@AMCOND_BUILD_QT_GRAPHICS_TRUE@@AMCOND_BUILD_QT_GUI_TRUE@libgui_graphics___init_qt___la_LIBADD = \
@AMCOND_BUILD_QT_GRAPHICS_TRUE@@AMCOND_BUILD_QT_GUI_TRUE@ $(DLD_LIBOCTGUI_LIBADD) \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-qt5-cxxflags.diff b/math/octave/files/patch-qt5-cxxflags.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f15c9e7..0fe5207 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-qt5-cxxflags.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/files/patch-qt5-cxxflags.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- configure.orig 2019-02-23 10:33:37.000000000 -0700
+++ configure 2019-03-23 11:55:55.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73481,7 +73481,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73410,7 +73410,7 @@
</span> ac_octave_save_CPPFLAGS="$CPPFLAGS"
ac_octave_save_CXXFLAGS="$CXXFLAGS"
CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73544,7 +73544,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73473,7 +73473,7 @@
</span> ac_octave_save_CPPFLAGS="$CPPFLAGS"
ac_octave_save_CXXFLAGS="$CXXFLAGS"
CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@
</span> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73608,7 +73608,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73537,7 +73537,7 @@
</span> ac_octave_save_CPPFLAGS="$CPPFLAGS"
ac_octave_save_CXXFLAGS="$CXXFLAGS"
CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,7 +27,7 @@
</span> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73672,7 +73672,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73601,7 +73601,7 @@
</span> ac_octave_save_CPPFLAGS="$CPPFLAGS"
ac_octave_save_CXXFLAGS="$CXXFLAGS"
CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,7 +36,7 @@
</span> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73736,7 +73736,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73665,7 +73665,7 @@
</span> ac_octave_save_CPPFLAGS="$CPPFLAGS"
ac_octave_save_CXXFLAGS="$CXXFLAGS"
CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +45,7 @@
</span> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73801,7 +73801,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73730,7 +73730,7 @@
</span> ac_octave_save_CPPFLAGS="$CPPFLAGS"
ac_octave_save_CXXFLAGS="$CXXFLAGS"
CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +54,7 @@
</span> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73864,7 +73864,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73793,7 +73793,7 @@
</span> ac_octave_save_CPPFLAGS="$CPPFLAGS"
ac_octave_save_CXXFLAGS="$CXXFLAGS"
CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,7 +63,7 @@
</span> cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73928,7 +73928,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -73857,7 +73857,7 @@
</span> ac_octave_save_CPPFLAGS="$CPPFLAGS"
ac_octave_save_CXXFLAGS="$CXXFLAGS"
CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-versions.diff b/math/octave/files/patch-versions.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 821b13c..3cebd7c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-versions.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/files/patch-versions.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,21 +11,21 @@
</span> man1ext="@man1ext@"
--- configure.orig 2019-03-03 07:08:47.000000000 -0700
+++ configure 2019-03-03 07:12:49.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8201,7 +8201,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8191,7 +8191,7 @@
</span> ## This path usually includes the Octave version and configuration name, so
## that configurations for multiple versions of Octave may be installed at once.
- : ${archlibdir='${libexecdir}/octave/${version}/exec/${canonical_host_type}'}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : ${archlibdir='${libexecdir}/octave/${version}/exec/__MACPORTS_canonical_host_type__'}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : ${archlibdir='${libexecdir}/octave/${version}/exec/x86_64-apple-darwin19.x.x'}
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining archlibdir to be $archlibdir" >&5
$as_echo "defining archlibdir to be $archlibdir" >&6; }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8210,21 +8210,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8200,21 +8200,21 @@
</span> ## Where to put executables to be run by Octave, rather than the user, that
## are specific to this site.
- : ${localarchlibdir='${libexecdir}/octave/site/exec/${canonical_host_type}'}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : ${localarchlibdir='${libexecdir}/octave/site/exec/__MACPORTS_canonical_host_type__'}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : ${localarchlibdir='${libexecdir}/octave/site/exec/x86_64-apple-darwin19.x.x'}
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining localarchlibdir to be $localarchlibdir" >&5
$as_echo "defining localarchlibdir to be $localarchlibdir" >&6; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,7 @@
</span>
- : ${localapiarchlibdir='${libexecdir}/octave/${api_version}/site/exec/${canonical_host_type}'}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : ${localapiarchlibdir='${libexecdir}/octave/${api_version}/site/exec/__MACPORTS_canonical_host_type__'}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : ${localapiarchlibdir='${libexecdir}/octave/${api_version}/site/exec/x86_64-apple-darwin19.x.x'}
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining localapiarchlibdir to be $localapiarchlibdir" >&5
$as_echo "defining localapiarchlibdir to be $localapiarchlibdir" >&6; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,25 +41,25 @@
</span>
- : ${localverarchlibdir='${libexecdir}/octave/${version}/site/exec/${canonical_host_type}'}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : ${localverarchlibdir='${libexecdir}/octave/${version}/site/exec/__MACPORTS_canonical_host_type__'}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : ${localverarchlibdir='${libexecdir}/octave/${version}/site/exec/x86_64-apple-darwin19.x.x'}
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining localverarchlibdir to be $localverarchlibdir" >&5
$as_echo "defining localverarchlibdir to be $localverarchlibdir" >&6; }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8234,7 +8234,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8224,7 +8224,7 @@
</span> ## This path includes the Octave version and configuration name, so that
## configurations for multiple versions of Octave may be installed at once.
- : ${octfiledir='${libdir}/octave/${version}/oct/${canonical_host_type}'}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : ${octfiledir='${libdir}/octave/${version}/oct/__MACPORTS_canonical_host_type__'}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : ${octfiledir='${libdir}/octave/${version}/oct/x86_64-apple-darwin19.x.x'}
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining octfiledir to be $octfiledir" >&5
$as_echo "defining octfiledir to be $octfiledir" >&6; }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8245,21 +8245,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8235,21 +8235,21 @@
</span> ## before consulting ${octfiledir}. This should be a colon-separated list of
## directories.
- : ${localoctfiledir='${libdir}/octave/site/oct/${canonical_host_type}'}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : ${localoctfiledir='${libdir}/octave/site/oct/__MACPORTS_canonical_host_type__'}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : ${localoctfiledir='${libdir}/octave/site/oct/x86_64-apple-darwin19.x.x'}
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining localoctfiledir to be $localoctfiledir" >&5
$as_echo "defining localoctfiledir to be $localoctfiledir" >&6; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +67,7 @@
</span>
- : ${localapioctfiledir='${libdir}/octave/site/oct/${api_version}/${canonical_host_type}'}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : ${localapioctfiledir='${libdir}/octave/site/oct/${api_version}/__MACPORTS_canonical_host_type__'}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : ${localapioctfiledir='${libdir}/octave/site/oct/${api_version}/x86_64-apple-darwin19.x.x'}
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining localapioctfiledir to be $localapioctfiledir" >&5
$as_echo "defining localapioctfiledir to be $localapioctfiledir" >&6; }
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,7 +75,7 @@
</span>
- : ${localveroctfiledir='${libdir}/octave/${version}/site/oct/${canonical_host_type}'}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : ${localveroctfiledir='${libdir}/octave/${version}/site/oct/__MACPORTS_canonical_host_type__'}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ : ${localveroctfiledir='${libdir}/octave/${version}/site/oct/x86_64-apple-darwin19.x.x'}
</span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining localveroctfiledir to be $localveroctfiledir" >&5
$as_echo "defining localveroctfiledir to be $localveroctfiledir" >&6; }
</pre><pre style='margin:0'>
</pre>