Date: Sun, 15 Feb 2015 21:36:30 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r379050 - head/textproc/apache-solr/files Message-ID: <201502152136.t1FLaUxI070149@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201502152136.t1FLaUxI070149>