[56331] trunk/dports/python/py25-pymvpa/Portfile

[jameskyle at macports.org]

Revision: 56331
          http://trac.macports.org/changeset/56331
Author:   jameskyle at macports.org
Date:     2009-08-25 23:34:59 -0700 (Tue, 25 Aug 2009)
Log Message:
-----------
Removed matplotlib warning.
Corrected shogun check for new framework style shogun install

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

Modified: trunk/dports/python/py25-pymvpa/Portfile
===================================================================
--- trunk/dports/python/py25-pymvpa/Portfile	2009-08-26 06:34:54 UTC (rev 56330)
+++ trunk/dports/python/py25-pymvpa/Portfile	2009-08-26 06:34:59 UTC (rev 56331)
@@ -42,23 +42,20 @@
 
 build.target            build_ext
 
-pre-extract {
-    if {[file exists ${prefix}/share/doc/mvpa]} {
-        ui_error "It appears antother version of mvpa is installed"
-        ui_error "Only one version of pymvpa can be installed at one time"
-        return -code error "multiple mvpa installs detected"
-    }
-    
-    ui_msg "The default matplotlib build may fail to compile."
-    ui_msg "If this is the case, please manually install with +wxpython variant."
-    
+pre-fetch {
     if {![variant_isset no_shogun]} {
-      if {![file exists ${prefix}/lib/python2.5/site-packages/sg.so]} {
-        ui_error "To install pymvpa with the shogun variant, shogun must be installed with the python variant."
+      if {![file exists ${prefix}/Library/Frameworks/Python.framework/Versions/2.5/site-packages/sg.so]} {
+        ui_error "To install py25-pymvpa with the shogun variant, shogun must be installed with the python25 variant."
+        ui_error "This may require a manual install of shogun"
         return -code error "incompatible shogun installation"
       }
     }
     
+    if {[file exists ${prefix}/share/doc/mvpa]} {
+        ui_error "It appears antother version of mvpa is installed"
+        ui_error "Only one version of pymvpa can be installed at one time"
+        return -code error "multiple mvpa installs detected"
+    }
 }
 
 variant no_shogun description {Do not build shogun} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090825/8b678f23/attachment.html>