Index: head/sysutils/filebeat/Makefile
===================================================================
--- head/sysutils/filebeat/Makefile	(revision 428145)
+++ head/sysutils/filebeat/Makefile	(revision 428146)
@@ -1,33 +1,33 @@
 # Created by: Palle Girgensohn <girgen@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	filebeat
-PORTVERSION=	1.2.3
+PORTVERSION=	5.0.2
 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
 GH_PROJECT=	beats
 
 USES=		gmake go
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
 GO_TARGETS=	${PORTNAME}
 
 USE_RC_SUBR=	${PORTNAME}
 
 do-build:
 	cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GMAKE} -C ${GO_TARGETS}
 
 do-install:
 	${INSTALL_PROGRAM} ${GO_WRKSRC}/${GO_TARGETS}/${GO_TARGETS} \
 		${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_DATA} ${GO_WRKSRC}/${GO_TARGETS}/etc/${GO_TARGETS}.yml \
+	${INSTALL_DATA} ${WRKSRC}/${GO_TARGETS}/${GO_TARGETS}.yml \
 		${STAGEDIR}${PREFIX}/etc/${GO_TARGETS}.yml.sample
 
 .include <bsd.port.mk>
Index: head/sysutils/filebeat/distinfo
===================================================================
--- head/sysutils/filebeat/distinfo	(revision 428145)
+++ head/sysutils/filebeat/distinfo	(revision 428146)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1464325885
-SHA256 (elastic-beats-v1.2.3_GH0.tar.gz) = 8eea85de415898c362144ba533062651d8891241c738799e54cc9b17040c1fc9
-SIZE (elastic-beats-v1.2.3_GH0.tar.gz) = 9922853
+TIMESTAMP = 1481067807
+SHA256 (elastic-beats-v5.0.2_GH0.tar.gz) = feef1e53b978c12b3b3c552534fd666839df5d7d3b974e16636360ca6c4ab7c0
+SIZE (elastic-beats-v5.0.2_GH0.tar.gz) = 15774694
Index: head/sysutils/filebeat/files/filebeat.in
===================================================================
--- head/sysutils/filebeat/files/filebeat.in	(revision 428145)
+++ head/sysutils/filebeat/files/filebeat.in	(revision 428146)
@@ -1,36 +1,37 @@
 #!/bin/sh
 # $FreeBSD$
 
 # PROVIDE: filebeat
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
 # KEYWORD: shutdown
 
-# Add the following lines to /etc/rc.conf to enable logstash-forwarder:
+# Add the following lines to /etc/rc.conf to enable filebeat:
+#
 # filebeat_enable (bool):	Set to YES to enable filebeat
 # 				Default: NO
 # filebeat_flags (str):		Extra flags passed to filebeat
 # filebeat_conf (str):		filebeat configuration file
 #				Default: ${PREFIX}/etc/filebeat.yml
 
 . /etc/rc.subr
 
 name="filebeat"
 rcvar=${name}_enable
 load_rc_config $name
 
 : ${filebeat_enable:="NO"}
 : ${filebeat_config:="%%PREFIX%%/etc/${name}.yml"}
 
 # daemon
 start_precmd=filebeat_prestart
 command=/usr/sbin/daemon
 pidfile="/var/run/${name}"
 command_args="-rP ${pidfile} %%PREFIX%%/sbin/${name} -c ${filebeat_config}"
 
 filebeat_prestart() {
 # Have to empty rc_flags so they don't get passed to daemon(8)
 	rc_flags=""
 }
 
 run_rc_command "$1"
Index: head/sysutils/filebeat/files/patch-libbeat_scripts_Makefile
===================================================================
--- head/sysutils/filebeat/files/patch-libbeat_scripts_Makefile	(revision 428145)
+++ head/sysutils/filebeat/files/patch-libbeat_scripts_Makefile	(revision 428146)
@@ -1,11 +1,11 @@
---- libbeat/scripts/Makefile.orig	2016-02-11 14:04:40 UTC
-+++ libbeat/scripts/Makefile
-@@ -6,7 +6,7 @@ ARCH?=$(shell uname -m)
- export PATH := ./bin:$(PATH)
- export GO15VENDOREXPERIMENT=1
+--- 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')
--SHELL=/bin/bash
-+SHELL=/bin/sh
- ES_HOST?="elasticsearch-210"
- BEAT_DIR?=github.com/elastic/beats
- BUILD_DIR=build
+ GOFILES_NOVENDOR = $(shell find . -type f -name '*.go' -not -path "*/vendor/*")
+ GOFILES_ALL = $(GOFILES) $(shell find $(ES_BEATS) -type f -name '*.go')
+-SHELL=bash
++SHELL=sh
+ ES_HOST?="elasticsearch"
+ PWD=$(shell pwd)
+ BUILD_DIR?=$(shell pwd)/build
Index: head/sysutils/packetbeat/Makefile
===================================================================
--- head/sysutils/packetbeat/Makefile	(revision 428145)
+++ head/sysutils/packetbeat/Makefile	(revision 428146)
@@ -1,35 +1,33 @@
 # Created by: Palle Girgensohn <girgen@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	packetbeat
-PORTVERSION=	1.2.3
+PORTVERSION=	5.0.2
 DISTVERSIONPREFIX=v
 CATEGORIES=	sysutils
 
 MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	Elasticsearch real-time network packet analytics
 
 LICENSE=	APACHE20
 
-#BUILD_DEPENDS=	go:lang/go
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	elastic
 GH_PROJECT=	beats
 
 USES=		gmake go
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
 GO_TARGETS=	${PORTNAME}
 
 USE_RC_SUBR=	${PORTNAME}
 
 do-build:
 	cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GMAKE} -C ${GO_TARGETS}
 
 do-install:
 	${INSTALL_PROGRAM} ${GO_WRKSRC}/${GO_TARGETS}/${GO_TARGETS} \
 		${STAGEDIR}${PREFIX}/sbin
-	${INSTALL_DATA} ${GO_WRKSRC}/${GO_TARGETS}/etc/${GO_TARGETS}.yml \
+	${INSTALL_DATA} ${WRKSRC}/${GO_TARGETS}/${GO_TARGETS}.yml \
 		${STAGEDIR}${PREFIX}/etc/${GO_TARGETS}.yml.sample
 
 .include <bsd.port.mk>
Index: head/sysutils/packetbeat/distinfo
===================================================================
--- head/sysutils/packetbeat/distinfo	(revision 428145)
+++ head/sysutils/packetbeat/distinfo	(revision 428146)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1464325900
-SHA256 (elastic-beats-v1.2.3_GH0.tar.gz) = 8eea85de415898c362144ba533062651d8891241c738799e54cc9b17040c1fc9
-SIZE (elastic-beats-v1.2.3_GH0.tar.gz) = 9922853
+TIMESTAMP = 1481067807
+SHA256 (elastic-beats-v5.0.2_GH0.tar.gz) = feef1e53b978c12b3b3c552534fd666839df5d7d3b974e16636360ca6c4ab7c0
+SIZE (elastic-beats-v5.0.2_GH0.tar.gz) = 15774694
Index: head/sysutils/packetbeat/files/patch-libbeat_scripts_Makefile
===================================================================
--- head/sysutils/packetbeat/files/patch-libbeat_scripts_Makefile	(revision 428145)
+++ head/sysutils/packetbeat/files/patch-libbeat_scripts_Makefile	(revision 428146)
@@ -1,11 +1,11 @@
---- libbeat/scripts/Makefile.orig	2016-02-11 14:04:40 UTC
-+++ libbeat/scripts/Makefile
-@@ -6,7 +6,7 @@ ARCH?=$(shell uname -m)
- export PATH := ./bin:$(PATH)
- export GO15VENDOREXPERIMENT=1
+--- 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')
--SHELL=/bin/bash
-+SHELL=/bin/sh
- ES_HOST?="elasticsearch-210"
- BEAT_DIR?=github.com/elastic/beats
- BUILD_DIR=build
+ GOFILES_NOVENDOR = $(shell find . -type f -name '*.go' -not -path "*/vendor/*")
+ GOFILES_ALL = $(GOFILES) $(shell find $(ES_BEATS) -type f -name '*.go')
+-SHELL=bash
++SHELL=sh
+ ES_HOST?="elasticsearch"
+ PWD=$(shell pwd)
+ BUILD_DIR?=$(shell pwd)/build