<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[121728] trunk/dports/python/py-shiboken</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/121728">121728</a></dd>
<dt>Author</dt> <dd>mmoll@macports.org</dd>
<dt>Date</dt> <dd>2014-07-05 17:00:53 -0700 (Sat, 05 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>py-shiboken: install pkgconfig and cmake files, take #2. closes #44250</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpyshibokenPortfile">trunk/dports/python/py-shiboken/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportspythonpyshibokenfilespatchcmakepkgconfigdiff">trunk/dports/python/py-shiboken/files/patch-cmakepkgconfig.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpyshibokenPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-shiboken/Portfile (121727 => 121728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-shiboken/Portfile 2014-07-05 17:48:12 UTC (rev 121727)
+++ trunk/dports/python/py-shiboken/Portfile 2014-07-06 00:00:53 UTC (rev 121728)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> set realname shiboken
</span><span class="cx"> name py-${realname}
</span><span class="cx"> version 1.2.2
</span><del>-revision 2
</del><ins>+revision 3
</ins><span class="cx"> python.versions 26 27 32 33 34
</span><span class="cx"> python.default_version 27
</span><span class="cx"> categories-append devel
</span><span class="lines">@@ -34,14 +34,11 @@
</span><span class="cx"> system "mv -v '${worksrcpath}/generator/shiboken' '${worksrcpath}/generator/shiboken.d'"
</span><span class="cx"> reinplace "s|3.2 3.1 3.0|${python.branch}|g" ${worksrcpath}/cmake/Modules/FindPython3Libs.cmake
</span><span class="cx"> reinplace "s|NAMES python3.2mu python3.2m python3.2u python3.2 python3.1 python3.0 python3|NAMES python${python.branch}|g" ${worksrcpath}/cmake/Modules/FindPython3Interp.cmake
</span><del>- reinplace "s|@LIB_INSTALL_DIR@|${python.prefix}/lib|g" ${worksrcpath}/data/ShibokenConfig.cmake.in ${worksrcpath}/data/ShibokenConfig-spec.cmake.in
- reinplace "s|set(shiboken_SUFFIX \"-\$\{shiboken_MAJOR_VERSION\}.\$\{shiboken_MINOR_VERSION\}\")|set(shiboken_SUFFIX \"-${python.branch}\")|g" ${worksrcpath}/libshiboken/CMakeLists.txt
- reinplace "s|\$\{shibokengenerator_BINARY_DIR\}/shiboken|\$\{shibokengenerator_BINARY_DIR\}/shiboken-${python.branch}|g" ${worksrcpath}/shibokenmodule/CMakeLists.txt
- reinplace "s|include/shiboken|include/shiboken-${python.branch}|g;s|/@shiboken_SUFFIX@||g" ${worksrcpath}/data/shiboken.pc.in
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> patchfiles default_visibility.patch \
</span><del>- filename_collision.patch
</del><ins>+ filename_collision.patch \
+ patch-cmakepkgconfig.diff
</ins><span class="cx">
</span><span class="cx"> depends_lib-append port:qt4-mac \
</span><span class="cx"> port:python${python.version} \
</span><span class="lines">@@ -49,13 +46,13 @@
</span><span class="cx"> port:sparsehash
</span><span class="cx"> use_configure yes
</span><span class="cx"> configure.args-append -DBUILD_TESTS:BOOL=FALSE \
</span><del>- -DENABLE_VERSION_SUFFIX=ON \
- -Dshiboken_SUFFIX="-${python.branch}" \
</del><span class="cx"> -DPYTHON_EXECUTABLE=${python.bin} \
</span><span class="cx"> -DPYTHON_LIBRARIES=${python.lib} \
</span><span class="cx"> -DPYTHON_INCLUDE_DIR=${python.include} \
</span><span class="cx"> -DPYTHON_SITE_PACKAGES=${python.pkgd} \
</span><del>- -DSPARSEHASH_INCLUDE_PATH=${prefix}/include
</del><ins>+ -DSPARSEHASH_INCLUDE_PATH=${prefix}/include \
+ -DPYTHONBRANCH=${python.branch} \
+ -DPYTHONPREFIX=${python.prefix}
</ins><span class="cx"> if {${python.version} >= 30} {
</span><span class="cx"> configure.args-append -DUSE_PYTHON3:BOOL=TRUE -DPYTHON3_LIBRARY=${python.lib} -DPYTHON3_INCLUDE_DIR=${python.include}
</span><span class="cx"> }
</span><span class="lines">@@ -64,6 +61,8 @@
</span><span class="cx"> destroot.cmd make
</span><span class="cx"> destroot.destdir DESTDIR=${destroot}
</span><span class="cx"> post-destroot {
</span><ins>+ move ${destroot}${prefix}/bin/shiboken ${destroot}${prefix}/bin/shiboken-${python.branch}
+ move ${destroot}${prefix}/include/shiboken ${destroot}${prefix}/include/shiboken-${python.branch}
</ins><span class="cx"> move ${destroot}${prefix}/share/man/man1/shiboken.1 ${destroot}${prefix}/share/man/man1/shiboken-${python.branch}.1
</span><span class="cx"> move ${destroot}${prefix}/lib/cmake ${destroot}${python.prefix}/lib/cmake
</span><span class="cx"> move ${destroot}${prefix}/lib/pkgconfig ${destroot}${python.prefix}/lib/pkgconfig
</span></span></pre></div>
<a id="trunkdportspythonpyshibokenfilespatchcmakepkgconfigdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/python/py-shiboken/files/patch-cmakepkgconfig.diff (0 => 121728)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-shiboken/files/patch-cmakepkgconfig.diff (rev 0)
+++ trunk/dports/python/py-shiboken/files/patch-cmakepkgconfig.diff 2014-07-06 00:00:53 UTC (rev 121728)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+diff -rubw data/ShibokenConfig-spec.cmake.in data/ShibokenConfig-spec.cmake.in
+--- data/ShibokenConfig-spec.cmake.in 2014-04-22 10:42:48.000000000 -0500
++++ data/ShibokenConfig-spec.cmake.in 2014-07-05 18:42:33.000000000 -0500
+@@ -5,7 +5,7 @@
+ # SHIBOKEN_PYTHON_INTERPRETER - Python interpreter (regular or debug) to be used with the bindings.
+ # SHIBOKEN_PYTHON_LIBRARIES - Python libraries (regular or debug) Shiboken is linked against.
+
+-SET(SHIBOKEN_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/shiboken@shiboken_SUFFIX@")
++SET(SHIBOKEN_INCLUDE_DIR "@CMAKE_INSTALL_PREFIX@/include/shiboken-@PYTHONBRANCH@")
+ if(MSVC)
+ SET(SHIBOKEN_LIBRARY "@LIB_INSTALL_DIR@/@CMAKE_SHARED_LIBRARY_PREFIX@shiboken@shiboken_SUFFIX@@PYTHON_SUFFIX@@LIBRARY_OUTPUT_SUFFIX@.lib")
+ elseif(CYGWIN)
+@@ -23,4 +23,4 @@
+ message(STATUS "libshiboken built for @SHIBOKEN_BUILD_TYPE@")
+ @SBK_ADD_PY_DEBUG_DEFINITION@
+
+-set(SHIBOKEN_BINARY "@CMAKE_INSTALL_PREFIX@/bin/@SHIBOKEN_GENERATOR@")
++set(SHIBOKEN_BINARY "@CMAKE_INSTALL_PREFIX@/bin/@SHIBOKEN_GENERATOR@-@PYTHONBRANCH@")
+diff -rubw data/ShibokenConfig.cmake.in data/ShibokenConfig.cmake.in
+--- data/ShibokenConfig.cmake.in 2014-04-22 10:42:48.000000000 -0500
++++ data/ShibokenConfig.cmake.in 2014-07-05 18:42:37.000000000 -0500
+@@ -2,4 +2,4 @@
+ message(STATUS "Using default python: @PYTHON_SUFFIX@")
+ SET(PYTHON_SUFFIX @PYTHON_SUFFIX@)
+ endif()
+-include(@LIB_INSTALL_DIR@/cmake/Shiboken-@shiboken_VERSION@/ShibokenConfig${PYTHON_SUFFIX}.cmake)
++include(@PYTHONPREFIX@/lib/cmake/Shiboken-@shiboken_VERSION@/ShibokenConfig${PYTHON_SUFFIX}.cmake)
+diff -rubw data/shiboken.pc.in data/shiboken.pc.in
+--- data/shiboken.pc.in 2014-04-22 10:42:48.000000000 -0500
++++ data/shiboken.pc.in 2014-07-05 18:42:28.000000000 -0500
+@@ -1,8 +1,8 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+ exec_prefix=@CMAKE_INSTALL_PREFIX@
+ libdir=@LIB_INSTALL_DIR@
+-includedir=@CMAKE_INSTALL_PREFIX@/include/shiboken
+-generator_location=@CMAKE_INSTALL_PREFIX@/bin/@SHIBOKEN_GENERATOR@
++includedir=@CMAKE_INSTALL_PREFIX@/include/shiboken-@PYTHONBRANCH@
++generator_location=@CMAKE_INSTALL_PREFIX@/bin/@SHIBOKEN_GENERATOR@-@PYTHONBRANCH@
+ python_interpreter=@PYTHON_EXECUTABLE@
+ python_include_dir=@SBK_PYTHON_INCLUDE_DIR@
+
</ins></span></pre>
</div>
</div>
</body>
</html>