Index: head/sysutils/beats/Makefile =================================================================== --- head/sysutils/beats/Makefile (revision 455740) +++ head/sysutils/beats/Makefile (revision 455741) @@ -1,62 +1,54 @@ # Created by: Palle Girgensohn # $FreeBSD$ PORTNAME= beats -PORTVERSION= 5.6.4 +PORTVERSION= 6.0.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 libbeat/dashboards ${GO_TARGETS}; do \ + @for GO_TARGET in ${GO_TARGETS}; do \ cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GMAKE} -C $${GO_TARGET} ;\ done do-install: - ${MKDIR} ${STAGEDIR}${DATADIR} - ${INSTALL_PROGRAM} \ - ${GO_WRKSRC}/libbeat/dashboards/import_dashboards \ - ${STAGEDIR}${DATADIR} 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 ;\ - ${INSTALL_DATA} ${WRKSRC}/$${GO_TARGET}/$${GO_TARGET}.template.json \ - ${STAGEDIR}${PREFIX}/etc/$${GO_TARGET}.template.json.sample ;\ - ${INSTALL_DATA} ${WRKSRC}/$${GO_TARGET}/$${GO_TARGET}.template-es2x.json \ - ${STAGEDIR}${PREFIX}/etc/$${GO_TARGET}.template-es2x.json.sample ;\ ${MKDIR} ${STAGEDIR}/var/db/beats/$${GO_TARGET} ;\ done .include Index: head/sysutils/beats/distinfo =================================================================== --- head/sysutils/beats/distinfo (revision 455740) +++ head/sysutils/beats/distinfo (revision 455741) @@ -1,3 +1,3 @@ -TIMESTAMP = 1510152676 -SHA256 (elastic-beats-v5.6.4_GH0.tar.gz) = c06f913af79bb54825483ba0ed4b31752db5784daf3717f53d83b6b12890c0a4 -SIZE (elastic-beats-v5.6.4_GH0.tar.gz) = 18145215 +TIMESTAMP = 1512664719 +SHA256 (elastic-beats-v6.0.1_GH0.tar.gz) = 10cbac9789b227e844ad47ef563266057f5b7f6ca58d480f46c966e5055694ce +SIZE (elastic-beats-v6.0.1_GH0.tar.gz) = 15150919 Index: head/sysutils/beats/files/patch-gopsutil =================================================================== --- head/sysutils/beats/files/patch-gopsutil (revision 455740) +++ head/sysutils/beats/files/patch-gopsutil (nonexistent) @@ -1,22 +0,0 @@ ---- ../src/github.com/elastic/beats/vendor/github.com/shirou/gopsutil/disk/disk_freebsd_386.go.orig 2016-12-13 11:17:18.930219000 +0100 -+++ ../src/github.com/elastic/beats/vendor/github.com/shirou/gopsutil/disk/disk_freebsd_386.go 2016-12-13 11:17:23.015481000 +0100 -@@ -39,6 +39,10 @@ - MNT_SUSPEND = 4 - ) - -+const ( -+ sizeOfDevstat = 0xf0 -+) -+ - type ( - _C_short int16 - _C_int int32 -@@ -95,7 +99,7 @@ - Flags uint32 - Device_type uint32 - Priority uint32 -- ID *byte -+ Id *byte - Sequence1 uint32 - } - type Bintime struct { Property changes on: head/sysutils/beats/files/patch-gopsutil ___________________________________________________________________ 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/pkg-plist =================================================================== --- head/sysutils/beats/pkg-plist (revision 455740) +++ head/sysutils/beats/pkg-plist (revision 455741) @@ -1,22 +1,13 @@ -%%DATADIR%%/import_dashboards %%FILEBEAT%%sbin/filebeat %%HEARTBEAT%%sbin/heartbeat %%METRICBEAT%%sbin/metricbeat %%PACKETBEAT%%sbin/packetbeat -%%FILEBEAT%%@sample etc/filebeat.template-es2x.json.sample -%%FILEBEAT%%@sample etc/filebeat.template.json.sample %%FILEBEAT%%@sample etc/filebeat.yml.sample -%%HEARTBEAT%%@sample etc/heartbeat.template-es2x.json.sample -%%HEARTBEAT%%@sample etc/heartbeat.template.json.sample %%HEARTBEAT%%@sample etc/heartbeat.yml.sample -%%METRICBEAT%%@sample etc/metricbeat.template-es2x.json.sample -%%METRICBEAT%%@sample etc/metricbeat.template.json.sample %%METRICBEAT%%@sample etc/metricbeat.yml.sample -%%PACKETBEAT%%@sample etc/packetbeat.template-es2x.json.sample -%%PACKETBEAT%%@sample etc/packetbeat.template.json.sample %%PACKETBEAT%%@sample etc/packetbeat.yml.sample @dir /var/db/beats %%FILEBEAT%%@dir /var/db/beats/filebeat %%HEARTBEAT%%@dir /var/db/beats/heartbeat %%METRICBEAT%%@dir /var/db/beats/metricbeat %%PACKETBEAT%%@dir /var/db/beats/packetbeat