Revision: 76452 http://trac.macports.org/changeset/76452 Author: jameskyle@macports.org Date: 2011-02-23 14:16:40 -0800 (Wed, 23 Feb 2011) Log Message: ----------- Added gcc* dependencies to each variant. Fixed issue where swig wasn't finding the python.swg file. #26444 Modified Paths: -------------- trunk/dports/python/py26-pymvpa/Portfile Added Paths: ----------- trunk/dports/python/py26-pymvpa/files/setup-py.diff Modified: trunk/dports/python/py26-pymvpa/Portfile =================================================================== --- trunk/dports/python/py26-pymvpa/Portfile 2011-02-23 21:39:15 UTC (rev 76451) +++ trunk/dports/python/py26-pymvpa/Portfile 2011-02-23 22:16:40 UTC (rev 76452) @@ -40,7 +40,7 @@ build.args --with-system-libsvm #patch.pre_args -p1 -#patchfiles setup-py.diff +patchfiles setup-py.diff build.target build @@ -65,9 +65,15 @@ depends_lib-delete port:shogun } -variant gcc43 conflicts gcc44 description {build with gcc 4.3} {} -variant gcc44 conflicts gcc43 description {build with gcc 4.4} {} -variant gcc45 conflicts gcc43 gcc44 description {build with gcc 4.5} {} +variant gcc43 conflicts gcc44 description {build with gcc 4.3} { + depends_build-append port:gcc43 +} +variant gcc44 conflicts gcc43 description {build with gcc 4.4} { + depends_build-append port:gcc44 +} +variant gcc45 conflicts gcc43 gcc44 description {build with gcc 4.5} { + depends_build-append port:gcc45 +} if {[variant_isset gcc43]} { set gccversion 4.3 @@ -107,5 +113,9 @@ file copy ${worksrcpath}/doc ${destroot}${prefix}/share/doc/mvpa } +post-patch { + reinplace "s|@@@MACPORTS_PYTHON_SWIG_PATH@@@|${prefix}/share/swig/2.0.1/python|g" ${worksrcpath}/setup.py +} + livecheck.url http://git.debian.org/?p=pkg-exppsy/pymvpa.git livecheck.regex {upstream\/([0-9.]+)} Added: trunk/dports/python/py26-pymvpa/files/setup-py.diff =================================================================== --- trunk/dports/python/py26-pymvpa/files/setup-py.diff (rev 0) +++ trunk/dports/python/py26-pymvpa/files/setup-py.diff 2011-02-23 22:16:40 UTC (rev 76452) @@ -0,0 +1,10 @@ +--- setup.py.orig 2011-02-23 14:05:16.000000000 -0800 ++++ setup.py 2011-02-23 14:06:48.000000000 -0800 +@@ -27,6 +27,7 @@ + # platform-specific settings + if sys.platform == "darwin": + extra_link_args.append("-bundle") ++ libsvmc_include_dirs += ["@@@MACPORTS_PYTHON_SWIG_PATH@@@"] + + if sys.platform.startswith('linux'): + # need to look for numpy (header location changes with v1.3)