[56239] trunk/dports

[jameskyle at macports.org]

Revision: 56239
          http://trac.macports.org/changeset/56239
Author:   jameskyle at macports.org
Date:     2009-08-25 09:51:00 -0700 (Tue, 25 Aug 2009)
Log Message:
-----------
Incremental commit on python version detection

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

Modified: trunk/dports/math/shogun/Portfile
===================================================================
--- trunk/dports/math/shogun/Portfile	2009-08-25 15:56:17 UTC (rev 56238)
+++ trunk/dports/math/shogun/Portfile	2009-08-25 16:51:00 UTC (rev 56239)
@@ -58,7 +58,9 @@
 # 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]} {lappend interfaces "python,python_modular"}
+if {[variant_isset python] || [variant_isset python26]} {
+  lappend interfaces "python,python_modular"
+}
 if {[variant_isset r]} {lappend interfaces "r"}
 if {[variant_isset octave]} {lappend interfaces "octave,octave_modular"}
 if {[variant_isset elwms]  && !([variant_isset python] &&
@@ -81,14 +83,31 @@
 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"
+  }
   configure.args-append \
       --includes=${prefix}/Library/Frameworks/Python.framework/Versions/2.5/include/python2.5 \
-      --python=${prefix}/bin/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"
+  }
+  configure.args-append \
+  --includes=${prefix}/Library/Frameworks/Python.framework/Versions/2.6/include/python2.6 \
+  --python=${prefix}/bin/python2.6
+  
+  depends_lib-append port:python26 \
+                     port:py26-numpy
+}
+
 variant r description {Build the R API} {
   depends_lib-append port:R
 }
@@ -109,13 +128,13 @@
 pre-extract {
   # Before doing anything, verify the correct swig bindings are present for
   # our variants
-  if {[variant_isset python]} {
+  if {[variant_isset python] || [variant_isset python26]} {
     if {![file exists ${prefix}/share/swig/1.3.39/python/python.swg]} {
       ui_error "To install shogun with the python variant, swig must be installed with the python variant as well."
       return -code error "incompatible swig installation"
     }
   }
-  
+    
   if {[variant_isset r]} {
     if {![file exists ${prefix}/share/swig/1.3.39/r/r.swg]} {
       ui_error "To install shogun with the r variant, swig must be installed with the r variant as well."

Modified: trunk/dports/multimedia/x264/Portfile
===================================================================
--- trunk/dports/multimedia/x264/Portfile	2009-08-25 15:56:17 UTC (rev 56238)
+++ trunk/dports/multimedia/x264/Portfile	2009-08-25 16:51:00 UTC (rev 56239)
@@ -5,7 +5,7 @@
 PortGroup               muniversal 1.0
 
 name		x264
-version		20090408
+version		20090810
 revision        1
 categories	multimedia
 platforms	darwin
@@ -20,10 +20,11 @@
 master_sites	ftp://ftp.videolan.org/pub/videolan/x264/snapshots/
 distname	${name}-snapshot-${version}-2245
 
-checksums       md5     d1c7323a052740b1c16f4aea917cb561 \
-                sha1    9dae6f86da058dc0a96b49102ff0dedb33c5a5a8 \
-                rmd160  98e2e0089be071165363324946c0eb296a6f002e
+checksums           md5     6671b66a0a83769c54ba9cd10ad598d8 \
+                    sha1    26abd8c1dc05dae04f99b33a689e4ee7debd9126 \
+                    rmd160  f8297dcb4a43207f5c03165a2320425a640ff4d7
 
+
 use_bzip2	yes
 
 pre-extract {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090825/62587f6f/attachment.html>