Index: head/sysutils/beats/Makefile =================================================================== --- head/sysutils/beats/Makefile (revision 461137) +++ head/sysutils/beats/Makefile (revision 461138) @@ -1,54 +1,54 @@ # Created by: Palle Girgensohn # $FreeBSD$ PORTNAME= beats -PORTVERSION= 6.1.3 +PORTVERSION= 6.2.0 DISTVERSIONPREFIX=v CATEGORIES= sysutils MAINTAINER= girgen@FreeBSD.org COMMENT= Collect logs locally and send to remote logstash LICENSE= APACHE20 USE_GITHUB= yes GH_ACCOUNT= elastic USES= gmake go GO_PKGNAME= github.com/${GH_ACCOUNT}/${GH_PROJECT} USE_RC_SUBR= ${GO_TARGETS} OPTIONS_DEFAULT=FILEBEAT PACKETBEAT METRICBEAT HEARTBEAT OPTIONS_SUB= yes OPTIONS_MULTI= BEATS OPTIONS_MULTI_BEATS=${OPTIONS_DEFAULT} FILEBEAT_DESC= Filebeat FILEBEAT_VARS= GO_TARGETS+=filebeat PACKETBEAT_DESC=Packetbeat PACKETBEAT_VARS=GO_TARGETS+=packetbeat METRICBEAT_DESC=Metricbeat METRICBEAT_VARS=GO_TARGETS+=metricbeat HEARTBEAT_DESC= Heartbeat HEARTBEAT_VARS=GO_TARGETS+=heartbeat do-build: @for GO_TARGET in ${GO_TARGETS}; do \ cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GMAKE} -C $${GO_TARGET} ;\ done do-install: for GO_TARGET in ${GO_TARGETS}; do \ ${INSTALL_PROGRAM} ${GO_WRKSRC}/$${GO_TARGET}/$${GO_TARGET} \ ${STAGEDIR}${PREFIX}/sbin ;\ ${INSTALL_DATA} ${WRKSRC}/$${GO_TARGET}/$${GO_TARGET}.yml \ ${STAGEDIR}${PREFIX}/etc/$${GO_TARGET}.yml.sample ;\ ${MKDIR} ${STAGEDIR}/var/db/beats/$${GO_TARGET} ;\ done .include Index: head/sysutils/beats/distinfo =================================================================== --- head/sysutils/beats/distinfo (revision 461137) +++ head/sysutils/beats/distinfo (revision 461138) @@ -1,3 +1,3 @@ -TIMESTAMP = 1517398295 -SHA256 (elastic-beats-v6.1.3_GH0.tar.gz) = 5a21ce1eca7eab2b8214b54a7f4690cd557cd05073119f861025330e1b4006a3 -SIZE (elastic-beats-v6.1.3_GH0.tar.gz) = 17374165 +TIMESTAMP = 1518004202 +SHA256 (elastic-beats-v6.2.0_GH0.tar.gz) = f4cf4dee93ae5803d7c07573e96f73ee421cf9f3154615c9c518137c1956feab +SIZE (elastic-beats-v6.2.0_GH0.tar.gz) = 19405883 Index: head/sysutils/beats/files/patch-gosigar_freebsd.go =================================================================== --- head/sysutils/beats/files/patch-gosigar_freebsd.go (revision 461137) +++ head/sysutils/beats/files/patch-gosigar_freebsd.go (nonexistent) @@ -1,26 +0,0 @@ -commit 988370a873665ea56d5cf1c287c7274f88c429a3 -Author: Palle Girgensohn -Date: Thu Dec 28 11:55:29 2017 +0100 - - Use the common version of Get(pid) - -diff --git a/sigar_freebsd.go b/sigar_freebsd.go -index 0a31d08..602b4a0 100644 ---- a/sigar_freebsd.go -+++ vendor/github.com/elastic/gosigar/sigar_freebsd.go -@@ -4,7 +4,6 @@ package gosigar - - import ( - "io/ioutil" -- "runtime" - "strconv" - "strings" - "unsafe" -@@ -107,7 +106,3 @@ func parseCpuStat(self *Cpu, line string) error { - self.Idle, _ = strtoull(fields[4]) - return nil - } -- --func (self *ProcTime) Get(pid int) error { -- return ErrNotImplemented{runtime.GOOS} --} Property changes on: head/sysutils/beats/files/patch-gosigar_freebsd.go ___________________________________________________________________ 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/beats/files/patch-libbeat_scripts_Makefile =================================================================== --- head/sysutils/beats/files/patch-libbeat_scripts_Makefile (revision 461137) +++ head/sysutils/beats/files/patch-libbeat_scripts_Makefile (revision 461138) @@ -1,11 +1,11 @@ ---- libbeat/scripts/Makefile.orig 2016-12-08 18:08:06.201040000 +0100 -+++ libbeat/scripts/Makefile 2016-12-08 18:08:14.835100000 +0100 -@@ -30,7 +30,7 @@ - GOFILES = $(shell find . -type f -name '*.go') +--- libbeat/scripts/Makefile.orig 2018-02-01 16:56:52.000000000 +0100 ++++ libbeat/scripts/Makefile 2018-02-07 12:53:00.911420000 +0100 +@@ -27,7 +27,7 @@ GOFILES_NOVENDOR = $(shell find . -type f -name '*.go' -not -path "*/vendor/*") GOFILES_ALL = $(GOFILES) $(shell find $(ES_BEATS) -type f -name '*.go') + GOPACKAGES_STRESSTESTS=$(shell find . -name '*.go' | xargs awk 'FNR>1 {nextfile} /\+build.*stresstest/ {print FILENAME; nextfile}' | xargs dirname | uniq) -SHELL=bash +SHELL=sh ES_HOST?="elasticsearch" PWD=$(shell pwd) BUILD_DIR?=$(shell pwd)/build