[74642] trunk/dports/aqua/qt4-mac/Portfile

jmr at macports.org jmr at macports.org
Sun Dec 26 08:00:16 PST 2010


Revision: 74642
          http://trac.macports.org/changeset/74642
Author:   jmr at macports.org
Date:     2010-12-26 08:00:10 -0800 (Sun, 26 Dec 2010)
Log Message:
-----------
qt4-mac: disable x11 variant that does nothing but cause failures for users with +x11 in their variants.conf

Modified Paths:
--------------
    trunk/dports/aqua/qt4-mac/Portfile

Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile	2010-12-26 15:31:01 UTC (rev 74641)
+++ trunk/dports/aqua/qt4-mac/Portfile	2010-12-26 16:00:10 UTC (rev 74642)
@@ -259,7 +259,8 @@
 
         # cannot use pre-compiled headers when compiling with more than 1
         # arch type (typically +universal) or for X11
-        if {[llength ${qt_arch_types}] != 1 || [variant_isset x11]} {
+        #if {[llength ${qt_arch_types}] != 1 || [variant_isset x11]} {
+        if {[llength ${qt_arch_types}] != 1} {
             configure.args-append -no-pch
         } else {
             configure.args-append -pch
@@ -494,28 +495,29 @@
     configure.args-append -release
 }
 
-variant quartz conflicts x11 \
+#variant quartz conflicts x11
+variant quartz \
 description {Build for Native OSX Quartz GUI, not X11 (default)} {}
 
-variant x11 conflicts quartz \
-description {Build for X11 GUI, not Native OSX Quartz} {}
+#variant x11 conflicts quartz \
+#description {Build for X11 GUI, not Native OSX Quartz} {}
 
 # if neither +x11 or +quartz were specified, default to the latter
-if {![variant_isset quartz] && ![variant_isset x11]} {
+#if {![variant_isset quartz] && ![variant_isset x11]}
     default_variants +quartz
-}
+#}
 
 # check to see if user specified just "-quartz", which can't work.
-if {![variant_isset quartz] && ![variant_isset x11]} {
-    return -code error \
-"\n\nThe variant -quartz will not work alone.
-Please select one of +quartz or +x11 as a variant.\n"
-}
+#if {![variant_isset quartz] && ![variant_isset x11]} {
+#    return -code error \
+#"\n\nThe variant -quartz will not work alone.
+#Please select one of +quartz or +x11 as a variant.\n"
+#}
 
-if {[variant_isset x11]} {
-    return -code error "\n\nVariant +x11 is not yet functional; \
-please use +quartz for now.\n"
-}
+#if {[variant_isset x11]} {
+#    return -code error "\n\nVariant +x11 is not yet functional; \
+#please use +quartz for now.\n"
+#}
 
 livecheck.type      regex
 livecheck.url       http://get.qt.nokia.com/qt/source/
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101226/bcff9650/attachment.html>


More information about the macports-changes mailing list