[69526] trunk/dports/graphics/qwt52/Portfile
michaelld at macports.org
michaelld at macports.org
Thu Jul 8 14:14:24 PDT 2010
Revision: 69526
http://trac.macports.org/changeset/69526
Author: michaelld at macports.org
Date: 2010-07-08 14:14:24 -0700 (Thu, 08 Jul 2010)
Log Message:
-----------
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. Hopefully fixes
ticket #25574.
Modified Paths:
--------------
trunk/dports/graphics/qwt52/Portfile
Modified: trunk/dports/graphics/qwt52/Portfile
===================================================================
--- trunk/dports/graphics/qwt52/Portfile 2010-07-08 21:12:26 UTC (rev 69525)
+++ trunk/dports/graphics/qwt52/Portfile 2010-07-08 21:14:24 UTC (rev 69526)
@@ -30,21 +30,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
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100708/e6dc1861/attachment.html>
More information about the macports-changes
mailing list