Revision: 69216 http://trac.macports.org/changeset/69216 Author: michaelld@macports.org Date: 2010-06-28 18:56:20 -0700 (Mon, 28 Jun 2010) Log Message: ----------- Added variants for qwt and qwt52, and tested to make sure both work. Fixed library dependency in py25 version. Modified Paths: -------------- trunk/dports/python/py25-pyqwt/Portfile trunk/dports/python/py26-pyqwt/Portfile Modified: trunk/dports/python/py25-pyqwt/Portfile =================================================================== --- trunk/dports/python/py25-pyqwt/Portfile 2010-06-28 23:44:16 UTC (rev 69215) +++ trunk/dports/python/py25-pyqwt/Portfile 2010-06-29 01:56:20 UTC (rev 69216) @@ -5,10 +5,11 @@ name py25-pyqwt version 5.2.0 +revision 1 platforms macosx categories python devel -maintainers nomaintainer +maintainers openmaintainer description PyQwt is a set of Python bindings for the Qwt toolkit long_description PyQwt is a set of Python bindings for the Qwt C++ class library which extends \ @@ -25,8 +26,7 @@ sha1 797f37c63dec660272f6a8ccfd16a017df0ad640 \ rmd160 e4c8a63d623d974cd500e29fbc62255746ca7feb -depends_lib path:bin/qmake-mac:qt4-mac \ - port:qwt52 \ +depends_lib port:py25-pyqt4 \ port:py25-numpy worksrcdir ${worksrcdir}/configure @@ -42,3 +42,15 @@ move ${destroot}${frameworks_dir}/Python.framework/Versions/2.5/lib/python2.5 \ ${destroot}${prefix}/lib/python2.5 } + +variant qwt conflicts qwt52 description {Use qwt} { + depends_lib-append port:qwt +} + +variant qwt52 conflicts qwt description {Use qwt52} { + depends_lib-append port:qwt52 +} + +if {![variant_isset qwt] && ![variant_isset qwt52]} { + default_variants +qwt52 +} Modified: trunk/dports/python/py26-pyqwt/Portfile =================================================================== --- trunk/dports/python/py26-pyqwt/Portfile 2010-06-28 23:44:16 UTC (rev 69215) +++ trunk/dports/python/py26-pyqwt/Portfile 2010-06-29 01:56:20 UTC (rev 69216) @@ -5,10 +5,11 @@ name py26-pyqwt version 5.2.0 +revision 1 platforms macosx categories python devel -maintainers macsforever2000 +maintainers macsforever2000 michaelld description PyQwt is a set of Python bindings for the Qwt toolkit long_description PyQwt is a set of Python bindings for the Qwt C++ class library which extends \ @@ -26,7 +27,6 @@ rmd160 e4c8a63d623d974cd500e29fbc62255746ca7feb depends_lib port:py26-pyqt4 \ - port:qwt52 \ port:py26-numpy worksrcdir ${worksrcdir}/configure @@ -36,3 +36,15 @@ configure.universal_args-delete --disable-dependency-tracking build.target + +variant qwt conflicts qwt52 description {Use qwt} { + depends_lib-append port:qwt +} + +variant qwt52 conflicts qwt description {Use qwt52} { + depends_lib-append port:qwt52 +} + +if {![variant_isset qwt] && ![variant_isset qwt52]} { + default_variants +qwt52 +}