svn commit: r367323 - in head/databases/cassandra2: . files

[Kurt Jaeger]

Author: pi
Date: Fri Sep  5 03:30:38 2014
New Revision: 367323
URL: http://svnweb.freebsd.org/changeset/ports/367323
QAT: https://qat.redports.org/buildarchive/r367323/

Log:
  databases/cassandra2: fix jdk7 invocation
  
  PR:		193236
  Submitted by:	toshiro.biz at gmail.com
  Approved by:	admins at perceptyx.com (maintainer)

Modified:
  head/databases/cassandra2/Makefile
  head/databases/cassandra2/files/patch-env

Modified: head/databases/cassandra2/Makefile
==============================================================================
--- head/databases/cassandra2/Makefile	Fri Sep  5 03:17:36 2014	(r367322)
+++ head/databases/cassandra2/Makefile	Fri Sep  5 03:30:38 2014	(r367323)
@@ -2,6 +2,7 @@
 
 PORTNAME=	cassandra
 PORTVERSION=	2.0.10
+PORTREVISION=	1
 CATEGORIES=	databases java
 MASTER_SITES=	APACHE
 MASTER_SITE_SUBDIR=	cassandra/${PORTVERSION}

Modified: head/databases/cassandra2/files/patch-env
==============================================================================
--- head/databases/cassandra2/files/patch-env	Fri Sep  5 03:17:36 2014	(r367322)
+++ head/databases/cassandra2/files/patch-env	Fri Sep  5 03:30:38 2014	(r367323)
@@ -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#*_}
+ 
+