Update 4.1.1c.r3 -> 4.2.0

4 files changed, 107 insertions, 98 deletions

diff --git a/net/ntp/Makefile b/net/ntp/Makefile
index 24b7932bcc30..8e8f8c176bb5 100644
--- a/net/ntp/Makefile
+++ b/net/ntp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ntp
-PORTVERSION=	4.1.1c.r3
+PORTVERSION=	4.2.0
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.udel.edu/pub/ntp/ntp4/ \
 		http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ \
diff --git a/net/ntp/distinfo b/net/ntp/distinfo
index d14f1606f442..eca77adb5a51 100644
--- a/net/ntp/distinfo
+++ b/net/ntp/distinfo
@@ -1 +1 @@
-MD5 (ntp-4.1.1c-rc3.tar.gz) = 8c2f13da8230066c94b8ba15b5b5320c
+MD5 (ntp-4.2.0.tar.gz) = 0f8fabe87cf54f409b57c6283f0c0c3d
diff --git a/net/ntp/files/patch-aa b/net/ntp/files/patch-aa
index 2b418488de44..df54ce2e249b 100644
--- a/net/ntp/files/patch-aa
+++ b/net/ntp/files/patch-aa
@@ -27,12 +27,13 @@
  						cp++;
  					while (cp < reqend && *cp != ',') {
  						*tp++ = *cp++;
-@@ -1870,7 +1870,7 @@
+@@ -1904,8 +1904,8 @@
  						cp++;
- 					while (tp > buf) {
- 						*tp-- = '\0';
+ 					*tp-- = '\0';
+ 					while (tp >= buf) {
 -						if (!isspace((int)(*tp)))
 +						if (!isspace((unsigned char)(*tp)))
  							break;
+ 						*tp-- = '\0';
  					}
  					reqpt = cp;
diff --git a/net/ntp/pkg-plist b/net/ntp/pkg-plist
index 242d77529f1d..b15360f5a9a8 100644
--- a/net/ntp/pkg-plist
+++ b/net/ntp/pkg-plist
@@ -1,65 +1,63 @@
-bin/ntp-genkeys
+bin/ntp-keygen
 bin/ntpd
 bin/ntpdate
 bin/ntpdc
 bin/ntpq
 bin/ntptime
-bin/ntptimeset
 bin/ntptrace
 bin/ntp-wait
 bin/tickadj
-%%PORTDOCS%%share/doc/ntp/Oncore-SHMEM.htm
-%%PORTDOCS%%share/doc/ntp/accopt.htm
-%%PORTDOCS%%share/doc/ntp/assoc.htm
-%%PORTDOCS%%share/doc/ntp/audio.htm
-%%PORTDOCS%%share/doc/ntp/authopt.htm
-%%PORTDOCS%%share/doc/ntp/biblio.htm
-%%PORTDOCS%%share/doc/ntp/build.htm
-%%PORTDOCS%%share/doc/ntp/clockopt.htm
-%%PORTDOCS%%share/doc/ntp/config.htm
-%%PORTDOCS%%share/doc/ntp/confopt.htm
-%%PORTDOCS%%share/doc/ntp/copyright.htm
-%%PORTDOCS%%share/doc/ntp/debug.htm
-%%PORTDOCS%%share/doc/ntp/driver1.htm
-%%PORTDOCS%%share/doc/ntp/driver10.htm
-%%PORTDOCS%%share/doc/ntp/driver11.htm
-%%PORTDOCS%%share/doc/ntp/driver12.htm
-%%PORTDOCS%%share/doc/ntp/driver16.htm
-%%PORTDOCS%%share/doc/ntp/driver18.htm
-%%PORTDOCS%%share/doc/ntp/driver19.htm
-%%PORTDOCS%%share/doc/ntp/driver2.htm
-%%PORTDOCS%%share/doc/ntp/driver20.htm
-%%PORTDOCS%%share/doc/ntp/driver22.htm
-%%PORTDOCS%%share/doc/ntp/driver23.htm
-%%PORTDOCS%%share/doc/ntp/driver24.htm
-%%PORTDOCS%%share/doc/ntp/driver26.htm
-%%PORTDOCS%%share/doc/ntp/driver27.htm
-%%PORTDOCS%%share/doc/ntp/driver28.htm
-%%PORTDOCS%%share/doc/ntp/driver29.htm
-%%PORTDOCS%%share/doc/ntp/driver3.htm
-%%PORTDOCS%%share/doc/ntp/driver30.htm
-%%PORTDOCS%%share/doc/ntp/driver32.htm
-%%PORTDOCS%%share/doc/ntp/driver33.htm
-%%PORTDOCS%%share/doc/ntp/driver34.htm
-%%PORTDOCS%%share/doc/ntp/driver35.htm
-%%PORTDOCS%%share/doc/ntp/driver36.htm
-%%PORTDOCS%%share/doc/ntp/driver37.htm
-%%PORTDOCS%%share/doc/ntp/driver38.htm
-%%PORTDOCS%%share/doc/ntp/driver39.htm
-%%PORTDOCS%%share/doc/ntp/driver40.htm
-%%PORTDOCS%%share/doc/ntp/driver42.htm
-%%PORTDOCS%%share/doc/ntp/driver43.htm
-%%PORTDOCS%%share/doc/ntp/driver44.htm
-%%PORTDOCS%%share/doc/ntp/driver4.htm
-%%PORTDOCS%%share/doc/ntp/driver5.htm
-%%PORTDOCS%%share/doc/ntp/driver6.htm
-%%PORTDOCS%%share/doc/ntp/driver7.htm
-%%PORTDOCS%%share/doc/ntp/driver8.htm
-%%PORTDOCS%%share/doc/ntp/driver9.htm
-%%PORTDOCS%%share/doc/ntp/exec.htm
-%%PORTDOCS%%share/doc/ntp/extern.htm
-%%PORTDOCS%%share/doc/ntp/gadget.htm
-%%PORTDOCS%%share/doc/ntp/genkeys.htm
+%%PORTDOCS%%share/doc/ntp/accopt.html
+%%PORTDOCS%%share/doc/ntp/assoc.html
+%%PORTDOCS%%share/doc/ntp/audio.html
+%%PORTDOCS%%share/doc/ntp/authopt.html
+%%PORTDOCS%%share/doc/ntp/build.html
+%%PORTDOCS%%share/doc/ntp/clockopt.html
+%%PORTDOCS%%share/doc/ntp/config.html
+%%PORTDOCS%%share/doc/ntp/confopt.html
+%%PORTDOCS%%share/doc/ntp/copyright.html
+%%PORTDOCS%%share/doc/ntp/debug.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver1.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver10.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver11.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver12.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver16.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver18.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver19.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver2.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver20.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver22.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver23.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver24.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver26.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver27.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver28.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver29.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver3.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver30.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver32.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver33.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver34.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver35.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver36.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver37.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver38.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver39.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver4.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver40.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver42.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver43.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver44.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver5.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver6.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver7.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver8.html
+%%PORTDOCS%%share/doc/ntp/drivers/driver9.html
+%%PORTDOCS%%share/doc/ntp/drivers/icons/home.gif
+%%PORTDOCS%%share/doc/ntp/drivers/icons/mail2.gif
+%%PORTDOCS%%share/doc/ntp/drivers/oncore-shmem.html
+%%PORTDOCS%%share/doc/ntp/extern.html
+%%PORTDOCS%%share/doc/ntp/hints.html
 %%PORTDOCS%%share/doc/ntp/hints/a-ux
 %%PORTDOCS%%share/doc/ntp/hints/aix
 %%PORTDOCS%%share/doc/ntp/hints/bsdi
@@ -70,11 +68,12 @@ bin/tickadj
 %%PORTDOCS%%share/doc/ntp/hints/hpux
 %%PORTDOCS%%share/doc/ntp/hints/linux
 %%PORTDOCS%%share/doc/ntp/hints/mpeix
+%%PORTDOCS%%share/doc/ntp/hints/netbsd
 %%PORTDOCS%%share/doc/ntp/hints/notes-xntp-v3
 %%PORTDOCS%%share/doc/ntp/hints/parse
 %%PORTDOCS%%share/doc/ntp/hints/refclocks
 %%PORTDOCS%%share/doc/ntp/hints/rs6000
-%%PORTDOCS%%share/doc/ntp/hints/sco.htm
+%%PORTDOCS%%share/doc/ntp/hints/sco.html
 %%PORTDOCS%%share/doc/ntp/hints/sgi
 %%PORTDOCS%%share/doc/ntp/hints/solaris-dosynctodr.html
 %%PORTDOCS%%share/doc/ntp/hints/solaris.html
@@ -86,36 +85,35 @@ bin/tickadj
 %%PORTDOCS%%share/doc/ntp/hints/svr4-dell
 %%PORTDOCS%%share/doc/ntp/hints/svr4_package
 %%PORTDOCS%%share/doc/ntp/hints/todo
-%%PORTDOCS%%share/doc/ntp/hints/vxworks.htm
 %%PORTDOCS%%share/doc/ntp/hints/vxworks.html
-%%PORTDOCS%%share/doc/ntp/hints/winnt.htm
-%%PORTDOCS%%share/doc/ntp/hints.htm
-%%PORTDOCS%%share/doc/ntp/howto.htm
-%%PORTDOCS%%share/doc/ntp/htmlprimer.htm
-%%PORTDOCS%%share/doc/ntp/index.htm
-%%PORTDOCS%%share/doc/ntp/kern.htm
-%%PORTDOCS%%share/doc/ntp/kernpps.htm
-%%PORTDOCS%%share/doc/ntp/ldisc.htm
-%%PORTDOCS%%share/doc/ntp/leap.htm
-%%PORTDOCS%%share/doc/ntp/measure.htm
-%%PORTDOCS%%share/doc/ntp/miscopt.htm
-%%PORTDOCS%%share/doc/ntp/monopt.htm
-%%PORTDOCS%%share/doc/ntp/mx4200data.htm
-%%PORTDOCS%%share/doc/ntp/notes.htm
-%%PORTDOCS%%share/doc/ntp/ntpd.htm
-%%PORTDOCS%%share/doc/ntp/ntpdate.htm
-%%PORTDOCS%%share/doc/ntp/ntpdc.htm
-%%PORTDOCS%%share/doc/ntp/ntpq.htm
-%%PORTDOCS%%share/doc/ntp/ntptime.htm
-%%PORTDOCS%%share/doc/ntp/ntptrace.htm
-%%PORTDOCS%%share/doc/ntp/parsedata.htm
-%%PORTDOCS%%share/doc/ntp/parsenew.htm
-%%PORTDOCS%%share/doc/ntp/patches.htm
+%%PORTDOCS%%share/doc/ntp/hints/winnt.html
+%%PORTDOCS%%share/doc/ntp/howto.html
+%%PORTDOCS%%share/doc/ntp/icons/home.gif
+%%PORTDOCS%%share/doc/ntp/icons/mail2.gif
+%%PORTDOCS%%share/doc/ntp/index.html
+%%PORTDOCS%%share/doc/ntp/kern.html
+%%PORTDOCS%%share/doc/ntp/keygen.html
+%%PORTDOCS%%share/doc/ntp/ldisc.html
+%%PORTDOCS%%share/doc/ntp/manyopt.html
+%%PORTDOCS%%share/doc/ntp/measure.html
+%%PORTDOCS%%share/doc/ntp/miscopt.html
+%%PORTDOCS%%share/doc/ntp/monopt.html
+%%PORTDOCS%%share/doc/ntp/msyslog.html
+%%PORTDOCS%%share/doc/ntp/mx4200data.html
+%%PORTDOCS%%share/doc/ntp/notes.html
+%%PORTDOCS%%share/doc/ntp/ntpd.html
+%%PORTDOCS%%share/doc/ntp/ntpdate.html
+%%PORTDOCS%%share/doc/ntp/ntpdc.html
+%%PORTDOCS%%share/doc/ntp/ntpdsim.html
+%%PORTDOCS%%share/doc/ntp/ntpq.html
+%%PORTDOCS%%share/doc/ntp/ntptime.html
+%%PORTDOCS%%share/doc/ntp/ntptrace.html
+%%PORTDOCS%%share/doc/ntp/parsedata.html
+%%PORTDOCS%%share/doc/ntp/parsenew.html
+%%PORTDOCS%%share/doc/ntp/patches.html
 %%PORTDOCS%%share/doc/ntp/pic/9400n.jpg
 %%PORTDOCS%%share/doc/ntp/pic/alice11.gif
-%%PORTDOCS%%share/doc/ntp/pic/alice12.gif
 %%PORTDOCS%%share/doc/ntp/pic/alice13.gif
-%%PORTDOCS%%share/doc/ntp/pic/alice15.gif
 %%PORTDOCS%%share/doc/ntp/pic/alice23.gif
 %%PORTDOCS%%share/doc/ntp/pic/alice31.gif
 %%PORTDOCS%%share/doc/ntp/pic/alice32.gif
@@ -129,18 +127,16 @@ bin/tickadj
 %%PORTDOCS%%share/doc/ntp/pic/beaver.gif
 %%PORTDOCS%%share/doc/ntp/pic/boom3.gif
 %%PORTDOCS%%share/doc/ntp/pic/boom3a.gif
-%%PORTDOCS%%share/doc/ntp/pic/boom4.gif
 %%PORTDOCS%%share/doc/ntp/pic/bustardfly.gif
 %%PORTDOCS%%share/doc/ntp/pic/c51.jpg
+%%PORTDOCS%%share/doc/ntp/pic/dogsnake.gif
 %%PORTDOCS%%share/doc/ntp/pic/driver29.gif
 %%PORTDOCS%%share/doc/ntp/pic/driver43_1.gif
 %%PORTDOCS%%share/doc/ntp/pic/driver43_2.jpg
 %%PORTDOCS%%share/doc/ntp/pic/fg6021.gif
 %%PORTDOCS%%share/doc/ntp/pic/fg6039.jpg
-%%PORTDOCS%%share/doc/ntp/pic/flatheads.gif
 %%PORTDOCS%%share/doc/ntp/pic/gadget.jpg
 %%PORTDOCS%%share/doc/ntp/pic/gps167.jpg
-%%PORTDOCS%%share/doc/ntp/pic/home.gif
 %%PORTDOCS%%share/doc/ntp/pic/hornraba.gif
 %%PORTDOCS%%share/doc/ntp/pic/igclock.gif
 %%PORTDOCS%%share/doc/ntp/pic/neoclock4x.gif
@@ -165,15 +161,27 @@ bin/tickadj
 %%PORTDOCS%%share/doc/ntp/pic/stack1a.jpg
 %%PORTDOCS%%share/doc/ntp/pic/tonea.gif
 %%PORTDOCS%%share/doc/ntp/pic/wingdorothy.gif
-%%PORTDOCS%%share/doc/ntp/porting.htm
-%%PORTDOCS%%share/doc/ntp/pps.htm
-%%PORTDOCS%%share/doc/ntp/prefer.htm
-%%PORTDOCS%%share/doc/ntp/qth.htm
-%%PORTDOCS%%share/doc/ntp/quick.htm
-%%PORTDOCS%%share/doc/ntp/rdebug.htm
-%%PORTDOCS%%share/doc/ntp/refclock.htm
-%%PORTDOCS%%share/doc/ntp/release.htm
-%%PORTDOCS%%share/doc/ntp/tickadj.htm
+%%PORTDOCS%%share/doc/ntp/porting.html
+%%PORTDOCS%%share/doc/ntp/pps.html
+%%PORTDOCS%%share/doc/ntp/prefer.html
+%%PORTDOCS%%share/doc/ntp/quick.html
+%%PORTDOCS%%share/doc/ntp/rdebug.html
+%%PORTDOCS%%share/doc/ntp/refclock.html
+%%PORTDOCS%%share/doc/ntp/release.html
+%%PORTDOCS%%share/doc/ntp/scripts/footer.txt
+%%PORTDOCS%%share/doc/ntp/scripts/links10.txt
+%%PORTDOCS%%share/doc/ntp/scripts/links11.txt
+%%PORTDOCS%%share/doc/ntp/scripts/links12.txt
+%%PORTDOCS%%share/doc/ntp/scripts/links7.txt
+%%PORTDOCS%%share/doc/ntp/scripts/links8.txt
+%%PORTDOCS%%share/doc/ntp/scripts/links9.txt
+%%PORTDOCS%%share/doc/ntp/scripts/style.css
+%%PORTDOCS%%share/doc/ntp/sntp.html
+%%PORTDOCS%%share/doc/ntp/tickadj.html
+%%PORTDOCS%%@dirrm share/doc/ntp/scripts
 %%PORTDOCS%%@dirrm share/doc/ntp/pic
+%%PORTDOCS%%@dirrm share/doc/ntp/icons
 %%PORTDOCS%%@dirrm share/doc/ntp/hints
+%%PORTDOCS%%@dirrm share/doc/ntp/drivers/icons
+%%PORTDOCS%%@dirrm share/doc/ntp/drivers
 %%PORTDOCS%%@dirrm share/doc/ntp