aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuraj Lutter <otis@FreeBSD.org>2021-05-27 13:51:57 +0000
committerJuraj Lutter <otis@FreeBSD.org>2021-06-02 18:42:07 +0000
commit52ee32a5c2801d16243859ac71b1ed939b4c1fb9 (patch)
tree09076a33513e69eecc88f3e9825389b45a1819d1
parent84a8e46147bf0570ca58be6cc6c9718febae0a9a (diff)
downloadports-52ee32a5c2801d16243859ac71b1ed939b4c1fb9.tar.gz
ports-52ee32a5c2801d16243859ac71b1ed939b4c1fb9.zip
sysutils/beats6: Update to 6.8.16
Also reformat Makefile a bit. (cherry picked from commit d1c4efbffaef0fb5e1da397590ae696bf6b0f421)
-rw-r--r--sysutils/beats6/Makefile37
-rw-r--r--sysutils/beats6/distinfo6
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