[37409] trunk/dports/python

[ram at macports.org]

Revision: 37409
          http://trac.macosforge.org/projects/macports/changeset/37409
Author:   ram at macports.org
Date:     2008-06-06 06:24:46 -0700 (Fri, 06 Jun 2008)

Log Message:
-----------
py-scipy/py25-scipy: remove g95 fortran variant, use gcc42 as the default
fortran variant, closes #14240

Modified Paths:
--------------
    trunk/dports/python/py-scipy/Portfile
    trunk/dports/python/py25-scipy/Portfile

Modified: trunk/dports/python/py-scipy/Portfile
===================================================================
--- trunk/dports/python/py-scipy/Portfile	2008-06-06 13:24:41 UTC (rev 37408)
+++ trunk/dports/python/py-scipy/Portfile	2008-06-06 13:24:46 UTC (rev 37409)
@@ -5,7 +5,7 @@
 
 name                    py-scipy
 version                 0.6.0
-revision                6
+revision                7
 categories              python
 platforms               darwin
 maintainers             ram openmaintainer
@@ -34,21 +34,14 @@
   reinplace "s|include <\\(umfpack\.*.h\\)>|include <${prefix}/include/ufsparse/\\1>|g" ${worksrcpath}/scipy/linsolve/umfpack/umfpack.i
 }
 
-variant g95 conflicts gcc42 gcc43 description "Use g95 as fortran compiler" {
-  depends_lib-append    port:g95
-  set fc_options        "config_fc --fcompiler g95 --f77exec ${prefix}/bin/g95 --f90exec ${prefix}/bin/g95"
-  build.cmd-append      ${fc_options}
-  destroot.cmd-append   ${fc_options}
-}
-
-variant gcc42 conflicts g95 gcc43 description "Use gfortran-mp-4.2 as fortran compiler" {
+variant gcc42 conflicts gcc43 description "Use gfortran-mp-4.2 as fortran compiler" {
   depends_lib-append    port:gcc42
   set fc_options        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.2 --f90exec ${prefix}/bin/gfortran-mp-4.2"
   build.cmd-append      ${fc_options}
   destroot.cmd-append   ${fc_options}
 }
 
-variant gcc43 conflicts g95 gcc42 description "Use gfortran-mp-4.3 as fortran compiler" {
+variant gcc43 conflicts gcc42 description "Use gfortran-mp-4.3 as fortran compiler" {
   depends_lib-append    port:gcc43
   set fc_options        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.3 --f90exec ${prefix}/bin/gfortran-mp-4.3"
   build.cmd-append      ${fc_options}
@@ -59,6 +52,6 @@
   depends_lib-delete    lib:gnuplot:gnuplot
 }
 
-if { ![variant_isset g95] && ![variant_isset gcc42] && ![variant_isset gcc43] } {
-  default_variants      +g95
+if { ![variant_isset gcc42] && ![variant_isset gcc43] } {
+  default_variants      +gcc43
 }

Modified: trunk/dports/python/py25-scipy/Portfile
===================================================================
--- trunk/dports/python/py25-scipy/Portfile	2008-06-06 13:24:41 UTC (rev 37408)
+++ trunk/dports/python/py25-scipy/Portfile	2008-06-06 13:24:46 UTC (rev 37409)
@@ -5,7 +5,7 @@
 
 name                    py25-scipy
 version                 0.6.0
-revision                7
+revision                8
 categories              python
 platforms               darwin
 maintainers             ram openmaintainer
@@ -35,21 +35,14 @@
   reinplace "s|include <\\(umfpack\.*.h\\)>|include <${prefix}/include/ufsparse/\\1>|g" ${worksrcpath}/scipy/linsolve/umfpack/umfpack.i
 }
 
-variant g95 conflicts gcc42 gcc43 description "Use g95 as fortran compiler" {
-  depends_lib-append    port:g95
-  set fc_options        "config_fc --fcompiler g95 --f77exec ${prefix}/bin/g95 --f90exec ${prefix}/bin/g95"
-  build.cmd-append      ${fc_options}
-  destroot.cmd-append   ${fc_options}
-}
-
-variant gcc42 conflicts g95 gcc43 description "Use gfortran-mp-4.2 as fortran compiler" {
+variant gcc42 conflicts gcc43 description "Use gfortran-mp-4.2 as fortran compiler" {
   depends_lib-append    port:gcc42
   set fc_options        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.2 --f90exec ${prefix}/bin/gfortran-mp-4.2"
   build.cmd-append      ${fc_options}
   destroot.cmd-append   ${fc_options}
 }
 
-variant gcc43 conflicts g95 gcc42 description "Use gfortran-mp-4.3 as fortran compiler" {
+variant gcc43 conflicts gcc42 description "Use gfortran-mp-4.3 as fortran compiler" {
   depends_lib-append    port:gcc43
   set fc_options        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.3 --f90exec ${prefix}/bin/gfortran-mp-4.3"
   build.cmd-append      ${fc_options}
@@ -60,6 +53,6 @@
   depends_lib-delete    lib:gnuplot:gnuplot
 }
 
-if { ![variant_isset g95] && ![variant_isset gcc42] && ![variant_isset gcc43] } {
-  default_variants      +g95
+if { ![variant_isset gcc42] && ![variant_isset gcc43] } {
+  default_variants      +gcc43
 }

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080606/422213d4/attachment-0001.htm