[110109] trunk/dports/python/py26-pymvpa/Portfile

[jeremyhu at macports.org]

Revision: 110109
          https://trac.macports.org/changeset/110109
Author:   jeremyhu at macports.org
Date:     2013-08-26 01:51:50 -0700 (Mon, 26 Aug 2013)
Log Message:
-----------
py26-pymvpa: Use fortran recipe to fix build on Mavericks.  Replace no_shogun variant with shogun variant (default on).

Modified Paths:
--------------
    trunk/dports/python/py26-pymvpa/Portfile

Modified: trunk/dports/python/py26-pymvpa/Portfile
===================================================================
--- trunk/dports/python/py26-pymvpa/Portfile	2013-08-26 08:28:43 UTC (rev 110108)
+++ trunk/dports/python/py26-pymvpa/Portfile	2013-08-26 08:51:50 UTC (rev 110109)
@@ -6,7 +6,7 @@
 
 name                    py26-pymvpa
 version                 0.4
-revision                1
+revision                2
 epoch                   1
 categories              python
 
@@ -52,7 +52,7 @@
     }
 
 
-    if {![variant_isset no_shogun]} {
+    if {[variant_isset shogun]} {
       if {![file exists ${python.pkgd}/sg.so]} {
         ui_error "To install pymvpa with the shogun variant, shogun must be installed with the python variant."
         return -code error "incompatible shogun installation"
@@ -61,46 +61,24 @@
 
 }
 
-variant no_shogun description {Do not build shogun} {
+variant shogun description {Do not build shogun} {
     depends_lib-delete port:shogun
 }
+default_variants-append +shogun
 
-variant gcc43 conflicts gcc44 gcc45 gcc46 gcc47 description {build with gcc 4.3} {}
-variant gcc44 conflicts gcc43 gcc45 gcc46 gcc47 description {build with gcc 4.4} {}
-variant gcc45 conflicts gcc43 gcc44 gcc46 gcc47 description {build with gcc 4.5} {}
-variant gcc46 conflicts gcc43 gcc44 gcc45 gcc47 description {build with gcc 4.6} {}
-variant gcc47 conflicts gcc43 gcc44 gcc45 gcc46 description {build with gcc 4.7} {}
+configure.env           CC=${configure.cc} \
+                        CPP=${configure.cxx}
 
-if {[variant_isset gcc43]} {
-    set gccversion 4.3
-} elseif {[variant_isset gcc44]} {
-    set gccversion 4.4
-} elseif {[variant_isset gcc45]} {
-    set gccversion 4.5
-} elseif {[variant_isset gcc46]} {
-    set gccversion 4.6
-} else {
-    default_variants +gcc47
-    set gccversion 4.7
-}
+build.env-append        CC=${configure.cc} \
+                        CPP=${configure.cxx} \
+                        CCFLAGS="${configure.cppflags} ${configure.cflags}" \
+                        CPPFLAGS="${configure.cppflags} ${configure.cxxflags}"
 
-set gccnumber [join [split ${gccversion} .] ""]
- 
-configure.compiler      macports-gcc-${gccversion}
-configure.env           CC=${prefix}/bin/gcc-mp-${gccversion} \
-                        CPP=${prefix}/bin/g++-mp-${gccversion}
+destroot.env-append     CC=${configure.cc} \
+                        CPP=${configure.cxx} \
+                        CCFLAGS="${configure.cppflags} ${configure.cflags}" \
+                        CPPFLAGS="${configure.cppflags} ${configure.cxxflags}"
 
-build.env-append        CC=${prefix}/bin/gcc-mp-${gccversion} \
-                        CPP=${prefix}/bin/g++-mp-${gccversion} \
-                        CCFLAGS="-I${prefix}/include -L${prefix}/lib" \
-                        CPPFLAGS="-I${prefix}/include -L${prefix}/lib"
-
-destroot.env-append     CC=${prefix}/bin/gcc-mp-${gccversion} \
-                        CPP=${prefix}/bin/g++-mp-${gccversion} \
-                        CCFLAGS="-I${prefix}/include -L${prefix}/lib" \
-                        CPPFLAGS="-I${prefix}/include -L${prefix}/lib"
-
-
 post-destroot {
   xinstall -m 755 -d "${destroot}${prefix}/share/doc/"
   file delete ${worksrcpath}/doc/todo.txt
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130826/7f486bb2/attachment.html>