Index: branches/2016Q1/net/ntp/Makefile
===================================================================
--- branches/2016Q1/net/ntp/Makefile	(revision 406835)
+++ branches/2016Q1/net/ntp/Makefile	(revision 406836)
@@ -1,77 +1,77 @@
 # Created by: andreas
 # $FreeBSD$
 
 PORTNAME=	ntp
-PORTVERSION=	4.2.8p5
+PORTVERSION=	4.2.8p6
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ \
 		http://archive.ntp.org/ntp4/ntp-4.2/ \
 		ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/ntp/ntp4/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/P/p/:S/.r/-RC/}
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	The Network Time Protocol Distribution
 
 LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
 
 CONFLICTS=	ntp-rc-* ntp-devel-*
 
 USES=		cpe pathfix shebangfix libedit libtool pkgconfig
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-silent-rules
 
 TEST_TARGET=	check
 
 SHEBANG_FILES=	scripts/ntptrace/ntptrace.in \
 		scripts/ntp-wait/ntp-wait.in \
 		scripts/update-leap/update-leap.in
 perl_OLD_CMD=	@PATH_PERL@
 
 .include "Makefile.inc"
 
 OPTIONS_DEFINE+=	DEBUG NLS THREADS
 OPTIONS_DEFAULT+=	THREADS
 OPTIONS_SUB=		yes
 
 DEBUG_CONFIGURE_ENABLE=	debugging
 
 IPV6_CONFIGURE_ENABLE=	ipv6
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_CONFIGURE_OFF=	ac_cv_lib_intl_gettext=no
 NLS_USES=	gettext-runtime
 
 NTP_SIGND_CONFIGURE_ENABLE=	ntp-signd
 
 NTPSNMPD_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
 NTPSNMPD_CONFIGURE_OFF=	--without-ntpsnmpd
 
 PERL_UTILS_USES=	perl5
 
 SSL_USE=		OPENSSL=yes
 SSL_CONFIGURE_ON=	--with-openssl-incdir=${OPENSSLINC} \
 			--with-openssl-libdir=${OPENSSLLIB}
 SSL_CONFIGURE_OFF=	--without-crypto
 
 THREADS_CONFIGURE_ENABLE=	thread-support
 THREADS_CONFIGURE_WITH=		threads
 
 .for D in ${NTP_DRIVERS}
 ${D}_CONFIGURE_ON=	--enable-${D}
 .endfor
 
 # XXX Temporary hack. Remember to remove this next commit.
 post-extract:
 	@${TOUCH} ${WRKSRC}/scripts/build/checkHtmlFileDates
 	@${CHMOD} +x ${WRKSRC}/scripts/build/checkHtmlFileDates
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/conf/* ${STAGEDIR}${EXAMPLESDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${FIND} ${WRKSRC}/html -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
 	@cd ${WRKSRC}/html && ${FIND} . -print | \
 		${CPIO} -pdu -R ${SHAREOWN}:${SHAREGRP} --quiet ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: branches/2016Q1/net/ntp/distinfo
===================================================================
--- branches/2016Q1/net/ntp/distinfo	(revision 406835)
+++ branches/2016Q1/net/ntp/distinfo	(revision 406836)
@@ -1,2 +1,2 @@
-SHA256 (ntp-4.2.8p5.tar.gz) = ca28baf4f6bb6fabdc1b62fd1dcec412be2e621192b40466a469a2496164f696
-SIZE (ntp-4.2.8p5.tar.gz) = 7138233
+SHA256 (ntp-4.2.8p6.tar.gz) = 583d0e1c573ace30a9c6afbea0fc52cae9c8c916dbc15c026e485a0dda4ba048
+SIZE (ntp-4.2.8p6.tar.gz) = 7152557
Index: branches/2016Q1
===================================================================
--- branches/2016Q1	(revision 406835)
+++ branches/2016Q1	(revision 406836)

Property changes on: branches/2016Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r406830