From owner-dev-commits-ports-branches@freebsd.org Wed Jun 2 18:43:31 2021 Return-Path: Delivered-To: dev-commits-ports-branches@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C12396491FC; Wed, 2 Jun 2021 18:43:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FwHwg5616z4XCW; Wed, 2 Jun 2021 18:43:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 975E31BDE7; Wed, 2 Jun 2021 18:43:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 152IhVwB027971; Wed, 2 Jun 2021 18:43:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 152IhV3g027970; Wed, 2 Jun 2021 18:43:31 GMT (envelope-from git) Date: Wed, 2 Jun 2021 18:43:31 GMT Message-Id: <202106021843.152IhV3g027970@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Juraj Lutter Subject: git: 52ee32a5c280 - 2021Q2 - sysutils/beats6: Update to 6.8.16 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: otis X-Git-Repository: ports X-Git-Refname: refs/heads/2021Q2 X-Git-Reftype: branch X-Git-Commit: 52ee32a5c2801d16243859ac71b1ed939b4c1fb9 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-branches@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 02 Jun 2021 18:43:31 -0000 The branch 2021Q2 has been updated by otis: URL: https://cgit.FreeBSD.org/ports/commit/?id=52ee32a5c2801d16243859ac71b1ed939b4c1fb9 commit 52ee32a5c2801d16243859ac71b1ed939b4c1fb9 Author: Juraj Lutter AuthorDate: 2021-05-27 13:51:57 +0000 Commit: Juraj Lutter 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 - 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 @@ -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