[60409] trunk/dports/aqua/qt4-mac-devel/Portfile
jochen at macports.org
jochen at macports.org
Wed Nov 11 06:43:08 PST 2009
Revision: 60409
http://trac.macports.org/changeset/60409
Author: jochen at macports.org
Date: 2009-11-11 06:43:08 -0800 (Wed, 11 Nov 2009)
Log Message:
-----------
upgrade to 4.6.0-beta1 based on current qt4-mac port
Modified Paths:
--------------
trunk/dports/aqua/qt4-mac-devel/Portfile
Modified: trunk/dports/aqua/qt4-mac-devel/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/Portfile 2009-11-11 14:42:35 UTC (rev 60408)
+++ trunk/dports/aqua/qt4-mac-devel/Portfile 2009-11-11 14:43:08 UTC (rev 60409)
@@ -5,23 +5,23 @@
name qt4-mac-devel
conflicts qt4-mac
-version 4.5.0
-revision 1
+version 4.6.0-beta1
categories aqua
platforms macosx
-maintainers illogic-al openmaintainer
+maintainers nomaintainer
homepage http://www.trolltech.com/
description Qt Tool Kit (Native Aqua Version)
long_description This is Qt, TrollTech's C++ toolkit for writing cross-platform GUI applications. \
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
+distname qt-everywhere-opensource-src-${version}
+checksums \
+ md5 60d136f17491ce0e56bb317ea7300aef \
+ sha1 ab3898f0d7307decbce03a6fc6829218bba17311 \
+ rmd160 aa3df8dc0ea601f73abe624f376cf3df032d77d1
+
depends_build port:pkgconfig
depends_lib \
@@ -35,16 +35,11 @@
port:sqlite3
# Build plugins as bundle files instead of dylib files.
-# Allow the use of -isystem instead of -I to include files.
# Test for Precompiled-headers support requires a C++ compiler, but configure calls it, by default, with a C compiler.
-# Use unixODBC provided by MacPorts instead of iODBC provided my Mac OS.
# Ensure that securesocketclient demo is built even with configure option -openssl-linked.
patchfiles \
patch-mac.conf.diff \
- patch-isystem.diff \
- patch-precomp.test.diff \
- patch-odbc.diff \
- patch-network.pro.diff
+ patch-precomp.test.diff
# The build process uses -fconstant-cfstrings.
# configure.compiler should therefore not be one of the MacPorts compilers.
@@ -52,14 +47,23 @@
# --prefix is not recognized.
configure.pre_args-delete --prefix=${prefix}
# -I${prefix}/include and -L${prefix}/lib must be set in ${configure.args}
-# or else some generated Makefiles will not seem them.
+# or else some generated Makefiles will not see them.
configure.cppflags
configure.ldflags
+################################################################################
+# We do not want flags of any kind -- QT is smart enough to set up its own. #
+################################################################################
+
+configure.universal_cflags
+configure.universal_cppflags
+configure.universal_cxxflags
+configure.universal_ldflags
+
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).
+# CPATH 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.
@@ -72,6 +76,7 @@
-v \
-debug-and-release \
-confirm-license \
+ -opensource \
-prefix ${qt_dir} \
-docdir ${prefix}/share/doc/${dirname} \
-examplesdir ${prefix}/share/${dirname}/examples \
@@ -79,9 +84,24 @@
-system-sqlite \
-openssl-linked \
-dbus-linked \
- -isystem${prefix}/include \
- -L${prefix}/lib
+ -L${prefix}/lib \
+ -arch \"${build_arch}\"
+lappend cpath ${prefix}/include
+lappend library_path ${prefix}/lib
+
+pre-configure {
+ configure.env-append \
+ CPATH=[join ${cpath} :] \
+ LIBRARY_PATH=[join ${library_path} :]
+}
+
+pre-build {
+ build.env-append \
+ CPATH=[join ${cpath} :] \
+ LIBRARY_PATH=[join ${library_path} :]
+}
+
# Stop configure script from searching for SQL Drivers
# not available from MacPorts.
foreach driver {db2 ibase oci tds} {
@@ -96,12 +116,15 @@
configure.args-append -no-sql-${driver}
}
+platform darwin 10 {
+ default_variants +cocoa
+}
+
variant mysql description {Enable MySQL SQL Driver} {
depends_lib-append path:lib/mysql5:mysql5
- configure.args-append \
- -isystem${prefix}/include/mysql5/mysql \
- -L${prefix}/lib/mysql5/mysql
+ lappend cpath ${prefix}/include/mysql5/mysql
+ lappend library_path ${prefix}/lib/mysql5/mysql
configure.args-delete -no-sql-mysql
}
@@ -114,9 +137,8 @@
variant psql description {Enable PostgreSQL SQL Driver} {
depends_lib-append port:postgresql83
- configure.args-append \
- -isystem${prefix}/include/postgresql83 \
- -L${prefix}/lib/postgresql83
+ lappend cpath ${prefix}/include/postgresql83
+ lappend library_path ${prefix}/lib/postgresql83
configure.args-delete -no-sql-psql
}
@@ -147,20 +169,15 @@
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
reinplace "s| g++\$| ${configure.cxx}|" ${worksrcpath}/mkspecs/macx-g++/qmake.conf
}
post-destroot {
# Install documentation.
- foreach doc { INSTALL LICENSE.LGPL LICENSE.GPL3 LGPL_EXCEPTION.txt README } {
+ foreach doc { INSTALL LGPL_EXCEPTION.txt LICENSE.GPL3 LICENSE.LGPL README } {
xinstall -c -m 644 ${worksrcpath}/$doc ${destroot}${prefix}/share/doc/${name}
}
@@ -218,9 +235,13 @@
variant universal {
configure.universal_args-delete --disable-dependency-tracking
- configure.args-append -arch \"${universal_archs}\"
+ configure.args-delete -arch \"${build_arch}\"
+ configure.args-append -arch \"${universal_archs}\"
+ if {[info exists universal_sysroot]} {
+ configure.args-append -sdk ${universal_sysroot}
+ }
}
livecheck.type regex
-livecheck.url http://trolltech.com/downloads/opensource/appdev/mac-os-cpp
+livecheck.url http://qt.nokia.com/downloads/mac-os-cpp
livecheck.regex "qt-mac-opensource-src-(4(?:\\.\\d+)*)${extract.suffix}"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091111/05de877f/attachment-0001.html>
More information about the macports-changes
mailing list