Update from 4.2.4p7 to 4.2.6p1-RC1 (4.2.6p1.r1).

5 files changed, 83 insertions, 95 deletions

diff --git a/net/ntp/Makefile b/net/ntp/Makefile
index 778853208292..b64139880b27 100644
--- a/net/ntp/Makefile
+++ b/net/ntp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ntp
-PORTVERSION?=	4.2.4p7
+PORTVERSION?=	4.2.6p1.r1
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.udel.edu/pub/ntp/ntp4/ \
 		http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ \
@@ -20,7 +20,7 @@ COMMENT=	The Network Time Protocol Distribution
 LATEST_LINK=	${PORTNAME}
 
 GNU_CONFIGURE=	yes
-USE_AUTOTOOLS=	automake:19
+USE_AUTOTOOLS=	automake:110
 
 .if defined(ENABLE_RAWDCF)
 CONFIGURE_ARGS+=	--enable-RAWDCF
@@ -39,13 +39,16 @@ CONFIGURE_ARGS+=	--enable-ipv6
 
 MAN1=		sntp.1 \
 		ntpd.1 \
-		ntpdsim.1 \
 		ntpdc.1 \
 		ntpq.1 \
+		ntpsnmpd.1 \
 		ntp-keygen.1 \
 
 .include <bsd.port.pre.mk>
 
+pre-configure:
+	@cd ${WRKSRC} && ./bootstrap
+
 post-install:
 	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/conf/* ${EXAMPLESDIR}
diff --git a/net/ntp/distinfo b/net/ntp/distinfo
index 07fcae4f6818..33f4b39020bf 100644
--- a/net/ntp/distinfo
+++ b/net/ntp/distinfo
@@ -1,3 +1,3 @@
-MD5 (ntp-4.2.4p7.tar.gz) = 8c19ff62ed4f7d64f8e2aa59cb11f364
-SHA256 (ntp-4.2.4p7.tar.gz) = 5681883ce5cd0666d73c1b907e284653964a25ad4c02a308ab11b54aca8f01c3
-SIZE (ntp-4.2.4p7.tar.gz) = 3382146
+MD5 (ntp-4.2.6p1-RC1.tar.gz) = 692b299ba689307175aa270995e435be
+SHA256 (ntp-4.2.6p1-RC1.tar.gz) = b193da760bedeee8a19b4385429e61d9b8cbd33d699169435f60e7e77fe82044
+SIZE (ntp-4.2.6p1-RC1.tar.gz) = 4326185
diff --git a/net/ntp/files/patch-configure b/net/ntp/files/patch-configure
deleted file mode 100644
index 72dd4c4c4494..000000000000
--- a/net/ntp/files/patch-configure
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.orig	Sun Jul  9 04:08:43 2006
-+++ configure	Thu Oct  5 11:20:15 2006
-@@ -1479,6 +1479,11 @@
-       done
-     done
-     ;;
-+ i?86-*-freebsd[[123]].*)
-+    ;;
-+ i?86-*-freebsd*)
-+    ans=yes
-+    ;;
- esac
- done
- 
diff --git a/net/ntp/files/patch-sntp-socket.c b/net/ntp/files/patch-sntp-socket.c
deleted file mode 100644
index d36272b79158..000000000000
--- a/net/ntp/files/patch-sntp-socket.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- sntp/socket.c.orig	Sun Jul  9 04:01:46 2006
-+++ sntp/socket.c	Fri Aug  4 20:56:59 2006
-@@ -7,8 +7,10 @@
- the only system that the author uses that has it is Linux. */
- 
- 
--
-+/* XXX config.h not generated by configure script in this directory */
-+#if 0
- #include "config.h"
-+#endif
- 
- #include "header.h"
- #include "internet.h"
diff --git a/net/ntp/pkg-plist b/net/ntp/pkg-plist
index 4fdd574fd27f..a69a682112be 100644
--- a/net/ntp/pkg-plist
+++ b/net/ntp/pkg-plist
@@ -8,57 +8,21 @@ bin/ntptime
 bin/ntptrace
 bin/sntp
 bin/tickadj
+sbin/ntpsnmpd
 %%PORTDOCS%%%%DOCSDIR%%/accopt.html
 %%PORTDOCS%%%%DOCSDIR%%/assoc.html
 %%PORTDOCS%%%%DOCSDIR%%/audio.html
 %%PORTDOCS%%%%DOCSDIR%%/authopt.html
+%%PORTDOCS%%%%DOCSDIR%%/bugs.html
+%%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%%/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%%/decode.html
+%%PORTDOCS%%%%DOCSDIR%%/description_files/description.jpg
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver1.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver10.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver11.html
@@ -84,39 +48,65 @@ bin/tickadj
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver37.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver38.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver39.html
+%%PORTDOCS%%%%DOCSDIR%%/drivers/driver4.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver40.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver42.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver43.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver44.html
-%%PORTDOCS%%%%DOCSDIR%%/drivers/driver4.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver5.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver6.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver7.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver8.html
 %%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%%/drivers/icons/home.gif
-%%PORTDOCS%%%%DOCSDIR%%/drivers/icons/mail2.gif
 %%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
@@ -131,6 +121,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
@@ -144,19 +135,25 @@ bin/tickadj
 %%PORTDOCS%%%%DOCSDIR%%/pic/beaver.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/boom3.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/boom3a.gif
+%%PORTDOCS%%%%DOCSDIR%%/pic/boom4.gif
+%%PORTDOCS%%%%DOCSDIR%%/pic/broad.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/bustardfly.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/c51.jpg
+%%PORTDOCS%%%%DOCSDIR%%/pic/description.jpg
 %%PORTDOCS%%%%DOCSDIR%%/pic/dogsnake.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/driver29.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/driver43_1.gif
 %%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
 %%PORTDOCS%%%%DOCSDIR%%/pic/hornraba.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/igclock.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/neoclock4x.gif
+%%PORTDOCS%%%%DOCSDIR%%/pic/offset1211.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/oncore_evalbig.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/oncore_remoteant.jpg
 %%PORTDOCS%%%%DOCSDIR%%/pic/oncore_utplusbig.gif
@@ -164,35 +161,52 @@ bin/tickadj
 %%PORTDOCS%%%%DOCSDIR%%/pic/panda.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/pd_om006.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/pd_om011.gif
+%%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%%/pic/pzf511.jpg
 %%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
@@ -203,11 +217,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%%