[88316] trunk/dports/math

ram at macports.org ram at macports.org
Wed Dec 28 04:21:06 PST 2011


Revision: 88316
          http://trac.macports.org/changeset/88316
Author:   ram at macports.org
Date:     2011-12-28 04:21:05 -0800 (Wed, 28 Dec 2011)
Log Message:
-----------
math/fftw-3{,single,long}: add gcc46 variant, closes #32668

Modified Paths:
--------------
    trunk/dports/math/fftw-3/Portfile
    trunk/dports/math/fftw-3-long/Portfile
    trunk/dports/math/fftw-3-single/Portfile

Modified: trunk/dports/math/fftw-3/Portfile
===================================================================
--- trunk/dports/math/fftw-3/Portfile	2011-12-28 12:20:52 UTC (rev 88315)
+++ trunk/dports/math/fftw-3/Portfile	2011-12-28 12:21:05 UTC (rev 88316)
@@ -76,7 +76,7 @@
   }
 }
 
-variant gcc42 description {create Fortran wrappers using gcc42} conflicts gcc43 gcc44 gcc45 g95 {
+variant gcc42 description {create Fortran wrappers using gcc42} conflicts gcc43 gcc44 gcc45 gcc46 g95 {
     depends_lib-append    port:gcc42
     depends_skip_archcheck gcc42
     configure.f77         gfortran-mp-4.2
@@ -90,7 +90,7 @@
     }
 }
 
-variant gcc43 description {create Fortran wrappers using gcc43} conflicts gcc42 gcc44 gcc45 g95 {
+variant gcc43 description {create Fortran wrappers using gcc43} conflicts gcc42 gcc44 gcc45 gcc46 g95 {
     depends_lib-append    port:gcc43
     depends_skip_archcheck gcc43
     configure.f77         gfortran-mp-4.3
@@ -104,7 +104,7 @@
     }
 }
 
-variant gcc44 description {create Fortran wrappers using gcc44} conflicts gcc42 gcc43 gcc45 g95 {
+variant gcc44 description {create Fortran wrappers using gcc44} conflicts gcc42 gcc43 gcc45 gcc46 g95 {
     depends_lib-append    port:gcc44
     depends_skip_archcheck gcc44
     configure.f77         gfortran-mp-4.4
@@ -118,7 +118,7 @@
     }
 }
 
-variant gcc45 description {create Fortran wrappers using gcc45} conflicts gcc42 gcc43 gcc44 g95 {
+variant gcc45 description {create Fortran wrappers using gcc45} conflicts gcc42 gcc43 gcc44 gcc46 g95 {
     depends_lib-append    port:gcc45
     depends_skip_archcheck gcc45
     configure.f77         gfortran-mp-4.5
@@ -132,7 +132,21 @@
     }
 }
 
-variant g95 description {create Fortran wrappers using f95} conflicts gcc42 gcc43 gcc44 gcc45 {
+variant gcc46 description {create Fortran wrappers using gcc46} conflicts gcc42 gcc43 gcc44 gcc45 g95 {
+    depends_lib-append    port:gcc46
+    depends_skip_archcheck gcc46
+    configure.f77         gfortran-mp-4.6
+    configure.args-delete --disable-fortran
+    if { ${os.arch} == "i386" } {
+        lappend merger_configure_args(ppc)     "--disable-fortran"
+        lappend merger_configure_args(ppc64)   "--disable-fortran"
+    } else {
+        lappend merger_configure_args(i386)    "--disable-fortran"
+        lappend merger_configure_args(x86_64)  "--disable-fortran"
+    }
+}
+
+variant g95 description {create Fortran wrappers using f95} conflicts gcc42 gcc43 gcc44 gcc45 gcc46 {
     depends_lib-append    port:g95
     depends_skip_archcheck g95
     configure.f77         g95

Modified: trunk/dports/math/fftw-3-long/Portfile
===================================================================
--- trunk/dports/math/fftw-3-long/Portfile	2011-12-28 12:20:52 UTC (rev 88315)
+++ trunk/dports/math/fftw-3-long/Portfile	2011-12-28 12:21:05 UTC (rev 88316)
@@ -62,7 +62,7 @@
 
 use_parallel_build yes
 
-variant gcc42 description {create Fortran wrappers using gcc42} conflicts gcc43 gcc44 gcc45 g95 {
+variant gcc42 description {create Fortran wrappers using gcc42} conflicts gcc43 gcc44 gcc45 gcc46 g95 {
     depends_lib-append    port:gcc42
     configure.f77         gfortran-mp-4.2
     configure.args-delete --disable-fortran
@@ -75,7 +75,7 @@
     }
 }
 
-variant gcc43 description {create Fortran wrappers using gcc43} conflicts gcc42 gcc44 gcc45 g95 {
+variant gcc43 description {create Fortran wrappers using gcc43} conflicts gcc42 gcc44 gcc45 gcc46 g95 {
     depends_lib-append    port:gcc43
     configure.f77         gfortran-mp-4.3
     configure.args-delete --disable-fortran
@@ -88,7 +88,7 @@
     }
 }
 
-variant gcc44 description {create Fortran wrappers using gcc44} conflicts gcc42 gcc43 gcc45 g95 {
+variant gcc44 description {create Fortran wrappers using gcc44} conflicts gcc42 gcc43 gcc45 gcc46 g95 {
     depends_lib-append    port:gcc44
     configure.f77         gfortran-mp-4.4
     configure.args-delete --disable-fortran
@@ -101,7 +101,7 @@
     }
 }
 
-variant gcc45 description {create Fortran wrappers using gcc45} conflicts gcc42 gcc43 gcc44 g95 {
+variant gcc45 description {create Fortran wrappers using gcc45} conflicts gcc42 gcc43 gcc44 gcc46 g95 {
     depends_lib-append    port:gcc45
     depends_skip_archcheck gcc45
     configure.f77         gfortran-mp-4.5
@@ -115,7 +115,21 @@
     }
 }
 
-variant g95 description {create Fortran wrappers using f95} conflicts gcc42 gcc43 gcc44 gcc45 {
+variant gcc46 description {create Fortran wrappers using gcc46} conflicts gcc42 gcc43 gcc44 gcc45 g95 {
+    depends_lib-append    port:gcc46
+    depends_skip_archcheck gcc46
+    configure.f77         gfortran-mp-4.6
+    configure.args-delete --disable-fortran
+    if { ${os.arch} == "i386" } {
+        lappend merger_configure_args(ppc)     "--disable-fortran"
+        lappend merger_configure_args(ppc64)   "--disable-fortran"
+    } else {
+        lappend merger_configure_args(i386)    "--disable-fortran"
+        lappend merger_configure_args(x86_64)  "--disable-fortran"
+    }
+}
+
+variant g95 description {create Fortran wrappers using f95} conflicts gcc42 gcc43 gcc44 gcc45 gcc46 {
     depends_lib-append    port:g95
     configure.f77         g95
     configure.args-delete --disable-fortran

Modified: trunk/dports/math/fftw-3-single/Portfile
===================================================================
--- trunk/dports/math/fftw-3-single/Portfile	2011-12-28 12:20:52 UTC (rev 88315)
+++ trunk/dports/math/fftw-3-single/Portfile	2011-12-28 12:21:05 UTC (rev 88316)
@@ -81,7 +81,7 @@
     }
 }
 
-variant gcc42 description {create Fortran wrappers using gcc42} conflicts gcc43 gcc44 gcc45 g95 {
+variant gcc42 description {create Fortran wrappers using gcc42} conflicts gcc43 gcc44 gcc45 gcc46 g95 {
     depends_lib-append    port:gcc42
     depends_skip_archcheck gcc42
     configure.f77         gfortran-mp-4.2
@@ -95,7 +95,7 @@
     }
 }
 
-variant gcc43 description {create Fortran wrappers using gcc43} conflicts gcc42 gcc44 gcc45 g95 {
+variant gcc43 description {create Fortran wrappers using gcc43} conflicts gcc42 gcc44 gcc45 gcc46 g95 {
     depends_lib-append    port:gcc43
     depends_skip_archcheck gcc43
     configure.f77         gfortran-mp-4.3
@@ -109,7 +109,7 @@
     }
 }
 
-variant gcc44 description {create Fortran wrappers using gcc44} conflicts gcc42 gcc43 gcc45 g95 {
+variant gcc44 description {create Fortran wrappers using gcc44} conflicts gcc42 gcc43 gcc45 gcc46 g95 {
     depends_lib-append    port:gcc44
     depends_skip_archcheck gcc44
     configure.f77         gfortran-mp-4.4
@@ -123,7 +123,7 @@
     }
 }
 
-variant gcc45 description {create Fortran wrappers using gcc45} conflicts gcc42 gcc43 gcc44 g95 {
+variant gcc45 description {create Fortran wrappers using gcc45} conflicts gcc42 gcc43 gcc44 gcc46 g95 {
     depends_lib-append    port:gcc45
     depends_skip_archcheck gcc45
     configure.f77         gfortran-mp-4.5
@@ -137,7 +137,21 @@
     }
 }
 
-variant g95 description {create Fortran wrappers using f95} conflicts gcc42 gcc43 gcc44 gcc45 {
+variant gcc46 description {create Fortran wrappers using gcc46} conflicts gcc42 gcc43 gcc44 gcc45 g95 {
+    depends_lib-append    port:gcc46
+    depends_skip_archcheck gcc46
+    configure.f77         gfortran-mp-4.6
+    configure.args-delete --disable-fortran
+    if { ${os.arch} == "i386" } {
+        lappend merger_configure_args(ppc)     "--disable-fortran"
+        lappend merger_configure_args(ppc64)   "--disable-fortran"
+    } else {
+        lappend merger_configure_args(i386)    "--disable-fortran"
+        lappend merger_configure_args(x86_64)  "--disable-fortran"
+    }
+}
+
+variant g95 description {create Fortran wrappers using f95} conflicts gcc42 gcc43 gcc44 gcc45 gcc46 {
     depends_lib-append    port:g95
     depends_skip_archcheck g95
     configure.f77         g95
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111228/b45eefe0/attachment-0001.html>


More information about the macports-changes mailing list