Revision: 83437 http://trac.macports.org/changeset/83437 Author: michaelld@macports.org Date: 2011-09-01 06:58:09 -0700 (Thu, 01 Sep 2011) Log Message: ----------- qt4-mac: update to 4.7.4; remove now-unnecessary patch; fix setting of MINOR variable. Modified Paths: -------------- trunk/dports/aqua/qt4-mac/Portfile Modified: trunk/dports/aqua/qt4-mac/Portfile =================================================================== --- trunk/dports/aqua/qt4-mac/Portfile 2011-09-01 13:49:57 UTC (rev 83436) +++ trunk/dports/aqua/qt4-mac/Portfile 2011-09-01 13:58:09 UTC (rev 83437) @@ -10,7 +10,7 @@ name qt4-mac conflicts qt3 qt3-mac qt4-mac-devel -version 4.7.3 +version 4.7.4 categories aqua platforms macosx maintainers michaelld @@ -24,9 +24,9 @@ master_sites trolltech distname qt-everywhere-opensource-src-${version} -checksums md5 49b96eefb1224cc529af6fe5608654fe \ - sha1 765eb70d9779f93fefddddda5e6ddb33f4c0b71e \ - rmd160 ab9c11c85898430fa74e5e07894f8da5e5936645 +checksums md5 ddf7d83f912cf1283aa066368464fa22 \ + sha1 ac7b4df34adaa6e9d1fb41743d1f15f5aac481db \ + rmd160 347ba2c4f855b40bf3ce90adb19c1a87925e6c61 depends_lib-append port:zlib port:dbus port:openssl port:sqlite3 \ port:tiff port:libpng port:libmng port:jpeg @@ -84,13 +84,10 @@ # (6) fix use of CARBON, found on PPC64, but will work on any system patchfiles-append patch-PluginView-no-carbon.diff -# (7) fix use of NSDragOperation on OS X 10.7 -patchfiles-append patch-NSDragOperation.diff - -# (8) Allow compiling under OS X 10.7 +# (7) Allow compiling under OS X 10.7 patchfiles-append patch-src-corelib-global-qglobal.h.diff -# (9) fix #includes for OS X 10.7 in Bearer CoreWLAN +# (8) fix #includes for OS X 10.7 in Bearer CoreWLAN patchfiles-append patch-src-plugins-bearer-corewlan-qcorewlanengine.mm.diff # find a way to specify the OS MINOR version. @@ -99,7 +96,7 @@ # hopefully the macosx_deployment_target exists and is set by now. if # not, last resort (which is not desirable) is to use the os.version. -if {${macosx_deployment_target} == ""} { +if {${macosx_deployment_target} != ""} { set MINOR [lindex [split ${macosx_deployment_target} "."] 1] } else { set MINOR [expr [lindex [split ${os.version} "."] 0] - 4]