Update to ntp 4.2.0.

All platforms:

	Autokey, using OpenSSL.
	IPv6 support.
	Bugfixes in loopfilter and refclocks.

NetBSD:

	Support for editline command line editing
	    in "ntpq" and "ntpdc".

NetBSD-current:

	Use nanosecond resolution POSIX timers.

3 files changed, 136 insertions, 111 deletions

diff --git a/net/ntp4/Makefile b/net/ntp4/Makefile
index 3c77c6e20a5..7f7614d90fe 100644
--- a/net/ntp4/Makefile
+++ b/net/ntp4/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2003/10/24 04:35:16 fredb Exp $
+# $NetBSD: Makefile,v 1.25 2003/10/24 04:52:26 fredb Exp $
 #
 
-DISTNAME=	ntp-4.1.1a
+DISTNAME=	ntp-4.2.0
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.udel.edu/pub/ntp/ntp4/		\
 		http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/
@@ -11,20 +11,13 @@ HOMEPAGE=	http://www.ntp.org/
 COMMENT=	Network Time Protocol Version 4
 
 GNU_CONFIGURE=	YES
+#USE_BUILDLINK2=YES ***FIXME: Causes lots of "missing prototype" warnings.***
 
 CONFIGURE_ENV+=	PATH_PERL="${PERL5}"
-CONFIGURE_ENV+=	ac_cv_lib_readline_readline=no
 
 DOCDIR=		${PREFIX}/share/doc/html
 EXAMPLESDIR=	${PREFIX}/share/examples
 
-pre-configure:
-	cd ${WRKSRC} &&						\
-	    ${TOUCH} stamp-h.in COPYRIGHT			\
-		    `${FIND} . -name aclocal.m4 -print`		\
-		    `${FIND} . -name configure -print`		\
-		    `${FIND} . -name Makefile.in -print`
-
 post-install:
 	cd ${WRKSRC} &&						\
 	    ${RM} conf/.cvsignore* 2> /dev/null || ${TRUE};	\
@@ -36,4 +29,24 @@ post-install:
 	${CHMOD} a+x ${DOCDIR}/ntp4 ${DOCDIR}/ntp4/hints ${DOCDIR}/ntp4/pic
 	${CHMOD} a+x ${EXAMPLESDIR}/ntp4
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+#
+# Use POSIX nanosecond timers when available, but not otherwise.
+#
+LOWER_OPSYS_VERSUFFIX=	1
+MACHINE_GNU_PLATFORM=	${LOWER_ARCH}--${LOWER_OPSYS}${LOWER_OPSYS_VERSUFFIX}
+. for __wildcard__ in 1.6[N-Z]* 2*
+.  if ${OS_VERSION:M${__wildcard__}} != ""
+LOWER_OPSYS_VERSUFFIX=	2
+.  endif
+. endfor
+#
+# Don't pick up libwww's -lmd5, until buildlink can be fixed.
+#
+CONFIGURE_ENV+=	ac_cv_lib_md5_MD5Init=no
+.endif
+
+.include "../../security/openssl/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ntp4/PLIST b/net/ntp4/PLIST
index f9e783ea7e2..0c535f2d8b1 100644
--- a/net/ntp4/PLIST
+++ b/net/ntp4/PLIST
@@ -1,95 +1,95 @@
-@comment $NetBSD: PLIST,v 1.3 2002/07/16 14:57:08 fredb Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/10/24 04:52:26 fredb Exp $
+bin/ntp-keygen
+bin/ntp-wait
 bin/ntpd
 bin/ntpdate
 bin/ntpdc
 bin/ntpq
 bin/ntptime
-bin/ntptimeset
 bin/ntptrace
-bin/ntp-genkeys
-bin/ntp-wait
 bin/tickadj
-share/doc/html/ntp4/Oncore-SHMEM.htm
-share/doc/html/ntp4/accopt.htm
-share/doc/html/ntp4/assoc.htm
-share/doc/html/ntp4/audio.htm
-share/doc/html/ntp4/authopt.htm
-share/doc/html/ntp4/biblio.htm
-share/doc/html/ntp4/build.htm
-share/doc/html/ntp4/clockopt.htm
-share/doc/html/ntp4/config.htm
-share/doc/html/ntp4/confopt.htm
-share/doc/html/ntp4/copyright.htm
-share/doc/html/ntp4/debug.htm
-share/doc/html/ntp4/driver1.htm
-share/doc/html/ntp4/driver2.htm
-share/doc/html/ntp4/driver3.htm
-share/doc/html/ntp4/driver4.htm
-share/doc/html/ntp4/driver5.htm
-share/doc/html/ntp4/driver6.htm
-share/doc/html/ntp4/driver7.htm
-share/doc/html/ntp4/driver8.htm
-share/doc/html/ntp4/driver9.htm
-share/doc/html/ntp4/driver10.htm
-share/doc/html/ntp4/driver11.htm
-share/doc/html/ntp4/driver12.htm
-share/doc/html/ntp4/driver16.htm
-share/doc/html/ntp4/driver18.htm
-share/doc/html/ntp4/driver19.htm
-share/doc/html/ntp4/driver20.htm
-share/doc/html/ntp4/driver22.htm
-share/doc/html/ntp4/driver23.htm
-share/doc/html/ntp4/driver24.htm
-share/doc/html/ntp4/driver26.htm
-share/doc/html/ntp4/driver27.htm
-share/doc/html/ntp4/driver28.htm
-share/doc/html/ntp4/driver29.htm
-share/doc/html/ntp4/driver30.htm
-share/doc/html/ntp4/driver32.htm
-share/doc/html/ntp4/driver33.htm
-share/doc/html/ntp4/driver34.htm
-share/doc/html/ntp4/driver35.htm
-share/doc/html/ntp4/driver36.htm
-share/doc/html/ntp4/driver37.htm
-share/doc/html/ntp4/driver38.htm
-share/doc/html/ntp4/driver39.htm
-share/doc/html/ntp4/driver40.htm
-share/doc/html/ntp4/driver42.html
-share/doc/html/ntp4/exec.htm
-share/doc/html/ntp4/extern.htm
-share/doc/html/ntp4/gadget.htm
-share/doc/html/ntp4/genkeys.htm
-share/doc/html/ntp4/hints.htm
-share/doc/html/ntp4/howto.htm
-share/doc/html/ntp4/htmlprimer.htm
-share/doc/html/ntp4/index.htm
-share/doc/html/ntp4/kern.htm
-share/doc/html/ntp4/kernpps.htm
-share/doc/html/ntp4/ldisc.htm
-share/doc/html/ntp4/leap.htm
-share/doc/html/ntp4/measure.htm
-share/doc/html/ntp4/miscopt.htm
-share/doc/html/ntp4/monopt.htm
-share/doc/html/ntp4/mx4200data.htm
-share/doc/html/ntp4/notes.htm
-share/doc/html/ntp4/ntpd.htm
-share/doc/html/ntp4/ntpdate.htm
-share/doc/html/ntp4/ntpdc.htm
-share/doc/html/ntp4/ntpq.htm
-share/doc/html/ntp4/ntptime.htm
-share/doc/html/ntp4/ntptrace.htm
-share/doc/html/ntp4/parsedata.htm
-share/doc/html/ntp4/parsenew.htm
-share/doc/html/ntp4/patches.htm
-share/doc/html/ntp4/porting.htm
-share/doc/html/ntp4/pps.htm
-share/doc/html/ntp4/prefer.htm
-share/doc/html/ntp4/qth.htm
-share/doc/html/ntp4/quick.htm
-share/doc/html/ntp4/rdebug.htm
-share/doc/html/ntp4/refclock.htm
-share/doc/html/ntp4/release.htm
-share/doc/html/ntp4/tickadj.htm
+share/doc/html/ntp4/accopt.html
+share/doc/html/ntp4/assoc.html
+share/doc/html/ntp4/audio.html
+share/doc/html/ntp4/authopt.html
+share/doc/html/ntp4/build.html
+share/doc/html/ntp4/clockopt.html
+share/doc/html/ntp4/config.html
+share/doc/html/ntp4/confopt.html
+share/doc/html/ntp4/copyright.html
+share/doc/html/ntp4/debug.html
+share/doc/html/ntp4/extern.html
+share/doc/html/ntp4/hints.html
+share/doc/html/ntp4/howto.html
+share/doc/html/ntp4/index.html
+share/doc/html/ntp4/kern.html
+share/doc/html/ntp4/keygen.html
+share/doc/html/ntp4/ldisc.html
+share/doc/html/ntp4/manyopt.html
+share/doc/html/ntp4/measure.html
+share/doc/html/ntp4/miscopt.html
+share/doc/html/ntp4/monopt.html
+share/doc/html/ntp4/msyslog.html
+share/doc/html/ntp4/mx4200data.html
+share/doc/html/ntp4/notes.html
+share/doc/html/ntp4/ntpd.html
+share/doc/html/ntp4/ntpdate.html
+share/doc/html/ntp4/ntpdc.html
+share/doc/html/ntp4/ntpdsim.html
+share/doc/html/ntp4/ntpq.html
+share/doc/html/ntp4/ntptime.html
+share/doc/html/ntp4/ntptrace.html
+share/doc/html/ntp4/parsedata.html
+share/doc/html/ntp4/parsenew.html
+share/doc/html/ntp4/patches.html
+share/doc/html/ntp4/porting.html
+share/doc/html/ntp4/pps.html
+share/doc/html/ntp4/prefer.html
+share/doc/html/ntp4/quick.html
+share/doc/html/ntp4/rdebug.html
+share/doc/html/ntp4/refclock.html
+share/doc/html/ntp4/release.html
+share/doc/html/ntp4/sntp.html
+share/doc/html/ntp4/tickadj.html
+share/doc/html/ntp4/drivers/driver1.html
+share/doc/html/ntp4/drivers/driver2.html
+share/doc/html/ntp4/drivers/driver3.html
+share/doc/html/ntp4/drivers/driver4.html
+share/doc/html/ntp4/drivers/driver5.html
+share/doc/html/ntp4/drivers/driver6.html
+share/doc/html/ntp4/drivers/driver7.html
+share/doc/html/ntp4/drivers/driver8.html
+share/doc/html/ntp4/drivers/driver9.html
+share/doc/html/ntp4/drivers/driver10.html
+share/doc/html/ntp4/drivers/driver11.html
+share/doc/html/ntp4/drivers/driver12.html
+share/doc/html/ntp4/drivers/driver16.html
+share/doc/html/ntp4/drivers/driver18.html
+share/doc/html/ntp4/drivers/driver19.html
+share/doc/html/ntp4/drivers/driver20.html
+share/doc/html/ntp4/drivers/driver22.html
+share/doc/html/ntp4/drivers/driver23.html
+share/doc/html/ntp4/drivers/driver24.html
+share/doc/html/ntp4/drivers/driver26.html
+share/doc/html/ntp4/drivers/driver27.html
+share/doc/html/ntp4/drivers/driver28.html
+share/doc/html/ntp4/drivers/driver29.html
+share/doc/html/ntp4/drivers/driver30.html
+share/doc/html/ntp4/drivers/driver32.html
+share/doc/html/ntp4/drivers/driver33.html
+share/doc/html/ntp4/drivers/driver34.html
+share/doc/html/ntp4/drivers/driver35.html
+share/doc/html/ntp4/drivers/driver36.html
+share/doc/html/ntp4/drivers/driver37.html
+share/doc/html/ntp4/drivers/driver38.html
+share/doc/html/ntp4/drivers/driver39.html
+share/doc/html/ntp4/drivers/driver40.html
+share/doc/html/ntp4/drivers/driver42.html
+share/doc/html/ntp4/drivers/driver43.html
+share/doc/html/ntp4/drivers/driver44.html
+share/doc/html/ntp4/drivers/oncore-shmem.html
+share/doc/html/ntp4/drivers/icons/home.gif
+share/doc/html/ntp4/drivers/icons/mail2.gif
 share/doc/html/ntp4/hints/a-ux
 share/doc/html/ntp4/hints/aix
 share/doc/html/ntp4/hints/bsdi
@@ -99,31 +99,31 @@ share/doc/html/ntp4/hints/decosf2
 share/doc/html/ntp4/hints/freebsd
 share/doc/html/ntp4/hints/hpux
 share/doc/html/ntp4/hints/linux
-share/doc/html/ntp4/hints/notes-xntp-v3
 share/doc/html/ntp4/hints/mpeix
+share/doc/html/ntp4/hints/netbsd
+share/doc/html/ntp4/hints/notes-xntp-v3
 share/doc/html/ntp4/hints/parse
 share/doc/html/ntp4/hints/refclocks
 share/doc/html/ntp4/hints/rs6000
-share/doc/html/ntp4/hints/sco.htm
+share/doc/html/ntp4/hints/sco.html
 share/doc/html/ntp4/hints/sgi
+share/doc/html/ntp4/hints/solaris-dosynctodr.html
 share/doc/html/ntp4/hints/solaris.html
 share/doc/html/ntp4/hints/solaris.xtra.4023118
 share/doc/html/ntp4/hints/solaris.xtra.4095849
 share/doc/html/ntp4/hints/solaris.xtra.S99ntpd
 share/doc/html/ntp4/hints/solaris.xtra.patchfreq
-share/doc/html/ntp4/hints/solaris-dosynctodr.html
 share/doc/html/ntp4/hints/sun4
 share/doc/html/ntp4/hints/svr4-dell
 share/doc/html/ntp4/hints/svr4_package
 share/doc/html/ntp4/hints/todo
-share/doc/html/ntp4/hints/vxworks.htm
 share/doc/html/ntp4/hints/vxworks.html
-share/doc/html/ntp4/hints/winnt.htm
+share/doc/html/ntp4/hints/winnt.html
+share/doc/html/ntp4/icons/home.gif
+share/doc/html/ntp4/icons/mail2.gif
 share/doc/html/ntp4/pic/9400n.jpg
 share/doc/html/ntp4/pic/alice11.gif
-share/doc/html/ntp4/pic/alice12.gif
 share/doc/html/ntp4/pic/alice13.gif
-share/doc/html/ntp4/pic/alice15.gif
 share/doc/html/ntp4/pic/alice23.gif
 share/doc/html/ntp4/pic/alice31.gif
 share/doc/html/ntp4/pic/alice32.gif
@@ -137,18 +137,19 @@ share/doc/html/ntp4/pic/barnstable.gif
 share/doc/html/ntp4/pic/beaver.gif
 share/doc/html/ntp4/pic/boom3.gif
 share/doc/html/ntp4/pic/boom3a.gif
-share/doc/html/ntp4/pic/boom4.gif
 share/doc/html/ntp4/pic/bustardfly.gif
 share/doc/html/ntp4/pic/c51.jpg
+share/doc/html/ntp4/pic/dogsnake.gif
 share/doc/html/ntp4/pic/driver29.gif
+share/doc/html/ntp4/pic/driver43_1.gif
+share/doc/html/ntp4/pic/driver43_2.jpg
 share/doc/html/ntp4/pic/fg6021.gif
 share/doc/html/ntp4/pic/fg6039.jpg
-share/doc/html/ntp4/pic/flatheads.gif
 share/doc/html/ntp4/pic/gadget.jpg
 share/doc/html/ntp4/pic/gps167.jpg
-share/doc/html/ntp4/pic/home.gif
 share/doc/html/ntp4/pic/hornraba.gif
 share/doc/html/ntp4/pic/igclock.gif
+share/doc/html/ntp4/pic/neoclock4x.gif
 share/doc/html/ntp4/pic/oncore_evalbig.gif
 share/doc/html/ntp4/pic/oncore_remoteant.jpg
 share/doc/html/ntp4/pic/oncore_utplusbig.gif
@@ -167,18 +168,29 @@ share/doc/html/ntp4/pic/pzf509.jpg
 share/doc/html/ntp4/pic/rabbit.gif
 share/doc/html/ntp4/pic/radio2.jpg
 share/doc/html/ntp4/pic/sheepb.jpg
-share/doc/html/ntp4/pic/tonea.gif
 share/doc/html/ntp4/pic/stack1a.jpg
+share/doc/html/ntp4/pic/tonea.gif
 share/doc/html/ntp4/pic/wingdorothy.gif
+share/doc/html/ntp4/scripts/footer.txt
+share/doc/html/ntp4/scripts/links7.txt
+share/doc/html/ntp4/scripts/links8.txt
+share/doc/html/ntp4/scripts/links9.txt
+share/doc/html/ntp4/scripts/links10.txt
+share/doc/html/ntp4/scripts/links11.txt
+share/doc/html/ntp4/scripts/links12.txt
+share/doc/html/ntp4/scripts/style.css
 share/examples/ntp4/README
-share/examples/ntp4/beauregard.conf
 share/examples/ntp4/baldwin.conf
-share/examples/ntp4/dewey.conf
+share/examples/ntp4/beauregard.conf
 share/examples/ntp4/grundoon.conf
 share/examples/ntp4/malarky.conf
 share/examples/ntp4/pogo.conf
 share/examples/ntp4/rackety.conf
 @dirrm share/examples/ntp4
+@dirrm share/doc/html/ntp4/scripts
 @dirrm share/doc/html/ntp4/pic
+@dirrm share/doc/html/ntp4/icons
 @dirrm share/doc/html/ntp4/hints
+@dirrm share/doc/html/ntp4/drivers/icons
+@dirrm share/doc/html/ntp4/drivers
 @dirrm share/doc/html/ntp4
diff --git a/net/ntp4/distinfo b/net/ntp4/distinfo
index 89e7baa71e2..a9e326e2532 100644
--- a/net/ntp4/distinfo
+++ b/net/ntp4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/07/16 14:57:08 fredb Exp $
+$NetBSD: distinfo,v 1.8 2003/10/24 04:52:26 fredb Exp $
 
-SHA1 (ntp-4.1.1a.tar.gz) = a55ae3ae3aed8d8a37651bfa7b63dc622a33a52a
-Size (ntp-4.1.1a.tar.gz) = 2023986 bytes
+SHA1 (ntp-4.2.0.tar.gz) = 38343a4ebfc0b8d9aff3bec4c6a93f4c59071ce3
+Size (ntp-4.2.0.tar.gz) = 2514502 bytes