diff options
| -rw-r--r-- | databases/apache-cassandra/Makefile | 4 | ||||
| -rw-r--r-- | databases/apache-cassandra/distinfo | 8 | ||||
| -rw-r--r-- | databases/apache-cassandra/files/smf/manifest.xml | 3 |
3 files changed, 7 insertions, 8 deletions
diff --git a/databases/apache-cassandra/Makefile b/databases/apache-cassandra/Makefile index 0e2722c4506..c0ed0861f0d 100644 --- a/databases/apache-cassandra/Makefile +++ b/databases/apache-cassandra/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2014/03/11 14:34:36 jperkin Exp $ +# $NetBSD: Makefile,v 1.17 2014/04/07 10:09:33 fhajny Exp $ # DISTNAME= apache-cassandra-${CASSANDRA_VER} @@ -23,7 +23,7 @@ PKG_DESTDIR_SUPPORT= destdir .include "../../mk/bsd.prefs.mk" -CASSANDRA_VER= 1.2.15 +CASSANDRA_VER= 1.2.16 CASSANDRA_HOME= ${PREFIX}/share/cassandra EGDIR= ${PREFIX}/share/examples/cassandra DOCDIR= ${PREFIX}/share/doc/cassandra diff --git a/databases/apache-cassandra/distinfo b/databases/apache-cassandra/distinfo index 646173bb244..72e9100309e 100644 --- a/databases/apache-cassandra/distinfo +++ b/databases/apache-cassandra/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.8 2014/02/14 10:25:23 fhajny Exp $ +$NetBSD: distinfo,v 1.9 2014/04/07 10:09:33 fhajny Exp $ -SHA1 (apache-cassandra-1.2.15-bin.tar.gz) = 717487325aab8df2c1ca0da71d567e0ea656733c -RMD160 (apache-cassandra-1.2.15-bin.tar.gz) = 8f90f2062940b6abe37eba5733034d067d8c5b60 -Size (apache-cassandra-1.2.15-bin.tar.gz) = 16877671 bytes +SHA1 (apache-cassandra-1.2.16-bin.tar.gz) = 637d9ecb643f3226bbf510880586f6021cf70d33 +RMD160 (apache-cassandra-1.2.16-bin.tar.gz) = 1cfd4f9bc93279a720bbda228e2bbb6b73e5c5b8 +Size (apache-cassandra-1.2.16-bin.tar.gz) = 16880266 bytes diff --git a/databases/apache-cassandra/files/smf/manifest.xml b/databases/apache-cassandra/files/smf/manifest.xml index bde53db7bfb..b94c96aeb4b 100644 --- a/databases/apache-cassandra/files/smf/manifest.xml +++ b/databases/apache-cassandra/files/smf/manifest.xml @@ -13,8 +13,7 @@ <method_context project="@SMF_NAME@" working_directory="@CASSANDRA_HOME@"> <method_credential user="@CASSANDRA_USER@" group="@CASSANDRA_GROUP@" /> <method_environment> - <envvar name="JAVA_HOME" value="@PREFIX@/java/sun6" /> - <envvar name="JVM_OPTS" value="-d64" /> + <envvar name="JAVA_HOME" value="@JAVA_HOME@" /> </method_environment> </method_context> <exec_method type="method" name="start" exec="@PREFIX@/share/cassandra/bin/cassandra -p @VARBASE@/lib/cassandra/cassandra.pid" timeout_seconds="600" /> |