Update ntp4 to 4.0.98f. Extensive clean ups, bug fixes in reference clock

drivers and in burst mode operation. Clean ups to and additional documentation.

- - Package builds cleanly (including ntptime) for NetBSD-1.4.1, now that
    HAVE_PPSAPI depends on finding PPS_API_VERS_1 in sys/timepps.h, rather
    than simply checking for the presence of sys/timpepps.h.
- - Remove dependencies on gmake and autoconf.

5 files changed, 16 insertions, 67 deletions

diff --git a/net/ntp4/Makefile b/net/ntp4/Makefile
index 9ce2792ea43..c2d95a0c8d6 100644
--- a/net/ntp4/Makefile
+++ b/net/ntp4/Makefile
@@ -1,53 +1,30 @@
-# $NetBSD: Makefile,v 1.9 1999/08/30 11:15:13 fredb Exp $
+# $NetBSD: Makefile,v 1.10 1999/11/14 05:23:26 fredb Exp $
 #
 
-DISTNAME=	ntp-4.0.95
-PKGNAME=	ntp-4.0.97d
+DISTNAME=	ntp-4.0.98f
 CATEGORIES=	net
 MASTER_SITES=	http://www.eecis.udel.edu/~ntp/ntp_spool/testing/ \
 		http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ \
 		ftp://ftp.udel.edu/pub/ntp/testing/ \
 		ftp://ftp.udel.edu/pub/ntp/ntp4/
 
-PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	ntp-4.0.95-4.0.96.diff.gz \
-		ntp-4.0.96-4.0.96p1.diff.gz \
-		ntp-4.0.96p1-4.0.97.diff.gz \
-		ntp-4.0.97-4.0.97a.diff.gz \
-		ntp-4.0.97a-4.0.97b.diff.gz \
-		ntp-4.0.97b-4.0.97c.diff.gz \
-		ntp-4.0.97c-4.0.97d.diff.gz
-PATCH_DIST_STRIP= -p1
-
 MAINTAINER=	fb@enteract.com
 HOMEPAGE=	http://www.ntp.org/
 
-BUILD_DEPENDS+=	autoconf:../../devel/autoconf
-BUILD_DEPENDS+=	automake:../../devel/automake
-
-# gmake, automake, autoconf are only required for patch releases
-
 GNU_CONFIGURE=	YES
-USE_GMAKE=	YES
 
 DOCDIR=		${PREFIX}/share/doc
 EXAMPLESDIR=	${PREFIX}/share/examples
 MESSAGE_FILE=	${WRKDIR}/MESSAGE
 
-post-configure:
-	cd ${WRKSRC}; \
-	${SED} /ac_cv_make_ntptime/s/no/yes/ < config.cache > config.cache~; \
-	${MV} config.cache~ config.cache
-	@${MAKE} do-configure
-
 post-build:
 	${SED} 's#@PREFIX@#${PREFIX}#g' < ${PKGDIR}/MESSAGE > ${WRKDIR}/MESSAGE
 
 post-install:
 	cd ${WRKSRC}; \
-	${PAX} -r -w -s "/html/ntp4/" html ${DOCDIR}; \
-	${PAX} -r -w -s "/conf/ntp4/" conf ${EXAMPLESDIR}
-	-${RM} ${DOCDIR}/ntp4/.cvs* ${DOCDIR}/ntp4/*.orig ${DOCDIR}/ntp4/hints/*.orig
+	    ${RM} html/.cvsignore* 2> /dev/null || true; \
+	    ${PAX} -r -w -s "/html/ntp4/" html ${DOCDIR}; \
+	    ${PAX} -r -w -s "/conf/ntp4/" conf ${EXAMPLESDIR}
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCDIR}/ntp4 ${EXAMPLESDIR}/ntp4
 	${CHMOD} -R ${SHAREMODE} ${DOCDIR}/ntp4 ${EXAMPLESDIR}/ntp4
 	${CHMOD} a+x ${DOCDIR}/ntp4 ${DOCDIR}/ntp4/hints ${DOCDIR}/ntp4/pic
diff --git a/net/ntp4/files/md5 b/net/ntp4/files/md5
index 2c365e734b5..44e7b1ddf4d 100644
--- a/net/ntp4/files/md5
+++ b/net/ntp4/files/md5
@@ -1,10 +1,3 @@
-$NetBSD: md5,v 1.6 1999/08/30 11:15:13 fredb Exp $
+$NetBSD: md5,v 1.7 1999/11/14 05:23:27 fredb Exp $
 
-MD5 (ntp-4.0.95.tar.gz) = 96a42abc0afabf34ad163d3ca544571b
-MD5 (ntp-4.0.95-4.0.96.diff.gz) = 6b927d1163bb3b7195defa699b495d7e
-MD5 (ntp-4.0.96-4.0.96p1.diff.gz) = eaa38cfe7d800aab0b2e2de4065981a2
-MD5 (ntp-4.0.96p1-4.0.97.diff.gz) = 05771929e832568d133a0f33e760e9bb
-MD5 (ntp-4.0.97-4.0.97a.diff.gz) = 41edd351f1b28dc1f1c3a855eba35825
-MD5 (ntp-4.0.97a-4.0.97b.diff.gz) = 3669c7a339a6d10b91638f9177563b35
-MD5 (ntp-4.0.97b-4.0.97c.diff.gz) = 9fea05d89687614d6669abeca695955d
-MD5 (ntp-4.0.97c-4.0.97d.diff.gz) = 863c2fb2c329bbc54c2f244e746f1b4c
+MD5 (ntp-4.0.98f.tar.gz) = 967a102cc59964c24de5450d0b5e778f
diff --git a/net/ntp4/files/patch-sum b/net/ntp4/files/patch-sum
index b6168372807..29ea04b0d04 100644
--- a/net/ntp4/files/patch-sum
+++ b/net/ntp4/files/patch-sum
@@ -1,3 +1,6 @@
-$NetBSD: patch-sum,v 1.1 1999/08/13 08:56:03 fredb Exp $
+$NetBSD: patch-sum,v 1.2 1999/11/14 05:23:27 fredb Exp $
 
-MD5 (patch-aa) = 75e65f03456f4bbf17c7b6ae7ffb4bc0
+This placeholder file is generated by the ``makepatchsum'' target
+whenever the patches directory is empty or missing. Its purpose
+is to ensure that the presence of any obsolete patches will cause
+the proper error to be emitted at build time.
diff --git a/net/ntp4/patches/patch-aa b/net/ntp4/patches/patch-aa
deleted file mode 100644
index 0bb0584e0a5..00000000000
--- a/net/ntp4/patches/patch-aa
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-aa,v 1.1 1999/08/13 08:54:29 fredb Exp $
-
-*** Makefile.am.orig	Tue Aug 10 06:35:45 1999
---- Makefile.am	Tue Aug 10 06:44:38 1999
-***************
-*** 28,37 ****
-  # HMS: make ports be the last directory...
-  DIST_HOOK_DIRS = conf html scripts ports
-  
-! BUILT_SOURCES = $(srcdir)/COPYRIGHT
-  
-! $(srcdir)/COPYRIGHT: html/copyright.htm
-! 	( echo "This file is automatically generated from html/copyright.htm" ; lynx -dump $(srcdir)/html/copyright.htm ) > $(srcdir)/COPYRIGHT.new && mv $(srcdir)/COPYRIGHT.new $(srcdir)/COPYRIGHT
-  
-  # local-dist: dist-tarZ
-  
---- 28,37 ----
-  # HMS: make ports be the last directory...
-  DIST_HOOK_DIRS = conf html scripts ports
-  
-! #BUILT_SOURCES = $(srcdir)/COPYRIGHT
-  
-! #$(srcdir)/COPYRIGHT: html/copyright.htm
-! #	( echo "This file is automatically generated from html/copyright.htm" ; lynx -dump $(srcdir)/html/copyright.htm ) > $(srcdir)/COPYRIGHT.new && mv $(srcdir)/COPYRIGHT.new $(srcdir)/COPYRIGHT
-  
-  # local-dist: dist-tarZ
-  
diff --git a/net/ntp4/pkg/PLIST b/net/ntp4/pkg/PLIST
index de4f4372e5b..fe3ddf157ae 100644
--- a/net/ntp4/pkg/PLIST
+++ b/net/ntp4/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 1999/08/19 08:52:58 fredb Exp $
+@comment $NetBSD: PLIST,v 1.4 1999/11/14 05:23:28 fredb Exp $
 bin/ntpd
 bin/ntpdate
 bin/ntpdc
@@ -21,6 +21,7 @@ share/doc/ntp4/driver1.htm
 share/doc/ntp4/driver10.htm
 share/doc/ntp4/driver11.htm
 share/doc/ntp4/driver12.htm
+share/doc/ntp4/driver16.htm
 share/doc/ntp4/driver18.htm
 share/doc/ntp4/driver19.htm
 share/doc/ntp4/driver2.htm
@@ -36,6 +37,7 @@ share/doc/ntp4/driver3.htm
 share/doc/ntp4/driver30.htm
 share/doc/ntp4/driver32.htm
 share/doc/ntp4/driver33.htm
+share/doc/ntp4/driver34.htm
 share/doc/ntp4/driver4.htm
 share/doc/ntp4/driver5.htm
 share/doc/ntp4/driver6.htm
@@ -121,6 +123,7 @@ share/doc/ntp4/pic/appletree.gif
 share/doc/ntp4/pic/barnstable.gif
 share/doc/ntp4/pic/beaver.gif
 share/doc/ntp4/pic/c51.jpg
+share/doc/ntp4/pic/driver29.gif
 share/doc/ntp4/pic/fg6021.gif
 share/doc/ntp4/pic/flatheads.gif
 share/doc/ntp4/pic/gadget.jpg