[63132] trunk/dports/aqua/qt4-mac-devel
sharky at macports.org
sharky at macports.org
Wed Jan 27 06:58:22 PST 2010
Revision: 63132
http://trac.macports.org/changeset/63132
Author: sharky at macports.org
Date: 2010-01-27 06:58:21 -0800 (Wed, 27 Jan 2010)
Log Message:
-----------
qt4-mac-devel: update to version 4.6.1 (#23379)
Modified Paths:
--------------
trunk/dports/aqua/qt4-mac-devel/Portfile
Removed Paths:
-------------
trunk/dports/aqua/qt4-mac-devel/files/patch-configure.diff
trunk/dports/aqua/qt4-mac-devel/files/patch-network.pro.diff
Modified: trunk/dports/aqua/qt4-mac-devel/Portfile
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/Portfile 2010-01-27 14:54:31 UTC (rev 63131)
+++ trunk/dports/aqua/qt4-mac-devel/Portfile 2010-01-27 14:58:21 UTC (rev 63132)
@@ -4,10 +4,8 @@
PortSystem 1.0
name qt4-mac-devel
-conflicts qt4-mac kdelibs3 libevent
-epoch 1
-version 4.6.0
-revision 2
+conflicts qt4-mac kdelibs3 kdelibs4 libevent
+version 4.6.1
categories aqua
platforms macosx
maintainers nomaintainer
@@ -20,9 +18,9 @@
distname qt-everywhere-opensource-src-${version}
dist_subdir qt4-mac
-checksums md5 2a7b5126f2450d8525af355fc4c12ad6 \
- sha1 c2cbbde83f1ebac3b8dd13a112fcad757d395041 \
- rmd160 7842b9f4a5364016677fc2162dfd31f1440bb05d
+checksums md5 0542a4be6425451ab5f668c6899cac36 \
+ sha1 d3b44ae6d9bc9c44fc57f32e545b92daf0b54775 \
+ rmd160 7365dfe3c688df36002d2c9aaef6b79ba8175402
depends_build port:pkgconfig
@@ -31,11 +29,8 @@
# Build plugins as bundle files instead of dylib files.
# Test for Precompiled-headers support requires a C++ compiler, but configure calls it, by default, with a C compiler.
-# Ensure that securesocketclient demo is built even with configure option -openssl-linked.
patchfiles patch-mac.conf.diff \
- patch-configure.diff \
- patch-precomp.test.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.
@@ -84,6 +79,7 @@
-docdir ${prefix}/share/doc/${dirname} \
-examplesdir ${prefix}/share/${dirname}/examples \
-demosdir ${prefix}/share/${dirname}/demos \
+ -cocoa \
-system-sqlite \
-openssl-linked \
-dbus-linked \
@@ -119,8 +115,8 @@
configure.args-append -no-sql-${driver}
}
-platform darwin 10 {
- default_variants +cocoa
+platform darwin 8 {
+ configure.args-delete -cocoa
}
variant mysql description {Enable MySQL SQL Driver} {
@@ -151,21 +147,6 @@
configure.args-delete -no-sql-sqlite2
}
-variant cocoa description {Build the Cocoa version of Qt in 32-bit mode} conflicts noframework {
- configure.args-append -cocoa
-
- # Everything might build, but nothing will run.
- pre-fetch {
- if { ${os.major} < 9 } {
- return -code error "Variant cocoa creates Qt binaries which require Mac OS X 10.5 or higher."
- }
- }
-}
-
-variant noframework description {Do not build frameworks} conflicts cocoa {
- configure.args-append -no-framework
-}
-
build.target first
use_parallel_build yes
@@ -236,6 +217,14 @@
configure.args-append -graphicssystem raster
}
+variant no_demos description {Do not build demo programs} {
+ configure.args-append -nomake demos
+}
+
+variant no_examples description {Do not build example programs} {
+ configure.args-append -nomake examples
+}
+
variant universal {
configure.universal_args-delete --disable-dependency-tracking
configure.args-delete -arch \"${build_arch}\"
Deleted: trunk/dports/aqua/qt4-mac-devel/files/patch-configure.diff
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/files/patch-configure.diff 2010-01-27 14:54:31 UTC (rev 63131)
+++ trunk/dports/aqua/qt4-mac-devel/files/patch-configure.diff 2010-01-27 14:58:21 UTC (rev 63132)
@@ -1,11 +0,0 @@
---- configure.orig 2009-10-13 17:34:09.000000000 +0200
-+++ configure 2009-11-03 17:46:54.000000000 +0100
-@@ -131,7 +131,7 @@
- cat >conftest.cpp <<EOF
- int main() { return 0; }
- EOF
-- "$TEST_COMPILER" "$@" -o /dev/null conftest.cpp
-+ "$TEST_COMPILER" "$@" -o conftest.o conftest.cpp
- ret=$?
- rm -f conftest.cpp conftest.o
- return $ret
Deleted: trunk/dports/aqua/qt4-mac-devel/files/patch-network.pro.diff
===================================================================
--- trunk/dports/aqua/qt4-mac-devel/files/patch-network.pro.diff 2010-01-27 14:54:31 UTC (rev 63131)
+++ trunk/dports/aqua/qt4-mac-devel/files/patch-network.pro.diff 2010-01-27 14:58:21 UTC (rev 63132)
@@ -1,11 +0,0 @@
---- examples/network/network.pro.orig 2009-02-25 16:09:16.000000000 -0500
-+++ examples/network/network.pro 2009-03-11 14:06:26.000000000 -0400
-@@ -13,7 +13,7 @@
- threadedfortuneserver \
- torrent
-
--contains(QT_CONFIG, openssl):SUBDIRS += securesocketclient
-+contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked):SUBDIRS += securesocketclient
-
- # install
- sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS network.pro README
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100127/671bad3a/attachment.html>
More information about the macports-changes
mailing list