Revision: 107373 https://trac.macports.org/changeset/107373 Author: michaelld@macports.org Date: 2013-06-26 07:38:30 -0700 (Wed, 26 Jun 2013) Log Message: ----------- py*-pyqt4: * fix name of qt4 designer plugin to include python.version (rev bump); * fix whitespace; * fix comments. Modified Paths: -------------- trunk/dports/python/py-pyqt4/Portfile Modified: trunk/dports/python/py-pyqt4/Portfile =================================================================== --- trunk/dports/python/py-pyqt4/Portfile 2013-06-26 13:30:57 UTC (rev 107372) +++ trunk/dports/python/py-pyqt4/Portfile 2013-06-26 14:38:30 UTC (rev 107373) @@ -7,6 +7,7 @@ name py-pyqt4 version 4.10.2 +revision 1 python.versions 24 25 26 27 31 32 33 python.default_version 27 categories-append devel @@ -131,9 +132,9 @@ foreach profile ${profiles} { reinplace -E "s|^(CONFIG\[ \\t].*)|\\1 ${conflags}|" ${profile} } - - # This file exists if Qt was installed non-universal. - # Easiest just to check if it was created + + # This file exists if Qt was installed non-universal. + # Easiest just to check if it was created. if {[file exists ${worksrcpath}/designer/python.pro ]} { system "cd ${worksrcpath}/designer && \ ${qt_qmake_cmd} -spec ${qt_mkspecs_dir}/macx-g++ \ @@ -142,7 +143,7 @@ } } -# allow ccache, if specified by the user + # allow ccache, if specified by the user pre-build { if {[tbool configure.ccache]} { build.post_args "CCACHE=ccache" @@ -173,13 +174,13 @@ THANKS \ ${docdir}/${subport} - # This file exists if Qt was installed non-universal. - # Easiest just to check if it was created - if {[file exists ${destroot}${qt_plugins_dir}/designer/libpythonplugin.dylib]} { + # Rename designer plugin to include Python version; easiest + # just to check if it was created, instead of patching. + if {[file exists ${destroot}${qt_plugins_dir}/designer/libpyqt4.dylib]} { # rename Qt4 specific files # (a) designer plugin - set old_name libpythonplugin.dylib - set new_name libpython${python.version}plugin.dylib + set old_name libpyqt4.dylib + set new_name libpy${python.version}qt4.dylib move ${destroot}${qt_plugins_dir}/designer/${old_name} \ ${destroot}${qt_plugins_dir}/designer/${new_name}