[69527] trunk/dports/graphics

[michaelld at macports.org]

Revision: 69527
          http://trac.macports.org/changeset/69527
Author:   michaelld at macports.org
Date:     2010-07-08 14:26:56 -0700 (Thu, 08 Jul 2010)
Log Message:
-----------
Per ticket #25574 : Moved the setting of 'qt_dir' from inside variants
to inside 'if' statements so that they are processed in-order with the
Portfile statements and in the main scope of the Portfile.

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

Modified: trunk/dports/graphics/qwt/Portfile
===================================================================
--- trunk/dports/graphics/qwt/Portfile	2010-07-08 21:14:24 UTC (rev 69526)
+++ trunk/dports/graphics/qwt/Portfile	2010-07-08 21:26:56 UTC (rev 69527)
@@ -29,21 +29,24 @@
 
 patchfiles          patch-qwtconfig.pri.diff
 
-# set the qt_dir variable to nothing; makes 'port' happy
-set qt_dir ""
-
 variant qt3 conflicts qt4 description {Use qt3-mac} {
     depends_lib-append  port:qt3-mac
-    set qt_dir          ${prefix}/libexec/qt3-mac
 }
 
 variant qt4 conflicts qt3 description {Use qt4-mac} {
     depends_lib-append  port:qt4-mac
-    set qt_dir          ${prefix}/libexec/qt4-mac
 }
 
-if {![variant_isset qt3] && ![variant_isset qt4]} {
-    default_variants    +qt4
+# 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]} {
+    set qt_dir          ${prefix}/libexec/qt3-mac
+} else {
+    # when variant 'qt3' is not set, use qt4 whether by default or via
+    # the user's variant choice
+    if {![variant_isset qt4]} {
+        default_variants    +qt4
+    }
     set qt_dir          ${prefix}/libexec/qt4-mac
 }
 

Modified: trunk/dports/graphics/qwtplot3d/Portfile
===================================================================
--- trunk/dports/graphics/qwtplot3d/Portfile	2010-07-08 21:14:24 UTC (rev 69526)
+++ trunk/dports/graphics/qwtplot3d/Portfile	2010-07-08 21:26:56 UTC (rev 69527)
@@ -23,21 +23,24 @@
                     sha1   4463fafb8420a91825e165da7a296aaabd70abea \
                     rmd160 0f28462cb95ef6091d73642c8b26ece60d50bfb8
 
-# set the qt_dir variable to nothing; makes 'port' happy
-set qt_dir ""
-
 variant qt3 conflicts qt4 description {Use qt3-mac} {
     depends_lib-append  port:qt3-mac
-    set qt_dir          ${prefix}/libexec/qt3-mac
 }
 
 variant qt4 conflicts qt3 description {Use qt4-mac} {
     depends_lib-append  port:qt4-mac
-    set qt_dir          ${prefix}/libexec/qt4-mac
 }
 
-if {![variant_isset qt3] && ![variant_isset qt4]} {
-    default_variants    +qt4
+# 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]} {
+    set qt_dir          ${prefix}/libexec/qt3-mac
+} else {
+    # when variant 'qt3' is not set, use qt4 whether by default or via
+    # the user's variant choice
+    if {![variant_isset qt4]} {
+        default_variants    +qt4
+    }
     set qt_dir          ${prefix}/libexec/qt4-mac
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100708/678b2a32/attachment-0001.html>