Index: head/sysutils/beats/Makefile
===================================================================
--- head/sysutils/beats/Makefile	(revision 528928)
+++ head/sysutils/beats/Makefile	(revision 528929)
@@ -1,69 +1,70 @@
 # Created by: Palle Girgensohn <girgen@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	beats
 PORTVERSION=	6.8.7
+PORTREVISION=	1
 DISTVERSIONPREFIX=v
 CATEGORIES=	sysutils
 
 MAINTAINER=	elastic@FreeBSD.org
 COMMENT=	Collect logs locally and send to remote logstash
 
 LICENSE=	APACHE20
 
 USES=		gmake go
 USE_GITHUB=	yes
 GH_ACCOUNT=	elastic
 USE_RC_SUBR=	${GO_TARGETS}
 
 GO_PKGNAME=	github.com/${GH_ACCOUNT}/${GH_PROJECT}
 FIND_ARGS=	"! ( -regex .*/*\.(go|in|log) ) ! -path *test* ! -path *vendor*"
 MAKE_ENV+=	GOBUILD_FLAGS=""
 
 OPTIONS_DEFAULT=FILEBEAT HEARTBEAT METRICBEAT
 OPTIONS_DEFINE=	FILEBEAT HEARTBEAT METRICBEAT PACKETBEAT
 OPTIONS_SUB=	yes
 
 FILEBEAT_DESC=	Filebeat
 FILEBEAT_VARS=	GO_TARGETS+=filebeat
 
 PACKETBEAT_DESC=Packetbeat
 PACKETBEAT_VARS=GO_TARGETS+=packetbeat
 PACKETBEAT_BROKEN=	An underlying library is currently broken under FreeBSD
 
 METRICBEAT_DESC=Metricbeat
 METRICBEAT_VARS=GO_TARGETS+=metricbeat
 
 HEARTBEAT_DESC=	Heartbeat
 HEARTBEAT_VARS=	GO_TARGETS+=heartbeat
 
 .include <bsd.port.options.mk>
 
 do-build:
 .for GO_TARGET in ${GO_TARGETS}
 	@(cd ${GO_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GO_ENV} ${GMAKE} -C ${GO_TARGET})
 .endfor
 
 do-install:
 .for GO_TARGET in ${GO_TARGETS}
 	${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
 	(DEST_COMPONENT_PATH_UNSTAGED=/var/db/beats/${GO_TARGET}/kibana; \
 		DEST_COMPONENT_PATH=${STAGEDIR}$${DEST_COMPONENT_PATH_UNSTAGED}; \
 		${MKDIR} $${DEST_COMPONENT_PATH}; \
 		DASHBOARD_FIND_ARGS="-path */_meta/kibana -type d"; \
 		DASHBOARD_PATHS=$$(${SETENV} ${FIND} ${WRKSRC}/${GO_TARGET} $${DASHBOARD_FIND_ARGS}); \
 		for DASHBOARD_PATH in $${DASHBOARD_PATHS}; \
 		do \
 			(cd $${DASHBOARD_PATH} && ${COPYTREE_SHARE} . $${DEST_COMPONENT_PATH}); \
 		done)
 .endfor
 .for BEATMOD in filebeat metricbeat
 	${MKDIR} ${STAGEDIR}${ETCDIR}/${BEATMOD}.modules.d ${STAGEDIR}${DATADIR}/${BEATMOD}/module
 	(cd ${WRKSRC}/${BEATMOD}/module && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/${BEATMOD}/module ${FIND_ARGS})
 	(cd ${WRKSRC}/${BEATMOD}/modules.d && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/${BEATMOD}.modules.d)
 .endfor
 
 .include <bsd.port.mk>
Index: head/sysutils/beats/files/filebeat.in
===================================================================
--- head/sysutils/beats/files/filebeat.in	(revision 528928)
+++ head/sysutils/beats/files/filebeat.in	(revision 528929)
@@ -1,37 +1,37 @@
 #!/bin/sh
 # $FreeBSD$
 
 # PROVIDE: filebeat
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
 # KEYWORD: shutdown
 
 # 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:="-path.home /var/db/beats/${name} -path.config %%PREFIX%%/etc"}
+: ${filebeat_config:="-path.home %%DATADIR%%/${name} -path.config %%PREFIX%%/etc"}
 
 # daemon
 start_precmd=filebeat_prestart
 command=/usr/sbin/daemon
 pidfile="/var/run/${name}"
 command_args="-rfP ${pidfile} %%PREFIX%%/sbin/${name} ${filebeat_config}"
 
 filebeat_prestart() {
 # Have to empty rc_flags so they don't get passed to daemon(8)
 	rc_flags=""
 }
 
 run_rc_command "$1"