Index: head/sysutils/beats/Makefile
===================================================================
--- head/sysutils/beats/Makefile	(revision 463407)
+++ head/sysutils/beats/Makefile	(revision 463408)
@@ -1,56 +1,56 @@
 # Created by: Palle Girgensohn <girgen@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	beats
-PORTVERSION=	6.2.1
+PORTVERSION=	6.2.2
 DISTVERSIONPREFIX=v
 CATEGORIES=	sysutils
 
 MAINTAINER=	girgen@FreeBSD.org
 COMMENT=	Collect logs locally and send to remote logstash
 
 LICENSE=	APACHE20
 
-BROKEN=		overwrites go-1.10 files, see PR-226039
-
 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
+
+MAKE_ENV+=	GOBUILD_FLAGS=""
 
 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 <bsd.port.mk>
Index: head/sysutils/beats/distinfo
===================================================================
--- head/sysutils/beats/distinfo	(revision 463407)
+++ head/sysutils/beats/distinfo	(revision 463408)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1518181356
-SHA256 (elastic-beats-v6.2.1_GH0.tar.gz) = 7fc935b65469acc728653c89ef7b8541db4c5dafdbb1459822f0c215d58d30e6
-SIZE (elastic-beats-v6.2.1_GH0.tar.gz) = 19408673
+TIMESTAMP = 1519216976
+SHA256 (elastic-beats-v6.2.2_GH0.tar.gz) = 0866c3e26fcbd55f191e746b3bf925b450badd13fb72ea9f712481559932c878
+SIZE (elastic-beats-v6.2.2_GH0.tar.gz) = 19409238