[137618] trunk/dports/python/py-networkit

[stromnov at macports.org]

Revision: 137618
          https://trac.macports.org/changeset/137618
Author:   stromnov at macports.org
Date:     2015-06-15 06:35:48 -0700 (Mon, 15 Jun 2015)
Log Message:
-----------
py-networkit: update to verion 3.5

Modified Paths:
--------------
    trunk/dports/python/py-networkit/Portfile
    trunk/dports/python/py-networkit/files/patch-setup.py.diff

Modified: trunk/dports/python/py-networkit/Portfile
===================================================================
--- 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)
@@ -3,9 +3,10 @@
 
 PortSystem          1.0
 PortGroup           python 1.0
+PortGroup           compilers 1.0
 
 name                py-networkit
-version             3.3
+version             3.5
 revision            0
 categories-append   devel
 platforms           darwin
@@ -23,11 +24,11 @@
 
 distname            networkit-${version}
 
-checksums           rmd160  ce76b5bde0266fe5e3ce4d1131607393c98fa7fe \
-                    sha256  31fba2f565ed7ea8f6b56233301999f040017ecb48e560879771438ea5c5e105
+checksums           rmd160  b252409c0cc270486f94e85b3f5cd38215acf071 \
+                    sha256  f79bd95f99c58ab646320a396f4a53da7a3eea4209d57703bd82d2a46513e103
 
 if {${name} ne ${subport}} {
-    patchfiles-append   patch-setup.py.diff
+    compiler.whitelist  macports-gcc-4.8 macports-gcc-4.9
 
     depends_build-append \
                         port:py${python.version}-setuptools \
@@ -40,24 +41,14 @@
                         port:py${python.version}-scipy \
                         port:py${python.version}-matplotlib
 
-    variant gcc48 conflicts gcc49 description {build using macports-gcc-4.8} {}
-    variant gcc49 conflicts gcc48 description {build using macports-gcc-4.9} {}
+    patchfiles-append   patch-setup.py.diff
 
-    if {![variant_isset gcc48] && ![variant_isset gcc49]} {
-        default_variants +gcc48
+    post-patch {
+        reinplace "s|@COMPILER@|${configure.cxx}|g" ${worksrcpath}/setup.py
     }
 
-    if {[variant_isset gcc48]} {
-       configure.compiler   macports-gcc-4.8
-    } elseif {[variant_isset gcc49]} {
-       configure.compiler   macports-gcc-4.9
-    }
-
-    build.target        build_ext
     build.env-append    CC="${configure.cc}" CXX="${configure.cxx}"
 
-    destroot.env-append CC="${configure.cc}" CXX="${configure.cxx}"
-
     livecheck.type      none
 } else {
     livecheck.type      regex

Modified: trunk/dports/python/py-networkit/files/patch-setup.py.diff
===================================================================
--- 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)
@@ -1,49 +1,11 @@
---- 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:
+--- 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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150615/21cdcbd1/attachment-0001.html>