[44200] trunk/dports/aqua/qt4-mac/Portfile
mcalhoun at macports.org
mcalhoun at macports.org
Tue Dec 23 12:14:29 PST 2008
Revision: 44200
http://trac.macports.org/changeset/44200
Author: mcalhoun at macports.org
Date: 2008-12-23 12:14:29 -0800 (Tue, 23 Dec 2008)
Log Message:
-----------
qt4-mac: Remove most variants.
Some variants required no extra dependencies so include them by default.
Other variants are required by other libraries (see r36830, #17730, and #15627).
Add library dependency on sqlite3.
examples and demos are made by default.
Fixes #17730 and #15627.
Modified Paths:
--------------
trunk/dports/aqua/qt4-mac/Portfile
Modified: trunk/dports/aqua/qt4-mac/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac/Portfile 2008-12-23 19:56:55 UTC (rev 44199)
+++ trunk/dports/aqua/qt4-mac/Portfile 2008-12-23 20:14:29 UTC (rev 44200)
@@ -21,7 +21,17 @@
sha1 00cdf6df27a590565f557a7c02ba2edc634354d1 \
rmd160 7c39303f7aef6a369a16e787681b78d07c59fc76
-depends_lib port:libmng port:libpng port:jpeg port:tiff
+depends_lib \
+ port:zlib \
+ port:tiff \
+ port:libpng \
+ port:libmng \
+ port:jpeg \
+ port:dbus \
+ port:mysql5 \
+ port:postgresql83 \
+ port:openssl \
+ port:sqlite3
patchfiles patch-compile.test.diff patch-mac.conf.diff
@@ -54,6 +64,10 @@
# we instead patch -isystem ${prefix}/include into the configure
# script to avoid conflicts with other ports (e.g. pcre).
# See http://trac.macports.org/ticket/15219
+#
+# -dbus-linked prevends qt4 from trying to dynamically load libdbus-1,
+# which it is not able to find in ${prefix}
+# -openssl-linked ensures that the MacPorts openssl is used
configure.args \
-v \
-confirm-license \
@@ -65,17 +79,23 @@
-plugindir '${prefix}/lib/${portname}-plugins' \
-translationdir '${prefix}/share/${portname}/translations' \
-optimized-qmake -debug-and-release -shared -stl \
- -no-openssl -largefile \
+ -largefile \
-system-libpng -system-libjpeg -system-libmng -system-libtiff \
-system-zlib -qt-gif \
- -no-sql-ibase -no-sql-mysql -no-sql-odbc -no-sql-psql \
- -no-sql-sqlite -no-nis -no-cups \
-framework -libdir '${frameworkdir}' \
-make libs -make tools \
- -L${prefix}/lib
+ -docdir ${prefix}/share/doc/${name} \
+ -examplesdir ${prefix}/share/${name}/examples \
+ -demosdir ${prefix}/share/${name}/demos \
+ -system-sqlite \
+ -openssl-linked \
+ -dbus-linked \
+ -I${prefix}/include/mysql5/mysql \
+ -I${prefix}/include/postgresql83 \
+ -L${prefix}/lib \
+ -L${prefix}/lib/mysql5/mysql \
+ -L${prefix}/lib/postgresql83
- # not made by default, anyway: -nomake demos -nomake examples
-
build.target first
use_parallel_build yes
@@ -85,6 +105,10 @@
# configure script only accepts -I..., but we want -isystem...
reinplace -E "s|^I_FLAGS=\$|I_FLAGS=-isystem${prefix}/include|" \
${worksrcpath}/configure
+
+ # ensure that securesocketclient demo is built
+ reinplace "s|contains(QT_CONFIG, openssl)|contains(QT_CONFIG, openssl) \\| contains(QT_CONFIG, openssl-linked)|" \
+ examples/network/network.pro
}
post-destroot {
@@ -116,74 +140,11 @@
}
}
-default_variants +docs +dbus
-
-variant dbus description "Include DBus support" {
- depends_lib-append port:dbus
- configure.args-append -dbus-linked
-}
-
variant noframework description "Do not build frameworks" {
configure.args-delete -framework -libdir '${frameworkdir}'
configure.args-append -no-framework
}
-variant nis description "Include Network Information Service (NIS) support" {
- configure.args-delete -no-nis
- configure.args-append -nis
-}
-
-variant cups description "Include Common Unix Printing System (CUPS) support" {
- configure.args-delete -no-cups
- configure.args-append -cups
-}
-
-variant mysql4 conflicts mysql5 description "Include support for SQL via mysql4 driver" {
- depends_lib-append lib:libmysqlclient.12:mysql4
- configure.args-delete -no-sql-mysql
- configure.args-append -qt-sql-mysql -plugin-sql-mysql \
- -I${prefix}/include/mysql -L${prefix}/lib/mysql
-}
-
-variant mysql5 conflicts mysql4 description "Include support for SQL via mysql5 driver" {
- depends_lib-append lib:libmysqlclient.15:mysql5
- configure.args-delete -no-sql-mysql
- configure.args-append -qt-sql-mysql -plugin-sql-mysql \
- -I${prefix}/include/mysql5/mysql -L${prefix}/lib/mysql5/mysql
-}
-
-variant psql description "Include support for SQL via postgresql driver" {
- depends_lib-append port:postgresql83
- configure.args-delete -no-sql-psql
- configure.args-append -qt-sql-psql -plugin-sql-psql \
- -I${prefix}/include/postgresql83 -L${prefix}/lib/postgresql83
-}
-
-variant sqlite description "Include support for SQL via sqlite driver" {
- configure.args-delete -no-sql-sqlite
- configure.args-append -qt-sql-sqlite -plugin-sql-sqlite
-}
-
-variant ssl description "Include OpenSSL support" {
- depends_lib-append port:openssl
- configure.args-delete -no-openssl
- configure.args-append -openssl
-}
-
-variant examples description "Build Qt examples" {
- # configure.args-delete "-nomake examples"
- configure.args-append -make examples -examplesdir ${prefix}/share/${portname}/examples
-}
-
-variant demos description "Build Qt demos" {
- # configure.args-delete "-nomake demos"
- configure.args-append -make demos -demosdir ${prefix}/share/${portname}/demos
-}
-
-variant docs description "Include Qt Documentation" {
- configure.args-append -make docs
-}
-
variant universal {
configure.universal_args-delete --disable-dependency-tracking
configure.args-append -universal
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081223/809544cf/attachment-0001.html>
More information about the macports-changes
mailing list