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

[sharky at macports.org]

Revision: 62670
          http://trac.macports.org/changeset/62670
Author:   sharky at macports.org
Date:     2010-01-13 10:19:24 -0800 (Wed, 13 Jan 2010)
Log Message:
-----------
qt4-mac: always use cocoa, except on OS X 10.4

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

Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile	2010-01-13 17:54:43 UTC (rev 62669)
+++ trunk/dports/aqua/qt4-mac/Portfile	2010-01-13 18:19:24 UTC (rev 62670)
@@ -6,6 +6,7 @@
 name                qt4-mac
 conflicts           qt4-mac-devel kdelibs3 libevent
 version             4.6.0
+revision            1
 categories          aqua
 platforms           macosx
 maintainers         nomaintainer
@@ -81,6 +82,7 @@
     -docdir          ${prefix}/share/doc/${dirname}       \
     -examplesdir     ${prefix}/share/${dirname}/examples  \
     -demosdir        ${prefix}/share/${dirname}/demos     \
+    -cocoa                                                \
     -system-sqlite                                        \
     -openssl-linked                                       \
     -dbus-linked                                          \
@@ -116,8 +118,8 @@
     configure.args-append -no-sql-${driver}
 }
 
-platform darwin 10 {
-    default_variants +cocoa
+platform darwin 8 {
+    configure.args-delete -cocoa
 }
 
 variant mysql description {Enable MySQL SQL Driver} {
@@ -148,21 +150,6 @@
     configure.args-delete -no-sql-sqlite2
 }
 
-variant cocoa description {Build the Cocoa version of Qt in 32-bit mode} conflicts noframework {
-    configure.args-append  -cocoa
-
-    # Everything might build, but nothing will run.
-    pre-fetch {
-        if { ${os.major} < 9 } {
-            return -code error "Variant cocoa creates Qt binaries which require Mac OS X 10.5 or higher."
-        }
-    }
-}
-
-variant noframework description {Do not build frameworks} conflicts cocoa {
-    configure.args-append   -no-framework
-}
-
 build.target        first
 use_parallel_build  yes
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100113/2d19371d/attachment.html>