Update ntp4 to 4.0.96p1

Highlights:
- - Y2K patches from AT&T: readme, test results, in source directory
- - various portability and configuration patches for Linux, WinNT

This version of the package now requires "gmake", "autoconf", and
"automake" as a consequence of its use of distribution patches.
This requirement is expected to go away with the pending release.

4 files changed, 58 insertions, 7 deletions

diff --git a/net/ntp4/Makefile b/net/ntp4/Makefile
index 1e111d80377..42e95125faf 100644
--- a/net/ntp4/Makefile
+++ b/net/ntp4/Makefile
@@ -1,19 +1,31 @@
-# $NetBSD: Makefile,v 1.6 1999/07/29 19:06:05 fredb Exp $
+# $NetBSD: Makefile,v 1.7 1999/08/13 08:54:28 fredb Exp $
 #
 
 DISTNAME=	ntp-4.0.95
+PKGNAME=	ntp-4.0.96p1
 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
+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:
@@ -27,10 +39,12 @@ post-build:
 
 post-install:
 	cd ${WRKSRC}; \
-	${PAX} -r -w -s "/html/ntp4/" html ${DOCDIR}
-	-${RM} -R ${DOCDIR}/ntp4/.cvs*
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCDIR}/ntp4
-	${CHMOD} -R ${SHAREMODE} ${DOCDIR}/ntp4
+	${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
+	${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
+	${CHMOD} a+x ${EXAMPLESDIR}/ntp4
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ntp4/files/md5 b/net/ntp4/files/md5
index e86223a3c92..f13e1d9a590 100644
--- a/net/ntp4/files/md5
+++ b/net/ntp4/files/md5
@@ -1,3 +1,5 @@
-$NetBSD: md5,v 1.3 1999/07/28 09:00:50 fredb Exp $
+$NetBSD: md5,v 1.4 1999/08/13 08:54:28 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
diff --git a/net/ntp4/patches/patch-aa b/net/ntp4/patches/patch-aa
new file mode 100644
index 00000000000..0bb0584e0a5
--- /dev/null
+++ b/net/ntp4/patches/patch-aa
@@ -0,0 +1,27 @@
+$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 f5eccec2c3d..1f0ff42577e 100644
--- a/net/ntp4/pkg/PLIST
+++ b/net/ntp4/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/07/24 18:29:34 fredb Exp $
+@comment $NetBSD: PLIST,v 1.2 1999/08/13 08:54:29 fredb Exp $
 bin/ntpd
 bin/ntpdate
 bin/ntpdc
@@ -145,6 +145,14 @@ share/doc/ntp4/pic/rabbit.gif
 share/doc/ntp4/pic/sheepb.jpg
 share/doc/ntp4/pic/tardisa.gif
 share/doc/ntp4/pic/tonea.gif
+share/examples/ntp4/README
+share/examples/ntp4/beauregard.conf
+share/examples/ntp4/baldwin.conf
+share/examples/ntp4/dewey.conf
+share/examples/ntp4/grundoon.conf
+share/examples/ntp4/malarky.conf
+share/examples/ntp4/pogo.conf
+@dirrm share/examples/ntp4
 @dirrm share/doc/ntp4/pic
 @dirrm share/doc/ntp4/hints
 @dirrm share/doc/ntp4