Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 2 Jun 2021 18:43:31 GMT
From:      Juraj Lutter <otis@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org
Subject:   git: 52ee32a5c280 - 2021Q2 - sysutils/beats6: Update to 6.8.16
Message-ID:  <202106021843.152IhV3g027970@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch 2021Q2 has been updated by otis:

URL: https://cgit.FreeBSD.org/ports/commit/?id=52ee32a5c2801d16243859ac71b1ed939b4c1fb9

commit 52ee32a5c2801d16243859ac71b1ed939b4c1fb9
Author:     Juraj Lutter <otis@FreeBSD.org>
AuthorDate: 2021-05-27 13:51:57 +0000
Commit:     Juraj Lutter <otis@FreeBSD.org>
CommitDate: 2021-06-02 18:42:07 +0000

    sysutils/beats6: Update to 6.8.16
    
    Also reformat Makefile a bit.
    
    (cherry picked from commit d1c4efbffaef0fb5e1da397590ae696bf6b0f421)
---
 sysutils/beats6/Makefile | 37 +++++++++++++++++--------------------
 sysutils/beats6/distinfo |  6 +++---
 2 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/sysutils/beats6/Makefile b/sysutils/beats6/Makefile
index c9ac40b515ff..2e592d1a30ab 100644
--- a/sysutils/beats6/Makefile
+++ b/sysutils/beats6/Makefile
@@ -1,8 +1,6 @@
-# Created by: Palle Girgensohn <girgen@FreeBSD.org>
-
 PORTNAME=	beats
-PORTVERSION=	6.8.15
-DISTVERSIONPREFIX=v
+PORTVERSION=	6.8.16
+DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	6
 
@@ -16,28 +14,27 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	elastic
 USE_RC_SUBR=	${GO_TARGETS}
 
-CONFLICTS=	beats7*
-
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
-FIND_ARGS=	"! ( -regex .*/*\.(go|in|log) ) ! -path *test* ! -path *vendor*"
 MAKE_ENV+=	GOBUILD_FLAGS=""
 
-OPTIONS_DEFAULT=FILEBEAT HEARTBEAT METRICBEAT
-OPTIONS_DEFINE=	FILEBEAT HEARTBEAT METRICBEAT PACKETBEAT
-OPTIONS_SUB=	yes
+CONFLICTS=	beats7
 
-FILEBEAT_DESC=	Filebeat
-FILEBEAT_VARS=	GO_TARGETS+=filebeat
+OPTIONS_DEFINE=		FILEBEAT HEARTBEAT METRICBEAT PACKETBEAT
+OPTIONS_DEFAULT=	FILEBEAT HEARTBEAT METRICBEAT
+OPTIONS_SUB=		yes
 
-PACKETBEAT_DESC=Packetbeat
-PACKETBEAT_VARS=GO_TARGETS+=packetbeat
-PACKETBEAT_BROKEN=	An underlying library is currently broken under FreeBSD
+FILEBEAT_DESC=		Filebeat
+HEARTBEAT_DESC=		Heartbeat
+METRICBEAT_DESC=	Metricbeat
+PACKETBEAT_DESC=	Packetbeat
 
-METRICBEAT_DESC=Metricbeat
-METRICBEAT_VARS=GO_TARGETS+=metricbeat
+FILEBEAT_VARS=		GO_TARGETS+=filebeat
+HEARTBEAT_VARS=		GO_TARGETS+=heartbeat
+METRICBEAT_VARS=	GO_TARGETS+=metricbeat
+PACKETBEAT_BROKEN=	An underlying library is currently broken under FreeBSD
+PACKETBEAT_VARS=	GO_TARGETS+=packetbeat
 
-HEARTBEAT_DESC=	Heartbeat
-HEARTBEAT_VARS=	GO_TARGETS+=heartbeat
+_FIND_ARGS=	"! ( -regex .*/*\.(go|in|log) ) ! -path *test* ! -path *vendor*"
 
 .include <bsd.port.options.mk>
 
@@ -64,7 +61,7 @@ do-install:
 .endfor
 .for BEATMOD in filebeat metricbeat
 	${MKDIR} ${STAGEDIR}${ETCDIR}/${BEATMOD}.modules.d ${STAGEDIR}${DATADIR}/${BEATMOD}/module
-	(cd ${WRKSRC}/${BEATMOD}/module && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/${BEATMOD}/module ${FIND_ARGS})
+	(cd ${WRKSRC}/${BEATMOD}/module && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/${BEATMOD}/module ${_FIND_ARGS})
 	(cd ${WRKSRC}/${BEATMOD}/modules.d && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/${BEATMOD}.modules.d)
 .endfor
 
diff --git a/sysutils/beats6/distinfo b/sysutils/beats6/distinfo
index a2cf4eb7488e..79956e62d86f 100644
--- a/sysutils/beats6/distinfo
+++ b/sysutils/beats6/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1617794829
-SHA256 (elastic-beats-v6.8.15_GH0.tar.gz) = 92229c42685231a960f290fb6707f4c625abb60a49552ca20bcb75bb5cf8eab0
-SIZE (elastic-beats-v6.8.15_GH0.tar.gz) = 35585973
+TIMESTAMP = 1622123272
+SHA256 (elastic-beats-v6.8.16_GH0.tar.gz) = 2cdbcd6e454317fe4fa41555efcd3470fef5b120bb920fff2ae135f0b78195bc
+SIZE (elastic-beats-v6.8.16_GH0.tar.gz) = 35592988



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106021843.152IhV3g027970>