svn commit: r313904 - in head/textproc/elasticsearch: . files

[Tom Judge]

Author: tj
Date: Mon Mar 11 14:14:30 2013
New Revision: 313904
URL: http://svnweb.freebsd.org/changeset/ports/313904

Log:
  Fix jar file name introduced in update.
  
  Submitted by:	zi

Modified:
  head/textproc/elasticsearch/Makefile
  head/textproc/elasticsearch/files/elasticsearch-plugin.in
  head/textproc/elasticsearch/files/elasticsearch.in

Modified: head/textproc/elasticsearch/Makefile
==============================================================================
--- head/textproc/elasticsearch/Makefile	Mon Mar 11 14:11:26 2013	(r313903)
+++ head/textproc/elasticsearch/Makefile	Mon Mar 11 14:14:30 2013	(r313904)
@@ -3,6 +3,7 @@
 
 PORTNAME=	elasticsearch
 PORTVERSION=	0.20.5
+PORTREVISION=	1
 CATEGORIES=	textproc java devel
 MASTER_SITES=	http://download.elasticsearch.org/${PORTNAME}/${PORTNAME}/ \
 		http://mirrors.rit.edu/zi/
@@ -45,7 +46,9 @@ GROUPS=		${SEARCHGROUP}
 ELASTIC_DBDIR=	/var/db/elasticsearch
 ELASTIC_LOGDIR=	/var/log/elasticsearch
 
-SUB_LIST=	SEARCHUSER=${SEARCHUSER} SEARCHGROUP=${SEARCHGROUP}
+SUB_LIST=	SEARCHUSER=${SEARCHUSER} \
+		SEARCHGROUP=${SEARCHGROUP} \
+		PORTVERSION=${PORTVERSION}
 SUB_FILES=	elasticsearch-plugin
 PLIST_SUB=	SIGAR_ARCH=${SIGAR_ARCH} \
 		SEARCHUSER=${SEARCHUSER} \

Modified: head/textproc/elasticsearch/files/elasticsearch-plugin.in
==============================================================================
--- head/textproc/elasticsearch/files/elasticsearch-plugin.in	Mon Mar 11 14:11:26 2013	(r313903)
+++ head/textproc/elasticsearch/files/elasticsearch-plugin.in	Mon Mar 11 14:14:30 2013	(r313904)
@@ -10,7 +10,7 @@ load_rc_config $name
 : ${elasticsearch_config:="%%PREFIX%%/etc/elasticsearch/elasticsearch.yml"}
 
 ES_LIB="%%PREFIX%%/lib/elasticsearch"
-ES_CLASSPATH=$ES_LIB/elasticsearch-0.19.9.jar:$ES_LIB/*:$ES_LIB/sigar/*
+ES_CLASSPATH=$ES_LIB/elasticsearch-%%PORTVERSION%%.jar:$ES_LIB/*:$ES_LIB/sigar/*
 
 JAVA=%%LOCALBASE%%/bin/java
 

Modified: head/textproc/elasticsearch/files/elasticsearch.in
==============================================================================
--- head/textproc/elasticsearch/files/elasticsearch.in	Mon Mar 11 14:11:26 2013	(r313903)
+++ head/textproc/elasticsearch/files/elasticsearch.in	Mon Mar 11 14:14:30 2013	(r313904)
@@ -45,7 +45,7 @@ required_files="${elasticsearch_config}"
 pidfile="/var/run/${name}.pid"
 
 ES_LIB="%%PREFIX%%/lib/elasticsearch"
-ES_CLASSPATH=$ES_LIB/elasticsearch-0.19.9.jar:$ES_LIB/*:$ES_LIB/sigar/*
+ES_CLASSPATH=$ES_LIB/elasticsearch-%%PORTVERSION%%.jar:$ES_LIB/*:$ES_LIB/sigar/*
 
 
 java_options=" 	-server \