Index: head/net/chrony/Makefile
===================================================================
--- head/net/chrony/Makefile	(revision 530886)
+++ head/net/chrony/Makefile	(revision 530887)
@@ -1,89 +1,89 @@
 # Created by: Masaki TAGAWA <masaki@club.kyutech.ac.jp>
 # $FreeBSD$
 
 PORTNAME=	chrony
 PORTVERSION=	3.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://download.tuxfamily.org/chrony/
 
 MAINTAINER=	mandree@FreeBSD.org
 COMMENT=	System clock synchronization client and server
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		cpe gmake libedit pkgconfig
 USERS=		chronyd
 GROUPS=		chronyd
 
 CPE_VENDOR=	tuxfamily
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--chronyvardir=/var/db/${PORTNAME} \
 		--sysconfdir=${PREFIX}/etc --mandir=${MANPREFIX}/man \
 		--datarootdir=${DATADIR} --docdir=${DOCSDIR} \
 		--with-readline-library=${LOCALBASE}/lib \
 		--with-user=chronyd --without-tomcrypt
 USE_RC_SUBR=	chronyd
 
 ALL_TARGET=	all
 INSTALL_TARGET=	install
 PORTDOCS=	FAQ NEWS README
 PORTEXAMPLES=	chrony.conf.example1 chrony.conf.example2 \
 		chrony.conf.example3 chrony.keys.example
 
 # XXX: there are also other potentially useful options worth looking into:
 #  --disable-pps        Disable PPS API support
 OPTIONS_DEFINE=		DOCS HTMLDOCS EXAMPLES IPV6 
 OPTIONS_DEFAULT=	NETTLE
 OPTIONS_RADIO=		CRYPTLIB
 OPTIONS_RADIO_CRYPTLIB=	NETTLE NSS
 HTMLDOCS_IMPLIES=	DOCS
 OPTIONS_SUB=		yes
 
 HTMLDOCS_DESC=		Build HTML docs (IMPLIES DOCS, needs ruby, asciidoctor)
 NETTLE_DESC=		Nettle crypto library support
 NSS_DESC=		NSS-based support for more hashing algorithms
 
 IPV6_CONFIGURE_OFF=	--disable-ipv6
 NETTLE_CONFIGURE_OFF=	--without-nettle
 NETTLE_LIB_DEPENDS=	libnettle.so:security/nettle
 NSS_CONFIGURE_OFF=	--without-nss
 NSS_LIB_DEPENDS=	libfreebl3.so:security/nss
 
 HTMLDOCS_BUILD_DEPENDS+=asciidoctor:textproc/rubygem-asciidoctor
 HTMLDOCS_ALL_TARGET=	docs
 HTMLDOCS_INSTALL_TARGET=docs
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
 .endif
 
 .if ${PORT_OPTIONS:MHTMLDOCS}
 PORTDOCS+=		doc/*.html
 .endif
 
 post-patch:
 	cd ${WRKSRC}/examples && \
 		${REINPLACE_CMD} -e 's!%%PREFIX%%!${PREFIX}!g' ${PORTEXAMPLES}
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/chronyc
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/chronyd
 	${INSTALL_DATA} ${WRKSRC}/examples/chrony.conf.example3 \
 		${STAGEDIR}${PREFIX}/etc/chrony.conf.sample
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${RM} doc/installation.html
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && \
 		${INSTALL_DATA} ${PORTEXAMPLES} ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.post.mk>
Index: head/net/chrony/files/chronyd.in
===================================================================
--- head/net/chrony/files/chronyd.in	(revision 530886)
+++ head/net/chrony/files/chronyd.in	(revision 530887)
@@ -1,35 +1,34 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 # PROVIDE: chronyd
 # REQUIRE: DAEMON
 # KEYWORD: nojail shutdown
 #
 # Add the following lines to /etc/rc.conf.local or /etc/rc.conf
 # to enable this service:
 #
 # chronyd_enable (bool):	Set it to "YES" to enable chronyd
 #				Default is "NO"
 # chronyd_config (str):		Set full path to configuration file.
 #				Default is "%%PREFIX%%/etc/chrony.conf"
 # chronyd_flags (str):		Flags passed to chronyd(8)
 #				Default is ""
 #
 
 . /etc/rc.subr
 
 name=chronyd
 rcvar=chronyd_enable
 
 load_rc_config ${name}
 
 : ${chronyd_enable:="NO"}
 : ${chronyd_config:="%%PREFIX%%/etc/chrony.conf"}
 
 command=%%PREFIX%%/sbin/${name}
-command_args="-f ${chronyd_config}"
-pidfile=/var/run/chrony/${name}.pid
-required_files=${chronyd_config}
+command_args="-f \"${chronyd_config}\""
+required_files="${chronyd_config}"
 
 run_rc_command "$1"