View | Details | Raw Unified | Return to bug 204821
Collapse All | Expand All

(-)./Makefile (-9 / +11 lines)
Lines 2-8 Link Here
2
# $FreeBSD: head/textproc/elasticsearch2/Makefile 401977 2015-11-19 21:50:18Z tj $
2
# $FreeBSD: head/textproc/elasticsearch2/Makefile 401977 2015-11-19 21:50:18Z tj $
3
3
4
PORTNAME=	elasticsearch
4
PORTNAME=	elasticsearch
5
PORTVERSION=	2.0.0
5
PORTVERSION=	2.1.0
6
CATEGORIES=	textproc java devel
6
CATEGORIES=	textproc java devel
7
MASTER_SITES=	http://download.elasticsearch.org/${PORTNAME}/${PORTNAME}/ \
7
MASTER_SITES=	http://download.elasticsearch.org/${PORTNAME}/${PORTNAME}/ \
8
		http://mirrors.rit.edu/zi/
8
		http://mirrors.rit.edu/zi/
Lines 26-32 Link Here
26
26
27
.include <bsd.port.options.mk>
27
.include <bsd.port.options.mk>
28
28
29
LUCENEVER=	5.2.1
29
LUCENEVER=	5.3.1
30
CONFIG_FILES=	elasticsearch.yml logging.yml
30
CONFIG_FILES=	elasticsearch.yml logging.yml
31
JARS=		elasticsearch-${PORTVERSION}.jar \
31
JARS=		elasticsearch-${PORTVERSION}.jar \
32
		HdrHistogram-2.1.6.jar \
32
		HdrHistogram-2.1.6.jar \
Lines 40-49 Link Here
40
		groovy-all-2.4.4-indy.jar \
40
		groovy-all-2.4.4-indy.jar \
41
		guava-18.0.jar \
41
		guava-18.0.jar \
42
		hppc-0.7.1.jar \
42
		hppc-0.7.1.jar \
43
		jackson-core-2.5.3.jar \
43
		jackson-core-2.6.2.jar \
44
		jackson-dataformat-cbor-2.5.3.jar \
44
		jackson-dataformat-cbor-2.6.2.jar \
45
		jackson-dataformat-smile-2.5.3.jar \
45
		jackson-dataformat-smile-2.6.2.jar \
46
		jackson-dataformat-yaml-2.5.3.jar \
46
		jackson-dataformat-yaml-2.6.2.jar \
47
		jna-4.1.0.jar \
47
		jna-4.1.0.jar \
48
		joda-convert-1.2.jar \
48
		joda-convert-1.2.jar \
49
		joda-time-2.8.2.jar \
49
		joda-time-2.8.2.jar \
Lines 63-72 Link Here
63
		lucene-queryparser-${LUCENEVER}.jar \
63
		lucene-queryparser-${LUCENEVER}.jar \
64
		lucene-sandbox-${LUCENEVER}.jar \
64
		lucene-sandbox-${LUCENEVER}.jar \
65
		lucene-spatial-${LUCENEVER}.jar \
65
		lucene-spatial-${LUCENEVER}.jar \
66
		lucene-spatial3d-${LUCENEVER}.jar \
66
		lucene-suggest-${LUCENEVER}.jar \
67
		lucene-suggest-${LUCENEVER}.jar \
67
		netty-3.10.5.Final.jar \
68
		netty-3.10.5.Final.jar \
68
		snakeyaml-1.12.jar \
69
		snakeyaml-1.15.jar \
69
		spatial4j-0.4.1.jar \
70
		spatial4j-0.5.jar \
70
		t-digest-3.0.jar
71
		t-digest-3.0.jar
71
BINS=		elasticsearch.in.sh \
72
BINS=		elasticsearch.in.sh \
72
		elasticsearch \
73
		elasticsearch \
Lines 116-127 Link Here
116
	${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins
117
	${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins
117
	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/elasticsearch
118
	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/elasticsearch
118
119
120
	cd ${STAGEDIR}${PREFIX}/bin && ${LN} -s ${PREFIX}/lib/elasticsearch/bin/plugin elasticsearch-plugin
121
119
do-install-DOCS-on:
122
do-install-DOCS-on:
120
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
123
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
121
.for f in ${DOCS}
124
.for f in ${DOCS}
122
	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
125
	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
123
.endfor
126
.endfor
124
127
125
	cd ${STAGEDIR}${PREFIX}/bin && ${LN} -s ${PREFIX}/lib/elasticsearch/bin/plugin elasticsearch-plugin
126
128
127
.include <bsd.port.mk>
129
.include <bsd.port.mk>
(-)./distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (elasticsearch-2.0.0.tar.gz) = b25f13f615337c2072964fd9fc5c7250f8a2a983b22198daf93548285d5d16df
1
SHA256 (elasticsearch-2.1.0.tar.gz) = 8a4e85bcb506daa369651506af1cbc55c09fd7ff387d111142ae14d0a85d4d14
2
SIZE (elasticsearch-2.0.0.tar.gz) = 28576708
2
SIZE (elasticsearch-2.1.0.tar.gz) = 28994631
(-)./files/patch-bin-elasticsearch.in.sh (-3 / +4 lines)
Lines 1-6 Link Here
1
--- bin/elasticsearch.in.sh.orig	2015-11-19 16:02:28.386051810 -0500
1
--- bin/elasticsearch.in.sh.old 2015-11-19 22:50:18.000000000 +0100
2
+++ bin/elasticsearch.in.sh	2015-11-19 16:02:56.618049877 -0500
2
+++ bin/elasticsearch.in.sh 2015-11-25 22:42:10.191882093 +0100
3
@@ -1,5 +1,19 @@
3
@@ -1,5 +1,20 @@
4
 #!/bin/sh
4
 #!/bin/sh
5
 
5
 
6
+if [ `uname -o` == "FreeBSD" ]; then
6
+if [ `uname -o` == "FreeBSD" ]; then
Lines 15-20 Link Here
15
+	ES_GC_LOG_FILE=${elasticsearch_gc_logfile}
15
+	ES_GC_LOG_FILE=${elasticsearch_gc_logfile}
16
+	JAVA_OPTS="$JAVA_OPTS -Des.path.conf=${elasticsearch_config:="%%PREFIX%%/etc/elasticsearch"}"
16
+	JAVA_OPTS="$JAVA_OPTS -Des.path.conf=${elasticsearch_config:="%%PREFIX%%/etc/elasticsearch"}"
17
+	JAVA_OPTS="$JAVA_OPTS -Des.path.scripts=${elasticsearch_scripts:="%%PREFIX%%/libexec/elasticsearch"}"
17
+	JAVA_OPTS="$JAVA_OPTS -Des.path.scripts=${elasticsearch_scripts:="%%PREFIX%%/libexec/elasticsearch"}"
18
+	PATH=$PATH:/usr/local/bin
18
+fi
19
+fi
19
+
20
+
20
 # check in case a user was using this mechanism
21
 # check in case a user was using this mechanism
(-)./pkg-plist (-6 / +7 lines)
Lines 15-24 Link Here
15
lib/elasticsearch/lib/groovy-all-2.4.4-indy.jar
15
lib/elasticsearch/lib/groovy-all-2.4.4-indy.jar
16
lib/elasticsearch/lib/guava-18.0.jar
16
lib/elasticsearch/lib/guava-18.0.jar
17
lib/elasticsearch/lib/hppc-0.7.1.jar
17
lib/elasticsearch/lib/hppc-0.7.1.jar
18
lib/elasticsearch/lib/jackson-core-2.5.3.jar
18
lib/elasticsearch/lib/jackson-core-2.6.2.jar
19
lib/elasticsearch/lib/jackson-dataformat-cbor-2.5.3.jar
19
lib/elasticsearch/lib/jackson-dataformat-cbor-2.6.2.jar
20
lib/elasticsearch/lib/jackson-dataformat-smile-2.5.3.jar
20
lib/elasticsearch/lib/jackson-dataformat-smile-2.6.2.jar
21
lib/elasticsearch/lib/jackson-dataformat-yaml-2.5.3.jar
21
lib/elasticsearch/lib/jackson-dataformat-yaml-2.6.2.jar
22
lib/elasticsearch/lib/jna-4.1.0.jar
22
lib/elasticsearch/lib/jna-4.1.0.jar
23
lib/elasticsearch/lib/joda-convert-1.2.jar
23
lib/elasticsearch/lib/joda-convert-1.2.jar
24
lib/elasticsearch/lib/joda-time-2.8.2.jar
24
lib/elasticsearch/lib/joda-time-2.8.2.jar
Lines 38-47 Link Here
38
lib/elasticsearch/lib/lucene-queryparser-%%LUCENEVER%%.jar
38
lib/elasticsearch/lib/lucene-queryparser-%%LUCENEVER%%.jar
39
lib/elasticsearch/lib/lucene-sandbox-%%LUCENEVER%%.jar
39
lib/elasticsearch/lib/lucene-sandbox-%%LUCENEVER%%.jar
40
lib/elasticsearch/lib/lucene-spatial-%%LUCENEVER%%.jar
40
lib/elasticsearch/lib/lucene-spatial-%%LUCENEVER%%.jar
41
lib/elasticsearch/lib/lucene-spatial3d-%%LUCENEVER%%.jar
41
lib/elasticsearch/lib/lucene-suggest-%%LUCENEVER%%.jar
42
lib/elasticsearch/lib/lucene-suggest-%%LUCENEVER%%.jar
42
lib/elasticsearch/lib/netty-3.10.5.Final.jar
43
lib/elasticsearch/lib/netty-3.10.5.Final.jar
43
lib/elasticsearch/lib/snakeyaml-1.12.jar
44
lib/elasticsearch/lib/snakeyaml-1.15.jar
44
lib/elasticsearch/lib/spatial4j-0.4.1.jar
45
lib/elasticsearch/lib/spatial4j-0.5.jar
45
lib/elasticsearch/lib/t-digest-3.0.jar
46
lib/elasticsearch/lib/t-digest-3.0.jar
46
lib/elasticsearch/bin/elasticsearch.in.sh
47
lib/elasticsearch/bin/elasticsearch.in.sh
47
lib/elasticsearch/bin/elasticsearch
48
lib/elasticsearch/bin/elasticsearch

Return to bug 204821