sysutils/logstash7: Update to 7.10.1

Changelog at:
https://www.elastic.co/guide/en/logstash/7.10/logstash-7-10-1.html

And while here, also reformat Makefile according to portfmt and portclippy

Reviewed by:	osa (mentor)
Approved by:	osa (mentor)
Differential Revision:	https://reviews.freebsd.org/D27821
This commit is contained in:
Juraj Lutter 2020-12-30 13:21:02 +00:00
parent f536499089
commit 8d4dba011a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=559658
2 changed files with 21 additions and 29 deletions

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= logstash
PORTVERSION= 7.10.0
PORTVERSION= 7.10.1
DISTVERSIONSUFFIX= -darwin-x86_64
CATEGORIES= sysutils java
MASTER_SITES= http://artifacts.elastic.co/downloads/logstash/
@ -17,39 +17,31 @@ RUN_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash
USES= cpe shebangfix
#USE_GITHUB= yes
#GH_ACCOUNT= elastic
#GH_PROJECT= logstash
#GH_TAGNAME= v${DISTVERSION}
CONFLICTS= logstash5-[0-9]* logstash6-[0-9]*
SHEBANG_FILES= bin/*
CPE_VENDOR= elasticsearch
USE_JAVA= yes
JAVA_VERSION= 11+
JAVA_RUN= yes
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
USERS= logstash
GROUPS= logstash
LOGSTASH_DIR= ${PREFIX}/${PORTNAME}
USE_RC_SUBR= logstash
LOGSTASH_HOME?= ${PREFIX}/${PORTNAME}
SHEBANG_FILES= bin/*
CONFLICTS= logstash5-[0-9]* logstash6-[0-9]*
NO_BUILD= yes
SUB_LIST= JAVA_HOME=${JAVA_HOME} \
LOGSTASH_HOME=${LOGSTASH_HOME}
LOGSTASH_CONF_FILES= jvm.options log4j2.properties logstash.yml \
pipelines.yml startup.options
LOGSTASH_JRUBY_SUBDIR= vendor/jruby/bin
WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
USERS= logstash
GROUPS= logstash
LOGSTASH_CONF_FILES= jvm.options log4j2.properties logstash.yml \
pipelines.yml startup.options
LOGSTASH_HOME?= ${PREFIX}/${PORTNAME}
LOGSTASH_JRUBY_BIN_FILES= ast gem irb jgem jirb jirb_swing jruby \
jruby.bash jruby.sh jrubyc rake rdoc ri testrb
LOGSTASH_JRUBY_SUBDIR= vendor/jruby/bin
post-patch:
${REINPLACE_CMD} 's|%%ETCDIR%%|${ETCDIR}|g' ${WRKSRC}/config/logstash.yml
@ -63,12 +55,12 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/config/${x} ${STAGEDIR}${ETCDIR}/${x}.sample
.endfor
${RM} -rf ${WRKSRC}/config
(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${LOGSTASH_DIR})
${CHMOD} ${BINMODE} ${STAGEDIR}${LOGSTASH_DIR}/bin/*
(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${LOGSTASH_HOME})
${CHMOD} ${BINMODE} ${STAGEDIR}${LOGSTASH_HOME}/bin/*
.for x in ${LOGSTASH_JRUBY_BIN_FILES}
${CHMOD} ${BINMODE} ${STAGEDIR}${LOGSTASH_DIR}/${LOGSTASH_JRUBY_SUBDIR}/${x}
${CHMOD} ${BINMODE} ${STAGEDIR}${LOGSTASH_HOME}/${LOGSTASH_JRUBY_SUBDIR}/${x}
.endfor
${INSTALL} -lrs ${STAGEDIR}${ETCDIR} ${STAGEDIR}${LOGSTASH_DIR}/config
${INSTALL} -lrs ${STAGEDIR}${ETCDIR} ${STAGEDIR}${LOGSTASH_HOME}/config
post-install:
${ECHO} "@sample ${ETCDIR}/logstash.conf.sample" >> ${TMPPLIST}

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1605395547
SHA256 (logstash-7.10.0-darwin-x86_64.tar.gz) = eecdf4a75a3f138c4a02db05da8719a4051943e2a6909d9e573d0d1161bcd835
SIZE (logstash-7.10.0-darwin-x86_64.tar.gz) = 344078154
TIMESTAMP = 1609275205
SHA256 (logstash-7.10.1-darwin-x86_64.tar.gz) = b478ce9fbeb5f00d3924e4da6a5b6fbedda5228d3947ffe5acb6ce8c352fd65a
SIZE (logstash-7.10.1-darwin-x86_64.tar.gz) = 344131518