update to ntp latest dev version to deal with CVE-2013-5211

(amplification attacks using monlist queries)

tickadj for Solaris is a guess (and probably version dependent)
the bulk builds will tell :)

6 files changed, 392 insertions, 107 deletions

diff --git a/net/ntp4/Makefile b/net/ntp4/Makefile
index 2b491b18d63..55b1df3433d 100644
--- a/net/ntp4/Makefile
+++ b/net/ntp4/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.74 2013/07/15 02:02:27 ryoon Exp $
+# $NetBSD: Makefile,v 1.75 2014/01/12 17:01:02 spz Exp $
 #
 
-DISTNAME=	ntp-4.2.4p8
-PKGREVISION=	5
+DISTNAME=	ntp-dev-4.2.7p410
 CATEGORIES=	net time
-MASTER_SITES=	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/
+MASTER_SITES=	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-dev/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.ntp.org/
@@ -19,6 +18,7 @@ USE_LIBTOOL=	YES
 USE_TOOLS+=	pax perl:run
 
 CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=--with-locfile=loc/pkgsrc
 CONFIGURE_ENV+=	  PATH_PERL=${PERL5}
 
 DOCDIR=		${DESTDIR}${PREFIX}/share/doc/ntp4
@@ -41,13 +41,11 @@ post-install:
 
 PLIST_VARS+=	ntptime tickadj timetrim
 
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux"
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
 PLIST.ntptime=		yes
 PLIST.tickadj=		yes
 .elif ${OPSYS} == "IRIX"
 PLIST.timetrim=		yes
-.elif ${OPSYS} == "SunOS"
-PLIST.ntptime=		yes
 .endif
 
 # chroot jail support
diff --git a/net/ntp4/PLIST b/net/ntp4/PLIST
index 297fa161570..3eb576e464f 100644
--- a/net/ntp4/PLIST
+++ b/net/ntp4/PLIST
@@ -1,72 +1,43 @@
-@comment $NetBSD: PLIST,v 1.13 2009/06/14 18:09:37 joerg Exp $
-bin/ntp-keygen
-bin/ntp-wait
-bin/ntpd
-bin/ntpdate
-bin/ntpdc
-bin/ntpq
-${PLIST.ntptime}bin/ntptime
-bin/ntptrace
+@comment $NetBSD: PLIST,v 1.14 2014/01/12 17:01:02 spz Exp $
 bin/sntp
-${PLIST.tickadj}bin/tickadj
-${PLIST.timetrim}bin/timetrim
-man/man1/ntp-keygen.1
-man/man1/ntpd.1
-man/man1/ntpdc.1
-man/man1/ntpdsim.1
-man/man1/ntpq.1
 man/man1/sntp.1
+man/man5/ntp.conf.5
+man/man5/ntp.keys.5
+man/man8/ntp-keygen.8
+man/man8/ntpd.8
+man/man8/ntpdc.8
+man/man8/ntpq.8
+${PLIST.tickadj}sbin/calc_tickadj
+sbin/ntp-keygen
+sbin/ntp-wait
+sbin/ntpd
+sbin/ntpdate
+sbin/ntpdc
+sbin/ntpq
+${PLIST.ntptime}sbin/ntptime
+sbin/ntptrace
+${PLIST.tickadj}sbin/tickadj
+${PLIST.timetrim}sbin/timetrim
+share/doc/ntp4/access.html
 share/doc/ntp4/accopt.html
 share/doc/ntp4/assoc.html
 share/doc/ntp4/audio.html
+share/doc/ntp4/authentic.html
 share/doc/ntp4/authopt.html
-share/doc/ntp4/build/build.html
-share/doc/ntp4/build/config.html
-share/doc/ntp4/build/hints.html
-share/doc/ntp4/build/hints/a-ux
-share/doc/ntp4/build/hints/aix
-share/doc/ntp4/build/hints/bsdi
-share/doc/ntp4/build/hints/changes
-share/doc/ntp4/build/hints/decosf1
-share/doc/ntp4/build/hints/decosf2
-share/doc/ntp4/build/hints/freebsd
-share/doc/ntp4/build/hints/hpux
-share/doc/ntp4/build/hints/linux
-share/doc/ntp4/build/hints/mpeix
-share/doc/ntp4/build/hints/netbsd
-share/doc/ntp4/build/hints/notes-xntp-v3
-share/doc/ntp4/build/hints/parse
-share/doc/ntp4/build/hints/refclocks
-share/doc/ntp4/build/hints/rs6000
-share/doc/ntp4/build/hints/sco.html
-share/doc/ntp4/build/hints/sgi
-share/doc/ntp4/build/hints/solaris-dosynctodr.html
-share/doc/ntp4/build/hints/solaris.html
-share/doc/ntp4/build/hints/solaris.xtra.4023118
-share/doc/ntp4/build/hints/solaris.xtra.4095849
-share/doc/ntp4/build/hints/solaris.xtra.S99ntpd
-share/doc/ntp4/build/hints/solaris.xtra.patchfreq
-share/doc/ntp4/build/hints/sun4
-share/doc/ntp4/build/hints/svr4-dell
-share/doc/ntp4/build/hints/svr4_package
-share/doc/ntp4/build/hints/todo
-share/doc/ntp4/build/hints/vxworks.html
-share/doc/ntp4/build/hints/winnt.html
-share/doc/ntp4/build/patches.html
-share/doc/ntp4/build/porting.html
-share/doc/ntp4/build/quick.html
-share/doc/ntp4/build/scripts/footer.txt
-share/doc/ntp4/build/scripts/links10.txt
-share/doc/ntp4/build/scripts/links11.txt
-share/doc/ntp4/build/scripts/links12.txt
-share/doc/ntp4/build/scripts/links7.txt
-share/doc/ntp4/build/scripts/links8.txt
-share/doc/ntp4/build/scripts/links9.txt
-share/doc/ntp4/build/scripts/style.css
+share/doc/ntp4/autokey.html
+share/doc/ntp4/bugs.html
+share/doc/ntp4/build.html
+share/doc/ntp4/clock.html
 share/doc/ntp4/clockopt.html
+share/doc/ntp4/cluster.html
+share/doc/ntp4/comdex.html
+share/doc/ntp4/config.html
 share/doc/ntp4/confopt.html
 share/doc/ntp4/copyright.html
 share/doc/ntp4/debug.html
+share/doc/ntp4/decode.html
+share/doc/ntp4/discipline.html
+share/doc/ntp4/discover.html
 share/doc/ntp4/drivers/driver1.html
 share/doc/ntp4/drivers/driver10.html
 share/doc/ntp4/drivers/driver11.html
@@ -74,7 +45,6 @@ share/doc/ntp4/drivers/driver12.html
 share/doc/ntp4/drivers/driver16.html
 share/doc/ntp4/drivers/driver18.html
 share/doc/ntp4/drivers/driver19.html
-share/doc/ntp4/drivers/driver2.html
 share/doc/ntp4/drivers/driver20.html
 share/doc/ntp4/drivers/driver22.html
 share/doc/ntp4/drivers/driver26.html
@@ -97,6 +67,7 @@ share/doc/ntp4/drivers/driver40.html
 share/doc/ntp4/drivers/driver42.html
 share/doc/ntp4/drivers/driver43.html
 share/doc/ntp4/drivers/driver44.html
+share/doc/ntp4/drivers/driver45.html
 share/doc/ntp4/drivers/driver5.html
 share/doc/ntp4/drivers/driver6.html
 share/doc/ntp4/drivers/driver7.html
@@ -104,27 +75,288 @@ share/doc/ntp4/drivers/driver8.html
 share/doc/ntp4/drivers/driver9.html
 share/doc/ntp4/drivers/icons/home.gif
 share/doc/ntp4/drivers/icons/mail2.gif
+share/doc/ntp4/drivers/mx4200data.html
 share/doc/ntp4/drivers/oncore-shmem.html
 share/doc/ntp4/drivers/scripts/footer.txt
 share/doc/ntp4/drivers/scripts/style.css
 share/doc/ntp4/drivers/tf582_4.html
 share/doc/ntp4/extern.html
-share/doc/ntp4/gadget.html
-share/doc/ntp4/groups.html
+share/doc/ntp4/filter.html
+share/doc/ntp4/hints.html
+share/doc/ntp4/hints/a-ux
+share/doc/ntp4/hints/aix
+share/doc/ntp4/hints/bsdi
+share/doc/ntp4/hints/changes
+share/doc/ntp4/hints/decosf1
+share/doc/ntp4/hints/decosf2
+share/doc/ntp4/hints/freebsd
+share/doc/ntp4/hints/hpux
+share/doc/ntp4/hints/linux
+share/doc/ntp4/hints/mpeix
+share/doc/ntp4/hints/notes-xntp-v3
+share/doc/ntp4/hints/parse
+share/doc/ntp4/hints/refclocks
+share/doc/ntp4/hints/rs6000
+share/doc/ntp4/hints/sco.html
+share/doc/ntp4/hints/sgi
+share/doc/ntp4/hints/solaris-dosynctodr.html
+share/doc/ntp4/hints/solaris.html
+share/doc/ntp4/hints/solaris.xtra.4023118
+share/doc/ntp4/hints/solaris.xtra.4095849
+share/doc/ntp4/hints/solaris.xtra.S99ntpd
+share/doc/ntp4/hints/solaris.xtra.patchfreq
+share/doc/ntp4/hints/sun4
+share/doc/ntp4/hints/svr4-dell
+share/doc/ntp4/hints/svr4_package
+share/doc/ntp4/hints/todo
+share/doc/ntp4/hints/vxworks.html
+share/doc/ntp4/hints/winnt.html
+share/doc/ntp4/history.html
 share/doc/ntp4/howto.html
+share/doc/ntp4/html/access.html
+share/doc/ntp4/html/accopt.html
+share/doc/ntp4/html/assoc.html
+share/doc/ntp4/html/audio.html
+share/doc/ntp4/html/authentic.html
+share/doc/ntp4/html/authopt.html
+share/doc/ntp4/html/autokey.html
+share/doc/ntp4/html/bugs.html
+share/doc/ntp4/html/build.html
+share/doc/ntp4/html/clock.html
+share/doc/ntp4/html/clockopt.html
+share/doc/ntp4/html/cluster.html
+share/doc/ntp4/html/comdex.html
+share/doc/ntp4/html/config.html
+share/doc/ntp4/html/confopt.html
+share/doc/ntp4/html/copyright.html
+share/doc/ntp4/html/debug.html
+share/doc/ntp4/html/decode.html
+share/doc/ntp4/html/discipline.html
+share/doc/ntp4/html/discover.html
+share/doc/ntp4/html/drivers/driver1.html
+share/doc/ntp4/html/drivers/driver10.html
+share/doc/ntp4/html/drivers/driver11.html
+share/doc/ntp4/html/drivers/driver12.html
+share/doc/ntp4/html/drivers/driver16.html
+share/doc/ntp4/html/drivers/driver18.html
+share/doc/ntp4/html/drivers/driver19.html
+share/doc/ntp4/html/drivers/driver20.html
+share/doc/ntp4/html/drivers/driver22.html
+share/doc/ntp4/html/drivers/driver26.html
+share/doc/ntp4/html/drivers/driver27.html
+share/doc/ntp4/html/drivers/driver28.html
+share/doc/ntp4/html/drivers/driver29.html
+share/doc/ntp4/html/drivers/driver3.html
+share/doc/ntp4/html/drivers/driver30.html
+share/doc/ntp4/html/drivers/driver31.html
+share/doc/ntp4/html/drivers/driver32.html
+share/doc/ntp4/html/drivers/driver33.html
+share/doc/ntp4/html/drivers/driver34.html
+share/doc/ntp4/html/drivers/driver35.html
+share/doc/ntp4/html/drivers/driver36.html
+share/doc/ntp4/html/drivers/driver37.html
+share/doc/ntp4/html/drivers/driver38.html
+share/doc/ntp4/html/drivers/driver39.html
+share/doc/ntp4/html/drivers/driver4.html
+share/doc/ntp4/html/drivers/driver40.html
+share/doc/ntp4/html/drivers/driver42.html
+share/doc/ntp4/html/drivers/driver43.html
+share/doc/ntp4/html/drivers/driver44.html
+share/doc/ntp4/html/drivers/driver45.html
+share/doc/ntp4/html/drivers/driver5.html
+share/doc/ntp4/html/drivers/driver6.html
+share/doc/ntp4/html/drivers/driver7.html
+share/doc/ntp4/html/drivers/driver8.html
+share/doc/ntp4/html/drivers/driver9.html
+share/doc/ntp4/html/drivers/icons/home.gif
+share/doc/ntp4/html/drivers/icons/mail2.gif
+share/doc/ntp4/html/drivers/mx4200data.html
+share/doc/ntp4/html/drivers/oncore-shmem.html
+share/doc/ntp4/html/drivers/scripts/footer.txt
+share/doc/ntp4/html/drivers/scripts/style.css
+share/doc/ntp4/html/drivers/tf582_4.html
+share/doc/ntp4/html/extern.html
+share/doc/ntp4/html/filter.html
+share/doc/ntp4/html/hints.html
+share/doc/ntp4/html/hints/a-ux
+share/doc/ntp4/html/hints/aix
+share/doc/ntp4/html/hints/bsdi
+share/doc/ntp4/html/hints/changes
+share/doc/ntp4/html/hints/decosf1
+share/doc/ntp4/html/hints/decosf2
+share/doc/ntp4/html/hints/freebsd
+share/doc/ntp4/html/hints/hpux
+share/doc/ntp4/html/hints/linux
+share/doc/ntp4/html/hints/mpeix
+share/doc/ntp4/html/hints/notes-xntp-v3
+share/doc/ntp4/html/hints/parse
+share/doc/ntp4/html/hints/refclocks
+share/doc/ntp4/html/hints/rs6000
+share/doc/ntp4/html/hints/sco.html
+share/doc/ntp4/html/hints/sgi
+share/doc/ntp4/html/hints/solaris-dosynctodr.html
+share/doc/ntp4/html/hints/solaris.html
+share/doc/ntp4/html/hints/solaris.xtra.4023118
+share/doc/ntp4/html/hints/solaris.xtra.4095849
+share/doc/ntp4/html/hints/solaris.xtra.S99ntpd
+share/doc/ntp4/html/hints/solaris.xtra.patchfreq
+share/doc/ntp4/html/hints/sun4
+share/doc/ntp4/html/hints/svr4-dell
+share/doc/ntp4/html/hints/svr4_package
+share/doc/ntp4/html/hints/todo
+share/doc/ntp4/html/hints/vxworks.html
+share/doc/ntp4/html/hints/winnt.html
+share/doc/ntp4/html/history.html
+share/doc/ntp4/html/howto.html
+share/doc/ntp4/html/huffpuff.html
+share/doc/ntp4/html/icons/home.gif
+share/doc/ntp4/html/icons/mail2.gif
+share/doc/ntp4/html/icons/sitemap.png
+share/doc/ntp4/html/index.html
+share/doc/ntp4/html/kern.html
+share/doc/ntp4/html/kernpps.html
+share/doc/ntp4/html/keygen.html
+share/doc/ntp4/html/leap.html
+share/doc/ntp4/html/miscopt.html
+share/doc/ntp4/html/monopt.html
+share/doc/ntp4/html/msyslog.html
+share/doc/ntp4/html/ntp-wait.html
+share/doc/ntp4/html/ntp_conf.html
+share/doc/ntp4/html/ntpd.html
+share/doc/ntp4/html/ntpdate.html
+share/doc/ntp4/html/ntpdc.html
+share/doc/ntp4/html/ntpdsim.html
+share/doc/ntp4/html/ntpdsim_new.html
+share/doc/ntp4/html/ntpq.html
+share/doc/ntp4/html/ntptime.html
+share/doc/ntp4/html/ntptrace.html
+share/doc/ntp4/html/orphan.html
+share/doc/ntp4/html/parsedata.html
+share/doc/ntp4/html/parsenew.html
+share/doc/ntp4/html/pic/9400n.jpg
+share/doc/ntp4/html/pic/alice11.gif
+share/doc/ntp4/html/pic/alice13.gif
+share/doc/ntp4/html/pic/alice15.gif
+share/doc/ntp4/html/pic/alice23.gif
+share/doc/ntp4/html/pic/alice31.gif
+share/doc/ntp4/html/pic/alice32.gif
+share/doc/ntp4/html/pic/alice35.gif
+share/doc/ntp4/html/pic/alice38.gif
+share/doc/ntp4/html/pic/alice44.gif
+share/doc/ntp4/html/pic/alice47.gif
+share/doc/ntp4/html/pic/alice51.gif
+share/doc/ntp4/html/pic/alice61.gif
+share/doc/ntp4/html/pic/barnstable.gif
+share/doc/ntp4/html/pic/beaver.gif
+share/doc/ntp4/html/pic/boom3.gif
+share/doc/ntp4/html/pic/boom3a.gif
+share/doc/ntp4/html/pic/boom4.gif
+share/doc/ntp4/html/pic/broad.gif
+share/doc/ntp4/html/pic/bustardfly.gif
+share/doc/ntp4/html/pic/c51.jpg
+share/doc/ntp4/html/pic/description.jpg
+share/doc/ntp4/html/pic/discipline.gif
+share/doc/ntp4/html/pic/dogsnake.gif
+share/doc/ntp4/html/pic/driver29.gif
+share/doc/ntp4/html/pic/driver43_1.gif
+share/doc/ntp4/html/pic/driver43_2.jpg
+share/doc/ntp4/html/pic/fg6021.gif
+share/doc/ntp4/html/pic/fg6039.jpg
+share/doc/ntp4/html/pic/fig_3_1.gif
+share/doc/ntp4/html/pic/flatheads.gif
+share/doc/ntp4/html/pic/flt1.gif
+share/doc/ntp4/html/pic/flt2.gif
+share/doc/ntp4/html/pic/flt3.gif
+share/doc/ntp4/html/pic/flt4.gif
+share/doc/ntp4/html/pic/flt5.gif
+share/doc/ntp4/html/pic/flt6.gif
+share/doc/ntp4/html/pic/flt7.gif
+share/doc/ntp4/html/pic/flt8.gif
+share/doc/ntp4/html/pic/flt9.gif
+share/doc/ntp4/html/pic/freq1211.gif
+share/doc/ntp4/html/pic/gadget.jpg
+share/doc/ntp4/html/pic/gps167.jpg
+share/doc/ntp4/html/pic/group.gif
+share/doc/ntp4/html/pic/hornraba.gif
+share/doc/ntp4/html/pic/igclock.gif
+share/doc/ntp4/html/pic/neoclock4x.gif
+share/doc/ntp4/html/pic/offset1211.gif
+share/doc/ntp4/html/pic/oncore_evalbig.gif
+share/doc/ntp4/html/pic/oncore_remoteant.jpg
+share/doc/ntp4/html/pic/oncore_utplusbig.gif
+share/doc/ntp4/html/pic/oz2.gif
+share/doc/ntp4/html/pic/panda.gif
+share/doc/ntp4/html/pic/pd_om006.gif
+share/doc/ntp4/html/pic/pd_om011.gif
+share/doc/ntp4/html/pic/peer.gif
+share/doc/ntp4/html/pic/pogo.gif
+share/doc/ntp4/html/pic/pogo1a.gif
+share/doc/ntp4/html/pic/pogo3a.gif
+share/doc/ntp4/html/pic/pogo4.gif
+share/doc/ntp4/html/pic/pogo5.gif
+share/doc/ntp4/html/pic/pogo6.gif
+share/doc/ntp4/html/pic/pogo7.gif
+share/doc/ntp4/html/pic/pogo8.gif
+share/doc/ntp4/html/pic/pzf509.jpg
+share/doc/ntp4/html/pic/pzf511.jpg
+share/doc/ntp4/html/pic/rabbit.gif
+share/doc/ntp4/html/pic/radio2.jpg
+share/doc/ntp4/html/pic/sheepb.jpg
+share/doc/ntp4/html/pic/stack1a.jpg
+share/doc/ntp4/html/pic/sx5.gif
+share/doc/ntp4/html/pic/thunderbolt.jpg
+share/doc/ntp4/html/pic/tonea.gif
+share/doc/ntp4/html/pic/tribeb.gif
+share/doc/ntp4/html/pic/wingdorothy.gif
+share/doc/ntp4/html/poll.html
+share/doc/ntp4/html/pps.html
+share/doc/ntp4/html/prefer.html
+share/doc/ntp4/html/quick.html
+share/doc/ntp4/html/rate.html
+share/doc/ntp4/html/rdebug.html
+share/doc/ntp4/html/refclock.html
+share/doc/ntp4/html/release.html
+share/doc/ntp4/html/scripts/accopt.txt
+share/doc/ntp4/html/scripts/audio.txt
+share/doc/ntp4/html/scripts/authopt.txt
+share/doc/ntp4/html/scripts/clockopt.txt
+share/doc/ntp4/html/scripts/command.txt
+share/doc/ntp4/html/scripts/config.txt
+share/doc/ntp4/html/scripts/confopt.txt
+share/doc/ntp4/html/scripts/external.txt
+share/doc/ntp4/html/scripts/footer.txt
+share/doc/ntp4/html/scripts/hand.txt
+share/doc/ntp4/html/scripts/install.txt
+share/doc/ntp4/html/scripts/manual.txt
+share/doc/ntp4/html/scripts/misc.txt
+share/doc/ntp4/html/scripts/miscopt.txt
+share/doc/ntp4/html/scripts/monopt.txt
+share/doc/ntp4/html/scripts/refclock.txt
+share/doc/ntp4/html/scripts/special.txt
+share/doc/ntp4/html/scripts/style.css
+share/doc/ntp4/html/select.html
+share/doc/ntp4/html/sitemap.html
+share/doc/ntp4/html/sntp.html
+share/doc/ntp4/html/stats.html
+share/doc/ntp4/html/tickadj.html
+share/doc/ntp4/html/warp.html
+share/doc/ntp4/html/xleave.html
+share/doc/ntp4/huffpuff.html
 share/doc/ntp4/icons/home.gif
 share/doc/ntp4/icons/mail2.gif
+share/doc/ntp4/icons/sitemap.png
 share/doc/ntp4/index.html
 share/doc/ntp4/kern.html
+share/doc/ntp4/kernpps.html
 share/doc/ntp4/keygen.html
-share/doc/ntp4/ldisc.html
-share/doc/ntp4/manyopt.html
-share/doc/ntp4/measure.html
+share/doc/ntp4/leap.html
 share/doc/ntp4/miscopt.html
 share/doc/ntp4/monopt.html
 share/doc/ntp4/msyslog.html
-share/doc/ntp4/mx4200data.html
-share/doc/ntp4/notes.html
+share/doc/ntp4/ntp-keygen.html
+share/doc/ntp4/ntp-wait.html
+share/doc/ntp4/ntp.conf.html
+share/doc/ntp4/ntp.keys.html
 share/doc/ntp4/ntp_conf.html
 share/doc/ntp4/ntpd.html
 share/doc/ntp4/ntpdate.html
@@ -132,13 +364,17 @@ share/doc/ntp4/ntpdc.html
 share/doc/ntp4/ntpdsim.html
 share/doc/ntp4/ntpdsim_new.html
 share/doc/ntp4/ntpq.html
+share/doc/ntp4/ntpsnmpd.html
+share/doc/ntp4/ntpsweep.html
 share/doc/ntp4/ntptime.html
 share/doc/ntp4/ntptrace.html
+share/doc/ntp4/orphan.html
 share/doc/ntp4/parsedata.html
 share/doc/ntp4/parsenew.html
 share/doc/ntp4/pic/9400n.jpg
 share/doc/ntp4/pic/alice11.gif
 share/doc/ntp4/pic/alice13.gif
+share/doc/ntp4/pic/alice15.gif
 share/doc/ntp4/pic/alice23.gif
 share/doc/ntp4/pic/alice31.gif
 share/doc/ntp4/pic/alice32.gif
@@ -152,19 +388,37 @@ share/doc/ntp4/pic/barnstable.gif
 share/doc/ntp4/pic/beaver.gif
 share/doc/ntp4/pic/boom3.gif
 share/doc/ntp4/pic/boom3a.gif
+share/doc/ntp4/pic/boom4.gif
+share/doc/ntp4/pic/broad.gif
 share/doc/ntp4/pic/bustardfly.gif
 share/doc/ntp4/pic/c51.jpg
+share/doc/ntp4/pic/description.jpg
+share/doc/ntp4/pic/discipline.gif
 share/doc/ntp4/pic/dogsnake.gif
 share/doc/ntp4/pic/driver29.gif
 share/doc/ntp4/pic/driver43_1.gif
 share/doc/ntp4/pic/driver43_2.jpg
 share/doc/ntp4/pic/fg6021.gif
 share/doc/ntp4/pic/fg6039.jpg
+share/doc/ntp4/pic/fig_3_1.gif
+share/doc/ntp4/pic/flatheads.gif
+share/doc/ntp4/pic/flt1.gif
+share/doc/ntp4/pic/flt2.gif
+share/doc/ntp4/pic/flt3.gif
+share/doc/ntp4/pic/flt4.gif
+share/doc/ntp4/pic/flt5.gif
+share/doc/ntp4/pic/flt6.gif
+share/doc/ntp4/pic/flt7.gif
+share/doc/ntp4/pic/flt8.gif
+share/doc/ntp4/pic/flt9.gif
+share/doc/ntp4/pic/freq1211.gif
 share/doc/ntp4/pic/gadget.jpg
 share/doc/ntp4/pic/gps167.jpg
+share/doc/ntp4/pic/group.gif
 share/doc/ntp4/pic/hornraba.gif
 share/doc/ntp4/pic/igclock.gif
 share/doc/ntp4/pic/neoclock4x.gif
+share/doc/ntp4/pic/offset1211.gif
 share/doc/ntp4/pic/oncore_evalbig.gif
 share/doc/ntp4/pic/oncore_remoteant.jpg
 share/doc/ntp4/pic/oncore_utplusbig.gif
@@ -172,35 +426,60 @@ share/doc/ntp4/pic/oz2.gif
 share/doc/ntp4/pic/panda.gif
 share/doc/ntp4/pic/pd_om006.gif
 share/doc/ntp4/pic/pd_om011.gif
+share/doc/ntp4/pic/peer.gif
 share/doc/ntp4/pic/pogo.gif
 share/doc/ntp4/pic/pogo1a.gif
 share/doc/ntp4/pic/pogo3a.gif
 share/doc/ntp4/pic/pogo4.gif
 share/doc/ntp4/pic/pogo5.gif
 share/doc/ntp4/pic/pogo6.gif
+share/doc/ntp4/pic/pogo7.gif
 share/doc/ntp4/pic/pogo8.gif
+share/doc/ntp4/pic/pzf509.jpg
 share/doc/ntp4/pic/pzf511.jpg
 share/doc/ntp4/pic/rabbit.gif
 share/doc/ntp4/pic/radio2.jpg
 share/doc/ntp4/pic/sheepb.jpg
 share/doc/ntp4/pic/stack1a.jpg
+share/doc/ntp4/pic/sx5.gif
+share/doc/ntp4/pic/thunderbolt.jpg
 share/doc/ntp4/pic/tonea.gif
+share/doc/ntp4/pic/tribeb.gif
 share/doc/ntp4/pic/wingdorothy.gif
+share/doc/ntp4/poll.html
 share/doc/ntp4/pps.html
 share/doc/ntp4/prefer.html
+share/doc/ntp4/quick.html
+share/doc/ntp4/rate.html
 share/doc/ntp4/rdebug.html
 share/doc/ntp4/refclock.html
 share/doc/ntp4/release.html
+share/doc/ntp4/scripts/accopt.txt
+share/doc/ntp4/scripts/audio.txt
+share/doc/ntp4/scripts/authopt.txt
+share/doc/ntp4/scripts/clockopt.txt
+share/doc/ntp4/scripts/command.txt
+share/doc/ntp4/scripts/config.txt
+share/doc/ntp4/scripts/confopt.txt
+share/doc/ntp4/scripts/external.txt
 share/doc/ntp4/scripts/footer.txt
-share/doc/ntp4/scripts/links10.txt
-share/doc/ntp4/scripts/links11.txt
-share/doc/ntp4/scripts/links12.txt
-share/doc/ntp4/scripts/links7.txt
-share/doc/ntp4/scripts/links8.txt
-share/doc/ntp4/scripts/links9.txt
+share/doc/ntp4/scripts/hand.txt
+share/doc/ntp4/scripts/install.txt
+share/doc/ntp4/scripts/manual.txt
+share/doc/ntp4/scripts/misc.txt
+share/doc/ntp4/scripts/miscopt.txt
+share/doc/ntp4/scripts/monopt.txt
+share/doc/ntp4/scripts/refclock.txt
+share/doc/ntp4/scripts/special.txt
 share/doc/ntp4/scripts/style.css
+share/doc/ntp4/select.html
+share/doc/ntp4/sitemap.html
 share/doc/ntp4/sntp.html
+share/doc/ntp4/stats.html
 share/doc/ntp4/tickadj.html
+share/doc/ntp4/warp.html
+share/doc/ntp4/xleave.html
+share/doc/sntp/sntp.html
 share/examples/ntp4/README
 share/examples/ntp4/baldwin.conf
 share/examples/ntp4/beauregard.conf
@@ -210,3 +489,5 @@ share/examples/ntp4/pogo.conf
 share/examples/ntp4/rackety.conf
 share/examples/rc.d/ntpd
 share/examples/rc.d/ntpdate
+share/ntp/lib/NTP/Util.pm
+@pkgdir include/event2
diff --git a/net/ntp4/distinfo b/net/ntp4/distinfo
index 46694410c1c..bdc398291b9 100644
--- a/net/ntp4/distinfo
+++ b/net/ntp4/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2009/12/21 14:48:21 tnn Exp $
+$NetBSD: distinfo,v 1.17 2014/01/12 17:01:02 spz Exp $
 
-SHA1 (ntp-4.2.4p8.tar.gz) = 0aa9bd4f451a35586843ccd5eb8391f061beb960
-RMD160 (ntp-4.2.4p8.tar.gz) = 63e684b1f92b93a7d972706286c335abcceb54bd
-Size (ntp-4.2.4p8.tar.gz) = 3389646 bytes
-SHA1 (patch-aa) = 57f3173b9b7a6918d7146162d9878ba84e730245
-SHA1 (patch-ab) = 9d4deb7ecd26053cc40228ecc57d23bbc26acc85
+SHA1 (ntp-dev-4.2.7p410.tar.gz) = d93719047fdd9e67287edaabb1653735ffaf28f3
+RMD160 (ntp-dev-4.2.7p410.tar.gz) = 309f7c6ba088b9c4ac0b2bd018ea3918fb837d4f
+Size (ntp-dev-4.2.7p410.tar.gz) = 6334536 bytes
+SHA1 (patch-aa) = b247569339d09a88f2e143e355033ce7635ffe92
+SHA1 (patch-sntp_loc_pkgsrc) = 6e46ffc0cc2afcfdc1d01297cbe04cb80d103575
diff --git a/net/ntp4/patches/patch-aa b/net/ntp4/patches/patch-aa
index bf8fd181725..bbac1a6ba92 100644
--- a/net/ntp4/patches/patch-aa
+++ b/net/ntp4/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2009/12/21 14:48:21 tnn Exp $
+$NetBSD: patch-aa,v 1.11 2014/01/12 17:01:02 spz Exp $
 
---- include/ntp_syscall.h.orig	2004-02-25 05:57:56.000000000 +0000
+--- include/ntp_syscall.h.orig	2011-03-31 10:03:53.000000000 +0000
 +++ include/ntp_syscall.h
-@@ -14,6 +14,14 @@
+@@ -10,6 +10,14 @@
  # include <sys/timex.h>
  #endif
  
@@ -15,5 +15,5 @@ $NetBSD: patch-aa,v 1.10 2009/12/21 14:48:21 tnn Exp $
 +#endif
 +
  #ifndef NTP_SYSCALLS_LIBC
- #ifdef NTP_SYSCALLS_STD
- # define ntp_adjtime(t)		syscall(SYS_ntp_adjtime, (t))
+ # ifdef NTP_SYSCALLS_STD
+ #  define ntp_adjtime(t)	syscall(SYS_ntp_adjtime, (t))
diff --git a/net/ntp4/patches/patch-ab b/net/ntp4/patches/patch-ab
deleted file mode 100644
index 0d5f0b6118f..00000000000
--- a/net/ntp4/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2009/12/21 14:48:21 tnn Exp $
-
---- sntp/Makefile.in.orig	2009-12-08 11:58:17.000000000 +0000
-+++ sntp/Makefile.in
-@@ -286,10 +286,9 @@ sntp_SOURCES = \
- 	unix.c \
- 	$(NULL)
- 
--dist_man_MANS = sntp.1
- EXTRA_DIST = bincheck.mf	\
- 		COPYRIGHT	\
--		sntp-opts.def sntp.1 sntp-opts.texi sntp-opts.menu	\
-+		sntp-opts.def sntp-opts.texi sntp-opts.menu	\
- 		autogen-version.def version.def
- 
- BUILT_SOURCES = check-autogen-version.def check-version.def	\
diff --git a/net/ntp4/patches/patch-sntp_loc_pkgsrc b/net/ntp4/patches/patch-sntp_loc_pkgsrc
new file mode 100644
index 00000000000..a60c0e587d0
--- /dev/null
+++ b/net/ntp4/patches/patch-sntp_loc_pkgsrc
@@ -0,0 +1,22 @@
+$NetBSD: patch-sntp_loc_pkgsrc,v 1.1 2014/01/12 17:01:02 spz Exp $
+
+--- sntp/loc/pkgsrc.orig	2014-01-12 16:25:16.000000000 +0000
++++ sntp/loc/pkgsrc
+@@ -0,0 +1,17 @@
++# pkgsrc installation and man page suffixes
++MAN
++ntp-keygen,sbin,8
++ntp-wait,sbin,8
++ntpd,sbin,8
++ntpdate,sbin,8
++ntpdc,sbin,8
++ntpdsim,sbin,8
++ntpq,sbin,8
++ntpsnmpd,sbin,8
++ntpsweep,noinst,8
++ntptrace,sbin,8
++sntp,bin,1
++ntptime,sbin,8
++calc_tickadj,sbin,8
++tickadj,sbin,8
++timetrim,sbin,8