<!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>[114354] trunk/dports/devel/boost</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/114354">114354</a></dd>
<dt>Author</dt> <dd>mmoll@macports.org</dd>
<dt>Date</dt> <dd>2013-12-05 12:01:16 -0800 (Thu, 05 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>boost: update patch for +python3X variants</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelboostPortfile">trunk/dports/devel/boost/Portfile</a></li>
<li><a href="#trunkdportsdevelboostfilespatchboostpython3diff">trunk/dports/devel/boost/files/patch-boost-python3.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelboostPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/boost/Portfile (114353 => 114354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/boost/Portfile 2013-12-05 19:05:19 UTC (rev 114353)
+++ trunk/dports/devel/boost/Portfile 2013-12-05 20:01:16 UTC (rev 114354)
</span><span class="lines">@@ -178,9 +178,6 @@
</span><span class="cx"> set v [string index ${s} 0].[string index ${s} 1]
</span><span class="cx"> set i [lsearch -exact ${pythons_ports} ${p}]
</span><span class="cx"> set c [lreplace ${pythons_ports} ${i} ${i}]
</span><del>- # patch for boost.python from
- # https://raw.github.com/archlinuxarm/PKGBUILDs/master/extra/boost/boost-1.53.0-python3.patch
- # see also https://svn.boost.org/trac/boost/ticket/4657)
</del><span class="cx"> if { ${s} > 30 } { set bppatch "patch-boost-python3.diff" } else { set bppatch "" }
</span><span class="cx"> eval [subst {
</span><span class="cx"> variant ${p} description "Build Boost.Python for Python ${v}" conflicts ${c} debug {
</span></span></pre></div>
<a id="trunkdportsdevelboostfilespatchboostpython3diff"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/boost/files/patch-boost-python3.diff (114353 => 114354)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/boost/files/patch-boost-python3.diff 2013-12-05 19:05:19 UTC (rev 114353)
+++ trunk/dports/devel/boost/files/patch-boost-python3.diff 2013-12-05 20:01:16 UTC (rev 114354)
</span><span class="lines">@@ -12,85 +12,12 @@
</span><span class="cx"> namespace boost { namespace mpi { namespace python {
</span><span class="cx">
</span><span class="cx"> void export_datatypes()
</span><del>-diff -Naur libs/mpi/src/python/py_environment.cpp libs/mpi/src/python/py_environment.cpp
---- libs/mpi/src/python/py_environment.cpp 2007-11-25 13:38:02.000000000 -0500
-+++ libs/mpi/src/python/py_environment.cpp 2013-03-11 21:02:12.961737401 -0400
-@@ -11,6 +11,9 @@
- * This file reflects the Boost.MPI "environment" class into Python
- * methods at module level.
- */
-+
-+#include <locale>
-+#include <string>
- #include <boost/python.hpp>
- #include <boost/mpi.hpp>
-
-@@ -50,11 +53,65 @@
-
- // If anything changed, convert C-style argc/argv into Python argv
- if (mpi_argv != my_argv)
-+ {
-+#if PY_MAJOR_VERSION >= 3
-+ // Code stolen from py3k/Modules/python.c.
-+
-+ wchar_t **argv_copy = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc);
-+ /* We need a second copies, as Python might modify the first one. */
-+ wchar_t **argv_copy2 = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc);
-+
-+ if (!argv_copy || !argv_copy2) {
-+ fprintf(stderr, "out of memory\n");
-+ return false;
-+ }
-+
-+ std::locale mylocale;
-+ mbstate_t mystate;
-+
-+ const std::codecvt<char, wchar_t, mbstate_t>& myfacet =
-+ std::use_facet<std::codecvt<char, wchar_t, mbstate_t> >(mylocale);
-+
-+ for (int i = 0; i < mpi_argc; i++)
-+ {
-+ size_t length = strlen(mpi_argv[i]);
-+
-+ wchar_t *dest = (wchar_t *) PyMem_Malloc(sizeof(wchar_t) * (length + 1));
-+
-+ const char *from_next;
-+ wchar_t *to_next;
-+
-+ std::codecvt<wchar_t,char,mbstate_t>::result myresult =
-+ myfacet.out(mystate,
-+ mpi_argv[i], mpi_argv[i] + length + 1, from_next,
-+ dest, dest+length+1, to_next);
-+
-+ if (myresult != std::codecvt<wchar_t,char,mbstate_t>::ok )
-+ {
-+ fprintf(stderr, "failure translating argv\n");
-+ return 1;
-+ }
-+
-+ argv_copy2[i] = argv_copy[i] = dest;
-+ if (!argv_copy[i])
-+ return false;
-+ }
-+
-+ PySys_SetArgv(mpi_argc, argv_copy);
-+
-+ for (int i = 0; i < mpi_argc; i++) {
-+ PyMem_Free(argv_copy2[i]);
-+ }
-+ PyMem_Free(argv_copy);
-+ PyMem_Free(argv_copy2);
-+#else
- PySys_SetArgv(mpi_argc, mpi_argv);
-+#endif
-+ }
-
-- for (int arg = 0; arg < my_argc; ++arg)
-- free(my_argv[arg]);
-- delete [] my_argv;
-+ for (int arg = 0; arg < mpi_argc; ++arg)
-+ free(mpi_argv[arg]);
-+ delete [] mpi_argv;
-
- return true;
- }
</del><ins>+diff -Naur libs/mpi/build/__init__.py llibs/mpi/build/__init__.py
+--- libs/mpi/build/__init__.py 2013-11-27 12:52:37.000000000 -0600
++++ libs/mpi/build/__init__.py 2013-11-27 12:52:55.000000000 -0600
+@@ -6,5 +6,5 @@
+ import mpi
+ sys.setdlopenflags(flags)
+ else:
+- import mpi
++ from . import mpi
</ins></span></pre>
</div>
</div>
</body>
</html>