[33718] trunk/dports/python

ram at macports.org ram at macports.org
Sun Feb 3 16:51:44 PST 2008


Revision: 33718
          http://trac.macosforge.org/projects/macports/changeset/33718
Author:   ram at macports.org
Date:     2008-02-03 16:51:42 -0800 (Sun, 03 Feb 2008)

Log Message:
-----------
numpy/scipy: readd g95 and gcc42 variants

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

Modified: trunk/dports/python/py-numpy/Portfile
===================================================================
--- trunk/dports/python/py-numpy/Portfile	2008-02-03 23:12:47 UTC (rev 33717)
+++ trunk/dports/python/py-numpy/Portfile	2008-02-04 00:51:42 UTC (rev 33718)
@@ -22,11 +22,22 @@
 
 patchfiles              patch-g95_link.diff
 
-depends_lib-append      port:gcc42 \
-                        port:fftw-3
+depends_lib-append      port:fftw-3
 
 post-patch {
   reinplace "s|@@MPORTS_PREFIX@@|${prefix}|" ${worksrcpath}/numpy/distutils/fcompiler/g95.py
 }
 
-build.cmd-append        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.2 --f90exec ${prefix}/bin/gfortran-mp-4.2"
+variant g95 conflicts gcc42 description "Use g95 as fortran compiler" {
+  depends_lib-append    port:g95
+  build.cmd-append      "config_fc --fcompiler g95 --f77exec ${prefix}/bin/g95 --f90exec ${prefix}/bin/g95"
+}
+
+variant gcc42 conflicts g95 description "Use gfortran-mp-4.2 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"
+}
+
+if { ![variant_isset g95] && ![variant_isset gcc42] } {
+  default_variants      +g95
+}

Modified: trunk/dports/python/py-scipy/Portfile
===================================================================
--- trunk/dports/python/py-scipy/Portfile	2008-02-03 23:12:47 UTC (rev 33717)
+++ trunk/dports/python/py-scipy/Portfile	2008-02-04 00:51:42 UTC (rev 33718)
@@ -20,8 +20,7 @@
                         sha1 65eff3e245f59b2af9adc70fad11daa40f0ba3e0 \
                         rmd160 391f2067f7dcc133e7e8622df93a2a0cd5ebbe5b
 
-depends_lib-append      port:gcc42 \
-                        lib:gnuplot:gnuplot \
+depends_lib-append      lib:gnuplot:gnuplot \
                         port:py-numpy
 
 worksrcdir              ${distname}
@@ -30,10 +29,24 @@
 
 build.env               CCFLAGS="-I${prefix}/include -L${prefix}/lib"
 
-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 g95 conflicts gcc42 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 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 no_gnuplot description "Don't depend on GNUPlot" {
   depends_lib-delete    lib:gnuplot:gnuplot
 }
+
+if { ![variant_isset g95] && ![variant_isset gcc42] } {
+  default_variants      +g95
+}

Modified: trunk/dports/python/py25-numpy/Portfile
===================================================================
--- trunk/dports/python/py25-numpy/Portfile	2008-02-03 23:12:47 UTC (rev 33717)
+++ trunk/dports/python/py25-numpy/Portfile	2008-02-04 00:51:42 UTC (rev 33718)
@@ -22,12 +22,23 @@
 
 patchfiles              patch-g95_link.diff
 
-depends_lib-append      port:gcc42 \
-                        port:fftw-3 \
+depends_lib-append      port:fftw-3 \
                         port:py25-hashlib
 
 post-patch {
   reinplace "s|@@MPORTS_PREFIX@@|${prefix}|" ${worksrcpath}/numpy/distutils/fcompiler/g95.py
 }
 
-build.cmd-append        "config_fc --fcompiler gnu95 --f77exec ${prefix}/bin/gfortran-mp-4.2 --f90exec ${prefix}/bin/gfortran-mp-4.2"
+variant g95 conflicts gcc42 description "Use g95 as fortran compiler" {
+  depends_lib-append    port:g95
+  build.cmd-append      "config_fc --fcompiler g95 --f77exec ${prefix}/bin/g95 --f90exec ${prefix}/bin/g95"
+}
+
+variant gcc42 conflicts g95 description "Use gfortran-mp-4.2 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"
+}
+
+if { ![variant_isset g95] && ![variant_isset gcc42] } {
+  default_variants      +g95
+}

Modified: trunk/dports/python/py25-scipy/Portfile
===================================================================
--- trunk/dports/python/py25-scipy/Portfile	2008-02-03 23:12:47 UTC (rev 33717)
+++ trunk/dports/python/py25-scipy/Portfile	2008-02-04 00:51:42 UTC (rev 33718)
@@ -20,8 +20,7 @@
                         sha1 65eff3e245f59b2af9adc70fad11daa40f0ba3e0 \
                         rmd160 391f2067f7dcc133e7e8622df93a2a0cd5ebbe5b
 
-depends_lib-append      port:gcc42 \
-                        lib:gnuplot:gnuplot \
+depends_lib-append      lib:gnuplot:gnuplot \
                         port:py25-numpy
 
 worksrcdir              ${distname}
@@ -30,10 +29,24 @@
 
 build.env               CCFLAGS="-I${prefix}/include -L${prefix}/lib"
 
-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 g95 conflicts gcc42 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 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 no_gnuplot description "Don't depend on GNUPlot" {
   depends_lib-delete    lib:gnuplot:gnuplot
 }
+
+if { ![variant_isset g95] && ![variant_isset gcc42] } {
+  default_variants      +g95
+}

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080203/6d4d448c/attachment-0001.html


More information about the macports-changes mailing list