aboutsummaryrefslogtreecommitdiffstats
path: root/textproc
diff options
context:
space:
mode:
authorglewis <glewis@FreeBSD.org>2015-02-16 05:36:29 +0800
committerglewis <glewis@FreeBSD.org>2015-02-16 05:36:29 +0800
commit1f5ca9994f09baa41347608b3654d4f8a2bc60bd (patch)
tree13109267c7d33c466900469dda9b178cc952ba17 /textproc
parent368590981a7e13e7f979fda7e93a403c7e8305f4 (diff)
downloadfreebsd-ports-gnome-1f5ca9994f09baa41347608b3654d4f8a2bc60bd.tar.gz
freebsd-ports-gnome-1f5ca9994f09baa41347608b3654d4f8a2bc60bd.tar.zst
freebsd-ports-gnome-1f5ca9994f09baa41347608b3654d4f8a2bc60bd.zip
. Allow Apache Solr to be run with either openjdk7 or openjdk8.
PR: 195860 Submitted by: paul@gromit.dlib.vt.edu
Diffstat (limited to 'textproc')
-rw-r--r--textproc/apache-solr/files/solr.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/textproc/apache-solr/files/solr.in b/textproc/apache-solr/files/solr.in
index 7afe7aa5d220..d45da8e6c960 100644
--- a/textproc/apache-solr/files/solr.in
+++ b/textproc/apache-solr/files/solr.in
@@ -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"