From b7d5541808c0d0461d628792a523c6b35be28e4f Mon Sep 17 00:00:00 2001
From: tonnerre <tonnerre>
Date: Sat, 16 Oct 2010 11:43:30 +0000
Subject: Update libcassandra to version 20101010. Changes since 20100501:

 - Rewritten parts in C++0x
 - Lots of bugfixes
 - Added some header files
---
 databases/libcassandra/Makefile         | 12 +++++++++---
 databases/libcassandra/PLIST            |  4 +++-
 databases/libcassandra/distinfo         | 10 +++++-----
 databases/libcassandra/patches/patch-aa |  5 ++++-
 4 files changed, 21 insertions(+), 10 deletions(-)

(limited to 'databases/libcassandra')

diff --git a/databases/libcassandra/Makefile b/databases/libcassandra/Makefile
index 7fbbef71111..b2c9fd20a5b 100644
--- a/databases/libcassandra/Makefile
+++ b/databases/libcassandra/Makefile
@@ -1,12 +1,13 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/05/01 15:09:44 tonnerre Exp $
+# $NetBSD: Makefile,v 1.2 2010/10/16 11:43:30 tonnerre Exp $
 #
 
-DISTNAME=		libcassandra-20100501
+DISTNAME=		libcassandra-20101010
 CATEGORIES=		databases
 MASTER_SITES=		ftp://ftp.ancient-solutions.com/pub/bsdprojects/NetBSD/packages/distfiles/
 
 MAINTAINER=		tonnerre@NetBSD.org
 HOMEPAGE=		http://github.com/posulliv/libcassandra/
+LICENSE=		modified-bsd
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
@@ -17,11 +18,16 @@ USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
 .include "../../devel/boost-headers/buildlink3.mk"
+.include "../../devel/boost-libs/buildlink3.mk"
 .include "../../devel/libthrift/buildlink3.mk"
+.include "../../lang/gcc44/buildlink3.mk"
 
 .include "../../mk/bsd.prefs.mk"
 
-CONFIGURE_ARGS+=	CPPFLAGS="-I${BUILDLINK_PREFIX.libthrift:Q}/include/thrift -I${BUILDLINK_PREFIX.boost-headers}/include/boost"
+pre-configure:
+.include "../../lang/gcc44/preconfigure.mk"
+
+CONFIGURE_ARGS+=	CPPFLAGS="-I${BUILDLINK_PREFIX.libthrift}/include/thrift -I${BUILDLINK_PREFIX.boost-headers}/include/boost"
 MAKE_ENV+=		AM_DEFAULT_VERBOSITY=1
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/libcassandra/PLIST b/databases/libcassandra/PLIST
index 94b8ff78a94..4eb2f7bbd0c 100644
--- a/databases/libcassandra/PLIST
+++ b/databases/libcassandra/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2010/05/01 15:09:44 tonnerre Exp $
+@comment $NetBSD: PLIST,v 1.2 2010/10/16 11:43:30 tonnerre Exp $
 include/libcassandra/cassandra.h
 include/libcassandra/cassandra_factory.h
+include/libcassandra/cassandra_host.h
 include/libcassandra/exception.h
 include/libcassandra/keyspace.h
 include/libcassandra/keyspace_factory.h
+include/libcassandra/util_functions.h
 include/libgenthrift/Cassandra.h
 include/libgenthrift/cassandra_constants.h
 include/libgenthrift/cassandra_types.h
diff --git a/databases/libcassandra/distinfo b/databases/libcassandra/distinfo
index 640da41c3d8..b8be8c834c4 100644
--- a/databases/libcassandra/distinfo
+++ b/databases/libcassandra/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2010/05/01 15:16:06 tonnerre Exp $
+$NetBSD: distinfo,v 1.3 2010/10/16 11:43:30 tonnerre Exp $
 
-SHA1 (libcassandra-20100501.tar.gz) = 95136e5cd96f2bc63cd170b791e23853edde6fde
-RMD160 (libcassandra-20100501.tar.gz) = ceaa80c5a9abab7d5a0c0a42e19bd303799cb483
-Size (libcassandra-20100501.tar.gz) = 1081501 bytes
-SHA1 (patch-aa) = 0df36269318a8a422f2c3d4eabbf3e1e02a87fcc
+SHA1 (libcassandra-20101010.tar.gz) = 457dcf1fd24ad310c63eefb3b532f58835f326ef
+RMD160 (libcassandra-20101010.tar.gz) = e3e05861d1c1173d2492d49442aa68ee429d7b8f
+Size (libcassandra-20101010.tar.gz) = 873233 bytes
+SHA1 (patch-aa) = 387ea4e5ceb65c63e0a8d894035c9ae0fee2b792
diff --git a/databases/libcassandra/patches/patch-aa b/databases/libcassandra/patches/patch-aa
index 65d063c5bd6..d0dd6e00c25 100644
--- a/databases/libcassandra/patches/patch-aa
+++ b/databases/libcassandra/patches/patch-aa
@@ -1,4 +1,7 @@
-$NetBSD: patch-aa,v 1.2 2010/05/01 15:16:06 tonnerre Exp $
+$NetBSD: patch-aa,v 1.3 2010/10/16 11:43:30 tonnerre Exp $
+
+Remove the -pedantic flag from the configure script, it isn't terribly
+useful for C++0x code.
 
 --- configure.orig	2010-04-30 23:25:08.000000000 +0000
 +++ configure
-- 
cgit v1.2.3