Ticket #33567: update.diff

File update.diff, 3.1 KB (added by pkgw (Peter Williams), 13 years ago)

Portfile patch.

  • ports/science/miriad/Portfile 

    commit 69c48d66e7cd5e6337fc65a3742ad19b15e8ac11
Author: Peter Williams <peter@newton.cx>
Date:   Fri Mar 9 14:32:05 2012 -0800

    Portfile: update for 4.2.3.20120309, add gcc46 variant

diff --git a/ports/science/miriad/Portfile b/ports/science/miriad/Portfile
index fa10bf0..c1121d2 100644
    a b PortGroup xcodeversion 1.0 
    1111name             miriad
    1212conflicts        pgplot
    1313set relver       4.2.3
    14 set tardate      20111010
     14set tardate      20120309
    1515version          ${relver}.${tardate}
    1616platforms        darwin
    1717categories       science
    … … license unknown 
    3232# Files
    3333
    3434master_sites http://astro.berkeley.edu/~pkwill/miriad-macport/
    35 checksums    rmd160  9de12a01dfded42da817bf02d8ef8243ad81214e \
    36              sha256  25d7c253ea54a74b2beaeff477ede4d9c8c862a32a73050635403e534f2112f6
     35checksums    rmd160  4a077d0533c59b587dbacb646d5fb8c48bbe7225 \
     36             sha256  c327b53b49700a24e5294e9299ebd75c54598bec1a4ef56309898b7182403c07
    3737
    3838# Telescope/buffer size selection.
    3939
    … … if {[variant_isset carma]} { 
    5858# to build with better-optimizing proprietary compilers, which we allow
    5959# via the gcc_select mechanism.
    6060
    61 variant gcc44 conflicts gcc45 gcc_select description {Build with gcc 4.4} {
     61variant gcc44 conflicts gcc45 gcc46 gcc_select description {Build with gcc/gfortran 4.4} {
    6262    configure.compiler  macports-gcc-4.4
    6363    depends_lib-append  port:gcc44
    6464}
    6565
    66 variant gcc45 conflicts gcc44 gcc_select description {Build with gcc 4.5} {
     66variant gcc45 conflicts gcc44 gcc46 gcc_select description {Build with gcc/gfortran 4.5} {
    6767    configure.compiler  macports-gcc-4.5
    6868    depends_lib-append  port:gcc45
    6969}
    7070
    71 variant gcc_select conflicts gcc45 gcc44 description {Build with compilers chosen via gcc_select -- experts only} {
     71variant gcc46 conflicts gcc44 gcc45 gcc_select description {Build with gcc/gfortran 4.6} {
     72    configure.compiler  macports-gcc-4.6
     73    depends_lib-append  port:gcc46
     74}
     75
     76variant gcc_select conflicts gcc44 gcc45 gcc46 description {Build with compilers chosen via gcc_select -- experts only} {
    7277    # Setting the compiler to vanilla "gcc" prevents MacPorts from
    7378    # trying to get fancy with the flags, which probably won't work
    7479    # with the user's special compiler.
    … … variant gcc_select conflicts gcc45 gcc44 description {Build with compilers chose 
    8287    depends_lib-append  port:gcc_select
    8388}
    8489
    85 if {![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc_select]} {
     90if {![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc_select]} {
    8691    default_variants +gcc45
    8792}
    8893
    … … variant debug description {Build with debugging support -- tasks will be very sl 
    144149    configure.optflags -g -O0
    145150    configure.args-append --enable-warnings
    146151}
    147 
    148 variant docs description {Build documentation PDFs -- depends on many ports} {
    149     depends_build-append port:texlive port:latex2html port:transfig port:gnuplot
    150     configure.args-delete --disable-docs
    151     configure.args-append --enable-docs
    152 }