Index: head/sysutils/beats/Makefile
===================================================================
--- head/sysutils/beats/Makefile	(revision 470948)
+++ head/sysutils/beats/Makefile	(revision 470949)
@@ -1,56 +1,57 @@
 # Created by: Palle Girgensohn <girgen@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	beats
 PORTVERSION=	6.2.4
+PORTREVISION=	1
 DISTVERSIONPREFIX=v
 CATEGORIES=	sysutils
 
 MAINTAINER=	elastic@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
 
 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/files/filebeat.in
===================================================================
--- head/sysutils/beats/files/filebeat.in	(revision 470948)
+++ head/sysutils/beats/files/filebeat.in	(revision 470949)
@@ -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"}
 
 # daemon
 start_precmd=filebeat_prestart
 command=/usr/sbin/daemon
 pidfile="/var/run/${name}"
-command_args="-rP ${pidfile} %%PREFIX%%/sbin/${name} ${filebeat_config}"
+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"
Index: head/sysutils/beats/files/heartbeat.in
===================================================================
--- head/sysutils/beats/files/heartbeat.in	(revision 470948)
+++ head/sysutils/beats/files/heartbeat.in	(revision 470949)
@@ -1,37 +1,37 @@
 #!/bin/sh
 # $FreeBSD$
 
 # PROVIDE: heartbeat
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
 # KEYWORD: shutdown
 
 # Add the following lines to /etc/rc.conf to enable heartbeat:
 #
 # heartbeat_enable (bool):	Set to YES to enable heartbeat
 # 				Default: NO
-# heartbeat_flags (str):		Extra flags passed to heartbeat
+# heartbeat_flags (str):	Extra flags passed to heartbeat
 # heartbeat_conf (str):		heartbeat configuration file
 #				Default: ${PREFIX}/etc/heartbeat.yml
 
 . /etc/rc.subr
 
 name="heartbeat"
 rcvar=${name}_enable
 load_rc_config $name
 
 : ${heartbeat_enable:="NO"}
 : ${heartbeat_config:="-path.home /var/db/beats/${name} -path.config %%PREFIX%%/etc"}
 
 # daemon
 start_precmd=heartbeat_prestart
 command=/usr/sbin/daemon
 pidfile="/var/run/${name}"
-command_args="-rP ${pidfile} %%PREFIX%%/sbin/${name} ${heartbeat_config}"
+command_args="-rfP ${pidfile} %%PREFIX%%/sbin/${name} ${heartbeat_config}"
 
 heartbeat_prestart() {
 # Have to empty rc_flags so they don't get passed to daemon(8)
 	rc_flags=""
 }
 
 run_rc_command "$1"
Index: head/sysutils/beats/files/metricbeat.in
===================================================================
--- head/sysutils/beats/files/metricbeat.in	(revision 470948)
+++ head/sysutils/beats/files/metricbeat.in	(revision 470949)
@@ -1,45 +1,45 @@
 #!/bin/sh
 # $FreeBSD$
 
 # PROVIDE: metricbeat
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
 # KEYWORD: shutdown
 
 # Add the following lines to /etc/rc.conf to enable metricbeat:
 #
 # metricbeat_enable (bool):	Set to YES to enable metricbeat
 # 				Default: NO
 # metricbeat_flags (str):	Extra flags passed to metricbeat
 # metricbeat_conf (str):	metricbeat configuration metric
 #				Default: ${PREFIX}/etc/metricbeat.yml
 
 . /etc/rc.subr
 
 name="metricbeat"
 rcvar=${name}_enable
 load_rc_config $name
 
 : ${metricbeat_enable:="NO"}
 : ${metricbeat_config:="-path.home /var/db/beats/${name} -path.config %%PREFIX%%/etc"}
 
 # daemon
 start_precmd=metricbeat_prestart
 command=/usr/sbin/daemon
 pidfile="/var/run/${name}"
-command_args="-rP ${pidfile} -p ${pidfile}.child %%PREFIX%%/sbin/${name} ${metricbeat_config}"
+command_args="-rfP ${pidfile} -p ${pidfile}.child %%PREFIX%%/sbin/${name} ${metricbeat_config}"
 
 metricbeat_prestart() {
 # Have to empty rc_flags so they don't get passed to daemon(8)
 	rc_flags=""
 }
 
 # metricbeat will refuse to quit if linprocfs is mounted, and sadly requires -9
 [ -f /compat/linux/proc/cpuinfo ] && stop_cmd=metricbeat_stop
 
 metricbeat_stop() {
 	pkill -9 -F ${pidfile} > /dev/null 2>&1
 	pkill -9 -F ${pidfile}.child > /dev/null 2>&1
 }
 
 run_rc_command "$1"
Index: head/sysutils/beats/files/packetbeat.in
===================================================================
--- head/sysutils/beats/files/packetbeat.in	(revision 470948)
+++ head/sysutils/beats/files/packetbeat.in	(revision 470949)
@@ -1,37 +1,37 @@
 #!/bin/sh
 # $FreeBSD$
 
 # PROVIDE: packetbeat
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
 # KEYWORD: shutdown
 
 # Add the following lines to /etc/rc.conf to enable packetbeat
 #
 # packetbeat_enable (bool):	Set to YES to enable packetbeat
 # 				Default: NO
 # packetbeat_flags (str):	Extra flags passed to packetbeat
 # packetbeat_conf (str):	packetbeat configuration file
 #				Default: ${PREFIX}/etc/packetbeat.yml
 
 . /etc/rc.subr
 
 name="packetbeat"
 rcvar=${name}_enable
 load_rc_config $name
 
 : ${packetbeat_enable:="NO"}
 : ${packetbeat_config:="-path.home /var/db/beats/${name} -path.config %%PREFIX%%/etc"}
 
 # daemon
 start_precmd=packetbeat_prestart
 command=/usr/sbin/daemon
 pidfile="/var/run/${name}"
-command_args="-rP ${pidfile} %%PREFIX%%/sbin/${name} ${packetbeat_config}"
+command_args="-rfP ${pidfile} %%PREFIX%%/sbin/${name} ${packetbeat_config}"
 
 packetbeat_prestart() {
 # Have to empty rc_flags so they don't get passed to daemon(8)
 	rc_flags=""
 }
 
 run_rc_command "$1"