<pre style='margin:0'>
Andrew Stromnov (stromnov) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5918167e19069b9b55605038b024f83a1aebec48">https://github.com/macports/macports-ports/commit/5918167e19069b9b55605038b024f83a1aebec48</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 5918167e19069b9b55605038b024f83a1aebec48
</span>Author: Andrey Stromnov <stromnov@macports.org>
AuthorDate: Mon Dec 23 17:15:30 2019 +0300
<span style='display:block; white-space:pre;color:#404040;'> py-networkit: update to 6.0
</span>---
python/py-networkit/Portfile | 44 +++++++++-------------
.../py-networkit/files/patch-CMakeLists.txt.diff | 13 +++++++
2 files changed, 31 insertions(+), 26 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-networkit/Portfile b/python/py-networkit/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 048d6e2..34c2002 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-networkit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-networkit/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,17 +2,15 @@
</span>
PortSystem 1.0
PortGroup python 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cxx11 1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup compilers 1.0
</span>
name py-networkit
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.0
</span> revision 0
categories-append devel
platforms darwin
license MIT
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 35 36 37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 37 38
</span>
maintainers {stromnov @stromnov} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,24 +18,25 @@ description NetworKit is a toolbox for high-performance network analysis
</span> long_description ${description}
homepage https://networkit.iti.kit.edu/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites pypi:[string index ${python.rootname} 0]/${python.rootname}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${python.rootname}-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 65c96a31c2b5b535ba8eca701db096dd4e770cd7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4fd9439a155cc569000ec039e13680804d8cc233c6d602c88cf0f63174b2babd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1776184
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 e0bf2a0be34bb6724303442e6a96e5ddd31850a0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c9dd49c567ad2ac2969a4cdf7be098d4effa55f28ed799ce1bf981e46b83d631 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1824903
</span>
if {${name} ne ${subport}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Pick a compiler that supports openmp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.whitelist macports-clang-6.0 macports-clang-5.0 macports-clang-3.7 macports-gcc-7 macports-gcc-6 macports-gcc-5 macports-gcc-4.8 macports-gcc-4.7 macports-gcc-4.6 macports-gcc-4.5 macports-gcc-4.4 macports-gcc-4.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- compiler.fallback macports-clang-6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.cxx_standard 2017
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.openmp_version 2.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@PREFIX@@|${prefix}|" ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
depends_build-append \
port:py${python.version}-setuptools \
port:py${python.version}-cython \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-pip \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:scons
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:cmake
</span>
depends_lib-append port:py${python.version}-scipy \
port:py${python.version}-matplotlib \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,19 +46,12 @@ if {${name} ne ${subport}} {
</span> port:py${python.version}-tabulate \
port:py${python.version}-seaborn \
port:py${python.version}-scikit-learn \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-ipython
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-ipython \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:libomp
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS=${configure.cc_archflags} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS=${configure.cxx_archflags} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS=${configure.cppflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.env-append "CXX=${configure.cxx}"
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS=${configure.cc_archflags} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXFLAGS=${configure.cxx_archflags} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CPPFLAGS=${configure.cppflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot.env-append "CXX=${configure.cxx}"
</span>
livecheck.type none
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-networkit/files/patch-CMakeLists.txt.diff b/python/py-networkit/files/patch-CMakeLists.txt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..10471be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-networkit/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2019-12-20 13:54:35.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2019-12-23 16:41:03.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -120,8 +120,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Following section manually sets the required fields for clang-like compiler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") OR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_library(LIBOMP_PATH NAMES omp HINTS "/usr/local/opt/libomp/include")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_path(LIBOMP_INCLUDE NAMES omp.h HINTS "/usr/local/opt/libomp/include")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_library(LIBOMP_PATH NAMES omp HINTS "@@PREFIX@@/lib/libomp")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_path(LIBOMP_INCLUDE NAMES omp.h HINTS "@@PREFIX@@/include/libomp")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(LIBOMP_PATH AND LIBOMP_INCLUDE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(OpenMP_CXX_FLAGS "-Xpreprocessor -fopenmp -I${LIBOMP_INCLUDE}" CACHE STRING "Manually set")
</span></pre><pre style='margin:0'>
</pre>