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

[takeshi at macports.org]

Revision: 113472
          https://trac.macports.org/changeset/113472
Author:   takeshi at macports.org
Date:     2013-11-16 17:11:21 -0800 (Sat, 16 Nov 2013)
Log Message:
-----------
berkeley_upc: updated to 2.18.0. removed deprecated variants. added openmpi and mpich (openmpi is no longer a default)

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

Modified: trunk/dports/lang/berkeley_upc/Portfile
===================================================================
--- trunk/dports/lang/berkeley_upc/Portfile	2013-11-17 01:10:37 UTC (rev 113471)
+++ trunk/dports/lang/berkeley_upc/Portfile	2013-11-17 01:11:21 UTC (rev 113472)
@@ -4,7 +4,7 @@
 PortSystem          1.0
 
 name                berkeley_upc
-version             2.16.2
+version             2.18.0
 categories          lang science parallel
 maintainers         takeshi
 description         Unified Parallel C runtime
@@ -16,12 +16,11 @@
 platforms           darwin
 master_sites        ${homepage}/download/release/
 
-checksums           md5     d2a763f924fcacc337f37ec464e3a425 \
-                    sha1    c8bb0c58f9e65884bd47036f1f3ea86703142692 \
-                    rmd160  841af6df6bab024ee59f1787293e20d5ee3bec1f
+checksums           md5     12afd1c1fef2831b6071ac83ef570866 \
+                    sha1    60d7b73637bf522daeba53778160b52323bfe2e4 \
+                    rmd160  90e0a1ad142ba877f153c07e8e8579c4336b8430
 
-depends_lib         port:openmpi \
-                    port:upc \
+depends_lib         port:upc \
                     bin:perl:perl5
 
 use_parallel_build  yes
@@ -34,8 +33,7 @@
 
 configure.cc        ${prefix}/lib/upc/bin/gcc
 configure.cxx       ${prefix}/lib/upc/bin/g++
-configure.env       MPI_CC=${prefix}/lib/openmpi/bin/mpicc \
-                    MPI_CFLAGS="-O3" \
+configure.env       MPI_CFLAGS="-O3" \
                     GCCUPC_TRANS=${prefix}/lib/upc/bin/upc
               
 configure.args-append \
@@ -50,13 +48,17 @@
                     --disable-portals \
                     --disable-dcmf \
                     --disable-sci \
-                    --enable-mpi \
+                    --disable-mpi \
                     --enable-udp \
                     --enable-smp \
                     --disable-pshm \
                     --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
+}
 
 post-configure {
     reinplace "s|-L\$(top_builddir) -lgasnet_tools-seq|\$(top_builddir)/libgasnet_tools-seq.a|" ${worksrcpath}/dbg_gupc/gasnet/other/amudp/Makefile
@@ -74,12 +76,18 @@
     }
 }
 
-variant gcc44 conflicts gcc45 description {deprecated dummy variant} {
+variant openmpi description {build with openmpi} conflicts mpich {
+    depends_lib-append      port:openmpi
+    configure.env-append    MPI_CC=${prefix}/lib/openmpi/bin/mpicc
 }
 
-variant gcc45 conflicts gcc44 description {deprecated dummy variant} {
+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
 livecheck.url       ${homepage}
 livecheck.regex     {Berkeley UPC version ([0-9]+\.[0-9]+\.[0-9]+)}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131116/5f3b7293/attachment.html>