[135811] trunk/dports/python/py-milk

[stromnov at macports.org]

Revision: 135811
          https://trac.macports.org/changeset/135811
Author:   stromnov at macports.org
Date:     2015-05-04 07:26:20 -0700 (Mon, 04 May 2015)
Log Message:
-----------
py-milk: update to version 0.6

Modified Paths:
--------------
    trunk/dports/python/py-milk/Portfile

Added Paths:
-----------
    trunk/dports/python/py-milk/files/patch-milk_utils_utils.h.diff

Removed Paths:
-------------
    trunk/dports/python/py-milk/files/patch-setup.py.diff

Modified: trunk/dports/python/py-milk/Portfile
===================================================================
--- trunk/dports/python/py-milk/Portfile	2015-05-04 14:09:11 UTC (rev 135810)
+++ trunk/dports/python/py-milk/Portfile	2015-05-04 14:26:20 UTC (rev 135811)
@@ -5,7 +5,7 @@
 PortGroup           python 1.0
 
 name                py-milk
-version             0.5.3
+version             0.6
 revision            0
 categories-append   science
 platforms           darwin
@@ -23,35 +23,18 @@
 
 distname            milk-${version}
 
-checksums           rmd160  eb7f1bb5f6b7321303df28d27fa26b8ad229defd \
-                    sha256  d98e0c142ab27fe96eb44bd3aefe774984530de82595ac996a61834e05111de9
+checksums           rmd160  db38c67c4540dcb7104c5fd0a1b0e2c7acd6ac80 \
+                    sha256  d3e1fe08b5c1c13268132695ba42e65c7b6ee3580d1d0badc2d536e6541732b6
 
 if {${name} ne ${subport}} {
     depends_build-append \
                         port:py${python.version}-setuptools
+
     depends_lib-append  port:py${python.version}-numpy \
                         port:eigen3
 
-    variant gcc45 conflicts gcc46 gcc47 description {Compile with gcc 4.5} {
-        configure.compiler  macports-gcc-4.5
-    }
+    patchfiles-append   patch-milk_utils_utils.h.diff
 
-    variant gcc46 conflicts gcc45 gcc47 description {Compile with gcc 4.6} {
-        configure.compiler  macports-gcc-4.6
-    }
-
-    variant gcc47 conflicts gcc45 gcc46  description {Compile with gcc 4.7} {
-        configure.compiler  macports-gcc-4.7
-    }
-
-    if {![variant_isset gcc45] && ![variant_isset gcc46] && ![variant_isset gcc47]} {
-        default_variants    +gcc47
-    }
-
-    if {[variant_isset gcc45] || [variant_isset gcc46] || [variant_isset gcc47]} {
-        patchfiles-append   patch-setup.py.diff
-    }
-
     livecheck.type      none
 } else {
     livecheck.type      regex

Added: trunk/dports/python/py-milk/files/patch-milk_utils_utils.h.diff
===================================================================
--- trunk/dports/python/py-milk/files/patch-milk_utils_utils.h.diff	                        (rev 0)
+++ trunk/dports/python/py-milk/files/patch-milk_utils_utils.h.diff	2015-05-04 14:26:20 UTC (rev 135811)
@@ -0,0 +1,40 @@
+--- /dev/null	2015-05-04 17:22:31.000000000 +0300
++++ milk/utils/utils.h	2015-04-30 23:43:18.000000000 +0300
+@@ -0,0 +1,37 @@
++extern "C" {
++    #include <Python.h>
++    #include <numpy/ndarrayobject.h>
++}
++#if PY_MAJOR_VERSION < 3
++
++#define DECLARE_MODULE(name) \
++extern "C" \
++void init##name () { \
++    import_array(); \
++    (void)Py_InitModule(#name, methods); \
++}
++
++#else
++
++#define DECLARE_MODULE(name) \
++namespace { \
++    struct PyModuleDef moduledef = { \
++        PyModuleDef_HEAD_INIT, \
++        #name, \
++        NULL, \
++        -1, \
++        methods, \
++        NULL, \
++        NULL, \
++        NULL, \
++        NULL \
++    }; \
++} \
++PyMODINIT_FUNC \
++PyInit_##name () { \
++    import_array(); \
++    PyModule_Create(&moduledef); \
++}
++
++#endif
++

Deleted: trunk/dports/python/py-milk/files/patch-setup.py.diff
===================================================================
--- trunk/dports/python/py-milk/files/patch-setup.py.diff	2015-05-04 14:09:11 UTC (rev 135810)
+++ trunk/dports/python/py-milk/files/patch-setup.py.diff	2015-05-04 14:26:20 UTC (rev 135811)
@@ -1,11 +0,0 @@
---- setup.py.orig	2013-01-16 14:02:43.000000000 +0400
-+++ setup.py	2013-01-16 14:03:04.000000000 +0400
-@@ -58,8 +58,6 @@
- }
- 
- compiler_args = ['-std=c++0x']
--if platform.system() == 'Darwin':
--  compiler_args.append('-stdlib=libc++')
- 
- ext_modules = [
-     Extension(key,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150504/89b07f1c/attachment-0001.html>