diff options
| author | Kurt Jaeger <pi@FreeBSD.org> | 2014-09-05 03:30:38 +0000 |
|---|---|---|
| committer | Kurt Jaeger <pi@FreeBSD.org> | 2014-09-05 03:30:38 +0000 |
| commit | 5c2c944002099bf147f568dae099cf174b38e047 (patch) | |
| tree | adfa6fead2008141b6912107bae75ea632f29cb6 /databases/cassandra2 | |
| parent | d706fd023eaa73ca4f659e6a2704f50de3875fbc (diff) | |
| download | ports-5c2c944002099bf147f568dae099cf174b38e047.tar.gz ports-5c2c944002099bf147f568dae099cf174b38e047.zip | |
databases/cassandra2: fix jdk7 invocation
PR: 193236
Submitted by: toshiro.biz@gmail.com
Approved by: admins@perceptyx.com (maintainer)
Notes
Notes:
svn path=/head/; revision=367323
Diffstat (limited to 'databases/cassandra2')
| -rw-r--r-- | databases/cassandra2/Makefile | 1 | ||||
| -rw-r--r-- | databases/cassandra2/files/patch-env | 19 |
2 files changed, 13 insertions, 7 deletions
diff --git a/databases/cassandra2/Makefile b/databases/cassandra2/Makefile index 346940b0d0d2..e26a8f1af3af 100644 --- a/databases/cassandra2/Makefile +++ b/databases/cassandra2/Makefile @@ -2,6 +2,7 @@ PORTNAME= cassandra PORTVERSION= 2.0.10 +PORTREVISION= 1 CATEGORIES= databases java MASTER_SITES= APACHE MASTER_SITE_SUBDIR= cassandra/${PORTVERSION} diff --git a/databases/cassandra2/files/patch-env b/databases/cassandra2/files/patch-env index caacf9cbfe48..455327527bb5 100644 --- a/databases/cassandra2/files/patch-env +++ b/databases/cassandra2/files/patch-env @@ -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#*_} + + |