Revision: 111707 https://trac.macports.org/changeset/111707 Author: mmoll@macports.org Date: 2013-09-28 20:15:03 -0700 (Sat, 28 Sep 2013) Log Message: ----------- py-pyside: avoid conflicts between subports. see also r111706 and #40587 Revision Links: -------------- https://trac.macports.org/changeset/111706 Modified Paths: -------------- trunk/dports/python/py-pyside/Portfile Added Paths: ----------- trunk/dports/python/py-pyside/files/ trunk/dports/python/py-pyside/files/FindShiboken.cmake.patch Modified: trunk/dports/python/py-pyside/Portfile =================================================================== --- trunk/dports/python/py-pyside/Portfile 2013-09-29 03:13:44 UTC (rev 111706) +++ trunk/dports/python/py-pyside/Portfile 2013-09-29 03:15:03 UTC (rev 111707) @@ -7,6 +7,7 @@ set realname pyside name py-${realname} version 1.2.1 +revision 1 set qt.ver 4.8 python.versions 26 27 32 33 python.default_version 27 @@ -31,6 +32,19 @@ use_bzip2 yes if {$subport != $name} { + patchfiles FindShiboken.cmake.patch + post-patch { + if {${python.version} < 30} { + reinplace "s|@PYTHONSUFFIX@|-python${python.branch}|g" ${worksrcpath}/cmake/Macros/FindShiboken.cmake + } else { + reinplace "s|@PYTHONSUFFIX@|.cpython-${python.version}m|g" ${worksrcpath}/cmake/Macros/FindShiboken.cmake + } + reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/cmake/Macros/FindShiboken.cmake + reinplace "s|@PYTHONBRANCH@|${python.branch}|g" ${worksrcpath}/cmake/Macros/FindShiboken.cmake + reinplace "s|@PYTHONINCLUDE@|${python.include}|g" ${worksrcpath}/cmake/Macros/FindShiboken.cmake + reinplace "s|@PYTHONBIN@|${python.bin}|g" ${worksrcpath}/cmake/Macros/FindShiboken.cmake + + } depends_lib-append port:qt4-mac port:py${python.version}-shiboken use_configure yes configure.args-append -DBUILD_TESTS:BOOL=FALSE \ @@ -39,6 +53,15 @@ build.target all destroot.cmd make destroot.destdir DESTDIR=${destroot} + post-destroot { + move ${destroot}${prefix}/include/PySide ${destroot}${prefix}/include/PySide-${python.branch} + move ${destroot}${prefix}/share/PySide ${destroot}${prefix}/share/PySide-${python.branch} + file delete ${destroot}${prefix}/lib/cmake/PySide-${version}/PySideConfig-python${python.branch}.cmake + file delete ${destroot}${prefix}/lib/cmake/PySide-${version}/PySideConfig.cmake + file delete ${destroot}${prefix}/lib/cmake/PySide-${version}/PySideConfigVersion.cmake + file delete ${destroot}${prefix}/lib/pkgconfig/pyside.pc + + } } if {${name} == ${subport}} { Added: trunk/dports/python/py-pyside/files/FindShiboken.cmake.patch =================================================================== --- trunk/dports/python/py-pyside/files/FindShiboken.cmake.patch (rev 0) +++ trunk/dports/python/py-pyside/files/FindShiboken.cmake.patch 2013-09-29 03:15:03 UTC (rev 111707) @@ -0,0 +1,11 @@ +diff -r FindShiboken.cmake FindShiboken.cmake +--- cmake/Macros/FindShiboken.cmake Thu Jan 01 00:00:00 1970 +0000 ++++ cmake/Macros/FindShiboken.cmake Sat Sep 28 20:27:46 2013 -0500 +@@ -0,0 +1,7 @@ ++set(SHIBOKEN_PYTHON_SUFFIX "@PYTHONSUFFIX@") ++set(SHIBOKEN_INCLUDE_DIR "@PREFIX@/include/shiboken-@PYTHONBRANCH@") ++set(SHIBOKEN_LIBRARY "@PREFIX@/lib/libshiboken${SHIBOKEN_PYTHON_SUFFIX}.dylib") ++set(SHIBOKEN_PYTHON_INCLUDE_DIR "@PYTHONINCLUDE@") ++set(SHIBOKEN_PYTHON_INTERPRETER "@PYTHONBIN@") ++set(SHIBOKEN_PYTHON_LIBRARIES "-undefined dynamic_lookup") ++set(SHIBOKEN_BINARY "@PREFIX@/bin/shiboken-@PYTHONBRANCH@")