Update to 5.7p2 based on PR 49583 by Paul B. Henson.

2015-01-20  OpenNTPD 5.7p2

	* Switched the drift file from an unscaled frequency offset to ppm.
	  The latter format is compatible with that of ntp.org.  This allows
	  easy switching between ntpd daemons
	* Fixed a memory leak in DNS lookups.
	* Added support for setting the process title on Linux and OS X.
	  The different processes are now possible to tell apart by role in
	  the process list.
	* Import NetBSD support.
	* Various bugfixes and refinements from the community.

2015-01-08  OpenNTPD 5.7p1

	* Support for a new build infrastructure based on the LibreSSL
	  framework. Source code is integrated directly from the OpenBSD tree
	  with few manual changes, easing maintenance.
	* Removed support for several OSes pending test reports and updated
	  portability code.
	* Supports the Simple Network Time Protocol version 4 as described in
	  RFC 5905
	* Added route virtualization (rdomain) support.
	* Added ntpctl(8), which allows for querying ntpd(8) at runtime.
	* Finer-grained clock adjustment via adjfreq / ntp_adjtime where
	  available.
	* Improved latency on heavily-loaded machines.

4 files changed, 40 insertions, 18 deletions

diff --git a/net/openntpd/DESCR b/net/openntpd/DESCR
index 9126bd99ea1..d0ef78e6565 100644
--- a/net/openntpd/DESCR
+++ b/net/openntpd/DESCR
@@ -1,8 +1,14 @@
-OpenNTPd is a free implementation of the Network Time Protocol.
-It provides the ability to sync the local clock to remote NTP servers and
-can act as NTP server itself, redistributing the local clock.
+OpenNTPD is a FREE, easy to use implementation of the Network Time Protocol. It
+provides the ability to sync the local clock to remote NTP servers and can act
+as NTP server itself, redistributing the local clock.
 
-OpenNTPd is primarily developed by Henning Brauer and Alexander Guy as part
-of the OpenBSD Project. The portable version is made by Darren Tucker.
-The software and is freely useable and re-useable by everyone under a BSD
-license.
+OpenNTPD was primarily developed by Henning Brauer as part of the OpenBSD
+Project and gets released as a base component of OpenBSD every six months.
+
+The portable version is maintained by Brent Cook and is mirrored on Github and
+available as periodic tarball releases. Contributions are welcome to both the
+OpenNTPD core and the portable build framework.
+
+The software is freely usable and re-usable by everyone under a BSD license.
+The OpenBSD project sells CDs, T-Shirts and Posters. Sales of these items help
+to fund development.
diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile
index dbfdbcff098..c0c65e98be0 100644
--- a/net/openntpd/Makefile
+++ b/net/openntpd/Makefile
@@ -1,18 +1,31 @@
-# $NetBSD: Makefile,v 1.36 2015/01/17 05:51:43 obache Exp $
+# $NetBSD: Makefile,v 1.37 2015/01/20 10:45:01 wiz Exp $
 
-DISTNAME=		openntpd-3.9p1
-PKGREVISION=		5
+DISTNAME=		openntpd-5.7p2
 CATEGORIES=		net
 MASTER_SITES=		${MASTER_SITE_OPENBSD:=OpenNTPD/}
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
+MAINTAINER=		henson@acm.org
 HOMEPAGE=		http://www.openntpd.org/
 COMMENT=		Free implementation of the Network Time Protocol
+LICENSE=		isc
 
 CONFLICTS+=		ntp-[0-9]*
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
+CONFIGURE_ARGS+=	--with-privsep-path=path=${VARBASE}/chroot/ntpd
+
+SUBST_CLASSES+=		ntpd_m
+SUBST_STAGE.ntpd_m=	pre-build
+SUBST_FILES.ntpd_m=	ntpd.8 ntpctl.8
+SUBST_SED.ntpd_m+=	-e 's,/var/db/,${VARBASE}/db/openntpd/,g'
+SUBST_SED.ntpd_m+=	-e 's,/var/run/,${VARBASE}/run/,g'
+
+SUBST_CLASSES+=		ntpd_h
+SUBST_STAGE.ntpd_h=	pre-build
+SUBST_FILES.ntpd_h=	ntpd.h
+SUBST_SED.ntpd_h+=	-e 's,/db/ntpd.drift,/db/openntpd/ntpd.drift,g'
 
 EGDIR=			${PREFIX}/share/examples/openntpd
 CONF_FILES=		${EGDIR}/ntpd.conf ${PKG_SYSCONFDIR}/ntpd.conf
@@ -31,9 +44,10 @@ INSTALLATION_DIRS+=	sbin ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 ${EGDIR}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ntpd ${DESTDIR}${PREFIX}/sbin/ntpd
+	ln ${DESTDIR}${PREFIX}/sbin/ntpd ${DESTDIR}${PREFIX}/sbin/ntpctl
 	${INSTALL_MAN} ${WRKSRC}/ntpd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/ntpd.8
+	${INSTALL_MAN} ${WRKSRC}/ntpctl.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/ntpctl.8
 	${INSTALL_MAN} ${WRKSRC}/ntpd.conf.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/ntpd.conf.5
 	${INSTALL_DATA} ${WRKSRC}/ntpd.conf ${DESTDIR}${EGDIR}/ntpd.conf
 
-.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/openntpd/PLIST b/net/openntpd/PLIST
index 7f71f0db743..f7a99a9cd12 100644
--- a/net/openntpd/PLIST
+++ b/net/openntpd/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2014/03/11 14:05:10 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.5 2015/01/20 10:45:01 wiz Exp $
 man/man5/ntpd.conf.5
+man/man8/ntpctl.8
 man/man8/ntpd.8
+sbin/ntpctl
 sbin/ntpd
 share/examples/openntpd/ntpd.conf
diff --git a/net/openntpd/distinfo b/net/openntpd/distinfo
index 7ab2712ac3a..b3b2a283ca0 100644
--- a/net/openntpd/distinfo
+++ b/net/openntpd/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.7 2006/08/20 14:50:43 peter Exp $
+$NetBSD: distinfo,v 1.8 2015/01/20 10:45:01 wiz Exp $
 
-SHA1 (openntpd-3.9p1.tar.gz) = 098a435d02886a9e4d34afb15b15fde795eda1e9
-RMD160 (openntpd-3.9p1.tar.gz) = c348004116c78810daa9451f15abcc26788949a8
-Size (openntpd-3.9p1.tar.gz) = 152700 bytes
+SHA1 (openntpd-5.7p2.tar.gz) = ccfb9a0c9acff8a8643d7604ed66a070b7f6bd4e
+RMD160 (openntpd-5.7p2.tar.gz) = e99c3d1a7535ea4b85feca93d4b5158e396ac740
+Size (openntpd-5.7p2.tar.gz) = 408421 bytes