[56240] trunk/dports/math/shogun/Portfile

[jameskyle at macports.org]

Revision: 56240
          http://trac.macports.org/changeset/56240
Author:   jameskyle at macports.org
Date:     2009-08-25 09:51:03 -0700 (Tue, 25 Aug 2009)
Log Message:
-----------
Added python2.6 support to shogun.
Corrected shogun install to conform to the Framework python layout.

Modified Paths:
--------------
    trunk/dports/math/shogun/Portfile

Modified: trunk/dports/math/shogun/Portfile
===================================================================
--- trunk/dports/math/shogun/Portfile	2009-08-25 16:51:00 UTC (rev 56239)
+++ trunk/dports/math/shogun/Portfile	2009-08-25 16:51:03 UTC (rev 56240)
@@ -3,7 +3,7 @@
 
 categories          math science
 name                shogun
-version             0.7.3
+version             0.8.0
 
 
 maintainers         jameskyle
@@ -19,14 +19,14 @@
                     state of the art OCAS, LibSVM, SVMLight, SVMLin and GPDT.
 
 homepage            http://www.shogun-toolbox.org/
-master_sites        http://shogun-toolbox.org/archives/shogun/releases/0.7/sources/
+master_sites        http://shogun-toolbox.org/archives/shogun/releases/0.8/sources/
 use_bzip2           yes
 distfiles            shogun-${version}${extract.suffix}
 
 
-checksums           md5     e3cb08aa05c1da78cd96d71ef97669b0 \
-                    sha1    edad946b8ecbdf8e14f7de2ad54a95c4e2e72140 \
-                    rmd160  bfe7e456505e5306dcf8818ee1c1074d8b8b05e9
+checksums           md5     e21db2d96288223d8da2e7a49e237245 \
+                    sha1    bd4ef09f0a561eb3fb8ba3bd19939d69265f00c6 \
+                    rmd160  0bd5d7bb7a2fbf3ed6a276a6a5b92d7f774c8df4
 
 worksrcdir          ${name}-${version}/src
 
@@ -51,7 +51,7 @@
 
 configure.compiler  macports-gcc-4.3
 
-patchfiles          patch-src-configure.diff
+# patchfiles          patch-src-configure.diff
 
 default_variants    +python +glpk
 
@@ -83,29 +83,33 @@
 variant elwms description {Build elwms interface. requires python plus  one other interface} {}
 
 variant python description {Build Python API} {
-  if {[variant_isset python26 ]} {
-    ui_error "Cannot select both python and python26 variants"
-    return -code error "Python variant conflict"
+  if { ! [variant_isset python26 ]} {
+      configure.args-append \
+          --includes=${prefix}/Library/Frameworks/Python.framework/Versions/2.5/include/python2.5 \
+          --python=${prefix}/Library/Frameworks/Python.framework/Versions/2.5/bin/python \
+          --pydir=${prefix}/Library/Frameworks/Python.framework/Versions/2.5/site-packages
+      depends_lib-append port:python25 \
+                         port:py25-numpy
+                         
+      
   }
-  configure.args-append \
-      --includes=${prefix}/Library/Frameworks/Python.framework/Versions/2.5/include/python2.5 \
-      --python=${prefix}/Library/Frameworks/Python.framework/Versions/2.6/bin/python
-
-  depends_lib-append port:python25 \
-                     port:py25-numpy
 }
 
 variant python26 description {Build Python 2.6 API} {
   if {[variant_isset python ]} {
-    ui_error "Cannot select both python and python26 variants"
-    return -code error "Python variant conflict"
+    ui_warn "Cannot select both python and python26 variants"
+    ui_warn "Disabling the python variant"
   }
   configure.args-append \
   --includes=${prefix}/Library/Frameworks/Python.framework/Versions/2.6/include/python2.6 \
-  --python=${prefix}/bin/python2.6
+  --python=${prefix}/Library/Frameworks/Python.framework/Versions/2.6/bin/python2.6 \
+  --pydir=/Users/jkyle/Projects/macports/mports/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages
   
+  
   depends_lib-append port:python26 \
                      port:py26-numpy
+  depends_lib-delete port:python25 \
+                     port:py25-numpy
 }
 
 variant r description {Build the R API} {
@@ -150,8 +154,9 @@
   }
 }
 
-post-patch {
+pre-configure {
   reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/configure 
+  reinplace "s|= $\{_libdir\}/$\{_pydir\}|= $\{_pydir\}|g" ${worksrcpath}/configure
 }
 post-destroot {
   if {[variant_isset doc]} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090825/fe204640/attachment.html>