[53399] trunk/dports/aqua/qt4-mac
mcalhoun at macports.org
mcalhoun at macports.org
Sat Jul 4 16:35:21 PDT 2009
Revision: 53399
http://trac.macports.org/changeset/53399
Author: mcalhoun at macports.org
Date: 2009-07-04 16:35:21 -0700 (Sat, 04 Jul 2009)
Log Message:
-----------
qt4-mac: Update version 4.5.1 -> 4.5.2.
Use environment variable CPATH instead of hacking in support for -isystem.
Modified Paths:
--------------
trunk/dports/aqua/qt4-mac/Portfile
trunk/dports/aqua/qt4-mac/files/patch-odbc.diff
Removed Paths:
-------------
trunk/dports/aqua/qt4-mac/files/patch-isystem.diff
Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile 2009-07-04 23:34:09 UTC (rev 53398)
+++ trunk/dports/aqua/qt4-mac/Portfile 2009-07-04 23:35:21 UTC (rev 53399)
@@ -4,7 +4,7 @@
PortSystem 1.0
name qt4-mac
-version 4.5.1
+version 4.5.2
categories aqua
platforms macosx
maintainers erickt gmail.com:clubjuggler openmaintainer
@@ -16,10 +16,10 @@
master_sites trolltech
distname qt-mac-opensource-src-${version}
-checksums \
- md5 9fc0e96197df6db48a0628ac4d63e0dd \
- sha1 bf534b1b28648b5eeea8179c1c8c81097795aa05 \
- rmd160 677f44ffc7837413e12589d11a468cc54c820808
+checksums \
+ md5 c549d6c0c2e0723377cb955c78a1b680 \
+ sha1 61b45db17962b48c338628d58c0445c9f544d5e6 \
+ rmd160 53c752de43aa0623f005ca1c5a12810acc1da013
depends_build port:pkgconfig
@@ -34,13 +34,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
@@ -50,15 +48,14 @@
# --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.
+# -I${prefix}/include and -L${prefix}/lib are set using environment variables.
configure.cppflags
configure.ldflags
set dirname qt4-mac
set qt_dir ${prefix}/libexec/${dirname}
-# -isystem is used instead of -I to avoid conflicts with other ports.
+# 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.
@@ -71,16 +68,30 @@
-v \
-debug-and-release \
-confirm-license \
+ -opensource \
-prefix ${qt_dir} \
-docdir ${prefix}/share/doc/${dirname} \
-examplesdir ${prefix}/share/${dirname}/examples \
-demosdir ${prefix}/share/${dirname}/demos \
-system-sqlite \
-openssl-linked \
- -dbus-linked \
- -isystem${prefix}/include \
- -L${prefix}/lib
+ -dbus-linked
+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} {
@@ -98,10 +109,9 @@
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
}
@@ -113,9 +123,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
}
@@ -156,7 +165,7 @@
post-destroot {
# Install documentation.
- foreach doc { FAQ.txt INSTALL KNOWN.ISSUES LGPL_EXCEPTION.txt LICENSE.GPL3 LICENSE.LGPL README } {
+ foreach doc { FAQ.txt INSTALL LGPL_EXCEPTION.txt LICENSE.GPL3 LICENSE.LGPL README } {
xinstall -c -m 644 ${worksrcpath}/$doc ${destroot}${prefix}/share/doc/${name}
}
Deleted: trunk/dports/aqua/qt4-mac/files/patch-isystem.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-isystem.diff 2009-07-04 23:34:09 UTC (rev 53398)
+++ trunk/dports/aqua/qt4-mac/files/patch-isystem.diff 2009-07-04 23:35:21 UTC (rev 53399)
@@ -1,41 +0,0 @@
---- configure.orig 2009-02-25 16:09:14.000000000 -0500
-+++ configure 2009-03-07 20:07:15.000000000 -0500
-@@ -854,6 +854,15 @@
- VAL=`echo $1 | sed 's,-I,,'`
- fi
- ;;
-+ -isystem?*|-isystem)
-+ VAR="add_ipath_system"
-+ if [ "$1" = "-isystem" ]; then
-+ shift
-+ VAL="$1"
-+ else
-+ VAL=`echo $1 | sed 's,-isystem,,'`
-+ fi
-+ ;;
- -L?*|-L)
- VAR="add_lpath"
- if [ "$1" = "-L" ]; then
-@@ -1805,6 +1814,9 @@
- add_ipath)
- I_FLAGS="$I_FLAGS -I\"${VAL}\""
- ;;
-+ add_ipath_system)
-+ I_FLAGS="$I_FLAGS -isystem\"${VAL}\""
-+ ;;
- add_lpath)
- L_FLAGS="$L_FLAGS -L\"${VAL}\""
- ;;
---- config.tests/unix/compile.test.orig 2008-09-27 04:58:41.000000000 -0400
-+++ config.tests/unix/compile.test 2008-10-27 00:46:48.000000000 -0400
-@@ -32,6 +32,10 @@
- INC=`echo $PARAM | sed -e 's/^-I//'`
- INCLUDEPATH="$INCLUDEPATH $INC"
- ;;
-+ -isystem*)
-+ INC=`echo $PARAM | sed -e 's/^-isystem//'`
-+ INCLUDEPATH="$INCLUDEPATH $INC"
-+ ;;
- -f*|-D*)
- CXXFLAGS="$CXXFLAGS $PARAM"
- ;;
Modified: trunk/dports/aqua/qt4-mac/files/patch-odbc.diff
===================================================================
--- trunk/dports/aqua/qt4-mac/files/patch-odbc.diff 2009-07-04 23:34:09 UTC (rev 53398)
+++ trunk/dports/aqua/qt4-mac/files/patch-odbc.diff 2009-07-04 23:35:21 UTC (rev 53399)
@@ -25,3 +25,14 @@
}
}
+--- src/sql/drivers/drivers.pri.orig 2009-06-20 00:57:58.000000000 -0400
++++ src/sql/drivers/drivers.pri 2009-07-01 16:38:05.000000000 -0400
+@@ -47,7 +47,7 @@
+ HEADERS += drivers/odbc/qsql_odbc.h
+ SOURCES += drivers/odbc/qsql_odbc.cpp
+
+- mac:!contains( LIBS, .*odbc.* ):LIBS *= -liodbc
++ mac:!contains( LIBS, .*odbc.* ):LIBS *= -lodbc
+ unix:!contains( LIBS, .*odbc.* ):LIBS *= -lodbc
+
+ win32 {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090704/56a36159/attachment-0001.html>
More information about the macports-changes
mailing list