Index: branches/2017Q3/net-mgmt/nrpe/Makefile
===================================================================
--- branches/2017Q3/net-mgmt/nrpe/Makefile	(revision 449332)
+++ branches/2017Q3/net-mgmt/nrpe/Makefile	(revision 449333)
@@ -1,77 +1,77 @@
 # Created by: Paul Dlug<paul@nerdlabs.com>
 # $FreeBSD$
 
 PORTNAME=	nrpe
 DISTVERSION=	2.15
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/nagios/${PORTNAME}-2.x/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	zeising@FreeBSD.org
 COMMENT?=	Nagios Remote Plugin Executor
 
 LICENSE=	GPLv2
 
 CONFLICTS=	nrpe-ssl-2.*
 
 USES=		perl5
 USE_PERL5=	build
 USE_RC_SUBR=	nrpe2
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	SSL ARGS
 OPTIONS_RADIO=	PLUGINS
 OPTIONS_RADIO_PLUGINS=	MONPLUGINS NAGPLUGINS
 OPTIONS_DEFAULT=ARGS NAGPLUGINS
 
 SSL_DESC=	Enable SSL support (disables plain-text server)
 ARGS_DESC=	Enable command argument processing
 NAGPLUGINS_DESC=Use net-mgmt/nagios-plugins
 MONPLUGINS_DESC=Use net-mgmt/monitoring-plugins
 
 SSL_USES=		ssl
 SSL_CONFIGURE_ON=	--enable-ssl --with-ssl=${OPENSSLDIR} \
 			--with-ssl-inc=${OPENSSLINC} \
 			--with-ssl-lib=${OPENSSLLIB}
 SSL_CONFIGURE_OFF=	--disable-ssl
 SSL_CFLAGS=		-I${OPENSSLINC}
 
 ARGS_CONFIGURE_ON=	--enable-command-args
 ARGS_CONFIGURE_OFF=	--disable-command-args
 
 MONPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/monitoring-plugins
 NAGPLUGINS_RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:net-mgmt/nagios-plugins
 
 NAGIOSUSER?=	nagios
 NAGIOSGROUP?=	nagios
 USERS=		${NAGIOSUSER}
 GROUPS=		${NAGIOSGROUP}
 
 NRPE_PIDDIR?=	/var/run/nrpe2
 
 CONFIGURE_ARGS+=--bindir=${PREFIX}/sbin \
 		--libexecdir=${PREFIX}/libexec/nagios \
 		--sysconfdir=${PREFIX}/etc \
 		--with-nrpe-user=${NAGIOSUSER} \
 		--with-nrpe-group=${NAGIOSGROUP}
 
 PLIST_SUB=	NAGIOSUSER=${NAGIOSUSER} \
 		NAGIOSGROUP=${NAGIOSGROUP} \
 		NRPE_PIDDIR=${NRPE_PIDDIR}
 SUB_LIST+=	PIDDIR=${NRPE_PIDDIR}
 
 SUB_FILES=	pkg-message
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/var/run/nrpe.pid|${NRPE_PIDDIR}/nrpe2.pid|g' \
 		-e 's|/usr/lib/nagios/plugins/|${LOCALBASE}/libexec/nagios/|g' \
 		-e 's|/usr/bin/sudo|${LOCALBASE}/bin/sudo|g' \
 		${WRKSRC}/sample-config/nrpe.cfg.in
 do-install:
 	${INSTALL} -d ${STAGEDIR}${NRPE_PIDDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/src/nrpe ${STAGEDIR}${PREFIX}/sbin/nrpe2
 	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/nagios
 	${INSTALL_PROGRAM} ${WRKSRC}/src/check_nrpe ${STAGEDIR}${PREFIX}/libexec/nagios/check_nrpe2
 	${INSTALL_DATA} ${WRKSRC}/sample-config/nrpe.cfg ${STAGEDIR}${PREFIX}/etc/nrpe.cfg.sample
 
 .include <bsd.port.mk>
Index: branches/2017Q3/net-mgmt/nrpe/files/nrpe2.in
===================================================================
--- branches/2017Q3/net-mgmt/nrpe/files/nrpe2.in	(revision 449332)
+++ branches/2017Q3/net-mgmt/nrpe/files/nrpe2.in	(revision 449333)
@@ -1,53 +1,54 @@
 #!/bin/sh
 
 # $FreeBSD$
 #
 # PROVIDE: nrpe2
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf to enable nrpe2:
 # nrpe2_enable (bool):    Set to "NO" by default.
 #                         Set it to "YES" to enable nrpe2.
 # nrpe2_flags (str):      Not set by default.
 # nrpe2_configfile (str): Set to "%%PREFIX%%/etc/nrpe.cfg" by default.
 
 . /etc/rc.subr
 
 name=nrpe2
 rcvar=nrpe2_enable
 
 load_rc_config "${name}"
 
 : ${nrpe2_enable:=NO}
 : ${nrpe2_configfile:=%%PREFIX%%/etc/nrpe.cfg}
 
 required_files="${nrpe2_configfile}"
 
 command="%%PREFIX%%/sbin/nrpe2"
 command_args="-c ${nrpe2_configfile} -d"
 extra_commands=reload
 sig_reload=HUP
 
 start_precmd=nrpe2_prestart
 stop_precmd=find_pidfile
 
 find_pidfile()
 {
 	[ -n "$nrpe2_pidfile" ] &&
 	    warn "No longer necessary to set nrpe2_pidfile in rc.conf[.local]"
 
 	if get_pidfile_from_conf pid_file ${nrpe2_configfile}; then
 		pidfile="$_pidfile_from_conf"
 	else
 		pidfile='%%PIDDIR%%/nrpe2.pid'
 	fi
 }
 
 nrpe2_prestart()
 {
 	find_pidfile
 	install -d -o ${nrpe_user:-nagios} ${pidfile%/*}
+	rm -f ${pidfile}
 }
 
 run_rc_command "$1"
Index: branches/2017Q3
===================================================================
--- branches/2017Q3	(revision 449332)
+++ branches/2017Q3	(revision 449333)

Property changes on: branches/2017Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r449332