Update 4.2.0a-2006-02-24 --> 4.2.2p3.r2

4 files changed, 21 insertions, 55 deletions

diff --git a/net/ntp-stable/Makefile b/net/ntp-stable/Makefile
index b874ff7fa88d..9f297a7e3cbd 100644
--- a/net/ntp-stable/Makefile
+++ b/net/ntp-stable/Makefile
@@ -6,18 +6,13 @@
 #
 
 PORTNAME=	ntp
-PORTVERSION=	4.2.0a
-PORTREVISION=	${YEAR}${MONTH}${DAY}
+PORTVERSION=	4.2.2p3.r2
 CATEGORIES=	net ipv6
-YEAR=		2006
-MONTH=		02
-DAY=		24
-SNAPSHOT_DIR=	snapshots/ntp-stable/${YEAR}/${MONTH}
-MASTER_SITES=	ftp://ftp.udel.edu/pub/ntp/ntp4/${SNAPSHOT_DIR}/ \
-		http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/${SNAPSHOT_DIR}/ \
-		ftp://ftp.archive.de.uu.net/pub/unix/ntp/ntp4/${SNAPSHOT_DIR} \
-		ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/ntp/ntp4/${SNAPSHOT_DIR}/
-DISTNAME=	${PORTNAME}-stable-${PORTVERSION:S/.r/-rc/}-${YEAR}${MONTH}${DAY}
+MASTER_SITES=	ftp://ftp.udel.edu/pub/ntp/ntp4/ntp-4.2/ \
+		http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ \
+		ftp://ftp.archive.de.uu.net/pub/unix/ntp/ntp4/ntp-4.2/ \
+		ftp://ftp.netlab.is.tsukuba.ac.jp/pub/network/ntp/ntp4/ntp-4.2/
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/-RC/}
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	The Network Time Protocol Distribution
@@ -41,6 +36,12 @@ CONFIGURE_ARGS+=	--with-openssl-incdir=${OPENSSLINC} \
 PLIST_SUB+=		SSL=""
 .endif
 
+.if !defined(DISABLE_IPV6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.endif
+
+MAN1=			sntp.1
+
 post-install:
 	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/conf/* ${EXAMPLESDIR}
diff --git a/net/ntp-stable/distinfo b/net/ntp-stable/distinfo
index 7d0c80666cba..abfd48cccc03 100644
--- a/net/ntp-stable/distinfo
+++ b/net/ntp-stable/distinfo
@@ -1,3 +1,3 @@
-MD5 (ntp-stable-4.2.0a-20060224.tar.gz) = 49d4a704b49dc1ef2a7ec0b7938c3ae1
-SHA256 (ntp-stable-4.2.0a-20060224.tar.gz) = 5232890e8ac01f0549082d3f3f1dda60ed47b43f4fe22a562b9cf754a900f0d1
-SIZE (ntp-stable-4.2.0a-20060224.tar.gz) = 2447194
+MD5 (ntp-4.2.2p3-RC2.tar.gz) = 3cc52ac3c20e625363660824ef0a71ea
+SHA256 (ntp-4.2.2p3-RC2.tar.gz) = dfdda0bb20dbb89a820ad5737fafe199da80599388bcda3b041c7acbd2cd4e1a
+SIZE (ntp-4.2.2p3-RC2.tar.gz) = 2562651
diff --git a/net/ntp-stable/files/patch-aa b/net/ntp-stable/files/patch-aa
deleted file mode 100644
index df54ce2e249b..000000000000
--- a/net/ntp-stable/files/patch-aa
+++ /dev/null
@@ -1,39 +0,0 @@
---- ntpd/ntp_control.c.orig	Mon Apr  9 13:19:56 2001
-+++ ntpd/ntp_control.c	Wed Apr 11 20:53:28 2001
-@@ -1823,7 +1823,7 @@
- 	 * Delete leading commas and white space
- 	 */
- 	while (reqpt < reqend && (*reqpt == ',' ||
--	    isspace((int)*reqpt)))
-+	    isspace((unsigned char)*reqpt)))
- 		reqpt++;
- 	if (reqpt >= reqend)
- 		return (0);
-@@ -1846,7 +1846,7 @@
- 				tp++;
- 			}
- 			if ((*tp == '\0') || (*tp == '=')) {
--				while (cp < reqend && isspace((int)*cp))
-+				while (cp < reqend && isspace((unsigned char)*cp))
- 					cp++;
- 				if (cp == reqend || *cp == ',') {
- 					buf[0] = '\0';
-@@ -1859,7 +1859,7 @@
- 				if (*cp == '=') {
- 					cp++;
- 					tp = buf;
--					while (cp < reqend && isspace((int)*cp))
-+					while (cp < reqend && isspace((unsigned char)*cp))
- 						cp++;
- 					while (cp < reqend && *cp != ',') {
- 						*tp++ = *cp++;
-@@ -1904,8 +1904,8 @@
- 						cp++;
- 					*tp-- = '\0';
- 					while (tp >= buf) {
--						if (!isspace((int)(*tp)))
-+						if (!isspace((unsigned char)(*tp)))
- 							break;
- 						*tp-- = '\0';
- 					}
- 					reqpt = cp;
diff --git a/net/ntp-stable/pkg-plist b/net/ntp-stable/pkg-plist
index 76209e76325b..a510edd7725d 100644
--- a/net/ntp-stable/pkg-plist
+++ b/net/ntp-stable/pkg-plist
@@ -6,6 +6,7 @@ bin/ntpdc
 bin/ntpq
 bin/ntptime
 bin/ntptrace
+bin/sntp
 bin/tickadj
 %%PORTDOCS%%%%DOCSDIR%%/accopt.html
 %%PORTDOCS%%%%DOCSDIR%%/assoc.html
@@ -68,8 +69,6 @@ bin/tickadj
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver2.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver20.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver22.html
-%%PORTDOCS%%%%DOCSDIR%%/drivers/driver23.html
-%%PORTDOCS%%%%DOCSDIR%%/drivers/driver24.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver26.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver27.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver28.html
@@ -95,12 +94,15 @@ bin/tickadj
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver7.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver8.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver9.html
+%%PORTDOCS%%%%DOCSDIR%%/drivers/tf582_4.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/icons/home.gif
 %%PORTDOCS%%%%DOCSDIR%%/drivers/icons/mail2.gif
 %%PORTDOCS%%%%DOCSDIR%%/drivers/oncore-shmem.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/scripts/footer.txt
 %%PORTDOCS%%%%DOCSDIR%%/drivers/scripts/style.css
 %%PORTDOCS%%%%DOCSDIR%%/extern.html
+%%PORTDOCS%%%%DOCSDIR%%/gadget.html
+%%PORTDOCS%%%%DOCSDIR%%/groups.html
 %%PORTDOCS%%%%DOCSDIR%%/howto.html
 %%PORTDOCS%%%%DOCSDIR%%/icons/home.gif
 %%PORTDOCS%%%%DOCSDIR%%/icons/mail2.gif
@@ -115,10 +117,12 @@ bin/tickadj
 %%PORTDOCS%%%%DOCSDIR%%/msyslog.html
 %%PORTDOCS%%%%DOCSDIR%%/mx4200data.html
 %%PORTDOCS%%%%DOCSDIR%%/notes.html
+%%PORTDOCS%%%%DOCSDIR%%/ntp_conf.html
 %%PORTDOCS%%%%DOCSDIR%%/ntpd.html
 %%PORTDOCS%%%%DOCSDIR%%/ntpdate.html
 %%PORTDOCS%%%%DOCSDIR%%/ntpdc.html
 %%PORTDOCS%%%%DOCSDIR%%/ntpdsim.html
+%%PORTDOCS%%%%DOCSDIR%%/ntpdsim_new.html
 %%PORTDOCS%%%%DOCSDIR%%/ntpq.html
 %%PORTDOCS%%%%DOCSDIR%%/ntptime.html
 %%PORTDOCS%%%%DOCSDIR%%/ntptrace.html