[88002] trunk/dports/aqua/qt4-mac-devel/Portfile

[michaelld at macports.org]

Revision: 88002
          http://trac.macports.org/changeset/88002
Author:   michaelld at macports.org
Date:     2011-12-15 12:29:17 -0800 (Thu, 15 Dec 2011)
Log Message:
-----------
qt4-mac-devel: update to 4.8.0; add license and XCode compatibility; correctly disable qmake optimization on 10.6 32-bit; move distfile location to that of qt4-mac (per request).

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

Modified: trunk/dports/aqua/qt4-mac-devel/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/Portfile	2011-12-15 18:44:59 UTC (rev 88001)
+++ trunk/dports/aqua/qt4-mac-devel/Portfile	2011-12-15 20:29:17 UTC (rev 88002)
@@ -7,15 +7,18 @@
 # does not include certain parts
 set building_qt4    1
 PortGroup           qt4 1.0
+PortGroup           xcodeversion 1.0
 
 name                qt4-mac-devel
 conflicts           qt3 qt3-mac qt4-mac
 set ver_nums        4.8.0
-set branch          rc1
-version             ${ver_nums}-${branch}
+version             ${ver_nums}
+#set branch          rc1
+#version             ${ver_nums}-${branch}
 categories          aqua
 platforms           macosx
 maintainers         michaelld openmaintainer
+license             {LGPL-2.1 GPL-3}
 
 homepage            http://qt.nokia.com/
 description         Qt Tool Kit
@@ -25,13 +28,17 @@
 
 master_sites        trolltech
 distname            qt-everywhere-opensource-src-${version}
-checksums           md5     3e003b671384df8d1cb77dd6cc804934 \
-                    sha1    95812c27e66908e1e649f292609482a54d17c7d2 \
-                    rmd160  92e9f1ff54edbce3f1e766602f1c41068576b133
+checksums           md5     e8a5fdbeba2927c948d9f477a6abe904 \
+                    sha1    2ba35adca8fb9c66a58eca61a15b21df6213f22e \
+                    rmd160  7506dce7743215481fd9fe56920b8a47f07a112e
+dist_subdir		    qt4-mac
 
 worksrcdir          qt-everywhere-opensource-src-${ver_nums}
 
-depends_lib-append  port:zlib path:bin/dbus-daemon:dbus port:openssl port:sqlite3 \
+minimum_xcodeversions   {8 2.5}
+
+depends_lib-append  port:zlib path:bin/dbus-daemon:dbus \
+                    port:openssl port:sqlite3 \
                     port:tiff port:libpng port:libmng port:jpeg
 
 # (0) Fix the testing script to properly handle both +universal as
@@ -300,6 +307,11 @@
         if {[lsearch -exact ${qt_arch_types} ${os.arch}] == -1} {
             # not building for native arch: disable optimizing qmake
             configure.args-delete -optimized-qmake
+        } elseif {${MINOR} == "6" &&
+                  [llength ${qt_arch_types}] == 1 &&
+                  [lsearch -exact ${qt_arch_types} x86] == 0} {
+            # disable qmake optimization on 10.6 32-bit
+            configure.args-delete -optimized-qmake
         }
 
         # find a way to specify the SDK to use; Qt will use the 10.4u
@@ -329,11 +341,6 @@
     }
 }
 
-platform darwin 10 i386 {
-    # optimization of QMake does not work on 10.6 32-bit native
-    configure.args-delete -optimized-qmake
-}
-
 # Remove any '-I' and '-L' string from the *FLAGS for SQLITE, DBUS,
 # ODBC, and OPENSSL, so that what remains are just non-I/L flags;
 # these paths are in compiler.cpath and compiler.library_path.  The
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111215/bf1fa67e/attachment-0001.html>