<!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>[137618] trunk/dports/python/py-networkit</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/137618">137618</a></dd>
<dt>Author</dt> <dd>stromnov@macports.org</dd>
<dt>Date</dt> <dd>2015-06-15 06:35:48 -0700 (Mon, 15 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>py-networkit: update to verion 3.5</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpynetworkitPortfile">trunk/dports/python/py-networkit/Portfile</a></li>
<li><a href="#trunkdportspythonpynetworkitfilespatchsetuppydiff">trunk/dports/python/py-networkit/files/patch-setup.py.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpynetworkitPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-networkit/Portfile (137617 => 137618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-networkit/Portfile 2015-06-15 13:35:04 UTC (rev 137617)
+++ trunk/dports/python/py-networkit/Portfile 2015-06-15 13:35:48 UTC (rev 137618)
</span><span class="lines">@@ -3,9 +3,10 @@
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><span class="cx"> PortGroup python 1.0
</span><ins>+PortGroup compilers 1.0
</ins><span class="cx">
</span><span class="cx"> name py-networkit
</span><del>-version 3.3
</del><ins>+version 3.5
</ins><span class="cx"> revision 0
</span><span class="cx"> categories-append devel
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -23,11 +24,11 @@
</span><span class="cx">
</span><span class="cx"> distname networkit-${version}
</span><span class="cx">
</span><del>-checksums rmd160 ce76b5bde0266fe5e3ce4d1131607393c98fa7fe \
- sha256 31fba2f565ed7ea8f6b56233301999f040017ecb48e560879771438ea5c5e105
</del><ins>+checksums rmd160 b252409c0cc270486f94e85b3f5cd38215acf071 \
+ sha256 f79bd95f99c58ab646320a396f4a53da7a3eea4209d57703bd82d2a46513e103
</ins><span class="cx">
</span><span class="cx"> if {${name} ne ${subport}} {
</span><del>- patchfiles-append patch-setup.py.diff
</del><ins>+ compiler.whitelist macports-gcc-4.8 macports-gcc-4.9
</ins><span class="cx">
</span><span class="cx"> depends_build-append \
</span><span class="cx"> port:py${python.version}-setuptools \
</span><span class="lines">@@ -40,24 +41,14 @@
</span><span class="cx"> port:py${python.version}-scipy \
</span><span class="cx"> port:py${python.version}-matplotlib
</span><span class="cx">
</span><del>- variant gcc48 conflicts gcc49 description {build using macports-gcc-4.8} {}
- variant gcc49 conflicts gcc48 description {build using macports-gcc-4.9} {}
</del><ins>+ patchfiles-append patch-setup.py.diff
</ins><span class="cx">
</span><del>- if {![variant_isset gcc48] && ![variant_isset gcc49]} {
- default_variants +gcc48
</del><ins>+ post-patch {
+ reinplace "s|@COMPILER@|${configure.cxx}|g" ${worksrcpath}/setup.py
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if {[variant_isset gcc48]} {
- configure.compiler macports-gcc-4.8
- } elseif {[variant_isset gcc49]} {
- configure.compiler macports-gcc-4.9
- }
-
- build.target build_ext
</del><span class="cx"> build.env-append CC="${configure.cc}" CXX="${configure.cxx}"
</span><span class="cx">
</span><del>- destroot.env-append CC="${configure.cc}" CXX="${configure.cxx}"
-
</del><span class="cx"> livecheck.type none
</span><span class="cx"> } else {
</span><span class="cx"> livecheck.type regex
</span></span></pre></div>
<a id="trunkdportspythonpynetworkitfilespatchsetuppydiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-networkit/files/patch-setup.py.diff (137617 => 137618)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-networkit/files/patch-setup.py.diff 2015-06-15 13:35:04 UTC (rev 137617)
+++ trunk/dports/python/py-networkit/files/patch-setup.py.diff 2015-06-15 13:35:48 UTC (rev 137618)
</span><span class="lines">@@ -1,49 +1,11 @@
</span><del>---- setup.py.orig 2014-10-31 12:06:18.000000000 +0300
-+++ setup.py 2014-10-31 14:41:10.000000000 +0300
-@@ -1,9 +1,5 @@
- import version
- import sys
--if "setuptools" not in sys.modules:
-- from ez_setup import use_setuptools
-- # in case setuptools is not installed
-- use_setuptools()
-
- from setuptools import setup
- from setuptools import Extension
-@@ -69,34 +65,9 @@
- }""")
- sample.close()
-
--
--gcc_version_satisfied = False
--gcc_versions = ["","-4.9","-4.8","-4.7"]
--gcc = ""
--v = 0
--while gcc_version_satisfied == False and v < len(gcc_versions):
-- try:
-- comp_cmd = "g++{0} -o test sample.cpp -fopenmp -std=c++11".format(gcc_versions[v])
-- #print(comp_cmd)
-- comp_proc = Popen(shlex.split(comp_cmd), stdout=DEVNULL, stderr=DEVNULL)
-- comp_proc.wait()
-- if (comp_proc.returncode == 0):
-- gcc_version_satisfied = True
-- gcc = "g++{0}".format(gcc_versions[v])
-- #print("your latest gcc is {0}".format(gcc))
-- except:
-- foo = 0
-- #print("g++{0} is not installed".format(gcc_versions[v]))
-- v += 1
--os.remove("sample.cpp")
--if gcc_version_satisfied:
-- os.remove("test")
-+gcc = os.environ["CXX"]
-+if "CC" not in os.environ:
- os.environ["CC"] = gcc
-- os.environ["CXX"] = gcc
--else:
-- errorMessages.append("ERROR: Please install GCC/g++ 4.8 or later and rerun")
-- abortInstallation = True
--
-
- # abort installation in case either Cython, Scons or the compiler requirements aren't satisfied
- if abortInstallation:
</del><ins>+--- setup.py.orig 2015-06-15 15:41:36.000000000 +0300
++++ setup.py 2015-06-15 16:21:44.000000000 +0300
+@@ -76,7 +76,7 @@
+ #######################################
+ # temporarily disable compiler check on windows.
+ if not sys.platform == 'Windows':
+- candidates = ["g++", "g++-4.9", "g++-4.8"] # , "g++-4.7"
++ candidates = ["@COMPILER@"]
+ cppcompiler = determineCompiler(candidates)
+ if cppcompiler is not None:
+ os.environ["CC"] = cppcompiler
</ins></span></pre>
</div>
</div>
</body>
</html>