[71348] trunk/dports/python/py26-pymvpa

[jameskyle at macports.org]

Revision: 71348
          http://trac.macports.org/changeset/71348
Author:   jameskyle at macports.org
Date:     2010-09-09 14:03:28 -0700 (Thu, 09 Sep 2010)
Log Message:
-----------
Upgraded to the 0.4.5.dev23 branch. This eliminates the need for patches to work with libsvm.

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

Removed Paths:
-------------
    trunk/dports/python/py26-pymvpa/files/patch-mvpa.diff
    trunk/dports/python/py26-pymvpa/files/setup-py.diff

Modified: trunk/dports/python/py26-pymvpa/Portfile
===================================================================
--- trunk/dports/python/py26-pymvpa/Portfile	2010-09-09 21:03:25 UTC (rev 71347)
+++ trunk/dports/python/py26-pymvpa/Portfile	2010-09-09 21:03:28 UTC (rev 71348)
@@ -5,7 +5,7 @@
 PortGroup               python26 1.0
 
 name                    py26-pymvpa
-version                 0.4.4
+version                 0.4.5.dev23
 categories              python
 
 platforms               darwin
@@ -36,11 +36,11 @@
 
 configure.args          --with-libsvm
 build.args              --with-libsvm
-patch.pre_args          -p1
+#patch.pre_args          -p1
 
-patchfiles              patch-mvpa.diff setup-py.diff
+#patchfiles              setup-py.diff
 
-build.target            build_ext
+build.target            build
 
 pre-fetch {
     if {[file exists ${prefix}/share/doc/mvpa]} {
@@ -82,15 +82,15 @@
 configure.env           CC=${prefix}/bin/gcc-mp-${gccversion} \
                         CPP=${prefix}/bin/g++-mp-${gccversion}
 
-build.env           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"
+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           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 {

Deleted: trunk/dports/python/py26-pymvpa/files/patch-mvpa.diff
===================================================================
--- trunk/dports/python/py26-pymvpa/files/patch-mvpa.diff	2010-09-09 21:03:25 UTC (rev 71347)
+++ trunk/dports/python/py26-pymvpa/files/patch-mvpa.diff	2010-09-09 21:03:28 UTC (rev 71348)
@@ -1,14 +0,0 @@
-diff --git a/mvpa/clfs/libsvmc/svmc.i b/mvpa/clfs/libsvmc/svmc.i
-index 2b50c85..16bfa5d 100644
---- a/mvpa/clfs/libsvmc/svmc.i
-+++ b/mvpa/clfs/libsvmc/svmc.i
-@@ -146,9 +146,6 @@ struct svm_model
- 				// 0 if svm_model is created by svm_train
- };
- 
--/* one really wants to configure verbosity within python! */
--void svm_set_verbosity(int verbosity_flag);
--
- struct svm_model *svm_train(const struct svm_problem *prob, const struct svm_parameter *param);
- 
- void svm_cross_validation(const struct svm_problem *prob, const struct svm_parameter *param, int nr_fold, double *target);

Deleted: trunk/dports/python/py26-pymvpa/files/setup-py.diff
===================================================================
--- trunk/dports/python/py26-pymvpa/files/setup-py.diff	2010-09-09 21:03:25 UTC (rev 71347)
+++ trunk/dports/python/py26-pymvpa/files/setup-py.diff	2010-09-09 21:03:28 UTC (rev 71348)
@@ -1,21 +0,0 @@
---- py25-pymvpa-0.4.2/setup.py.old	2009-05-27 20:12:50.000000000 -0700
-+++ py25-pymvpa-0.4.2/setup.py	2009-05-27 20:14:12.000000000 -0700
-@@ -38,17 +38,7 @@
- if sys.argv.count('--with-libsvm'):
-     # clean argv if necessary (or distutils will complain)
-     sys.argv.remove('--with-libsvm')
--    # look for libsvm in some places, when local one is not used
--    if not have_libsvm:
--        if not sys.platform.startswith('win'):
--            include_dirs += ['/usr/include/libsvm-2.0/libsvm',
--                             '/usr/include/libsvm',
--                             '/usr/local/include/libsvm',
--                             '/usr/local/include/libsvm-2.0/libsvm',
--                             '/usr/local/include']
--        else:
--            # no clue on windows
--            pass
-+
-     have_libsvm = True
- 
- 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100909/e9705fe2/attachment-0001.html>