Attachment 159560 Details for Bug 201834 – Update textproc/elasticsearch from 1.6.0 to 1.7.0 + NO_ARCH & minor rclint cleanups

[patch] Update textproc/elasticsearch from 1.6.0 to 1.7.0 + NO_ARCH & minor rclint cleanups

elasticsearch-1.7.0.patch (text/plain), 4.07 KB, created by Jason Unovitch on 2015-08-05 02:13:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Unovitch

Created: 2015-08-05 02:13:23 UTC

Size: 4.07 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 393560)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	elasticsearch
>-PORTVERSION=	1.6.0
>+PORTVERSION=	1.7.0
> CATEGORIES=	textproc java devel
> MASTER_SITES=	http://download.elasticsearch.org/${PORTNAME}/${PORTNAME}/ \
> 		http://mirrors.rit.edu/zi/
>@@ -15,6 +15,7 @@
> RUN_DEPENDS=	java-sigar>=0:${PORTSDIR}/java/sigar
> 
> USES=		cpe
>+NO_ARCH=	yes
> USE_JAVA=	yes
> NO_BUILD=	yes
> JAVA_VERSION=	1.7+
>@@ -32,7 +33,7 @@
> 		asm-commons-4.1.jar \
> 		apache-log4j-extras-1.2.17.jar \
> 		antlr-runtime-3.5.jar \
>-		groovy-all-2.4.0.jar \
>+		groovy-all-2.4.4.jar \
> 		jna-4.1.0.jar \
> 		jts-1.13.jar \
> 		log4j-1.2.17.jar \
>Index: distinfo
>===================================================================
>--- distinfo	(revision 393560)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (elasticsearch-1.6.0.tar.gz) = dc336c83394b2f2f72f362e0f959a4cfdec2109aa3de15668401afeab0b02d2e
>-SIZE (elasticsearch-1.6.0.tar.gz) = 28401477
>+SHA256 (elasticsearch-1.7.0.tar.gz) = 6fabed2db09e1b88587df15269df328ecef33e155b3c675a2a6d2299bda09c95
>+SIZE (elasticsearch-1.7.0.tar.gz) = 28501532
>Index: files/elasticsearch-plugin.in
>===================================================================
>--- files/elasticsearch-plugin.in	(revision 393560)
>+++ files/elasticsearch-plugin.in	(working copy)
>@@ -5,8 +5,9 @@
> 
> name=elasticsearch
> rcvar=elasticsearch_enable
>-load_rc_config $name
> 
>+load_rc_config ${name}
>+
> : ${elasticsearch_config:="%%PREFIX%%/etc/elasticsearch/elasticsearch.yml"}
> 
> ES_LIB="%%PREFIX%%/lib/elasticsearch"
>Index: files/elasticsearch.in
>===================================================================
>--- files/elasticsearch.in	(revision 393560)
>+++ files/elasticsearch.in	(working copy)
>@@ -27,8 +27,9 @@
> 
> name=elasticsearch
> rcvar=elasticsearch_enable
>-load_rc_config $name
> 
>+load_rc_config ${name}
>+
> : ${elasticsearch_enable:="NO"}
> : ${elasticsearch_user:=%%SEARCHUSER%%}
> : ${elasticsearch_group:=%%SEARCHGROUP%%}
>@@ -47,7 +48,6 @@
> ES_LIB="%%PREFIX%%/lib/elasticsearch"
> ES_CLASSPATH=$ES_LIB/elasticsearch-%%PORTVERSION%%.jar:$ES_LIB/*:$ES_LIB/sigar/*
> 
>-
> java_options=" 	-server \
> 		-Xms${elasticsearch_min_mem} \
> 		-Xmx${elasticsearch_max_mem} \
>@@ -71,7 +71,8 @@
> command="/usr/sbin/daemon"
> command_args="-f %%LOCALBASE%%/bin/java -Des.pidfile=${pidfile} ${elasticsearch_props} ${java_options} org.elasticsearch.bootstrap.Elasticsearch"
> 
>-elasticsearch_precmd() {
>+elasticsearch_precmd()
>+{
>         touch ${pidfile}
>         chown ${elasticsearch_user}:${elasticsearch_group} ${pidfile}
> 	/usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 750 ${elasticsearch_tmp}
>@@ -79,12 +80,14 @@
> 	/usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 750 /var/log/elasticsearch
> }
> 
>-elasticsearch_console () {
>+elasticsearch_console()
>+{
> 	%%LOCALBASE%%/bin/java -Des.foreground=yes ${elasticsearch_props} ${java_options} org.elasticsearch.bootstrap.Elasticsearch
> }
> 
> 
>-elasticsearch_stop() {
>+elasticsearch_stop()
>+{
> 	rc_pid=$(elasticsearch_check_pidfile $pidfile)
> 
> 	if [ -z "$rc_pid" ]; then
>@@ -97,7 +100,8 @@
> 	kill ${rc_pid} 2> /dev/null
> }
> 
>-elasticsearch_status() {
>+elasticsearch_status()
>+{
> 	rc_pid=$(elasticsearch_check_pidfile $pidfile)
> 
> 	if [ -z "$rc_pid" ]; then
>@@ -108,7 +112,8 @@
> 	echo "${name} is running as pid ${rc_pid}."
> }
> 
>-elasticsearch_check_pidfile() {
>+elasticsearch_check_pidfile()
>+{
> 	_pidfile=$1
> 	if [ -z "$_pidfile" ]; then
> 		err 3 'USAGE: elasticsearch_check_pidfile pidfile'
>@@ -126,5 +131,5 @@
> 		echo -n $_pid
> 	fi
> }
>-load_rc_config ${name}
>+
> run_rc_command "$1"
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 393560)
>+++ pkg-plist	(working copy)
>@@ -8,7 +8,7 @@
> lib/elasticsearch/asm-4.1.jar
> lib/elasticsearch/asm-commons-4.1.jar
> lib/elasticsearch/elasticsearch-%%PORTVERSION%%.jar
>-lib/elasticsearch/groovy-all-2.4.0.jar
>+lib/elasticsearch/groovy-all-2.4.4.jar
> lib/elasticsearch/jna-4.1.0.jar
> lib/elasticsearch/jts-1.13.jar
> lib/elasticsearch/log4j-1.2.17.jar

Actions: View | Diff

Attachments on bug 201834: 159169 | 159215 | 159560 | 159561