9 files changed, 357 insertions, 87 deletions

diff --git a/net/ntp/Makefile b/net/ntp/Makefile
index 1368a4accce7..87c3bc828d02 100644
--- a/net/ntp/Makefile
+++ b/net/ntp/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ntp
-PORTVERSION?=	4.2.6p5
-PORTREVISION=	4
+PORTVERSION=	4.2.8
 CATEGORIES=	net ipv6
 MASTER_SITES=	ftp://ftp.udel.edu/pub/ntp/ntp4/ \
 		http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ \
@@ -14,18 +13,16 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/P/p/:S/.r/-RC/}
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	The Network Time Protocol Distribution
 
-USES=		libtool shebangfix
-SHEBANG_FILES=	${WRKSRC}/scripts/ntptrace.in ${WRKSRC}/scripts/ntp-wait.in
-perl_OLD_CMD=	@PATH_PERL@
 GNU_CONFIGURE=	yes
 OPTIONS_SUB=	yes
+USES=		pathfix shebangfix libtool
+LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+
+NTP_SHEBANG_FILES=	sbin/ntp-wait sbin/ntptrace
 
 .include "Makefile.inc"
 
-NTPSNMPD_PLIST_FILES=	bin/ntpsnmpd
-NTPSNMPD_BUILD_DEPENDS=	${LOCALBASE}/include/net-snmp/net-snmp-config.h:${PORTSDIR}/net-mgmt/net-snmp
-NTPSNMPD_RUN_DEPENDS=	${LOCALBASE}/include/net-snmp/net-snmp-config.h:${PORTSDIR}/net-mgmt/net-snmp
-NTPSNMPD_CONFIGURE_OFF=	--without-ntpsnmpd
+PERL_UTILS_USES=	perl5
 
 SSL_USE=		OPENSSL=yes
 SSL_CONFIGURE_OFF=	--without-crypto
@@ -34,7 +31,10 @@ IPV6_CONFIGURE_ENABLE=	ipv6
 
 NTP_SIGND_CONFIGURE_ENABLE=	ntp-signd
 
-.include <bsd.port.options.mk>
+NTPSNMPD_LIB_DEPENDS=	libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp
+NTPSNMPD_CONFIGURE_OFF=	--without-ntpsnmpd
+
+.include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MSSL}
 CONFIGURE_ARGS+=	--with-openssl-incdir=${OPENSSLINC} \
@@ -47,6 +47,17 @@ CONFIGURE_ARGS+=	--enable-${D}
 .endif
 .endfor
 
+.if ${PORT_OPTIONS:MMX4200}
+BROKEN=		Fails to compile when MX4200 is enabled.
+.endif
+ 
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}4
+
+# XXX Temporary hack. Remember to remove this next commit.
+post-extract:
+	@/usr/bin/touch ${WRKSRC}/scripts/build/checkHtmlFileDates
+	@${CHMOD} +x ${WRKSRC}/scripts/build/checkHtmlFileDates
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/conf/* ${STAGEDIR}${EXAMPLESDIR}
@@ -54,5 +65,7 @@ post-install:
 	@${FIND} ${WRKSRC}/html -type f | ${XARGS} ${CHMOD} ${SHAREMODE}
 	@cd ${WRKSRC}/html && ${FIND} . -print | \
 		${CPIO} -pdu -R ${SHAREOWN}:${SHAREGRP} --quiet ${STAGEDIR}${DOCSDIR}
+	@cd ${STAGEDIR}${PREFIX}; \
+		${ECHO_CMD} ${NTP_SHEBANG_FILES} | ${XARGS} ${SED} -i '' ${_SHEBANG_REINPLACE_ARGS}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/net/ntp/Makefile.inc b/net/ntp/Makefile.inc
index 6a9ee96b355b..1299357ee76b 100644
--- a/net/ntp/Makefile.inc
+++ b/net/ntp/Makefile.inc
@@ -32,6 +32,7 @@ OPTIONS_DEFINE=	NTPSNMPD \
   		ONCORE \
   		PALISADE \
   		PCF \
+		PERL_UTILS \
   		PST \
   		RIPENCC \
   		SHM \
@@ -47,6 +48,7 @@ OPTIONS_DEFINE=	NTPSNMPD \
   		RAWDCF	 \
   		RCC8000 \
   		SCHMID \
+		SEL240X \
   		TRIMTAIP \
   		TRIMTSIP \
   		WHARTON	 \
@@ -55,8 +57,8 @@ OPTIONS_DEFINE=	NTPSNMPD \
   		EXAMPLES
 
 OPTIONS_DEFAULT=	SSL \
-		NTP_SIGND \
   		ATOM \
+		PERL_UTILS \
   		NMEA
 
 NTPSNMPD_DESC=	Build and install ntpsnmpd
@@ -89,6 +91,7 @@ NMEA_DESC=	Enable NMEA GPS receiver
 ONCORE_DESC=	Enable Motorola VP/UT Oncore GPS receiver
 PALISADE_DESC=	Enable Palisade clock
 PCF_DESC=	Enable Conrad parallel port radio clock
+PERL_UTILS_DESC=	Install ntp-wait and ntptrace utilities
 PST_DESC=	Enable PST/Traconex 1020 WWV/WWVH receiver
 RIPENCC_DESC=	Enable RIPENCC specific Trimble driver
 SHM_DESC=	Enable SHM clock attached thru shared memory
@@ -104,6 +107,7 @@ MEINBERG_DESC=	Enable Meinberg clocks
 RAWDCF_DESC=	Enable DCF77 raw time code
 RCC8000_DESC=	Enable RCC 8000 clock
 SCHMID_DESC=	Enable Schmid DCF77 clock
+SEL240X_DESC=	Enable SEL 240X clocks
 TRIMTAIP_DESC=	Enable Trimble GPS receiver/TAIP protocol
 TRIMTSIP_DESC=	Enable Trimble GPS receiver/TSIP protocol
 WHARTON_DESC=	Enable WHARTON 400A Series clock
@@ -156,6 +160,7 @@ NTP_DRIVERS= \
   		RAWDCF \
   		RCC8000 \
   		SCHMID \
+		SEL240X \
   		TRIMTAIP \
   		TRIMTSIP \
   		WHARTON \
diff --git a/net/ntp/distinfo b/net/ntp/distinfo
index 6a1abff827d9..5864086bd8f9 100644
--- a/net/ntp/distinfo
+++ b/net/ntp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ntp-4.2.6p5.tar.gz) = d6ab8371f9d31e594eb6922823d5ccd03dcc4e9d84b0e23ea25ac1405432f91c
-SIZE (ntp-4.2.6p5.tar.gz) = 4202539
+SHA256 (ntp-4.2.8.tar.gz) = 2e920df8b6a5a410567a73767fa458c00c7f0acec3213e69ed0134414a50d8ee
+SIZE (ntp-4.2.8.tar.gz) = 6750364
diff --git a/net/ntp/files/patch-include__ntp_net.h b/net/ntp/files/patch-include__ntp_net.h
new file mode 100644
index 000000000000..e431baf24eb2
--- /dev/null
+++ b/net/ntp/files/patch-include__ntp_net.h
@@ -0,0 +1,28 @@
+--- include/ntp_net.h.orig	2014-12-19 03:56:52.000000000 -0800
++++ include/ntp_net.h	2014-12-19 16:21:51.050264459 -0800
+@@ -5,6 +5,11 @@
+ #ifndef NTP_NET_H
+ #define NTP_NET_H
+ 
++/* XXX obtained from /usr/include/netinet6/in6.h */
++#define s6_addr8  __u6_addr.__u6_addr8
++#define s6_addr16 __u6_addr.__u6_addr16
++#define s6_addr32 __u6_addr.__u6_addr32
++
+ #include <sys/types.h>
+ #ifdef HAVE_SYS_SOCKET_H
+ #include <sys/socket.h>
+@@ -29,6 +34,13 @@
+ 	struct sockaddr		sa;
+ 	struct sockaddr_in	sa4;
+ 	struct sockaddr_in6	sa6;
++/* XXX obtained from /usr/include/netinet6/in6.h */
++	union {
++		uint8_t         __u6_addr8[16];
++		uint16_t        __u6_addr16[8];
++		uint32_t        __u6_addr32[4];
++	} __u6_addr;                    /* 128-bit IP6 address */
++
+ } sockaddr_u;
+ 
+ /*
diff --git a/net/ntp/files/patch-ntpd-ntp_io.c b/net/ntp/files/patch-ntpd-ntp_io.c
deleted file mode 100644
index cdf1eada580f..000000000000
--- a/net/ntp/files/patch-ntpd-ntp_io.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ntpd/ntp_io.c.orig	2010-06-03 20:24:51.000000000 -0700
-+++ ntpd/ntp_io.c	2010-06-03 20:27:36.000000000 -0700
-@@ -1414,12 +1414,18 @@
- 	sockaddr_u *psau
- 	)
- {
-+	unsigned char zerobuf[8];
-+
- 	if (IS_IPV4(psau) && !NSRCADR(psau))
- 		return 1;
- 
- #ifdef INCLUDE_IPV6_SUPPORT
- 	if (IS_IPV6(psau) && S_ADDR6_EQ(psau, &in6addr_any))
- 		return 1;
-+	bzero(zerobuf, sizeof(zerobuf));
-+	// If the host portion is all 0, then assume it's a router's anycast address.
-+	if (IS_IPV6(psau) && memcmp((char*)(&((struct sockaddr_in6*)psau)->sin6_addr) + 8, zerobuf, 8) == 0)
-+		return 1;
- #endif
- 
- 	return 0;
diff --git a/net/ntp/files/patch-ntpd-ntp_request.c b/net/ntp/files/patch-ntpd-ntp_request.c
deleted file mode 100644
index 5ecaf67993ad..000000000000
--- a/net/ntp/files/patch-ntpd-ntp_request.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- ntpd/ntp_request.c.orig	2011-11-30 18:55:17.000000000 -0800
-+++ ntpd/ntp_request.c	2014-10-06 17:07:02.570303970 -0700
-@@ -1956,7 +1956,6 @@
- 	    printf("wants monitor 0 list\n");
- #endif
- 	if (!mon_enabled) {
--		req_ack(srcadr, inter, inpkt, INFO_ERR_NODATA);
- 		return;
- 	}
- 	im = (struct info_monitor *)prepare_pkt(srcadr, inter, inpkt,
-@@ -2002,7 +2001,6 @@
- 	extern int mon_enabled;
- 
- 	if (!mon_enabled) {
--		req_ack(srcadr, inter, inpkt, INFO_ERR_NODATA);
- 		return;
- 	}
- 	im = (struct info_monitor_1 *)prepare_pkt(srcadr, inter, inpkt,
diff --git a/net/ntp/files/patch-ntpd-ntpd.c b/net/ntp/files/patch-ntpd-ntpd.c
deleted file mode 100644
index 2b1614ffe6c6..000000000000
--- a/net/ntp/files/patch-ntpd-ntpd.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- ntpd/ntpd.c.orig	2011-12-24 15:27:15.000000000 -0800
-+++ ntpd/ntpd.c	2014-10-06 17:04:57.760219124 -0700
-@@ -853,8 +853,8 @@
- 	init_proto();		/* Call at high priority */
- 	init_io();
- 	init_loopfilter();
--	mon_start(MON_ON);	/* monitor on by default now	  */
--				/* turn off in config if unwanted */
-+	mon_start(MON_OFF);	/* monitor off by default now	  */
-+				/* turn on in config if wanted */
- 
- 	/*
- 	 * Get the configuration.  This is done in a separate module
diff --git a/net/ntp/pkg-descr b/net/ntp/pkg-descr
index a2e2348a5109..8610484769d3 100644
--- a/net/ntp/pkg-descr
+++ b/net/ntp/pkg-descr
@@ -13,4 +13,6 @@ network paths, in order to achieve high accuracy and reliability.
 Some configurations include cryptographic authentication to prevent
 accidental or malicious protocol attacks.
 
+See homepage for more infos:
+
 WWW: http://www.ntp.org/
diff --git a/net/ntp/pkg-plist b/net/ntp/pkg-plist
index 5c87f9aba628..90fd7a47825e 100644
--- a/net/ntp/pkg-plist
+++ b/net/ntp/pkg-plist
@@ -1,33 +1,44 @@
-%%SSL%%bin/ntp-keygen
-bin/ntp-wait
-bin/ntpd
-bin/ntpdate
-bin/ntpdc
-bin/ntpq
-bin/ntptime
-bin/ntptrace
-bin/sntp
-bin/tickadj
-man/man1/sntp.1.gz
-man/man1/ntpd.1.gz
-man/man1/ntpdc.1.gz
-man/man1/ntpq.1.gz
-man/man1/ntpsnmpd.1.gz
-man/man1/ntp-keygen.1.gz
+man/man5/ntp.conf.5.gz
+man/man5/ntp.keys.5.gz
+man/man8/ntp-keygen.8.gz
+%%PERL_UTILS%%man/man8/ntp-wait.8.gz
+man/man8/ntpd.8.gz
+man/man8/ntpdc.8.gz
+man/man8/ntpq.8.gz
+%%PERL_UTILS%%man/man8/ntptrace.8.gz
+%%NTPSNMPD%%man/man8/ntpsnmpd.8.gz
+man/man8/sntp.8.gz
+%%SSL%%sbin/ntp-keygen
+%%PERL_UTILS%%sbin/ntp-wait
+sbin/ntpd
+sbin/ntpdate
+sbin/ntpdc
+sbin/ntpq
+%%NTPSNMPD%%sbin/ntpsnmpd
+sbin/ntptime
+%%PERL_UTILS%%sbin/ntptrace
+sbin/sntp
+%%PERL_UTILS%%share/ntp/lib/NTP/Util.pm
+%%PORTDOCS%%%%DOCSDIR%%/access.html
 %%PORTDOCS%%%%DOCSDIR%%/accopt.html
 %%PORTDOCS%%%%DOCSDIR%%/assoc.html
 %%PORTDOCS%%%%DOCSDIR%%/audio.html
+%%PORTDOCS%%%%DOCSDIR%%/authentic.html
 %%PORTDOCS%%%%DOCSDIR%%/authopt.html
+%%PORTDOCS%%%%DOCSDIR%%/autokey.html
 %%PORTDOCS%%%%DOCSDIR%%/bugs.html
 %%PORTDOCS%%%%DOCSDIR%%/build.html
+%%PORTDOCS%%%%DOCSDIR%%/clock.html
 %%PORTDOCS%%%%DOCSDIR%%/clockopt.html
+%%PORTDOCS%%%%DOCSDIR%%/cluster.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%%/discipline.html
+%%PORTDOCS%%%%DOCSDIR%%/discover.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver1.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver10.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver11.html
@@ -35,7 +46,6 @@ man/man1/ntp-keygen.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver16.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver18.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver19.html
-%%PORTDOCS%%%%DOCSDIR%%/drivers/driver2.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver20.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver22.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver26.html
@@ -58,6 +68,8 @@ man/man1/ntp-keygen.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver42.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver43.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver44.html
+%%PORTDOCS%%%%DOCSDIR%%/drivers/driver45.html
+%%PORTDOCS%%%%DOCSDIR%%/drivers/driver46.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver5.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver6.html
 %%PORTDOCS%%%%DOCSDIR%%/drivers/driver7.html
@@ -71,7 +83,7 @@ man/man1/ntp-keygen.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/drivers/scripts/style.css
 %%PORTDOCS%%%%DOCSDIR%%/drivers/tf582_4.html
 %%PORTDOCS%%%%DOCSDIR%%/extern.html
-%%PORTDOCS%%%%DOCSDIR%%/gadget.html
+%%PORTDOCS%%%%DOCSDIR%%/filter.html
 %%PORTDOCS%%%%DOCSDIR%%/hints.html
 %%PORTDOCS%%%%DOCSDIR%%/hints/a-ux
 %%PORTDOCS%%%%DOCSDIR%%/hints/aix
@@ -101,17 +113,255 @@ man/man1/ntp-keygen.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/hints/todo
 %%PORTDOCS%%%%DOCSDIR%%/hints/vxworks.html
 %%PORTDOCS%%%%DOCSDIR%%/hints/winnt.html
+%%PORTDOCS%%%%DOCSDIR%%/history.html
 %%PORTDOCS%%%%DOCSDIR%%/howto.html
+%%PORTDOCS%%%%DOCSDIR%%/html/access.html
+%%PORTDOCS%%%%DOCSDIR%%/html/accopt.html
+%%PORTDOCS%%%%DOCSDIR%%/html/assoc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/audio.html
+%%PORTDOCS%%%%DOCSDIR%%/html/authentic.html
+%%PORTDOCS%%%%DOCSDIR%%/html/authopt.html
+%%PORTDOCS%%%%DOCSDIR%%/html/autokey.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bugs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/build.html
+%%PORTDOCS%%%%DOCSDIR%%/html/clock.html
+%%PORTDOCS%%%%DOCSDIR%%/html/clockopt.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cluster.html
+%%PORTDOCS%%%%DOCSDIR%%/html/comdex.html
+%%PORTDOCS%%%%DOCSDIR%%/html/config.html
+%%PORTDOCS%%%%DOCSDIR%%/html/confopt.html
+%%PORTDOCS%%%%DOCSDIR%%/html/copyright.html
+%%PORTDOCS%%%%DOCSDIR%%/html/debug.html
+%%PORTDOCS%%%%DOCSDIR%%/html/decode.html
+%%PORTDOCS%%%%DOCSDIR%%/html/discipline.html
+%%PORTDOCS%%%%DOCSDIR%%/html/discover.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver1.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver10.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver11.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver12.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver16.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver18.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver19.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver20.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver22.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver26.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver27.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver28.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver29.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver30.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver31.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver32.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver33.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver34.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver35.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver36.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver37.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver38.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver39.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver4.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver40.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver42.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver43.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver44.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver45.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver46.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver5.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver6.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver7.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver8.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/driver9.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/icons/home.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/icons/mail2.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/mx4200data.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/oncore-shmem.html
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/scripts/footer.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/scripts/style.css
+%%PORTDOCS%%%%DOCSDIR%%/html/drivers/tf582_4.html
+%%PORTDOCS%%%%DOCSDIR%%/html/extern.html
+%%PORTDOCS%%%%DOCSDIR%%/html/filter.html
+%%PORTDOCS%%%%DOCSDIR%%/html/hints.html
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/a-ux
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/aix
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/bsdi
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/changes
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/decosf1
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/decosf2
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/freebsd
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/hpux
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/linux
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/mpeix
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/notes-xntp-v3
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/parse
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/refclocks
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/rs6000
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/sco.html
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/sgi
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/solaris-dosynctodr.html
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/solaris.html
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/solaris.xtra.4023118
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/solaris.xtra.4095849
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/solaris.xtra.S99ntpd
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/solaris.xtra.patchfreq
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/sun4
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/svr4-dell
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/svr4_package
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/todo
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/vxworks.html
+%%PORTDOCS%%%%DOCSDIR%%/html/hints/winnt.html
+%%PORTDOCS%%%%DOCSDIR%%/html/history.html
+%%PORTDOCS%%%%DOCSDIR%%/html/howto.html
+%%PORTDOCS%%%%DOCSDIR%%/html/huffpuff.html
+%%PORTDOCS%%%%DOCSDIR%%/html/icons/home.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/icons/mail2.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/icons/sitemap.png
+%%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/kern.html
+%%PORTDOCS%%%%DOCSDIR%%/html/kernpps.html
+%%PORTDOCS%%%%DOCSDIR%%/html/keygen.html
+%%PORTDOCS%%%%DOCSDIR%%/html/leap.html
+%%PORTDOCS%%%%DOCSDIR%%/html/miscopt.html
+%%PORTDOCS%%%%DOCSDIR%%/html/monopt.html
+%%PORTDOCS%%%%DOCSDIR%%/html/msyslog.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ntp-wait.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ntp_conf.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ntpd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ntpdate.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ntpdc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ntpdsim.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ntpdsim_new.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ntpq.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ntptime.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ntptrace.html
+%%PORTDOCS%%%%DOCSDIR%%/html/orphan.html
+%%PORTDOCS%%%%DOCSDIR%%/html/parsedata.html
+%%PORTDOCS%%%%DOCSDIR%%/html/parsenew.html
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/9400n.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/alice11.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/alice13.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/alice15.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/alice23.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/alice31.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/alice32.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/alice35.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/alice38.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/alice44.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/alice47.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/alice51.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/alice61.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/barnstable.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/beaver.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/boom3.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/boom3a.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/boom4.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/broad.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/bustardfly.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/c51.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/description.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/discipline.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/dogsnake.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/driver29.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/driver43_1.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/driver43_2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/fg6021.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/fg6039.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/fig_3_1.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/flatheads.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/flt1.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/flt2.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/flt3.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/flt4.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/flt5.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/flt6.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/flt7.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/flt8.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/flt9.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/freq1211.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/gadget.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/gps167.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/group.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/hornraba.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/igclock.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/neoclock4x.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/offset1211.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/oncore_evalbig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/oncore_remoteant.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/oncore_utplusbig.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/oz2.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/panda.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/pd_om006.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/pd_om011.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/peer.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/pogo.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/pogo1a.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/pogo3a.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/pogo4.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/pogo5.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/pogo6.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/pogo7.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/pogo8.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/pzf509.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/pzf511.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/rabbit.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/radio2.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/sheepb.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/stack1a.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/stats.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/sx5.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/thunderbolt.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/time1.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/tonea.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/tribeb.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/pic/wingdorothy.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/poll.html
+%%PORTDOCS%%%%DOCSDIR%%/html/pps.html
+%%PORTDOCS%%%%DOCSDIR%%/html/prefer.html
+%%PORTDOCS%%%%DOCSDIR%%/html/quick.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rate.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rdebug.html
+%%PORTDOCS%%%%DOCSDIR%%/html/refclock.html
+%%PORTDOCS%%%%DOCSDIR%%/html/release.html
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/accopt.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/audio.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/authopt.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/clockopt.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/command.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/config.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/confopt.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/external.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/footer.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/hand.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/install.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/manual.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/misc.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/miscopt.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/monopt.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/refclock.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/special.txt
+%%PORTDOCS%%%%DOCSDIR%%/html/scripts/style.css
+%%PORTDOCS%%%%DOCSDIR%%/html/select.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sitemap.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sntp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/stats.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tickadj.html
+%%PORTDOCS%%%%DOCSDIR%%/html/warp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/xleave.html
+%%PORTDOCS%%%%DOCSDIR%%/huffpuff.html
 %%PORTDOCS%%%%DOCSDIR%%/icons/home.gif
 %%PORTDOCS%%%%DOCSDIR%%/icons/mail2.gif
+%%PORTDOCS%%%%DOCSDIR%%/icons/sitemap.png
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/kern.html
 %%PORTDOCS%%%%DOCSDIR%%/kernpps.html
 %%PORTDOCS%%%%DOCSDIR%%/keygen.html
-%%PORTDOCS%%%%DOCSDIR%%/manyopt.html
+%%PORTDOCS%%%%DOCSDIR%%/leap.html
 %%PORTDOCS%%%%DOCSDIR%%/miscopt.html
 %%PORTDOCS%%%%DOCSDIR%%/monopt.html
 %%PORTDOCS%%%%DOCSDIR%%/msyslog.html
+%%PORTDOCS%%%%DOCSDIR%%/ntp-keygen.html
+%%PORTDOCS%%%%DOCSDIR%%/ntp-wait.html
+%%PORTDOCS%%%%DOCSDIR%%/ntp.conf.html
+%%PORTDOCS%%%%DOCSDIR%%/ntp.keys.html
 %%PORTDOCS%%%%DOCSDIR%%/ntp_conf.html
 %%PORTDOCS%%%%DOCSDIR%%/ntpd.html
 %%PORTDOCS%%%%DOCSDIR%%/ntpdate.html
@@ -119,9 +369,11 @@ man/man1/ntp-keygen.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/ntpdsim.html
 %%PORTDOCS%%%%DOCSDIR%%/ntpdsim_new.html
 %%PORTDOCS%%%%DOCSDIR%%/ntpq.html
+%%PORTDOCS%%%%DOCSDIR%%/ntpsnmpd.html
+%%PORTDOCS%%%%DOCSDIR%%/ntpsweep.html
 %%PORTDOCS%%%%DOCSDIR%%/ntptime.html
 %%PORTDOCS%%%%DOCSDIR%%/ntptrace.html
-%%PORTDOCS%%%%DOCSDIR%%/ntp-wait.html
+%%PORTDOCS%%%%DOCSDIR%%/orphan.html
 %%PORTDOCS%%%%DOCSDIR%%/parsedata.html
 %%PORTDOCS%%%%DOCSDIR%%/parsenew.html
 %%PORTDOCS%%%%DOCSDIR%%/pic/9400n.jpg
@@ -146,16 +398,28 @@ man/man1/ntp-keygen.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/pic/bustardfly.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/c51.jpg
 %%PORTDOCS%%%%DOCSDIR%%/pic/description.jpg
+%%PORTDOCS%%%%DOCSDIR%%/pic/discipline.gif
 %%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/fig_3_1.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/flatheads.gif
+%%PORTDOCS%%%%DOCSDIR%%/pic/flt1.gif
+%%PORTDOCS%%%%DOCSDIR%%/pic/flt2.gif
+%%PORTDOCS%%%%DOCSDIR%%/pic/flt3.gif
+%%PORTDOCS%%%%DOCSDIR%%/pic/flt4.gif
+%%PORTDOCS%%%%DOCSDIR%%/pic/flt5.gif
+%%PORTDOCS%%%%DOCSDIR%%/pic/flt6.gif
+%%PORTDOCS%%%%DOCSDIR%%/pic/flt7.gif
+%%PORTDOCS%%%%DOCSDIR%%/pic/flt8.gif
+%%PORTDOCS%%%%DOCSDIR%%/pic/flt9.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/freq1211.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/gadget.jpg
 %%PORTDOCS%%%%DOCSDIR%%/pic/gps167.jpg
+%%PORTDOCS%%%%DOCSDIR%%/pic/group.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/hornraba.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/igclock.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/neoclock4x.gif
@@ -182,10 +446,14 @@ man/man1/ntp-keygen.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/pic/radio2.jpg
 %%PORTDOCS%%%%DOCSDIR%%/pic/sheepb.jpg
 %%PORTDOCS%%%%DOCSDIR%%/pic/stack1a.jpg
+%%PORTDOCS%%%%DOCSDIR%%/pic/stats.gif
+%%PORTDOCS%%%%DOCSDIR%%/pic/sx5.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/thunderbolt.jpg
+%%PORTDOCS%%%%DOCSDIR%%/pic/time1.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/tonea.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/tribeb.gif
 %%PORTDOCS%%%%DOCSDIR%%/pic/wingdorothy.gif
+%%PORTDOCS%%%%DOCSDIR%%/poll.html
 %%PORTDOCS%%%%DOCSDIR%%/pps.html
 %%PORTDOCS%%%%DOCSDIR%%/prefer.html
 %%PORTDOCS%%%%DOCSDIR%%/quick.html
@@ -202,17 +470,23 @@ man/man1/ntp-keygen.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/scripts/confopt.txt
 %%PORTDOCS%%%%DOCSDIR%%/scripts/external.txt
 %%PORTDOCS%%%%DOCSDIR%%/scripts/footer.txt
+%%PORTDOCS%%%%DOCSDIR%%/scripts/hand.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/special.txt
 %%PORTDOCS%%%%DOCSDIR%%/scripts/style.css
+%%PORTDOCS%%%%DOCSDIR%%/select.html
 %%PORTDOCS%%%%DOCSDIR%%/sitemap.html
 %%PORTDOCS%%%%DOCSDIR%%/sntp.html
+%%PORTDOCS%%%%DOCSDIR%%/stats.html
 %%PORTDOCS%%%%DOCSDIR%%/tickadj.html
+%%PORTDOCS%%%%DOCSDIR%%/warp.html
 %%PORTDOCS%%%%DOCSDIR%%/xleave.html
+%%PORTDOCS%%share/doc/sntp/sntp.html
 %%EXAMPLESDIR%%/README
 %%EXAMPLESDIR%%/baldwin.conf
 %%EXAMPLESDIR%%/beauregard.conf