aboutsummaryrefslogtreecommitdiff
path: root/databases
diff options
context:
space:
mode:
authorPawel Pekala <pawel@FreeBSD.org>2011-10-18 21:07:35 +0000
committerPawel Pekala <pawel@FreeBSD.org>2011-10-18 21:07:35 +0000
commitb594f26dc91389043ae1fef610b3ea9708c7d603 (patch)
tree2cf69ebc16b4162dc44f3c4e70b889cd32a7396c /databases
parent9ded345815acfc2e4ac7443816f80c948f2a4971 (diff)
downloadports-b594f26dc91389043ae1fef610b3ea9708c7d603.tar.gz
ports-b594f26dc91389043ae1fef610b3ea9708c7d603.zip
Update to version 0.8.7
PR: ports/161671 Submitted by: Gea-Suan Lin <gslin@gslin.org> (maintainer)
Notes
Notes: svn path=/head/; revision=283854
Diffstat (limited to 'databases')
-rw-r--r--databases/cassandra/Makefile32
-rw-r--r--databases/cassandra/distinfo4
-rw-r--r--databases/cassandra/pkg-plist4
3 files changed, 26 insertions, 14 deletions
diff --git a/databases/cassandra/Makefile b/databases/cassandra/Makefile
index 51093defd282..00a9ec3209d6 100644
--- a/databases/cassandra/Makefile
+++ b/databases/cassandra/Makefile
@@ -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 @@ LICENSE= ASL
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 @@ post-extract:
@${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 @@ do-install:
@${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 --git a/databases/cassandra/distinfo b/databases/cassandra/distinfo
index a1f9698bea69..f87950b570f3 100644
--- a/databases/cassandra/distinfo
+++ b/databases/cassandra/distinfo
@@ -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 --git a/databases/cassandra/pkg-plist b/databases/cassandra/pkg-plist
index befe3fe7a506..3bc702ea7d21 100644
--- a/databases/cassandra/pkg-plist
+++ b/databases/cassandra/pkg-plist
@@ -1555,8 +1555,8 @@ bin/nodetool
%%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