svn commit: r523980 - in head/textproc: . elasticsearch7 elasticsearch7/files
Greg Lewis
glewis at FreeBSD.org
Fri Jan 24 19:16:32 UTC 2020
Author: glewis
Date: Fri Jan 24 19:16:31 2020
New Revision: 523980
URL: https://svnweb.freebsd.org/changeset/ports/523980
Log:
Add a port of ElasticSearch 7.x
This is an updated version of the submission to work with 7.5.2 and to
tweak a few things (e.g. sorting, petting portlint)
PR: 237372
Submitted by: Miroslav Lachman
Added:
head/textproc/elasticsearch7/
- copied from r523977, head/textproc/elasticsearch6/
Modified:
head/textproc/Makefile
head/textproc/elasticsearch7/Makefile
head/textproc/elasticsearch7/distinfo
head/textproc/elasticsearch7/files/patch-config_jvm.options
Modified: head/textproc/Makefile
==============================================================================
--- head/textproc/Makefile Fri Jan 24 19:06:24 2020 (r523979)
+++ head/textproc/Makefile Fri Jan 24 19:16:31 2020 (r523980)
@@ -164,6 +164,7 @@
SUBDIR += elasticsearch5
SUBDIR += elasticsearch5-search-guard
SUBDIR += elasticsearch6
+ SUBDIR += elasticsearch7
SUBDIR += elixir-earmark
SUBDIR += elixir-funnel
SUBDIR += elixir-sweet_xml
Modified: head/textproc/elasticsearch7/Makefile
==============================================================================
--- head/textproc/elasticsearch6/Makefile Fri Jan 24 18:26:04 2020 (r523977)
+++ head/textproc/elasticsearch7/Makefile Fri Jan 24 19:16:31 2020 (r523980)
@@ -2,11 +2,11 @@
# $FreeBSD$
PORTNAME= elasticsearch
-PORTVERSION= 6.8.6
+PORTVERSION= 7.5.2
CATEGORIES= textproc java devel
-MASTER_SITES= https://artifacts.elastic.co/downloads/${PORTNAME}/ \
- https://ftp.sk.freebsd.org/pub/local/distfiles/
-PKGNAMESUFFIX= 6
+MASTER_SITES= https://artifacts.elastic.co/downloads/${PORTNAME}/
+PKGNAMESUFFIX= 7
+DISTNAME= ${PORTNAME}-${PORTVERSION}-no-jdk-linux-x86_64
MAINTAINER= elastic at FreeBSD.org
COMMENT= Full-text search engine for Java
@@ -19,11 +19,12 @@ RUN_DEPENDS= bash>0:shells/bash \
USES= cpe shebangfix
-CONFLICTS= elasticsearch-[0-9]* elasticsearch2-[0-9]* elasticsearch5-[0-9]*
+CONFLICTS= elasticsearch[56]-[0-9]*
NO_ARCH= yes
USE_JAVA= yes
NO_BUILD= yes
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
JAVA_VERSION= 8+
USE_RC_SUBR= ${PORTNAME}
SHEBANG_FILES= bin/elasticsearch \
@@ -34,13 +35,13 @@ SHEBANG_FILES= bin/elasticsearch \
bin/elasticsearch-env \
bin/elasticsearch-keystore \
bin/elasticsearch-migrate \
+ bin/elasticsearch-node \
bin/elasticsearch-plugin \
bin/elasticsearch-saml-metadata \
bin/elasticsearch-setup-passwords \
bin/elasticsearch-shard \
bin/elasticsearch-sql-cli \
bin/elasticsearch-syskeygen \
- bin/elasticsearch-translog \
bin/elasticsearch-users \
bin/x-pack-env \
bin/x-pack-security-env \
@@ -51,8 +52,8 @@ OPTIONS_DEFINE= DOCS
.include <bsd.port.options.mk>
CONFIG_FILES= elasticsearch.yml \
- log4j2.properties \
jvm.options \
+ log4j2.properties \
role_mapping.yml \
roles.yml
BINS= elasticsearch \
@@ -63,6 +64,7 @@ BINS= elasticsearch \
elasticsearch-env \
elasticsearch-keystore \
elasticsearch-migrate \
+ elasticsearch-node \
elasticsearch-plugin \
elasticsearch-saml-metadata \
elasticsearch-setup-passwords \
@@ -70,7 +72,6 @@ BINS= elasticsearch \
elasticsearch-sql-cli \
elasticsearch-sql-cli-${PORTVERSION}.jar \
elasticsearch-syskeygen \
- elasticsearch-translog \
elasticsearch-users \
x-pack-env \
x-pack-security-env \
@@ -78,7 +79,7 @@ BINS= elasticsearch \
PORTDOCS= LICENSE.txt \
NOTICE.txt \
- README.textile
+ README.asciidoc
SIGAR_ARCH= ${ARCH:S|i386|x86|}
SEARCHUSER?= elasticsearch
@@ -90,8 +91,6 @@ SUB_LIST= ETCDIR=${ETCDIR} JAVA_HOME=${JAVA_HOME}
SUB_FILES= pkg-message
post-patch:
- ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/config/elasticsearch.yml
- ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/bin/elasticsearch
${RM} ${WRKSRC}/lib/jna-*.jar
# ML plugin not supported on FreeBSD
${RM} -rf ${WRKSRC}/modules/x-pack/x-pack-ml
@@ -123,10 +122,10 @@ do-install-DOCS-on:
post-install:
${ECHO} "@sample ${ETCDIR}/elasticsearch.yml.sample" >> ${TMPPLIST}
- ${ECHO} "@sample ${ETCDIR}/log4j2.properties.sample" >> ${TMPPLIST}
${ECHO} "@sample ${ETCDIR}/jvm.options.sample" >> ${TMPPLIST}
- ${ECHO} "@sample ${ETCDIR}/roles.yml.sample" >> ${TMPPLIST}
+ ${ECHO} "@sample ${ETCDIR}/log4j2.properties.sample" >> ${TMPPLIST}
${ECHO} "@sample ${ETCDIR}/role_mapping.yml.sample" >> ${TMPPLIST}
+ ${ECHO} "@sample ${ETCDIR}/roles.yml.sample" >> ${TMPPLIST}
${FIND} -s ${STAGEDIR}${PREFIX}/lib/elasticsearch -not -type d | ${SORT} | \
${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
${ECHO} "@dir lib/elasticsearch/plugins" >> ${TMPPLIST}
Modified: head/textproc/elasticsearch7/distinfo
==============================================================================
--- head/textproc/elasticsearch6/distinfo Fri Jan 24 18:26:04 2020 (r523977)
+++ head/textproc/elasticsearch7/distinfo Fri Jan 24 19:16:31 2020 (r523980)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1577620816
-SHA256 (elasticsearch-6.8.6.tar.gz) = 67b9b07a649831eb30779cf8264548a0828414ba9abb1be7bc592a8db91fdf7c
-SIZE (elasticsearch-6.8.6.tar.gz) = 149510158
+TIMESTAMP = 1579833580
+SHA256 (elasticsearch-7.5.2-no-jdk-linux-x86_64.tar.gz) = 5e7d47e2a154400ea2f3ce25ebff621b2661a259cfab53811142f574f21397e5
+SIZE (elasticsearch-7.5.2-no-jdk-linux-x86_64.tar.gz) = 141758515
Modified: head/textproc/elasticsearch7/files/patch-config_jvm.options
==============================================================================
--- head/textproc/elasticsearch6/files/patch-config_jvm.options Fri Jan 24 18:26:04 2020 (r523977)
+++ head/textproc/elasticsearch7/files/patch-config_jvm.options Fri Jan 24 19:16:31 2020 (r523980)
@@ -1,6 +1,6 @@
---- config/jvm.options.orig 2019-11-13 20:02:23 UTC
+--- config/jvm.options.orig 2020-01-15 04:09:47 UTC
+++ config/jvm.options
-@@ -107,13 +107,13 @@
+@@ -67,10 +67,10 @@
8:-XX:+PrintGCDateStamps
8:-XX:+PrintTenuringDistribution
8:-XX:+PrintGCApplicationStoppedTime
@@ -13,6 +13,3 @@
# JDK 9+ GC logging
-9-:-Xlog:gc*,gc+age=trace,safepoint:file=logs/gc.log:utctime,pid,tags:filecount=32,filesize=64m
+9-:-Xlog:gc*,gc+age=trace,safepoint:file=${ES_TMPDIR}/gc.log:utctime,pid,tags:filecount=32,filesize=64m
- # due to internationalization enhancements in JDK 9 Elasticsearch need to set the provider to COMPAT otherwise
- # time/date parsing will break in an incompatible way for some date patterns and locals
- 9-:-Djava.locale.providers=COMPAT
More information about the svn-ports-all
mailing list