Changeset 146714


Ignore:
Timestamp:
Mar 15, 2016, 5:35:59 PM (4 years ago)
Author:
mcalhoun@…
Message:

octave-devel: update to latest version; update necessitates moving patches around

Location:
trunk/dports/math/octave-devel
Files:
1 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/dports/math/octave-devel/Portfile

    r146640 r146714  
    3030if { ${name} eq ${subport} } {
    3131    version         ${version_tip}
    32     revision        4
    33     hg.tag          12e98e5ebd13
    34 
    35     # allow osmesa support to at least compile
     32    revision        5
     33    hg.tag          2868abbc88eb
     34
     35    # see http://savannah.gnu.org/bugs/?41027
    3636    patchfiles-append   \
    37         osmesa_mac_fix.patch
    38 
    39     # force "${prefix}/bin/octave-${version} --no-gui-libs" to call octave-cli-${version} instead of octave-cli
    40     patchfiles-append   \
    41         patch-append_version_cli.diff
     37        octave-bug_41027-half.patch
    4238
    4339    checksums-append               \
    4440        ${hg.tag}${extract.suffix} \
    45         rmd160  173e4f1376ebbbbce553162c7068f72b48ba67af \
    46         sha256  8dcf8a3caaffee78492119b57b79981fd26e9c8330fa2ebc0cd219e504ffed81
     41        rmd160  0a5fd063e2587d451a1c8bde668e1c9b542d5fde \
     42        sha256  58b725674c43ea866c87235da7e7c9a75e9629b3215908c0c8c20aa60ee818b4
    4743
    4844    livecheck.regex   "<a href=\"/hgweb/octave/rev/(\[a-zA-Z0-9.\]+)\">\ntip"
     
    6258        patch-e870a68742a6.diff
    6359
     60    # see http://savannah.gnu.org/bugs/?41027
     61    patchfiles-append   \
     62        octave-bug_41027.patch
     63
    6464    checksums-append               \
    6565        ${hg.tag}${extract.suffix} \
     
    9494    patchfiles-append   \
    9595        patch-append_version_cli.diff
     96
     97    # see http://savannah.gnu.org/bugs/?41027
     98    patchfiles-append   \
     99        octave-bug_41027.patch
    96100
    97101    checksums-append               \
     
    129133    move ${worksrcpath}/../gnulib-hg-${hg_gnu_tag} ${worksrcpath}/gnulib-hg
    130134}
    131 
    132 # see http://savannah.gnu.org/bugs/?41027
    133 patchfiles-append   \
    134     octave-bug_41027.patch
    135135
    136136# see http://git.savannah.gnu.org/cgit/gnulib.git/commit/lib/stdio.in.h?id=d6176702c3ffb6c56e6620397470e1b3bd540b10
     
    590590}
    591591
    592 # remove architecture flags from header file
    593 if { [variant_exists universal] && [variant_isset universal] } {
    594     merger-post-destroot {
    595         foreach arch ${universal_archs_to_use} {
    596             set hfile ${destroot}-${arch}${prefix}/include/octave-${version}/octave/oct-conf.h
    597             reinplace "s:-arch ${arch}::g"   ${hfile}
    598             reinplace {s:-m32::g}            ${hfile}
    599             reinplace {s:-m64::g}            ${hfile}
    600         }
    601     }
    602 } else {
    603     post-destroot {
    604         set hfile ${destroot}${prefix}/include/octave-${version}/octave/oct-conf.h
    605         reinplace "s:-arch ${build_arch}::g" ${hfile}
    606         reinplace {s:-m32::g}                ${hfile}
    607         reinplace {s:-m64::g}                ${hfile}
     592if { ${subport} eq "octave-devel-rc" || ${subport} eq "octave-devel-release" } {
     593    # remove architecture flags from header file
     594    if { [variant_exists universal] && [variant_isset universal] } {
     595        merger-post-destroot {
     596            foreach arch ${universal_archs_to_use} {
     597                set hfile ${destroot}-${arch}${prefix}/include/octave-${version}/octave/oct-conf.h
     598                reinplace "s:-arch ${arch}::g"   ${hfile}
     599                reinplace {s:-m32::g}                ${hfile}
     600                reinplace {s:-m64::g}                ${hfile}
     601            }
     602        }
     603    } else {
     604        post-destroot {
     605            set hfile ${destroot}${prefix}/include/octave-${version}/octave/oct-conf.h
     606            reinplace "s:-arch ${build_arch}::g" ${hfile}
     607            reinplace {s:-m32::g}                ${hfile}
     608            reinplace {s:-m64::g}                ${hfile}
     609        }
    608610    }
    609611}
  • trunk/dports/math/octave-devel/files/octave-bug_41027-half.patch

    r146572 r146714  
    22--- a/libinterp/corefcn/comment-list.h  Sat Apr 19 09:28:20 2014 -0700
    33+++ libinterp/corefcn/comment-list.h    Sun May 18 18:09:05 2014 +0200
    4 @@ -25,7 +25,7 @@
     4@@ -27,7 +27,7 @@
    55 
    66 #include <string>
     
    1212 
    1313diff -r 900b524d9072 libinterp/corefcn/oct.h
    14 --- a/libinterp/corefcn/oct.h   Sat Apr 19 09:28:20 2014 -0700
    15 +++ libinterp/corefcn/oct.h     Sun May 18 18:09:05 2014 +0200
    16 @@ -28,7 +28,7 @@
    17  // config.h needs to be first because it includes #defines that can */
    18  // affect other header files.
    19  
    20 -#include <config.h>
    21 +#include "config.h"
    22  
    23  #include "Matrix.h"
    24  
Note: See TracChangeset for help on using the changeset viewer.