[116354] trunk/dports/math/gnudatalanguage/Portfile

[sean at macports.org]

Revision: 116354
          https://trac.macports.org/changeset/116354
Author:   sean at macports.org
Date:     2014-01-23 12:13:13 -0800 (Thu, 23 Jan 2014)
Log Message:
-----------
gnudatalanguage: use mpi portgroup

Modified Paths:
--------------
    trunk/dports/math/gnudatalanguage/Portfile

Modified: trunk/dports/math/gnudatalanguage/Portfile
===================================================================
--- trunk/dports/math/gnudatalanguage/Portfile	2014-01-23 20:13:10 UTC (rev 116353)
+++ trunk/dports/math/gnudatalanguage/Portfile	2014-01-23 20:13:13 UTC (rev 116354)
@@ -4,7 +4,12 @@
 PortSystem                  1.0
 PortGroup                   cmake 1.0
 PortGroup                   conflicts_build 1.0
+PortGroup                   mpi 1.0
 
+compilers.choose            cc cxx
+mpi.choose
+mpi.setup                   -openmpi -openmpi_devel
+
 name                        gnudatalanguage
 version                     0.9.4
 revision                    4
@@ -125,15 +130,16 @@
     }
 }
 
-variant mpich description {build with support for MPICH (experimental)} {
-    depends_lib-append      path:bin/mpicc-mp:mpich-default
-    configure.args-delete   -DMPICH=OFF
-    configure.args-append   -DMPICH=ON
-    configure.args-append   -DMPI_COMPILER=${prefix}/bin/mpicc-mp \
-                            -DMPI_LIBRARY=MPI_LIBRARY-NOTFOUND
-} 
+pre-configure {
+    if {[mpi_variant_isset]} {
+        configure.args-delete   -DMPICH=OFF
+        configure.args-append   -DMPICH=ON
+        configure.args-append   -DMPI_COMPILER=${mpi.cc} \
+                                -DMPI_LIBRARY=MPI_LIBRARY-NOTFOUND
+    }
+}
 
-# gnudatalanguage does not build against wxWidgets30. 
+# gnudatalanguage does not build against wxWidgets30.
 # wxWidget support is not actively developed.
 variant wxWidgets description {deprecated compatibility variant} {
 #    supported_archs         ppc i386
@@ -153,61 +159,32 @@
 variant python requires python26 description {Legacy compatibility variant} {}
 
 variant python25 conflicts python26 python27 description {build with support for calling Python (2.5) from GDL (using numpy)} {
-    depends_lib-append      port:py25-numpy 
+    depends_lib-append      port:py25-numpy
     configure.args-append   -DPYTHONDIR=${frameworks_dir}/Python.framework/Versions/2.5 \
                             -DPYTHONVERSION=2.5
 }
 
 variant python26 conflicts python25 python27 description {build with support for calling Python (2.6) from GDL (using numpy)} {
-    depends_lib-append      port:py26-numpy 
+    depends_lib-append      port:py26-numpy
     configure.args-append   -DPYTHONDIR=${frameworks_dir}/Python.framework/Versions/2.6 \
                             -DPYTHONVERSION=2.6
 }
 
 variant python27 conflicts python25 python26 description {build with support for calling Python (2.7) from GDL (using numpy)} {
-    depends_lib-append      port:py27-numpy 
+    depends_lib-append      port:py27-numpy
     configure.args-append   -DPYTHONDIR=${frameworks_dir}/Python.framework/Versions/2.7 \
                             -DPYTHONVERSION=2.7
 }
 
-if {[variant_isset gcc44] || [variant_isset gcc45] || [variant_isset gcc46] || [variant_isset gcc47] || [variant_isset gcc48] || [variant_isset gcc49]} {
+if {[gcc_variant_isset]} {
     configure.args-delete   -DOPENMP=OFF
     configure.args-append   -DOPENMP=ON
+    # Detecting CXX compiler ABI info fails without this
+    configure.args-append   -D
 }
 
 variant openmp requires gcc44 description {Legacy compatibility variant} {}
 
-variant gcc44 conflicts gcc45 gcc46 gcc47 gcc48 gcc49 description {enabling of the support for OpenMP with gcc44} {
-    configure.compiler      macports-gcc-4.4
-# Detecting CXX compiler ABI info fails without this
-    configure.args-append   -D
-}
-
-variant gcc45 conflicts gcc44 gcc46 gcc47 gcc48 gcc49 description {enabling of the support for OpenMP with gcc45} {
-    configure.compiler      macports-gcc-4.5
-# Detecting CXX compiler ABI info fails without this
-    configure.args-append   -D
-}
-
-variant gcc46 conflicts gcc44 gcc45 gcc47 gcc48 gcc49 description {enabling of the support for OpenMP with gcc46} {
-    configure.compiler      macports-gcc-4.6
-# Detecting CXX compiler ABI info fails without this
-    configure.args-append   -D
-}
-
-variant gcc47 conflicts gcc44 gcc45 gcc46 gcc48 gcc49 description {enabling of the support for OpenMP with gcc47} {
-    configure.compiler      macports-gcc-4.7
-}
-
-variant gcc48 conflicts gcc44 gcc45 gcc46 gcc47 gcc49 description {enabling of the support for OpenMP with gcc48} {
-    configure.compiler      macports-gcc-4.8
-}
-
-variant gcc49 conflicts gcc44 gcc45 gcc46 gcc47 gcc48 description {enabling of the support for OpenMP with gcc49} {
-    configure.compiler      macports-gcc-4.9
-}
-
-
 variant gshhs description {build with support for GSHHS} {
     distfiles-append        ${gshhssrc}:gshhs \
                             ${gshhsdata}:gshhs
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140123/9d5f8567/attachment.html>