7 files changed, 59 insertions, 150 deletions

diff --git a/net/ntp/Makefile b/net/ntp/Makefile
index e4d55d4c36bc..6dcddb3be0fb 100644
--- a/net/ntp/Makefile
+++ b/net/ntp/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	ntp
-PORTVERSION=	4.2.0
-PORTREVISION=	1
+PORTVERSION=	4.2.2
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.udel.edu/pub/ntp/ntp4/ \
 		http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ \
@@ -37,6 +36,8 @@ CONFIGURE_ARGS+=	--with-openssl-incdir=${OPENSSLINC} \
 PLIST_SUB+=		SSL=""
 .endif
 
+MAN1=		sntp.1
+
 post-install:
 	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/conf/* ${EXAMPLESDIR}
diff --git a/net/ntp/distinfo b/net/ntp/distinfo
index c7cfd8e9a77c..4285de1573a9 100644
--- a/net/ntp/distinfo
+++ b/net/ntp/distinfo
@@ -1,3 +1,3 @@
-MD5 (ntp-4.2.0.tar.gz) = 0f8fabe87cf54f409b57c6283f0c0c3d
-SHA256 (ntp-4.2.0.tar.gz) = da784d5c0363d4f708a25f3aad23ba9a3486aafd464444d2aa6a9f8d29213f25
-SIZE (ntp-4.2.0.tar.gz) = 2514502
+MD5 (ntp-4.2.2.tar.gz) = 111d879acdcc955e60f527575ab0a71a
+SHA256 (ntp-4.2.2.tar.gz) = fb392fa5f1a753043981e661b09c6d0249050ff903078ed215a568952d76befc
+SIZE (ntp-4.2.2.tar.gz) = 2546027
diff --git a/net/ntp/files/patch-Makefile.in b/net/ntp/files/patch-Makefile.in
deleted file mode 100644
index 7829972e1366..000000000000
--- a/net/ntp/files/patch-Makefile.in
+++ /dev/null
@@ -1,40 +0,0 @@
---- Makefile.in.orig	Wed Oct 15 02:01:51 2003
-+++ Makefile.in	Mon Apr 19 22:01:44 2004
-@@ -224,7 +224,7 @@
- 	version
- 
- 
--DISTCLEANFILES = .warning
-+DISTCLEANFILES = .gcc-warning
- 
- #ETAGS_ARGS = $(srcdir)/Makefile.am $(srcdir)/configure.in
- ETAGS_ARGS = Makefile.am configure.in
-@@ -232,8 +232,8 @@
- # HMS: make ports be the last directory...
- # DIST_HOOK_DIRS = conf html scripts ports
- 
--# HMS: Keep .warning first, as that way it gets printed first.
--BUILT_SOURCES = .warning $(srcdir)/COPYRIGHT $(srcdir)/version
-+# HMS: Keep .gcc-warning first, as that way it gets printed first.
-+BUILT_SOURCES = .gcc-warning $(srcdir)/COPYRIGHT $(srcdir)/version
- 
- 
- # HMS: The following seems to be a work-in-progress...
-@@ -672,7 +672,7 @@
- 	@for i in `find $(distdir)/ports/winnt -type f -name '*.ds*' -print`; \
- 	   do chmod u+w $$i ; unix2dos $$i $$i; done
- 
--.warning:
-+.gcc-warning:
- 	@echo "Compiling with GCC now generates lots of new warnings."
- 	@echo " "
- 	@echo "Don't be concerned. They're just warnings."
-@@ -682,7 +682,7 @@
- 	@echo "Feel free to send patches that fix these warnings, though."
- 	@echo " "
- 	@sleep 1
--	@touch .warning
-+	@touch .gcc-warning
- 
- .buildcvo:
- 	echo "$(CVO)" > .buildcvo
diff --git a/net/ntp/files/patch-aa b/net/ntp/files/patch-aa
deleted file mode 100644
index df54ce2e249b..000000000000
--- a/net/ntp/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/files/patch-ntpdc::ntpdc.c b/net/ntp/files/patch-ntpdc::ntpdc.c
deleted file mode 100644
index bb13b576a464..000000000000
--- a/net/ntp/files/patch-ntpdc::ntpdc.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ntpdc/ntpdc.c.orig	Sat Oct 11 00:52:22 2003
-+++ ntpdc/ntpdc.c	Sun Jan 25 13:29:58 2004
-@@ -449,7 +449,11 @@
- 	hints.ai_flags = AI_NUMERICHOST;
- 
- 	a_info = getaddrinfo(hname, service, &hints, &ai);
-+#ifdef EAI_NODATA
- 	if (a_info == EAI_NONAME || a_info == EAI_NODATA) {
-+#else
-+	if (a_info == EAI_NONAME) {
-+#endif
- 		hints.ai_flags = AI_CANONNAME;
- #ifdef AI_ADDRCONFIG
- 		hints.ai_flags |= AI_ADDRCONFIG;
diff --git a/net/ntp/files/patch-ntpq::ntpq.c b/net/ntp/files/patch-ntpq::ntpq.c
deleted file mode 100644
index 0a221dd0742b..000000000000
--- a/net/ntp/files/patch-ntpq::ntpq.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- ntpq/ntpq.c.orig	Thu Oct  9 02:27:05 2003
-+++ ntpq/ntpq.c	Sun Jan 25 13:49:33 2004
-@@ -630,7 +630,11 @@
- 	hints.ai_flags = AI_NUMERICHOST;
- 
- 	a_info = getaddrinfo(hname, service, &hints, &ai);
-+#ifdef EAI_NODATA
- 	if (a_info == EAI_NONAME || a_info == EAI_NODATA) {
-+#else
-+	if (a_info == EAI_NONAME) {
-+#endif
- 		hints.ai_flags = AI_CANONNAME;
- #ifdef AI_ADDRCONFIG
- 		hints.ai_flags |= AI_ADDRCONFIG;
diff --git a/net/ntp/pkg-plist b/net/ntp/pkg-plist
index 0c009fd0e4bf..8f4d6c37c11a 100644
--- a/net/ntp/pkg-plist
+++ b/net/ntp/pkg-plist
@@ -6,17 +6,59 @@ bin/ntpdc
 bin/ntpq
 bin/ntptime
 bin/ntptrace
+bin/sntp
 bin/tickadj
 %%PORTDOCS%%%%DOCSDIR%%/accopt.html
 %%PORTDOCS%%%%DOCSDIR%%/assoc.html
 %%PORTDOCS%%%%DOCSDIR%%/audio.html
 %%PORTDOCS%%%%DOCSDIR%%/authopt.html
-%%PORTDOCS%%%%DOCSDIR%%/build.html
 %%PORTDOCS%%%%DOCSDIR%%/clockopt.html
-%%PORTDOCS%%%%DOCSDIR%%/config.html
 %%PORTDOCS%%%%DOCSDIR%%/confopt.html
 %%PORTDOCS%%%%DOCSDIR%%/copyright.html
 %%PORTDOCS%%%%DOCSDIR%%/debug.html
+%%PORTDOCS%%%%DOCSDIR%%/build/build.html
+%%PORTDOCS%%%%DOCSDIR%%/build/config.html
+%%PORTDOCS%%%%DOCSDIR%%/build/hints.html
+%%PORTDOCS%%%%DOCSDIR%%/build/hints/a-ux
+%%PORTDOCS%%%%DOCSDIR%%/build/hints/aix
+%%PORTDOCS%%%%DOCSDIR%%/build/hints/bsdi
+%%PORTDOCS%%%%DOCSDIR%%/build/hints/changes
+%%PORTDOCS%%%%DOCSDIR%%/build/hints/decosf1
+%%PORTDOCS%%%%DOCSDIR%%/build/hints/decosf2
+%%PORTDOCS%%%%DOCSDIR%%/build/hints/freebsd
+%%PORTDOCS%%%%DOCSDIR%%/build/hints/hpux
+%%PORTDOCS%%%%DOCSDIR%%/build/hints/linux
+%%PORTDOCS%%%%DOCSDIR%%/build/hints/mpeix
+%%PORTDOCS%%%%DOCSDIR%%/build/hints/netbsd
+%%PORTDOCS%%%%DOCSDIR%%/build/hints/notes-xntp-v3
+%%PORTDOCS%%%%DOCSDIR%%/build/hints/parse
+%%PORTDOCS%%%%DOCSDIR%%/build/hints/refclocks
+%%PORTDOCS%%%%DOCSDIR%%/build/hints/rs6000
+%%PORTDOCS%%%%DOCSDIR%%/build/hints/sco.html
+%%PORTDOCS%%%%DOCSDIR%%/build/hints/sgi
+%%PORTDOCS%%%%DOCSDIR%%/build/hints/solaris-dosynctodr.html
+%%PORTDOCS%%%%DOCSDIR%%/build/hints/solaris.html
+%%PORTDOCS%%%%DOCSDIR%%/build/hints/solaris.xtra.4023118
+%%PORTDOCS%%%%DOCSDIR%%/build/hints/solaris.xtra.4095849
+%%PORTDOCS%%%%DOCSDIR%%/build/hints/solaris.xtra.S99ntpd
+%%PORTDOCS%%%%DOCSDIR%%/build/hints/solaris.xtra.patchfreq
+%%PORTDOCS%%%%DOCSDIR%%/build/hints/sun4
+%%PORTDOCS%%%%DOCSDIR%%/build/hints/svr4-dell
+%%PORTDOCS%%%%DOCSDIR%%/build/hints/svr4_package
+%%PORTDOCS%%%%DOCSDIR%%/build/hints/todo
+%%PORTDOCS%%%%DOCSDIR%%/build/hints/vxworks.html
+%%PORTDOCS%%%%DOCSDIR%%/build/hints/winnt.html
+%%PORTDOCS%%%%DOCSDIR%%/build/patches.html
+%%PORTDOCS%%%%DOCSDIR%%/build/porting.html
+%%PORTDOCS%%%%DOCSDIR%%/build/quick.html
+%%PORTDOCS%%%%DOCSDIR%%/build/scripts/footer.txt
+%%PORTDOCS%%%%DOCSDIR%%/build/scripts/links10.txt
+%%PORTDOCS%%%%DOCSDIR%%/build/scripts/links11.txt
+%%PORTDOCS%%%%DOCSDIR%%/build/scripts/links12.txt
+%%PORTDOCS%%%%DOCSDIR%%/build/scripts/links7.txt
+%%PORTDOCS%%%%DOCSDIR%%/build/scripts/links8.txt
+%%PORTDOCS%%%%DOCSDIR%%/build/scripts/links9.txt
+%%PORTDOCS%%%%DOCSDIR%%/build/scripts/style.css
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver1.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver10.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver11.html
@@ -27,14 +69,13 @@ 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
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver29.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver3.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver30.html
+%%PORTDOCS%%%%DOCSDIR%%/drivers/driver31.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver32.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver33.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver34.html
@@ -54,39 +95,13 @@ bin/tickadj
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver8.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver9.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/oncore-shmem.html
+%%PORTDOCS%%%%DOCSDIR%%/drivers/scripts/footer.txt
+%%PORTDOCS%%%%DOCSDIR%%/drivers/scripts/style.css
+%%PORTDOCS%%%%DOCSDIR%%/drivers/tf582_4.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/icons/home.gif
 %%PORTDOCS%%%%DOCSDIR%%/drivers/icons/mail2.gif
 %%PORTDOCS%%%%DOCSDIR%%/extern.html
-%%PORTDOCS%%%%DOCSDIR%%/hints/a-ux
-%%PORTDOCS%%%%DOCSDIR%%/hints/aix
-%%PORTDOCS%%%%DOCSDIR%%/hints/bsdi
-%%PORTDOCS%%%%DOCSDIR%%/hints/changes
-%%PORTDOCS%%%%DOCSDIR%%/hints/decosf1
-%%PORTDOCS%%%%DOCSDIR%%/hints/decosf2
-%%PORTDOCS%%%%DOCSDIR%%/hints/freebsd
-%%PORTDOCS%%%%DOCSDIR%%/hints/hpux
-%%PORTDOCS%%%%DOCSDIR%%/hints/linux
-%%PORTDOCS%%%%DOCSDIR%%/hints/mpeix
-%%PORTDOCS%%%%DOCSDIR%%/hints/netbsd
-%%PORTDOCS%%%%DOCSDIR%%/hints/notes-xntp-v3
-%%PORTDOCS%%%%DOCSDIR%%/hints/parse
-%%PORTDOCS%%%%DOCSDIR%%/hints/refclocks
-%%PORTDOCS%%%%DOCSDIR%%/hints/rs6000
-%%PORTDOCS%%%%DOCSDIR%%/hints/sco.html
-%%PORTDOCS%%%%DOCSDIR%%/hints/sgi
-%%PORTDOCS%%%%DOCSDIR%%/hints/solaris-dosynctodr.html
-%%PORTDOCS%%%%DOCSDIR%%/hints/solaris.html
-%%PORTDOCS%%%%DOCSDIR%%/hints/solaris.xtra.4023118
-%%PORTDOCS%%%%DOCSDIR%%/hints/solaris.xtra.4095849
-%%PORTDOCS%%%%DOCSDIR%%/hints/solaris.xtra.S99ntpd
-%%PORTDOCS%%%%DOCSDIR%%/hints/solaris.xtra.patchfreq
-%%PORTDOCS%%%%DOCSDIR%%/hints/sun4
-%%PORTDOCS%%%%DOCSDIR%%/hints/svr4-dell
-%%PORTDOCS%%%%DOCSDIR%%/hints/svr4_package
-%%PORTDOCS%%%%DOCSDIR%%/hints/todo
-%%PORTDOCS%%%%DOCSDIR%%/hints/vxworks.html
-%%PORTDOCS%%%%DOCSDIR%%/hints/winnt.html
-%%PORTDOCS%%%%DOCSDIR%%/hints.html
+%%PORTDOCS%%%%DOCSDIR%%/gadget.html
 %%PORTDOCS%%%%DOCSDIR%%/howto.html
 %%PORTDOCS%%%%DOCSDIR%%/icons/home.gif
 %%PORTDOCS%%%%DOCSDIR%%/icons/mail2.gif
@@ -110,7 +125,6 @@ bin/tickadj
 %%PORTDOCS%%%%DOCSDIR%%/ntptrace.html
 %%PORTDOCS%%%%DOCSDIR%%/parsedata.html
 %%PORTDOCS%%%%DOCSDIR%%/parsenew.html
-%%PORTDOCS%%%%DOCSDIR%%/patches.html
 %%PORTDOCS%%%%DOCSDIR%%/pic/9400n.jpg
 %%PORTDOCS%%%%DOCSDIR%%/pic/alice11.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/alice13.gif
@@ -161,10 +175,8 @@ bin/tickadj
 %%PORTDOCS%%%%DOCSDIR%%/pic/stack1a.jpg
 %%PORTDOCS%%%%DOCSDIR%%/pic/tonea.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/wingdorothy.gif
-%%PORTDOCS%%%%DOCSDIR%%/porting.html
 %%PORTDOCS%%%%DOCSDIR%%/pps.html
 %%PORTDOCS%%%%DOCSDIR%%/prefer.html
-%%PORTDOCS%%%%DOCSDIR%%/quick.html
 %%PORTDOCS%%%%DOCSDIR%%/rdebug.html
 %%PORTDOCS%%%%DOCSDIR%%/refclock.html
 %%PORTDOCS%%%%DOCSDIR%%/release.html
@@ -188,8 +200,11 @@ bin/tickadj
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/scripts
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/pic
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/icons
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/hints
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/drivers/scripts
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/drivers/icons
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/drivers
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/build/scripts
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/build/hints
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/build
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%EXAMPLESDIR%%