svn commit: r308724 - in head/databases/cassandra: . files

[Jason Helfman]

Author: jgh
Date: Wed Dec 12 00:12:08 2012
New Revision: 308724
URL: http://svnweb.freebsd.org/changeset/ports/308724

Log:
  - move to jdk7
  - while here shorten MASTER_SITES
  
  PR:		174346
  Submitted by:	maintainer, hsn at sendmail.cz

Modified:
  head/databases/cassandra/Makefile
  head/databases/cassandra/files/cassandra.in

Modified: head/databases/cassandra/Makefile
==============================================================================
--- head/databases/cassandra/Makefile	Wed Dec 12 00:07:57 2012	(r308723)
+++ head/databases/cassandra/Makefile	Wed Dec 12 00:12:08 2012	(r308724)
@@ -3,8 +3,9 @@
 
 PORTNAME=	cassandra
 PORTVERSION=	1.0.12
+PORTREVISION=	1
 CATEGORIES=	databases java
-MASTER_SITES=	${MASTER_SITE_APACHE}
+MASTER_SITES=	APACHE
 MASTER_SITE_SUBDIR=	cassandra/${PORTVERSION}
 DISTNAME=	apache-cassandra-${PORTVERSION}
 EXTRACT_SUFX=	-bin.tar.gz
@@ -14,7 +15,7 @@ COMMENT=	Open source distributed databas
 
 LICENSE=	AL2
 
-JAVA_VERSION=	1.6
+JAVA_VERSION=	1.7
 JAVA_VENDOR=	openjdk
 REINPLACE_ARGS=	-i ''
 USE_JAVA=	yes

Modified: head/databases/cassandra/files/cassandra.in
==============================================================================
--- head/databases/cassandra/files/cassandra.in	Wed Dec 12 00:07:57 2012	(r308723)
+++ head/databases/cassandra/files/cassandra.in	Wed Dec 12 00:12:08 2012	(r308724)
@@ -57,7 +57,7 @@ export JVM_OPTS=-javaagent:%%DATADIR%%/l
 export JVM_OVERRIDE_OPTS="$cassandra_vmargs"
 
 export JAVA_VENDOR=openjdk
-export JAVA_VERSION=1.6
+export JAVA_VERSION=1.7
 
 cassandra_prestop() {
 	$CASSANDRA_HOME/bin/nodetool -h localhost disablegossip