Bump ntpd to 4.2.7p411 oi_151a oi_151a_prestable9
authorJon Tibble <meths@btinternet.com>
Fri, 17 Jan 2014 19:32:42 +0000
branchoi_151a
changeset 252 600924158051
parent 251 1d39ce6d1d4d
child 253 702bbe36863b
Bump ntpd to 4.2.7p411
usr/src/cmd/ntpd/METADATA
usr/src/cmd/ntpd/Patches/10-etcfix.patch
usr/src/cmd/ntpd/Patches/50-noserve.patch
usr/src/cmd/ntpd/Patches/60-exit-message.patch
usr/src/cmd/ntpd/Patches/etcfix.patch
usr/src/cmd/ntpd/Patches/mc.patch
usr/src/cmd/ntpd/Patches/mdns.patch
usr/src/cmd/ntpd/Patches/noextra.patch
usr/src/cmd/ntpd/Patches/ntpwait.patch
usr/src/cmd/ntpd/Patches/timing.patch
usr/src/cmd/ntpd/install-sfw
usr/src/cmd/ntpd/ntp-dev-4.2.5p200.tar.gz
usr/src/cmd/ntpd/ntp-dev-4.2.7p411.tar.gz
usr/src/pkgdefs/SUNWntpu/prototype_com
--- a/usr/src/cmd/ntpd/METADATA	Sun Jan 05 18:57:27 2014 +0000
+++ b/usr/src/cmd/ntpd/METADATA	Fri Jan 17 19:32:42 2014 +0000
@@ -1,10 +1,10 @@
 NAME:		ntp-dev
-VERSION:	4.2.5p200
+VERSION:	4.2.7p411
 DESCRIPTION:	Network Time Protocol
 PACKAGE:	SUNWntpu SUNWntpr
 LICENSE:	BSD-like
 PROJECT_URL:	http://www.ntp.org/
-SOURCE_DOWNLOAD:	http://archive.ntp.org/ntp4/ntp-dev/ntp-dev-4.2.5p200.tar.gz
+SOURCE_DOWNLOAD:	http://archive.ntp.org/ntp4/ntp-dev/ntp-dev-4.2.7p411.tar.gz
 SUPPORT:	B
 BUGTRAQ:	solaris/network/ntp
 OSR:		6466
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/ntpd/Patches/10-etcfix.patch	Fri Jan 17 19:32:42 2014 +0000
@@ -0,0 +1,50 @@
+This patch does the customization for the Solaris way
+of installing things. There is a method for doing this
+with the configure scripts, but these last few file
+paths have not been converted. When they are, this patch
+can go away.
+
+--- include/ntp_config.h.orig	Thu May 14 06:34:41 2009
++++ include/ntp_config.h	Thu May 14 06:15:12 2009
+@@ -10,7 +10,7 @@
+  */
+ #ifndef CONFIG_FILE
+ # ifndef SYS_WINNT
+-#  define	CONFIG_FILE "/etc/ntp.conf"
++#  define	CONFIG_FILE "/etc/inet/ntp.conf"
+ # else /* SYS_WINNT */
+ #  define	CONFIG_FILE	"%windir%\\system32\\drivers\\etc\\ntp.conf"
+ #  define	ALT_CONFIG_FILE "%windir%\\ntp.conf"
+--- libntp/audio.c.orig	Thu May 14 06:34:41 2009
++++ libntp/audio.c	Thu May 14 06:15:12 2009
+@@ -53,7 +53,7 @@
+ static struct audio_device device; /* audio device ident */
+ #endif /* HAVE_SYS_AUDIOIO_H */
+ #ifdef PCM_STYLE_SOUND
+-# define INIT_FILE "/etc/ntp.audio"
++# define INIT_FILE "/etc/inet/ntp.audio"
+ int agc =	SOUND_MIXER_WRITE_RECLEV; /* or IGAIN or LINE */
+ int monitor =	SOUND_MIXER_WRITE_VOLUME; /* or OGAIN */
+ int devmask = 0;
+--- ntpdate/ntpdate.c.orig	Thu May 14 06:34:41 2009
++++ ntpdate/ntpdate.c	Thu May 14 06:15:12 2009
+@@ -179,7 +179,7 @@
+ 
+ #ifndef KEYFILE
+ # ifndef SYS_WINNT
+-#define KEYFILE 	"/etc/ntp.keys"
++#define KEYFILE 	"/etc/inet/ntp.keys"
+ # else
+ #define KEYFILE 	"%windir%\\ntp.keys"
+ # endif /* SYS_WINNT */
+--- ntpd/refclock_oncore.c.orig	Thu May 14 06:34:41 2009
++++ ntpd/refclock_oncore.c	Thu May 14 06:15:12 2009
+@@ -1210,7 +1210,7 @@
+ 
+ 	FILE	*fd;
+ 	char	*cp, *cc, *ca, line[100], units[2], device[64], **cpp;
+-	char	*dirs[] = { "/etc/ntp", "/etc", 0 };
++	char	*dirs[] = { "/etc/inet", "/etc", 0 };
+ 	int	i, sign, lat_flg, long_flg, ht_flg, mode, mask;
+ 	double	f1, f2, f3;
+ 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/ntpd/Patches/50-noserve.patch	Fri Jan 17 19:32:42 2014 +0000
@@ -0,0 +1,20 @@
+See:
+	http://bugzilla.ntp.org/show_bug.cgi?id=2367
+
+--- ntpd/ntp_proto.c
++++ ntpd/ntp_proto.c
+@@ -429,9 +429,11 @@ receive(
+ 		process_control(rbufp, restrict_mask);
+ 		return;
+ 	}
+-	if (restrict_mask & RES_DONTSERVE) {
+-		sys_restricted++;
+-		return;				/* no time serve */
++	if (hismode == MODE_CLIENT) {
++		if (restrict_mask & RES_DONTSERVE) {
++			sys_restricted++;
++			return;				/* no time serve */
++		}
+ 	}
+ 
+ 	/*
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/ntpd/Patches/60-exit-message.patch	Fri Jan 17 19:32:42 2014 +0000
@@ -0,0 +1,36 @@
+See: 
+
+	http://bugzilla.ntp.org/show_bug.cgi?id=2410
+
+
+--- ntpd/ntp_proto.c
++++ ntpd/ntp_proto.c
+@@ -1856,23 +1856,27 @@ clock_update(
+ 	 * Clock exceeds panic threshold. Life as we know it ends.
+ 	 */
+ 	case -1:
++		msyslog(LOG_ERR, "Clock offset exceeds panic threshold.");
+ #ifdef HAVE_LIBSCF_H
+ 		/*
+ 		 * For Solaris enter the maintenance mode.
+ 		 */
+ 		if ((fmri = getenv("SMF_FMRI")) != NULL) {
+ 			if (smf_maintain_instance(fmri, 0) < 0) {
+-				printf("smf_maintain_instance: %s\n",
++				msyslog(LOG_ERR, "smf_maintain_instance: %s\n",
+ 				    scf_strerror(scf_error()));
+ 				exit(1);
+ 			}
+ 			/*
+ 			 * Sleep until SMF kills us.
+ 			 */
++			msyslog(LOG_ERR, "%s placed into maintenance. "
++			    "Set system clock by hand before clearing.", fmri);
+ 			for (;;)
+ 				pause();
+ 		}
+ #endif /* HAVE_LIBSCF_H */
++		msyslog(LOG_ERR, "Set system clock by hand.");
+ 		exit (-1);
+ 		/* not reached */
+ 
--- a/usr/src/cmd/ntpd/Patches/etcfix.patch	Sun Jan 05 18:57:27 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
---- sntp/header.h.orig	Thu May 14 06:34:41 2009
-+++ sntp/header.h	Thu May 14 06:15:12 2009
-@@ -19,10 +19,10 @@
- #define MAX_SOCKETS        10          /* Maximum number of addresses */
- 
- #ifndef LOCKNAME
--#    define LOCKNAME "/etc/sntp.pid"  /* Stores the pid */
-+#    define LOCKNAME "/var/run/sntp.pid"  /* Stores the pid */
- #endif
- #ifndef SAVENAME
--#    define SAVENAME "/etc/sntp.state" /* Stores the recovery state */
-+#    define SAVENAME "/var/ntp/sntp.state" /* Stores the recovery state */
- #endif
- 
- 
---- include/ntp_config.h.orig	Thu May 14 06:34:41 2009
-+++ include/ntp_config.h	Thu May 14 06:15:12 2009
-@@ -10,7 +10,7 @@
-  */
- #ifndef CONFIG_FILE
- # ifndef SYS_WINNT
--#  define	CONFIG_FILE "/etc/ntp.conf"
-+#  define	CONFIG_FILE "/etc/inet/ntp.conf"
- # else /* SYS_WINNT */
- #  define	CONFIG_FILE	"%windir%\\system32\\drivers\\etc\\ntp.conf"
- #  define	ALT_CONFIG_FILE "%windir%\\ntp.conf"
---- libntp/audio.c.orig	Thu May 14 06:34:41 2009
-+++ libntp/audio.c	Thu May 14 06:15:12 2009
-@@ -53,7 +53,7 @@
- static struct audio_device device; /* audio device ident */
- #endif /* HAVE_SYS_AUDIOIO_H */
- #ifdef PCM_STYLE_SOUND
--# define INIT_FILE "/etc/ntp.audio"
-+# define INIT_FILE "/etc/inet/ntp.audio"
- int agc =	SOUND_MIXER_WRITE_RECLEV; /* or IGAIN or LINE */
- int monitor =	SOUND_MIXER_WRITE_VOLUME; /* or OGAIN */
- int devmask = 0;
---- ntpdate/ntpdate.c.orig	Thu May 14 06:34:41 2009
-+++ ntpdate/ntpdate.c	Thu May 14 06:15:12 2009
-@@ -192,7 +192,7 @@
- 
- #ifndef KEYFILE
- # ifndef SYS_WINNT
--#define KEYFILE 	"/etc/ntp.keys"
-+#define KEYFILE 	"/etc/inet/ntp.keys"
- # else
- #define KEYFILE 	"%windir%\\ntp.keys"
- # endif /* SYS_WINNT */
---- ntpdate/ntptimeset.c.orig	Thu May 14 06:34:41 2009
-+++ ntpdate/ntptimeset.c	Thu May 14 06:15:12 2009
-@@ -270,7 +270,7 @@
- 
- #ifndef KEYFILE
- # ifndef SYS_WINNT
--#define KEYFILE 	"/etc/ntp.keys"
-+#define KEYFILE 	"/etc/inet/ntp.keys"
- # else
- #define KEYFILE 	"%windir%\\ntp.keys"
- # endif /* SYS_WINNT */
---- ntpdate/ntptime_config.c.orig	Thu May 14 06:34:41 2009
-+++ ntpdate/ntptime_config.c	Thu May 14 06:15:12 2009
-@@ -37,7 +37,7 @@
-  */
- #ifndef CONFIG_FILE
- # ifndef SYS_WINNT
--#  define	CONFIG_FILE "/etc/ntp.conf"
-+#  define	CONFIG_FILE "/etc/inet/ntp.conf"
- # else /* SYS_WINNT */
- #  define	CONFIG_FILE 	"%windir%\\ntp.conf"
- #  define	ALT_CONFIG_FILE "%windir%\\ntp.ini"
---- ntpd/refclock_oncore.c.orig	Thu May 14 06:34:41 2009
-+++ ntpd/refclock_oncore.c	Thu May 14 06:15:12 2009
-@@ -1188,7 +1188,7 @@
- 
- 	FILE	*fd;
- 	char	*cp, *cc, *ca, line[100], units[2], device[20], Msg[160], **cpp;
--	char	*dirs[] = { "/etc/ntp", "/etc", 0 };
-+	char	*dirs[] = { "/etc/inet", "/etc", 0 };
- 	int	i, sign, lat_flg, long_flg, ht_flg, mode, mask;
- 	double	f1, f2, f3;
- 
--- a/usr/src/cmd/ntpd/Patches/mc.patch	Sun Jan 05 18:57:27 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-*** ntpd/ntp_io.c.orig	Fri Jul 30 06:57:58 2010
---- ntpd/ntp_io.c	Fri Jul 30 06:58:46 2010
-***************
-*** 1869,1875 ****
-  
-  	case AF_INET:
-  		if (setsockopt(iface->fd, IPPROTO_IP, IP_MULTICAST_IF,
-! 			       (char *)NSRCADR(&iface->sin),
-  			       sizeof(NSRCADR(&iface->sin)))) {
-  
-  			msyslog(LOG_ERR,
---- 1869,1875 ----
-  
-  	case AF_INET:
-  		if (setsockopt(iface->fd, IPPROTO_IP, IP_MULTICAST_IF,
-! 			       (void *)&NSRCADR(&iface->sin),
-  			       sizeof(NSRCADR(&iface->sin)))) {
-  
-  			msyslog(LOG_ERR,
--- a/usr/src/cmd/ntpd/Patches/mdns.patch	Sun Jan 05 18:57:27 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,317 +0,0 @@
---- ntpd/ntpd-opts.c.orig	Thu Jul 29 09:29:51 2010
-+++ ntpd/ntpd-opts.c	Thu Jul 29 09:43:40 2010
-@@ -243,6 +243,24 @@
- #define NOVIRTUALIPS_FLAGS       (OPTST_DISABLED)
- 
- /*
-+ *  Mdns option description:
-+ */
-+#ifdef HAVE_DNSREGISTRATION
-+tSCC    zMdnsText[] =
-+        "Register with mDNS as a NTP server";
-+tSCC    zMdns_NAME[]               = "MDNS";
-+tSCC    zMdns_Name[]               = "mdns";
-+#define MDNS_FLAGS       (OPTST_DISABLED)
-+
-+#else   /* disable Mdns */
-+#define VALUE_OPT_MDNS NO_EQUIVALENT
-+#define MDNS_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
-+#define zMdnsText       NULL
-+#define zMdns_NAME      NULL
-+#define zMdns_Name      NULL
-+#endif  /* HAVE_DNSREGISTRATION */
-+
-+/*
-  *  Modifymmtimer option description:
-  */
- #ifdef SYS_WINNT
-@@ -673,10 +691,22 @@
-      /* desc, NAME, name */ zNovirtualipsText, zNovirtualips_NAME, zNovirtualips_Name,
-      /* disablement strs */ NULL, NULL },
- 
--  {  /* entry idx, value */ 15, VALUE_OPT_MODIFYMMTIMER,
--     /* equiv idx, value */ 15, VALUE_OPT_MODIFYMMTIMER,
-+  {  /* entry idx, value */ 15, VALUE_OPT_MDNS,
-+     /* equiv idx, value */ 15, VALUE_OPT_MDNS,
-      /* equivalenced to  */ NO_EQUIVALENT,
-      /* min, max, act ct */ 0, 1, 0,
-+     /* opt state flags  */ MDNS_FLAGS, 0,
-+     /* last opt argumnt */ { NULL },
-+     /* arg list/cookie  */ NULL,
-+     /* must/cannot opts */ NULL, NULL,
-+     /* option proc      */ NULL,
-+     /* desc, NAME, name */ zMdnsText, zMdns_NAME, zMdns_Name,
-+     /* disablement strs */ NULL, NULL },
-+
-+  {  /* entry idx, value */ 16, VALUE_OPT_MODIFYMMTIMER,
-+     /* equiv idx, value */ 16, VALUE_OPT_MODIFYMMTIMER,
-+     /* equivalenced to  */ NO_EQUIVALENT,
-+     /* min, max, act ct */ 0, 1, 0,
-      /* opt state flags  */ MODIFYMMTIMER_FLAGS, 0,
-      /* last opt argumnt */ { NULL },
-      /* arg list/cookie  */ NULL,
-@@ -685,8 +715,8 @@
-      /* desc, NAME, name */ zModifymmtimerText, zModifymmtimer_NAME, zModifymmtimer_Name,
-      /* disablement strs */ NULL, NULL },
- 
--  {  /* entry idx, value */ 16, VALUE_OPT_NOFORK,
--     /* equiv idx, value */ 16, VALUE_OPT_NOFORK,
-+  {  /* entry idx, value */ 17, VALUE_OPT_NOFORK,
-+     /* equiv idx, value */ 17, VALUE_OPT_NOFORK,
-      /* equivalenced to  */ NO_EQUIVALENT,
-      /* min, max, act ct */ 0, 1, 0,
-      /* opt state flags  */ NOFORK_FLAGS, 0,
-@@ -697,8 +727,8 @@
-      /* desc, NAME, name */ zNoforkText, zNofork_NAME, zNofork_Name,
-      /* disablement strs */ NULL, NULL },
- 
--  {  /* entry idx, value */ 17, VALUE_OPT_NICE,
--     /* equiv idx, value */ 17, VALUE_OPT_NICE,
-+  {  /* entry idx, value */ 18, VALUE_OPT_NICE,
-+     /* equiv idx, value */ 18, VALUE_OPT_NICE,
-      /* equivalenced to  */ NO_EQUIVALENT,
-      /* min, max, act ct */ 0, 1, 0,
-      /* opt state flags  */ NICE_FLAGS, 0,
-@@ -709,8 +739,8 @@
-      /* desc, NAME, name */ zNiceText, zNice_NAME, zNice_Name,
-      /* disablement strs */ NULL, NULL },
- 
--  {  /* entry idx, value */ 18, VALUE_OPT_PIDFILE,
--     /* equiv idx, value */ 18, VALUE_OPT_PIDFILE,
-+  {  /* entry idx, value */ 19, VALUE_OPT_PIDFILE,
-+     /* equiv idx, value */ 19, VALUE_OPT_PIDFILE,
-      /* equivalenced to  */ NO_EQUIVALENT,
-      /* min, max, act ct */ 0, 1, 0,
-      /* opt state flags  */ PIDFILE_FLAGS, 0,
-@@ -721,8 +751,8 @@
-      /* desc, NAME, name */ zPidfileText, zPidfile_NAME, zPidfile_Name,
-      /* disablement strs */ NULL, NULL },
- 
--  {  /* entry idx, value */ 19, VALUE_OPT_PRIORITY,
--     /* equiv idx, value */ 19, VALUE_OPT_PRIORITY,
-+  {  /* entry idx, value */ 20, VALUE_OPT_PRIORITY,
-+     /* equiv idx, value */ 20, VALUE_OPT_PRIORITY,
-      /* equivalenced to  */ NO_EQUIVALENT,
-      /* min, max, act ct */ 0, 1, 0,
-      /* opt state flags  */ PRIORITY_FLAGS, 0,
-@@ -733,8 +763,8 @@
-      /* desc, NAME, name */ zPriorityText, zPriority_NAME, zPriority_Name,
-      /* disablement strs */ NULL, NULL },
- 
--  {  /* entry idx, value */ 20, VALUE_OPT_QUIT,
--     /* equiv idx, value */ 20, VALUE_OPT_QUIT,
-+  {  /* entry idx, value */ 21, VALUE_OPT_QUIT,
-+     /* equiv idx, value */ 21, VALUE_OPT_QUIT,
-      /* equivalenced to  */ NO_EQUIVALENT,
-      /* min, max, act ct */ 0, 1, 0,
-      /* opt state flags  */ QUIT_FLAGS, 0,
-@@ -745,8 +775,8 @@
-      /* desc, NAME, name */ zQuitText, zQuit_NAME, zQuit_Name,
-      /* disablement strs */ NULL, NULL },
- 
--  {  /* entry idx, value */ 21, VALUE_OPT_PROPAGATIONDELAY,
--     /* equiv idx, value */ 21, VALUE_OPT_PROPAGATIONDELAY,
-+  {  /* entry idx, value */ 22, VALUE_OPT_PROPAGATIONDELAY,
-+     /* equiv idx, value */ 22, VALUE_OPT_PROPAGATIONDELAY,
-      /* equivalenced to  */ NO_EQUIVALENT,
-      /* min, max, act ct */ 0, 1, 0,
-      /* opt state flags  */ PROPAGATIONDELAY_FLAGS, 0,
-@@ -757,8 +787,8 @@
-      /* desc, NAME, name */ zPropagationdelayText, zPropagationdelay_NAME, zPropagationdelay_Name,
-      /* disablement strs */ NULL, NULL },
- 
--  {  /* entry idx, value */ 22, VALUE_OPT_STATSDIR,
--     /* equiv idx, value */ 22, VALUE_OPT_STATSDIR,
-+  {  /* entry idx, value */ 23, VALUE_OPT_STATSDIR,
-+     /* equiv idx, value */ 23, VALUE_OPT_STATSDIR,
-      /* equivalenced to  */ NO_EQUIVALENT,
-      /* min, max, act ct */ 0, 1, 0,
-      /* opt state flags  */ STATSDIR_FLAGS, 0,
-@@ -769,8 +799,8 @@
-      /* desc, NAME, name */ zStatsdirText, zStatsdir_NAME, zStatsdir_Name,
-      /* disablement strs */ NULL, NULL },
- 
--  {  /* entry idx, value */ 23, VALUE_OPT_TRUSTEDKEY,
--     /* equiv idx, value */ 23, VALUE_OPT_TRUSTEDKEY,
-+  {  /* entry idx, value */ 24, VALUE_OPT_TRUSTEDKEY,
-+     /* equiv idx, value */ 24, VALUE_OPT_TRUSTEDKEY,
-      /* equivalenced to  */ NO_EQUIVALENT,
-      /* min, max, act ct */ 0, NOLIMIT, 0,
-      /* opt state flags  */ TRUSTEDKEY_FLAGS, 0,
-@@ -781,8 +811,8 @@
-      /* desc, NAME, name */ zTrustedkeyText, zTrustedkey_NAME, zTrustedkey_Name,
-      /* disablement strs */ NULL, NULL },
- 
--  {  /* entry idx, value */ 24, VALUE_OPT_USER,
--     /* equiv idx, value */ 24, VALUE_OPT_USER,
-+  {  /* entry idx, value */ 25, VALUE_OPT_USER,
-+     /* equiv idx, value */ 25, VALUE_OPT_USER,
-      /* equivalenced to  */ NO_EQUIVALENT,
-      /* min, max, act ct */ 0, 1, 0,
-      /* opt state flags  */ USER_FLAGS, 0,
-@@ -793,8 +823,8 @@
-      /* desc, NAME, name */ zUserText, zUser_NAME, zUser_Name,
-      /* disablement strs */ NULL, NULL },
- 
--  {  /* entry idx, value */ 25, VALUE_OPT_UPDATEINTERVAL,
--     /* equiv idx, value */ 25, VALUE_OPT_UPDATEINTERVAL,
-+  {  /* entry idx, value */ 26, VALUE_OPT_UPDATEINTERVAL,
-+     /* equiv idx, value */ 26, VALUE_OPT_UPDATEINTERVAL,
-      /* equivalenced to  */ NO_EQUIVALENT,
-      /* min, max, act ct */ 0, 1, 0,
-      /* opt state flags  */ UPDATEINTERVAL_FLAGS, 0,
-@@ -805,8 +835,8 @@
-      /* desc, NAME, name */ zUpdateintervalText, zUpdateinterval_NAME, zUpdateinterval_Name,
-      /* disablement strs */ NULL, NULL },
- 
--  {  /* entry idx, value */ 26, VALUE_OPT_VAR,
--     /* equiv idx, value */ 26, VALUE_OPT_VAR,
-+  {  /* entry idx, value */ 27, VALUE_OPT_VAR,
-+     /* equiv idx, value */ 27, VALUE_OPT_VAR,
-      /* equivalenced to  */ NO_EQUIVALENT,
-      /* min, max, act ct */ 0, NOLIMIT, 0,
-      /* opt state flags  */ VAR_FLAGS, 0,
-@@ -817,8 +847,8 @@
-      /* desc, NAME, name */ zVarText, zVar_NAME, zVar_Name,
-      /* disablement strs */ NULL, NULL },
- 
--  {  /* entry idx, value */ 27, VALUE_OPT_DVAR,
--     /* equiv idx, value */ 27, VALUE_OPT_DVAR,
-+  {  /* entry idx, value */ 28, VALUE_OPT_DVAR,
-+     /* equiv idx, value */ 28, VALUE_OPT_DVAR,
-      /* equivalenced to  */ NO_EQUIVALENT,
-      /* min, max, act ct */ 0, NOLIMIT, 0,
-      /* opt state flags  */ DVAR_FLAGS, 0,
-@@ -829,8 +859,8 @@
-      /* desc, NAME, name */ zDvarText, zDvar_NAME, zDvar_Name,
-      /* disablement strs */ NULL, NULL },
- 
--  {  /* entry idx, value */ 28, VALUE_OPT_SLEW,
--     /* equiv idx, value */ 28, VALUE_OPT_SLEW,
-+  {  /* entry idx, value */ 29, VALUE_OPT_SLEW,
-+     /* equiv idx, value */ 29, VALUE_OPT_SLEW,
-      /* equivalenced to  */ NO_EQUIVALENT,
-      /* min, max, act ct */ 0, 1, 0,
-      /* opt state flags  */ SLEW_FLAGS, 0,
-@@ -967,7 +997,7 @@
-       NO_EQUIVALENT, /* '-#' option index */
-       NO_EQUIVALENT /* index of default opt */
-     },
--    34 /* full option count */, 31 /* user option count */,
-+    35 /* full option count */, 32 /* user option count */,
-     ntpd_full_usage, ntpd_short_usage,
-     NULL, NULL
- };
---- ntpd/ntpd.c.orig	Wed Aug 12 04:07:05 2009
-+++ ntpd/ntpd.c	Thu Jul 29 09:48:44 2010
-@@ -166,7 +166,7 @@
-  * after we have synched the first time. If the attempt fails, then try again once per 
-  * minute for up to 5 times. After all, we may be starting before mDNS.
-  */
--int mdnsreg = 1;
-+int mdnsreg = 0;
- int mdnstries = 5;
- #endif  /* HAVE_DNSREGISTRATION */
- 
-@@ -540,6 +540,9 @@
- 	if (HAVE_OPT( NOVIRTUALIPS ))
- 		listen_to_virtual_ips = 0;
- 
-+	if (HAVE_OPT( MDNS ))
-+		mdnsreg = 1;
-+
- 	/*
- 	 * Limit specific interfaces
- 	 */
---- ntpd/ntpd-opts.h.orig	Wed Aug 12 04:42:23 2009
-+++ ntpd/ntpd-opts.h	Thu Jul 29 09:39:13 2010
-@@ -67,28 +67,29 @@
-     INDEX_OPT_KEYFILE           = 12,
-     INDEX_OPT_LOGFILE           = 13,
-     INDEX_OPT_NOVIRTUALIPS      = 14,
--    INDEX_OPT_MODIFYMMTIMER     = 15,
--    INDEX_OPT_NOFORK            = 16,
--    INDEX_OPT_NICE              = 17,
--    INDEX_OPT_PIDFILE           = 18,
--    INDEX_OPT_PRIORITY          = 19,
--    INDEX_OPT_QUIT              = 20,
--    INDEX_OPT_PROPAGATIONDELAY  = 21,
--    INDEX_OPT_STATSDIR          = 22,
--    INDEX_OPT_TRUSTEDKEY        = 23,
--    INDEX_OPT_USER              = 24,
--    INDEX_OPT_UPDATEINTERVAL    = 25,
--    INDEX_OPT_VAR               = 26,
--    INDEX_OPT_DVAR              = 27,
--    INDEX_OPT_SLEW              = 28,
--    INDEX_OPT_USEPCC            = 29,
--    INDEX_OPT_PCCFREQ           = 30,
--    INDEX_OPT_VERSION           = 31,
--    INDEX_OPT_HELP              = 32,
--    INDEX_OPT_MORE_HELP         = 33
-+    INDEX_OPT_MDNS              = 15,
-+    INDEX_OPT_MODIFYMMTIMER     = 16,
-+    INDEX_OPT_NOFORK            = 17,
-+    INDEX_OPT_NICE              = 18,
-+    INDEX_OPT_PIDFILE           = 19,
-+    INDEX_OPT_PRIORITY          = 20,
-+    INDEX_OPT_QUIT              = 21,
-+    INDEX_OPT_PROPAGATIONDELAY  = 22,
-+    INDEX_OPT_STATSDIR          = 23,
-+    INDEX_OPT_TRUSTEDKEY        = 24,
-+    INDEX_OPT_USER              = 25,
-+    INDEX_OPT_UPDATEINTERVAL    = 26,
-+    INDEX_OPT_VAR               = 27,
-+    INDEX_OPT_DVAR              = 28,
-+    INDEX_OPT_SLEW              = 29,
-+    INDEX_OPT_USEPCC            = 30,
-+    INDEX_OPT_PCCFREQ           = 31,
-+    INDEX_OPT_VERSION           = 32,
-+    INDEX_OPT_HELP              = 33,
-+    INDEX_OPT_MORE_HELP         = 34
- } teOptIndex;
- 
--#define OPTION_CT    34
-+#define OPTION_CT    35
- #define NTPD_VERSION       "4.2.5p200"
- #define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.5p200"
- 
-@@ -177,6 +178,10 @@
- #  warning undefining NOVIRTUALIPS due to option name conflict
- #  undef   NOVIRTUALIPS
- # endif
-+# ifdef    MDNS
-+#  warning undefining MDNS due to option name conflict
-+#  undef   MDNS
-+# endif
- # ifdef    MODIFYMMTIMER
- #  warning undefining MODIFYMMTIMER due to option name conflict
- #  undef   MODIFYMMTIMER
-@@ -257,6 +262,7 @@
- # undef KEYFILE
- # undef LOGFILE
- # undef NOVIRTUALIPS
-+# undef MDNS
- # undef MODIFYMMTIMER
- # undef NOFORK
- # undef NICE
-@@ -302,6 +308,9 @@
- #define VALUE_OPT_KEYFILE        'k'
- #define VALUE_OPT_LOGFILE        'l'
- #define VALUE_OPT_NOVIRTUALIPS   'L'
-+#ifdef HAVE_DNSREGISTRATION
-+#define VALUE_OPT_MDNS           'm'
-+#endif /* HAVE_DNSREGISTRATION */
- #ifdef SYS_WINNT
- #define VALUE_OPT_MODIFYMMTIMER  'M'
- #endif /* SYS_WINNT */
-@@ -319,8 +328,8 @@
- #endif /* HAVE_DROPROOT */
- #define VALUE_OPT_UPDATEINTERVAL 'U'
- #define OPT_VALUE_UPDATEINTERVAL (DESC(UPDATEINTERVAL).optArg.argInt)
--#define VALUE_OPT_VAR            26
--#define VALUE_OPT_DVAR           27
-+#define VALUE_OPT_VAR            27
-+#define VALUE_OPT_DVAR           28
- #define VALUE_OPT_SLEW           'x'
- #ifdef SYS_WINNT
- #define VALUE_OPT_USEPCC         29
--- a/usr/src/cmd/ntpd/Patches/noextra.patch	Sun Jan 05 18:57:27 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
---- configure.orig	Thu May 14 06:34:41 2009
-+++ configure	Thu May 14 06:15:13 2009
-@@ -459,8 +459,6 @@
- #endif"
- 
- ac_subdirs_all="$ac_subdirs_all arlib"
--ac_subdirs_all="$ac_subdirs_all sntp"
--ac_subdirs_all="$ac_subdirs_all gsoc_sntp"
- ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP YACC VPATH_HACK_TRUE VPATH_HACK_FALSE LIBOPTS_DIR INSTALL_LIBOPTS_TRUE INSTALL_LIBOPTS_FALSE NEED_LIBOPTS_TRUE NEED_LIBOPTS_FALSE LIBOPTS_LDADD LIBOPTS_CFLAGS BINSUBDIR subdirs ARLIB_DIR LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB LIBTOOL PATH_SH PATH_PERL PATH_NET_SNMP_CONFIG EDITLINE_LIBS HAVE_INLINE LIBPARSE MAKE_LIBPARSE MAKE_LIBPARSE_KERNEL MAKE_CHECK_Y2K OPENSSL OPENSSL_INC OPENSSL_LIB LCRYPTO EF_PROGS EF_LIBS MAKE_CHECK_LAYOUT TESTDCF DCFD MAKE_PARSEKMODULE PROPDELAY CHUTEST CLKTEST MAKE_ADJTIMED MAKE_NTPTIME MAKE_TICKADJ MAKE_TIMETRIM MAKE_LIBNTPSIM MAKE_NTPDSIM SNMP_LIBS SNMP_CPPFLAGS SNMP_CFLAGS MAKE_NTPSNMPD LSCF LIBOBJS LTLIBOBJS'
- ac_subst_files=''
- 
-@@ -48060,11 +48058,9 @@
- 
- 
- 
--subdirs="$subdirs sntp"
- 
- 
- 
--subdirs="$subdirs gsoc_sntp"
- 
- 
- cat >confcache <<\_ACEOF
---- Makefile.in.orig	Thu May 14 06:34:41 2009
-+++ Makefile.in	Thu May 14 06:15:13 2009
-@@ -217,8 +217,8 @@
- ACLOCAL_AMFLAGS = -I m4 -I libopts/m4
- NULL = 
- SUBDIRS = scripts include ElectricFence $(am__append_1) @ARLIB_DIR@ \
--	libntp libparse ntpd ntpdate ntpdc ntpq ntpsnmpd parseutil \
--	adjtimed clockstuff kernel gsoc_sntp sntp util $(NULL)
-+	libntp libparse ntpd ntpdate ntpdc ntpq parseutil \
-+	adjtimed clockstuff kernel util $(NULL)
- DIST_SUBDIRS = \
- 	scripts		\
- 	include		\
-@@ -231,13 +231,10 @@
- 	ntpdate		\
- 	ntpdc		\
- 	ntpq		\
--	ntpsnmpd	\
- 	parseutil	\
- 	adjtimed	\
- 	clockstuff	\
- 	kernel		\
--	gsoc_sntp	\
--	sntp		\
- 	util		\
- 	$(NULL)
- 
--- a/usr/src/cmd/ntpd/Patches/ntpwait.patch	Sun Jan 05 18:57:27 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
---- scripts/ntp-wait.in.orig	Thu May 14 06:34:42 2009
-+++ scripts/ntp-wait.in	Thu May 14 06:15:13 2009
-@@ -20,8 +20,8 @@
-     while(<Q>) {
-       chomp;
-       # the first line should be similar to:
--      # associd=0 status=0645 leap_none, sync_ntp, ...
--      if (/^associd=0 status=(\S{4}) (\S+), (\S+),/) {
-+      # status=0645 leap_none, sync_ntp, ...
-+      if (/status=(\S{4}) (\S+), (\S+),/) {
- 	my $status = $1;
- 	my $leap = $2;
- 	my $sync = $3;
--- a/usr/src/cmd/ntpd/Patches/timing.patch	Sun Jan 05 18:57:27 2014 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
---- ntpd/ntp_proto.c.orig	Thu May 14 06:34:42 2009
-+++ ntpd/ntp_proto.c	Thu May 14 06:15:13 2009
-@@ -1629,6 +1629,16 @@
- 	char	*fmri;
- #endif /* HAVE_LIBSCF_H */
- 
-+#ifdef DEBUG_TIMING
-+{
-+        char buf[2048];
-+
-+        snprintf(buf, sizeof(buf), "%lu %lu %d %d epoch",
-+                 sys_epoch,peer->epoch,peer->epoch-sys_epoch,current_time - peer->epoch);
-+        record_timing_stats(buf);
-+}
-+#endif
-+
- 	/*
- 	 * Update the system state variables. We do this very carefully,
- 	 * as the poll interval might need to be clamped differently.
--- a/usr/src/cmd/ntpd/install-sfw	Sun Jan 05 18:57:27 2014 +0000
+++ b/usr/src/cmd/ntpd/install-sfw	Fri Jan 17 19:32:42 2014 +0000
@@ -47,9 +47,9 @@
 
 # distribution executables
 _install E ntpd/ntpd ${LIBDIR}/ntpd 0555
-_install S scripts/ntp-wait ${LIBDIR}/ntp-wait 0555
+_install S scripts/ntp-wait/ntp-wait ${LIBDIR}/ntp-wait 0555
 _install E ntpdate/ntpdate ${BINDIR}/ntpdate 0555
-_install S scripts/ntptrace ${BINDIR}/ntptrace 0555
+_install S scripts/ntptrace/ntptrace ${BINDIR}/ntptrace 0555
 _install E ntpdc/ntpdc ${BINDIR}/ntpdc 0555
 _install L ntpdc ${BINDIR}/xntpdc
 _install E ntpq/ntpq ${BINDIR}/ntpq 0555
@@ -57,205 +57,233 @@
 _install E util/ntptime ${BINDIR}/ntptime 0555
 
 # distribution html
-_install N html/ntp_conf.html ${HTMLDIR}/ntp_conf.html 0444
-_install N html/build.html ${HTMLDIR}/build.html 0444
-_install N html/ntpdate.html ${HTMLDIR}/ntpdate.html 0444
-_install N html/copyright.html ${HTMLDIR}/copyright.html 0444
+_install N html/access.html ${HTMLDIR}/access.html 0444
+_install N html/accopt.html ${HTMLDIR}/accopt.html 0444
+_install N html/assoc.html ${HTMLDIR}/assoc.html 0444
+_install N html/audio.html ${HTMLDIR}/audio.html 0444
+_install N html/authentic.html ${HTMLDIR}/authentic.html 0444
 _install N html/authopt.html ${HTMLDIR}/authopt.html 0444
-_install N html/ntpdsim.html ${HTMLDIR}/ntpdsim.html 0444
-_install N html/parsenew.html ${HTMLDIR}/parsenew.html 0444
-_install N html/rate.html ${HTMLDIR}/rate.html 0444
-_install N html/gadget.html ${HTMLDIR}/gadget.html 0444
-_install N html/manyopt.html ${HTMLDIR}/manyopt.html 0444
-_install N html/sntp.html ${HTMLDIR}/sntp.html 0444
-_install N html/monopt.html ${HTMLDIR}/monopt.html 0444
-_install N html/prefer.html ${HTMLDIR}/prefer.html 0444
-_install N html/kern.html ${HTMLDIR}/kern.html 0444
-_install N html/keygen.html ${HTMLDIR}/keygen.html 0444
-_install N html/miscopt.html ${HTMLDIR}/miscopt.html 0444
-_install N html/ntpdsim_new.html ${HTMLDIR}/ntpdsim_new.html 0444
-_install N html/ntpdc.html ${HTMLDIR}/ntpdc.html 0444
-_install N html/refclock.html ${HTMLDIR}/refclock.html 0444
-_install N html/quick.html ${HTMLDIR}/quick.html 0444
-_install N html/ntptrace.html ${HTMLDIR}/ntptrace.html 0444
-_install N html/release.html ${HTMLDIR}/release.html 0444
-_install N html/howto.html ${HTMLDIR}/howto.html 0444
-_install N html/rdebug.html ${HTMLDIR}/rdebug.html 0444
+_install N html/autokey.html ${HTMLDIR}/autokey.html 0444
+_install N html/bugs.html ${HTMLDIR}/bugs.html 0444
+_install N html/build.html ${HTMLDIR}/build.html 0444
+_install N html/clock.html ${HTMLDIR}/clock.html 0444
+_install N html/clockopt.html ${HTMLDIR}/clockopt.html 0444
+_install N html/cluster.html ${HTMLDIR}/cluster.html 0444
+_install N html/comdex.html ${HTMLDIR}/comdex.html 0444
+_install N html/config.html ${HTMLDIR}/config.html 0444
 _install N html/confopt.html ${HTMLDIR}/confopt.html 0444
+_install N html/copyright.html ${HTMLDIR}/copyright.html 0444
 _install N html/debug.html ${HTMLDIR}/debug.html 0444
-_install N html/xleave.html ${HTMLDIR}/xleave.html 0444
-_install N html/sitemap.html ${HTMLDIR}/sitemap.html 0444
-_install N html/ntptime.html ${HTMLDIR}/ntptime.html 0444
-_install N html/config.html ${HTMLDIR}/config.html 0444
-_install N html/bugs.html ${HTMLDIR}/bugs.html 0444
-_install N html/accopt.html ${HTMLDIR}/accopt.html 0444
-_install N html/index.html ${HTMLDIR}/index.html 0444
-_install N html/parsedata.html ${HTMLDIR}/parsedata.html 0444
 _install N html/decode.html ${HTMLDIR}/decode.html 0444
+_install N html/discipline.html ${HTMLDIR}/discipline.html 0444
+_install N html/discover.html ${HTMLDIR}/discover.html 0444
+_install N html/extern.html ${HTMLDIR}/extern.html 0444
+_install N html/filter.html ${HTMLDIR}/filter.html 0444
 _install N html/hints.html ${HTMLDIR}/hints.html 0444
-_install N html/ntpq.html ${HTMLDIR}/ntpq.html 0444
-_install N html/audio.html ${HTMLDIR}/audio.html 0444
-_install N html/pps.html ${HTMLDIR}/pps.html 0444
-_install N html/clockopt.html ${HTMLDIR}/clockopt.html 0444
-_install N html/tickadj.html ${HTMLDIR}/tickadj.html 0444
-_install N html/xleave.html ${HTMLDIR}/tickadj.html 0444
-_install N html/extern.html ${HTMLDIR}/extern.html 0444
-_install N html/ntpd.html ${HTMLDIR}/ntpd.html 0444
-_install N html/msyslog.html ${HTMLDIR}/msyslog.html 0444
-_install N html/comdex.html ${HTMLDIR}/comdex.html 0444
+_install N html/history.html ${HTMLDIR}/history.html 0444
+_install N html/howto.html ${HTMLDIR}/howto.html 0444
+_install N html/huffpuff.html ${HTMLDIR}/huffpuff.html 0444
+_install N html/index.html ${HTMLDIR}/index.html 0444
+_install N html/kern.html ${HTMLDIR}/kern.html 0444
 _install N html/kernpps.html ${HTMLDIR}/kernpps.html 0444
-_install N html/assoc.html ${HTMLDIR}/assoc.html 0444
-_install N html/icons/mail2.gif ${HTMLDIR}/icons/mail2.gif 0444
-_install N html/icons/home.gif ${HTMLDIR}/icons/home.gif 0444
-_install N html/hints/notes-xntp-v3 ${HTMLDIR}/hints/notes-xntp-v3 0444
-_install N html/hints/refclocks ${HTMLDIR}/hints/refclocks 0444
-_install N html/hints/solaris-dosynctodr.html ${HTMLDIR}/hints/solaris-dosynctodr.html 0444
-_install N html/hints/sun4 ${HTMLDIR}/hints/sun4 0444
-_install N html/hints/vxworks.html ${HTMLDIR}/hints/vxworks.html 0444
-_install N html/hints/solaris.xtra.S99ntpd ${HTMLDIR}/hints/solaris.xtra.S99ntpd 0444
-_install N html/hints/svr4_package ${HTMLDIR}/hints/svr4_package 0444
-_install N html/hints/decosf1 ${HTMLDIR}/hints/decosf1 0444
-_install N html/hints/hpux ${HTMLDIR}/hints/hpux 0444
+_install N html/keygen.html ${HTMLDIR}/keygen.html 0444
+_install N html/leap.html ${HTMLDIR}/leap.html 0444
+_install N html/miscopt.html ${HTMLDIR}/miscopt.html 0444
+_install N html/monopt.html ${HTMLDIR}/monopt.html 0444
+_install N html/msyslog.html ${HTMLDIR}/msyslog.html 0444
+_install N html/ntp_conf.html ${HTMLDIR}/ntp_conf.html 0444
+_install N html/ntp-wait.html ${HTMLDIR}/ntp-wait.html 0444
+_install N html/ntpd.html ${HTMLDIR}/ntpd.html 0444
+_install N html/ntpdate.html ${HTMLDIR}/ntpdate.html 0444
+_install N html/ntpdc.html ${HTMLDIR}/ntpdc.html 0444
+_install N html/ntpdsim_new.html ${HTMLDIR}/ntpdsim_new.html 0444
+_install N html/ntpdsim.html ${HTMLDIR}/ntpdsim.html 0444
+_install N html/ntpq.html ${HTMLDIR}/ntpq.html 0444
+_install N html/ntptime.html ${HTMLDIR}/ntptime.html 0444
+_install N html/ntptrace.html ${HTMLDIR}/ntptrace.html 0444
+_install N html/orphan.html ${HTMLDIR}/orphan.html 0444
+_install N html/parsedata.html ${HTMLDIR}/parsedata.html 0444
+_install N html/parsenew.html ${HTMLDIR}/parsenew.html 0444
+_install N html/poll.html ${HTMLDIR}/poll.html 0444
+_install N html/pps.html ${HTMLDIR}/pps.html 0444
+_install N html/prefer.html ${HTMLDIR}/prefer.html 0444
+_install N html/quick.html ${HTMLDIR}/quick.html 0444
+_install N html/rate.html ${HTMLDIR}/rate.html 0444
+_install N html/rdebug.html ${HTMLDIR}/rdebug.html 0444
+_install N html/refclock.html ${HTMLDIR}/refclock.html 0444
+_install N html/release.html ${HTMLDIR}/release.html 0444
+_install N html/select.html ${HTMLDIR}/select.html 0444
+_install N html/sitemap.html ${HTMLDIR}/sitemap.html 0444
+_install N html/sntp.html ${HTMLDIR}/sntp.html 0444
+_install N html/stats.html ${HTMLDIR}/stats.html 0444
+_install N html/tickadj.html ${HTMLDIR}/tickadj.html 0444
+_install N html/warp.html ${HTMLDIR}/warp.html 0444
+_install N html/xleave.html ${HTMLDIR}/xleave.html 0444
+_install N html/drivers/driver1.html ${HTMLDIR}/drivers/driver1.html 0444
+_install N html/drivers/driver10.html ${HTMLDIR}/drivers/driver10.html 0444
+_install N html/drivers/driver11.html ${HTMLDIR}/drivers/driver11.html 0444
+_install N html/drivers/driver12.html ${HTMLDIR}/drivers/driver12.html 0444
+_install N html/drivers/driver16.html ${HTMLDIR}/drivers/driver16.html 0444
+_install N html/drivers/driver18.html ${HTMLDIR}/drivers/driver18.html 0444
+_install N html/drivers/driver19.html ${HTMLDIR}/drivers/driver19.html 0444
+_install N html/drivers/driver20.html ${HTMLDIR}/drivers/driver20.html 0444
+_install N html/drivers/driver22.html ${HTMLDIR}/drivers/driver22.html 0444
+_install N html/drivers/driver26.html ${HTMLDIR}/drivers/driver26.html 0444
+_install N html/drivers/driver27.html ${HTMLDIR}/drivers/driver27.html 0444
+_install N html/drivers/driver28.html ${HTMLDIR}/drivers/driver28.html 0444
+_install N html/drivers/driver29.html ${HTMLDIR}/drivers/driver29.html 0444
+_install N html/drivers/driver3.html ${HTMLDIR}/drivers/driver3.html 0444
+_install N html/drivers/driver30.html ${HTMLDIR}/drivers/driver30.html 0444
+_install N html/drivers/driver31.html ${HTMLDIR}/drivers/driver31.html 0444
+_install N html/drivers/driver32.html ${HTMLDIR}/drivers/driver32.html 0444
+_install N html/drivers/driver33.html ${HTMLDIR}/drivers/driver33.html 0444
+_install N html/drivers/driver34.html ${HTMLDIR}/drivers/driver34.html 0444
+_install N html/drivers/driver35.html ${HTMLDIR}/drivers/driver35.html 0444
+_install N html/drivers/driver36.html ${HTMLDIR}/drivers/driver36.html 0444
+_install N html/drivers/driver37.html ${HTMLDIR}/drivers/driver37.html 0444
+_install N html/drivers/driver38.html ${HTMLDIR}/drivers/driver38.html 0444
+_install N html/drivers/driver39.html ${HTMLDIR}/drivers/driver39.html 0444
+_install N html/drivers/driver4.html ${HTMLDIR}/drivers/driver4.html 0444
+_install N html/drivers/driver40.html ${HTMLDIR}/drivers/driver40.html 0444
+_install N html/drivers/driver42.html ${HTMLDIR}/drivers/driver42.html 0444
+_install N html/drivers/driver43.html ${HTMLDIR}/drivers/driver43.html 0444
+_install N html/drivers/driver44.html ${HTMLDIR}/drivers/driver44.html 0444
+_install N html/drivers/driver45.html ${HTMLDIR}/drivers/driver45.html 0444
+_install N html/drivers/driver5.html ${HTMLDIR}/drivers/driver5.html 0444
+_install N html/drivers/driver6.html ${HTMLDIR}/drivers/driver6.html 0444
+_install N html/drivers/driver7.html ${HTMLDIR}/drivers/driver7.html 0444
+_install N html/drivers/driver8.html ${HTMLDIR}/drivers/driver8.html 0444
+_install N html/drivers/driver9.html ${HTMLDIR}/drivers/driver9.html 0444
+_install N html/drivers/icons/home.gif ${HTMLDIR}/drivers/icons/home.gif 0444
+_install N html/drivers/icons/mail2.gif ${HTMLDIR}/drivers/icons/mail2.gif 0444
+_install N html/drivers/mx4200data.html ${HTMLDIR}/drivers/mx4200data.html 0444
+_install N html/drivers/oncore-shmem.html ${HTMLDIR}/drivers/oncore-shmem.html 0444
+_install N html/drivers/scripts/footer.txt ${HTMLDIR}/drivers/scripts/footer.txt 0444
+_install N html/drivers/scripts/style.css ${HTMLDIR}/drivers/scripts/style.css 0444
+_install N html/drivers/tf582_4.html ${HTMLDIR}/drivers/tf582_4.html 0444
+_install N html/hints/a-ux ${HTMLDIR}/hints/a-ux 0444
 _install N html/hints/aix ${HTMLDIR}/hints/aix 0444
-_install N html/hints/parse ${HTMLDIR}/hints/parse 0444
-_install N html/hints/sgi ${HTMLDIR}/hints/sgi 0444
-_install N html/hints/solaris.xtra.4095849 ${HTMLDIR}/hints/solaris.xtra.4095849 0444
+_install N html/hints/bsdi ${HTMLDIR}/hints/bsdi 0444
 _install N html/hints/changes ${HTMLDIR}/hints/changes 0444
-_install N html/hints/bsdi ${HTMLDIR}/hints/bsdi 0444
+_install N html/hints/decosf1 ${HTMLDIR}/hints/decosf1 0444
 _install N html/hints/decosf2 ${HTMLDIR}/hints/decosf2 0444
-_install N html/hints/svr4-dell ${HTMLDIR}/hints/svr4-dell 0444
-_install N html/hints/winnt.html ${HTMLDIR}/hints/winnt.html 0444
 _install N html/hints/freebsd ${HTMLDIR}/hints/freebsd 0444
-_install N html/hints/todo ${HTMLDIR}/hints/todo 0444
-_install N html/hints/a-ux ${HTMLDIR}/hints/a-ux 0444
-_install N html/hints/solaris.xtra.4023118 ${HTMLDIR}/hints/solaris.xtra.4023118 0444
+_install N html/hints/hpux ${HTMLDIR}/hints/hpux 0444
 _install N html/hints/linux ${HTMLDIR}/hints/linux 0444
+_install N html/hints/mpeix ${HTMLDIR}/hints/mpeix 0444
+_install N html/hints/notes-xntp-v3 ${HTMLDIR}/hints/notes-xntp-v3 0444
+_install N html/hints/parse ${HTMLDIR}/hints/parse 0444
+_install N html/hints/refclocks ${HTMLDIR}/hints/refclocks 0444
+_install N html/hints/rs6000 ${HTMLDIR}/hints/rs6000 0444
 _install N html/hints/sco.html ${HTMLDIR}/hints/sco.html 0444
-_install N html/hints/mpeix ${HTMLDIR}/hints/mpeix 0444
-_install N html/hints/rs6000 ${HTMLDIR}/hints/rs6000 0444
+_install N html/hints/sgi ${HTMLDIR}/hints/sgi 0444
+_install N html/hints/solaris-dosynctodr.html ${HTMLDIR}/hints/solaris-dosynctodr.html 0444
 _install N html/hints/solaris.html ${HTMLDIR}/hints/solaris.html 0444
+_install N html/hints/solaris.xtra.4023118 ${HTMLDIR}/hints/solaris.xtra.4023118 0444
+_install N html/hints/solaris.xtra.4095849 ${HTMLDIR}/hints/solaris.xtra.4095849 0444
 _install N html/hints/solaris.xtra.patchfreq ${HTMLDIR}/hints/solaris.xtra.patchfreq 0444
-_install N html/drivers/driver33.html ${HTMLDIR}/drivers/driver33.html 0444
-_install N html/drivers/driver4.html ${HTMLDIR}/drivers/driver4.html 0444
-_install N html/drivers/driver37.html ${HTMLDIR}/drivers/driver37.html 0444
-_install N html/drivers/driver12.html ${HTMLDIR}/drivers/driver12.html 0444
-_install N html/drivers/driver8.html ${HTMLDIR}/drivers/driver8.html 0444
-_install N html/drivers/driver27.html ${HTMLDIR}/drivers/driver27.html 0444
-_install N html/drivers/driver16.html ${HTMLDIR}/drivers/driver16.html 0444
-_install N html/drivers/driver40.html ${HTMLDIR}/drivers/driver40.html 0444
-_install N html/drivers/tf582_4.html ${HTMLDIR}/drivers/tf582_4.html 0444
-_install N html/drivers/driver22.html ${HTMLDIR}/drivers/driver22.html 0444
-_install N html/drivers/driver9.html ${HTMLDIR}/drivers/driver9.html 0444
-_install N html/drivers/driver44.html ${HTMLDIR}/drivers/driver44.html 0444
-_install N html/drivers/driver26.html ${HTMLDIR}/drivers/driver26.html 0444
-_install N html/drivers/driver32.html ${HTMLDIR}/drivers/driver32.html 0444
-_install N html/drivers/driver5.html ${HTMLDIR}/drivers/driver5.html 0444
-_install N html/drivers/driver36.html ${HTMLDIR}/drivers/driver36.html 0444
-_install N html/drivers/driver1.html ${HTMLDIR}/drivers/driver1.html 0444
-_install N html/drivers/driver42.html ${HTMLDIR}/drivers/driver42.html 0444
-_install N html/drivers/driver38.html ${HTMLDIR}/drivers/driver38.html 0444
-_install N html/drivers/driver11.html ${HTMLDIR}/drivers/driver11.html 0444
-_install N html/drivers/driver20.html ${HTMLDIR}/drivers/driver20.html 0444
-_install N html/drivers/driver19.html ${HTMLDIR}/drivers/driver19.html 0444
-_install N html/drivers/driver28.html ${HTMLDIR}/drivers/driver28.html 0444
-_install N html/drivers/driver7.html ${HTMLDIR}/drivers/driver7.html 0444
-_install N html/drivers/driver30.html ${HTMLDIR}/drivers/driver30.html 0444
-_install N html/drivers/driver3.html ${HTMLDIR}/drivers/driver3.html 0444
-_install N html/drivers/driver34.html ${HTMLDIR}/drivers/driver34.html 0444
-_install N html/drivers/driver18.html ${HTMLDIR}/drivers/driver18.html 0444
-_install N html/drivers/driver29.html ${HTMLDIR}/drivers/driver29.html 0444
-_install N html/drivers/driver6.html ${HTMLDIR}/drivers/driver6.html 0444
-_install N html/drivers/driver31.html ${HTMLDIR}/drivers/driver31.html 0444
-_install N html/drivers/oncore-shmem.html ${HTMLDIR}/drivers/oncore-shmem.html 0444
-_install N html/drivers/driver2.html ${HTMLDIR}/drivers/driver2.html 0444
-_install N html/drivers/driver35.html ${HTMLDIR}/drivers/driver35.html 0444
-_install N html/drivers/driver43.html ${HTMLDIR}/drivers/driver43.html 0444
-_install N html/drivers/driver39.html ${HTMLDIR}/drivers/driver39.html 0444
-_install N html/drivers/driver10.html ${HTMLDIR}/drivers/driver10.html 0444
-_install N html/drivers/mx4200data.html ${HTMLDIR}/drivers/mx4200data.html 0444
-_install N html/drivers/scripts/style.css ${HTMLDIR}/drivers/scripts/style.css 0444
-_install N html/drivers/scripts/footer.txt ${HTMLDIR}/drivers/scripts/footer.txt 0444
-_install N html/drivers/icons/mail2.gif ${HTMLDIR}/drivers/icons/mail2.gif 0444
-_install N html/drivers/icons/home.gif ${HTMLDIR}/drivers/icons/home.gif 0444
-_install N html/description_files/description.jpg ${HTMLDIR}/description_files/description.jpg 0444
-_install N html/pic/pd_om006.gif ${HTMLDIR}/pic/pd_om006.gif 0444
-_install N html/pic/c51.jpg ${HTMLDIR}/pic/c51.jpg 0444
-_install N html/pic/beaver.gif ${HTMLDIR}/pic/beaver.gif 0444
-_install N html/pic/tonea.gif ${HTMLDIR}/pic/tonea.gif 0444
-_install N html/pic/pogo5.gif ${HTMLDIR}/pic/pogo5.gif 0444
-_install N html/pic/dogsnake.gif ${HTMLDIR}/pic/dogsnake.gif 0444
-_install N html/pic/stack1a.jpg ${HTMLDIR}/pic/stack1a.jpg 0444
-_install N html/pic/sheepb.jpg ${HTMLDIR}/pic/sheepb.jpg 0444
-_install N html/pic/driver43_2.jpg ${HTMLDIR}/pic/driver43_2.jpg 0444
+_install N html/hints/solaris.xtra.S99ntpd ${HTMLDIR}/hints/solaris.xtra.S99ntpd 0444
+_install N html/hints/sun4 ${HTMLDIR}/hints/sun4 0444
+_install N html/hints/svr4_package ${HTMLDIR}/hints/svr4_package 0444
+_install N html/hints/svr4-dell ${HTMLDIR}/hints/svr4-dell 0444
+_install N html/hints/todo ${HTMLDIR}/hints/todo 0444
+_install N html/hints/vxworks.html ${HTMLDIR}/hints/vxworks.html 0444
+_install N html/hints/winnt.html ${HTMLDIR}/hints/winnt.html 0444
+_install N html/icons/home.gif ${HTMLDIR}/icons/home.gif 0444
+_install N html/icons/mail2.gif ${HTMLDIR}/icons/mail2.gif 0444
+_install N html/pic/9400n.jpg ${HTMLDIR}/pic/9400n.jpg 0444
+_install N html/pic/alice11.gif ${HTMLDIR}/pic/alice11.gif 0444
+_install N html/pic/alice13.gif ${HTMLDIR}/pic/alice13.gif 0444
+_install N html/pic/alice15.gif ${HTMLDIR}/pic/alice15.gif 0444
 _install N html/pic/alice23.gif ${HTMLDIR}/pic/alice23.gif 0444
-_install N html/pic/alice51.gif ${HTMLDIR}/pic/alice51.gif 0444
-_install N html/pic/boom3a.gif ${HTMLDIR}/pic/boom3a.gif 0444
-_install N html/pic/pzf511.jpg ${HTMLDIR}/pic/pzf511.jpg 0444
-_install N html/pic/barnstable.gif ${HTMLDIR}/pic/barnstable.gif 0444
-_install N html/pic/oncore_utplusbig.gif ${HTMLDIR}/pic/oncore_utplusbig.gif 0444
-_install N html/pic/flatheads.gif ${HTMLDIR}/pic/flatheads.gif 0444
-_install N html/pic/alice11.gif ${HTMLDIR}/pic/alice11.gif 0444
-_install N html/pic/pd_om011.gif ${HTMLDIR}/pic/pd_om011.gif 0444
-_install N html/pic/pogo3a.gif ${HTMLDIR}/pic/pogo3a.gif 0444
-_install N html/pic/hornraba.gif ${HTMLDIR}/pic/hornraba.gif 0444
-_install N html/pic/9400n.jpg ${HTMLDIR}/pic/9400n.jpg 0444
-_install N html/pic/offset1211.gif ${HTMLDIR}/pic/offset1211.gif 0444
-_install N html/pic/alice47.gif ${HTMLDIR}/pic/alice47.gif 0444
-_install N html/pic/pzf509.jpg ${HTMLDIR}/pic/pzf509.jpg 0444
-_install N html/pic/pogo4.gif ${HTMLDIR}/pic/pogo4.gif 0444
+_install N html/pic/alice31.gif ${HTMLDIR}/pic/alice31.gif 0444
 _install N html/pic/alice32.gif ${HTMLDIR}/pic/alice32.gif 0444
 _install N html/pic/alice35.gif ${HTMLDIR}/pic/alice35.gif 0444
-_install N html/pic/freq1211.gif ${HTMLDIR}/pic/freq1211.gif 0444
-_install N html/pic/wingdorothy.gif ${HTMLDIR}/pic/wingdorothy.gif 0444
-_install N html/pic/description.jpg ${HTMLDIR}/pic/description.jpg 0444
-_install N html/pic/neoclock4x.gif ${HTMLDIR}/pic/neoclock4x.gif 0444
-_install N html/pic/fg6039.jpg ${HTMLDIR}/pic/fg6039.jpg 0444
 _install N html/pic/alice38.gif ${HTMLDIR}/pic/alice38.gif 0444
 _install N html/pic/alice44.gif ${HTMLDIR}/pic/alice44.gif 0444
-_install N html/pic/gadget.jpg ${HTMLDIR}/pic/gadget.jpg 0444
-_install N html/pic/pogo7.gif ${HTMLDIR}/pic/pogo7.gif 0444
-_install N html/pic/alice31.gif ${HTMLDIR}/pic/alice31.gif 0444
-_install N html/pic/pogo.gif ${HTMLDIR}/pic/pogo.gif 0444
+_install N html/pic/alice47.gif ${HTMLDIR}/pic/alice47.gif 0444
+_install N html/pic/alice51.gif ${HTMLDIR}/pic/alice51.gif 0444
+_install N html/pic/alice61.gif ${HTMLDIR}/pic/alice61.gif 0444
+_install N html/pic/barnstable.gif ${HTMLDIR}/pic/barnstable.gif 0444
+_install N html/pic/beaver.gif ${HTMLDIR}/pic/beaver.gif 0444
+_install N html/pic/boom3.gif ${HTMLDIR}/pic/boom3.gif 0444
+_install N html/pic/boom3a.gif ${HTMLDIR}/pic/boom3a.gif 0444
+_install N html/pic/boom4.gif ${HTMLDIR}/pic/boom4.gif 0444
+_install N html/pic/broad.gif ${HTMLDIR}/pic/broad.gif 0444
+_install N html/pic/bustardfly.gif ${HTMLDIR}/pic/bustardfly.gif 0444
+_install N html/pic/c51.jpg ${HTMLDIR}/pic/c51.jpg 0444
+_install N html/pic/description.jpg ${HTMLDIR}/pic/description.jpg 0444
+_install N html/pic/discipline.gif ${HTMLDIR}/pic/discipline.gif 0444
+_install N html/pic/dogsnake.gif ${HTMLDIR}/pic/dogsnake.gif 0444
 _install N html/pic/driver29.gif ${HTMLDIR}/pic/driver29.gif 0444
-_install N html/pic/pogo1a.gif ${HTMLDIR}/pic/pogo1a.gif 0444
-_install N html/pic/gps167.jpg ${HTMLDIR}/pic/gps167.jpg 0444
-_install N html/pic/thunderbolt.jpg ${HTMLDIR}/pic/thunderbolt.jpg 0444
-_install N html/pic/oncore_remoteant.jpg ${HTMLDIR}/pic/oncore_remoteant.jpg 0444
-_install N html/pic/oncore_evalbig.gif ${HTMLDIR}/pic/oncore_evalbig.gif 0444
-_install N html/pic/tribeb.gif ${HTMLDIR}/pic/tribeb.gif 0444
-_install N html/pic/panda.gif ${HTMLDIR}/pic/panda.gif 0444
-_install N html/pic/radio2.jpg ${HTMLDIR}/pic/radio2.jpg 0444
-_install N html/pic/alice15.gif ${HTMLDIR}/pic/alice15.gif 0444
-_install N html/pic/pogo6.gif ${HTMLDIR}/pic/pogo6.gif 0444
-_install N html/pic/rabbit.gif ${HTMLDIR}/pic/rabbit.gif 0444
-_install N html/pic/broad.gif ${HTMLDIR}/pic/broad.gif 0444
-_install N html/pic/pogo8.gif ${HTMLDIR}/pic/pogo8.gif 0444
-_install N html/pic/bustardfly.gif ${HTMLDIR}/pic/bustardfly.gif 0444
-_install N html/pic/peer.gif ${HTMLDIR}/pic/peer.gif 0444
 _install N html/pic/driver43_1.gif ${HTMLDIR}/pic/driver43_1.gif 0444
+_install N html/pic/driver43_2.jpg ${HTMLDIR}/pic/driver43_2.jpg 0444
 _install N html/pic/fg6021.gif ${HTMLDIR}/pic/fg6021.gif 0444
-_install N html/pic/oz2.gif ${HTMLDIR}/pic/oz2.gif 0444
+_install N html/pic/fg6039.jpg ${HTMLDIR}/pic/fg6039.jpg 0444
+_install N html/pic/fig_3_1.gif ${HTMLDIR}/pic/fig_3_1.gif 0444
+_install N html/pic/flatheads.gif ${HTMLDIR}/pic/flatheads.gif 0444
+_install N html/pic/flt1.gif ${HTMLDIR}/pic/flt1.gif 0444
+_install N html/pic/flt2.gif ${HTMLDIR}/pic/flt2.gif 0444
+_install N html/pic/flt3.gif ${HTMLDIR}/pic/flt3.gif 0444
+_install N html/pic/flt4.gif ${HTMLDIR}/pic/flt4.gif 0444
+_install N html/pic/flt5.gif ${HTMLDIR}/pic/flt5.gif 0444
+_install N html/pic/flt6.gif ${HTMLDIR}/pic/flt6.gif 0444
+_install N html/pic/flt7.gif ${HTMLDIR}/pic/flt7.gif 0444
+_install N html/pic/flt8.gif ${HTMLDIR}/pic/flt8.gif 0444
+_install N html/pic/flt9.gif ${HTMLDIR}/pic/flt9.gif 0444
+_install N html/pic/freq1211.gif ${HTMLDIR}/pic/freq1211.gif 0444
+_install N html/pic/gadget.jpg ${HTMLDIR}/pic/gadget.jpg 0444
+_install N html/pic/gps167.jpg ${HTMLDIR}/pic/gps167.jpg 0444
+_install N html/pic/group.gif ${HTMLDIR}/pic/group.gif 0444
+_install N html/pic/hornraba.gif ${HTMLDIR}/pic/hornraba.gif 0444
 _install N html/pic/igclock.gif ${HTMLDIR}/pic/igclock.gif 0444
-_install N html/pic/alice13.gif ${HTMLDIR}/pic/alice13.gif 0444
-_install N html/pic/alice61.gif ${HTMLDIR}/pic/alice61.gif 0444
-_install N html/pic/boom4.gif ${HTMLDIR}/pic/boom4.gif 0444
-_install N html/pic/boom3.gif ${HTMLDIR}/pic/boom3.gif 0444
+_install N html/pic/neoclock4x.gif ${HTMLDIR}/pic/neoclock4x.gif 0444
+_install N html/pic/offset1211.gif ${HTMLDIR}/pic/offset1211.gif 0444
+_install N html/pic/oncore_evalbig.gif ${HTMLDIR}/pic/oncore_evalbig.gif 0444
+_install N html/pic/oncore_remoteant.jpg ${HTMLDIR}/pic/oncore_remoteant.jpg 0444
+_install N html/pic/oncore_utplusbig.gif ${HTMLDIR}/pic/oncore_utplusbig.gif 0444
+_install N html/pic/oz2.gif ${HTMLDIR}/pic/oz2.gif 0444
+_install N html/pic/panda.gif ${HTMLDIR}/pic/panda.gif 0444
+_install N html/pic/pd_om006.gif ${HTMLDIR}/pic/pd_om006.gif 0444
+_install N html/pic/pd_om011.gif ${HTMLDIR}/pic/pd_om011.gif 0444
+_install N html/pic/peer.gif ${HTMLDIR}/pic/peer.gif 0444
+_install N html/pic/pogo.gif ${HTMLDIR}/pic/pogo.gif 0444
+_install N html/pic/pogo1a.gif ${HTMLDIR}/pic/pogo1a.gif 0444
+_install N html/pic/pogo3a.gif ${HTMLDIR}/pic/pogo3a.gif 0444
+_install N html/pic/pogo4.gif ${HTMLDIR}/pic/pogo4.gif 0444
+_install N html/pic/pogo5.gif ${HTMLDIR}/pic/pogo5.gif 0444
+_install N html/pic/pogo6.gif ${HTMLDIR}/pic/pogo6.gif 0444
+_install N html/pic/pogo7.gif ${HTMLDIR}/pic/pogo7.gif 0444
+_install N html/pic/pogo8.gif ${HTMLDIR}/pic/pogo8.gif 0444
+_install N html/pic/pzf509.jpg ${HTMLDIR}/pic/pzf509.jpg 0444
+_install N html/pic/pzf511.jpg ${HTMLDIR}/pic/pzf511.jpg 0444
+_install N html/pic/rabbit.gif ${HTMLDIR}/pic/rabbit.gif 0444
+_install N html/pic/radio2.jpg ${HTMLDIR}/pic/radio2.jpg 0444
+_install N html/pic/sheepb.jpg ${HTMLDIR}/pic/sheepb.jpg 0444
+_install N html/pic/stack1a.jpg ${HTMLDIR}/pic/stack1a.jpg 0444
+_install N html/pic/sx5.gif ${HTMLDIR}/pic/sx5.gif 0444
+_install N html/pic/thunderbolt.jpg ${HTMLDIR}/pic/thunderbolt.jpg 0444
+_install N html/pic/tonea.gif ${HTMLDIR}/pic/tonea.gif 0444
+_install N html/pic/tribeb.gif ${HTMLDIR}/pic/tribeb.gif 0444
+_install N html/pic/wingdorothy.gif ${HTMLDIR}/pic/wingdorothy.gif 0444
+_install N html/scripts/accopt.txt ${HTMLDIR}/scripts/accopt.txt 0444
 _install N html/scripts/audio.txt ${HTMLDIR}/scripts/audio.txt 0444
-_install N html/scripts/manual.txt ${HTMLDIR}/scripts/manual.txt 0444
-_install N html/scripts/refclock.txt ${HTMLDIR}/scripts/refclock.txt 0444
-_install N html/scripts/footer.txt ${HTMLDIR}/scripts/footer.txt 0444
-_install N html/scripts/monopt.txt ${HTMLDIR}/scripts/monopt.txt 0444
-_install N html/scripts/confopt.txt ${HTMLDIR}/scripts/confopt.txt 0444
-_install N html/scripts/install.txt ${HTMLDIR}/scripts/install.txt 0444
-_install N html/scripts/style.css ${HTMLDIR}/scripts/style.css 0444
+_install N html/scripts/authopt.txt ${HTMLDIR}/scripts/authopt.txt 0444
 _install N html/scripts/clockopt.txt ${HTMLDIR}/scripts/clockopt.txt 0444
-_install N html/scripts/miscopt.txt ${HTMLDIR}/scripts/miscopt.txt 0444
-_install N html/scripts/authopt.txt ${HTMLDIR}/scripts/authopt.txt 0444
-_install N html/scripts/accopt.txt ${HTMLDIR}/scripts/accopt.txt 0444
-_install N html/scripts/external.txt ${HTMLDIR}/scripts/external.txt 0444
-_install N html/scripts/misc.txt ${HTMLDIR}/scripts/misc.txt 0444
 _install N html/scripts/command.txt ${HTMLDIR}/scripts/command.txt 0444
 _install N html/scripts/config.txt ${HTMLDIR}/scripts/config.txt 0444
+_install N html/scripts/confopt.txt ${HTMLDIR}/scripts/confopt.txt 0444
+_install N html/scripts/external.txt ${HTMLDIR}/scripts/external.txt 0444
+_install N html/scripts/footer.txt ${HTMLDIR}/scripts/footer.txt 0444
+_install N html/scripts/hand.txt ${HTMLDIR}/scripts/hand.txt 0444
+_install N html/scripts/install.txt ${HTMLDIR}/scripts/install.txt 0444
+_install N html/scripts/manual.txt ${HTMLDIR}/scripts/manual.txt 0444
+_install N html/scripts/misc.txt ${HTMLDIR}/scripts/misc.txt 0444
+_install N html/scripts/miscopt.txt ${HTMLDIR}/scripts/miscopt.txt 0444
+_install N html/scripts/monopt.txt ${HTMLDIR}/scripts/monopt.txt 0444
+_install N html/scripts/refclock.txt ${HTMLDIR}/scripts/refclock.txt 0444
+_install N html/scripts/special.txt ${HTMLDIR}/scripts/special.txt 0444
+_install N html/scripts/style.css ${HTMLDIR}/scripts/style.css 0444
 
 cd ..
 
Binary file usr/src/cmd/ntpd/ntp-dev-4.2.5p200.tar.gz has changed
Binary file usr/src/cmd/ntpd/ntp-dev-4.2.7p411.tar.gz has changed
--- a/usr/src/pkgdefs/SUNWntpu/prototype_com	Sun Jan 05 18:57:27 2014 +0000
+++ b/usr/src/pkgdefs/SUNWntpu/prototype_com	Fri Jan 17 19:32:42 2014 +0000
@@ -87,19 +87,26 @@
 d none usr/share/doc/ntp/pic 0755 root bin
 d none usr/share/doc/ntp/scripts 0755 root bin
 d none usr/share/doc/ntp/description_files 0755 root bin
+f none usr/share/doc/ntp/access.html 0444 root bin
 f none usr/share/doc/ntp/accopt.html 0444 root bin
 f none usr/share/doc/ntp/assoc.html 0444 root bin
 f none usr/share/doc/ntp/audio.html 0444 root bin
+f none usr/share/doc/ntp/authentic.html 0444 root bin
 f none usr/share/doc/ntp/authopt.html 0444 root bin
+f none usr/share/doc/ntp/autokey.html 0444 root bin
 f none usr/share/doc/ntp/bugs.html 0444 root bin
 f none usr/share/doc/ntp/build.html 0444 root bin
+f none usr/share/doc/ntp/clock.html 0444 root bin
 f none usr/share/doc/ntp/clockopt.html 0444 root bin
+f none usr/share/doc/ntp/cluster.html 0444 root bin
 f none usr/share/doc/ntp/comdex.html 0444 root bin
 f none usr/share/doc/ntp/config.html 0444 root bin
 f none usr/share/doc/ntp/confopt.html 0444 root bin
 f none usr/share/doc/ntp/copyright.html 0444 root bin
 f none usr/share/doc/ntp/debug.html 0444 root bin
 f none usr/share/doc/ntp/decode.html 0444 root bin
+f none usr/share/doc/ntp/discipline.html 0444 root bin
+f none usr/share/doc/ntp/discover.html 0444 root bin
 f none usr/share/doc/ntp/drivers/driver1.html 0444 root bin
 f none usr/share/doc/ntp/drivers/driver10.html 0444 root bin
 f none usr/share/doc/ntp/drivers/driver11.html 0444 root bin
@@ -107,7 +114,6 @@
 f none usr/share/doc/ntp/drivers/driver16.html 0444 root bin
 f none usr/share/doc/ntp/drivers/driver18.html 0444 root bin
 f none usr/share/doc/ntp/drivers/driver19.html 0444 root bin
-f none usr/share/doc/ntp/drivers/driver2.html 0444 root bin
 f none usr/share/doc/ntp/drivers/driver20.html 0444 root bin
 f none usr/share/doc/ntp/drivers/driver22.html 0444 root bin
 f none usr/share/doc/ntp/drivers/driver26.html 0444 root bin
@@ -130,6 +136,7 @@
 f none usr/share/doc/ntp/drivers/driver42.html 0444 root bin
 f none usr/share/doc/ntp/drivers/driver43.html 0444 root bin
 f none usr/share/doc/ntp/drivers/driver44.html 0444 root bin
+f none usr/share/doc/ntp/drivers/driver45.html 0444 root bin
 f none usr/share/doc/ntp/drivers/driver5.html 0444 root bin
 f none usr/share/doc/ntp/drivers/driver6.html 0444 root bin
 f none usr/share/doc/ntp/drivers/driver7.html 0444 root bin
@@ -143,7 +150,7 @@
 f none usr/share/doc/ntp/drivers/scripts/style.css 0444 root bin
 f none usr/share/doc/ntp/drivers/tf582_4.html 0444 root bin
 f none usr/share/doc/ntp/extern.html 0444 root bin
-f none usr/share/doc/ntp/gadget.html 0444 root bin
+f none usr/share/doc/ntp/filter.html 0444 root bin
 f none usr/share/doc/ntp/hints.html 0444 root bin
 f none usr/share/doc/ntp/hints/a-ux 0444 root bin
 f none usr/share/doc/ntp/hints/aix 0444 root bin
@@ -173,18 +180,21 @@
 f none usr/share/doc/ntp/hints/todo 0444 root bin
 f none usr/share/doc/ntp/hints/vxworks.html 0444 root bin
 f none usr/share/doc/ntp/hints/winnt.html 0444 root bin
+f none usr/share/doc/ntp/history.html 0444 root bin
 f none usr/share/doc/ntp/howto.html 0444 root bin
+f none usr/share/doc/ntp/huffpuff.html 0444 root bin
 f none usr/share/doc/ntp/icons/home.gif 0444 root bin
 f none usr/share/doc/ntp/icons/mail2.gif 0444 root bin
 f none usr/share/doc/ntp/index.html 0444 root bin
 f none usr/share/doc/ntp/kern.html 0444 root bin
 f none usr/share/doc/ntp/kernpps.html 0444 root bin
 f none usr/share/doc/ntp/keygen.html 0444 root bin
-f none usr/share/doc/ntp/manyopt.html 0444 root bin
+f none usr/share/doc/ntp/leap.html 0444 root bin
 f none usr/share/doc/ntp/miscopt.html 0444 root bin
 f none usr/share/doc/ntp/monopt.html 0444 root bin
 f none usr/share/doc/ntp/msyslog.html 0444 root bin
 f none usr/share/doc/ntp/ntp_conf.html 0444 root bin
+f none usr/share/doc/ntp/ntp-wait.html 0444 root bin
 f none usr/share/doc/ntp/ntpd.html 0444 root bin
 f none usr/share/doc/ntp/ntpdate.html 0444 root bin
 f none usr/share/doc/ntp/ntpdc.html 0444 root bin
@@ -193,6 +203,7 @@
 f none usr/share/doc/ntp/ntpq.html 0444 root bin
 f none usr/share/doc/ntp/ntptime.html 0444 root bin
 f none usr/share/doc/ntp/ntptrace.html 0444 root bin
+f none usr/share/doc/ntp/orphan.html 0444 root bin
 f none usr/share/doc/ntp/parsedata.html 0444 root bin
 f none usr/share/doc/ntp/parsenew.html 0444 root bin
 f none usr/share/doc/ntp/pic/9400n.jpg 0444 root bin
@@ -217,17 +228,28 @@
 f none usr/share/doc/ntp/pic/bustardfly.gif 0444 root bin
 f none usr/share/doc/ntp/pic/c51.jpg 0444 root bin
 f none usr/share/doc/ntp/pic/description.jpg 0444 root bin
-f none usr/share/doc/ntp/description_files/description.jpg 0444 root bin
+f none usr/share/doc/ntp/pic/discipline.gif 0444 root bin
 f none usr/share/doc/ntp/pic/dogsnake.gif 0444 root bin
 f none usr/share/doc/ntp/pic/driver29.gif 0444 root bin
 f none usr/share/doc/ntp/pic/driver43_1.gif 0444 root bin
 f none usr/share/doc/ntp/pic/driver43_2.jpg 0444 root bin
 f none usr/share/doc/ntp/pic/fg6021.gif 0444 root bin
 f none usr/share/doc/ntp/pic/fg6039.jpg 0444 root bin
+f none usr/share/doc/ntp/pic/fig_3_1.gif 0444 root bin
 f none usr/share/doc/ntp/pic/flatheads.gif 0444 root bin
+f none usr/share/doc/ntp/pic/flt1.gif 0444 root bin
+f none usr/share/doc/ntp/pic/flt2.gif 0444 root bin
+f none usr/share/doc/ntp/pic/flt3.gif 0444 root bin
+f none usr/share/doc/ntp/pic/flt4.gif 0444 root bin
+f none usr/share/doc/ntp/pic/flt5.gif 0444 root bin
+f none usr/share/doc/ntp/pic/flt6.gif 0444 root bin
+f none usr/share/doc/ntp/pic/flt7.gif 0444 root bin
+f none usr/share/doc/ntp/pic/flt8.gif 0444 root bin
+f none usr/share/doc/ntp/pic/flt9.gif 0444 root bin
 f none usr/share/doc/ntp/pic/freq1211.gif 0444 root bin
 f none usr/share/doc/ntp/pic/gadget.jpg 0444 root bin
 f none usr/share/doc/ntp/pic/gps167.jpg 0444 root bin
+f none usr/share/doc/ntp/pic/group.gif 0444 root bin
 f none usr/share/doc/ntp/pic/hornraba.gif 0444 root bin
 f none usr/share/doc/ntp/pic/igclock.gif 0444 root bin
 f none usr/share/doc/ntp/pic/neoclock4x.gif 0444 root bin
@@ -254,10 +276,12 @@
 f none usr/share/doc/ntp/pic/radio2.jpg 0444 root bin
 f none usr/share/doc/ntp/pic/sheepb.jpg 0444 root bin
 f none usr/share/doc/ntp/pic/stack1a.jpg 0444 root bin
+f none usr/share/doc/ntp/pic/sx5.gif 0444 root bin
 f none usr/share/doc/ntp/pic/thunderbolt.jpg 0444 root bin
 f none usr/share/doc/ntp/pic/tonea.gif 0444 root bin
 f none usr/share/doc/ntp/pic/tribeb.gif 0444 root bin
 f none usr/share/doc/ntp/pic/wingdorothy.gif 0444 root bin
+f none usr/share/doc/ntp/poll.html 0444 root bin
 f none usr/share/doc/ntp/pps.html 0444 root bin
 f none usr/share/doc/ntp/prefer.html 0444 root bin
 f none usr/share/doc/ntp/quick.html 0444 root bin
@@ -274,14 +298,19 @@
 f none usr/share/doc/ntp/scripts/confopt.txt 0444 root bin
 f none usr/share/doc/ntp/scripts/external.txt 0444 root bin
 f none usr/share/doc/ntp/scripts/footer.txt 0444 root bin
+f none usr/share/doc/ntp/scripts/hand.txt 0444 root bin
 f none usr/share/doc/ntp/scripts/install.txt 0444 root bin
 f none usr/share/doc/ntp/scripts/manual.txt 0444 root bin
 f none usr/share/doc/ntp/scripts/misc.txt 0444 root bin
 f none usr/share/doc/ntp/scripts/miscopt.txt 0444 root bin
 f none usr/share/doc/ntp/scripts/monopt.txt 0444 root bin
 f none usr/share/doc/ntp/scripts/refclock.txt 0444 root bin
+f none usr/share/doc/ntp/scripts/special.txt 0444 root bin
 f none usr/share/doc/ntp/scripts/style.css 0444 root bin
+f none usr/share/doc/ntp/select.html 0444 root bin
 f none usr/share/doc/ntp/sitemap.html 0444 root bin
 f none usr/share/doc/ntp/sntp.html 0444 root bin
+f none usr/share/doc/ntp/stats.html 0444 root bin
 f none usr/share/doc/ntp/tickadj.html 0444 root bin
+f none usr/share/doc/ntp/warp.html 0444 root bin
 f none usr/share/doc/ntp/xleave.html 0444 root bin