<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/926432a0aec8c66c668a5007ec1ba2e28180b125">https://github.com/macports/macports-ports/commit/926432a0aec8c66c668a5007ec1ba2e28180b125</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 926432a0aec8c66c668a5007ec1ba2e28180b125
</span>Author: Andrey Stromnov <stromnov@macports.org>
AuthorDate: Tue Mar 3 00:06:41 2020 +0300

<span style='display:block; white-space:pre;color:#404040;'>    py-networkit: update to 6.1
</span>---
 python/py-networkit/Portfile                       | 15 +++++----
 .../py-networkit/files/patch-CMakeLists.txt.diff   | 13 --------
 python/py-networkit/files/patch-setup.py.diff      | 37 ++++++++++++++++++++++
 3 files changed, 46 insertions(+), 19 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 34c2002..13dc093 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;'>@@ -4,7 +4,7 @@ PortSystem          1.0
</span> PortGroup           python 1.0
 
 name                py-networkit
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version             6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             6.1
</span> revision            0
 categories-append   devel
 platforms           darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,18 +19,21 @@ long_description    ${description}
</span> 
 homepage            https://networkit.iti.kit.edu/
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  e0bf2a0be34bb6724303442e6a96e5ddd31850a0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  c9dd49c567ad2ac2969a4cdf7be098d4effa55f28ed799ce1bf981e46b83d631 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    1824903
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  9c17524816d248f7e9594ce9493a4adcd2fd8891 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  f7fcb50dec66a8253f85c10ff9314100de013c7578d531c81d3f71bc6cf8f093 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    2034262
</span> 
 if {${name} ne ${subport}} {
     compiler.cxx_standard 2017
     compiler.openmp_version 2.5
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    patchfiles-append   patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append   patch-setup.py.diff
</span> 
     post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace "s|@@PREFIX@@|${prefix}|" ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        # force cython usage
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        file delete ${worksrcpath}/networkit/_NetworKit.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|@@PREFIX@@|${prefix}|" ${worksrcpath}/setup.py
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        reinplace "s|@@CYTHON@@|cython-${python.branch}|" ${worksrcpath}/setup.py
</span>     }
 
     depends_build-append \
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 10471be..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-networkit/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig    2019-12-20 13:54:35.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2019-12-23 16:41:03.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -120,8 +120,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Following section manually sets the required fields for clang-like compiler
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") OR
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   "${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  find_library(LIBOMP_PATH NAMES omp HINTS "/usr/local/opt/libomp/include")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--  find_path(LIBOMP_INCLUDE NAMES omp.h HINTS "/usr/local/opt/libomp/include")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  find_library(LIBOMP_PATH NAMES omp HINTS "@@PREFIX@@/lib/libomp")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+  find_path(LIBOMP_INCLUDE NAMES omp.h HINTS "@@PREFIX@@/include/libomp")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-   if(LIBOMP_PATH AND LIBOMP_INCLUDE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-           if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "AppleClang")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                   set(OpenMP_CXX_FLAGS "-Xpreprocessor -fopenmp -I${LIBOMP_INCLUDE}" CACHE STRING "Manually set")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-networkit/files/patch-setup.py.diff b/python/py-networkit/files/patch-setup.py.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..adb94d3
</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-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,37 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig  2020-03-02 01:23:13.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py       2020-03-02 01:26:39.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24,6 +24,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   sys.exit(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ninja_available = shutil.which("ninja") is not None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ninja_available = False
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if not (ninja_available or shutil.which("make")):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   print("ERROR: NetworKit compilation requires Make or Ninja.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   sys.exit(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -117,7 +118,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ def cythonizeFile(filepath):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   cpp_file = filepath.replace("pyx","cpp")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  cython_available = shutil.which("cython") is not None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  cython_available = shutil.which("@@CYTHON@@") is not None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if not cython_available:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           if not os.path.isfile(cpp_file):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   print("ERROR: Neither cython nor _NetworKit.cpp is provided. Build cancelled", flush=True)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -134,7 +135,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           if not os.path.isfile(filepath):
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   print("_NetworKit.pyx is not available. Build cancelled.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   exit(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-          comp_cmd = ["cython","-3","--cplus","-t",filepath]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++          comp_cmd = ["@@CYTHON@@","-3","--cplus","-t",filepath]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           if not subprocess.call(comp_cmd) == 0:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   print("cython returned an error, exiting setup.py")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                   exit(1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -163,6 +164,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   comp_cmd.append(os.getcwd()) #call CMakeLists.txt from networkit root
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if rpath:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+           comp_cmd.append("-DNETWORKIT_PYTHON_RPATH="+rpath)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  comp_cmd.append("-DLIBOMP_PATH=@@PREFIX@@/lib/libomp")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++  comp_cmd.append("-DLIBOMP_INCLUDE=@@PREFIX@@/include/libomp")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   # Run cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   print("initializing NetworKit compilation with: '{0}'".format(" ".join(comp_cmd)), flush=True)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   if not subprocess.call(comp_cmd, cwd=buildDirectory) == 0:
</span></pre><pre style='margin:0'>

</pre>