| 1 | --- Portfile_original 2011-08-12 13:30:21.000000000 +0200 |
|---|
| 2 | +++ Portfile 2011-10-10 17:47:36.000000000 +0200 |
|---|
| 3 | @@ -4,8 +4,7 @@ |
|---|
| 4 | PortSystem 1.0 |
|---|
| 5 | |
|---|
| 6 | name octave-devel |
|---|
| 7 | -version 3.4.2 |
|---|
| 8 | -revision 1 |
|---|
| 9 | +version 3.4.3 |
|---|
| 10 | conflicts octave |
|---|
| 11 | categories math science |
|---|
| 12 | maintainers michaelld openmaintainer |
|---|
| 13 | @@ -24,9 +23,9 @@ |
|---|
| 14 | distname octave-${version} |
|---|
| 15 | use_bzip2 yes |
|---|
| 16 | |
|---|
| 17 | -checksums md5 31c744ab4555a2bf04d5e644b93f9b51 \ |
|---|
| 18 | - sha1 12cac29ef7d1ab8374980e1e2fd14637b2f15ba5 \ |
|---|
| 19 | - rmd160 ad2222ad0b3e0f1dd6db1ff8ca93c0666b95e3a0 |
|---|
| 20 | +checksums md5 185b08f4e4a7b646d76e4d33b77fa87e \ |
|---|
| 21 | + sha1 fe622c28a38f8730c59e46211bc7b18e7f51a679 \ |
|---|
| 22 | + rmd160 d6f43fca9097b40f163c140db853d8ac1383ab39 |
|---|
| 23 | |
|---|
| 24 | depends_build port:bison \ |
|---|
| 25 | port:flex \ |
|---|
| 26 | @@ -66,7 +65,8 @@ |
|---|
| 27 | configure.args --disable-dependency-tracking \ |
|---|
| 28 | --without-x \ |
|---|
| 29 | --disable-docs \ |
|---|
| 30 | - --with-cholmod="-lcholmod -lmetis" |
|---|
| 31 | + --with-cholmod="-lcholmod -lmetis" \ |
|---|
| 32 | + --without-framework-carbon |
|---|
| 33 | |
|---|
| 34 | # octave uses a number of other ports to create sources from template: |
|---|
| 35 | # perl, gawk, gsed, flex, bison, texinfo. Make sure these are the |
|---|
| 36 | @@ -87,13 +87,15 @@ |
|---|
| 37 | test.run yes |
|---|
| 38 | test.target check |
|---|
| 39 | |
|---|
| 40 | -variant gcc43 description {build with the macports gcc43 toolchain} conflicts gcc45 gcc44 g95 {} |
|---|
| 41 | +variant gcc43 description {build with the macports gcc43 toolchain} conflicts gcc46 gcc45 gcc44 g95 {} |
|---|
| 42 | |
|---|
| 43 | -variant gcc44 description {build with the macports gcc44 toolchain} conflicts gcc45 gcc43 g95 {} |
|---|
| 44 | +variant gcc44 description {build with the macports gcc44 toolchain} conflicts gcc46 gcc45 gcc43 g95 {} |
|---|
| 45 | |
|---|
| 46 | -variant gcc45 description {build with the macports gcc45 toolchain} conflicts gcc44 gcc43 g95 {} |
|---|
| 47 | +variant gcc45 description {build with the macports gcc45 toolchain} conflicts gcc46 gcc44 gcc43 g95 {} |
|---|
| 48 | |
|---|
| 49 | -variant g95 description {build with g95} conflicts gcc43 gcc44 gcc45 { |
|---|
| 50 | +variant gcc46 description {build with the macports gcc45 toolchain} conflicts gcc45 gcc44 gcc43 g95 {} |
|---|
| 51 | + |
|---|
| 52 | +variant g95 description {build with g95} conflicts gcc43 gcc44 gcc45 gcc46 { |
|---|
| 53 | depends_build-append port:g95 |
|---|
| 54 | configure.f77 "${prefix}/bin/g95" |
|---|
| 55 | } |
|---|
| 56 | @@ -103,13 +105,13 @@ |
|---|
| 57 | |
|---|
| 58 | # check for setting the default variant (gcc44) |
|---|
| 59 | if { ![variant_isset gcc43] && ![variant_isset gcc44] && \ |
|---|
| 60 | - ![variant_isset gcc45] && ![variant_isset g95] } { |
|---|
| 61 | + ![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset g95] } { |
|---|
| 62 | default_variants +gcc44 |
|---|
| 63 | } |
|---|
| 64 | |
|---|
| 65 | # check if the user disabled just the default variant: -gcc44 |
|---|
| 66 | if { ![variant_isset gcc43] && ![variant_isset gcc44] && \ |
|---|
| 67 | - ![variant_isset gcc45] && ![variant_isset g95] } { |
|---|
| 68 | + ![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset g95] } { |
|---|
| 69 | error "You cannot use the variant -gcc44 alone." |
|---|
| 70 | } |
|---|
| 71 | |
|---|
| 72 | @@ -120,6 +122,8 @@ |
|---|
| 73 | set gcc_version "4.4" |
|---|
| 74 | } elseif {[variant_isset gcc45]} { |
|---|
| 75 | set gcc_version "4.5" |
|---|
| 76 | +} elseif {[variant_isset gcc46]} { |
|---|
| 77 | + set gcc_version "4.6" |
|---|
| 78 | } |
|---|
| 79 | |
|---|
| 80 | if {${gcc_version} != ""} { |
|---|
