Revision: 69273 http://trac.macports.org/changeset/69273 Author: michaelld@macports.org Date: 2010-06-29 00:21:41 -0700 (Tue, 29 Jun 2010) Log Message: ----------- Added qt_mac and qt_x11 variants. Corrected use of qt4-* dependency. Modified Paths: -------------- trunk/dports/science/qfsm/Portfile Modified: trunk/dports/science/qfsm/Portfile =================================================================== --- trunk/dports/science/qfsm/Portfile 2010-06-29 07:20:40 UTC (rev 69272) +++ trunk/dports/science/qfsm/Portfile 2010-06-29 07:21:41 UTC (rev 69273) @@ -6,6 +6,7 @@ name qfsm version 0.52.0 +revision 1 categories science maintainers ecronin openmaintainer description A graphical tool for designing finite state machines @@ -22,22 +23,24 @@ sha1 6820603155270d0abdc5a302a647e9588f92a2dc \ rmd160 c60d6b49e1eaaffdf258f468e7e897479524baff -depends_lib-append path:bin/qmake-mac:qt4-mac - -set qmake_path ${prefix}/bin/qmake - post-patch { reinplace "s|SET(CMAKE_INSTALL_PREFIX \"/usr\")|SET(CMAKE_INSTALL_PREFIX \"${prefix}\")|g" ${worksrcpath}/CMakeLists.txt } -configure.args \ - -DQT_LIBRARY_DIR=${frameworks_dir} \ - -DQT_QMAKE_EXECUTABLE=${qmake_path}-mac +variant qt_mac conflicts qt_x11 description {build with qt4-mac} { + depends_lib-append port:qt4-mac + configure.args \ + -DQT_LIBRARY_DIR=${prefix}/libexec/qt4-mac/lib \ + -DQT_QMAKE_EXECUTABLE=${prefix}/libexec/qt4-mac/bin/qmake +} -variant x11 description {build with qt4-x11} { - depends_lib-delete path:bin/qmake-mac:qt4-mac - configure.args-delete -DQT_QMAKE_EXECUTABLE=${qmake_path}-mac - +variant qt_x11 conflicts qt_mac description {build with qt4-x11} { depends_lib-append port:qt4-x11 - configure.args-append -DQT_QMAKE_EXECUTABLE=${qmake_path}-x11 + configure.args \ + -DQT_LIBRARY_DIR=${prefix}/libexec/qt4-x11/lib \ + -DQT_QMAKE_EXECUTABLE=${prefix}/libexec/qt4-x11/bin/qmake } + +if {![variant_isset qt_mac] && ![variant_isset qt_x11]} { + default_variants +qt_mac +}