Index: head/sysutils/beats/Makefile =================================================================== --- head/sysutils/beats/Makefile (revision 457445) +++ head/sysutils/beats/Makefile (revision 457446) @@ -1,54 +1,55 @@ # Created by: Palle Girgensohn # $FreeBSD$ PORTNAME= beats PORTVERSION= 6.1.1 +PORTREVISION= 1 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/files/patch-gosigar_linux_common.go =================================================================== --- head/sysutils/beats/files/patch-gosigar_linux_common.go (revision 457445) +++ head/sysutils/beats/files/patch-gosigar_linux_common.go (nonexistent) @@ -1,18 +0,0 @@ ---- vendor/github.com/elastic/gosigar/sigar_linux_common.go.orig 2017-12-21 14:43:33.660692000 +0100 -+++ vendor/github.com/elastic/gosigar/sigar_linux_common.go 2017-12-21 14:44:02.666180000 +0100 -@@ -274,6 +274,7 @@ - return nil - } - -+/* - func (self *ProcTime) Get(pid int) error { - contents, err := readProcFile(pid, "stat") - if err != nil { -@@ -297,6 +298,7 @@ - - return nil - } -+*/ - - func (self *ProcArgs) Get(pid int) error { - contents, err := readProcFile(pid, "cmdline") Property changes on: head/sysutils/beats/files/patch-gosigar_linux_common.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-gosigar_freebsd.go =================================================================== --- head/sysutils/beats/files/patch-gosigar_freebsd.go (nonexistent) +++ head/sysutils/beats/files/patch-gosigar_freebsd.go (revision 457446) @@ -0,0 +1,26 @@ +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 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property