<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/4d920f94300d07876852b0ec635643621b4fe1f7">https://github.com/macports/macports-ports/commit/4d920f94300d07876852b0ec635643621b4fe1f7</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4d920f94300d07876852b0ec635643621b4fe1f7
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Nov 4 21:29:06 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> octave-legacy: mark as obsolete
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Octave 4 has been out for more than two years and builds
</span><span style='display:block; white-space:pre;color:#404040;'> on a wide variety of system configurations.
</span>---
math/octave-legacy/Portfile | 368 +--------------------
math/octave-legacy/files/Info.plist | 37 ---
math/octave-legacy/files/Octave | 3 -
math/octave-legacy/files/Octave.icns | Bin 108031 -> 0 bytes
math/octave-legacy/files/patch-clang-libcxx.diff | 105 ------
math/octave-legacy/files/patch-gl2ps_renderer.diff | 89 -----
.../files/patch-yosemite-libtool.diff | 13 -
7 files changed, 5 insertions(+), 610 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-legacy/Portfile b/math/octave-legacy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e3bc16c..73037a2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-legacy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-legacy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,370 +1,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- 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
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span>
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup active_variants 1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compiler_blacklist_versions 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compilers 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name octave-legacy
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+replaced_by octave
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup obsolete 1.0
</span>
<span style='display:block; white-space:pre;background:#e0ffe0;'>+name octave-legacy
</span> version 3.8.2
<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
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span> license GPL-3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description a Matlab-like environment for numerical analysis
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description Octave provides a convenient command line interface \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for solving linear and nonlinear problems numerically, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using a language that is mostly compatible with Matlab. \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- It is easily extensible and customizable via \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- user-defined functions or using dynamically loaded \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- modules written in e.g. C++, C or Fortran.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.gnu.org/software/octave/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname octave-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites gnu:octave
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 60201b29d368d0c935a34288c227d202ae286c6c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 83bbd701aab04e7e57d0d5b8373dd54719bebb64ce0a850e69bf3d7454f33bae
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:bison \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:flex \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gperf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:bin/perl:perl5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pkgconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:arpack \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:curl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fftw-3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fftw-3-single \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gawk \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:glpk \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gnuplot \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:GraphicsMagick \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:grep \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gsed \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:hdf5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:less \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ncurses \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pcre \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qhull \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:qrupdate \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:readline \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:SuiteSparse \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:zlib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:texinfo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run-append port:epstool \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:ghostscript \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:fig2dev \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:pstoedit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Octave's build system does not produce universal binaries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-universal_variant no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Don't link with "-flat_namespace -undefined suppress"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# on Mac OS X 10.10 Yosemite and later.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-yosemite-libtool.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fix certain versions of libc++ use of 'pow';
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See also: < http://llvm.org/bugs/show_bug.cgi?id=21083 >
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# < https://trac.macports.org/ticket/45210 >
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Adding in this patch will not hurt when using a working
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# version of libcxx (< 1101), nor with using libstdcxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# (where _LIBCPP_VERSION is not defined).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# REMINDER: check without this patch when new libcxx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# is available, to determine a stopping point for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# when this issue was fixed; add that version to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# the patch to "mx-inlines.cc".
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-clang-libcxx.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix gl2ps renderer interface for compiling using older clang.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See also: < https://trac.macports.org/ticket/44704 >
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-gl2ps_renderer.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# common configure arguments
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-dependency-tracking \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-umfpack="-lumfpack -lSuiteSparse" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-docs \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-strict-warning-flags \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-silent-rules
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# when using "hdf5 +mpich", have to manually include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# "/opt/local/include/mpich-mp". See also:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# < https://trac.macports.org/ticket/47618 >
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # is hdf5 installed and active?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![catch {set installed [lindex [registry_active hdf5] 0]}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # yes: is this one installed with +mpich*?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set _variants [lindex ${installed} 3]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string first {mpich} ${_variants}] != -1} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # yes; set cpath for both configure and build stages
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.cpath-append ${prefix}/include/mpich-mp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # and, set the configure flag, just in case
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "--with-hdf5-includedir=${prefix}/include/mpich-mp"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# octave uses a number of other ports to create sources from template:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# perl, gawk, gsed, flex, bison, texinfo. Make sure these are the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# MacPorts' versions. Python is not used if perl is available, so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# clear it out. grep is checked for in 'configure', but not used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# except inside that script; include it here for completion.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.perl ${prefix}/bin/perl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.python ' '
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.awk ${prefix}/bin/gawk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env-append GREP="${prefix}/bin/grep" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SED="${prefix}/bin/gsed" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEXI2DVI="${prefix}/bin/texi2dvi" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TEXI2PDF="${prefix}/bin/texi2pdf"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.cppflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.run yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.target check
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Block compilers: Some older versions of CLANG do not honor the CPATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# environment variables, which is required for compiling this port
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# when using MacPorts. The versions seem to be: MacPorts CLANG 2.9 or
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# earlier, and Apple CLANG 318.0.58 or older.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See also < http://llvm.org/bugs/show_bug.cgi?id=8971 >
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# < https://trac.macports.org/ticket/40250 >.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-compiler.blacklist-append { clang <= 318.0.61 }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} >= 12} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # In 10.8+, the LANG environment variable needs to be set to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # "C" otherwise /usr/bin/sed fails with an error. Ideally,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # octave's build system would honor the environment variable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ${SED} throughout; reality is that it does not, so this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # addition is required because /usr/bin/sed will be used.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.args-append LANG="C"
</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;'>-# atlas does not work with g95, so always conflict with it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant atlas description {use BLAS from MacPorts' atlas port} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts g95 accelerate {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:atlas
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # NOTE: libtatlas does not work as of 3.10.1_5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-blas="-lcblas -lf77blas -latlas" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-lapack="-llapack"
</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;'>-variant accelerate description \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {use BLAS from Apple's Accelerate.framework [might be buggy]} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts atlas {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:vecLibFort
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-blas=-lvecLibFort \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-lapack="-Wl,-framework -Wl,Accelerate"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset accelerate] && ![variant_isset atlas]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # when neither +accelerate nor +atlas is selected, default to the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # correct one for the selected Fortran compiler.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![variant_isset g95]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +atlas
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +accelerate
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# make sure that either +accelerate or +atlas is selected
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset accelerate] && ![variant_isset atlas]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "\n\nYou must select either the +accelerate or +atlas variant.\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "Invalid variant selection"
</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;'>-variant x11 conflicts glgui description {Enable use of X11} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-x --x-includes=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --without-x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +glgui
</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;'>-variant glgui conflicts x11 description {Enable OpenGL GUI (via FLTK) as the default graphical front-end} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/libfltk.dylib:fltk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:fontconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:freetype \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gl2ps
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset glgui]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-opengl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --without-opengl
</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;'>-variant gui requires qtgui description {Legacy variant} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant qtgui description {Enable experimental Qt GUI Application} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup qt4 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:qscintilla
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset qtgui]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-gui
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-gui
</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;'>-variant java description {Enable Java interface} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset java]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-java
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-java
</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;'>-# jit build fails for 3.8.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# variant jit description {Enable experimental JIT compiler} {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# if {[variant_isset jit]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# depends_lib-append port:clang-3.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.args-append --enable-jit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.env-append LLVM_CONFIG=${prefix}/bin/llvm-config-mp-3.3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# SHLIB_CXXLD=clang++-mp-3.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.cc clang-mp-3.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.cxx clang++-mp-3.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# configure.args-append --disable-jit
</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;'>-variant metis description {Use SuiteSparse + Metis for graph partitioning} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notes-append "\nWARNING: ${name} variant +metis uses the metis port, whose license is incompatible with Octave's. You can use this combination locally, but you cannot distribute them as a single package (e.g., tarball, m/pkg, archive)."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:metis
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset metis]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-cholmod="-lcholmod -lmetis"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # make sure SuiteSparse is installed with +metis
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants SuiteSparse metis
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-cholmod="-lcholmod"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # make sure SuiteSparse is installed without +metis
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- require_active_variants SuiteSparse {} metis
</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;'>-# check for +accelerate here as well as in dependent ports;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Apple's VecLib has bugs that cause Octave to crash sometimes,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# while Atlas does not have these issues. Print a warning if this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# variant is in use, but do not force the use of +atlas (for now).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![catch {set result [active_variants arpack accelerate {}]}]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$result} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notes-append "\nWARNING: Dependency 'arpack' is installed with the +accelerate variant, using Apple's Vector Libraries which have some known bugs that can cause Octave to crash if using certain functions in arpack. The +atlas variant does not have these issues with Octave, but does take many hours to compile even on modern hardware.\n"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {[variant_isset accelerate]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notes-append "\nWARNING: The +accelerate variant has been selected, using Apple's Vector Libraries which have some known bugs that can cause Octave to crash. The +atlas variant does not have these issues with Octave, but does take many hours to compile even on modern hardware.\n"
</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;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # select the default graphics toolkit depending on the +glgui variant
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset glgui]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo 'graphics_toolkit(\"fltk\");' >> ${destroot}${prefix}/share/octave/site/m/startup/octaverc"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "echo 'graphics_toolkit(\"gnuplot\");' >> ${destroot}${prefix}/share/octave/site/m/startup/octaverc"
</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;'>- # install the libc++ fix, no matter if used or not, since it is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # required for projects including these headers.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${worksrcpath}/liboctave/operators/libcxx-fix.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/include/octave-${version}/octave/libcxx-fix.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # when doing +qtgui variant, create the Mac OS X .app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset qtgui]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set appdir ${destroot}${applications_dir}/Octave.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${appdir}/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${appdir}/Contents/Resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${filespath}/Info.plist ${appdir}/Contents/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 ${filespath}/Octave.icns ${appdir}/Contents/Resources/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${filespath}/Octave ${appdir}/Contents/MacOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${appdir}/Contents "s,@@VERSION@@,${version},g" Info.plist
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -W ${appdir}/Contents/MacOS "s,@@PREFIX@@,${prefix},g" Octave
</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;'>-livecheck.regex {octave-(3+(?:\.\d+)*)}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-legacy/files/Info.plist b/math/octave-legacy/files/Info.plist
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1faaa62..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-legacy/files/Info.plist
</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;'>-<?xml version="1.0" encoding="UTF-8"?>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<plist version="1.0">
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-<dict>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>NSUIElement</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>1</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleDevelopmentRegion</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>English</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleExecutable</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>Octave</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleIconFile</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>Octave.icns</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleDocumentTypes</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <array>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <dict>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleTypeExtensions</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <array>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>m</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </array>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleTypeRole</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>Editor</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleTypeOSTypes</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>Mfile</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </dict>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- </array>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleIdentifier</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>org.octave.Octave</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleInfoDictionaryVersion</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>6.0</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleSignature</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>Octave</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleVersion</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>@@VERSION@@</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <key>CFBundleShortVersion</key>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <string>@@VERSION@@</string>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-</dict>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-</plist>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-legacy/files/Octave b/math/octave-legacy/files/Octave
</span>deleted file mode 100755
<span style='display:block; white-space:pre;color:#808080;'>index 6faf65a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-legacy/files/Octave
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,3 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@PREFIX@@/bin/octave --force-gui
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-legacy/files/Octave.icns b/math/octave-legacy/files/Octave.icns
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 28259ca5..0000000
</span>Binary files a/math/octave-legacy/files/Octave.icns and /dev/null differ
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-legacy/files/patch-clang-libcxx.diff b/math/octave-legacy/files/patch-clang-libcxx.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 361f2c6..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-legacy/files/patch-clang-libcxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,105 +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;'>-diff -r 91a6f06c5052 -r 1433cd4f7b7b liboctave/operators/mx-inlines.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- 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;'>-@@ -306,7 +306,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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;'>-+#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;'>-+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;'>- DEFMXMAPPER2X (mx_inline_pow, pow)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Arbitrary function appliers. The function is a template parameter to enable
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-legacy/files/patch-gl2ps_renderer.diff b/math/octave-legacy/files/patch-gl2ps_renderer.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8bef963..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-legacy/files/patch-gl2ps_renderer.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,89 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libinterp/corefcn/gl2ps-renderer.cc.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libinterp/corefcn/gl2ps-renderer.cc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,6 +34,9 @@ along with Octave; see the file COPYING. If not, see
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "gl2ps-renderer.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "gl2ps.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+glps_renderer::glps_renderer (FILE *_fp, const std::string& _term)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ : opengl_renderer () , fp (_fp), term (_term), fontsize (), fontname () { }
</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;'>- glps_renderer::draw (const graphics_object& go, const std::string print_cmd)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -253,4 +256,31 @@ glps_renderer::draw_text (const text::properties& props)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- alignment_to_mode (halign, valign), props.get_rotation ());
</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;'>-+glps_renderer::set_linestyle (const std::string& s, bool use_stipple)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ opengl_renderer::set_linestyle (s, use_stipple);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (s == "-" && ! use_stipple)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gl2psDisable (GL2PS_LINE_STIPPLE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gl2psEnable (GL2PS_LINE_STIPPLE);
</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;'>-+glps_renderer::set_polygon_offset (bool on, double offset)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ opengl_renderer::set_polygon_offset (on, offset);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (on)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gl2psEnable (GL2PS_POLYGON_OFFSET_FILL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gl2psDisable (GL2PS_POLYGON_OFFSET_FILL);
</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;'>-+glps_renderer::set_linewidth (float w)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gl2psLineWidth (w);
</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;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libinterp/corefcn/gl2ps-renderer.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libinterp/corefcn/gl2ps-renderer.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,8 +33,7 @@ OCTINTERP_API
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- glps_renderer : public opengl_renderer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- public:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- glps_renderer (FILE *_fp, const std::string& _term)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- : opengl_renderer () , fp (_fp), term (_term), fontsize (), fontname () { }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ glps_renderer (FILE *_fp, const std::string& _term);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ~glps_renderer (void) { }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -52,29 +51,9 @@ protected:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- void draw_pixels (GLsizei w, GLsizei h, GLenum format,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLenum type, const GLvoid *data);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- void set_linestyle (const std::string& s, bool use_stipple = false)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- opengl_renderer::set_linestyle (s, use_stipple);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (s == "-" && ! use_stipple)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gl2psDisable (GL2PS_LINE_STIPPLE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gl2psEnable (GL2PS_LINE_STIPPLE);
</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 set_polygon_offset (bool on, double offset = 0.0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- opengl_renderer::set_polygon_offset (on, offset);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (on)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gl2psEnable (GL2PS_POLYGON_OFFSET_FILL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gl2psDisable (GL2PS_POLYGON_OFFSET_FILL);
</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 set_linewidth (float w)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- gl2psLineWidth (w);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void set_linestyle (const std::string& s, bool use_stipple = false);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void set_polygon_offset (bool on, double offset = 0.0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ void set_linewidth (float w);
</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;'>- int alignment_to_mode (int ha, int va) const;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-legacy/files/patch-yosemite-libtool.diff b/math/octave-legacy/files/patch-yosemite-libtool.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2ebcaeb..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-legacy/files/patch-yosemite-libtool.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;'>-Index: configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21080,7 +21080,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 10.0,*86*-darwin8*|10.0,*-darwin[91]*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 10.[012]*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 10.[012][,.]*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 10.*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
</span></pre><pre style='margin:0'>
</pre>