4 files changed, 22 insertions, 14 deletions

diff --git a/databases/cassandra/Makefile b/databases/cassandra/Makefile
index 94b8dd6926c7..bd431ca8120a 100644
--- a/databases/cassandra/Makefile
+++ b/databases/cassandra/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cassandra
-PORTVERSION=	1.0.8
+PORTVERSION=	1.0.9
 CATEGORIES=	databases java
 MASTER_SITES=	${MASTER_SITE_APACHE}
 MASTER_SITE_SUBDIR=	cassandra/${PORTVERSION}
@@ -80,7 +80,10 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share/cassandra|${DATADIR}/bin|' \
 		${WRKSRC}/bin/cassandra-cli \
 		${WRKSRC}/bin/nodetool \
-		${WRKSRC}/bin/sstableloader
+		${WRKSRC}/bin/sstableloader \
+		${WRKSRC}/bin/sstable2json \
+		${WRKSRC}/bin/json2sstable \
+		${WRKSRC}/bin/sstablekeys
 	@${REINPLACE_CMD} -e 's|\`dirname \$$\0\`/..|${DATADIR}|' \
 		${WRKSRC}/bin/cassandra.in.sh
 	@${RM} -f ${WRKSRC}/conf/*.orig
@@ -103,6 +106,10 @@ do-install:
 	@${LN} -s ${DATADIR}/bin/nodetool ${PREFIX}/bin/nodetool
 	@${LN} -s ${DATADIR}/bin/sstableloader ${PREFIX}/bin/sstableloader
 	@${LN} -s ${DATADIR}/bin/repaircluster ${PREFIX}/bin/repaircluster
+	@${LN} -s ${DATADIR}/bin/json2sstable ${PREFIX}/bin/json2sstable
+	@${LN} -s ${DATADIR}/bin/sstable2json ${PREFIX}/bin/sstable2json
+	@${LN} -s ${DATADIR}/bin/sstablekeys ${PREFIX}/bin/sstablekeys
+
 .if defined(WITH_CQL)
 	@${LN} -s ${DATADIR}/bin/cqlsh ${PREFIX}/bin/cqlsh
 .endif
diff --git a/databases/cassandra/distinfo b/databases/cassandra/distinfo
index 77d97bbe1219..524d949a6965 100644
--- a/databases/cassandra/distinfo
+++ b/databases/cassandra/distinfo
@@ -1,2 +1,2 @@
-SHA256 (apache-cassandra-1.0.8-bin.tar.gz) = b8cc374752deb34b98797b7fb03b892332ebabfb37f4eae0c115482e19b659c6
-SIZE (apache-cassandra-1.0.8-bin.tar.gz) = 11271510
+SHA256 (apache-cassandra-1.0.9-bin.tar.gz) = 0c0597b4e5f5b6eff66d1b9c98ab806be9d2f38c95d5c968407914f5c76fcde1
+SIZE (apache-cassandra-1.0.9-bin.tar.gz) = 11276193
diff --git a/databases/cassandra/pkg-descr b/databases/cassandra/pkg-descr
index 314f71490a1e..94e1d853c722 100644
--- a/databases/cassandra/pkg-descr
+++ b/databases/cassandra/pkg-descr
@@ -10,4 +10,4 @@ by one of the authors of Amazon's Dynamo. In a lot of ways you can
 think of Cassandra as Dynamo 2.0. Cassandra is in production use at
 Facebook but is still under heavy development.
 
-WWW: http://cassandra.apache.org/
+WWW:	http://cassandra.apache.org/
diff --git a/databases/cassandra/pkg-plist b/databases/cassandra/pkg-plist
index 044992a1a24e..01bc10377be0 100644
--- a/databases/cassandra/pkg-plist
+++ b/databases/cassandra/pkg-plist
@@ -2,6 +2,9 @@ bin/cassandra-cli
 bin/nodetool
 bin/repaircluster
 bin/sstableloader
+bin/json2sstable
+bin/sstable2json
+bin/sstablekeys
 %%CQL%%bin/cqlsh
 %%DATADIR%%/CHANGES.txt
 %%DATADIR%%/LICENSE.txt
@@ -113,7 +116,6 @@ bin/sstableloader
 %%DATADIR%%/javadoc/org/apache/cassandra/client/package-summary.html
 %%DATADIR%%/javadoc/org/apache/cassandra/client/package-tree.html
 %%DATADIR%%/javadoc/org/apache/cassandra/client/package-use.html
-%%DATADIR%%/javadoc/org/apache/cassandra/concurrent/Context.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/CreationTimeAwareFuture.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/DebuggableScheduledThreadPoolExecutor.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.html
@@ -125,7 +127,6 @@ bin/sstableloader
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/NamedThreadFactory.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/Stage.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/StageManager.html
-%%DATADIR%%/javadoc/org/apache/cassandra/concurrent/class-use/Context.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/class-use/CreationTimeAwareFuture.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/class-use/DebuggableScheduledThreadPoolExecutor.html
 %%DATADIR%%/javadoc/org/apache/cassandra/concurrent/class-use/DebuggableThreadPoolExecutor.html
@@ -325,7 +326,6 @@ bin/sstableloader
 %%DATADIR%%/javadoc/org/apache/cassandra/db/TruncateResponse.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/TruncateVerbHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/Truncation.html
-%%DATADIR%%/javadoc/org/apache/cassandra/db/UnserializableColumnFamilyException.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/WriteResponse.WriteResponseSerializer.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/WriteResponse.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/AbstractColumnContainer.DeletionInfo.html
@@ -367,6 +367,10 @@ bin/sstableloader
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/KeyspaceNotDefinedException.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/Memtable.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/RangeSliceCommand.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/UnknownColumnFamilyException.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/AbstractCompositeType.CompositeComponent.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/marshal/class-use/AbstractCompositeType.CompositeComponent.html
+%%DATADIR%%/javadoc/org/apache/cassandra/db/UnknownColumnFamilyException.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/RangeSliceReply.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/ReadCommand.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/ReadRepairVerbHandler.html
@@ -390,7 +394,6 @@ bin/sstableloader
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/TruncateResponse.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/TruncateVerbHandler.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/Truncation.html
-%%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/UnserializableColumnFamilyException.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/WriteResponse.WriteResponseSerializer.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/class-use/WriteResponse.html
 %%DATADIR%%/javadoc/org/apache/cassandra/db/columniterator/IColumnIterator.html
@@ -1679,7 +1682,6 @@ bin/sstableloader
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/Throttle.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/UUIDGen.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/WrappedRunnable.html
-%%DATADIR%%/javadoc/org/apache/cassandra/utils/XMLUtils.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/AbstractStatsDeque.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/Allocator.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/BloomFilter.html
@@ -1728,7 +1730,6 @@ bin/sstableloader
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/Throttle.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/UUIDGen.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/WrappedRunnable.html
-%%DATADIR%%/javadoc/org/apache/cassandra/utils/class-use/XMLUtils.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/obs/OpenBitSet.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/obs/class-use/OpenBitSet.html
 %%DATADIR%%/javadoc/org/apache/cassandra/utils/obs/package-frame.html
@@ -1767,9 +1768,9 @@ bin/sstableloader
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/wcwidth.pyc
 %%CQL%%%%DATADIR%%/pylib/cqlshlib/wcwidth.py
 %%DATADIR%%/lib/antlr-3.2.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/apache-cassandra-1.0.9.jar
+%%DATADIR%%/lib/apache-cassandra-clientutil-1.0.9.jar
+%%DATADIR%%/lib/apache-cassandra-thrift-1.0.9.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