Modified: trunk/dports/security/Vidalia/Portfile (69264 => 69265)

--- trunk/dports/security/Vidalia/Portfile	2010-06-29 07:06:50 UTC (rev 69264)
+++ trunk/dports/security/Vidalia/Portfile	2010-06-29 07:10:51 UTC (rev 69265)
@@ -6,6 +6,7 @@
 
 name                Vidalia
 version             0.2.9
+revision            1
 categories          security net aqua
 maintainers         mnick openmaintainer
 description         Vidalia is a controller GUI for the Tor software
@@ -23,26 +24,30 @@
                     sha1    cf65dc982b97365664f66fe7c2d265342156cf37 \
                     rmd160  45df9f968a041a8ed70b974ebcb59b8b0e5d1153
 
-depends_lib-append  port:tor path:bin/qmake-mac:qt4-mac
+depends_lib-append  port:tor
 
-set qmake_path      ${prefix}/bin/qmake
-
-configure.args  \
-        -DQT_LIBRARY_DIR=${frameworks_dir} \
-        -DQT_QMAKE_EXECUTABLE=${qmake_path}-mac
-
 destroot {
     file copy ${worksrcpath}/src/vidalia/Vidalia.app ${destroot}${applications_dir}/Vidalia.app
 }
 
-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_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 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
+}
+
 livecheck.type  	regexm
 livecheck.url 		${homepage}
 livecheck.regex 	stable release is:\n<a href=\"https://trac.vidalia-project.net/milestone/Vidalia%20(\[\\d\.\]+)\">