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

[jameskyle at macports.org]

Revision: 56330
          http://trac.macports.org/changeset/56330
Author:   jameskyle at macports.org
Date:     2009-08-25 23:34:54 -0700 (Tue, 25 Aug 2009)
Log Message:
-----------
Removed many variants (changed to required dependencies)
Python 2.6 support is built by default.
no_python26 variant added.
python25 variant added. requires no_python26.

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

Modified: trunk/dports/math/shogun/Portfile
===================================================================
--- trunk/dports/math/shogun/Portfile	2009-08-26 06:34:51 UTC (rev 56329)
+++ trunk/dports/math/shogun/Portfile	2009-08-26 06:34:54 UTC (rev 56330)
@@ -37,28 +37,30 @@
 depends_lib         port:swig \
                     port:atlas \
                     port:readline \
-                    port:glpk
-
+                    port:glpk \
+                    port:python26 \
+                    port:py26-numpy
+set python_prefix   ${prefix}/Library/Frameworks/Python.framework/Versions/2.6
 configure.args      --disable-svm-light \
                     --libs=${prefix}/lib \
                     --install-path=${prefix} \
                     --includes=${prefix}/include \
                     --destdir=${destroot} \
                     --cc=${prefix}/bin/gcc-mp-4.3 \
-                    --cxx=${prefix}/bin/g++-mp-4.3
+                    --cxx=${prefix}/bin/g++-mp-4.3 \
+                    --includes=${python_prefix}/include/python2.6 \
+                    --python=${python_prefix}/bin/python2.6 \
+                    --pydir=${python_prefix}/lib/python2.6/site-packages
+                      
 
 configure.cc        ${prefix}/bin/gcc-mp-4.3                    
 
 configure.compiler  macports-gcc-4.3
 
-# patchfiles          patch-src-configure.diff
-
-default_variants    +python26 +glpk
-
 # Interfaces are added by a comma delimited argument list to --interfaces.
 # We check for variants and then build this list accordingly
 set interfaces "libshogun libshogunui cmdline"
-if {[variant_isset python] || [variant_isset python26]} {
+if {[variant_isset python25] || [variant_isset python26]} {
   lappend interfaces "python,python_modular"
 }
 if {[variant_isset r]} {lappend interfaces "r"}
@@ -70,11 +72,6 @@
   lappend interfaces "elwms"
 }
 
-# disable glpk if variant is not set
-if {![variant_isset glpk]} {
-  configure.args-append --disable-glpk
-  depends_lib-delete port:glpk
-}
 #if {[variant_isset matlab]} {lappend interfaces "matlab"}
 set interfaces [join $interfaces ","]
 
@@ -82,34 +79,25 @@
 
 variant elwms description {Build elwms interface. requires python plus  one other interface} {}
 
-variant python description {Build Python API} {
-  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
-                         
-      
-  } 
+variant python25 requires no_python26 description {Build Python 2.5 API} {
+    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
 }
 
-variant python26 description {Build Python 2.6 API} {
-  if {[variant_isset python ]} {
-    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}/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
+variant no_python26 description {Do not build Python 2.6 API} {
+  configure.args-delete \
+  --includes=${python_prefix}/include/python2.6 \
+  --python=${python_prefix}/bin/python2.6 \
+  --pydir=${python_prefix}/lib/python2.6/site-packages
   
   
-  depends_lib-append port:python26 \
+  depends_lib-delete port:python26 \
                      port:py26-numpy
-  depends_lib-delete port:python25 \
-                     port:py25-numpy
+
 }
 
 variant r description {Build the R API} {
@@ -120,7 +108,10 @@
   depends_lib-append port:octave
 }
 
-variant glpk description {Add support for the Gnu Linear Programming Kit} {}
+variant no_glpk description {Disable glpk support} {
+    configure.args-append --disable-glpk
+     depends_lib-delete port:glpk
+}
 
 #variant matlab description {Build the Matlab API} {}
 variant doc description {Install the documentation for shogun} {
@@ -142,6 +133,9 @@
       set sversion 0.0.0
   }
   ui_debug "Found swig version ${sversion}"
+  if {[variant_isset python]} {
+      
+  }
   if {[variant_isset python] || [variant_isset python26]} {
       ui_debug "Looking for swig python interface at ${prefix}/share/swig/${sversion}/python/python.swg"
     if {![file exists ${prefix}/share/swig/${sversion}/python/python.swg]} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090825/017864b0/attachment-0001.html>