Attachment 119209 Details for Bug 161671 – cassandra-0.8.7.patch

[patch] cassandra-0.8.7.patch

cassandra-0.8.7.patch (text/plain), 3.32 KB, created by gslin on 2011-10-14 23:50:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gslin

Created: 2011-10-14 23:50:02 UTC

Size: 3.32 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/databases/cassandra/Makefile /home/staff/gslin/work/ports/cassandra/Makefile
>--- /usr/ports/databases/cassandra/Makefile	2011-09-11 04:44:29.000000000 +0800
>+++ /home/staff/gslin/work/ports/cassandra/Makefile	2011-10-15 04:57:12.000000000 +0800
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	cassandra
>-PORTVERSION=	0.8.5
>+PORTVERSION=	0.8.7
> CATEGORIES=	databases java
> MASTER_SITES=	${MASTER_SITE_APACHE}
> MASTER_SITE_SUBDIR=	cassandra/${PORTVERSION}
>@@ -20,14 +20,23 @@
> 
> JAVA_VERSION=	1.6+
> NO_BUILD=	yes
>+REINPLACE_ARGS=	-i ''
> USE_JAVA=	yes
> USE_RC_SUBR=	cassandra
>-REINPLACE_ARGS=	-i ''
> 
>-CONFIGS=	access.properties cassandra-topology.properties cassandra.yaml \
>-		log4j-server.properties log4j-tools.properties passwd.properties
>-SCRIPTS=	cassandra cassandra-cli json2sstable nodetool sstable2json \
>-		sstablekeys sstableloader
>+CONFIGS=	access.properties \
>+		cassandra-topology.properties \
>+		cassandra.yaml \
>+		log4j-server.properties \
>+		log4j-tools.properties \
>+		passwd.properties
>+SCRIPTS=	cassandra \
>+		cassandra-cli \
>+		json2sstable \
>+		nodetool \
>+		sstable2json \
>+		sstablekeys \
>+		sstableloader
> 
> post-extract:
> 	@${RM} ${WRKSRC}/bin/*.bat ${WRKSRC}/bin/stop-server
>@@ -35,9 +44,12 @@
> 	@${MV} ${WRKSRC}/conf/${i} ${WRKSRC}/conf/${i}.sample
> .endfor
> 
>-do-patch:
>-	@${REINPLACE_CMD} -e 's|/usr/share/cassandra|${DATADIR}/bin|' ${WRKSRC}/bin/cassandra-cli ${WRKSRC}/bin/nodetool
>-	@${REINPLACE_CMD} -e 's|\`dirname \$$\0\`/..|${DATADIR}|' ${WRKSRC}/bin/cassandra.in.sh
>+post-patch:
>+	@${REINPLACE_CMD} -e 's|/usr/share/cassandra|${DATADIR}/bin|' \
>+		${WRKSRC}/bin/cassandra-cli \
>+		${WRKSRC}/bin/nodetool
>+	@${REINPLACE_CMD} -e 's|\`dirname \$$\0\`/..|${DATADIR}|' \
>+		${WRKSRC}/bin/cassandra.in.sh
> 
> do-install:
> 	@${MKDIR} ${DATADIR}
>@@ -47,6 +59,6 @@
> 	@${LN} -s ${DATADIR}/bin/nodetool ${PREFIX}/bin/nodetool
> 
> post-install:
>-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
>+	@PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
> 
> .include <bsd.port.mk>
>diff -ruN --exclude=CVS /usr/ports/databases/cassandra/distinfo /home/staff/gslin/work/ports/cassandra/distinfo
>--- /usr/ports/databases/cassandra/distinfo	2011-09-11 04:44:29.000000000 +0800
>+++ /home/staff/gslin/work/ports/cassandra/distinfo	2011-10-15 04:29:50.000000000 +0800
>@@ -1,2 +1,2 @@
>-SHA256 (apache-cassandra-0.8.5-bin.tar.gz) = 12a433e51f8e49d70da761ceed9a912633480854e7ef7f49899865f28331883a
>-SIZE (apache-cassandra-0.8.5-bin.tar.gz) = 10236276
>+SHA256 (apache-cassandra-0.8.7-bin.tar.gz) = 5b1f442e8f9e80bcebe7c46083659365c4d7edd0fe01ed610c4a07a9d1cfdc16
>+SIZE (apache-cassandra-0.8.7-bin.tar.gz) = 10274121
>diff -ruN --exclude=CVS /usr/ports/databases/cassandra/pkg-plist /home/staff/gslin/work/ports/cassandra/pkg-plist
>--- /usr/ports/databases/cassandra/pkg-plist	2011-09-11 04:44:29.000000000 +0800
>+++ /home/staff/gslin/work/ports/cassandra/pkg-plist	2011-10-15 06:43:27.000000000 +0800
>@@ -1555,8 +1555,8 @@
> %%DATADIR%%/javadoc/serialized-form.html
> %%DATADIR%%/javadoc/stylesheet.css
> %%DATADIR%%/lib/antlr-3.2.jar
>-%%DATADIR%%/lib/apache-cassandra-0.8.5.jar
>-%%DATADIR%%/lib/apache-cassandra-thrift-0.8.5.jar
>+%%DATADIR%%/lib/apache-cassandra-0.8.7.jar
>+%%DATADIR%%/lib/apache-cassandra-thrift-0.8.7.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 161671: 119209