kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

databases/cassandra2: fix jdk7 invocation

Browse source 
PR:		193236
Submitted by:	toshiro.biz@gmail.com
Approved by:	admins@perceptyx.com (maintainer)
This commit is contained in:
Kurt Jaeger 2014-09-05 03:30:38 +00:00
parent d706fd023e
commit 5c2c944002
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=367323
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
databases/cassandra2/Makefile
View file

@ -2,6 +2,7 @@
PORTNAME= cassandra
PORTVERSION= 2.0.10
PORTREVISION= 1
CATEGORIES= databases java
MASTER_SITES= APACHE
MASTER_SITE_SUBDIR= cassandra/${PORTVERSION}

19
databases/cassandra2/files/patch-env
View file

@ -1,7 +1,12 @@
--- conf/cassandra-env.sh.orig 2011-11-04 11:47:16.000000000 +0100
+++ conf/cassandra-env.sh 2011-11-09 16:50:50.124144710 +0100
@@ -192,3 +192,4 @@
JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.port=$JMX_PORT"
JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.ssl=false"
JVM_OPTS="$JVM_OPTS -Dcom.sun.management.jmxremote.authenticate=false"
+JVM_OPTS="$JVM_OPTS $JVM_OVERRIDE_OPTS"
--- conf/cassandra-env.sh.orig
+++ conf/cassandra-env.sh
@@ -90,7 +90,7 @@
java_ver_output=`"${JAVA:-java}" -version 2>&1`
-jvmver=`echo "$java_ver_output" | grep 'java version' | awk -F'"' 'NR==1 {print $2}'`
+jvmver=`echo "$java_ver_output" | egrep 'java version|openjdk version' | awk -F'"' 'NR==1 {print $2}'`
JVM_VERSION=${jvmver%_*}
JVM_PATCH_VERSION=${jvmver#*_}