Update to ntp-4.1.1. From the "NEWS" file:

    * Lose the source port check on incoming packets
    * (x)ntpdc compatibility patch
    * Virtual IP improvements
    * ntp_loopfilter fixes and improvements
    * ntpdc improvements
    * GOES refclock fix
    * JJY driver
    * bsdi port fixes
    * HP MPE/iX port
    * Win/NT port upgrade
    * Dynix PTX port fixes
    * Document conversion from CVS to BK
    * readline support for ntpq

4 files changed, 8 insertions, 29 deletions

diff --git a/net/ntp4/Makefile b/net/ntp4/Makefile
index 0fc8f1b9f30..07379e6790b 100644
--- a/net/ntp4/Makefile
+++ b/net/ntp4/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2001/08/14 06:10:41 fredb Exp $
+# $NetBSD: Makefile,v 1.20 2002/02/28 13:51:23 fredb Exp $
 #
 
-DISTNAME=	ntp-4.1.0
+DISTNAME=	ntp-4.1.1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.udel.edu/pub/ntp/ntp4/ \
 		http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/
diff --git a/net/ntp4/PLIST b/net/ntp4/PLIST
index 75d02a0ff5d..4acb2848e3e 100644
--- a/net/ntp4/PLIST
+++ b/net/ntp4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:57:10 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/02/28 13:51:24 fredb Exp $
 bin/ntpd
 bin/ntpdate
 bin/ntpdc
@@ -53,6 +53,7 @@ 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/exec.htm
 share/doc/html/ntp4/extern.htm
 share/doc/html/ntp4/gadget.htm
@@ -98,6 +99,7 @@ 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/parse
 share/doc/html/ntp4/hints/refclocks
 share/doc/html/ntp4/hints/rs6000
@@ -173,9 +175,6 @@ share/examples/ntp4/baldwin.conf
 share/examples/ntp4/dewey.conf
 share/examples/ntp4/grundoon.conf
 share/examples/ntp4/malarky.conf
-share/examples/ntp4/ntp_malarky.conf
-share/examples/ntp4/ntp_pogo.conf
-share/examples/ntp4/ntp_rackety.conf
 share/examples/ntp4/pogo.conf
 share/examples/ntp4/rackety.conf
 @dirrm share/examples/ntp4
diff --git a/net/ntp4/distinfo b/net/ntp4/distinfo
index 9405070180f..cfae7b7cabb 100644
--- a/net/ntp4/distinfo
+++ b/net/ntp4/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.5 2001/08/14 17:55:18 fredb Exp $
+$NetBSD: distinfo,v 1.6 2002/02/28 13:51:24 fredb Exp $
 
-SHA1 (ntp-4.1.0.tar.gz) = 9f68b2ed84f6424b3fa09a81657d60223b10f31a
-Size (ntp-4.1.0.tar.gz) = 1991312 bytes
-SHA1 (patch-aa) = 0f7b51ff56c1af049ba9bb6f747ba7995361dc65
+SHA1 (ntp-4.1.1.tar.gz) = 1759f1023df960a78d9c3f56039fda8ce86cb4b4
+Size (ntp-4.1.1.tar.gz) = 2019495 bytes
diff --git a/net/ntp4/patches/patch-aa b/net/ntp4/patches/patch-aa
deleted file mode 100644
index 923e58b3e82..00000000000
--- a/net/ntp4/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2001/08/14 17:55:19 fredb Exp $
-
-Index: ntpdate/ntpdate.c
-===================================================================
-RCS file: /cvsroot/basesrc/dist/ntp/ntpdate/ntpdate.c,v
-retrieving revision 1.1.1.2
-retrieving revision 1.2
-diff -u -r1.1.1.2 -r1.2
---- ntpdate/ntpdate.c	2000/04/22 14:53:42	1.1.1.2
-+++ ntpdate/ntpdate.c	2001/02/02 03:35:24	1.2
-@@ -431,7 +431,7 @@
- 	
- 	if (errflg) {
- 		(void) fprintf(stderr,
--				   "usage: %s [-bBdqsv] [-a key#] [-e delay] [-k file] [-p samples] [-o version#] [-r rate] [-t timeo] server ...\n",
-+				   "usage: %s [-bBdqsuv] [-a key#] [-e delay] [-k file] [-p samples] [-o version#] [-r rate] [-t timeo] server ...\n",
- 				   progname);
- 		exit(2);
- 	}