Fri Nov 16 00:40:18 2012 UTC ()
Disable warning about C++11 usage in Boost.
Always return a value in a non-void function.


(joerg)
diff -r1.15 -r1.16 pkgsrc/databases/libcassandra/Makefile
diff -r1.4 -r1.5 pkgsrc/databases/libcassandra/distinfo
diff -r1.1 -r1.2 pkgsrc/databases/libcassandra/patches/patch-libgenthrift_Cassandra.h
cvs diff -r1.15 -r1.16 pkgsrc/databases/libcassandra/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/libcassandra/Makefile 2012/10/03 21:54:12 1.15
+++ pkgsrc/databases/libcassandra/Makefile 2012/11/16 00:40:18 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.15 2012/10/03 21:54:12 wiz Exp $ 1# $NetBSD: Makefile,v 1.16 2012/11/16 00:40:18 joerg Exp $
2# 2#
3 3
4DISTNAME= libcassandra-20101010 4DISTNAME= libcassandra-20101010
5PKGREVISION= 8 5PKGREVISION= 8
6CATEGORIES= databases 6CATEGORIES= databases
7MASTER_SITES= ftp://ftp.ancient-solutions.com/pub/bsdprojects/NetBSD/packages/distfiles/ 7MASTER_SITES= ftp://ftp.ancient-solutions.com/pub/bsdprojects/NetBSD/packages/distfiles/
8 8
9MAINTAINER= tonnerre@NetBSD.org 9MAINTAINER= tonnerre@NetBSD.org
10HOMEPAGE= http://github.com/posulliv/libcassandra/ 10HOMEPAGE= http://github.com/posulliv/libcassandra/
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
13COMMENT= C++ interface to Cassandra 13COMMENT= C++ interface to Cassandra
14 14
@@ -23,14 +23,19 @@ BUILDLINK_TRANSFORM+= rm:-Wundef @@ -23,14 +23,19 @@ BUILDLINK_TRANSFORM+= rm:-Wundef
23.include "../../mk/bsd.prefs.mk" 23.include "../../mk/bsd.prefs.mk"
24 24
25.if ${OPSYS} != "DragonFly" 25.if ${OPSYS} != "DragonFly"
26GCC_REQD+= 4.4 26GCC_REQD+= 4.4
27.endif 27.endif
28 28
29.include "../../devel/boost-headers/buildlink3.mk" 29.include "../../devel/boost-headers/buildlink3.mk"
30.include "../../devel/boost-libs/buildlink3.mk" 30.include "../../devel/boost-libs/buildlink3.mk"
31.include "../../devel/libthrift/buildlink3.mk" 31.include "../../devel/libthrift/buildlink3.mk"
32 32
33CONFIGURE_ARGS+= CPPFLAGS="-I${BUILDLINK_PREFIX.libthrift}/include/thrift -I${BUILDLINK_PREFIX.boost-headers}/include/boost" 33CONFIGURE_ARGS+= CPPFLAGS="-I${BUILDLINK_PREFIX.libthrift}/include/thrift -I${BUILDLINK_PREFIX.boost-headers}/include/boost"
34MAKE_ENV+= AM_DEFAULT_VERBOSITY=1 34MAKE_ENV+= AM_DEFAULT_VERBOSITY=1
35 35
 36.include "../../mk/compiler.mk"
 37.if !empty(PKGSRC_COMPILER:Mclang)
 38CXXFLAGS+= -Wno-c++11-extensions
 39.endif
 40
36.include "../../mk/bsd.pkg.mk" 41.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/databases/libcassandra/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/libcassandra/distinfo 2011/11/23 15:39:21 1.4
+++ pkgsrc/databases/libcassandra/distinfo 2012/11/16 00:40:18 1.5
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.4 2011/11/23 15:39:21 joerg Exp $ 1$NetBSD: distinfo,v 1.5 2012/11/16 00:40:18 joerg Exp $
2 2
3SHA1 (libcassandra-20101010.tar.gz) = 457dcf1fd24ad310c63eefb3b532f58835f326ef 3SHA1 (libcassandra-20101010.tar.gz) = 457dcf1fd24ad310c63eefb3b532f58835f326ef
4RMD160 (libcassandra-20101010.tar.gz) = e3e05861d1c1173d2492d49442aa68ee429d7b8f 4RMD160 (libcassandra-20101010.tar.gz) = e3e05861d1c1173d2492d49442aa68ee429d7b8f
5Size (libcassandra-20101010.tar.gz) = 873233 bytes 5Size (libcassandra-20101010.tar.gz) = 873233 bytes
6SHA1 (patch-aa) = 387ea4e5ceb65c63e0a8d894035c9ae0fee2b792 6SHA1 (patch-aa) = 387ea4e5ceb65c63e0a8d894035c9ae0fee2b792
7SHA1 (patch-libgenthrift_Cassandra.cpp) = b8ab38d7e28f98ad84d0f2cd3459d564a8decfc7 7SHA1 (patch-libgenthrift_Cassandra.cpp) = b8ab38d7e28f98ad84d0f2cd3459d564a8decfc7
8SHA1 (patch-libgenthrift_Cassandra.h) = 02511eef6232f15e7e1f5c0ef2211c02f2ee5868 8SHA1 (patch-libgenthrift_Cassandra.h) = 271f776e8a4ba898fccd66b951cb7227c7c72cad
cvs diff -r1.1 -r1.2 pkgsrc/databases/libcassandra/patches/patch-libgenthrift_Cassandra.h (expand / switch to unified diff)

--- pkgsrc/databases/libcassandra/patches/patch-libgenthrift_Cassandra.h 2011/11/23 15:39:21 1.1
+++ pkgsrc/databases/libcassandra/patches/patch-libgenthrift_Cassandra.h 2012/11/16 00:40:18 1.2
@@ -1,13 +1,21 @@ @@ -1,13 +1,21 @@
1$NetBSD: patch-libgenthrift_Cassandra.h,v 1.1 2011/11/23 15:39:21 joerg Exp $ 1$NetBSD: patch-libgenthrift_Cassandra.h,v 1.2 2012/11/16 00:40:18 joerg Exp $
2 2
3--- libgenthrift/Cassandra.h.orig 2011-11-23 14:36:26.000000000 +0000 3--- libgenthrift/Cassandra.h.orig 2010-10-10 00:59:23.000000000 +0000
4+++ libgenthrift/Cassandra.h 4+++ libgenthrift/Cassandra.h
5@@ -2609,7 +2609,7 @@ class CassandraProcessor : virtual publi 5@@ -2609,7 +2609,7 @@ class CassandraProcessor : virtual publi
6 processMap_["describe_splits"] = &CassandraProcessor::process_describe_splits; 6 processMap_["describe_splits"] = &CassandraProcessor::process_describe_splits;
7 } 7 }
8  8
9- virtual bool process(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot); 9- virtual bool process(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot);
10+ virtual bool process(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot, void* connectionContext); 10+ virtual bool process(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot, void* connectionContext);
11 virtual ~CassandraProcessor() {} 11 virtual ~CassandraProcessor() {}
12 }; 12 };
13  13
 14@@ -2689,6 +2689,7 @@ class CassandraMultiface : virtual publi
 15 ifaces_[i]->get_count(keyspace, key, column_parent, consistency_level);
 16 }
 17 }
 18+ return 0;
 19 }
 20
 21 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) {