Revision: 75417 http://trac.macports.org/changeset/75417 Author: michaelld@macports.org Date: 2011-01-24 11:50:58 -0800 (Mon, 24 Jan 2011) Log Message: ----------- py26-pyqt4 and py27-pyqt4: Fix names of installed Qt4 files (plugin and Qsci API); fixes ticket #26985. 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 19:20:17 UTC (rev 75416) +++ trunk/dports/python/py26-pyqt4/Portfile 2011-01-24 19:50:58 UTC (rev 75417) @@ -6,10 +6,10 @@ name py26-pyqt4 version 4.8.3 +revision 1 categories python devel platforms macosx maintainers michaelld openmaintainer -conflicts py27-pyqt4 description PyQt4 is a set of Python bindings for the Qt4 toolkit long_description \ PyQt4 is a set of Python bindings for the Qt4 toolkit. The \ @@ -26,10 +26,11 @@ sha1 874ba6af725c7a102173b895b79d97a67bf33bcb \ rmd160 23a17c197d0347ad6cd1a19ce1291865e838fe9f -depends_lib-append port:py26-sip - set pyversion 2.6 +set pyversion_join [join [split ${pyversion} "."] ""] +depends_lib-append port:py${pyversion_join}-sip + # The patch file alters configure.py so that the qtdesigner plugin can link. # - it ensures that both LFLAGS are included and that the relevant version framework is linked patchfiles patch-configure.py @@ -44,7 +45,7 @@ } } -configure.cmd "${prefix}/bin/python2.6 configure.py \ +configure.cmd "${prefix}/bin/python${pyversion} configure.py \ -q ${qt_qmake_cmd} --verbose --confirm-license" configure.pre_args configure.post_args LFLAGS="-F${frameworks_dir} -L${prefix}/lib" @@ -106,6 +107,20 @@ LICENSE-MERGED-GPL2-GPL3 LICENSE.GPL2 LICENSE.GPL3 OPENSOURCE-NOTICE.TXT NEWS README \ THANKS \ ${destroot}${prefix}/share/doc/${name} + + # rename Qt4 specific files + # (a) designer plugin + set old_name libpythonplugin.dylib + set new_name libpython${pyversion_join}plugin.dylib + + move ${destroot}${qt_plugins_dir}/designer/${old_name} \ + ${destroot}${qt_plugins_dir}/designer/${new_name} + system "install_name_tool -id ${new_name} \ + ${destroot}${qt_plugins_dir}/designer/${new_name}" + + # (b) Qsci API file + move ${destroot}${qt_data_dir}/qsci/api/python/PyQt4.api \ + ${destroot}${qt_data_dir}/qsci/api/python/PyQt4-Python${pyversion}.api } variant debug description "Build debug libraries" { Modified: trunk/dports/python/py27-pyqt4/Portfile =================================================================== --- trunk/dports/python/py27-pyqt4/Portfile 2011-01-24 19:20:17 UTC (rev 75416) +++ trunk/dports/python/py27-pyqt4/Portfile 2011-01-24 19:50:58 UTC (rev 75417) @@ -6,10 +6,10 @@ name py27-pyqt4 version 4.8.3 +revision 1 categories python devel platforms macosx maintainers michaelld openmaintainer -conflicts py26-pyqt4 description PyQt4 is a set of Python bindings for the Qt4 toolkit long_description \ PyQt4 is a set of Python bindings for the Qt4 toolkit. The \ @@ -26,10 +26,11 @@ sha1 874ba6af725c7a102173b895b79d97a67bf33bcb \ rmd160 23a17c197d0347ad6cd1a19ce1291865e838fe9f -depends_lib-append port:py27-sip - set pyversion 2.7 +set pyversion_join [join [split ${pyversion} "."] ""] +depends_lib-append port:py${pyversion_join}-sip + # The patch file alters configure.py so that the qtdesigner plugin can link. # - it ensures that both LFLAGS are included and that the relevant version framework is linked patchfiles patch-configure.py @@ -44,7 +45,7 @@ } } -configure.cmd "${prefix}/bin/python2.7 configure.py \ +configure.cmd "${prefix}/bin/python${pyversion} configure.py \ -q ${qt_qmake_cmd} --verbose --confirm-license" configure.pre_args configure.post_args LFLAGS="-F${frameworks_dir} -L${prefix}/lib" @@ -55,7 +56,6 @@ ${configure.universal_ldflags}" configure.post_args-append CFLAGS="${configure.universal_cflags}" configure.post_args-append CXXFLAGS="${configure.universal_cxxflags}" - } post-configure { @@ -107,6 +107,20 @@ LICENSE-MERGED-GPL2-GPL3 LICENSE.GPL2 LICENSE.GPL3 OPENSOURCE-NOTICE.TXT NEWS README \ THANKS \ ${destroot}${prefix}/share/doc/${name} + + # rename Qt4 specific files + # (a) designer plugin + set old_name libpythonplugin.dylib + set new_name libpython${pyversion_join}plugin.dylib + + move ${destroot}${qt_plugins_dir}/designer/${old_name} \ + ${destroot}${qt_plugins_dir}/designer/${new_name} + system "install_name_tool -id ${new_name} \ + ${destroot}${qt_plugins_dir}/designer/${new_name}" + + # (b) Qsci API file + move ${destroot}${qt_data_dir}/qsci/api/python/PyQt4.api \ + ${destroot}${qt_data_dir}/qsci/api/python/PyQt4-Python${pyversion}.api } variant debug description "Build debug libraries" {