[31203] trunk/dports/python

[erickt at macports.org]

Revision: 31203
          http://trac.macosforge.org/projects/macports/changeset/31203
Author:   erickt at macports.org
Date:     2007-11-18 01:47:40 -0800 (Sun, 18 Nov 2007)

Log Message:
-----------
add variants to use gfortran from gcc42 for gcc43

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

Modified: trunk/dports/python/py-numpy/Portfile
===================================================================
--- trunk/dports/python/py-numpy/Portfile	2007-11-18 08:43:28 UTC (rev 31202)
+++ trunk/dports/python/py-numpy/Portfile	2007-11-18 09:47:40 UTC (rev 31203)
@@ -5,6 +5,7 @@
 
 name                    py-numpy
 version                 1.0.4
+revision                1
 categories              python
 platforms               darwin
 maintainers             erickt at macports.org
@@ -19,5 +20,28 @@
                         sha1 9a1f09358c3310cf990eecd06dc2eb54aec78321 \
                         rmd160 8ac192ad3f36a94a45c26e0c4028fdbb744881f5
 
-depends_lib             port:g95 \
-                        lib:fftw:fftw-3 
+depends_lib             lib:fftw:fftw-3
+
+variant g95 conflicts gcc42 gcc43 description "Use g95 as fortran compiler" {
+  depends_lib-append    port:g95
+}
+
+variant gcc42 conflicts g95 gcc43 description "Use gfortran as fortran compiler" {
+  depends_lib-append    port:gcc42
+  build.cmd-append      config_fc \
+                        --fcompiler gnu95 \
+                        --f77exec ${prefix}/bin/gfortran-mp-4.2 \
+                        --f90exec ${prefix}/bin/gfortran-mp-4.2
+}
+
+variant gcc43 conflicts g95 gcc42 description "Use gfortran as fortran compiler" {
+  depends_lib-append    port:gcc43
+  build.cmd-append      config_fc \
+                        --fcompiler gnu95 \
+                        --f77exec ${prefix}/bin/gfortran-mp-4.3 \
+                        --f90exec ${prefix}/bin/gfortran-mp-4.3
+}
+
+if { ![variant_isset g95] && ![variant_isset gcc42] && ![variant_isset gcc43] } {
+  default_variants      +g95
+}

Modified: trunk/dports/python/py25-numpy/Portfile
===================================================================
--- trunk/dports/python/py25-numpy/Portfile	2007-11-18 08:43:28 UTC (rev 31202)
+++ trunk/dports/python/py25-numpy/Portfile	2007-11-18 09:47:40 UTC (rev 31203)
@@ -5,6 +5,7 @@
 
 name                    py25-numpy
 version                 1.0.4
+revision                1
 categories              python
 platforms               darwin
 maintainers             erickt at macports.org
@@ -19,6 +20,33 @@
                         sha1 9a1f09358c3310cf990eecd06dc2eb54aec78321 \
                         rmd160 8ac192ad3f36a94a45c26e0c4028fdbb744881f5
 
-depends_lib             port:g95 \
-                        lib:fftw:fftw-3 \
+depends_lib             lib:fftw:fftw-3 \
                         port:py25-hashlib
+
+variant g95 conflicts gcc42 gcc43 description "Use g95 as fortran compiler" {
+  depends_lib-append    port:g95
+  build.cmd-append      config_fc \
+                        --fcompiler gnu95 \
+                        --f77exec ${prefix}/bin/g95 \
+                        --f90exec ${prefix}/bin/g95
+}
+
+variant gcc42 conflicts g95 gcc43 description "Use gfortran as fortran compiler" {
+  depends_lib-append    port:gcc42
+  build.cmd-append      config_fc \
+                        --fcompiler gnu95 \
+                        --f77exec ${prefix}/bin/gfortran-mp-4.2 \
+                        --f90exec ${prefix}/bin/gfortran-mp-4.2
+}
+
+variant gcc43 conflicts g95 gcc42 description "Use gfortran as fortran compiler" {
+  depends_lib-append    port:gcc43
+  build.cmd-append      config_fc \
+                        --fcompiler gnu95 \
+                        --f77exec ${prefix}/bin/gfortran-mp-4.3 \
+                        --f90exec ${prefix}/bin/gfortran-mp-4.3
+}
+
+if { ![variant_isset g95] && ![variant_isset gcc42] && ![variant_isset gcc43] } {
+  default_variants      +g95
+}

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071118/db1af42e/attachment.html