Attachment 123424 Details for Bug 166756 – cassandra-1.0.9.patch

[patch] cassandra-1.0.9.patch

cassandra-1.0.9.patch (text/plain), 6.89 KB, created by Radim Kolar on 2012-04-08 16:10:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Radim Kolar

Created: 2012-04-08 16:10:13 UTC

Size: 6.89 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/databases/cassandra/Makefile ./Makefile
>--- /usr/ports/databases/cassandra/Makefile	2012-03-10 18:12:10.000000000 +0100
>+++ ./Makefile	2012-04-08 16:54:35.298917878 +0200
>@@ -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 @@
> 	@${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 @@
> 	@${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 -ruN --exclude=CVS /usr/ports/databases/cassandra/distinfo ./distinfo
>--- /usr/ports/databases/cassandra/distinfo	2012-03-10 18:12:10.000000000 +0100
>+++ ./distinfo	2012-04-08 16:22:28.142017051 +0200
>@@ -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 -ruN --exclude=CVS /usr/ports/databases/cassandra/pkg-plist ./pkg-plist
>--- /usr/ports/databases/cassandra/pkg-plist	2012-03-10 18:12:10.000000000 +0100
>+++ ./pkg-plist	2012-04-08 16:53:35.705751901 +0200
>@@ -2,6 +2,9 @@
> 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 @@
> %%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 @@
> %%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 @@
> %%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 @@
> %%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 @@
> %%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 @@
> %%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 @@
> %%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 @@
> %%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

Actions: View | Diff

Attachments on bug 166756: 123424