From owner-svn-ports-head@FreeBSD.ORG  Sun Feb 15 21:36:30 2015
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 43D98E3;
 Sun, 15 Feb 2015 21:36:30 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2DBE8B23;
 Sun, 15 Feb 2015 21:36:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1FLaUOZ070150;
 Sun, 15 Feb 2015 21:36:30 GMT (envelope-from glewis@FreeBSD.org)
Received: (from glewis@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1FLaUxI070149;
 Sun, 15 Feb 2015 21:36:30 GMT (envelope-from glewis@FreeBSD.org)
Message-Id: <201502152136.t1FLaUxI070149@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: glewis set sender to
 glewis@FreeBSD.org using -f
From: Greg Lewis <glewis@FreeBSD.org>
Date: Sun, 15 Feb 2015 21:36:30 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r379050 - head/textproc/apache-solr/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-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 15 Feb 2015 21:36:30 -0000

Author: glewis
Date: Sun Feb 15 21:36:29 2015
New Revision: 379050
URL: https://svnweb.freebsd.org/changeset/ports/379050
QAT: https://qat.redports.org/buildarchive/r379050/

Log:
  . Allow Apache Solr to be run with either openjdk7 or openjdk8.
  
  PR:		195860
  Submitted by:	paul@gromit.dlib.vt.edu

Modified:
  head/textproc/apache-solr/files/solr.in   (contents, props changed)

Modified: head/textproc/apache-solr/files/solr.in
==============================================================================
--- head/textproc/apache-solr/files/solr.in	Sun Feb 15 21:18:12 2015	(r379049)
+++ head/textproc/apache-solr/files/solr.in	Sun Feb 15 21:36:29 2015	(r379050)
@@ -42,7 +42,7 @@ load_rc_config $name
 required_files=${solr_instance}/solr.xml
 pidfile=/var/run/solr.pid
 command=/usr/sbin/daemon
-procname=%%LOCALBASE%%/openjdk7/bin/java
+procname=`env JAVAVM_DRYRUN=true JAVA_VERSION=1.7+ %%LOCALBASE%%/bin/java | grep JAVAVM_PROG | cut -f 2 -d =`
 start_precmd="cd %%EXAMPLESDIR%%"
 
 command_args="-f -p ${pidfile} ${procname} ${solr_flags} -Dsolr.solr.home=${solr_instance} -Dsolr.log=/var/log -jar %%EXAMPLESDIR%%/start.jar"