<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch octave
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d0e20bde590faf271762c044a79dd8a0d3cfb95b">https://github.com/macports/macports-ports/commit/d0e20bde590faf271762c044a79dd8a0d3cfb95b</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit d0e20bde590faf271762c044a79dd8a0d3cfb95b
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Sun May 22 14:59:15 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> octave: update to 7.1.0, fix aarm64 build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> fix pkg bug 62436, delete obsolete patchfiles
</span><span style='display:block; white-space:pre;color:#404040;'> remove obsolete qt4 variant
</span>---
math/octave/Portfile | 74 +++++++++++---------------
math/octave/files/bug62436.patch | 27 ++++++++++
math/octave/files/patch-octave6-qt4-fixes.diff | 13 -----
math/octave/files/patch-qt5-cxxflags.diff | 74 --------------------------
math/octave/files/patch-versions.diff | 44 +++++++--------
5 files changed, 79 insertions(+), 153 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 e14a701fb65..21ce6240d2e 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 6.4.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set package_version 6.x.x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set package_version 7.x.x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
categories math science
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,9 +25,9 @@ homepage https://www.gnu.org/software/octave
</span>
master_sites gnu:octave
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 a87deb19263af1546e27206238fb3ba2730f366b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b48f33d4fceaf394cfbea73a8c850000936d83a41739a24f7568b5b0a7b39acd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 32873157
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 441b87175de45384e696e1721e62ed6a398d2e48 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d4a9d81f3f67b4a6e07cb7a80dcb10ad5e9176fcc30762c70a81580a64b8b0b6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 34187598
</span>
# see https://lists.gnu.org/archive/html/octave-maintainers/2016-05/msg00286.html
compiler.cxx_standard \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,17 +65,6 @@ patchfiles-append patch-__opengl_info__.diff
</span> # see https://trac.macports.org/ticket/57288
patchfiles-append patch-run-octave.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# find MacPorts Qt libraries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# fails to apply: patchfiles-append patch-link_location.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix CXXFLAGS when testing for Qt5 properties
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://trac.macports.org/ticket/58226
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-qt5-cxxflags.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# small fixes to allow Octave6 qt4 variant to build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# can be enabled at all times
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-octave6-qt4-fixes.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # see https://savannah.gnu.org/patch/index.php?9806
set java_version 1.8
patchfiles-append patch-java_version.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,6 +74,10 @@ post-patch {
</span> ${worksrcpath}/Makefile.in
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# pkg build fails if no configure file exists
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://savannah.gnu.org/bugs/?62436
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append bug62436.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
if { ${os.arch} eq "i386" } {
if { ${os.major} >= 9 && [sysctl hw.cpu64bit_capable] == 1 } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -418,14 +411,7 @@ variant java description {enable Java interface} {
</span> # https://trac.macports.org/ticket/51480
#default_variants-append +java
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant qt4 conflicts qt5 description {build the GUI using Qt4} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:qscintilla-qt4 port:qt4-mac-sqlite3-plugin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-replace --without-qt --with-qt=4
</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;'>-variant qt5 conflicts qt4 description {build the GUI using Qt5} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant qt5 description {build the GUI using Qt5} {
</span> PortGroup qt5 1.0
qt5.depends_component qttools sqlite-plugin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -442,7 +428,7 @@ variant qt5 conflicts qt4 description {build the GUI using Qt5} {
</span> destroot.env-append PATH=${qt_dir}/bin:$env(PATH)
test.env-append PATH=${qt_dir}/bin:$env(PATH)
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ![variant_isset qt4] && ![variant_isset qt5] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { ![variant_isset qt5] } {
</span> # a somewhat arbitrary cutoff for default values
# Mac OS X 10.7 (Darwin 11) was the last OS supported by Qt 4
# see http://doc.qt.io/qt-4.8/supported-platforms.html
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -450,8 +436,6 @@ if { ![variant_isset qt4] && ![variant_isset qt5] } {
</span> # see http://web.archive.org/web/20170702143426/https://doc.qt.io/qt-5/supported-platforms-and-configurations.html
if {${os.major} >= 14 || ${os.platform} ne "darwin"} {
default_variants-append +qt5
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +qt4
</span> }
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -462,7 +446,7 @@ variant fltk description {enable fltk as a graphics toolkit for plotting} {
</span> # see https://github.com/macports/macports-ports/pull/1865 for a discussion on fltk
#default_variants-append +fltk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset fltk] || [variant_isset qt4] || [variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset fltk] || [variant_isset qt5]} {
</span> # native_graphics (fltk) and gui (Qt) require OpenGL and font and printing capabilities
depends_lib-append \
port:fontconfig \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -472,14 +456,10 @@ if {[variant_isset fltk] || [variant_isset qt4] || [variant_isset qt5]} {
</span> configure.args-replace --without-opengl --with-framework-opengl
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if { ([variant_isset fltk] && [variant_isset qt4]) || ([variant_isset fltk] && [variant_isset qt5]) } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { [variant_isset fltk] && [variant_isset qt5] } {
</span> notes-append "unless octave is run with --no-gui-libs, graphics_toolkit(\"fltk\") will cause a crash"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset qt4]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notes-append "on-disk documentation is not building at present with qt4 variant, but online is available"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant sound description {enable audio support (file I/O and playback)} {
depends_lib-append port:libsndfile
depends_lib-append port:portaudio
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -505,7 +485,7 @@ variant app description "build application bundle to launch ${subport}" {
</span> xinstall -d -m 0755 ${worksrcpath}/${appName}/Contents/MacOS
set script [open "${worksrcpath}/${appName}/Contents/MacOS/Octave" w 0755]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [variant_isset qt4] || [variant_isset qt5] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [variant_isset qt5] } {
</span> puts ${script} "#!/bin/sh"
puts ${script} ""
puts ${script} "${prefix}/bin/octave-${version} --gui \"\$@\""
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -577,14 +557,14 @@ variant app description "build application bundle to launch ${subport}" {
</span> copy ${worksrcpath}/${appName} ${destroot}${applications_dir}
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset qt4] || [variant_isset qt5] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { [variant_isset qt5] } {
</span> default_variants-append +app
}
# the qt gui uses a few Objective-C calls, and for some reason
# libobjc.dylib is not being automatically linked in on older systems
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset qt4] || [variant_isset qt5] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if { [variant_isset qt5] } {
</span> if { ${os.platform} eq "darwin" && ${os.major} < 18 } {
configure.ldflags-append -lobjc
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -608,10 +588,7 @@ variant docs description {build documentation files} {
</span>
configure.args-replace --disable-docs --enable-docs
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# the documentation is not building when using qt4 at present
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset qt4]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants-append +docs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+default_variants-append +docs
</span>
# GraphicsMagick and octave need to be built with the same C++ standard library
# or else undefined symbols:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -638,6 +615,15 @@ if {${magickDefault}} {
</span> default_variants-append +graphicsmagick
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix @rpath for octave-cli
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change @rpath/libgfortran.5.dylib ${prefix}/lib/libgcc/libgfortran.5.dylib ${worksrcpath}/src/.libs/octave-cli"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change @rpath/libquadmath.0.dylib ${prefix}/lib/libgcc/libquadmath.0.dylib ${worksrcpath}/src/.libs/octave-cli"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix @rpath for octave-gui
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change @rpath/libgfortran.5.dylib ${prefix}/lib/libgcc/libgfortran.5.dylib ${worksrcpath}/src/.libs/octave-gui"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "install_name_tool -change @rpath/libquadmath.0.dylib ${prefix}/lib/libgcc/libquadmath.0.dylib ${worksrcpath}/src/.libs/octave-gui"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
# put any startup commands in ${destroot}${prefix}/share/octave/${version}/m/startup/octaverc
# see https://www.gnu.org/software/octave/doc/interpreter/Startup-Files.html
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -651,15 +637,15 @@ post-destroot {
</span> }
# do not force upgrade of every dependency every time the version changes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach lib {liboctave.8.dylib liboctinterp.9.dylib} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach lib {liboctave.9.dylib liboctinterp.10.dylib} {
</span> xinstall -d -m 0755 ${destroot}${prefix}/lib/octave/${package_version}
ln -s ../${version}/${lib} ${destroot}${prefix}/lib/octave/${package_version}/${lib}
system "install_name_tool -id ${prefix}/lib/octave/${package_version}/${lib} ${destroot}${prefix}/lib/octave/${version}/${lib}"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset qt4] || [variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if { [variant_isset qt5] } {
</span> # do not force upgrade of every dependency every time the version changes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach lib {liboctgui.6.dylib} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach lib {liboctgui.8.dylib} {
</span> xinstall -d -m 0755 ${destroot}${prefix}/lib/octave/${package_version}
ln -s ../${version}/${lib} ${destroot}${prefix}/lib/octave/${package_version}/${lib}
system "install_name_tool -id ${prefix}/lib/octave/${package_version}/${lib} ${destroot}${prefix}/lib/octave/${version}/${lib}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/bug62436.patch b/math/octave/files/bug62436.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..52f345f25ac
</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/bug62436.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,27 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# HG changeset patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# User John Donoghue <john.donoghue@ieee.org>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Date 1652358904 14400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Thu May 12 08:35:04 2022 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Branch stable
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Node ID 8c940cfcce257369677c09154da2aab2c56eaa79
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Parent 63710f3bd9811c2d206ac9e7b4f47cf06c47e153
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+* scripts/pkg/private/build.m: check configure and Makefile exist before trying to unlink them (Bug #62436)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -r 63710f3bd981 -r 8c940cfcce25 scripts/pkg/private/build.m
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scripts/pkg/private/build.m Wed May 11 09:44:55 2022 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scripts/pkg/private/build.m Thu May 12 08:35:04 2022 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -77,8 +77,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ arch_abi = getarch ();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure_make (desc, build_root, verbose);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unlink (fullfile (build_root, "src", "configure"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- unlink (fullfile (build_root, "src", "Makefile"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if exist (fullfile (build_root, "src", "configure"), "file")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unlink (fullfile (build_root, "src", "configure"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if exist (fullfile (build_root, "src", "Makefile"), "file")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unlink (fullfile (build_root, "src", "Makefile"));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tar_name = [desc.name "-" desc.version "-" arch_abi ".tar"];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ tar_path = fullfile (builddir, tar_name);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-octave6-qt4-fixes.diff b/math/octave/files/patch-octave6-qt4-fixes.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fb661631310..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-octave6-qt4-fixes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git libgui/src/octave-qobject.cc libgui/src/octave-qobject.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1320283..42cfaca 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgui/src/octave-qobject.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgui/src/octave-qobject.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73,7 +73,7 @@ static void disable_app_nap (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unsigned long long NSActivityLatencyCritical = 0xFF00000000ULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Avoid errors on older versions of OS X
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- process_info_class = static_cast<Class> (objc_getClass ("NSProcessInfo"));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ process_info_class = reinterpret_cast<Class> (objc_getClass ("NSProcessInfo"));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (process_info_class == nil)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-qt5-cxxflags.diff b/math/octave/files/patch-qt5-cxxflags.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0fe520752d9..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,74 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2019-02-23 10:33:37.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2019-03-23 11:55:55.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73410,7 +73410,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_octave_save_CPPFLAGS="$CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_octave_save_CXXFLAGS="$CXXFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CXXFLAGS="$CXXPICFLAG $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CXXFLAGS="$CXXFLAGS $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73473,7 +73473,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_octave_save_CPPFLAGS="$CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_octave_save_CXXFLAGS="$CXXFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CXXFLAGS="$CXXPICFLAG $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CXXFLAGS="$CXXFLAGS $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73537,7 +73537,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_octave_save_CPPFLAGS="$CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_octave_save_CXXFLAGS="$CXXFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CXXFLAGS="$CXXPICFLAG $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CXXFLAGS="$CXXFLAGS $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73601,7 +73601,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_octave_save_CPPFLAGS="$CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_octave_save_CXXFLAGS="$CXXFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CXXFLAGS="$CXXPICFLAG $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CXXFLAGS="$CXXFLAGS $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73665,7 +73665,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_octave_save_CPPFLAGS="$CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_octave_save_CXXFLAGS="$CXXFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CXXFLAGS="$CXXPICFLAG $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CXXFLAGS="$CXXFLAGS $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73730,7 +73730,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_octave_save_CPPFLAGS="$CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_octave_save_CXXFLAGS="$CXXFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CXXFLAGS="$CXXPICFLAG $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CXXFLAGS="$CXXFLAGS $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73793,7 +73793,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_octave_save_CPPFLAGS="$CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_octave_save_CXXFLAGS="$CXXFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CXXFLAGS="$CXXPICFLAG $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CXXFLAGS="$CXXFLAGS $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -73857,7 +73857,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_octave_save_CPPFLAGS="$CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_octave_save_CXXFLAGS="$CXXFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS="$QT_CPPFLAGS $CXXPICFLAG $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CXXFLAGS="$CXXPICFLAG $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CXXFLAGS="$CXXFLAGS $CPPFLAGS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</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-versions.diff b/math/octave/files/patch-versions.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 96ece985208..0647deb2286 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,71 +11,71 @@
</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;'>-@@ -8191,7 +8191,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## This path usually includes the Octave version and configuration name, so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## that configurations for multiple versions of Octave may be installed at once.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8510,7 +8510,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *)
</span>
- : ${archlibdir='${libexecdir}/octave/${version}/exec/${canonical_host_type}'}
+ : ${archlibdir='${libexecdir}/octave/${version}/exec/__MACPORTS_canonical_host_type__'}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining archlibdir to be $archlibdir" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo "defining archlibdir to be $archlibdir" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: defining archlibdir to be $archlibdir" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf "%s\n" "defining archlibdir to be $archlibdir" >&6; }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8200,21 +8200,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8520,21 +8520,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}'}
+ : ${localarchlibdir='${libexecdir}/octave/site/exec/__MACPORTS_canonical_host_type__'}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining localarchlibdir to be $localarchlibdir" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo "defining localarchlibdir to be $localarchlibdir" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: defining localarchlibdir to be $localarchlibdir" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf "%s\n" "defining localarchlibdir to be $localarchlibdir" >&6; }
</span>
- : ${localapiarchlibdir='${libexecdir}/octave/${api_version}/site/exec/${canonical_host_type}'}
+ : ${localapiarchlibdir='${libexecdir}/octave/${api_version}/site/exec/__MACPORTS_canonical_host_type__'}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining localapiarchlibdir to be $localapiarchlibdir" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo "defining localapiarchlibdir to be $localapiarchlibdir" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: defining localapiarchlibdir to be $localapiarchlibdir" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf "%s\n" "defining localapiarchlibdir to be $localapiarchlibdir" >&6; }
</span>
- : ${localverarchlibdir='${libexecdir}/octave/${version}/site/exec/${canonical_host_type}'}
+ : ${localverarchlibdir='${libexecdir}/octave/${version}/site/exec/__MACPORTS_canonical_host_type__'}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining localverarchlibdir to be $localverarchlibdir" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo "defining localverarchlibdir to be $localverarchlibdir" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: defining localverarchlibdir to be $localverarchlibdir" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf "%s\n" "defining localverarchlibdir to be $localverarchlibdir" >&6; }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8224,7 +8224,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8544,7 +8544,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}'}
+ : ${octfiledir='${libdir}/octave/${version}/oct/__MACPORTS_canonical_host_type__'}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining octfiledir to be $octfiledir" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo "defining octfiledir to be $octfiledir" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: defining octfiledir to be $octfiledir" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf "%s\n" "defining octfiledir to be $octfiledir" >&6; }
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8235,21 +8235,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8555,21 +8555,21 @@
</span> ## before consulting ${octfiledir}. This should be a colon-separated list of
## directories.
- : ${localoctfiledir='${libdir}/octave/site/oct/${canonical_host_type}'}
+ : ${localoctfiledir='${libdir}/octave/site/oct/__MACPORTS_canonical_host_type__'}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining localoctfiledir to be $localoctfiledir" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo "defining localoctfiledir to be $localoctfiledir" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: defining localoctfiledir to be $localoctfiledir" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf "%s\n" "defining localoctfiledir to be $localoctfiledir" >&6; }
</span>
- : ${localapioctfiledir='${libdir}/octave/site/oct/${api_version}/${canonical_host_type}'}
+ : ${localapioctfiledir='${libdir}/octave/site/oct/${api_version}/__MACPORTS_canonical_host_type__'}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining localapioctfiledir to be $localapioctfiledir" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo "defining localapioctfiledir to be $localapioctfiledir" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: defining localapioctfiledir to be $localapioctfiledir" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf "%s\n" "defining localapioctfiledir to be $localapioctfiledir" >&6; }
</span>
- : ${localveroctfiledir='${libdir}/octave/${version}/site/oct/${canonical_host_type}'}
+ : ${localveroctfiledir='${libdir}/octave/${version}/site/oct/__MACPORTS_canonical_host_type__'}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: defining localveroctfiledir to be $localveroctfiledir" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo "defining localveroctfiledir to be $localveroctfiledir" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: defining localveroctfiledir to be $localveroctfiledir" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf "%s\n" "defining localveroctfiledir to be $localveroctfiledir" >&6; }
</span>
</pre><pre style='margin:0'>
</pre>