From owner-svn-ports-all@FreeBSD.ORG  Wed Dec 12 00:12:09 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 79EEA5F7;
 Wed, 12 Dec 2012 00:12:09 +0000 (UTC) (envelope-from jgh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 42AE88FC16;
 Wed, 12 Dec 2012 00:12:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBC0C9Zq022785;
 Wed, 12 Dec 2012 00:12:09 GMT (envelope-from jgh@svn.freebsd.org)
Received: (from jgh@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBC0C8gG022782;
 Wed, 12 Dec 2012 00:12:08 GMT (envelope-from jgh@svn.freebsd.org)
Message-Id: <201212120012.qBC0C8gG022782@svn.freebsd.org>
From: Jason Helfman <jgh@FreeBSD.org>
Date: Wed, 12 Dec 2012 00:12:08 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r308724 - in head/databases/cassandra: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Dec 2012 00:12:09 -0000

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@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