From 42835ece46b378b578bddecad6d5de64407846ab Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Fri, 16 Nov 2012 00:40:18 +0000
Subject: Disable warning about C++11 usage in Boost. Always return a value in
 a non-void function.

---
 databases/libcassandra/Makefile                              |  7 ++++++-
 databases/libcassandra/distinfo                              |  4 ++--
 .../libcassandra/patches/patch-libgenthrift_Cassandra.h      | 12 ++++++++++--
 3 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'databases')

diff --git a/databases/libcassandra/Makefile b/databases/libcassandra/Makefile
index 4feee4dec9b..4b84818c5b9 100644
--- a/databases/libcassandra/Makefile
+++ b/databases/libcassandra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2012/10/03 21:54:12 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2012/11/16 00:40:18 joerg Exp $
 #
 
 DISTNAME=		libcassandra-20101010
@@ -33,4 +33,9 @@ GCC_REQD+=	4.4
 CONFIGURE_ARGS+=	CPPFLAGS="-I${BUILDLINK_PREFIX.libthrift}/include/thrift -I${BUILDLINK_PREFIX.boost-headers}/include/boost"
 MAKE_ENV+=		AM_DEFAULT_VERBOSITY=1
 
+.include "../../mk/compiler.mk"
+.if !empty(PKGSRC_COMPILER:Mclang)
+CXXFLAGS+=	-Wno-c++11-extensions
+.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/libcassandra/distinfo b/databases/libcassandra/distinfo
index 11f18bcd758..89b43739865 100644
--- a/databases/libcassandra/distinfo
+++ b/databases/libcassandra/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2011/11/23 15:39:21 joerg Exp $
+$NetBSD: distinfo,v 1.5 2012/11/16 00:40:18 joerg Exp $
 
 SHA1 (libcassandra-20101010.tar.gz) = 457dcf1fd24ad310c63eefb3b532f58835f326ef
 RMD160 (libcassandra-20101010.tar.gz) = e3e05861d1c1173d2492d49442aa68ee429d7b8f
 Size (libcassandra-20101010.tar.gz) = 873233 bytes
 SHA1 (patch-aa) = 387ea4e5ceb65c63e0a8d894035c9ae0fee2b792
 SHA1 (patch-libgenthrift_Cassandra.cpp) = b8ab38d7e28f98ad84d0f2cd3459d564a8decfc7
-SHA1 (patch-libgenthrift_Cassandra.h) = 02511eef6232f15e7e1f5c0ef2211c02f2ee5868
+SHA1 (patch-libgenthrift_Cassandra.h) = 271f776e8a4ba898fccd66b951cb7227c7c72cad
diff --git a/databases/libcassandra/patches/patch-libgenthrift_Cassandra.h b/databases/libcassandra/patches/patch-libgenthrift_Cassandra.h
index 8ea9d6f1b2b..10c70802da7 100644
--- a/databases/libcassandra/patches/patch-libgenthrift_Cassandra.h
+++ b/databases/libcassandra/patches/patch-libgenthrift_Cassandra.h
@@ -1,6 +1,6 @@
-$NetBSD: patch-libgenthrift_Cassandra.h,v 1.1 2011/11/23 15:39:21 joerg Exp $
+$NetBSD: patch-libgenthrift_Cassandra.h,v 1.2 2012/11/16 00:40:18 joerg Exp $
 
---- libgenthrift/Cassandra.h.orig	2011-11-23 14:36:26.000000000 +0000
+--- libgenthrift/Cassandra.h.orig	2010-10-10 00:59:23.000000000 +0000
 +++ libgenthrift/Cassandra.h
 @@ -2609,7 +2609,7 @@ class CassandraProcessor : virtual publi
      processMap_["describe_splits"] = &CassandraProcessor::process_describe_splits;
@@ -11,3 +11,11 @@ $NetBSD: patch-libgenthrift_Cassandra.h,v 1.1 2011/11/23 15:39:21 joerg Exp $
    virtual ~CassandraProcessor() {}
  };
  
+@@ -2689,6 +2689,7 @@ class CassandraMultiface : virtual publi
+         ifaces_[i]->get_count(keyspace, key, column_parent, consistency_level);
+       }
+     }
++    return 0;
+   }
+ 
+   void get_range_slice(std::vector<KeySlice> & _return, const std::string& keyspace, const ColumnParent& column_parent, const SlicePredicate& predicate, const std::string& start_key, const std::string& finish_key, const int32_t row_count, const ConsistencyLevel consistency_level) {
-- 
cgit v1.2.3