[121729] trunk/dports/python/py-pyside
mmoll at macports.org
mmoll at macports.org
Sat Jul 5 19:58:25 PDT 2014
Revision: 121729
https://trac.macports.org/changeset/121729
Author: mmoll at macports.org
Date: 2014-07-05 19:58:25 -0700 (Sat, 05 Jul 2014)
Log Message:
-----------
py-pyside: install pkgconfig and cmake files. closes #44251
Modified Paths:
--------------
trunk/dports/python/py-pyside/Portfile
Added Paths:
-----------
trunk/dports/python/py-pyside/files/patch-cmakepkgconfig.diff
Removed Paths:
-------------
trunk/dports/python/py-pyside/files/FindShiboken.cmake.patch
Modified: trunk/dports/python/py-pyside/Portfile
===================================================================
--- trunk/dports/python/py-pyside/Portfile 2014-07-06 00:00:53 UTC (rev 121728)
+++ trunk/dports/python/py-pyside/Portfile 2014-07-06 02:58:25 UTC (rev 121729)
@@ -7,6 +7,7 @@
set realname pyside
name py-${realname}
version 1.2.2
+revision 1
set qt.ver 4.8
python.versions 26 27 32 33 34
python.default_version 27
@@ -31,23 +32,14 @@
use_bzip2 yes
if {${name} ne ${subport}} {
- 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
-
- }
+ patchfiles patch-cmakepkgconfig.diff
depends_lib-append port:qt4-mac port:py${python.version}-shiboken
use_configure yes
+ configure.env-append CMAKE_PREFIX_PATH=${python.prefix}
configure.args-append -DBUILD_TESTS:BOOL=FALSE \
- -DSITE_PACKAGE=${python.pkgd}
+ -DSITE_PACKAGE=${python.pkgd} \
+ -DPYTHONBRANCH=${python.branch} \
+ -DPYTHONPREFIX=${python.prefix}
build.cmd make
build.target all
destroot.cmd make
@@ -55,11 +47,8 @@
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
-
+ move ${destroot}${prefix}/lib/cmake ${destroot}${python.prefix}/lib/cmake
+ move ${destroot}${prefix}/lib/pkgconfig ${destroot}${python.prefix}/lib/pkgconfig
}
}
Deleted: trunk/dports/python/py-pyside/files/FindShiboken.cmake.patch
===================================================================
--- trunk/dports/python/py-pyside/files/FindShiboken.cmake.patch 2014-07-06 00:00:53 UTC (rev 121728)
+++ trunk/dports/python/py-pyside/files/FindShiboken.cmake.patch 2014-07-06 02:58:25 UTC (rev 121729)
@@ -1,11 +0,0 @@
-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- at 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- at PYTHONBRANCH@")
Added: trunk/dports/python/py-pyside/files/patch-cmakepkgconfig.diff
===================================================================
--- trunk/dports/python/py-pyside/files/patch-cmakepkgconfig.diff (rev 0)
+++ trunk/dports/python/py-pyside/files/patch-cmakepkgconfig.diff 2014-07-06 02:58:25 UTC (rev 121729)
@@ -0,0 +1,41 @@
+diff -rubw libpyside/PySideConfig-spec.cmake.in libpyside/PySideConfig-spec.cmake.in
+--- libpyside/PySideConfig-spec.cmake.in 2014-04-22 10:45:29.000000000 -0500
++++ libpyside/PySideConfig-spec.cmake.in 2014-07-05 21:38:17.000000000 -0500
+@@ -3,7 +3,7 @@
+ # PYSIDE_PYTHONPATH - Path to where the PySide Python module files could be found
+ # PYSIDE_TYPESYSTEMS - Type system files that should be used by other bindings extending PySide
+
+-SET(PYSIDE_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/PySide at pyside_SUFFIX@")
++SET(PYSIDE_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/PySide- at PYTHONBRANCH@")
+ # Platform specific library names
+ if(MSVC)
+ SET(PYSIDE_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX at pyside@pyside_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@SHIBOKEN_PYTHON_SUFFIX at .lib")
+@@ -15,4 +15,4 @@
+ SET(PYSIDE_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX at pyside@pyside_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@@SHIBOKEN_PYTHON_SUFFIX@@CMAKE_SHARED_LIBRARY_SUFFIX@")
+ endif()
+ SET(PYSIDE_PYTHONPATH "@SITE_PACKAGE@")
+-SET(PYSIDE_TYPESYSTEMS "@CMAKE_INSTALL_PREFIX@/share/PySide at pyside_SUFFIX@/typesystems")
++SET(PYSIDE_TYPESYSTEMS "@CMAKE_INSTALL_PREFIX@/share/PySide- at PYTHONBRANCH@/typesystems")
+diff -rubw libpyside/PySideConfig.cmake.in libpyside/PySideConfig.cmake.in
+--- libpyside/PySideConfig.cmake.in 2014-04-22 10:45:29.000000000 -0500
++++ libpyside/PySideConfig.cmake.in 2014-07-05 21:38:11.000000000 -0500
+@@ -2,4 +2,4 @@
+ message(STATUS "Using default python: @SHIBOKEN_PYTHON_SUFFIX@")
+ SET(PYTHON_BASENAME @SHIBOKEN_PYTHON_SUFFIX@)
+ endif()
+-include(@LIB_INSTALL_DIR@/cmake/PySide- at BINDING_API_VERSION@/PySideConfig${PYTHON_BASENAME}.cmake)
++include(@PYTHONPREFIX@/lib/cmake/PySide- at BINDING_API_VERSION@/PySideConfig${PYTHON_BASENAME}.cmake)
+diff -rubw libpyside/pyside.pc.in libpyside/pyside.pc.in
+--- libpyside/pyside.pc.in 2014-04-22 10:45:29.000000000 -0500
++++ libpyside/pyside.pc.in 2014-07-05 21:38:07.000000000 -0500
+@@ -1,8 +1,8 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+ libdir=@LIB_INSTALL_DIR@
+-includedir=@CMAKE_INSTALL_PREFIX@/include/PySide at pyside_SUFFIX@
+-typesystemdir=@CMAKE_INSTALL_PREFIX@/share/PySide at pyside_SUFFIX@/typesystems
++includedir=@CMAKE_INSTALL_PREFIX@/include/PySide- at PYTHONBRANCH@
++typesystemdir=@CMAKE_INSTALL_PREFIX@/share/PySide- at PYTHONBRANCH@/typesystems
+ pythonpath=@SITE_PACKAGE@
+
+ Name: PySide at pyside_SUFFIX@
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140705/3db25bcb/attachment.html>
More information about the macports-changes
mailing list