From 3ba5ce97f0854fe04d1312af58fda96d36f9295d Mon Sep 17 00:00:00 2001
From: miwi <miwi@FreeBSD.org>
Date: Sat, 10 Mar 2012 17:12:10 +0000
Subject: - Update to 1.0.8 - extend repaircluster command to take optional
 keyspace name argument - improve stop procedure in rc.d script

PR:		165816
Submitted by:	Radim Kolar <hsn@sendmail.cz>
Feature safe:	yes
---
 databases/cassandra/Makefile               | 2 +-
 databases/cassandra/distinfo               | 4 ++--
 databases/cassandra/files/cassandra.in     | 5 +----
 databases/cassandra/files/repaircluster.in | 6 +++---
 databases/cassandra/pkg-plist              | 8 +++++---
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/databases/cassandra/Makefile b/databases/cassandra/Makefile
index 7f60c605f0d7..94b8dd6926c7 100644
--- a/databases/cassandra/Makefile
+++ b/databases/cassandra/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cassandra
-PORTVERSION=	1.0.6
+PORTVERSION=	1.0.8
 CATEGORIES=	databases java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	cassandra/${PORTVERSION}
diff --git a/databases/cassandra/distinfo b/databases/cassandra/distinfo
index 4c91bd86e62c..77d97bbe1219 100644
--- a/databases/cassandra/distinfo
+++ b/databases/cassandra/distinfo
@@ -1,2 +1,2 @@
-SHA256 (apache-cassandra-1.0.6-bin.tar.gz) = a1610344b78164d238415112f523639e8c33b0a3a14b427e8b910017cf060d13
-SIZE (apache-cassandra-1.0.6-bin.tar.gz) = 11243727
+SHA256 (apache-cassandra-1.0.8-bin.tar.gz) = b8cc374752deb34b98797b7fb03b892332ebabfb37f4eae0c115482e19b659c6
+SIZE (apache-cassandra-1.0.8-bin.tar.gz) = 11271510
diff --git a/databases/cassandra/files/cassandra.in b/databases/cassandra/files/cassandra.in
index 0058f2e2228e..7ddb8b22696f 100644
--- a/databases/cassandra/files/cassandra.in
+++ b/databases/cassandra/files/cassandra.in
@@ -61,11 +61,8 @@ export JAVA_VERSION=1.6
 
 cassandra_prestop() {
 	$CASSANDRA_HOME/bin/nodetool -h localhost disablegossip
-	sleep 13
-	$CASSANDRA_HOME/bin/nodetool -h localhost disablethrift
-	sleep 2
+	sleep 15
 	$CASSANDRA_HOME/bin/nodetool -h localhost drain 
-	sleep 5
 	return 0
 }
 
diff --git a/databases/cassandra/files/repaircluster.in b/databases/cassandra/files/repaircluster.in
index 20142a3b6c88..678cfa4f4a4d 100644
--- a/databases/cassandra/files/repaircluster.in
+++ b/databases/cassandra/files/repaircluster.in
@@ -4,9 +4,9 @@ PATH=/bin:/usr/bin:%%LOCALBASE%%/bin:%%PREFIX%%/bin
 NODETOOL=%%DATADIR%%/bin/nodetool
 
 if test $# -eq 0; then
-	echo "$0 <any node in cluster>"
+	echo "$0 <any node in cluster> [keyspace]"
 	exit 1;
-fi
+fi	 
 for i in `$NODETOOL -h $1 ring | cut -d ' ' -f 1 | grep -e '^[0-9]'`; do
-	$NODETOOL -h $i repair
+	$NODETOOL -h $i repair $2
 done
diff --git a/databases/cassandra/pkg-plist b/databases/cassandra/pkg-plist
index 394faa875e12..044992a1a24e 100644
--- a/databases/cassandra/pkg-plist
+++ b/databases/cassandra/pkg-plist
@@ -1764,10 +1764,12 @@ bin/sstableloader
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/cqlhandling.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/pylexotron.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/saferscanner.pyc
+%%CQL%%%%DATADIR%%/pylib/cqlshlib/wcwidth.pyc
+%%CQL%%%%DATADIR%%/pylib/cqlshlib/wcwidth.py
 %%DATADIR%%/lib/antlr-3.2.jar
-%%DATADIR%%/lib/apache-cassandra-1.0.6.jar
-%%DATADIR%%/lib/apache-cassandra-clientutil-1.0.6.jar
-%%DATADIR%%/lib/apache-cassandra-thrift-1.0.6.jar
+%%DATADIR%%/lib/apache-cassandra-1.0.8.jar
+%%DATADIR%%/lib/apache-cassandra-clientutil-1.0.8.jar
+%%DATADIR%%/lib/apache-cassandra-thrift-1.0.8.jar
 %%DATADIR%%/lib/avro-1.4.0-fixes.jar
 %%DATADIR%%/lib/avro-1.4.0-sources-fixes.jar
 %%DATADIR%%/lib/commons-cli-1.1.jar
-- 
cgit