Revision: 75410 http://trac.macports.org/changeset/75410 Author: michaelld@macports.org Date: 2011-01-24 09:10:28 -0800 (Mon, 24 Jan 2011) Log Message: ----------- py26-pyqt4 and py27-pyqt4: Finish update to 4.8.3 by removing 'Q' patch and other unnecessary commands. Add experimental "debug" variant. Fix checksums for py27 version. Modified Paths: -------------- trunk/dports/python/py26-pyqt4/Portfile trunk/dports/python/py27-pyqt4/Portfile Modified: trunk/dports/python/py26-pyqt4/Portfile =================================================================== --- trunk/dports/python/py26-pyqt4/Portfile 2011-01-24 17:02:39 UTC (rev 75409) +++ trunk/dports/python/py26-pyqt4/Portfile 2011-01-24 17:10:28 UTC (rev 75410) @@ -38,12 +38,6 @@ } pre-configure { - file copy -force ${qt_mkspecs_dir}/macx-g++/qmake.conf \ - ${worksrcpath}/qmake.conf - - reinplace "s|-bundle|-bundle -flat_namespace -undefined suppress|" \ - ${worksrcpath}/qmake.conf - # allow ccache, if specified by the user if {[tbool configure.ccache]} { configure.env-append "CCACHE=ccache" @@ -51,8 +45,7 @@ } configure.cmd "${prefix}/bin/python2.6 configure.py \ - -q ${qt_qmake_cmd} \ - --confirm-license" + -q ${qt_qmake_cmd} --verbose --confirm-license" configure.pre_args configure.post_args LFLAGS="-F${frameworks_dir} -L${prefix}/lib" @@ -62,7 +55,6 @@ ${configure.universal_ldflags}" configure.post_args-append CFLAGS="${configure.universal_cflags}" configure.post_args-append CXXFLAGS="${configure.universal_cxxflags}" - } post-configure { @@ -116,6 +108,10 @@ ${destroot}${prefix}/share/doc/${name} } +variant debug description "Build debug libraries" { + configure.cmd-append --debug +} + livecheck.type regex livecheck.url http://www.riverbankcomputing.co.uk/software/pyqt/download livecheck.regex "PyQt-mac-gpl-(\[0-9.\]\\.\[0-9.\]\\.\[0-9.\]).tar.gz" Modified: trunk/dports/python/py27-pyqt4/Portfile =================================================================== --- trunk/dports/python/py27-pyqt4/Portfile 2011-01-24 17:02:39 UTC (rev 75409) +++ trunk/dports/python/py27-pyqt4/Portfile 2011-01-24 17:10:28 UTC (rev 75410) @@ -22,9 +22,9 @@ distname PyQt-mac-gpl-${version} dist_subdir python -checksums md5 bbb21ddda3d681847e42d20f1c883fbb \ - sha1 3174950df11ae5d1a3aa2efc9a1e3f23d78f0337 \ - rmd160 29576a85193024c6a095db3f6b5a75a5080d9af3 +checksums md5 14bade8b251660177ccc1a0cbbe33aba \ + sha1 874ba6af725c7a102173b895b79d97a67bf33bcb \ + rmd160 23a17c197d0347ad6cd1a19ce1291865e838fe9f depends_lib-append port:py27-sip @@ -35,19 +35,9 @@ patchfiles patch-configure.py post-patch { reinplace "s|@@MACPORTS_PYTHON_FRAMEWORK@@|${frameworks_dir}/Python.framework/Versions/${pyversion}/Python|" ${worksrcpath}/configure.py - - # fix missing "Q" in UIC code - reinplace "s,\\.StackedWidget,.QStackedWidget,g" \ - ${worksrcpath}/pyuic/uic/uiparser.py } pre-configure { - file copy -force ${qt_mkspecs_dir}/macx-g++/qmake.conf \ - ${worksrcpath}/qmake.conf - - reinplace "s|-bundle|-bundle -flat_namespace -undefined suppress|" \ - ${worksrcpath}/qmake.conf - # allow ccache, if specified by the user if {[tbool configure.ccache]} { configure.env-append "CCACHE=ccache" @@ -55,8 +45,7 @@ } configure.cmd "${prefix}/bin/python2.7 configure.py \ - -q ${qt_qmake_cmd} \ - --confirm-license" + -q ${qt_qmake_cmd} --verbose --confirm-license" configure.pre_args configure.post_args LFLAGS="-F${frameworks_dir} -L${prefix}/lib" @@ -120,6 +109,10 @@ ${destroot}${prefix}/share/doc/${name} } +variant debug description "Build debug libraries" { + configure.cmd-append --debug +} + livecheck.type regex livecheck.url http://www.riverbankcomputing.co.uk/software/pyqt/download livecheck.regex "PyQt-mac-gpl-(\[0-9.\]\\.\[0-9.\]\\.\[0-9.\]).tar.gz"