View | Details | Raw Unified | Return to bug 204902 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-60 / +18 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
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-73 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
30
CONFIG_FILES=	elasticsearch.yml logging.yml
31
CONFIG_FILES=	elasticsearch.yml logging.yml
31
JARS=		elasticsearch-${PORTVERSION}.jar \
32
32
		HdrHistogram-2.1.6.jar \
33
		antlr-runtime-3.5.jar \
34
		apache-log4j-extras-1.2.17.jar \
35
		asm-4.1.jar \
36
		asm-commons-4.1.jar \
37
		commons-cli-1.3.1.jar \
38
		compiler-0.8.13.jar \
39
		compress-lzf-1.0.2.jar \
40
		groovy-all-2.4.4-indy.jar \
41
		guava-18.0.jar \
42
		hppc-0.7.1.jar \
43
		jackson-core-2.5.3.jar \
44
		jackson-dataformat-cbor-2.5.3.jar \
45
		jackson-dataformat-smile-2.5.3.jar \
46
		jackson-dataformat-yaml-2.5.3.jar \
47
		jna-4.1.0.jar \
48
		joda-convert-1.2.jar \
49
		joda-time-2.8.2.jar \
50
		jsr166e-1.1.0.jar \
51
		jts-1.13.jar \
52
		log4j-1.2.17.jar \
53
		lucene-analyzers-common-${LUCENEVER}.jar \
54
		lucene-backward-codecs-${LUCENEVER}.jar \
55
		lucene-core-${LUCENEVER}.jar \
56
		lucene-expressions-${LUCENEVER}.jar \
57
		lucene-grouping-${LUCENEVER}.jar \
58
		lucene-highlighter-${LUCENEVER}.jar \
59
		lucene-join-${LUCENEVER}.jar \
60
		lucene-memory-${LUCENEVER}.jar \
61
		lucene-misc-${LUCENEVER}.jar \
62
		lucene-queries-${LUCENEVER}.jar \
63
		lucene-queryparser-${LUCENEVER}.jar \
64
		lucene-sandbox-${LUCENEVER}.jar \
65
		lucene-spatial-${LUCENEVER}.jar \
66
		lucene-suggest-${LUCENEVER}.jar \
67
		netty-3.10.5.Final.jar \
68
		snakeyaml-1.12.jar \
69
		spatial4j-0.4.1.jar \
70
		t-digest-3.0.jar
71
BINS=		elasticsearch.in.sh \
33
BINS=		elasticsearch.in.sh \
72
		elasticsearch \
34
		elasticsearch \
73
		plugin
35
		plugin
Lines 96-127 Link Here
96
		ELASTIC_LOGDIR=${ELASTIC_LOGDIR}
58
		ELASTIC_LOGDIR=${ELASTIC_LOGDIR}
97
59
98
post-patch:
60
post-patch:
99
	${SED} -i .bak -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/config/elasticsearch.yml
61
	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/config/elasticsearch.yml
100
	${SED} -i .bak -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/bin/elasticsearch.in.sh
62
	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/bin/elasticsearch.in.sh
101
63
102
do-install:
64
do-install:
103
	${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch
65
	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/elasticsearch
104
.for f in ${CONFIG_FILES}
66
.for f in ${CONFIG_FILES}
105
	${INSTALL} -m 440 ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
67
	${INSTALL} -m 440 ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
106
.endfor
68
.endfor
107
	${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/bin
108
.for f in ${BINS}
109
	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${STAGEDIR}${PREFIX}/lib/elasticsearch/bin
110
.endfor
111
	${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib
112
.for f in ${JARS}
113
	${INSTALL_DATA} ${WRKSRC}/lib/${f} ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib
114
.endfor
115
69
116
	${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins
70
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/bin
117
	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/elasticsearch
71
	${INSTALL_SCRIPT} ${BINS:S|^|${WRKSRC}/bin/|} ${STAGEDIR}${PREFIX}/lib/elasticsearch/bin
118
72
73
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib
74
	(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib/ "-name *\.jar")
75
76
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins
77
	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/elasticsearch
78
	@${MKDIR} ${STAGEDIR}${ELASTIC_DBDIR} ${STAGEDIR}${ELASTIC_LOGDIR}
79
	${LN} -s ${PREFIX}/lib/elasticsearch/bin/plugin ${STAGEDIR}${PREFIX}/bin/elasticsearch-plugin
80
119
do-install-DOCS-on:
81
do-install-DOCS-on:
120
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
82
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
121
.for f in ${DOCS}
83
	${INSTALL_DATA} ${DOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
122
	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
123
.endfor
124
84
125
	cd ${STAGEDIR}${PREFIX}/bin && ${LN} -s ${PREFIX}/lib/elasticsearch/bin/plugin elasticsearch-plugin
126
127
.include <bsd.port.mk>
85
.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 (-2 / +2 lines)
Lines 1-5 Link Here
1
--- bin/elasticsearch.in.sh.orig	2015-11-19 16:02:28.386051810 -0500
1
--- bin/elasticsearch.in.sh.orig	2015-10-21 08:41:12 UTC
2
+++ bin/elasticsearch.in.sh	2015-11-19 16:02:56.618049877 -0500
2
+++ bin/elasticsearch.in.sh
3
@@ -1,5 +1,19 @@
3
@@ -1,5 +1,19 @@
4
 #!/bin/sh
4
 #!/bin/sh
5
 
5
 
(-)files/patch-config-elasticsearch.yml (-2 / +2 lines)
Lines 1-5 Link Here
1
--- config/elasticsearch.yml.orig	2015-10-21 04:41:12.000000000 -0400
1
--- config/elasticsearch.yml.orig	2015-11-18 12:27:49 UTC
2
+++ config/elasticsearch.yml	2015-11-19 12:34:39.766910803 -0500
2
+++ config/elasticsearch.yml
3
@@ -31,10 +31,12 @@
3
@@ -31,10 +31,12 @@
4
 # Path to directory where to store the data (separate multiple locations by comma):
4
 # Path to directory where to store the data (separate multiple locations by comma):
5
 #
5
 #
(-)pkg-plist (-15 / +15 lines)
Lines 1-8 Link Here
1
bin/elasticsearch-plugin
1
@sample(%%SEARCHUSER%%,%%SEARCHGROUP%%,440) %%ETCDIR%%/elasticsearch.yml.sample
2
@sample(%%SEARCHUSER%%,%%SEARCHGROUP%%,440) %%ETCDIR%%/elasticsearch.yml.sample
2
@sample(%%SEARCHUSER%%,%%SEARCHGROUP%%,440) %%ETCDIR%%/logging.yml.sample
3
@sample(%%SEARCHUSER%%,%%SEARCHGROUP%%,440) %%ETCDIR%%/logging.yml.sample
3
@unexec if [ -d %%ELASTIC_LOGDIR%% ]; then echo "You should remove %%ELASTIC_LOGDIR%% if you don't need it any more."; fi
4
lib/elasticsearch/bin/elasticsearch
4
@unexec if [ -d %%ELASTIC_DBDIR%% ]; then echo "You should remove %%ELASTIC_DBDIR%% if you don't need it any more."; fi
5
lib/elasticsearch/bin/elasticsearch.in.sh
5
bin/elasticsearch-plugin
6
lib/elasticsearch/bin/plugin
6
lib/elasticsearch/lib/HdrHistogram-2.1.6.jar
7
lib/elasticsearch/lib/HdrHistogram-2.1.6.jar
7
lib/elasticsearch/lib/antlr-runtime-3.5.jar
8
lib/elasticsearch/lib/antlr-runtime-3.5.jar
8
lib/elasticsearch/lib/apache-log4j-extras-1.2.17.jar
9
lib/elasticsearch/lib/apache-log4j-extras-1.2.17.jar
Lines 15-24 Link Here
15
lib/elasticsearch/lib/groovy-all-2.4.4-indy.jar
16
lib/elasticsearch/lib/groovy-all-2.4.4-indy.jar
16
lib/elasticsearch/lib/guava-18.0.jar
17
lib/elasticsearch/lib/guava-18.0.jar
17
lib/elasticsearch/lib/hppc-0.7.1.jar
18
lib/elasticsearch/lib/hppc-0.7.1.jar
18
lib/elasticsearch/lib/jackson-core-2.5.3.jar
19
lib/elasticsearch/lib/jackson-core-2.6.2.jar
19
lib/elasticsearch/lib/jackson-dataformat-cbor-2.5.3.jar
20
lib/elasticsearch/lib/jackson-dataformat-cbor-2.6.2.jar
20
lib/elasticsearch/lib/jackson-dataformat-smile-2.5.3.jar
21
lib/elasticsearch/lib/jackson-dataformat-smile-2.6.2.jar
21
lib/elasticsearch/lib/jackson-dataformat-yaml-2.5.3.jar
22
lib/elasticsearch/lib/jackson-dataformat-yaml-2.6.2.jar
22
lib/elasticsearch/lib/jna-4.1.0.jar
23
lib/elasticsearch/lib/jna-4.1.0.jar
23
lib/elasticsearch/lib/joda-convert-1.2.jar
24
lib/elasticsearch/lib/joda-convert-1.2.jar
24
lib/elasticsearch/lib/joda-time-2.8.2.jar
25
lib/elasticsearch/lib/joda-time-2.8.2.jar
Lines 38-56 Link Here
38
lib/elasticsearch/lib/lucene-queryparser-%%LUCENEVER%%.jar
39
lib/elasticsearch/lib/lucene-queryparser-%%LUCENEVER%%.jar
39
lib/elasticsearch/lib/lucene-sandbox-%%LUCENEVER%%.jar
40
lib/elasticsearch/lib/lucene-sandbox-%%LUCENEVER%%.jar
40
lib/elasticsearch/lib/lucene-spatial-%%LUCENEVER%%.jar
41
lib/elasticsearch/lib/lucene-spatial-%%LUCENEVER%%.jar
42
lib/elasticsearch/lib/lucene-spatial3d-%%LUCENEVER%%.jar
41
lib/elasticsearch/lib/lucene-suggest-%%LUCENEVER%%.jar
43
lib/elasticsearch/lib/lucene-suggest-%%LUCENEVER%%.jar
42
lib/elasticsearch/lib/netty-3.10.5.Final.jar
44
lib/elasticsearch/lib/netty-3.10.5.Final.jar
43
lib/elasticsearch/lib/snakeyaml-1.12.jar
45
lib/elasticsearch/lib/snakeyaml-1.15.jar
44
lib/elasticsearch/lib/spatial4j-0.4.1.jar
46
lib/elasticsearch/lib/spatial4j-0.5.jar
45
lib/elasticsearch/lib/t-digest-3.0.jar
47
lib/elasticsearch/lib/t-digest-3.0.jar
46
lib/elasticsearch/bin/elasticsearch.in.sh
47
lib/elasticsearch/bin/elasticsearch
48
lib/elasticsearch/bin/plugin
49
%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
48
%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
50
%%PORTDOCS%%%%DOCSDIR%%/NOTICE.txt
49
%%PORTDOCS%%%%DOCSDIR%%/NOTICE.txt
51
%%PORTDOCS%%%%DOCSDIR%%/README.textile
50
%%PORTDOCS%%%%DOCSDIR%%/README.textile
52
@dir lib/elasticsearch/lib
53
@dir lib/elasticsearch/bin
54
@dir lib/elasticsearch/plugins
51
@dir lib/elasticsearch/plugins
55
@dir lib/elasticsearch
56
@dir libexec/elasticsearch
52
@dir libexec/elasticsearch
53
@dir(%%SEARCHUSER%%,%%SEARCHGROUP%%,750) %%ELASTIC_LOGDIR%%
54
@dir(%%SEARCHUSER%%,%%SEARCHGROUP%%,750) %%ELASTIC_DBDIR%%
55
@postunexec if [ -d %%ELASTIC_LOGDIR%% ]; then echo "You should remove %%ELASTIC_LOGDIR%% if you don't need it any more."; fi
56
@postunexec if [ -d %%ELASTIC_DBDIR%% ]; then echo "You should remove %%ELASTIC_DBDIR%% if you don't need it any more."; fi

Return to bug 204902