Attachment 163539 Details for Bug 204821 – update_to_2.1.path

[patch] update_to_2.1.path

elasticsearch2.1.patch (text/plain), 4.99 KB, created by loic.blot on 2015-11-25 21:57:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: loic.blot

Created: 2015-11-25 21:57:36 UTC

Size: 4.99 KB

patch

obsolete

>--- /usr/ports/textproc/elasticsearch2/Makefile	2015-11-19 22:50:18.000000000 +0100
>+++ ./Makefile	2015-11-25 22:54:39.060830507 +0100
>@@ -2,7 +2,7 @@
> # $FreeBSD: head/textproc/elasticsearch2/Makefile 401977 2015-11-19 21:50:18Z tj $
> 
> PORTNAME=	elasticsearch
>-PORTVERSION=	2.0.0
>+PORTVERSION=	2.1.0
> CATEGORIES=	textproc java devel
> MASTER_SITES=	http://download.elasticsearch.org/${PORTNAME}/${PORTNAME}/ \
> 		http://mirrors.rit.edu/zi/
>@@ -26,7 +26,7 @@
> 
> .include <bsd.port.options.mk>
> 
>-LUCENEVER=	5.2.1
>+LUCENEVER=	5.3.1
> CONFIG_FILES=	elasticsearch.yml logging.yml
> JARS=		elasticsearch-${PORTVERSION}.jar \
> 		HdrHistogram-2.1.6.jar \
>@@ -40,10 +40,10 @@
> 		groovy-all-2.4.4-indy.jar \
> 		guava-18.0.jar \
> 		hppc-0.7.1.jar \
>-		jackson-core-2.5.3.jar \
>-		jackson-dataformat-cbor-2.5.3.jar \
>-		jackson-dataformat-smile-2.5.3.jar \
>-		jackson-dataformat-yaml-2.5.3.jar \
>+		jackson-core-2.6.2.jar \
>+		jackson-dataformat-cbor-2.6.2.jar \
>+		jackson-dataformat-smile-2.6.2.jar \
>+		jackson-dataformat-yaml-2.6.2.jar \
> 		jna-4.1.0.jar \
> 		joda-convert-1.2.jar \
> 		joda-time-2.8.2.jar \
>@@ -63,10 +63,11 @@
> 		lucene-queryparser-${LUCENEVER}.jar \
> 		lucene-sandbox-${LUCENEVER}.jar \
> 		lucene-spatial-${LUCENEVER}.jar \
>+		lucene-spatial3d-${LUCENEVER}.jar \
> 		lucene-suggest-${LUCENEVER}.jar \
> 		netty-3.10.5.Final.jar \
>-		snakeyaml-1.12.jar \
>-		spatial4j-0.4.1.jar \
>+		snakeyaml-1.15.jar \
>+		spatial4j-0.5.jar \
> 		t-digest-3.0.jar
> BINS=		elasticsearch.in.sh \
> 		elasticsearch \
>@@ -116,12 +117,13 @@
> 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins
> 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/elasticsearch
> 
>+	cd ${STAGEDIR}${PREFIX}/bin && ${LN} -s ${PREFIX}/lib/elasticsearch/bin/plugin elasticsearch-plugin
>+
> do-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> .for f in ${DOCS}
> 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
> .endfor
> 
>-	cd ${STAGEDIR}${PREFIX}/bin && ${LN} -s ${PREFIX}/lib/elasticsearch/bin/plugin elasticsearch-plugin
> 
> .include <bsd.port.mk>
>diff -ru /usr/ports/textproc/elasticsearch2/distinfo ./distinfo
>--- /usr/ports/textproc/elasticsearch2/distinfo	2015-11-19 22:50:18.000000000 +0100
>+++ ./distinfo	2015-11-25 20:24:15.253452386 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (elasticsearch-2.0.0.tar.gz) = b25f13f615337c2072964fd9fc5c7250f8a2a983b22198daf93548285d5d16df
>-SIZE (elasticsearch-2.0.0.tar.gz) = 28576708
>+SHA256 (elasticsearch-2.1.0.tar.gz) = 8a4e85bcb506daa369651506af1cbc55c09fd7ff387d111142ae14d0a85d4d14
>+SIZE (elasticsearch-2.1.0.tar.gz) = 28994631
>diff -ru /usr/ports/textproc/elasticsearch2/files/patch-bin-elasticsearch.in.sh ./files/patch-bin-elasticsearch.in.sh
>--- /usr/ports/textproc/elasticsearch2/files/patch-bin-elasticsearch.in.sh	2015-11-19 22:50:18.000000000 +0100
>+++ ./files/patch-bin-elasticsearch.in.sh	2015-11-25 22:54:27.151116047 +0100
>@@ -1,6 +1,6 @@
>---- bin/elasticsearch.in.sh.orig	2015-11-19 16:02:28.386051810 -0500
>-+++ bin/elasticsearch.in.sh	2015-11-19 16:02:56.618049877 -0500
>-@@ -1,5 +1,19 @@
>+--- bin/elasticsearch.in.sh.old 2015-11-19 22:50:18.000000000 +0100
>++++ bin/elasticsearch.in.sh 2015-11-25 22:42:10.191882093 +0100
>+@@ -1,5 +1,20 @@
>  #!/bin/sh
>  
> +if [ `uname -o` == "FreeBSD" ]; then
>@@ -15,6 +15,7 @@
> +	ES_GC_LOG_FILE=${elasticsearch_gc_logfile}
> +	JAVA_OPTS="$JAVA_OPTS -Des.path.conf=${elasticsearch_config:="%%PREFIX%%/etc/elasticsearch"}"
> +	JAVA_OPTS="$JAVA_OPTS -Des.path.scripts=${elasticsearch_scripts:="%%PREFIX%%/libexec/elasticsearch"}"
>++	PATH=$PATH:/usr/local/bin
> +fi
> +
>  # check in case a user was using this mechanism
>diff -ru /usr/ports/textproc/elasticsearch2/pkg-plist ./pkg-plist
>--- /usr/ports/textproc/elasticsearch2/pkg-plist	2015-11-19 22:50:18.000000000 +0100
>+++ ./pkg-plist	2015-11-25 20:44:15.694369693 +0100
>@@ -15,10 +15,10 @@
> lib/elasticsearch/lib/groovy-all-2.4.4-indy.jar
> lib/elasticsearch/lib/guava-18.0.jar
> lib/elasticsearch/lib/hppc-0.7.1.jar
>-lib/elasticsearch/lib/jackson-core-2.5.3.jar
>-lib/elasticsearch/lib/jackson-dataformat-cbor-2.5.3.jar
>-lib/elasticsearch/lib/jackson-dataformat-smile-2.5.3.jar
>-lib/elasticsearch/lib/jackson-dataformat-yaml-2.5.3.jar
>+lib/elasticsearch/lib/jackson-core-2.6.2.jar
>+lib/elasticsearch/lib/jackson-dataformat-cbor-2.6.2.jar
>+lib/elasticsearch/lib/jackson-dataformat-smile-2.6.2.jar
>+lib/elasticsearch/lib/jackson-dataformat-yaml-2.6.2.jar
> lib/elasticsearch/lib/jna-4.1.0.jar
> lib/elasticsearch/lib/joda-convert-1.2.jar
> lib/elasticsearch/lib/joda-time-2.8.2.jar
>@@ -38,10 +38,11 @@
> lib/elasticsearch/lib/lucene-queryparser-%%LUCENEVER%%.jar
> lib/elasticsearch/lib/lucene-sandbox-%%LUCENEVER%%.jar
> lib/elasticsearch/lib/lucene-spatial-%%LUCENEVER%%.jar
>+lib/elasticsearch/lib/lucene-spatial3d-%%LUCENEVER%%.jar
> lib/elasticsearch/lib/lucene-suggest-%%LUCENEVER%%.jar
> lib/elasticsearch/lib/netty-3.10.5.Final.jar
>-lib/elasticsearch/lib/snakeyaml-1.12.jar
>-lib/elasticsearch/lib/spatial4j-0.4.1.jar
>+lib/elasticsearch/lib/snakeyaml-1.15.jar
>+lib/elasticsearch/lib/spatial4j-0.5.jar
> lib/elasticsearch/lib/t-digest-3.0.jar
> lib/elasticsearch/bin/elasticsearch.in.sh
> lib/elasticsearch/bin/elasticsearch
>

Actions: View | Diff

Attachments on bug 204821: 163539