Update 4.2.5p109 --> 4.2.5p121

4 files changed, 79 insertions, 62 deletions

diff --git a/net/ntp-devel/Makefile b/net/ntp-devel/Makefile
index 3a06a9fa5a10..051eeae8b8fa 100644
--- a/net/ntp-devel/Makefile
+++ b/net/ntp-devel/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ntp
-PORTVERSION=	4.2.5p109
+PORTVERSION=	4.2.5p121
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.udel.edu/pub/ntp/ntp4/ntp-dev/ \
 		http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-dev/ \
diff --git a/net/ntp-devel/distinfo b/net/ntp-devel/distinfo
index 869a37fea221..3f9a9984e878 100644
--- a/net/ntp-devel/distinfo
+++ b/net/ntp-devel/distinfo
@@ -1,3 +1,3 @@
-MD5 (ntp-dev-4.2.5p109.tar.gz) = 8c98392f6273b466352fba9826e06c93
-SHA256 (ntp-dev-4.2.5p109.tar.gz) = 496edb6bfa0e3ec7c728f87d311d6d5e67b517ba6adb49bdfe91680fe5608523
-SIZE (ntp-dev-4.2.5p109.tar.gz) = 3666179
+MD5 (ntp-dev-4.2.5p121.tar.gz) = f3df6cbd1e14ebb5e7652288f89550fe
+SHA256 (ntp-dev-4.2.5p121.tar.gz) = 8f3233fc966f3b74a41bb3e2b05e7031bb1a535821cb93bf77277f9e2b5041b9
+SIZE (ntp-dev-4.2.5p121.tar.gz) = 3761033
diff --git a/net/ntp-devel/files/patch-libntp-refnumtoa.c b/net/ntp-devel/files/patch-libntp-refnumtoa.c
new file mode 100644
index 000000000000..6b68cea5451c
--- /dev/null
+++ b/net/ntp-devel/files/patch-libntp-refnumtoa.c
@@ -0,0 +1,12 @@
+--- libntp/refnumtoa.c.orig	2001-10-09 00:05:38.000000000 -0700
++++ libntp/refnumtoa.c	2008-07-24 22:45:30.917697416 -0700
+@@ -2,6 +2,9 @@
+  * refnumtoa - return asciized refclock addresses stored in local array space
+  */
+ #include <stdio.h>
++#ifdef __FreeBSD_cc_version
++#include <netinet/in.h>
++#endif
+ 
+ #include "ntp_fp.h"
+ #include "lib_strbuf.h"
diff --git a/net/ntp-devel/pkg-plist b/net/ntp-devel/pkg-plist
index 61ef3e109715..03a94f00e9cd 100644
--- a/net/ntp-devel/pkg-plist
+++ b/net/ntp-devel/pkg-plist
@@ -13,53 +13,15 @@ bin/tickadj
 %%PORTDOCS%%%%DOCSDIR%%/audio.html
 %%PORTDOCS%%%%DOCSDIR%%/authopt.html
 %%PORTDOCS%%%%DOCSDIR%%/bugs.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%%/build.html
 %%PORTDOCS%%%%DOCSDIR%%/clockopt.html
+%%PORTDOCS%%%%DOCSDIR%%/comdex.html
+%%PORTDOCS%%%%DOCSDIR%%/config.html
 %%PORTDOCS%%%%DOCSDIR%%/confopt.html
 %%PORTDOCS%%%%DOCSDIR%%/copyright.html
 %%PORTDOCS%%%%DOCSDIR%%/debug.html
+%%PORTDOCS%%%%DOCSDIR%%/decode.html
+%%PORTDOCS%%%%DOCSDIR%%/description_files/description.jpg
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver1.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver10.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver11.html
@@ -97,27 +59,53 @@ bin/tickadj
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver9.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/icons/home.gif
 %%PORTDOCS%%%%DOCSDIR%%/drivers/icons/mail2.gif
+%%PORTDOCS%%%%DOCSDIR%%/drivers/mx4200data.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%%/extern.html
 %%PORTDOCS%%%%DOCSDIR%%/gadget.html
-%%PORTDOCS%%%%DOCSDIR%%/groups.html
+%%PORTDOCS%%%%DOCSDIR%%/hints.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/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%%/howto.html
 %%PORTDOCS%%%%DOCSDIR%%/icons/home.gif
 %%PORTDOCS%%%%DOCSDIR%%/icons/mail2.gif
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/kern.html
+%%PORTDOCS%%%%DOCSDIR%%/kernpps.html
 %%PORTDOCS%%%%DOCSDIR%%/keygen.html
-%%PORTDOCS%%%%DOCSDIR%%/ldisc.html
 %%PORTDOCS%%%%DOCSDIR%%/manyopt.html
-%%PORTDOCS%%%%DOCSDIR%%/measure.html
 %%PORTDOCS%%%%DOCSDIR%%/miscopt.html
 %%PORTDOCS%%%%DOCSDIR%%/monopt.html
 %%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
@@ -132,6 +120,7 @@ bin/tickadj
 %%PORTDOCS%%%%DOCSDIR%%/pic/9400n.jpg
 %%PORTDOCS%%%%DOCSDIR%%/pic/alice11.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/alice13.gif
+%%PORTDOCS%%%%DOCSDIR%%/pic/alice15.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/alice23.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/alice31.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/alice32.gif
@@ -145,6 +134,7 @@ bin/tickadj
 %%PORTDOCS%%%%DOCSDIR%%/pic/beaver.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/boom3.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/boom3a.gif
+%%PORTDOCS%%%%DOCSDIR%%/pic/broad.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/bustardfly.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/c51.jpg
 %%PORTDOCS%%%%DOCSDIR%%/pic/description.jpg
@@ -154,6 +144,7 @@ bin/tickadj
 %%PORTDOCS%%%%DOCSDIR%%/pic/driver43_2.jpg
 %%PORTDOCS%%%%DOCSDIR%%/pic/fg6021.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/fg6039.jpg
+%%PORTDOCS%%%%DOCSDIR%%/pic/flatheads.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/freq1211.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/gadget.jpg
 %%PORTDOCS%%%%DOCSDIR%%/pic/gps167.jpg
@@ -168,37 +159,52 @@ bin/tickadj
 %%PORTDOCS%%%%DOCSDIR%%/pic/panda.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/pd_om006.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/pd_om011.gif
-%%PORTDOCS%%%%DOCSDIR%%/pic/pzf511.jpg
+%%PORTDOCS%%%%DOCSDIR%%/pic/peer.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/pogo.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/pogo1a.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/pogo3a.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/pogo4.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/pogo5.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/pogo6.gif
+%%PORTDOCS%%%%DOCSDIR%%/pic/pogo7.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/pogo8.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/pzf509.jpg
+%%PORTDOCS%%%%DOCSDIR%%/pic/pzf511.jpg
 %%PORTDOCS%%%%DOCSDIR%%/pic/rabbit.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/radio2.jpg
 %%PORTDOCS%%%%DOCSDIR%%/pic/sheepb.jpg
 %%PORTDOCS%%%%DOCSDIR%%/pic/stack1a.jpg
 %%PORTDOCS%%%%DOCSDIR%%/pic/thunderbolt.jpg
 %%PORTDOCS%%%%DOCSDIR%%/pic/tonea.gif
+%%PORTDOCS%%%%DOCSDIR%%/pic/tribeb.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/wingdorothy.gif
 %%PORTDOCS%%%%DOCSDIR%%/pps.html
 %%PORTDOCS%%%%DOCSDIR%%/prefer.html
+%%PORTDOCS%%%%DOCSDIR%%/quick.html
+%%PORTDOCS%%%%DOCSDIR%%/rate.html
 %%PORTDOCS%%%%DOCSDIR%%/rdebug.html
 %%PORTDOCS%%%%DOCSDIR%%/refclock.html
 %%PORTDOCS%%%%DOCSDIR%%/release.html
+%%PORTDOCS%%%%DOCSDIR%%/scripts/accopt.txt
+%%PORTDOCS%%%%DOCSDIR%%/scripts/audio.txt
+%%PORTDOCS%%%%DOCSDIR%%/scripts/authopt.txt
+%%PORTDOCS%%%%DOCSDIR%%/scripts/clockopt.txt
+%%PORTDOCS%%%%DOCSDIR%%/scripts/command.txt
+%%PORTDOCS%%%%DOCSDIR%%/scripts/config.txt
+%%PORTDOCS%%%%DOCSDIR%%/scripts/confopt.txt
+%%PORTDOCS%%%%DOCSDIR%%/scripts/external.txt
 %%PORTDOCS%%%%DOCSDIR%%/scripts/footer.txt
-%%PORTDOCS%%%%DOCSDIR%%/scripts/links10.txt
-%%PORTDOCS%%%%DOCSDIR%%/scripts/links11.txt
-%%PORTDOCS%%%%DOCSDIR%%/scripts/links12.txt
-%%PORTDOCS%%%%DOCSDIR%%/scripts/links7.txt
-%%PORTDOCS%%%%DOCSDIR%%/scripts/links8.txt
-%%PORTDOCS%%%%DOCSDIR%%/scripts/links9.txt
+%%PORTDOCS%%%%DOCSDIR%%/scripts/install.txt
+%%PORTDOCS%%%%DOCSDIR%%/scripts/manual.txt
+%%PORTDOCS%%%%DOCSDIR%%/scripts/misc.txt
+%%PORTDOCS%%%%DOCSDIR%%/scripts/miscopt.txt
+%%PORTDOCS%%%%DOCSDIR%%/scripts/monopt.txt
+%%PORTDOCS%%%%DOCSDIR%%/scripts/refclock.txt
 %%PORTDOCS%%%%DOCSDIR%%/scripts/style.css
+%%PORTDOCS%%%%DOCSDIR%%/sitemap.html
 %%PORTDOCS%%%%DOCSDIR%%/sntp.html
 %%PORTDOCS%%%%DOCSDIR%%/tickadj.html
+%%PORTDOCS%%%%DOCSDIR%%/xleave.html
 %%EXAMPLESDIR%%/README
 %%EXAMPLESDIR%%/baldwin.conf
 %%EXAMPLESDIR%%/beauregard.conf
@@ -209,11 +215,10 @@ 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%%/description_files
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%EXAMPLESDIR%%