Revision: 103405 https://trac.macports.org/changeset/103405 Author: larryv@macports.org Date: 2013-02-24 14:57:54 -0800 (Sun, 24 Feb 2013) Log Message: ----------- miriad: Update to 20130224 (maintainer, #38192). Also: - Make CARMA the default telescope, over ATA. - Add GCC 4.7 support and make it default. - Remove GCC 4.4 support. Modified Paths: -------------- trunk/dports/science/miriad/Portfile Modified: trunk/dports/science/miriad/Portfile =================================================================== --- trunk/dports/science/miriad/Portfile 2013-02-24 22:12:24 UTC (rev 103404) +++ trunk/dports/science/miriad/Portfile 2013-02-24 22:57:54 UTC (rev 103405) @@ -11,7 +11,7 @@ name miriad conflicts pgplot set relver 4.3.4 -set tardate 20120913 +set tardate 20130224 version ${relver}.${tardate} platforms darwin categories science @@ -32,8 +32,8 @@ # Files master_sites ${homepage} -checksums rmd160 a6f9502afa9a3ed74570f06459d531e857787b40 \ - sha256 8becce0716a93bf49b338d0347db9146f1e8e185bfa57d08c59a48cdb9ddcb7b +checksums rmd160 2df51baa2a84954f2ab4529cb52e21abe4c28c47 \ + sha256 5cba85f98783c4fd58de5e0bbc26c0e60b2fa232135a147415c7ef72a938b50c # Telescope/buffer size selection. @@ -42,15 +42,15 @@ variant sma conflicts ata carma wsrt description {use buffer sizes appropriate to SMA data} {} variant wsrt conflicts ata carma sma description {use buffer sizes appropriate to WSRT data} {} -if {[variant_isset carma]} { - set thescope carma +if {[variant_isset ata]} { + set thescope ata } elseif {[variant_isset wsrt]} { set thescope wsrt } elseif {[variant_isset sma]} { set thescope sma } else { - set thescope ata - default_variants +ata + set thescope carma + default_variants +carma } # We need Fortran support, which the Apple version of GCC doesn't offer. @@ -58,28 +58,28 @@ # to build with better-optimizing proprietary compilers, which we allow # via the gcc_select mechanism. -variant gcc44 conflicts gcc45 gcc46 gcc_select description {Build with gcc/gfortran 4.4} { - configure.compiler macports-gcc-4.4 - depends_lib-append port:gcc44 -} - -variant gcc45 conflicts gcc44 gcc46 gcc_select description {Build with gcc/gfortran 4.5} { +variant gcc45 conflicts gcc46 gcc47 gcc_select description {Build with gcc/gfortran 4.5} { configure.compiler macports-gcc-4.5 depends_lib-append port:gcc45 } -variant gcc46 conflicts gcc44 gcc45 gcc_select description {Build with gcc/gfortran 4.6} { +variant gcc46 conflicts gcc45 gcc47 gcc_select description {Build with gcc/gfortran 4.6} { configure.compiler macports-gcc-4.6 depends_lib-append port:gcc46 } -variant gcc_select conflicts gcc44 gcc45 gcc46 description {Build with compilers chosen via gcc_select -- experts only} { +variant gcc47 conflicts gcc45 gcc46 gcc_select description {Build with gcc/gfortran 4.7} { + configure.compiler macports-gcc-4.7 + depends_lib-append port:gcc47 +} + +variant gcc_select conflicts gcc45 gcc46 gcc47 description {Build with compilers chosen via gcc_select -- experts only} { configure.compiler macports-gcc depends_lib-append port:gcc_select } -if {![variant_isset gcc44] && ![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc_select]} { - default_variants +gcc45 +if {![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc47] && ![variant_isset gcc_select]} { + default_variants +gcc47 } universal_variant no