[122035] trunk/dports/python/py-openbabel

[nicos at macports.org]

Revision: 122035
          https://trac.macports.org/changeset/122035
Author:   nicos at macports.org
Date:     2014-07-13 04:07:42 -0700 (Sun, 13 Jul 2014)
Log Message:
-----------
py-openbabel: update to 2.3.2, fix build on Mavericks (tickets #41335, #42627)

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

Added Paths:
-----------
    trunk/dports/python/py-openbabel/files/
    trunk/dports/python/py-openbabel/files/patch-shared_ptr.diff

Modified: trunk/dports/python/py-openbabel/Portfile
===================================================================
--- trunk/dports/python/py-openbabel/Portfile	2014-07-13 11:06:07 UTC (rev 122034)
+++ trunk/dports/python/py-openbabel/Portfile	2014-07-13 11:07:42 UTC (rev 122035)
@@ -7,7 +7,7 @@
 # Keep relevant lines in sync between openbabel and py-openbabel.
 
 name                py-openbabel
-version             2.3.1
+version             2.3.2
 categories-append   science chemistry devel
 platforms           darwin freebsd
 license             GPL-2
@@ -29,14 +29,17 @@
 distname            openbabel-${version}
 dist_subdir         openbabel
 
-checksums           rmd160  da4d240a92942dbf9dcf999187336d69d7ef8f5c \
-                    sha256  9e2e8bc9af585ee7e4a03720e3d7b82ef567aa17fdeeea48cc213a3035ced7a3
+checksums           rmd160  dc9aa026a81b987b08c60709a624a192418ee7fb \
+                    sha256  4eaca26679aa6cc85ebf96af19191472ac63ca442c36b0427b369c3a25705188
 
 python.versions     26 27
 python.default_version 27
 
 worksrcdir          ${distname}/scripts/python
+patch.dir           ${workpath}/${distname}
 
+patchfiles          patch-shared_ptr.diff
+
 if {${name} ne ${subport}} {
     depends_build       port:eigen
     

Added: trunk/dports/python/py-openbabel/files/patch-shared_ptr.diff
===================================================================
--- trunk/dports/python/py-openbabel/files/patch-shared_ptr.diff	                        (rev 0)
+++ trunk/dports/python/py-openbabel/files/patch-shared_ptr.diff	2014-07-13 11:07:42 UTC (rev 122035)
@@ -0,0 +1,34 @@
+diff -ur ../openbabel-2.3.1-orig/include/openbabel/obmolecformat.h ./include/openbabel/obmolecformat.h
+--- ../openbabel-2.3.1-orig/include/openbabel/obmolecformat.h	2010-10-10 04:05:12.000000000 +0200
++++ ./include/openbabel/obmolecformat.h	2014-05-29 12:05:22.000000000 +0200
+@@ -23,7 +23,10 @@
+   #include <hash_map>
+ #endif
+ 
+-#if __GNUC__ == 4 && __GNUC_MINOR__ >= 1
++#include <ciso646>  // detect std::lib 
++#ifdef _LIBCPP_VERSION
++  #include <unordered_map>
++#elif __GNUC__ == 4 && __GNUC_MINOR__ >= 1
+   #include <tr1/unordered_map>
+ #elif defined(USE_BOOST)
+   #include <boost/tr1/unordered_map.hpp>
+diff -ur ../openbabel-2.3.1-orig/include/openbabel/shared_ptr.h ./include/openbabel/shared_ptr.h
+--- ../openbabel-2.3.1-orig/include/openbabel/shared_ptr.h	2011-10-12 22:24:02.000000000 +0200
++++ ./include/openbabel/shared_ptr.h	2014-05-29 12:00:36.000000000 +0200
+@@ -22,9 +22,13 @@
+ #else
+   #include <memory>
+   #if __GNUC__ == 4  //&& __GNUC_MINOR__ < 3  removed at the suggestion of Konstantin Tokarev
+-    #include <tr1/memory>
++    #ifdef _LIBCPP_VERSION
++      using std::shared_ptr;
++    #else
++      #include <tr1/memory>
++      using std::tr1::shared_ptr;
++    #endif
+   #endif
+-  using std::tr1::shared_ptr;
+ #endif
+ 
+ #endif // OB_SHARED_PTR_H
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140713/3a2efea9/attachment.html>