[110682] trunk/dports/science/raxml/Portfile

[cal at macports.org]

Revision: 110682
          https://trac.macports.org/changeset/110682
Author:   cal at macports.org
Date:     2013-09-03 12:55:27 -0700 (Tue, 03 Sep 2013)
Log Message:
-----------
raxml: update to 7.7.6, closes #39715, maintainer

Modified Paths:
--------------
    trunk/dports/science/raxml/Portfile

Modified: trunk/dports/science/raxml/Portfile
===================================================================
--- trunk/dports/science/raxml/Portfile	2013-09-03 18:22:23 UTC (rev 110681)
+++ trunk/dports/science/raxml/Portfile	2013-09-03 19:55:27 UTC (rev 110682)
@@ -2,9 +2,12 @@
 # $Id$
 
 PortSystem          1.0
+PortGroup           github 1.0
 
 name                raxml
-version             7.2.9
+github.setup        stamatak standard-RAxML 7.7.6 v
+checksums           sha256  7562b307bc50e38162f104271793a1c8f98f866c2342bea21afe6df6a982fd82 \
+                    rmd160  da76d6623515b7d8f78a69aaf4eec713508789af
 description         Estimation of phylogenetic trees
 long_description    RAxML is a program for sequential and parallel \
                     estimation of phylogenetic trees written by \
@@ -14,24 +17,26 @@
 categories          science biology
 homepage            http://www.exelixis-lab.org/
 platforms           darwin
-master_sites        http://sco.h-its.org/exelixis/software/
-distname            RAxML-${version}
-checksums           md5     028b70c7c96900e1f70cdc2c2acab449 \
-                    sha1    a038b72e197434d7fa8a7c35687b70adb4b0750b
-use_bzip2           yes
 
-patchfiles          Makefiles.patch
-
 use_configure       no
 
 #Strings used by the variant options
 set HPCm ""
 set HPCb ""
-set SSEm ""
-set SSEb ""
+set EXTm ""
+set EXTb ""
 
+#Use the HYBRID implementation
+
+variant hybrid conflicts pthreads mpi description {Hybrid MPI implementation} {
+    depends_lib-append  port:openmpi
+    set HPCm ".HYBRID"
+    set HPCb "-HYBRID"
+    configure.cc        ${prefix}/bin/openmpicc
+}
+
 #Use the MPI implementation
-variant mpi conflicts pthreads description {MPI implementation} {
+variant mpi conflicts pthreads hybrid description {MPI implementation} {
     depends_lib-append  port:openmpi
     set HPCm ".MPI"
     set HPCb "-MPI"
@@ -39,7 +44,7 @@
 }
 
 #Use the pthreads implementation (default)
-variant pthreads conflicts mpi description {Pthreads implementation} {
+variant pthreads conflicts mpi hybrid description {Pthreads implementation} {
     set HPCm ".PTHREADS"
     set HPCb "-PTHREADS"
 }
@@ -48,15 +53,24 @@
     default_variants    +pthreads
 }
 
-#For Intel machines add SSE as a variant and use it by default with pthreads
+#For Intel machines add SSE and AVX as a variant and use it by default with pthreads
 if {${build_arch} == "i386" || ${build_arch} == "x86_64"} {
-    variant sse3 description {Use the SSE3 extended instruction set from Intel since 2004} {
-        set SSEm ".SSE3"
-        set SSEb "-SSE3"
+    variant sse3 conflicts avx description {Use the SSE3 extended instruction set from Intel since 2004} {
+        set EXTm ".SSE3"
+        set EXTb "-SSE3"
     }
 
+    variant avx conflicts sse3 description {Use the AVX extended instruction set from Intel i7 (sandy bridge) and AMD Bulldozer} {
+        set EXTm ".AVX"
+        set EXTb "-AVX"
+    }
+
     if {![catch {sysctl hw.optional.sse3} result] && ${result} == 1} {
-        default_variants-append  +sse3
+        if {![catch {sysctl hw.optional.avx1_0} result] && ${result} == 1} {
+            default_variants-append +avx
+        } else {
+            default_variants-append  +sse3
+        }
     }
 } else {
     post-patch {
@@ -72,11 +86,11 @@
 
 #Make sure we are using the correct Makefile for this variant combo
 pre-build {
-    build.pre_args      -f Makefile${SSEm}${HPCm}.gcc
+    build.pre_args      -f Makefile${EXTm}${HPCm}.gcc
     build.args-append   CC="${configure.cc}"
 }
 
 #We only need the single raxml binary
 destroot {
-    copy ${worksrcpath}/raxmlHPC${HPCb}${SSEb} ${destroot}${prefix}/bin/raxml
+    copy ${worksrcpath}/raxmlHPC${HPCb}${EXTb} ${destroot}${prefix}/bin/raxml
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130903/040d3be7/attachment.html>