From 717e5dd1be8a5ae44873a068c6aec12c5614ca90 Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Mon, 24 Nov 2014 00:47:48 +0000
Subject: Adjust !TR1 support again.

---
 biology/openbabel/distinfo                         |  3 ++-
 biology/openbabel/patches/patch-src_ops_unique.cpp | 27 +++++++++++++---------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/biology/openbabel/distinfo b/biology/openbabel/distinfo
index 89eaf37460a..67f6504edf0 100644
--- a/biology/openbabel/distinfo
+++ b/biology/openbabel/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2014/11/20 09:05:56 mef Exp $
+$NetBSD: distinfo,v 1.6 2014/11/24 00:47:48 joerg Exp $
 
 SHA1 (openbabel-2.3.2.tar.gz) = b8831a308617d1c78a790479523e43524f07d50d
 RMD160 (openbabel-2.3.2.tar.gz) = dc9aa026a81b987b08c60709a624a192418ee7fb
@@ -6,3 +6,4 @@ Size (openbabel-2.3.2.tar.gz) = 20509105 bytes
 SHA1 (patch-doc_CMakeLists.txt) = ce39c53c4edfec2f557e785f750e09a62a209d05
 SHA1 (patch-include_openbabel_obmolecformat.h) = e12a42b67106899d5285651f27e4830e0cc42fe2
 SHA1 (patch-include_openbabel_shared__ptr.h) = 92a16f7bcdd10cf44cf6c9302d80670563074c2c
+SHA1 (patch-src_ops_unique.cpp) = 80b9e7ca8a405ea7024bbca832b16a8013c12e18
diff --git a/biology/openbabel/patches/patch-src_ops_unique.cpp b/biology/openbabel/patches/patch-src_ops_unique.cpp
index 071b02333c7..d6a8fb7cb9e 100644
--- a/biology/openbabel/patches/patch-src_ops_unique.cpp
+++ b/biology/openbabel/patches/patch-src_ops_unique.cpp
@@ -1,23 +1,28 @@
-$NetBSD: patch-src_ops_unique.cpp,v 1.1 2013/05/06 14:22:43 joerg Exp $
+$NetBSD: patch-src_ops_unique.cpp,v 1.2 2014/11/24 00:47:48 joerg Exp $
 
---- src/ops/unique.cpp.orig	2013-05-05 20:34:38.000000000 +0000
+--- src/ops/unique.cpp.orig	2014-11-23 16:04:26.000000000 +0000
 +++ src/ops/unique.cpp
-@@ -23,6 +23,9 @@ GNU General Public License for more deta
+@@ -21,10 +21,12 @@ GNU General Public License for more deta
+ #include <openbabel/obconversion.h>
+ #include <openbabel/descriptor.h>
  #include <openbabel/inchiformat.h>
- #ifdef _MSC_VER
+-#ifdef _MSC_VER
++#include <cstddef>
++#if defined(_MSC_VER) || defined(_LIBCPP_VERSION) || __cplusplus>=201103L
    #include <unordered_map>
-+#elif defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
-+# include <unordered_map>
-+using std::unordered_map;
  #elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 1 && !defined(__APPLE_CC__))
    #include <tr1/unordered_map>
++  using std::tr1::unordered_map;
  #else
-@@ -35,7 +38,7 @@ GNU General Public License for more deta
+   #ifdef USE_BOOST
+     #include <boost/tr1/unordered_map.hpp>
+@@ -35,9 +37,6 @@ GNU General Public License for more deta
  #endif
  
  using namespace std;
 -#ifndef NO_UNORDERED_MAP
-+#if !defined(NO_UNORDERED_MAP) && !defined(_LIBCPP_VERSION) && __cplusplus < 201103L
- using std::tr1::unordered_map;
- #endif
+-using std::tr1::unordered_map;
+-#endif
  namespace OpenBabel
+ {
+ 
-- 
cgit v1.2.3