Ticket #48622: Portfile-octave.diff

File Portfile-octave.diff, 5.1 KB (added by Schamschula (Marius Schamschula), 9 years ago)
  • Portfile

    old new  
    11# -*- 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
    2 # $Id: Portfile 142558 2015-11-15 17:24:00Z mmoll@macports.org $
     2# $Id: Portfile 139469 2015-08-18 01:10:17Z jmr@macports.org $
    33
    44PortSystem          1.0
    55PortGroup           active_variants 1.1
     
    88
    99name                octave
    1010
    11 version             3.8.2
    12 revision            14
     11version             4.0.0
    1312#conflicts           octave-devel
    1413categories          math science
    1514maintainers         michaelld openmaintainer
     
    2827dist_subdir         octave
    2928distname            octave-${version}
    3029master_sites        gnu:octave
    31 use_bzip2           yes
     30use_xz              yes
    3231
    33 checksums           rmd160  60201b29d368d0c935a34288c227d202ae286c6c \
    34                     sha256  83bbd701aab04e7e57d0d5b8373dd54719bebb64ce0a850e69bf3d7454f33bae
     32checksums           rmd160  57a4c6a90fbe49ad5268b257a4847788061daa49 \
     33                    sha256  cf6be2fac6796fda68971e249c96d026ce4a1b0ed074ce49a5791365a958c474
    3534
    3635compilers.choose    fc f77 f90
    3736compilers.setup     require_fortran
    3837
    3938depends_build-append \
     39                    port:autoconf \
     40                    port:automake \
    4041                    port:bison \
    4142                    port:flex \
    4243                    port:gperf \
     44                    port:icoutils \
     45                    port:librsvg \
     46                    port:libtool \
    4347                    path:bin/perl:perl5 \
    4448                    port:pkgconfig
    4549
     
    4953                    port:fftw-3 \
    5054                    port:fftw-3-single \
    5155                    port:gawk \
     56                    port:ghostscript \
     57                    port:gl2ps \
    5258                    port:glpk \
    5359                    port:gnuplot \
    5460                    port:GraphicsMagick \
     
    6672                    port:texinfo
    6773
    6874depends_run-append  port:epstool \
    69                     port:ghostscript \
    7075                    port:transfig \
    7176                    port:pstoedit
    7277
     
    7479
    7580universal_variant   no
    7681
    77 # Don't link with "-flat_namespace -undefined suppress"
    78 # on Mac OS X 10.10 Yosemite and later.
    79 
    80 patchfiles-append   patch-yosemite-libtool.diff
    81 
    82 # Fix certain versions of libc++ use of 'pow';
    83 # See also: < http://llvm.org/bugs/show_bug.cgi?id=21083 >
    84 #           < https://trac.macports.org/ticket/45210 >
    85 # Adding in this patch will not hurt when using a working
    86 # version of libcxx (< 1101), nor with using libstdcxx
    87 # (where _LIBCPP_VERSION is not defined).
    88 #
    89 # REMINDER: check without this patch when new libcxx
    90 # is available, to determine a stopping point for
    91 # when this issue was fixed; add that version to
    92 # the patch to "mx-inlines.cc".
    93 
    94 patchfiles-append   patch-clang-libcxx.diff
    95 
    96 # fix gl2ps renderer interface for compiling using older clang.
    97 # See also: < https://trac.macports.org/ticket/44704 >
    98 
    99 patchfiles-append   patch-gl2ps_renderer.diff
     82# Patch file from Homebrew
     83patchfiles-append   patch-rollup.diff \
     84                    osmesa.patch.diff \
     85                    patch-libgui-src-octave-dock-widget.cc.diff
    10086
    10187# common configure arguments
    10288
    10389configure.args \
     90    --disable-bounds-check \
    10491    --disable-dependency-tracking \
    10592    --with-umfpack="-lumfpack -lSuiteSparse" \
    106     --enable-docs \
    107     --enable-strict-warning-flags \
    108     --disable-silent-rules
     93    --disable-jit \
     94    --enable-link-all-dependencies \
     95    --enable-docs
    10996
    11097# when using "hdf5 +mpich", have to manually include
    11198# "/opt/local/include/mpich-mp". See also:
     
    153140# See also < http://llvm.org/bugs/show_bug.cgi?id=8971 >
    154141#          < https://trac.macports.org/ticket/40250 >.
    155142
    156 compiler.blacklist-append { clang <= 318.0.61 }
     143compiler.blacklist-append { clang <= 318.0.61 } macports-clang-2.9
    157144
    158145platform darwin {
    159146    if {${os.major} >= 12} {
     
    233220
    234221variant glgui conflicts x11 description {Enable OpenGL GUI (via FLTK) as the default graphical front-end} {
    235222
    236     # for now on OSX 10.11, just use fltk-devel since fltk does not
    237     # build; remove this condition with the next fltk release (noted
    238     # in that Portfile too).
    239 
    240     if {${os.major} == 15} {
    241         depends_lib-append port:fltk-devel
    242     } else {
    243         depends_lib-append path:lib/libfltk.dylib:fltk
    244     }
    245 
    246     depends_lib-append port:fontconfig \
     223    depends_lib-append path:lib/libfltk.dylib:fltk \
     224                       port:fontconfig \
    247225                       port:freetype \
    248226                       port:gl2ps
    249227
     
    251229
    252230if {[variant_isset glgui]} {
    253231
    254     configure.args-append --with-opengl
     232    configure.args-append --with-opengl \
     233                          --with-framework-opengl
    255234
    256235} else {
    257236
     
    261240
    262241variant gui requires qtgui description {Legacy variant} {}
    263242
    264 variant qtgui description {Enable experimental Qt GUI Application} {
     243variant qtgui description {Enable Qt GUI Application} {
    265244
    266     PortGroup qt4 1.0
     245    PortGroup          qt4 1.0
    267246    depends_lib-append port:qscintilla
    268247
    269248}