[50654] trunk/dports/aqua/qt4-mac

[mcalhoun at macports.org]

Revision: 50654
          http://trac.macports.org/changeset/50654
Author:   mcalhoun at macports.org
Date:     2009-05-05 22:06:21 -0700 (Tue, 05 May 2009)
Log Message:
-----------
qt4-mac: Update version 4.5.0 -> 4.5.1.

Modified Paths:
--------------
    trunk/dports/aqua/qt4-mac/Portfile
    trunk/dports/aqua/qt4-mac/files/patch-mac.conf.diff

Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile	2009-05-06 04:57:53 UTC (rev 50653)
+++ trunk/dports/aqua/qt4-mac/Portfile	2009-05-06 05:06:21 UTC (rev 50654)
@@ -4,8 +4,7 @@
 PortSystem          1.0
 
 name                qt4-mac
-version             4.5.0
-revision            1
+version             4.5.1
 categories          aqua
 platforms           macosx
 maintainers         erickt gmail.com:clubjuggler openmaintainer
@@ -16,10 +15,11 @@
                     This version uses the native Aqua UI. For a X11 version, see qt4-x11.
 master_sites        trolltech
 distname            qt-mac-opensource-src-${version}
+
 checksums  \
-    md5     c66a3f3211529b456086284f87f17393 \
-    sha1    7b4f0a2512352bda9ae90e4bcfdb5ee621ab27e1 \
-    rmd160  3abcf1a3b917a6dbbbbc4d915db3fbb538262c70
+    md5     9fc0e96197df6db48a0628ac4d63e0dd \
+    sha1    bf534b1b28648b5eeea8179c1c8c81097795aa05 \
+    rmd160  677f44ffc7837413e12589d11a468cc54c820808
 
 depends_build       port:pkgconfig
 
@@ -58,7 +58,7 @@
 set dirname qt4-mac
 set qt_dir ${prefix}/libexec/${dirname}
 
-# -isystem is used instead of -I to avoid conflicts with other ports (e.g. pcre).
+# -isystem is used instead of -I to avoid conflicts with other ports.
 #  See http://trac.macports.org/ticket/15219 and http://trac.macports.org/ticket/18723.
 #
 # -system-sqlite ensures the use SQLite provided by MacPorts instead of Qt.
@@ -146,11 +146,7 @@
 destroot.destdir    INSTALL_ROOT="${destroot}"
 
 post-patch {
-    # Ensure that securesocketclient demo is built.
-    reinplace "s|contains(QT_CONFIG, openssl)|contains(QT_CONFIG, openssl) \\| contains(QT_CONFIG, openssl-linked)|" \
-        ${worksrcpath}/examples/network/network.pro
-
-    # Ensure that MacPorts compilers are used.
+    # Ensure that correct compilers are used.
     reinplace "s| g++\$| ${configure.cxx}|" ${worksrcpath}/mkspecs/common/g++.conf
     reinplace "s| gcc\$| ${configure.cc}|"  ${worksrcpath}/mkspecs/common/g++.conf
     reinplace "s| g++\$| ${configure.cxx}|" ${worksrcpath}/mkspecs/common/mac-g++.conf
@@ -160,7 +156,7 @@
 
 post-destroot {
     # Install documentation.
-    foreach doc { INSTALL LICENSE.LGPL LICENSE.GPL3 LGPL_EXCEPTION.txt README } {
+    foreach doc { FAQ.txt INSTALL KNOWN.ISSUES LGPL_EXCEPTION.txt LICENSE.GPL3 LICENSE.LGPL README } {
         xinstall -c -m 644 ${worksrcpath}/$doc ${destroot}${prefix}/share/doc/${portname}
     }
 

Modified: trunk/dports/aqua/qt4-mac/files/patch-mac.conf.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-mac.conf.diff	2009-05-06 04:57:53 UTC (rev 50653)
+++ trunk/dports/aqua/qt4-mac/files/patch-mac.conf.diff	2009-05-06 05:06:21 UTC (rev 50654)
@@ -19,7 +19,7 @@
  QMAKE_LFLAGS_APP	+=
  QMAKE_LFLAGS_SHLIB	+= -single_module -dynamiclib
 -QMAKE_LFLAGS_PLUGIN	+= $$QMAKE_LFLAGS_SHLIB
-+QMAKE_LFLAGS_PLUGIN	+= -bundle -flat_namespace
++QMAKE_LFLAGS_PLUGIN	+= -bundle
  QMAKE_LFLAGS_THREAD	+=
  QMAKE_LFLAGS_INCREMENTAL+= -undefined suppress -flat_namespace
  QMAKE_LFLAGS_SONAME	+= -install_name$${LITERAL_WHITESPACE}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090505/9ed4f272/attachment-0001.html>