[116351] trunk/dports/lang/berkeley_upc/Portfile

[sean at macports.org]

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

Modified Paths:
--------------
    trunk/dports/lang/berkeley_upc/Portfile

Modified: trunk/dports/lang/berkeley_upc/Portfile
===================================================================
--- trunk/dports/lang/berkeley_upc/Portfile	2014-01-23 20:12:59 UTC (rev 116350)
+++ trunk/dports/lang/berkeley_upc/Portfile	2014-01-23 20:13:02 UTC (rev 116351)
@@ -2,9 +2,15 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup           mpi 1.0
 
+compilers.choose    cc cxx
+mpi.choose
+mpi.setup
+
 name                berkeley_upc
 version             2.18.0
+revision            1
 categories          lang science parallel
 maintainers         takeshi
 description         Unified Parallel C runtime
@@ -31,11 +37,9 @@
     reinplace "s|\$opt{'gccupc'}|1|g" ${worksrcpath}/multiconf.conf.in
 }
 
-configure.cc        ${prefix}/lib/upc/bin/gcc
-configure.cxx       ${prefix}/lib/upc/bin/g++
 configure.env       MPI_CFLAGS="-O3" \
                     GCCUPC_TRANS=${prefix}/lib/upc/bin/upc
-              
+
 configure.args-append \
                     --prefix=${prefix}/lib/${name} \
                     --mandir=${prefix}/share/man \
@@ -55,9 +59,13 @@
                     --enable-sptr-packed \
                     --disable-aligned-segments \
                     --with-multiconf=dbg_gccupc,opt_gccupc
-if {[variant_isset openmpi] || [variant_isset mpich]} {
-    configure.args-delete   --disable-mpi
-    configure.args-append   --enable-mpi
+
+pre-configure {
+    if {[mpi_variant_isset]} {
+        configure.args-delete   --disable-mpi
+        configure.args-append   --enable-mpi
+        configure.env-append    MPI_CC=${mpi.cc}
+    }
 }
 
 post-configure {
@@ -76,16 +84,6 @@
     }
 }
 
-variant openmpi description {build with openmpi} conflicts mpich {
-    depends_lib-append      port:openmpi
-    configure.env-append    MPI_CC=${prefix}/lib/openmpi/bin/mpicc
-}
-
-variant mpich description {build with openmpi} conflicts openmpi {
-    depends_lib-append      path:bin/mpicc-mp:mpich-default
-    configure.env-append    MPI_CC=${prefix}/bin/mpicc-mp
-}
-
 notes               "Choose openmpi or mpich to use MPI"
 
 livecheck.type      regex
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140123/427fb778/attachment.html>