diff options
| author | Palle Girgensohn <girgen@FreeBSD.org> | 2017-12-07 17:06:22 +0000 |
|---|---|---|
| committer | Palle Girgensohn <girgen@FreeBSD.org> | 2017-12-07 17:06:22 +0000 |
| commit | 7754a7307b83071ac2b33093a11cee9a2dc01ac4 (patch) | |
| tree | 9aeb6787e4b01998e8c1dc143e20dc341c3a57d5 | |
| parent | 0d641b0d74d29374c8d1311e2d6922de5e7b78b3 (diff) | |
| download | ports-7754a7307b83071ac2b33093a11cee9a2dc01ac4.tar.gz ports-7754a7307b83071ac2b33093a11cee9a2dc01ac4.zip | |
Notes
| -rw-r--r-- | sysutils/beats/Makefile | 12 | ||||
| -rw-r--r-- | sysutils/beats/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/beats/files/patch-gopsutil | 22 | ||||
| -rw-r--r-- | sysutils/beats/pkg-plist | 9 |
4 files changed, 5 insertions, 44 deletions
diff --git a/sysutils/beats/Makefile b/sysutils/beats/Makefile index b42379c3f2e4..6e5624629683 100644 --- a/sysutils/beats/Makefile +++ b/sysutils/beats/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= beats -PORTVERSION= 5.6.4 +PORTVERSION= 6.0.1 DISTVERSIONPREFIX=v CATEGORIES= sysutils @@ -38,24 +38,16 @@ 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 diff --git a/sysutils/beats/distinfo b/sysutils/beats/distinfo index bc089372225a..32e251f19679 100644 --- a/sysutils/beats/distinfo +++ b/sysutils/beats/distinfo @@ -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 diff --git a/sysutils/beats/files/patch-gopsutil b/sysutils/beats/files/patch-gopsutil deleted file mode 100644 index 9541876d7f21..000000000000 --- a/sysutils/beats/files/patch-gopsutil +++ /dev/null @@ -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 { diff --git a/sysutils/beats/pkg-plist b/sysutils/beats/pkg-plist index c372d6f6d54b..e084c6788786 100644 --- a/sysutils/beats/pkg-plist +++ b/sysutils/beats/pkg-plist @@ -1,19 +1,10 @@ -%%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 |