[72622] trunk/dports/graphics/qwtplot3d/Portfile

[michaelld at macports.org]

Revision: 72622
          http://trac.macports.org/changeset/72622
Author:   michaelld at macports.org
Date:     2010-10-21 05:54:09 -0700 (Thu, 21 Oct 2010)
Log Message:
-----------
Changes to use qt4 portgroup.

Modified Paths:
--------------
    trunk/dports/graphics/qwtplot3d/Portfile

Modified: trunk/dports/graphics/qwtplot3d/Portfile
===================================================================
--- trunk/dports/graphics/qwtplot3d/Portfile	2010-10-21 12:53:55 UTC (rev 72621)
+++ trunk/dports/graphics/qwtplot3d/Portfile	2010-10-21 12:54:09 UTC (rev 72622)
@@ -5,7 +5,7 @@
 
 name                qwtplot3d
 version             0.2.7
-revision            2
+revision            3
 categories          graphics science
 platforms           darwin
 maintainers         michaelld
@@ -23,17 +23,14 @@
                     sha1   4463fafb8420a91825e165da7a296aaabd70abea \
                     rmd160 0f28462cb95ef6091d73642c8b26ece60d50bfb8
 
-variant qt3 conflicts qt4 description {Use qt3-mac} {
-    depends_lib-append  port:qt3-mac
-}
+variant qt3 conflicts qt4 description {Use qt3-mac} {}
 
-variant qt4 conflicts qt3 description {Use qt4-mac} {
-    depends_lib-append  port:qt4-mac
-}
+variant qt4 conflicts qt3 description {Use qt4-mac} {}
 
 # move setting of 'qt_dir' outside variants, since 'if' statements are
 # processed in-order while variants are processed after everything else.
 if {[variant_isset qt3]} {
+    depends_lib-append  port:qt3-mac
     set qt_dir          ${prefix}/libexec/qt3-mac
 } else {
     # when variant 'qt3' is not set, use qt4 whether by default or via
@@ -41,10 +38,10 @@
     if {![variant_isset qt4]} {
         default_variants    +qt4
     }
-    set qt_dir          ${prefix}/libexec/qt4-mac
+    PortGroup           qt4 1.0
 }
 
-configure.cmd       ${qt_dir}/bin/qmake
+configure.cmd       ${qt_qmake_cmd}
 configure.pre_args  
 
 variant qwt conflicts qwt52 description {Use qwt} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101021/1d04fca3/attachment.html>