Index: head/sysutils/beats/Makefile
===================================================================
--- head/sysutils/beats/Makefile	(revision 440878)
+++ head/sysutils/beats/Makefile	(revision 440879)
@@ -1,69 +1,66 @@
 # Created by: Palle Girgensohn <girgen@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	beats
-PORTVERSION=	5.3.1
+PORTVERSION=	5.4.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 libbeat/dashboards ${GO_TARGETS}; do \
 		cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GMAKE} -C $${GO_TARGET} ;\
 	done
 
 post-stage:
 	for GO_TARGET in ${GO_TARGETS}; do \
 		${MKDIR} ${STAGEDIR}/var/db/beats/$${GO_TARGET} ;\
 	done
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_SCRIPT} \
-		${GO_WRKSRC}/libbeat/scripts/migrate_beat_config_1_x_to_5_0.py \
-		${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 ;\
 	done
 
 .include <bsd.port.mk>
Index: head/sysutils/beats/distinfo
===================================================================
--- head/sysutils/beats/distinfo	(revision 440878)
+++ head/sysutils/beats/distinfo	(revision 440879)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1493124253
-SHA256 (elastic-beats-v5.3.1_GH0.tar.gz) = 392c647fd3a4fd40b70d911950f38c0fd65a3ad4bb8548fcd0afd77c01d31d9e
-SIZE (elastic-beats-v5.3.1_GH0.tar.gz) = 17594920
+TIMESTAMP = 1494282443
+SHA256 (elastic-beats-v5.4.0_GH0.tar.gz) = d236f9433d48b69cc2f0bf3617f17d5f2eec261acee96cc28d8b72be84afc0a7
+SIZE (elastic-beats-v5.4.0_GH0.tar.gz) = 17823310
Index: head/sysutils/beats/pkg-plist
===================================================================
--- head/sysutils/beats/pkg-plist	(revision 440878)
+++ head/sysutils/beats/pkg-plist	(revision 440879)
@@ -1,23 +1,22 @@
 %%DATADIR%%/import_dashboards
-%%DATADIR%%/migrate_beat_config_1_x_to_5_0.py
 %%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