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

Collapse All | Expand All

(-)Makefile (-2 / +3 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	elasticsearch
4
PORTNAME=	elasticsearch
5
PORTVERSION=	1.6.0
5
PORTVERSION=	1.7.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 15-20 Link Here
15
RUN_DEPENDS=	java-sigar>=0:${PORTSDIR}/java/sigar
15
RUN_DEPENDS=	java-sigar>=0:${PORTSDIR}/java/sigar
16
16
17
USES=		cpe
17
USES=		cpe
18
NO_ARCH=	yes
18
USE_JAVA=	yes
19
USE_JAVA=	yes
19
NO_BUILD=	yes
20
NO_BUILD=	yes
20
JAVA_VERSION=	1.7+
21
JAVA_VERSION=	1.7+
Lines 32-38 Link Here
32
		asm-commons-4.1.jar \
33
		asm-commons-4.1.jar \
33
		apache-log4j-extras-1.2.17.jar \
34
		apache-log4j-extras-1.2.17.jar \
34
		antlr-runtime-3.5.jar \
35
		antlr-runtime-3.5.jar \
35
		groovy-all-2.4.0.jar \
36
		groovy-all-2.4.4.jar \
36
		jna-4.1.0.jar \
37
		jna-4.1.0.jar \
37
		jts-1.13.jar \
38
		jts-1.13.jar \
38
		log4j-1.2.17.jar \
39
		log4j-1.2.17.jar \
(-)distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (elasticsearch-1.6.0.tar.gz) = dc336c83394b2f2f72f362e0f959a4cfdec2109aa3de15668401afeab0b02d2e
1
SHA256 (elasticsearch-1.7.0.tar.gz) = 6fabed2db09e1b88587df15269df328ecef33e155b3c675a2a6d2299bda09c95
2
SIZE (elasticsearch-1.6.0.tar.gz) = 28401477
2
SIZE (elasticsearch-1.7.0.tar.gz) = 28501532
(-)files/elasticsearch-plugin.in (-1 / +2 lines)
Lines 5-12 Link Here
5
5
6
name=elasticsearch
6
name=elasticsearch
7
rcvar=elasticsearch_enable
7
rcvar=elasticsearch_enable
8
load_rc_config $name
9
8
9
load_rc_config ${name}
10
10
: ${elasticsearch_config:="%%PREFIX%%/etc/elasticsearch/elasticsearch.yml"}
11
: ${elasticsearch_config:="%%PREFIX%%/etc/elasticsearch/elasticsearch.yml"}
11
12
12
ES_LIB="%%PREFIX%%/lib/elasticsearch"
13
ES_LIB="%%PREFIX%%/lib/elasticsearch"
(-)files/elasticsearch.in (-8 / +13 lines)
Lines 27-34 Link Here
27
27
28
name=elasticsearch
28
name=elasticsearch
29
rcvar=elasticsearch_enable
29
rcvar=elasticsearch_enable
30
load_rc_config $name
31
30
31
load_rc_config ${name}
32
32
: ${elasticsearch_enable:="NO"}
33
: ${elasticsearch_enable:="NO"}
33
: ${elasticsearch_user:=%%SEARCHUSER%%}
34
: ${elasticsearch_user:=%%SEARCHUSER%%}
34
: ${elasticsearch_group:=%%SEARCHGROUP%%}
35
: ${elasticsearch_group:=%%SEARCHGROUP%%}
Lines 47-53 Link Here
47
ES_LIB="%%PREFIX%%/lib/elasticsearch"
48
ES_LIB="%%PREFIX%%/lib/elasticsearch"
48
ES_CLASSPATH=$ES_LIB/elasticsearch-%%PORTVERSION%%.jar:$ES_LIB/*:$ES_LIB/sigar/*
49
ES_CLASSPATH=$ES_LIB/elasticsearch-%%PORTVERSION%%.jar:$ES_LIB/*:$ES_LIB/sigar/*
49
50
50
51
java_options=" 	-server \
51
java_options=" 	-server \
52
		-Xms${elasticsearch_min_mem} \
52
		-Xms${elasticsearch_min_mem} \
53
		-Xmx${elasticsearch_max_mem} \
53
		-Xmx${elasticsearch_max_mem} \
Lines 71-77 Link Here
71
command="/usr/sbin/daemon"
71
command="/usr/sbin/daemon"
72
command_args="-f %%LOCALBASE%%/bin/java -Des.pidfile=${pidfile} ${elasticsearch_props} ${java_options} org.elasticsearch.bootstrap.Elasticsearch"
72
command_args="-f %%LOCALBASE%%/bin/java -Des.pidfile=${pidfile} ${elasticsearch_props} ${java_options} org.elasticsearch.bootstrap.Elasticsearch"
73
73
74
elasticsearch_precmd() {
74
elasticsearch_precmd()
75
{
75
        touch ${pidfile}
76
        touch ${pidfile}
76
        chown ${elasticsearch_user}:${elasticsearch_group} ${pidfile}
77
        chown ${elasticsearch_user}:${elasticsearch_group} ${pidfile}
77
	/usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 750 ${elasticsearch_tmp}
78
	/usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 750 ${elasticsearch_tmp}
Lines 79-90 Link Here
79
	/usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 750 /var/log/elasticsearch
80
	/usr/bin/install -d -o ${elasticsearch_user} -g ${elasticsearch_group} -m 750 /var/log/elasticsearch
80
}
81
}
81
82
82
elasticsearch_console () {
83
elasticsearch_console()
84
{
83
	%%LOCALBASE%%/bin/java -Des.foreground=yes ${elasticsearch_props} ${java_options} org.elasticsearch.bootstrap.Elasticsearch
85
	%%LOCALBASE%%/bin/java -Des.foreground=yes ${elasticsearch_props} ${java_options} org.elasticsearch.bootstrap.Elasticsearch
84
}
86
}
85
87
86
88
87
elasticsearch_stop() {
89
elasticsearch_stop()
90
{
88
	rc_pid=$(elasticsearch_check_pidfile $pidfile)
91
	rc_pid=$(elasticsearch_check_pidfile $pidfile)
89
92
90
	if [ -z "$rc_pid" ]; then
93
	if [ -z "$rc_pid" ]; then
Lines 97-103 Link Here
97
	kill ${rc_pid} 2> /dev/null
100
	kill ${rc_pid} 2> /dev/null
98
}
101
}
99
102
100
elasticsearch_status() {
103
elasticsearch_status()
104
{
101
	rc_pid=$(elasticsearch_check_pidfile $pidfile)
105
	rc_pid=$(elasticsearch_check_pidfile $pidfile)
102
106
103
	if [ -z "$rc_pid" ]; then
107
	if [ -z "$rc_pid" ]; then
Lines 108-114 Link Here
108
	echo "${name} is running as pid ${rc_pid}."
112
	echo "${name} is running as pid ${rc_pid}."
109
}
113
}
110
114
111
elasticsearch_check_pidfile() {
115
elasticsearch_check_pidfile()
116
{
112
	_pidfile=$1
117
	_pidfile=$1
113
	if [ -z "$_pidfile" ]; then
118
	if [ -z "$_pidfile" ]; then
114
		err 3 'USAGE: elasticsearch_check_pidfile pidfile'
119
		err 3 'USAGE: elasticsearch_check_pidfile pidfile'
Lines 126-130 Link Here
126
		echo -n $_pid
131
		echo -n $_pid
127
	fi
132
	fi
128
}
133
}
129
load_rc_config ${name}
134
130
run_rc_command "$1"
135
run_rc_command "$1"
(-)pkg-plist (-1 / +1 lines)
Lines 8-14 Link Here
8
lib/elasticsearch/asm-4.1.jar
8
lib/elasticsearch/asm-4.1.jar
9
lib/elasticsearch/asm-commons-4.1.jar
9
lib/elasticsearch/asm-commons-4.1.jar
10
lib/elasticsearch/elasticsearch-%%PORTVERSION%%.jar
10
lib/elasticsearch/elasticsearch-%%PORTVERSION%%.jar
11
lib/elasticsearch/groovy-all-2.4.0.jar
11
lib/elasticsearch/groovy-all-2.4.4.jar
12
lib/elasticsearch/jna-4.1.0.jar
12
lib/elasticsearch/jna-4.1.0.jar
13
lib/elasticsearch/jts-1.13.jar
13
lib/elasticsearch/jts-1.13.jar
14
lib/elasticsearch/log4j-1.2.17.jar
14
lib/elasticsearch/log4j-1.2.17.jar

Return to bug 201834