Index: head/sysutils/logstash7/Makefile =================================================================== --- head/sysutils/logstash7/Makefile (revision 538705) +++ head/sysutils/logstash7/Makefile (revision 538706) @@ -1,74 +1,74 @@ # Created by: Daniel Solsona , Guido Falsi # $FreeBSD$ PORTNAME= logstash -PORTVERSION= 7.6.2 +PORTVERSION= 7.7.1 CATEGORIES= sysutils java MASTER_SITES= http://artifacts.elastic.co/downloads/logstash/ PKGNAMESUFFIX= 7 MAINTAINER= elastic@FreeBSD.org COMMENT= Server-side data ingest and transfomation tool LICENSE= APACHE20 RUN_DEPENDS= ${LOCALBASE}/bin/bash:shells/bash USES= cpe shebangfix CONFLICTS= logstash5-[0-9]* logstash6-[0-9]* SHEBANG_FILES= bin/* CPE_VENDOR= elasticsearch USE_JAVA= yes -JAVA_VERSION= 1.8+ +JAVA_VERSION= 8+ JAVA_RUN= yes NO_BUILD= yes USERS= logstash GROUPS= logstash LOGSTASH_DIR= ${PREFIX}/${PORTNAME} USE_RC_SUBR= logstash LOGSTASH_HOME?= ${PREFIX}/${PORTNAME} 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 LOGSTASH_JRUBY_BIN_FILES= ast gem irb jgem jirb jirb_swing jruby \ jruby.bash jruby.sh jrubyc rake rdoc ri testrb post-patch: ${REINPLACE_CMD} 's|%%ETCDIR%%|${ETCDIR}|g' ${WRKSRC}/config/logstash.yml ${FIND} ${WRKSRC} -name '*.orig' -delete do-install: ${FIND} ${WRKSRC} -name '*.bat' -delete ${MKDIR} ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${FILESDIR}/logstash.conf.sample ${STAGEDIR}${ETCDIR} .for x in ${LOGSTASH_CONF_FILES} ${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/* .for x in ${LOGSTASH_JRUBY_BIN_FILES} ${CHMOD} ${BINMODE} ${STAGEDIR}${LOGSTASH_DIR}/${LOGSTASH_JRUBY_SUBDIR}/${x} .endfor ${INSTALL} -lrs ${STAGEDIR}${ETCDIR} ${STAGEDIR}${LOGSTASH_DIR}/config post-install: ${ECHO} "@sample ${ETCDIR}/logstash.conf.sample" >> ${TMPPLIST} .for x in ${LOGSTASH_CONF_FILES} ${ECHO} "@sample ${ETCDIR}/${x}.sample" >> ${TMPPLIST} .endfor ${FIND} -s ${STAGEDIR}${PREFIX}/logstash -not -type d | ${SORT} | \ ${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST} ${ECHO} "@dir(logstash,logstash,) logstash/data" >> ${TMPPLIST} .include Index: head/sysutils/logstash7/distinfo =================================================================== --- head/sysutils/logstash7/distinfo (revision 538705) +++ head/sysutils/logstash7/distinfo (revision 538706) @@ -1,3 +1,3 @@ -TIMESTAMP = 1587838565 -SHA256 (logstash-7.6.2.tar.gz) = 2bf5cb1bbb634552589f8676ffd4edb1e5d7338b91e08330193d160fe60dc868 -SIZE (logstash-7.6.2.tar.gz) = 172679447 +TIMESTAMP = 1591572840 +SHA256 (logstash-7.7.1.tar.gz) = ef60c707705429606a5848ebdcf0b70695901da6abec5d15e2ebf3fea03a88af +SIZE (logstash-7.7.1.tar.gz) = 166448487 Index: head/sysutils/logstash7/files/patch-vendor_jruby_bin_jruby =================================================================== --- head/sysutils/logstash7/files/patch-vendor_jruby_bin_jruby (revision 538705) +++ head/sysutils/logstash7/files/patch-vendor_jruby_bin_jruby (nonexistent) @@ -1,11 +0,0 @@ ---- vendor/jruby/bin/jruby.orig 2018-02-16 20:50:22 UTC -+++ vendor/jruby/bin/jruby -@@ -244,7 +244,7 @@ do - # Match -Xa.b.c=d to translate to -Da.b.c=d as a java option - -X*) - val=${1:2} -- if expr "$val" : '.*[.]' > /dev/null; then -+ if expr -- "$val" : '.*[.]' > /dev/null; then - java_args=("${java_args[@]}" "-Djruby.${val}") - else - ruby_args=("${ruby_args[@]}" "-X${val}") Property changes on: head/sysutils/logstash7/files/patch-vendor_jruby_bin_jruby ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/sysutils/logstash7/files/patch-vendor_jruby_bin_jruby.bash =================================================================== --- head/sysutils/logstash7/files/patch-vendor_jruby_bin_jruby.bash (revision 538705) +++ head/sysutils/logstash7/files/patch-vendor_jruby_bin_jruby.bash (nonexistent) @@ -1,11 +0,0 @@ ---- vendor/jruby/bin/jruby.bash.orig 2018-02-16 20:50:22 UTC -+++ vendor/jruby/bin/jruby.bash -@@ -244,7 +244,7 @@ do - # Match -Xa.b.c=d to translate to -Da.b.c=d as a java option - -X*) - val=${1:2} -- if expr "$val" : '.*[.]' > /dev/null; then -+ if expr -- "$val" : '.*[.]' > /dev/null; then - java_args=("${java_args[@]}" "-Djruby.${val}") - else - ruby_args=("${ruby_args[@]}" "-X${val}") Property changes on: head/sysutils/logstash7/files/patch-vendor_jruby_bin_jruby.bash ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property