Changeset 90820


Ignore:
Timestamp:
Mar 15, 2012, 3:13:40 AM (8 years ago)
Author:
jmr@…
Message:

add gcc45 variants to multiple ports; where gcc44 was default, change to gcc45 (#33544)

Location:
trunk/dports
Files:
45 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/audio/ardour2/Portfile

    r77840 r90820  
    7878}
    7979
    80 variant gcc43 conflicts gcc44 description {build with gcc 4.3} {
     80variant gcc43 conflicts gcc44 gcc45 description {build with gcc 4.3} {
    8181    depends_build-append    port:gcc43
    8282    configure.compiler      macports-gcc-4.3
     
    8585}
    8686
    87 variant gcc44 conflicts gcc43 description {build with gcc 4.4} {
     87variant gcc44 conflicts gcc43 gcc45 description {build with gcc 4.4} {
    8888    depends_build-append    port:gcc44
    8989    configure.compiler      macports-gcc-4.4
     
    9292}
    9393
    94 if {![variant_isset gcc43]} {
    95     default_variants +gcc44
     94variant gcc45 conflicts gcc43 gcc44 description {build with gcc 4.5} {
     95    depends_build-append    port:gcc45
     96    configure.compiler      macports-gcc-4.5
     97    build.env               CC=${configure.cc} CXX=${configure.cxx} CPP=${configure.cpp}
     98    destroot.env            CC=${configure.cc} CXX=${configure.cxx} CPP=${configure.cpp}
     99}
     100
     101if {![variant_isset gcc43] && ![variant_isset gcc44]} {
     102    default_variants +gcc45
    96103}
    97104
  • trunk/dports/devel/swig/Portfile

    r84644 r90820  
    5050    clisp       {port:clisp             clisp}
    5151    csharp      {port:mono              csharp}
    52     gcj         {port:gcc44             "gcj=${prefix}/bin/gcj-mp-4.4 --with-gcjh=${prefix}/bin/gcjh-mp-4.4"}
     52    gcj         {port:gcc45             "gcj=${prefix}/bin/gcj-mp-4.5 --with-gcjh=${prefix}/bin/gcjh-mp-4.5"}
    5353    go          {port:go                go}
    5454    guile       {port:guile             guile}
     
    8989
    9090subport swig-gcj {
    91     variant gcc43 conflicts gcc44 description {build using GCJ 4.3} {
    92         depends_lib-delete port:gcc44
     91    variant gcc43 conflicts gcc44 gcc45 description {build using GCJ 4.3} {
     92        depends_lib-delete port:gcc45
    9393        depends_lib-append port:gcc43
    94         configure.args-delete --with-gcj=${prefix}/bin/gcj-mp-4.4 --with-gcjh=${prefix}/bin/gcjh-mp-4.4
     94        configure.args-delete --with-gcj=${prefix}/bin/gcj-mp-4.5 --with-gcjh=${prefix}/bin/gcjh-mp-4.5
    9595        configure.args-append --with-gcj=${prefix}/bin/gcj-mp-4.3 --with-gcjh=${prefix}/bin/gcjh-mp-4.3
    9696    }
    97    
    98     # just a placeholder variant until gcc45 gets added
    99     variant gcc44 conflicts gcc43 description {build using GCJ 4.4} {}
    100    
    101     if {![variant_isset gcc43]} {
    102         default_variants +gcc44
     97
     98    variant gcc44 conflicts gcc43 gcc45 description {build using GCJ 4.4} {
     99        depends_lib-delete port:gcc45
     100        depends_lib-append port:gcc44
     101        configure.args-delete --with-gcj=${prefix}/bin/gcj-mp-4.5 --with-gcjh=${prefix}/bin/gcjh-mp-4.5
     102        configure.args-append --with-gcj=${prefix}/bin/gcj-mp-4.4 --with-gcjh=${prefix}/bin/gcjh-mp-4.4
     103    }
     104
     105    # just a placeholder variant until gcc46 gets added
     106    variant gcc45 conflicts gcc43 gcc44 description {build using GCJ 4.5} {}
     107
     108    if {![variant_isset gcc43] && ![variant_isset gcc44]} {
     109        default_variants +gcc45
    103110    }
    104111}
  • trunk/dports/games/snoopy/Portfile

    r68906 r90820  
    3131}
    3232
    33 variant gcc44 conflicts gcc43 description {build with gcc 4.4} {
     33variant gcc45 conflicts gcc43 gcc44 description {build with gcc 4.5} {
     34    depends_lib-append  port:gcc45
     35    configure.compiler  macports-gcc-4.5
     36}
     37
     38variant gcc44 conflicts gcc43 gcc45 description {build with gcc 4.4} {
    3439    depends_lib-append  port:gcc44
    3540    configure.compiler  macports-gcc-4.4
    3641}
    3742
    38 variant gcc43 conflicts gcc44 description {build with gcc 4.3} {
     43variant gcc43 conflicts gcc44 gcc45 description {build with gcc 4.3} {
    3944    depends_lib-append  port:gcc43
    4045    configure.compiler  macports-gcc-4.3
    4146}
    4247
    43 if {![variant_isset gcc43]} {
    44     default_variants +gcc44
     48if {![variant_isset gcc43] && ![variant_isset gcc44]} {
     49    default_variants +gcc45
    4550}
    4651
  • trunk/dports/graphics/pgplot/Portfile

    r90817 r90820  
    249249}
    250250
    251 if {![variant_isset g95] && ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc45] && ![variant_isset gcc46]} {
    252     default_variants    +gcc44
     251if {![variant_isset g95] && ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc46]} {
     252    default_variants +gcc45
    253253}
    254254
  • trunk/dports/lang/adaptor/Portfile

    r68907 r90820  
    6161destroot.destdir PREFIX=${destroot}${prefix}/lib/${name}
    6262
    63 variant gcc43 conflicts g95 gcc44 description {build with gfortran 4.3} {
     63variant gcc43 conflicts g95 gcc44 gcc45 description {build with gfortran 4.3} {
    6464    depends_lib-append port:gcc43
    6565    configure.f77 ${prefix}/bin/gfortran-mp-4.3
     
    6767}
    6868
    69 variant gcc44 conflicts g95 gcc43 description {build with gfortran 4.4} {
     69variant gcc44 conflicts g95 gcc43 gcc45 description {build with gfortran 4.4} {
    7070    depends_lib-append port:gcc44
    7171    configure.f77 ${prefix}/bin/gfortran-mp-4.4
     
    7373}
    7474
    75 variant g95 conflicts gcc43 gcc44 description {build with g95} {
     75variant gcc45 conflicts g95 gcc43 gcc44 description {build with gfortran 4.5} {
     76    depends_lib-append port:gcc45
     77    configure.f77 ${prefix}/bin/gfortran-mp-4.5
     78    configure.f90 ${prefix}/bin/gfortran-mp-4.5
     79}
     80
     81variant g95 conflicts gcc43 gcc44 gcc45 description {build with g95} {
    7682    depends_lib-append port:g95
    7783    configure.f77 ${prefix}/bin/g95
     
    8288}
    8389
    84 if {![variant_isset gcc43] && ![variant_isset g95]} {
    85     default_variants +gcc44
     90if {![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset g95]} {
     91    default_variants +gcc45
    8692}
  • trunk/dports/lang/ftidy/Portfile

    r83992 r90820  
    2828    sha1 200e4531f172355cde49c455e2f7e9df8f1f8404
    2929
    30 if { ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc45] } {
    31     default_variants    +gcc44
     30if { ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] } {
     31    default_variants    +gcc45
    3232}
    3333
  • trunk/dports/math/R/Portfile

    r90091 r90820  
    100100default_variants +recommended
    101101
    102 if {![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45]} {
    103     default_variants-append +gcc44
     102if {![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc46]} {
     103    default_variants-append +gcc45
    104104}
    105105
  • trunk/dports/math/arpack/Portfile

    r90710 r90820  
    8686}
    8787
    88 if { ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset g95] } {
     88if { ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc46] && ![variant_isset g95] } {
    8989        default_variants      +gcc45
    9090}
  • trunk/dports/math/atlas/Portfile

    r90189 r90820  
    7575                set gccversion  4.6
    7676        } else {
    77         default_variants        +gcc44
    78         set gccversion          4.4
     77        default_variants        +gcc45
     78        set gccversion          4.5
    7979        }
    8080} else {
     
    9191                set gccversion  4.5
    9292        } elseif { [variant_isset gcc46] } {
    93                 return -code error "GCC/GFortran 4.6 is not yet available"
     93            pre-fetch {
     94                    return -code error "GCC/GFortran 4.6 is not yet available on Lion"
     95                }
    9496        } elseif { [variant_isset dragonegg45] } {
    9597                configure.compiler      clang
     
    9799                patchfiles-append       patch-clang.diff
    98100        } else {
    99                 return -code error "GCC/GFortran 4.6 is not yet available"
     101                default_variants        +gcc45
     102                set gccversion          4.5
    100103        }
    101104}
     
    110113        configure.compiler      macports-gcc-${gccversion}
    111114        depends_lib-append      port:gcc${gccnumber}
    112 }
    113 
    114 if {[info exists depends_skip_archcheck] && [info exists gccversion]} {
    115         depends_skip_archcheck gcc${gccnumber}
    116115}
    117116
  • trunk/dports/math/dotwrp/Portfile

    r89986 r90820  
    2121use_configure   no
    2222
    23 if { ![variant_isset g95] && ![variant_isset gcc45] && ![variant_isset gcc46]} {
    24     default_variants +gcc44
     23if { ![variant_isset g95] && ![variant_isset gcc44] && ![variant_isset gcc46]} {
     24    default_variants +gcc45
    2525}
    2626
    2727if {[variant_isset g95]} {
    2828  set fc ${prefix}/bin/g95
     29} elseif {[variant_isset gcc46]} {
     30  set fc ${prefix}/bin/gfortran-mp-4.6
    2931} elseif {[variant_isset gcc45]} {
    3032  set fc ${prefix}/bin/gfortran-mp-4.5
  • trunk/dports/math/eigen3/Portfile

    r90506 r90820  
    3535# Variants
    3636variant gcc44 description {Use MacPorts' gcc44 compilers} conflicts gcc45 gcc46 {
     37  depends_build-append  port:gcc44
    3738  configure.compiler  macports-gcc-4.4
    3839}
    3940
    4041variant gcc45 description {Use MacPorts' gcc45 compilers} conflicts gcc44 gcc46 {
     42  depends_build-append  port:gcc45
    4143  configure.compiler  macports-gcc-4.5
    4244}
    4345
    4446variant gcc46 description {Use MacPorts' gcc46 compilers} conflicts gcc44 gcc45 {
     47  depends_build-append  port:gcc46
    4548  configure.compiler  macports-gcc-4.6
    4649}
  • trunk/dports/math/fftw-3-long/Portfile

    r90427 r90820  
    105105variant gcc45 description {create Fortran wrappers using gcc45} conflicts gcc42 gcc43 gcc44 gcc46 g95 {
    106106    depends_lib-append    port:gcc45
    107     depends_skip_archcheck gcc45
    108107    configure.f77         gfortran-mp-4.5
    109108    configure.args-delete --disable-fortran
     
    119118variant gcc46 description {create Fortran wrappers using gcc46} conflicts gcc42 gcc43 gcc44 gcc45 g95 {
    120119    depends_lib-append    port:gcc46
    121     depends_skip_archcheck gcc46
    122120    configure.f77         gfortran-mp-4.6
    123121    configure.args-delete --disable-fortran
  • trunk/dports/math/fftw-3-single/Portfile

    r90427 r90820  
    9999variant gcc43 description {create Fortran wrappers using gcc43} conflicts gcc42 gcc44 gcc45 gcc46 g95 {
    100100    depends_lib-append    port:gcc43
    101     depends_skip_archcheck gcc43
    102101    configure.f77         gfortran-mp-4.3
    103102    configure.args-delete --disable-fortran
     
    113112variant gcc44 description {create Fortran wrappers using gcc44} conflicts gcc42 gcc43 gcc45 gcc46 g95 {
    114113    depends_lib-append    port:gcc44
    115     depends_skip_archcheck gcc44
    116114    configure.f77         gfortran-mp-4.4
    117115    configure.args-delete --disable-fortran
     
    127125variant gcc45 description {create Fortran wrappers using gcc45} conflicts gcc42 gcc43 gcc44 gcc46 g95 {
    128126    depends_lib-append    port:gcc45
    129     depends_skip_archcheck gcc45
    130127    configure.f77         gfortran-mp-4.5
    131128    configure.args-delete --disable-fortran
     
    141138variant gcc46 description {create Fortran wrappers using gcc46} conflicts gcc42 gcc43 gcc44 gcc45 g95 {
    142139    depends_lib-append    port:gcc46
    143     depends_skip_archcheck gcc46
    144140    configure.f77         gfortran-mp-4.6
    145141    configure.args-delete --disable-fortran
  • trunk/dports/math/fftw-3/Portfile

    r90423 r90820  
    9393variant gcc43 description {create Fortran wrappers using gcc43} conflicts gcc42 gcc44 gcc45 gcc46 g95 {
    9494    depends_lib-append    port:gcc43
    95     depends_skip_archcheck gcc43
    9695    configure.f77         gfortran-mp-4.3
    9796    configure.args-delete --disable-fortran
     
    107106variant gcc44 description {create Fortran wrappers using gcc44} conflicts gcc42 gcc43 gcc45 gcc46 g95 {
    108107    depends_lib-append    port:gcc44
    109     depends_skip_archcheck gcc44
    110108    configure.f77         gfortran-mp-4.4
    111109    configure.args-delete --disable-fortran
     
    121119variant gcc45 description {create Fortran wrappers using gcc45} conflicts gcc42 gcc43 gcc44 gcc46 g95 {
    122120    depends_lib-append    port:gcc45
    123     depends_skip_archcheck gcc45
    124121    configure.f77         gfortran-mp-4.5
    125122    configure.args-delete --disable-fortran
     
    135132variant gcc46 description {create Fortran wrappers using gcc46} conflicts gcc42 gcc43 gcc44 gcc45 g95 {
    136133    depends_lib-append    port:gcc46
    137     depends_skip_archcheck gcc46
    138134    configure.f77         gfortran-mp-4.6
    139135    configure.args-delete --disable-fortran
  • trunk/dports/math/octave-devel/Portfile

    r89881 r90820  
    133133# check for setting the default variant (gcc44)
    134134if { ![variant_isset gcc43] && ![variant_isset gcc44] && \
    135          ![variant_isset gcc45] && ![variant_isset gcc46] && \
    136          ![variant_isset g95] } {
    137     default_variants +gcc44
     135         ![variant_isset gcc46] && ![variant_isset g95] } {
     136    default_variants +gcc45
    138137}
    139138
     
    142141         ![variant_isset gcc45] && ![variant_isset gcc46] && \
    143142         ![variant_isset g95] } {
    144     error "You cannot use the variant -gcc44 alone."
     143    pre-fetch {
     144        error "You must select one of the compiler variants."
     145    }
    145146}
    146147
  • trunk/dports/math/octave/Portfile

    r89881 r90820  
    126126}
    127127
    128 if { ![variant_isset gcc43] && ![variant_isset gcc45] && ![variant_isset g95] } {
    129     default_variants +gcc44
     128if { ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset g95] } {
     129    default_variants +gcc45
    130130}
    131131if {![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset g95]} {
  • trunk/dports/math/qrupdate/Portfile

    r86677 r90820  
    105105}
    106106
    107 if {![variant_isset gcc43] && ![variant_isset gcc44] && \
    108         ![variant_isset gcc45] && ![variant_isset g95]} {
    109     default_variants +gcc44
     107if {![variant_isset gcc43] && ![variant_isset gcc44] \
     108        && ![variant_isset g95]} {
     109    default_variants +gcc45
    110110}
    111111
  • trunk/dports/math/shogun/Portfile

    r84550 r90820  
    143143# }
    144144
    145 variant gcc43 conflicts gcc44 description {build with gcc 4.3} {}
    146 variant gcc44 conflicts gcc43 description {build with gcc 4.4} {}
     145variant gcc43 conflicts gcc44 gcc45 description {build with gcc 4.3} {}
     146variant gcc44 conflicts gcc43 gcc45 description {build with gcc 4.4} {}
    147147variant gcc45 conflicts gcc43 gcc44 description {build with gcc 4.5} {}
    148148
    149149if {[variant_isset gcc43]} {
    150150    set gccversion 4.3
    151 } elseif {[variant_isset gcc45]} {
     151} elseif {[variant_isset gcc44]} {
     152    set gccversion 4.4
     153} else {
     154    default_variants +gcc45
    152155    set gccversion 4.5
    153 } else {
    154     default_variants +gcc44
    155     set gccversion 4.4
    156156}
    157157
  • trunk/dports/net/lam/Portfile

    r68906 r90820  
    3535destroot.args   docdir=${prefix}/share/doc/lam
    3636
    37 variant gcc42 description {enable Fortran support with GCC 4.2} conflicts gcc43 gcc44 g95 {
     37variant gcc42 description {enable Fortran support with GCC 4.2} conflicts gcc43 gcc44 gcc45 g95 {
    3838        depends_lib   port:gcc42
    3939        configure.args-delete   --without-fc
     
    4141}
    4242
    43 variant gcc43 description {enable Fortran support with GCC 4.3} conflicts gcc42 gcc44 g95 {
     43variant gcc43 description {enable Fortran support with GCC 4.3} conflicts gcc42 gcc44 gcc45 g95 {
    4444        depends_lib   port:gcc43
    4545        configure.args-delete   --without-fc
     
    4747}
    4848
    49 variant gcc44 description {enable Fortran support with GCC 4.4} conflicts gcc42 gcc43 g95 {
     49variant gcc44 description {enable Fortran support with GCC 4.4} conflicts gcc42 gcc43 gcc45 g95 {
    5050        depends_lib   port:gcc44
    5151        configure.args-delete   --without-fc
     
    5353}
    5454
    55 variant g95 description {enable Fortran support with G95} conflicts gcc42 gcc43 gcc44 {
     55variant gcc45 description {enable Fortran support with GCC 4.5} conflicts gcc42 gcc43 gcc44 g95 {
     56        depends_lib   port:gcc45
     57        configure.args-delete   --without-fc
     58        configure.args-append   --with-fc=${prefix}/bin/gfortran-mp-4.5
     59}
     60
     61variant g95 description {enable Fortran support with G95} conflicts gcc42 gcc43 gcc44 gcc45 {
    5662        depends_lib   port:g95
    5763        configure.args-delete   --without-fc
  • trunk/dports/python/py-scipy/Portfile

    r90425 r90820  
    125125
    126126
    127 if { ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc45] &![variant_isset gcc46] } {
    128   default_variants      +gcc44
     127if { ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] &![variant_isset gcc46] } {
     128  default_variants      +gcc45
    129129}
    130130
  • trunk/dports/python/py25-pymc/Portfile

    r68906 r90820  
    3232depends_lib-append  port:py25-numpy
    3333
    34 variant gcc42 description {create Fortran wrappers using gcc42} conflicts gcc43 gcc44 g95 {
     34variant gcc42 description {create Fortran wrappers using gcc42} conflicts gcc43 gcc44 gcc45 g95 {
    3535    depends_lib-append    port:gcc42
    3636    set fc                ${prefix}/bin/gfortran-mp-4.2
     
    3838}
    3939
    40 variant gcc43 description {create Fortran wrappers using gcc43} conflicts gcc42 gcc44 g95 {
     40variant gcc43 description {create Fortran wrappers using gcc43} conflicts gcc42 gcc44 gcc45 g95 {
    4141    depends_lib-append    port:gcc43
    4242    set fc                ${prefix}/bin/gfortran-mp-4.3
     
    4444}
    4545
    46 variant gcc44 description {create Fortran wrappers using gcc44} conflicts gcc42 gcc43 g95 {
     46variant gcc44 description {create Fortran wrappers using gcc44} conflicts gcc42 gcc43 gcc45 g95 {
    4747    depends_lib-append    port:gcc44
    4848    set fc                ${prefix}/bin/gfortran-mp-4.4
     
    5050}
    5151
    52 variant g95 description {create Fortran wrappers using f95} conflicts gcc42 gcc43 gcc44 {
     52variant gcc45 description {create Fortran wrappers using gcc45} conflicts gcc42 gcc43 gcc44 g95 {
     53    depends_lib-append    port:gcc45
     54    set fc                ${prefix}/bin/gfortran-mp-4.5
     55    build.env-append      F77=${fc} F90=${fc}
     56}
     57
     58variant g95 description {create Fortran wrappers using f95} conflicts gcc42 gcc43 gcc44 gcc45 {
    5359    depends_lib-append    port:g95
    5460    set fc                ${prefix}/bin/g95
     
    5662}
    5763
    58 if {![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset g95]} {
    59        default_variants +gcc44
     64if {![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset g95]} {
     65       default_variants +gcc45
    6066}
    6167
  • trunk/dports/python/py25-pynifti/Portfile

    r68906 r90820  
    4343}
    4444
    45 variant gcc43 conflicts gcc44 description {build with gcc 4.3} {
     45variant gcc43 conflicts gcc44 gcc45 description {build with gcc 4.3} {
    4646    depends_build-append port:gcc43
    4747    configure.compiler   macports-gcc-4.3
    4848}
    4949
    50 variant gcc44 conflicts gcc43 description {build with gcc 4.4} {
     50variant gcc44 conflicts gcc43 gcc45 description {build with gcc 4.4} {
    5151    depends_build-append port:gcc44
    5252    configure.compiler   macports-gcc-4.4
    5353}
    5454
    55 if {![variant_isset gcc43]} {
    56     default_variants +gcc44
     55variant gcc45 conflicts gcc43 gcc44 description {build with gcc 4.5} {
     56    depends_build-append port:gcc45
     57    configure.compiler   macports-gcc-4.5
     58}
     59
     60if {![variant_isset gcc43] && ![variant_isset gcc44]} {
     61    default_variants +gcc45
    5762}
    5863
  • trunk/dports/python/py26-logilab-hmm/Portfile

    r68906 r90820  
    3131python.add_archflags no
    3232
    33 variant gcc42 conflicts gcc43 gcc44 description "Use gfortran-mp-4.2 as fortran compiler" {
     33variant gcc42 conflicts gcc43 gcc44 gcc45 description "Use gfortran-mp-4.2 as fortran compiler" {
    3434  configure.compiler    macports-gcc-4.2
    3535  depends_lib-append    port:gcc42
     
    3939}
    4040
    41 variant gcc43 conflicts gcc42 gcc44 description "Use gfortran-mp-4.3 as fortran compiler" {
     41variant gcc43 conflicts gcc42 gcc44 gcc45 description "Use gfortran-mp-4.3 as fortran compiler" {
    4242  configure.compiler    macports-gcc-4.3
    4343  depends_lib-append    port:gcc43
     
    4747}
    4848
    49 variant gcc44 conflicts gcc42 gcc43 description "Use gfortran-mp-4.4 as fortran compiler" {
     49variant gcc44 conflicts gcc42 gcc43 gcc45 description "Use gfortran-mp-4.4 as fortran compiler" {
    5050  configure.compiler    macports-gcc-4.4
    5151  depends_lib-append    port:gcc44
     
    5555}
    5656
     57variant gcc45 conflicts gcc42 gcc43 gcc44 description "Use gfortran-mp-4.5 as fortran compiler" {
     58  configure.compiler    macports-gcc-4.5
     59  depends_lib-append    port:gcc45
     60  set fc_options        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.5 --f90exec ${prefix}/bin/gfortran-mp-4.5"
     61  build.cmd-append      ${fc_options}
     62  destroot.cmd-append   ${fc_options}
     63}
     64
    5765if { ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] } {
    58   default_variants      +gcc44
     66  default_variants      +gcc45
    5967}
    6068
  • trunk/dports/python/py26-ngl/Portfile

    r80282 r90820  
    4444destroot.env        NCARG_ROOT=${prefix}
    4545
    46 if {![variant_isset g95] && ![variant_isset gcc43] && ![variant_isset universal]} {
    47     default_variants +gcc44
     46if {![variant_isset g95] && ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset universal]} {
     47    default_variants +gcc45
    4848}
    4949
    50 variant gcc43 conflicts g95 gcc44 universal description {link to libraries build with gfortran 4.3} {
     50variant gcc43 conflicts g95 gcc44 gcc45 universal description {link to libraries build with gfortran 4.3} {
    5151    depends_build-append    port:gcc43
    5252    configure.compiler  macports-gcc-4.3
     
    5656}
    5757
    58 variant gcc44 conflicts g95 gcc43 universal description {link to libraries build with gfortran 4.4} {
     58variant gcc44 conflicts g95 gcc43 gcc45 universal description {link to libraries build with gfortran 4.4} {
    5959    depends_build-append    port:gcc44
    6060    configure.compiler  macports-gcc-4.4
     
    6464}
    6565
    66 variant g95 conflicts gcc43 gcc44 universal description {link to libraries build with g95} {
     66variant gcc45 conflicts g95 gcc43 gcc44 universal description {link to libraries build with gfortran 4.5} {
     67    depends_build-append    port:gcc45
     68    configure.compiler  macports-gcc-4.5
     69    build.env-append    F2CLIBS=gfortran \
     70                        F2CLIBS_PREFIX=${prefix}/lib/gcc45 \
     71                        CC=${configure.cc}
     72}
     73
     74variant g95 conflicts gcc43 gcc44 gcc45 universal description {link to libraries build with g95} {
    6775    depends_build-append    port:g95
    6876    build.env-append    F2CLIBS=f95 \
  • trunk/dports/python/py26-nio/Portfile

    r80283 r90820  
    4747destroot.env        NCARG_ROOT=${prefix}
    4848
    49 if {![variant_isset g95] && ![variant_isset gcc43] && ![variant_isset universal]} {
    50     default_variants +gcc44
     49if {![variant_isset g95] && ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset universal]} {
     50    default_variants +gcc45
    5151}
    5252
    53 variant gcc43 conflicts g95 gcc44 universal description {link to libraries build with gfortran 4.3} {
     53variant gcc43 conflicts g95 gcc44 gcc45 universal description {link to libraries build with gfortran 4.3} {
    5454    depends_build-append       port:gcc43
    5555    configure.compiler  macports-gcc-4.3
     
    5959}
    6060
    61 variant gcc44 conflicts g95 gcc43 universal description {link to libraries build with gfortran 4.4} {
     61variant gcc44 conflicts g95 gcc43 gcc45 universal description {link to libraries build with gfortran 4.4} {
    6262    depends_build-append       port:gcc44
    6363    configure.compiler  macports-gcc-4.4
     
    6767}
    6868
    69 variant g95 conflicts gcc43 gcc44 universal description {link to libraries build with g95} {
     69variant gcc45 conflicts g95 gcc43 gcc44 universal description {link to libraries build with gfortran 4.5} {
     70    depends_build-append       port:gcc45
     71    configure.compiler  macports-gcc-4.5
     72    build.env-append    F2CLIBS=gfortran \
     73                        F2CLIBS_PREFIX=${prefix}/lib/gcc45 \
     74                        CC=${configure.cc}
     75}
     76
     77variant g95 conflicts gcc43 gcc44 gcc45 universal description {link to libraries build with g95} {
    7078    depends_build-append       port:g95
    7179    build.env-append    F2CLIBS=f95 \
  • trunk/dports/python/py26-pymc/Portfile

    r75960 r90820  
    6363}
    6464
    65 if {![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc45] && ![variant_isset g95]} {
    66            default_variants +gcc44
     65if {![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset g95]} {
     66           default_variants +gcc45
    6767}
    6868
  • trunk/dports/python/py26-pymvpa/Portfile

    r83028 r90820  
    7474if {[variant_isset gcc43]} {
    7575    set gccversion 4.3
    76 } elseif {[variant_isset gcc45]} {
     76} elseif {[variant_isset gcc44]} {
     77    set gccversion 4.4
     78} else {
     79    default_variants +gcc45
    7780    set gccversion 4.5
    78 } else {
    79     default_variants +gcc44
    80     set gccversion 4.4
    8181}
    8282
  • trunk/dports/python/py26-pynifti/Portfile

    r68906 r90820  
    4343}
    4444
    45 variant gcc43 conflicts gcc44 description {build with gcc 4.3} {
     45variant gcc43 conflicts gcc44 gcc45 description {build with gcc 4.3} {
    4646    depends_build-append port:gcc43
    4747    configure.compiler   macports-gcc-4.3
    4848}
    4949
    50 variant gcc44 conflicts gcc43 description {build with gcc 4.4} {
     50variant gcc44 conflicts gcc43 gcc45 description {build with gcc 4.4} {
    5151    depends_build-append port:gcc44
    5252    configure.compiler   macports-gcc-4.4
    5353}
    5454
    55 if {![variant_isset gcc43]} {
    56     default_variants +gcc44
     55variant gcc45 conflicts gcc43 gcc44 description {build with gcc 4.5} {
     56    depends_build-append port:gcc45
     57    configure.compiler   macports-gcc-4.5
     58}
     59
     60if {![variant_isset gcc43] && ![variant_isset gcc44]} {
     61    default_variants +gcc45
    5762}
    5863
  • trunk/dports/python/py27-pymc/Portfile

    r76386 r90820  
    6363}
    6464
    65 if {![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc45] && ![variant_isset g95]} {
    66            default_variants +gcc44
     65if {![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset g95]} {
     66           default_variants +gcc45
    6767}
    6868
  • trunk/dports/science/cdf/Portfile

    r90575 r90820  
    8686}
    8787
    88 if {![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46]} {
    89     default_variants +gcc44
     88if {![variant_isset gcc44] && ![variant_isset gcc46]} {
     89    default_variants +gcc45
    9090}
    9191
  • trunk/dports/science/cfitsio/Portfile

    r84921 r90820  
    6262}
    6363
    64 variant gcc42 description {create Fortran wrappers using gcc42} conflicts gcc43 gcc44 g95 {
     64variant gcc42 description {create Fortran wrappers using gcc42} conflicts gcc43 gcc44 gcc45 g95 {
    6565    depends_lib-append  port:gcc42
    6666    configure.fc        ${prefix}/bin/gfortran-mp-4.2
    6767}
    6868
    69 variant gcc43 description {create Fortran wrappers using gcc43} conflicts gcc42 gcc44 g95 {
     69variant gcc43 description {create Fortran wrappers using gcc43} conflicts gcc42 gcc44 gcc45 g95 {
    7070    depends_lib-append  port:gcc43
    7171    configure.fc        ${prefix}/bin/gfortran-mp-4.3
    7272}
    7373
    74 variant gcc44 description {create Fortran wrappers using gcc44} conflicts gcc42 gcc43 g95 {
     74variant gcc44 description {create Fortran wrappers using gcc44} conflicts gcc42 gcc43 gcc45 g95 {
    7575    depends_lib-append  port:gcc44
    7676    configure.fc        ${prefix}/bin/gfortran-mp-4.4
    7777}
    7878
    79 variant g95 description {create Fortran wrappers using f95} conflicts gcc42 gcc43 gcc44 {
     79variant gcc45 description {create Fortran wrappers using gcc45} conflicts gcc42 gcc43 gcc44 g95 {
     80    depends_lib-append  port:gcc45
     81    configure.fc        ${prefix}/bin/gfortran-mp-4.5
     82}
     83
     84variant g95 description {create Fortran wrappers using f95} conflicts gcc42 gcc43 gcc44 gcc45 {
    8085    depends_lib-append  port:g95
    8186    configure.fc        ${prefix}/bin/g95
  • trunk/dports/science/emos/Portfile

    r80377 r90820  
    9696
    9797use_parallel_build  no
    98 if {![variant_isset gcc43] && ![variant_isset gcc45] && ![variant_isset g95]} {
    99     default_variants    +gcc44
     98if {![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset g95]} {
     99    default_variants    +gcc45
    100100}
    101101universal_variant   no
  • trunk/dports/science/eo/Portfile

    r68906 r90820  
    5959}
    6060
    61 variant gcc43 conflicts gcc44 description "Use GCC 4.3 for compilation of EO - optimized for host machine" {
     61variant gcc43 conflicts gcc44 gcc45 description "Use GCC 4.3 for compilation of EO - optimized for host machine" {
    6262    depends_build-append        port:gcc43
    6363    configure.cc                gcc-mp-4.3
     
    6767}
    6868
    69 variant gcc44 conflicts gcc43 description "Use GCC 4.4 for compilation of EO - optimized for host machine" {
     69variant gcc44 conflicts gcc43 gcc45 description "Use GCC 4.4 for compilation of EO - optimized for host machine" {
    7070    depends_build-append        port:gcc44
    7171    configure.cc                gcc-mp-4.4
     
    7474    configure.cxxflags-append   "-ftree-vectorize -march=native -O3"
    7575}
     76
     77variant gcc45 conflicts gcc43 gcc44 description "Use GCC 4.5 for compilation of EO - optimized for host machine" {
     78    depends_build-append        port:gcc45
     79    configure.cc                gcc-mp-4.5
     80    configure.cxx               g++-mp-4.5
     81    configure.cflags-append     "-ftree-vectorize -march=native -O3"
     82    configure.cxxflags-append   "-ftree-vectorize -march=native -O3"
     83}
  • trunk/dports/science/gromacs-double/Portfile

    r78014 r90820  
    5353}
    5454
    55 if { ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45]} {
    56     default_variants-append     +gcc44
     55if { ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] } {
     56    default_variants     +gcc45
    5757}
    5858
  • trunk/dports/science/gromacs/Portfile

    r78014 r90820  
    5353}
    5454
    55 if { ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45]} {
    56     default_variants-append     +gcc44
     55if { ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] } {
     56    default_variants     +gcc45
    5757}
    5858
  • trunk/dports/science/hdf5/Portfile

    r84735 r90820  
    5353    configure.args-append   --enable-fortran
    5454    pre-fetch {
    55         if { ![variant_isset gcc44] && ![variant_isset gcc43] && ![variant_isset gcc42] && ![variant_isset g95] } {
     55        if { ![variant_isset gcc45] && ![variant_isset gcc44] && ![variant_isset gcc43] && ![variant_isset gcc42] && ![variant_isset g95] } {
    5656            error "You must specify a compiler variant in order to build the Fortran interface"
    5757        }
     
    7171
    7272
    73 variant gcc42 conflicts g95 gcc43 gcc44 description {Compile using GCC 4.2} {
     73variant gcc42 conflicts g95 gcc43 gcc44 gcc45 description {Compile using GCC 4.2} {
    7474    depends_lib-append          port:gcc42
    7575    configure.compiler          macports-gcc-4.2
    7676}
    7777
    78 variant gcc43 conflicts g95 gcc42 gcc44 description {Compile using GCC 4.3} {
     78variant gcc43 conflicts g95 gcc42 gcc44 gcc45 description {Compile using GCC 4.3} {
    7979    depends_lib-append          port:gcc43
    8080    configure.compiler          macports-gcc-4.3
     
    8282}
    8383
    84 variant gcc44 conflicts g95 gcc42 gcc43 description {Compile using GCC 4.4} {
     84variant gcc44 conflicts g95 gcc42 gcc43 gcc45 description {Compile using GCC 4.4} {
    8585    depends_lib-append          port:gcc44
    8686    configure.compiler          macports-gcc-4.4
     
    8888}
    8989
    90 variant g95 requires fortran conflicts gcc42 gcc43 gcc44 description {Use g95 Fortran compiler (unsupported)} {
     90variant gcc45 conflicts g95 gcc42 gcc43 gcc44 description {Compile using GCC 4.5} {
     91    depends_lib-append          port:gcc45
     92    configure.compiler          macports-gcc-4.5
     93    configure.env-append        LD=${prefix}/bin/g++-mp-4.5
     94}
     95
     96variant g95 requires fortran conflicts gcc42 gcc43 gcc44 gcc45 description {Use g95 Fortran compiler (unsupported)} {
    9197    depends_lib-append          port:g95
    9298    patchfiles-append           patch-powerpc-apple.diff
  • trunk/dports/science/jags/Portfile

    r88780 r90820  
    4444}
    4545
    46 if {![variant_isset gcc43] && ![variant_isset gcc45]} {
    47     default_variants +gcc44
     46if {![variant_isset gcc43] && ![variant_isset gcc44]} {
     47    default_variants +gcc45
    4848}
    4949
  • trunk/dports/science/magicspp/Portfile

    r89881 r90820  
    4141use_parallel_build  no
    4242universal_variant   no
    43 if {![variant_isset gcc43]} {
    44     default_variants    +gcc44
     43if {![variant_isset gcc43] && ![variant_isset gcc44]} {
     44    default_variants    +gcc45
    4545}
    4646
     
    7171                            --with-gs-font-dir=${prefix}/share/ghostscript/fonts
    7272
    73 variant gcc43 conflicts gcc44 description {for emos +gcc43} {
     73variant gcc43 conflicts gcc44 gcc45 description {for emos +gcc43} {
    7474    configure.ldflags-append    -lgrib_api -lopenjpeg -lpng -lemosR64 -lgfortran -lgfortranbegin -lnetcdf_c++ -lnetcdf
    7575    configure.compiler      macports-gcc-4.3
    7676}
    7777
    78 variant gcc44 conflicts gcc43 description {for emos +gcc44} {
     78variant gcc44 conflicts gcc43 gcc45 description {for emos +gcc44} {
    7979    configure.ldflags-append    -lgrib_api -lopenjpeg -lpng -lemosR64 -lgfortran -lgfortranbegin -lnetcdf_c++ -lnetcdf
    8080    configure.compiler      macports-gcc-4.4
     81}
     82
     83variant gcc45 conflicts gcc43 gcc44 description {for emos +gcc45} {
     84    configure.ldflags-append    -lgrib_api -lopenjpeg -lpng -lemosR64 -lgfortran -lgfortranbegin -lnetcdf_c++ -lnetcdf
     85    configure.compiler      macports-gcc-4.5
    8186}
    8287
  • trunk/dports/science/molden/Portfile

    r89590 r90820  
    8989}
    9090
    91 if {![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45]} {
    92     default_variants        +gcc44
     91if {![variant_isset gcc43] && ![variant_isset gcc44]} {
     92    default_variants        +gcc45
    9393}
    9494
  • trunk/dports/science/ncarg/Portfile

    r87279 r90820  
    8282    } elseif {[variant_isset gcc43]} {
    8383        set fortranlib  "-L${prefix}/lib/gcc43 -lgfortran"
     84    } elseif {[variant_isset gcc44]} {
     85        set fortranlib  "-L${prefix}/lib/gcc44 -lgfortran"
    8486    } elseif {[variant_isset gcc45]} {
    8587        set fortranlib  "-L${prefix}/lib/gcc45 -lgfortran"
    86     } else {
    87         set fortranlib  "-L${prefix}/lib/gcc44 -lgfortran"
    8888    }
    8989    foreach f {Darwin Darwin_Intel} {
     
    208208}
    209209
    210 if {![variant_isset gcc43] && ![variant_isset gcc45] && ![variant_isset g95]} {
    211     default_variants +gcc44
     210if {![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset g95]} {
     211    default_variants +gcc45
    212212}
    213213
  • trunk/dports/science/openmpi/Portfile

    r89298 r90820  
    130130
    131131# dependents like netcdf need some form of fortran
    132 if {![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset g95]} {
    133     default_variants +gcc44
     132if {![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc46] && ![variant_isset g95]} {
     133    default_variants +gcc45
    134134}
    135135
  • trunk/dports/science/plplot/Portfile

    r81075 r90820  
    141141# gd driver (gif, jpeg, png, svg) has been deprecated
    142142
    143 variant gcc43 conflicts g95 gcc44 universal description {Add support for fortran using gfortran-mp-4.3} {
     143variant gcc43 conflicts g95 gcc44 gcc45 universal description {Add support for fortran using gfortran-mp-4.3} {
    144144    depends_lib-append      port:gcc43
    145145    configure.args-delete   -DENABLE_f77=OFF \
     
    148148                            -DCMAKE_Fortran_FLAGS=\"${configure.fflags}\"
    149149}
    150 variant gcc44 conflicts g95 gcc43 universal description {Add support for fortran using gfortran-mp-4.4} {
     150variant gcc44 conflicts g95 gcc43 gcc45 universal description {Add support for fortran using gfortran-mp-4.4} {
    151151    depends_lib-append      port:gcc44
    152152    configure.args-delete   -DENABLE_f77=OFF \
     
    155155                            -DCMAKE_Fortran_FLAGS=\"${configure.fflags}\"
    156156}
    157 variant g95 conflicts gcc43 gcc44 universal description {Add support for fortran using g95} {
     157variant gcc45 conflicts g95 gcc43 gcc44 universal description {Add support for fortran using gfortran-mp-4.5} {
     158    depends_lib-append      port:gcc45
     159    configure.args-delete   -DENABLE_f77=OFF \
     160                            -DENABLE_f95=OFF
     161    configure.args-append   -DCMAKE_Fortran_COMPILER=\"${prefix}/bin/gfortran-mp-4.5\" \
     162                            -DCMAKE_Fortran_FLAGS=\"${configure.fflags}\"
     163}
     164variant g95 conflicts gcc43 gcc44 gcc45 universal description {Add support for fortran using g95} {
    158165    depends_lib-append      port:g95
    159166    configure.args-delete   -DENABLE_f77=OFF \
  • trunk/dports/science/scotch/Portfile

    r84550 r90820  
    3737use_configure       no
    3838
    39 configure.compiler  macports-gcc-4.4
     39variant gcc44 conflicts gcc45 description {Build with gcc 4.4} {}
     40variant gcc45 conflicts gcc44 description {Build with gcc 4.5} {}
     41
     42if {[variant_isset gcc44]} {
     43    depends_lib-append  port:gcc44
     44    configure.compiler  macports-gcc-4.4
     45} else {
     46    default_variants    +gcc45
     47    depends_lib-append  port:gcc45
     48    configure.compiler  macports-gcc-4.5
     49}
    4050
    4151variant universal {
     
    4454set archflags       [get_canonical_archflags]
    4555
    46 depends_lib         port:openmpi port:gcc44
     56depends_lib-append  port:openmpi
    4757
    4858build.env-append    CC=${configure.cc} \
  • trunk/dports/science/splash/Portfile

    r83330 r90820  
    2222                    sha256  f3e3331dbf544f35bfbe2dc2b4dd3da7963011f2b1bd2c7e5d1418244c32eb55
    2323
    24 if { ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46]} {
    25    default_variants      +gcc44
     24if { ![variant_isset gcc42] && ![variant_isset gcc43] && ![variant_isset gcc44] && ![variant_isset gcc46]} {
     25   default_variants      +gcc45
    2626}
    27 default_variants    +pgplot
     27default_variants-append    +pgplot
    2828
    2929use_configure       no
  • trunk/dports/science/whatcheck/Portfile

    r74468 r90820  
    2828dist_subdir         ${name}/${version}
    2929worksrcdir          ${name}
    30 depends_lib         port:gcc44 port:xfig
     30depends_lib         port:xfig
    3131patchfiles          whatcheck.patch
    3232use_configure       no
     
    3434extract.only        whatcheck.tar.bz2
    3535
    36 configure.compiler  macports-gcc-4.4
     36variant gcc44 conflicts gcc45 description {Build with GCC 4.4} {}
     37variant gcc45 conflicts gcc44 description {Build with GCC 4.5} {}
     38
     39if {[variant_isset gcc44]} {
     40    configure.compiler  macports-gcc-4.4
     41    depends_lib-append  port:gcc44
     42} else {
     43    default_variants    +gcc45
     44    configure.compiler  macports-gcc-4.5
     45    depends_lib-append  port:gcc45
     46}
    3747
    3848post-extract {
Note: See TracChangeset for help on using the changeset viewer.