Update ntp to 4.2.4p4.

---
(4.2.4p4) Released by Harlan Stenn <stenn@ntp.org>

* [Bug 902] Fix problems with the -6 flag.
* Updated include/copyright.def (owner and year).
* [Bug 878] Avoid ntpdc use of refid value as unterminated string.
* [Bug 881] Corrected display of pll offset on 64bit systems.
* [Bug 886] Corrected sign handling on 64bit in ntpdc loopinfo command.
* [Bug 889] avoid malloc() interrupted by SIGIO risk
* ntpd/refclock_parse.c: cleanup shutdown while the file descriptor is still open.
* [Bug 885] use emalloc() to get a message at the end of the memory
            unsigned types cannot be less than 0
            default_ai_family is a short
            lose trailing , from enum list
	    clarify ntp_restrict.c for easier automated analysis
* [Bug 884] don't access recv buffers after having them passed to the free list.
* [Bug 882] allow loopback interfaces to share addresses with other interfaces.

---
(4.2.4p3) Released by Harlan Stenn <stenn@ntp.org>

* [Bug 863] unable to stop ntpd on Windows as the handle reference for events
	    changed

---
(4.2.4p2) Released by Harlan Stenn <stenn@ntp.org>

* [Bug 854] Broadcast address was not correctly set for interface addresses
* [Bug 829] reduce syslog noise, while there fix Enabled/Disable logging
	    to reflect the actual configuration.
* [Bug 795] Moved declaration of variable to top of function.
* [Bug 789] Fix multicast client crypto authentication and make sure arriving
	    multicast packets do not disturb the autokey dance.
* [Bug 785] improve handling of multicast interfaces
	    (multicast routers still need to run a multicast routing
	    software/daemon)
* [Bug 527] Don't write from source address length to wrong location
* Upgraded autogen and libopts.
* [Bug 811] ntpd should not read a .ntprc file.

---
(4.2.4p1) (skipped)

---
(4.2.4p0) Released by Harlan Stenn <stenn@ntp.org>

* [Bug 793] Update Hans Lambermont's email address in ntpsweep.
* [Bug 776] Remove unimplemented "rate" flag from ntpdate.
* [Bug 586] Avoid lookups if AI_NUMERICHOST is set.
* [Bug 770] Fix numeric parameters to ntp-keygen (Alain Guibert).
* [Bug 768] Fix io_setbclient() error message.
* [Bug 765] Use net_bind_service capability on linux.
* [Bug 760] The background resolver must be aware of the 'dynamic' keyword.
* [Bug 753] make union timestamp anonymous (Philip Prindeville).
* confopt.html: move description for "dynamic" keyword into the right section.
* pick the right type for the recv*() length argument.

---
(4.2.4) Released by Harlan Stenn <stenn@ntp.org>

* monopt.html fixes from Dave Mills.
* [Bug 452] Do not report kernel PLL/FLL flips.
* [Bug 746] Expert mouseCLOCK USB v2.0 support added.'
* driver8.html updates.
* [Bug 747] Drop <NOBR> tags from ntpdc.html.
* sntp now uses the returned precision to control decimal places.
* sntp -u will use an unprivileged port for its queries.
* [Bug 741] "burst" doesn't work with !unfit peers.
* [Bug 735] Fix a make/gmake VPATH issue on Solaris.
* [Bug 739] ntpd -x should not take an argument.
* [Bug 737] Some systems need help providing struct iovec.
* [Bug 717] Fix libopts compile problem.
* [Bug 728] parse documentation fixes.
* [Bug 734] setsockopt(..., IP_MULTICAST_IF, ...) fails on 64-bit platforms.
* [Bug 732] C-DEX JST2000 patch from Hideo Kuramatsu.
* [Bug 721] check for __ss_family and __ss_len separately.
* [Bug 666] ntpq opeers displays jitter rather than dispersion.
* [Bug 718] Use the recommended type for the saddrlen arg to getsockname().
* [Bug 715] Fix a multicast issue under Linux.
* [Bug 690] Fix a Windows DNS lookup buffer overflow.
* [Bug 670] Resolved a Windows issue with the dynamic interface rescan code.
* K&R C support is being deprecated.
* [Bug 714] ntpq -p should conflict with -i, not -c.
* WWV refclock improvements from Dave Mills.
* [Bug 708] Use thread affinity only for the clock interpolation thread.
* [Bug 706] ntpd can be running several times in parallel.
* [Bug 704] Documentation typos.
* [Bug 701] coverity: NULL dereference in ntp_peer.c
* [Bug 695] libopts does not protect against macro collisions.
* [Bug 693] __adjtimex is independent of ntp_{adj,get}time.
* [Bug 692] sys_limitrejected was not being incremented.
* [Bug 691] restrictions() assumption not always valid.
* [Bug 689] Deprecate HEATH GC-1001 II; the driver never worked.
* [Bug 688] Fix documentation typos.
* [Bug 686] Handle leap seconds better under Windows.
* [Bug 685] Use the Windows multimedia timer.
* [Bug 684] Only allow debug options if debugging is enabled.
* [Bug 683] Use the right version string.
* [Bug 680] Fix the generated version string on Windows.
* [Bug 678] Use the correct size for control messages.
* [Bug 677] Do not check uint_t in configure.ac.
* [Bug 676] Use the right value for msg_namelen.
* [Bug 675] Make sure ntpd builds without debugging.
* [Bug 672] Fix cross-platform structure padding/size differences.
* [Bug 660] New TIMESTAMP code fails tp build on Solaris Express.
* [Bug 659] libopts does not build under Windows.
* [Bug 658] HP-UX with cc needs -Wp,-H8166 in CFLAGS.
* [Bug 656] ntpdate doesn't work with multicast address.
* [Bug 638] STREAMS_TLI is deprecated - remove it.
* [Bug 635] Fix tOptions definition.
* [Bug 628] Fallback to ntp discipline not working for large offsets.
* [Bug 622] Dynamic interface tracking for ntpd.
* [Bug 603] Don't link with libelf if it's not needed.
* [Bug 523] ntpd service under Windows does't shut down properly.
* [Bug 500] sntp should always be built.
* [Bug 479] Fix the -P option.
* [Bug 421] Support the bc637PCI-U card.
* [Bug 342] Deprecate broken TRAK refclock driver.
* [Bug 340] Deprecate broken MSF EES refclock driver.
* [Bug 153] Don't do DNS lookups on address masks.
* [Bug 143] Fix interrupted system call on HP-UX.
* [Bug 42] Distribution tarballs should be signed.
* Support separate PPS devices for PARSE refclocks.
* [Bug 637, 51?] Dynamic interface scanning can now be done.
* Options processing now uses GNU AutoGen.

---
(4.2.2p4) Released by Harlan Stenn <stenn@ntp.org>

 * [Bug 710] compat getnameinfo() has off-by-one error
 * [Bug 690] Buffer overflow in Windows when doing DNS Lookups

---
(4.2.2p3) Released by Harlan Stenn <stenn@ntp.org>

 * Make the ChangeLog file cleaner and easier to read
 * [Bug 601] ntpq's decodeint uses an extra level of indirection
 * [Bug 657] Different OSes need different sized args for IP_MULTICAST_LOOP
 * release engineering/build changes
 * Documentation fixes
 * Get sntp working under AIX-5

---
(4.2.2p2) (broken)

 * Get sntp working under AIX-5

---
(4.2.2p1)

 * [Bug 661] Use environment variable to specify the base path to openssl.
 * Resolve an ambiguity in the copyright notice
 * Added some new documentation files
 * URL cleanup in the documentation
 * [Bug 657]: IP_MULTICAST_LOOP uses a u_char value/size
 * quiet gcc4 complaints
 * more Coverity fixes
 * [Bug 614] manage file descriptors better
 * [Bug 632] update kernel PPS offsets when PPS offset is re-configured
 * [Bug 637] Ignore UP in*addr_any interfaces
 * [Bug 633] Avoid writing files in srcdir
 * release engineering/build changes

---
(4.2.2)

 * SNTP
 * Many bugfixes
 * Implements the current "goal state" of NTPv4
 * Autokey improvements
 * Much better IPv6 support
 * [Bug 360] ntpd loses handles with LAN connection disabled.
 * [Bug 239] Fix intermittent autokey failure with multicast clients.
 * Rewrite of the multicast code
 * New version numbering scheme

5 files changed, 81 insertions, 86 deletions

diff --git a/net/ntp4/MESSAGE b/net/ntp4/MESSAGE
index b4ed1e99465..b90b2b6e9ff 100644
--- a/net/ntp4/MESSAGE
+++ b/net/ntp4/MESSAGE
@@ -1,7 +1,7 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.5 2006/11/22 23:07:39 reed Exp $
+$NetBSD: MESSAGE,v 1.6 2008/06/08 04:53:27 obache Exp $
 
-THERE ARE NO MAN PAGES. All installed documentation is accessible through
+All installed documentation is accessible through
 
 	file://localhost${PREFIX}/share/doc/ntp4/index.html
 
diff --git a/net/ntp4/Makefile b/net/ntp4/Makefile
index 6ab40272684..be2c6357c09 100644
--- a/net/ntp4/Makefile
+++ b/net/ntp4/Makefile
@@ -1,36 +1,35 @@
-# $NetBSD: Makefile,v 1.55 2008/05/26 02:13:22 joerg Exp $
+# $NetBSD: Makefile,v 1.56 2008/06/08 04:53:27 obache Exp $
 #
 
-DISTNAME=	ntp-4.2.0
-PKGREVISION=	11
+DISTNAME=	ntp-4.2.4p4
 CATEGORIES=	net time
-MASTER_SITES=	ftp://ftp.udel.edu/pub/ntp/ntp4/		\
-		http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/
+MASTER_SITES=	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/	\
+		ftp://ftp.udel.edu/pub/ntp/ntp4/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.ntp.org/
 COMMENT=	Network Time Protocol Version 4
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
 
 CONFLICTS+=	openntpd-[0-9]*
 
 GNU_CONFIGURE=	YES
+USE_LIBTOOL=	YES
 USE_TOOLS+=	pax perl
 
-CONFIGURE_ENV+=	PATH_PERL=${PERL5:Q} ac_cv_header_sys_soundcard_h=no
+CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR}
 
-CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR:Q}
-
-DOCDIR=		${PREFIX}/share/doc/ntp4
-EXAMPLESDIR=	${PREFIX}/share/examples/ntp4
+DOCDIR=		${DESTDIR}${PREFIX}/share/doc/ntp4
+EXAMPLESDIR=	${DESTDIR}${PREFIX}/share/examples/ntp4
 ALL_NTP_DOCS=	${DOCDIR} ${EXAMPLESDIR}
 
 RCD_SCRIPTS=	ntpd ntpdate
 
 post-install:
-	cd ${WRKSRC}/html && pax -rw . ${DOCDIR}
-	cd ${WRKSRC}/conf && pax -rw . ${EXAMPLESDIR}
+	cd ${WRKSRC}/html && pax -rw -pm . ${DOCDIR}
+	cd ${WRKSRC}/conf && pax -rw -pm . ${EXAMPLESDIR}
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${ALL_NTP_DOCS}
 	${FIND} ${ALL_NTP_DOCS} -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
 	${FIND} ${ALL_NTP_DOCS} -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE}
@@ -40,20 +39,6 @@ post-install:
 PLIST_VARS+=	ntptime timetrim
 
 .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
 PLIST.ntptime=		yes
 .elif ${OPSYS} == "IRIX"
 PLIST.timetrim=		yes
diff --git a/net/ntp4/PLIST b/net/ntp4/PLIST
index e8ab2f9474a..ff5c55bd0e4 100644
--- a/net/ntp4/PLIST
+++ b/net/ntp4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2008/04/12 22:43:08 jlam Exp $
+@comment $NetBSD: PLIST,v 1.10 2008/06/08 04:53:27 obache Exp $
 bin/ntp-keygen
 bin/ntp-wait
 bin/ntpd
@@ -7,15 +7,63 @@ bin/ntpdc
 bin/ntpq
 ${PLIST.ntptime}bin/ntptime
 bin/ntptrace
+bin/sntp
 ${PLIST.ntptime}bin/tickadj
 ${PLIST.timetrim}bin/timetrim
+man/man1/ntp-keygen.1
+man/man1/ntpd.1
+man/man1/ntpdc.1
+man/man1/ntpdsim.1
+man/man1/ntpq.1
+man/man1/sntp.1
 share/doc/ntp4/accopt.html
 share/doc/ntp4/assoc.html
 share/doc/ntp4/audio.html
 share/doc/ntp4/authopt.html
-share/doc/ntp4/build.html
+share/doc/ntp4/build/build.html
+share/doc/ntp4/build/config.html
+share/doc/ntp4/build/hints.html
+share/doc/ntp4/build/hints/a-ux
+share/doc/ntp4/build/hints/aix
+share/doc/ntp4/build/hints/bsdi
+share/doc/ntp4/build/hints/changes
+share/doc/ntp4/build/hints/decosf1
+share/doc/ntp4/build/hints/decosf2
+share/doc/ntp4/build/hints/freebsd
+share/doc/ntp4/build/hints/hpux
+share/doc/ntp4/build/hints/linux
+share/doc/ntp4/build/hints/mpeix
+share/doc/ntp4/build/hints/${LOWER_OPSYS}
+share/doc/ntp4/build/hints/notes-xntp-v3
+share/doc/ntp4/build/hints/parse
+share/doc/ntp4/build/hints/refclocks
+share/doc/ntp4/build/hints/rs6000
+share/doc/ntp4/build/hints/sco.html
+share/doc/ntp4/build/hints/sgi
+share/doc/ntp4/build/hints/solaris-dosynctodr.html
+share/doc/ntp4/build/hints/solaris.html
+share/doc/ntp4/build/hints/solaris.xtra.4023118
+share/doc/ntp4/build/hints/solaris.xtra.4095849
+share/doc/ntp4/build/hints/solaris.xtra.S99ntpd
+share/doc/ntp4/build/hints/solaris.xtra.patchfreq
+share/doc/ntp4/build/hints/sun4
+share/doc/ntp4/build/hints/svr4-dell
+share/doc/ntp4/build/hints/svr4_package
+share/doc/ntp4/build/hints/todo
+share/doc/ntp4/build/hints/vxworks.html
+share/doc/ntp4/build/hints/winnt.html
+share/doc/ntp4/build/patches.html
+share/doc/ntp4/build/porting.html
+share/doc/ntp4/build/quick.html
+share/doc/ntp4/build/scripts/footer.txt
+share/doc/ntp4/build/scripts/links10.txt
+share/doc/ntp4/build/scripts/links11.txt
+share/doc/ntp4/build/scripts/links12.txt
+share/doc/ntp4/build/scripts/links7.txt
+share/doc/ntp4/build/scripts/links8.txt
+share/doc/ntp4/build/scripts/links9.txt
+share/doc/ntp4/build/scripts/style.css
 share/doc/ntp4/clockopt.html
-share/doc/ntp4/config.html
 share/doc/ntp4/confopt.html
 share/doc/ntp4/copyright.html
 share/doc/ntp4/debug.html
@@ -29,14 +77,13 @@ share/doc/ntp4/drivers/driver19.html
 share/doc/ntp4/drivers/driver2.html
 share/doc/ntp4/drivers/driver20.html
 share/doc/ntp4/drivers/driver22.html
-share/doc/ntp4/drivers/driver23.html
-share/doc/ntp4/drivers/driver24.html
 share/doc/ntp4/drivers/driver26.html
 share/doc/ntp4/drivers/driver27.html
 share/doc/ntp4/drivers/driver28.html
 share/doc/ntp4/drivers/driver29.html
 share/doc/ntp4/drivers/driver3.html
 share/doc/ntp4/drivers/driver30.html
+share/doc/ntp4/drivers/driver31.html
 share/doc/ntp4/drivers/driver32.html
 share/doc/ntp4/drivers/driver33.html
 share/doc/ntp4/drivers/driver34.html
@@ -58,37 +105,12 @@ share/doc/ntp4/drivers/driver9.html
 share/doc/ntp4/drivers/icons/home.gif
 share/doc/ntp4/drivers/icons/mail2.gif
 share/doc/ntp4/drivers/oncore-shmem.html
+share/doc/ntp4/drivers/scripts/footer.txt
+share/doc/ntp4/drivers/scripts/style.css
+share/doc/ntp4/drivers/tf582_4.html
 share/doc/ntp4/extern.html
-share/doc/ntp4/hints.html
-share/doc/ntp4/hints/a-ux
-share/doc/ntp4/hints/aix
-share/doc/ntp4/hints/bsdi
-share/doc/ntp4/hints/changes
-share/doc/ntp4/hints/decosf1
-share/doc/ntp4/hints/decosf2
-share/doc/ntp4/hints/freebsd
-share/doc/ntp4/hints/hpux
-share/doc/ntp4/hints/linux
-share/doc/ntp4/hints/mpeix
-share/doc/ntp4/hints/netbsd
-share/doc/ntp4/hints/notes-xntp-v3
-share/doc/ntp4/hints/parse
-share/doc/ntp4/hints/refclocks
-share/doc/ntp4/hints/rs6000
-share/doc/ntp4/hints/sco.html
-share/doc/ntp4/hints/sgi
-share/doc/ntp4/hints/solaris-dosynctodr.html
-share/doc/ntp4/hints/solaris.html
-share/doc/ntp4/hints/solaris.xtra.4023118
-share/doc/ntp4/hints/solaris.xtra.4095849
-share/doc/ntp4/hints/solaris.xtra.S99ntpd
-share/doc/ntp4/hints/solaris.xtra.patchfreq
-share/doc/ntp4/hints/sun4
-share/doc/ntp4/hints/svr4-dell
-share/doc/ntp4/hints/svr4_package
-share/doc/ntp4/hints/todo
-share/doc/ntp4/hints/vxworks.html
-share/doc/ntp4/hints/winnt.html
+share/doc/ntp4/gadget.html
+share/doc/ntp4/groups.html
 share/doc/ntp4/howto.html
 share/doc/ntp4/icons/home.gif
 share/doc/ntp4/icons/mail2.gif
@@ -103,16 +125,17 @@ share/doc/ntp4/monopt.html
 share/doc/ntp4/msyslog.html
 share/doc/ntp4/mx4200data.html
 share/doc/ntp4/notes.html
+share/doc/ntp4/ntp_conf.html
 share/doc/ntp4/ntpd.html
 share/doc/ntp4/ntpdate.html
 share/doc/ntp4/ntpdc.html
 share/doc/ntp4/ntpdsim.html
+share/doc/ntp4/ntpdsim_new.html
 share/doc/ntp4/ntpq.html
 share/doc/ntp4/ntptime.html
 share/doc/ntp4/ntptrace.html
 share/doc/ntp4/parsedata.html
 share/doc/ntp4/parsenew.html
-share/doc/ntp4/patches.html
 share/doc/ntp4/pic/9400n.jpg
 share/doc/ntp4/pic/alice11.gif
 share/doc/ntp4/pic/alice13.gif
@@ -156,17 +179,15 @@ share/doc/ntp4/pic/pogo4.gif
 share/doc/ntp4/pic/pogo5.gif
 share/doc/ntp4/pic/pogo6.gif
 share/doc/ntp4/pic/pogo8.gif
-share/doc/ntp4/pic/pzf509.jpg
+share/doc/ntp4/pic/pzf511.jpg
 share/doc/ntp4/pic/rabbit.gif
 share/doc/ntp4/pic/radio2.jpg
 share/doc/ntp4/pic/sheepb.jpg
 share/doc/ntp4/pic/stack1a.jpg
 share/doc/ntp4/pic/tonea.gif
 share/doc/ntp4/pic/wingdorothy.gif
-share/doc/ntp4/porting.html
 share/doc/ntp4/pps.html
 share/doc/ntp4/prefer.html
-share/doc/ntp4/quick.html
 share/doc/ntp4/rdebug.html
 share/doc/ntp4/refclock.html
 share/doc/ntp4/release.html
@@ -193,7 +214,10 @@ share/examples/rc.d/ntpdate
 @dirrm share/doc/ntp4/scripts
 @dirrm share/doc/ntp4/pic
 @dirrm share/doc/ntp4/icons
-@dirrm share/doc/ntp4/hints
+@dirrm share/doc/ntp4/drivers/scripts
 @dirrm share/doc/ntp4/drivers/icons
 @dirrm share/doc/ntp4/drivers
+@dirrm share/doc/ntp4/build/scripts
+@dirrm share/doc/ntp4/build/hints
+@dirrm share/doc/ntp4/build
 @dirrm share/doc/ntp4
diff --git a/net/ntp4/distinfo b/net/ntp4/distinfo
index fdb89c97c3c..4c5ac77eab1 100644
--- a/net/ntp4/distinfo
+++ b/net/ntp4/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.10 2005/09/10 10:43:42 adrianp Exp $
+$NetBSD: distinfo,v 1.11 2008/06/08 04:53:27 obache Exp $
 
-SHA1 (ntp-4.2.0.tar.gz) = 38343a4ebfc0b8d9aff3bec4c6a93f4c59071ce3
-RMD160 (ntp-4.2.0.tar.gz) = 73de5671ea583f6699c8052ea9f8270a8455c295
-Size (ntp-4.2.0.tar.gz) = 2514502 bytes
-SHA1 (patch-aa) = 6a6825604de9345001731c7d8b728f56602f15cc
+SHA1 (ntp-4.2.4p4.tar.gz) = 886a7c6819c148cc1f832d43a3446526488b1b5e
+RMD160 (ntp-4.2.4p4.tar.gz) = b5667d72e970ddb66b3a4e09bddcb713c7e743f0
+Size (ntp-4.2.4p4.tar.gz) = 3436148 bytes
diff --git a/net/ntp4/patches/patch-aa b/net/ntp4/patches/patch-aa
deleted file mode 100644
index a0cf269cee3..00000000000
--- a/net/ntp4/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2005/09/10 10:43:42 adrianp Exp $
-
---- ntpd/ntpd.c.orig	2005-09-10 10:48:16.000000000 +0100
-+++ ntpd/ntpd.c	2005-09-10 10:49:44.000000000 +0100
-@@ -863,7 +863,7 @@
- 	        } else {
- getgroup:	
- 	                if ((gr = getgrnam(group)) != NULL) {
--	                        sw_gid = pw->pw_gid;
-+	                        sw_gid = gr->gr_gid;
- 	                } else {
- 	                        errno = 0;
- 	                        msyslog(LOG_ERR, "Cannot find group `%s'", group);