CVS commit: pkgsrc/databases/libcassandra

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Thu May 14 19:09:10 UTC 2020

Modified Files:
        pkgsrc/databases/libcassandra: Makefile distinfo
        pkgsrc/databases/libcassandra/patches: patch-aa
            patch-libcassandra_cassandra.cc patch-libcassandra_cassandra.h
            patch-libcassandra_cassandra__factory.cc
            patch-libcassandra_cassandra__factory.h
            patch-libcassandra_keyspace__factory.cc
            patch-libcassandra_keyspace__factory.h
            patch-libgenthrift_Cassandra.cpp patch-libgenthrift_Cassandra.h

Log Message:
Just use C++11 std::shared_ptr instead of boost variant as dependencies
do so anyway.


To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 pkgsrc/databases/libcassandra/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/databases/libcassandra/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/libcassandra/patches/patch-aa
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/databases/libcassandra/patches/patch-libcassandra_cassandra.cc \
    pkgsrc/databases/libcassandra/patches/patch-libcassandra_cassandra.h \
    pkgsrc/databases/libcassandra/patches/patch-libcassandra_cassandra__factory.h \
    pkgsrc/databases/libcassandra/patches/patch-libcassandra_keyspace__factory.cc \
    pkgsrc/databases/libcassandra/patches/patch-libcassandra_keyspace__factory.h \
    pkgsrc/databases/libcassandra/patches/patch-libgenthrift_Cassandra.cpp
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/databases/libcassandra/patches/patch-libcassandra_cassandra__factory.cc \
    pkgsrc/databases/libcassandra/patches/patch-libgenthrift_Cassandra.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/libcassandra/Makefile
diff -u pkgsrc/databases/libcassandra/Makefile:1.50 pkgsrc/databases/libcassandra/Makefile:1.51
--- pkgsrc/databases/libcassandra/Makefile:1.50 Wed May  6 14:04:23 2020
+++ pkgsrc/databases/libcassandra/Makefile      Thu May 14 19:09:09 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2020/05/06 14:04:23 adam Exp $
+# $NetBSD: Makefile,v 1.51 2020/05/14 19:09:09 joerg Exp $
 #
 
 DISTNAME=              libcassandra-20101010
@@ -32,7 +32,7 @@ MAKE_ENV+=            AM_DEFAULT_VERBOSITY=1
 
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
-CXXFLAGS+=     -Wno-unknown-warning-option
+CXXFLAGS+=     -Wno-unknown-warning-option -Wno-unused-parameter
 CXXFLAGS+=     -Wno-c++11-extensions -Wno-error=unused-local-typedef
 .endif
 

Index: pkgsrc/databases/libcassandra/distinfo
diff -u pkgsrc/databases/libcassandra/distinfo:1.8 pkgsrc/databases/libcassandra/distinfo:1.9
--- pkgsrc/databases/libcassandra/distinfo:1.8  Tue Nov  3 01:56:13 2015
+++ pkgsrc/databases/libcassandra/distinfo      Thu May 14 19:09:09 2020
@@ -1,15 +1,15 @@
-$NetBSD: distinfo,v 1.8 2015/11/03 01:56:13 agc Exp $
+$NetBSD: distinfo,v 1.9 2020/05/14 19:09:09 joerg Exp $
 
 SHA1 (libcassandra-20101010.tar.gz) = 457dcf1fd24ad310c63eefb3b532f58835f326ef
 RMD160 (libcassandra-20101010.tar.gz) = e3e05861d1c1173d2492d49442aa68ee429d7b8f
 SHA512 (libcassandra-20101010.tar.gz) = 22ae1d5fe2a3558dc9cda94fd4576957c6948f55a866558882db08d4abaf49ae63e41e450f7485280fc342033cdea640759f589453a9a819b6482c5fd2cd8296
 Size (libcassandra-20101010.tar.gz) = 873233 bytes
-SHA1 (patch-aa) = 9cfe12f0fe26514bd7216d49e83248073cf26f4c
-SHA1 (patch-libcassandra_cassandra.cc) = 88d78156cbdbf51e0bd59326e72ca230de3a7688
-SHA1 (patch-libcassandra_cassandra.h) = 751a4b2847e52c87bbd9ccbf05bdcd62dfbb9ae3
-SHA1 (patch-libcassandra_cassandra__factory.cc) = fb5daea713f9b6a2df05c1dd2a2a033f49360cbe
-SHA1 (patch-libcassandra_cassandra__factory.h) = 602752ecd9d692bef0c692ba54098a75df4047c6
-SHA1 (patch-libcassandra_keyspace__factory.cc) = 9ac440c383243fd11e13147e9375e62c48847ebc
-SHA1 (patch-libcassandra_keyspace__factory.h) = bd611da5e673ce38a5eb811e6196a903a5a80ff8
-SHA1 (patch-libgenthrift_Cassandra.cpp) = b8ab38d7e28f98ad84d0f2cd3459d564a8decfc7
-SHA1 (patch-libgenthrift_Cassandra.h) = 271f776e8a4ba898fccd66b951cb7227c7c72cad
+SHA1 (patch-aa) = 00c444efc76919e0742f44e8f782d93205182490
+SHA1 (patch-libcassandra_cassandra.cc) = 766f59afb3185dc96c1fc1b5199b79c759a83092
+SHA1 (patch-libcassandra_cassandra.h) = d832fb8c600fc2f70512c89ecc1119e57add9361
+SHA1 (patch-libcassandra_cassandra__factory.cc) = 5ef14b0455cc6a02b8f616e6c0a445795b60e70b
+SHA1 (patch-libcassandra_cassandra__factory.h) = 1f82cec5ad2d601bf26c9041cf1d140b9e5c7bff
+SHA1 (patch-libcassandra_keyspace__factory.cc) = 57d84d8908d1778bdbca2f8ff639c8357160c84f
+SHA1 (patch-libcassandra_keyspace__factory.h) = 2fdad06db1167ac39806f84edec61caa859a9c62
+SHA1 (patch-libgenthrift_Cassandra.cpp) = e4e78815e9bdae8f288d153c3521d2355b863b80
+SHA1 (patch-libgenthrift_Cassandra.h) = ee6b007d6c39ae80e6ebc5a4639cb9b4af26a483

Index: pkgsrc/databases/libcassandra/patches/patch-aa
diff -u pkgsrc/databases/libcassandra/patches/patch-aa:1.4 pkgsrc/databases/libcassandra/patches/patch-aa:1.5
--- pkgsrc/databases/libcassandra/patches/patch-aa:1.4  Thu May 30 15:36:29 2013
+++ pkgsrc/databases/libcassandra/patches/patch-aa      Thu May 14 19:09:10 2020
@@ -1,11 +1,38 @@
-$NetBSD: patch-aa,v 1.4 2013/05/30 15:36:29 joerg Exp $
+$NetBSD: patch-aa,v 1.5 2020/05/14 19:09:10 joerg Exp $
 
 Remove the -pedantic flag from the configure script, it isn't terribly
 useful for C++0x code.
 
+Fix C++11 test case to actually work. The existing test fails with both
+GCC and Clang.
+
 --- configure.orig     2010-10-10 00:59:59.000000000 +0000
 +++ configure
-@@ -17972,7 +17972,7 @@ if test "${ac_cv_safe_to_use_wconversion
+@@ -15328,7 +15328,6 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ 
+     typedef check<int> check_type;
+     check_type c;
+-    check_type&& cr = c;
+ int
+ main ()
+ {
+@@ -15384,7 +15383,6 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ 
+     typedef check<int> check_type;
+     check_type c;
+-    check_type&& cr = c;
+ int
+ main ()
+ {
+@@ -15441,7 +15439,6 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ 
+     typedef check<int> check_type;
+     check_type c;
+-    check_type&& cr = c;
+ int
+ main ()
+ {
+@@ -17972,7 +17969,7 @@ if test "${ac_cv_safe_to_use_wconversion
    $as_echo_n "(cached) " >&6
  else
    save_CFLAGS="$CFLAGS"
@@ -14,7 +41,7 @@ useful for C++0x code.
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -18011,7 +18011,7 @@ if test "${ac_cv_safe_to_use_Wconversion
+@@ -18011,7 +18008,7 @@ if test "${ac_cv_safe_to_use_Wconversion
    $as_echo_n "(cached) " >&6
  else
    save_CFLAGS="$CFLAGS"
@@ -23,7 +50,7 @@ useful for C++0x code.
           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -18071,7 +18071,7 @@ if test "${ac_cv_safe_to_use_Wextra_+set
+@@ -18071,7 +18068,7 @@ if test "${ac_cv_safe_to_use_Wextra_+set
    $as_echo_n "(cached) " >&6
  else
    save_CFLAGS="$CFLAGS"
@@ -32,7 +59,7 @@ useful for C++0x code.
           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -18098,7 +18098,7 @@ fi
+@@ -18098,7 +18095,7 @@ fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_safe_to_use_Wextra_" >&5
  $as_echo "$ac_cv_safe_to_use_Wextra_" >&6; }
  
@@ -41,7 +68,7 @@ useful for C++0x code.
        if test "$ac_cv_safe_to_use_Wextra_" = "yes"; then :
    BASE_WARNINGS="${BASE_WARNINGS} -Wextra"
  else
-@@ -18120,7 +18120,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXX
+@@ -18120,7 +18117,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXX
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
           save_CXXFLAGS="$CXXFLAGS"
@@ -50,7 +77,7 @@ useful for C++0x code.
           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -18163,7 +18163,7 @@ if test "${ac_cv_safe_to_use_Wlogical_op
+@@ -18163,7 +18160,7 @@ if test "${ac_cv_safe_to_use_Wlogical_op
    $as_echo_n "(cached) " >&6
  else
    save_CFLAGS="$CFLAGS"
@@ -59,7 +86,7 @@ useful for C++0x code.
           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -18205,7 +18205,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXX
+@@ -18205,7 +18202,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXX
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
           save_CXXFLAGS="${CXXFLAGS}"
@@ -68,7 +95,7 @@ useful for C++0x code.
           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -18255,7 +18255,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXX
+@@ -18255,7 +18252,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXX
  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
  
           save_CXXFLAGS="${CXXFLAGS}"
@@ -77,7 +104,7 @@ useful for C++0x code.
           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -18313,7 +18313,7 @@ if test "${ac_cv_safe_to_use_Wno_attribu
+@@ -18313,7 +18310,7 @@ if test "${ac_cv_safe_to_use_Wno_attribu
    $as_echo_n "(cached) " >&6
  else
    save_CFLAGS="$CFLAGS"
@@ -86,7 +113,7 @@ useful for C++0x code.
           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -21222,8 +21222,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+@@ -21222,8 +21219,8 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
       if test -z "$ac_cv_cxx_cinttypes"; then
         cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */

Index: pkgsrc/databases/libcassandra/patches/patch-libcassandra_cassandra.cc
diff -u pkgsrc/databases/libcassandra/patches/patch-libcassandra_cassandra.cc:1.1 pkgsrc/databases/libcassandra/patches/patch-libcassandra_cassandra.cc:1.2
--- pkgsrc/databases/libcassandra/patches/patch-libcassandra_cassandra.cc:1.1   Thu May 30 15:36:29 2013
+++ pkgsrc/databases/libcassandra/patches/patch-libcassandra_cassandra.cc       Thu May 14 19:09:10 2020
@@ -1,22 +1,17 @@
-$NetBSD: patch-libcassandra_cassandra.cc,v 1.1 2013/05/30 15:36:29 joerg Exp $
+$NetBSD: patch-libcassandra_cassandra.cc,v 1.2 2020/05/14 19:09:10 joerg Exp $
 
---- libcassandra/cassandra.cc.orig     2013-05-30 10:33:52.000000000 +0000
+--- libcassandra/cassandra.cc.orig     2010-10-10 00:59:23.000000000 +0000
 +++ libcassandra/cassandra.cc
-@@ -17,6 +17,13 @@
+@@ -17,6 +17,8 @@
  #include "libcassandra/keyspace.h"
  #include "libcassandra/exception.h"
  
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
 +#include <memory>
-+#else
-+#include <tr1/memory>
-+using std::tr1::shared_ptr;
-+#endif
 +
  using namespace std;
  using namespace org::apache::cassandra;
  using namespace libcassandra;
-@@ -85,17 +92,17 @@ set<string> Cassandra::getKeyspaces()
+@@ -85,17 +87,17 @@ set<string> Cassandra::getKeyspaces()
  }
  
  
@@ -37,7 +32,7 @@ $NetBSD: patch-libcassandra_cassandra.cc
    if (key_it == keyspace_map.end())
    {
      getKeyspaces();
-@@ -104,7 +111,7 @@ tr1::shared_ptr<Keyspace> Cassandra::get
+@@ -104,7 +106,7 @@ tr1::shared_ptr<Keyspace> Cassandra::get
      {
        map< string, map<string, string> > keyspace_desc;
        thrift_client->describe_keyspace(keyspace_desc, name);
@@ -46,7 +41,7 @@ $NetBSD: patch-libcassandra_cassandra.cc
        keyspace_map[keymap_name]= ret;
      }
      else
-@@ -117,7 +124,7 @@ tr1::shared_ptr<Keyspace> Cassandra::get
+@@ -117,7 +119,7 @@ tr1::shared_ptr<Keyspace> Cassandra::get
  }
  
  
Index: pkgsrc/databases/libcassandra/patches/patch-libcassandra_cassandra.h
diff -u pkgsrc/databases/libcassandra/patches/patch-libcassandra_cassandra.h:1.1 pkgsrc/databases/libcassandra/patches/patch-libcassandra_cassandra.h:1.2
--- pkgsrc/databases/libcassandra/patches/patch-libcassandra_cassandra.h:1.1    Thu May 30 15:36:29 2013
+++ pkgsrc/databases/libcassandra/patches/patch-libcassandra_cassandra.h        Thu May 14 19:09:10 2020
@@ -1,58 +1,43 @@
-$NetBSD: patch-libcassandra_cassandra.h,v 1.1 2013/05/30 15:36:29 joerg Exp $
+$NetBSD: patch-libcassandra_cassandra.h,v 1.2 2020/05/14 19:09:10 joerg Exp $
 
---- libcassandra/cassandra.h.orig      2013-05-30 10:29:32.000000000 +0000
+--- libcassandra/cassandra.h.orig      2010-10-10 00:59:23.000000000 +0000
 +++ libcassandra/cassandra.h
-@@ -14,7 +14,11 @@
+@@ -14,7 +14,7 @@
  #include <vector>
  #include <set>
  #include <map>
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+-#include <tr1/memory>
 +#include <memory>
-+#else
- #include <tr1/memory>
-+#endif
  
  #include "libgenthrift/cassandra_types.h"
  
-@@ -65,17 +69,29 @@ public:
+@@ -65,17 +65,17 @@ public:
    /**
     * @return the keyspace with the given name.
     */
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+-  std::tr1::shared_ptr<Keyspace> getKeyspace(const std::string &name);
 +  std::shared_ptr<Keyspace> getKeyspace(const std::string &name);
-+#else
-   std::tr1::shared_ptr<Keyspace> getKeyspace(const std::string &name);
-+#endif
  
    /**
     * @return the keyspace with the given name at the given consistency level.
     */
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+-  std::tr1::shared_ptr<Keyspace> getKeyspace(const std::string &name, org::apache::cassandra::ConsistencyLevel level);
 +  std::shared_ptr<Keyspace> getKeyspace(const std::string &name, org::apache::cassandra::ConsistencyLevel level);
-+#else
-   std::tr1::shared_ptr<Keyspace> getKeyspace(const std::string &name, org::apache::cassandra::ConsistencyLevel level);
-+#endif
  
    /**
     * Remove the given keyspace.
     */
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+-  void removeKeyspace(std::tr1::shared_ptr<Keyspace> k);
 +  void removeKeyspace(std::shared_ptr<Keyspace> k);
-+#else
-   void removeKeyspace(std::tr1::shared_ptr<Keyspace> k);
-+#endif
  
    /**
     * @return the target server cluster name.
-@@ -128,7 +144,11 @@ private:
+@@ -128,7 +128,7 @@ private:
    std::string config_file;
    std::set<std::string> key_spaces;
    std::map<std::string, std::string> token_map;
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+-  std::map<std::string, std::tr1::shared_ptr<Keyspace> > keyspace_map;
 +  std::map<std::string, std::shared_ptr<Keyspace> > keyspace_map;
-+#else
-   std::map<std::string, std::tr1::shared_ptr<Keyspace> > keyspace_map;
-+#endif
  
    Cassandra(const Cassandra&);
    Cassandra &operator=(const Cassandra&);
Index: pkgsrc/databases/libcassandra/patches/patch-libcassandra_cassandra__factory.h
diff -u pkgsrc/databases/libcassandra/patches/patch-libcassandra_cassandra__factory.h:1.1 pkgsrc/databases/libcassandra/patches/patch-libcassandra_cassandra__factory.h:1.2
--- pkgsrc/databases/libcassandra/patches/patch-libcassandra_cassandra__factory.h:1.1   Thu May 30 15:36:29 2013
+++ pkgsrc/databases/libcassandra/patches/patch-libcassandra_cassandra__factory.h       Thu May 14 19:09:10 2020
@@ -1,30 +1,24 @@
-$NetBSD: patch-libcassandra_cassandra__factory.h,v 1.1 2013/05/30 15:36:29 joerg Exp $
+$NetBSD: patch-libcassandra_cassandra__factory.h,v 1.2 2020/05/14 19:09:10 joerg Exp $
 
---- libcassandra/cassandra_factory.h.orig      2013-05-30 10:31:55.000000000 +0000
+--- libcassandra/cassandra_factory.h.orig      2010-10-10 00:59:23.000000000 +0000
 +++ libcassandra/cassandra_factory.h
-@@ -12,7 +12,11 @@
+@@ -12,7 +12,7 @@
  
  #include <string>
  #include <vector>
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+-#include <tr1/memory>
 +#include <memory>
-+#else
- #include <tr1/memory>
-+#endif
  
  namespace org 
  { 
-@@ -44,8 +48,13 @@ public:
+@@ -44,8 +44,8 @@ public:
    /**
     * @return a shared ptr which points to a Cassandra client
     */
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+-  std::tr1::shared_ptr<Cassandra> create();
+-  std::tr1::shared_ptr<Cassandra> create(bool framed_transport);
 +  std::shared_ptr<Cassandra> create();
 +  std::shared_ptr<Cassandra> create(bool framed_transport);
-+#else
-   std::tr1::shared_ptr<Cassandra> create();
-   std::tr1::shared_ptr<Cassandra> create(bool framed_transport);
-+#endif
  
    int getPort() const;
    const std::string &getHost() const;
Index: pkgsrc/databases/libcassandra/patches/patch-libcassandra_keyspace__factory.cc
diff -u pkgsrc/databases/libcassandra/patches/patch-libcassandra_keyspace__factory.cc:1.1 pkgsrc/databases/libcassandra/patches/patch-libcassandra_keyspace__factory.cc:1.2
--- pkgsrc/databases/libcassandra/patches/patch-libcassandra_keyspace__factory.cc:1.1   Thu May 30 15:36:29 2013
+++ pkgsrc/databases/libcassandra/patches/patch-libcassandra_keyspace__factory.cc       Thu May 14 19:09:10 2020
@@ -1,28 +1,19 @@
-$NetBSD: patch-libcassandra_keyspace__factory.cc,v 1.1 2013/05/30 15:36:29 joerg Exp $
+$NetBSD: patch-libcassandra_keyspace__factory.cc,v 1.2 2020/05/14 19:09:10 joerg Exp $
 
---- libcassandra/keyspace_factory.cc.orig      2013-05-30 11:03:36.000000000 +0000
+--- libcassandra/keyspace_factory.cc.orig      2010-10-10 00:59:23.000000000 +0000
 +++ libcassandra/keyspace_factory.cc
-@@ -34,6 +34,16 @@ KeyspaceFactory::KeyspaceFactory() {}
+@@ -34,12 +34,11 @@ KeyspaceFactory::KeyspaceFactory() {}
  KeyspaceFactory::~KeyspaceFactory() {}
  
  
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+-tr1::shared_ptr<Keyspace> KeyspaceFactory::create(Cassandra *client,
 +std::shared_ptr<Keyspace> KeyspaceFactory::create(Cassandra *client,
-+                                                  const string &name,
-+                                                  const map< string, map<string, string> > &descrip,
-+                                                  ConsistencyLevel level)
-+{
-+  std::shared_ptr<Keyspace> ret(new Keyspace(client, name, descrip, level));
-+  return ret;
-+}
-+#else
- tr1::shared_ptr<Keyspace> KeyspaceFactory::create(Cassandra *client,
                                                    const string &name,
                                                    const map< string, map<string, string> > &descrip,
-@@ -42,4 +52,4 @@ tr1::shared_ptr<Keyspace> KeyspaceFactor
-   tr1::shared_ptr<Keyspace> ret(new Keyspace(client, name, descrip, level));
+                                                   ConsistencyLevel level)
+ {
+-  tr1::shared_ptr<Keyspace> ret(new Keyspace(client, name, descrip, level));
++  std::shared_ptr<Keyspace> ret(new Keyspace(client, name, descrip, level));
    return ret;
  }
 -
-+#endif
-\ No newline at end of file
Index: pkgsrc/databases/libcassandra/patches/patch-libcassandra_keyspace__factory.h
diff -u pkgsrc/databases/libcassandra/patches/patch-libcassandra_keyspace__factory.h:1.1 pkgsrc/databases/libcassandra/patches/patch-libcassandra_keyspace__factory.h:1.2
--- pkgsrc/databases/libcassandra/patches/patch-libcassandra_keyspace__factory.h:1.1    Thu May 30 15:36:29 2013
+++ pkgsrc/databases/libcassandra/patches/patch-libcassandra_keyspace__factory.h        Thu May 14 19:09:10 2020
@@ -1,34 +1,22 @@
-$NetBSD: patch-libcassandra_keyspace__factory.h,v 1.1 2013/05/30 15:36:29 joerg Exp $
+$NetBSD: patch-libcassandra_keyspace__factory.h,v 1.2 2020/05/14 19:09:10 joerg Exp $
 
---- libcassandra/keyspace_factory.h.orig       2013-05-30 10:36:25.000000000 +0000
+--- libcassandra/keyspace_factory.h.orig       2010-10-10 00:58:51.000000000 +0000
 +++ libcassandra/keyspace_factory.h
-@@ -12,7 +12,11 @@
+@@ -12,7 +12,7 @@
  
  #include <string>
  #include <map>
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+-#include <tr1/memory>
 +#include <memory>
-+#else
- #include <tr1/memory>
-+#endif
  
  namespace libcassandra
  {
-@@ -31,10 +35,17 @@ public:
+@@ -31,7 +31,7 @@ public:
    /**
     * @return a shared ptr which points to a Keyspace class
     */
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+-  std::tr1::shared_ptr<Keyspace> create(Cassandra *client,
 +  std::shared_ptr<Keyspace> create(Cassandra *client,
-+                                        const std::string &name,
-+                                        const std::map< std::string, std::map<std::string, std::string> > &descrip,
-+                                        org::apache::cassandra::ConsistencyLevel level);
-+#else
-   std::tr1::shared_ptr<Keyspace> create(Cassandra *client,
                                          const std::string &name,
                                          const std::map< std::string, std::map<std::string, std::string> > &descrip,
                                          org::apache::cassandra::ConsistencyLevel level);
-+#endif
- 
- };
- 
Index: pkgsrc/databases/libcassandra/patches/patch-libgenthrift_Cassandra.cpp
diff -u pkgsrc/databases/libcassandra/patches/patch-libgenthrift_Cassandra.cpp:1.1 pkgsrc/databases/libcassandra/patches/patch-libgenthrift_Cassandra.cpp:1.2
--- pkgsrc/databases/libcassandra/patches/patch-libgenthrift_Cassandra.cpp:1.1  Wed Nov 23 15:39:21 2011
+++ pkgsrc/databases/libcassandra/patches/patch-libgenthrift_Cassandra.cpp      Thu May 14 19:09:10 2020
@@ -1,13 +1,13 @@
-$NetBSD: patch-libgenthrift_Cassandra.cpp,v 1.1 2011/11/23 15:39:21 joerg Exp $
+$NetBSD: patch-libgenthrift_Cassandra.cpp,v 1.2 2020/05/14 19:09:10 joerg Exp $
 
---- libgenthrift/Cassandra.cpp.orig    2011-11-23 14:40:36.000000000 +0000
+--- libgenthrift/Cassandra.cpp.orig    2010-10-10 00:59:23.000000000 +0000
 +++ libgenthrift/Cassandra.cpp
 @@ -6761,7 +6761,8 @@ void CassandraClient::recv_describe_spli
    throw ::apache::thrift::TApplicationException(::apache::thrift::TApplicationException::MISSING_RESULT, "describe_splits failed: unknown result");
  }
  
 -bool CassandraProcessor::process(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot) {
-+bool CassandraProcessor::process(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot, void* connectionContext) {
++bool CassandraProcessor::process(std::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot, std::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot, void* connectionContext) {
 +  (void)&connectionContext;
  
    ::apache::thrift::protocol::TProtocol* iprot = piprot.get();

Index: pkgsrc/databases/libcassandra/patches/patch-libcassandra_cassandra__factory.cc
diff -u pkgsrc/databases/libcassandra/patches/patch-libcassandra_cassandra__factory.cc:1.2 pkgsrc/databases/libcassandra/patches/patch-libcassandra_cassandra__factory.cc:1.3
--- pkgsrc/databases/libcassandra/patches/patch-libcassandra_cassandra__factory.cc:1.2  Wed Jun 26 21:25:59 2013
+++ pkgsrc/databases/libcassandra/patches/patch-libcassandra_cassandra__factory.cc      Thu May 14 19:09:10 2020
@@ -1,34 +1,48 @@
-$NetBSD: patch-libcassandra_cassandra__factory.cc,v 1.2 2013/06/26 21:25:59 joerg Exp $
+$NetBSD: patch-libcassandra_cassandra__factory.cc,v 1.3 2020/05/14 19:09:10 joerg Exp $
 
---- libcassandra/cassandra_factory.cc.orig     2013-05-30 10:34:39.000000000 +0000
+--- libcassandra/cassandra_factory.cc.orig     2010-10-10 00:59:23.000000000 +0000
 +++ libcassandra/cassandra_factory.cc
-@@ -63,17 +63,29 @@ CassandraFactory::CassandraFactory(const
+@@ -63,17 +63,17 @@ CassandraFactory::CassandraFactory(const
  CassandraFactory::~CassandraFactory() {}
  
  
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+-tr1::shared_ptr<Cassandra> CassandraFactory::create()
 +std::shared_ptr<Cassandra> CassandraFactory::create()
-+#else
- tr1::shared_ptr<Cassandra> CassandraFactory::create()
-+#endif
  {
    /* Default is Buffered Transport */
    return create(false);
  }
  
  
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+-tr1::shared_ptr<Cassandra> CassandraFactory::create(bool framed_transport)
 +std::shared_ptr<Cassandra> CassandraFactory::create(bool framed_transport)
-+#else
- tr1::shared_ptr<Cassandra> CassandraFactory::create(bool framed_transport)
-+#endif
  {
    CassandraClient *thrift_client= createThriftClient(host, port, framed_transport);
-+#if defined(_LIBCPP_VERSION) || __cplusplus >= 201103L
+-  tr1::shared_ptr<Cassandra> ret(new Cassandra(thrift_client, host, port));
 +  std::shared_ptr<Cassandra> ret(new Cassandra(thrift_client, host, port));
-+#else
-   tr1::shared_ptr<Cassandra> ret(new Cassandra(thrift_client, host, port));
-+#endif
    return ret;
  }
  
+@@ -82,17 +82,17 @@ CassandraClient *CassandraFactory::creat
+                                                       int in_port, 
+                                                       bool framed_transport)
+ {
+-  boost::shared_ptr<TTransport> socket(new TSocket(in_host, in_port));
+-  boost::shared_ptr<TTransport> transport;
++  std::shared_ptr<TTransport> socket(new TSocket(in_host, in_port));
++  std::shared_ptr<TTransport> transport;
+   if (framed_transport) 
+   {
+-    transport= boost::shared_ptr<TTransport>(new TFramedTransport(socket));
++    transport= std::shared_ptr<TTransport>(new TFramedTransport(socket));
+   }
+   else
+   {
+-    transport= boost::shared_ptr<TTransport>(new TBufferedTransport(socket));
++    transport= std::shared_ptr<TTransport>(new TBufferedTransport(socket));
+   }
+-  boost::shared_ptr<TProtocol> protocol(new TBinaryProtocol(transport));
++  std::shared_ptr<TProtocol> protocol(new TBinaryProtocol(transport));
+   CassandraClient *client= new(std::nothrow) CassandraClient(protocol);
+ 
+   transport->open(); /* throws an exception */
Index: pkgsrc/databases/libcassandra/patches/patch-libgenthrift_Cassandra.h
diff -u pkgsrc/databases/libcassandra/patches/patch-libgenthrift_Cassandra.h:1.2 pkgsrc/databases/libcassandra/patches/patch-libgenthrift_Cassandra.h:1.3
--- pkgsrc/databases/libcassandra/patches/patch-libgenthrift_Cassandra.h:1.2    Fri Nov 16 00:40:18 2012
+++ pkgsrc/databases/libcassandra/patches/patch-libgenthrift_Cassandra.h        Thu May 14 19:09:10 2020
@@ -1,16 +1,86 @@
-$NetBSD: patch-libgenthrift_Cassandra.h,v 1.2 2012/11/16 00:40:18 joerg Exp $
+$NetBSD: patch-libgenthrift_Cassandra.h,v 1.3 2020/05/14 19:09:10 joerg Exp $
 
 --- libgenthrift/Cassandra.h.orig      2010-10-10 00:59:23.000000000 +0000
 +++ libgenthrift/Cassandra.h
-@@ -2609,7 +2609,7 @@ class CassandraProcessor : virtual publi
+@@ -2468,22 +2468,22 @@ class Cassandra_describe_splits_presult 
+ 
+ class CassandraClient : virtual public CassandraIf {
+  public:
+-  CassandraClient(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) :
++  CassandraClient(std::shared_ptr< ::apache::thrift::protocol::TProtocol> prot) :
+     piprot_(prot),
+     poprot_(prot) {
+     iprot_ = prot.get();
+     oprot_ = prot.get();
+   }
+-  CassandraClient(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) :
++  CassandraClient(std::shared_ptr< ::apache::thrift::protocol::TProtocol> iprot, std::shared_ptr< ::apache::thrift::protocol::TProtocol> oprot) :
+     piprot_(iprot),
+     poprot_(oprot) {
+     iprot_ = iprot.get();
+     oprot_ = oprot.get();
+   }
+-  boost::shared_ptr< ::apache::thrift::protocol::TProtocol> getInputProtocol() {
++  std::shared_ptr< ::apache::thrift::protocol::TProtocol> getInputProtocol() {
+     return piprot_;
+   }
+-  boost::shared_ptr< ::apache::thrift::protocol::TProtocol> getOutputProtocol() {
++  std::shared_ptr< ::apache::thrift::protocol::TProtocol> getOutputProtocol() {
+     return poprot_;
+   }
+   void login(const std::string& keyspace, const AuthenticationRequest& auth_request);
+@@ -2550,15 +2550,15 @@ class CassandraClient : virtual public C
+   void send_describe_splits(const std::string& start_token, const std::string& end_token, const int32_t keys_per_split);
+   void recv_describe_splits(std::vector<std::string> & _return);
+  protected:
+-  boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot_;
+-  boost::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot_;
++  std::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot_;
++  std::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot_;
+   ::apache::thrift::protocol::TProtocol* iprot_;
+   ::apache::thrift::protocol::TProtocol* oprot_;
+ };
+ 
+ class CassandraProcessor : virtual public ::apache::thrift::TProcessor {
+  protected:
+-  boost::shared_ptr<CassandraIf> iface_;
++  std::shared_ptr<CassandraIf> iface_;
+   virtual bool process_fn(::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot, std::string& fname, int32_t seqid);
+  private:
+   std::map<std::string, void (CassandraProcessor::*)(int32_t, ::apache::thrift::protocol::TProtocol*, ::apache::thrift::protocol::TProtocol*)> processMap_;
+@@ -2584,7 +2584,7 @@ class CassandraProcessor : virtual publi
+   void process_describe_keyspace(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot);
+   void process_describe_splits(int32_t seqid, ::apache::thrift::protocol::TProtocol* iprot, ::apache::thrift::protocol::TProtocol* oprot);
+  public:
+-  CassandraProcessor(boost::shared_ptr<CassandraIf> iface) :
++  CassandraProcessor(std::shared_ptr<CassandraIf> iface) :
+     iface_(iface) {
+     processMap_["login"] = &CassandraProcessor::process_login;
+     processMap_["get"] = &CassandraProcessor::process_get;
+@@ -2609,19 +2609,19 @@ class CassandraProcessor : virtual publi
      processMap_["describe_splits"] = &CassandraProcessor::process_describe_splits;
    }
  
 -  virtual bool process(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot);
-+  virtual bool process(boost::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot, boost::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot, void* connectionContext);
++  virtual bool process(std::shared_ptr< ::apache::thrift::protocol::TProtocol> piprot, std::shared_ptr< ::apache::thrift::protocol::TProtocol> poprot, void* connectionContext);
    virtual ~CassandraProcessor() {}
  };
  
+ class CassandraMultiface : virtual public CassandraIf {
+  public:
+-  CassandraMultiface(std::vector<boost::shared_ptr<CassandraIf> >& ifaces) : ifaces_(ifaces) {
++  CassandraMultiface(std::vector<std::shared_ptr<CassandraIf> >& ifaces) : ifaces_(ifaces) {
+   }
+   virtual ~CassandraMultiface() {}
+  protected:
+-  std::vector<boost::shared_ptr<CassandraIf> > ifaces_;
++  std::vector<std::shared_ptr<CassandraIf> > ifaces_;
+   CassandraMultiface() {}
+-  void add(boost::shared_ptr<CassandraIf> iface) {
++  void add(std::shared_ptr<CassandraIf> iface) {
+     ifaces_.push_back(iface);
+   }
+  public:
 @@ -2689,6 +2689,7 @@ class CassandraMultiface : virtual publi
          ifaces_[i]->get_count(keyspace, key, column_parent, consistency_level);
        }