Update Apache Cassandra to 1.2.16.

 * Add UNLOGGED, COUNTER options to BATCH documentation (CASSANDRA-6816)
 * add extra SSL cipher suites (CASSANDRA-6613)
 * fix nodetool getsstables for blob PK (CASSANDRA-6803)
 * Add CMSClassUnloadingEnabled JVM option (CASSANDRA-6541)
 * Catch memtable flush exceptions during shutdown (CASSANDRA-6735)
 * Don't attempt cross-dc forwarding in mixed-version cluster with 1.1
   (CASSANDRA-6732)
 * Fix broken streams when replacing with same IP (CASSANDRA-6622)
 * Fix upgradesstables NPE for non-CF-based indexes (CASSANDRA-6645)
 * Fix partition and range deletes not triggering flush (CASSANDRA-6655)
 * Fix mean cells and mean row size per sstable calculations
   (CASSANDRA-6667)
 * Compact hints after partial replay to clean out tombstones
   (CASSANDRA-6666)
 * Log USING TTL/TIMESTAMP in a counter update warning (CASSANDRA-6649)
 * Don't exchange schema between nodes with different versions
   (CASSANDRA-6695)
 * Use real node messaging versions for schema exchange decisions
   (CASSANDRA-6700)
 * IN on the last clustering columns + ORDER BY DESC yield no results
   (CASSANDRA-6701)
 * Fix SecondaryIndexManager#deleteFromIndexes() (CASSANDRA-6711)
 * Fix snapshot repair not snapshotting coordinator itself (CASSANDRA-6713)
 * Support negative timestamps for CQL3 dates in query string
   (CASSANDRA-6718)
 * Avoid NPEs when receiving table changes for an unknown keyspace
   (CASSANDRA-5631)
 * Fix bootstrapping when there is no schema (CASSANDRA-6685)
 * Fix truncating compression metadata (CASSANDRA-6791)
 * Fix SSTable not released if stream session fails before starts
   (CASSANDRA-6818)

3 files changed, 7 insertions, 8 deletions

diff --git a/databases/apache-cassandra/Makefile b/databases/apache-cassandra/Makefile
index 0e2722c4506..c0ed0861f0d 100644
--- a/databases/apache-cassandra/Makefile
+++ b/databases/apache-cassandra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2014/03/11 14:34:36 jperkin Exp $
+# $NetBSD: Makefile,v 1.17 2014/04/07 10:09:33 fhajny Exp $
 #
 
 DISTNAME=	apache-cassandra-${CASSANDRA_VER}
@@ -23,7 +23,7 @@ PKG_DESTDIR_SUPPORT=	destdir
 
 .include "../../mk/bsd.prefs.mk"
 
-CASSANDRA_VER=	1.2.15
+CASSANDRA_VER=	1.2.16
 CASSANDRA_HOME=	${PREFIX}/share/cassandra
 EGDIR=		${PREFIX}/share/examples/cassandra
 DOCDIR=		${PREFIX}/share/doc/cassandra
diff --git a/databases/apache-cassandra/distinfo b/databases/apache-cassandra/distinfo
index 646173bb244..72e9100309e 100644
--- a/databases/apache-cassandra/distinfo
+++ b/databases/apache-cassandra/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2014/02/14 10:25:23 fhajny Exp $
+$NetBSD: distinfo,v 1.9 2014/04/07 10:09:33 fhajny Exp $
 
-SHA1 (apache-cassandra-1.2.15-bin.tar.gz) = 717487325aab8df2c1ca0da71d567e0ea656733c
-RMD160 (apache-cassandra-1.2.15-bin.tar.gz) = 8f90f2062940b6abe37eba5733034d067d8c5b60
-Size (apache-cassandra-1.2.15-bin.tar.gz) = 16877671 bytes
+SHA1 (apache-cassandra-1.2.16-bin.tar.gz) = 637d9ecb643f3226bbf510880586f6021cf70d33
+RMD160 (apache-cassandra-1.2.16-bin.tar.gz) = 1cfd4f9bc93279a720bbda228e2bbb6b73e5c5b8
+Size (apache-cassandra-1.2.16-bin.tar.gz) = 16880266 bytes
diff --git a/databases/apache-cassandra/files/smf/manifest.xml b/databases/apache-cassandra/files/smf/manifest.xml
index bde53db7bfb..b94c96aeb4b 100644
--- a/databases/apache-cassandra/files/smf/manifest.xml
+++ b/databases/apache-cassandra/files/smf/manifest.xml
@@ -13,8 +13,7 @@
       <method_context project="@SMF_NAME@" working_directory="@CASSANDRA_HOME@">
       <method_credential user="@CASSANDRA_USER@" group="@CASSANDRA_GROUP@" />
       <method_environment>
-        <envvar name="JAVA_HOME" value="@PREFIX@/java/sun6" />
-        <envvar name="JVM_OPTS" value="-d64" />
+        <envvar name="JAVA_HOME" value="@JAVA_HOME@" />
       </method_environment>
     </method_context>
     <exec_method type="method" name="start" exec="@PREFIX@/share/cassandra/bin/cassandra -p @VARBASE@/lib/cassandra/cassandra.pid" timeout_seconds="600" />