<!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>[145624] trunk/dports/python/py-dynd</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/145624">145624</a></dd>
<dt>Author</dt> <dd>stromnov@macports.org</dd>
<dt>Date</dt> <dd>2016-02-11 04:55:16 -0800 (Thu, 11 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>py-dynd: update to version 0.7.1</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpydyndPortfile">trunk/dports/python/py-dynd/Portfile</a></li>
<li><a href="#trunkdportspythonpydyndfilespatchCMakeListstxtdiff">trunk/dports/python/py-dynd/files/patch-CMakeLists.txt.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportspythonpydyndfilespatchsetuppydiff">trunk/dports/python/py-dynd/files/patch-setup.py.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpydyndPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-dynd/Portfile (145623 => 145624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-dynd/Portfile        2016-02-11 12:55:13 UTC (rev 145623)
+++ trunk/dports/python/py-dynd/Portfile        2016-02-11 12:55:16 UTC (rev 145624)
</span><span class="lines">@@ -4,17 +4,17 @@
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup github 1.0
</span><span class="cx"> PortGroup python 1.0
</span><del>-PortGroup cmake 1.0
</del><span class="cx">
</span><del>-set git_sha1 d7ec36c6f1beb0621d6037ab0953db7e4c1b9150
-github.setup ContinuumIO dynd-python 0.6.6 v
</del><ins>+set git_sha1 f64124857edaacbbdfb76c48f3410e277ee1475c
</ins><span class="cx">
</span><ins>+github.setup libdynd dynd-python 0.7.1 v
+
</ins><span class="cx"> name py-dynd
</span><span class="cx"> categories-append devel
</span><span class="cx"> platforms darwin
</span><span class="cx"> license BSD
</span><span class="cx">
</span><del>-python.versions 27 34
</del><ins>+python.versions 27 34 35
</ins><span class="cx">
</span><span class="cx"> maintainers stromnov openmaintainer
</span><span class="cx">
</span><span class="lines">@@ -24,33 +24,26 @@
</span><span class="cx"> Python exposure of the DyND dynamic multi-dimensional \
</span><span class="cx"> array library.
</span><span class="cx">
</span><del>-checksums rmd160 490f6540ae67ab98430e4e433b9278b8f63e9237 \
- sha256 edf9206ee883cbc2251b9be7e305a0f805731d145a00c4220ab1a959b7f15a3a
</del><ins>+checksums rmd160 f666bf5df98cfd0850521b2639cab78a47df0692 \
+ sha256 4e1dc70235cd0382f083e68aeaa544d4dde4739b66b7af5963599cdefffa8b5e
</ins><span class="cx">
</span><span class="cx"> if {${name} ne ${subport}} {
</span><ins>+ depends_build-append \
+ port:py${python.version}-setuptools \
+ port:cmake
+
</ins><span class="cx"> depends_lib-append port:libdynd \
</span><span class="cx"> port:py${python.version}-numpy \
</span><span class="cx"> port:py${python.version}-cython
</span><span class="cx">
</span><del>- patchfiles-append patch-CMakeLists.txt.diff
</del><ins>+ patchfiles-append patch-CMakeLists.txt.diff \
+ patch-setup.py.diff
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|@@DYND_PYTHON_GIT_SHA1@@|${git_sha1}|g" ${worksrcpath}/CMakeLists.txt
</span><del>- reinplace "s|@@DYND_PYTHON_VERSION_STRING@@|v${version}|g" ${worksrcpath}/CMakeLists.txt
</del><ins>+ reinplace "s|@@DYND_PYTHON_VERSION_STRING@@|v${version}|g" ${worksrcpath}/CMakeLists.txt ${worksrcpath}/setup.py
+ reinplace "s|@@EXTRA_CMAKE_ARGS@@|-DCYTHON_EXECUTABLE=${prefix}/bin/cython-${python.branch}|g" ${worksrcpath}/setup.py
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- use_configure yes
- configure.args-append \
- -DUSE_SEPARATE_LIBDYND=ON \
- -DUSE_RELATIVE_RPATH=OFF \
- -DPYTHON_EXECUTABLE=${prefix}/bin/python${python.branch} \
- -DCYTHON_EXECUTABLE=${prefix}/bin/cython-${python.branch}
-
- build.cmd make
- build.target all
-
- destroot.cmd make
- destroot.destdir DESTDIR=${destroot}
-
</del><span class="cx"> livecheck.type none
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportspythonpydyndfilespatchCMakeListstxtdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-dynd/files/patch-CMakeLists.txt.diff (145623 => 145624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-dynd/files/patch-CMakeLists.txt.diff        2016-02-11 12:55:13 UTC (rev 145623)
+++ trunk/dports/python/py-dynd/files/patch-CMakeLists.txt.diff        2016-02-11 12:55:16 UTC (rev 145624)
</span><span class="lines">@@ -1,6 +1,14 @@
</span><del>---- CMakeLists.txt.orig        2014-05-12 14:00:52.000000000 +0400
-+++ CMakeLists.txt        2014-05-12 14:03:39.000000000 +0400
-@@ -86,8 +86,9 @@
</del><ins>+--- CMakeLists.txt.orig        2016-02-03 22:54:24.000000000 +0300
++++ CMakeLists.txt        2016-02-11 13:18:07.000000000 +0300
+@@ -32,7 +31,6 @@
+ # For the Git SHA1/version code
+ list(APPEND CMAKE_MODULE_PATH
+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
+-include(GetGitRevisionDescriptionDyND)
+
+ find_package(CUDA 6.5)
+ find_package(PythonInterp REQUIRED)
+@@ -91,8 +89,8 @@
</ins><span class="cx"> endif()
</span><span class="cx">
</span><span class="cx"> # Get the git revision
</span><span class="lines">@@ -8,16 +16,6 @@
</span><span class="cx"> -git_describe("${CMAKE_CURRENT_SOURCE_DIR}" DYND_PYTHON_VERSION_STRING --dirty --always --match "v*")
</span><span class="cx"> +SET(DYND_PYTHON_GIT_SHA1 "@@DYND_PYTHON_GIT_SHA1@@")
</span><span class="cx"> +SET(DYND_PYTHON_VERSION_STRING "@@DYND_PYTHON_VERSION_STRING@@")
</span><del>-+
</del><span class="cx"> message(STATUS "DyND-Python version: ${DYND_PYTHON_VERSION_STRING}")
</span><span class="cx"> configure_file(
</span><del>- "${CMAKE_CURRENT_SOURCE_DIR}/src/git_version.cpp.in"
-@@ -102,7 +103,7 @@
- # Treat warnings as errors (-WX does this)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -WX -EHsc")
- else()
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fomit-frame-pointer -fstrict-aliasing -fPIC -Wall -Wextra -Werror")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fomit-frame-pointer -fstrict-aliasing -fPIC -Wall -Wextra")
- if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
- # The '-fmax-errors' flag was first supported in gcc 4.6
- # Use the c++0x flag only in 4.6 and later
</del><ins>+ "${CMAKE_CURRENT_SOURCE_DIR}/dynd/src/git_version.cpp.in"
</ins></span></pre></div>
<a id="trunkdportspythonpydyndfilespatchsetuppydiff"></a>
<div class="addfile"><h4>Added: trunk/dports/python/py-dynd/files/patch-setup.py.diff (0 => 145624)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-dynd/files/patch-setup.py.diff         (rev 0)
+++ trunk/dports/python/py-dynd/files/patch-setup.py.diff        2016-02-11 12:55:16 UTC (rev 145624)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+--- setup.py.orig        2016-02-11 10:11:17.000000000 +0300
++++ setup.py        2016-02-11 14:46:18.000000000 +0300
+@@ -40,7 +40,7 @@
+
+ def initialize_options(self):
+ build_ext.initialize_options(self)
+- self.extra_cmake_args = ''
++ self.extra_cmake_args = '@@EXTRA_CMAKE_ARGS@@'
+
+ def run(self):
+ # We don't call the origin build_ext, instead ignore that
+@@ -82,7 +82,8 @@
+ build_tests_option = '-DDYND_BUILD_TESTS=OFF'
+
+ if sys.platform != 'win32':
+- cmake_command = ['cmake', self.extra_cmake_args, pyexe_option,
++ extra_cmake_args = shlex.split(self.extra_cmake_args)
++ cmake_command = ['cmake'] + extra_cmake_args + [pyexe_option,
+ install_lib_option, build_tests_option,
+ static_lib_option, source]
+
+@@ -166,9 +167,7 @@
+ import subprocess
+ return subprocess.Popen(args, stdout = subprocess.PIPE).communicate()[0]
+
+-# Get the version number to use from git
+-ver = check_output(['git', 'describe', '--dirty',
+- '--always', '--match', 'v*']).decode('ascii').strip('\n')
++ver = "@@DYND_PYTHON_VERSION_STRING@@"
+
+ # Same processing as in __init__.py
+ if '.' in ver:
</ins></span></pre>
</div>
</div>
</body>
</html>