Update several .def files to use autogen-5.17 feature set

bk: 50e68f008Xs2oo6K2VUvxci7gj3mYQ

diff --git a/ChangeLog b/ChangeLog
index 233220840275742c673c993b3bf6bb6d5337b4eb..0faa31a896714b530fcda7c028042d9f014e891a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Update several .def files to use autogen-5.17 feature set.
 (4.2.7p344) 2013/01/03 Released by Harlan Stenn <stenn@ntp.org>
 * Refactor and enhance mdoc2texi.
 * Make sure agtexi-file.tpl defines label-str.

diff --git a/ntpd/ntp.conf.def b/ntpd/ntp.conf.def
index bf3ff441c213394403d1c94e127f76ef2c6b7dc0..a3fe4d3c86ae7836916c556207f3fe7dbbb3428c 100644 (file)
--- a/ntpd/ntp.conf.def
+++ b/ntpd/ntp.conf.def
@@ -2691,11 +2691,6 @@ The default is eight multiples of 32 starting at
        _END_PROG_MDOC_DESCRIP;
 };
 
-/*
-prog-info-descrip = <<- _END_PROG_INFO_DESCRIP
-       _END_PROG_INFO_DESCRIP;
-*/
-
 doc-section    = {
   ds-type      = 'FILES';
   ds-format    = 'mdoc';
@@ -2759,7 +2754,7 @@ doc-section       = {
   ds-type      = 'NOTES';
   ds-format    = 'mdoc';
   ds-text      = <<- _END_MDOC_NOTES
-This document corresponds to version @VERSION@ of NTP.
+This document corresponds to version #VERSION# of NTP.
 This document was derived from FreeBSD.
        _END_MDOC_NOTES;
 };

diff --git a/ntpd/ntp.keys.def b/ntpd/ntp.keys.def
index 88f537f67350ce8de8da046e3eed874503b42d3b..68d14028915c067464e17161443a64730c945058 100644 (file)
--- a/ntpd/ntp.keys.def
+++ b/ntpd/ntp.keys.def
@@ -104,11 +104,6 @@ so it is generally appropriate to specify these keys in ASCII format.
        _END_PROG_MDOC_DESCRIP;
 };
 
-/*
-prog-info-descrip = <<- _END_PROG_INFO_DESCRIP
-       _END_PROG_INFO_DESCRIP;
-*/
-
 doc-section    = {
   ds-type      = 'FILES';
   ds-format    = 'mdoc';
@@ -152,7 +147,7 @@ doc-section = {
   ds-type      = 'NOTES';
   ds-format    = 'mdoc';
   ds-text      = <<- _END_MDOC_NOTES
-This document corresponds to version @VERSION@ of NTP.
+This document corresponds to version #VERSION# of NTP.
 This document was derived from FreeBSD.
        _END_MDOC_NOTES;
 };

diff --git a/ntpd/ntpd-opts.def b/ntpd/ntpd-opts.def
index 503dc976a12c16eb7a56d2d37971aa6cac6106fb..94157fdcf768c113e00a62fe8bc6783ffab60232 100644 (file)
--- a/ntpd/ntpd-opts.def
+++ b/ntpd/ntpd-opts.def
@@ -597,7 +597,7 @@ doc-section = {
   ds-type      = 'NOTES';
   ds-format    = 'mdoc';
   ds-text      = <<- _END_MDOC_NOTES
-This document corresponds to version @VERSION@ of NTP.
+This document corresponds to version #VERSION# of NTP.
 Portions of this document came from FreeBSD.
        _END_MDOC_NOTES;
 };

diff --git a/ntpsnmpd/ntpsnmpd-opts.def b/ntpsnmpd/ntpsnmpd-opts.def
index b80e4b26feedb3bae47ac1eaa4c059d43eef9d75..cb949b0a1a96d1cd0603e373ccdbc8baebc14a2b 100644 (file)
--- a/ntpsnmpd/ntpsnmpd-opts.def
+++ b/ntpsnmpd/ntpsnmpd-opts.def
@@ -112,7 +112,7 @@ please fill me in...
 please fill me in...
 .El
 .Pp
-This document corresponds to version @VERSION@ of NTP.
+This document corresponds to version #VERSION# of NTP.
        _END_MDOC_NOTES;
 };
 

diff --git a/scripts/ntp-wait-opts.def b/scripts/ntp-wait-opts.def
index 8980a8feea346917c0eed58e0b4cd4e837f25da6..0daa6c67e951324951d2ce4f666cd916625f9ab9 100644 (file)
--- a/scripts/ntp-wait-opts.def
+++ b/scripts/ntp-wait-opts.def
@@ -73,11 +73,6 @@ flag is provided.
        _END_PROG_MDOC_DESCRIP;
 };
 
-/*
-prog-info-descrip = <<- _END_PROG_INFO_DESCRIP
-       _END_PROG_INFO_DESCRIP;
-*/
-
 /*
 doc-section    = {
   ds-type      = 'USAGE';
@@ -99,7 +94,7 @@ doc-section   = {
   ds-type      = 'NOTES';
   ds-format    = 'mdoc';
   ds-text      = <<- _END_MDOC_NOTES
-This document corresponds to version @VERSION@ of NTP.
+This document corresponds to version #VERSION# of NTP.
        _END_MDOC_NOTES;
 };
 

diff --git a/sntp/ag-tpl/agman-file.tpl b/sntp/ag-tpl/:Old/agman-file.tpl
similarity index 100%
rename from sntp/ag-tpl/agman-file.tpl
rename to sntp/ag-tpl/:Old/agman-file.tpl

diff --git a/sntp/ag-tpl/agmdoc-file.tpl b/sntp/ag-tpl/:Old/agmdoc-file.tpl
similarity index 100%
rename from sntp/ag-tpl/agmdoc-file.tpl
rename to sntp/ag-tpl/:Old/agmdoc-file.tpl

diff --git a/sntp/ag-tpl/agtexi-cmd.tpl b/sntp/ag-tpl/:Old/agtexi-cmd.tpl
similarity index 100%
rename from sntp/ag-tpl/agtexi-cmd.tpl
rename to sntp/ag-tpl/:Old/agtexi-cmd.tpl

diff --git a/sntp/ag-tpl/cmd-doc.tlib b/sntp/ag-tpl/:Old/cmd-doc.tlib
similarity index 100%
rename from sntp/ag-tpl/cmd-doc.tlib
rename to sntp/ag-tpl/:Old/cmd-doc.tlib

diff --git a/sntp/ag-tpl/mdoc2man b/sntp/ag-tpl/:Old/mdoc2man
similarity index 100%
rename from sntp/ag-tpl/mdoc2man
rename to sntp/ag-tpl/:Old/mdoc2man

diff --git a/sntp/include/autogen-version.def b/sntp/include/autogen-version.def
index ebb6f8edec69e6cedf100015c744029a32d6486c..6c44d69de25220408e32dfb0d276091a6d7f5632 100644 (file)
--- a/sntp/include/autogen-version.def
+++ b/sntp/include/autogen-version.def
@@ -1,2 +1,3 @@
-#assert (version-compare >= autogen-version "5.17")
+#assert (version-compare > autogen-version "5.17")
+// >= is usually what we want.
 guard-option-names;

diff --git a/sntp/include/copyright.def b/sntp/include/copyright.def
index 64955801ceb7cf81e6643aa57e752ae1d35c04b0..923c3a877555bf5f2e29546f95f67a35d3ed84d4 100644 (file)
--- a/sntp/include/copyright.def
+++ b/sntp/include/copyright.def
@@ -19,3 +19,8 @@ eval VERSION=\`sed -e 's/.*,\\[//' -e 's/\\].*//' < ../sntp/m4/version.m4\`
 echo $VERSION`;
 
 version-value = '';    /* Don't use -v as a shortcut for --version */
+
+doc-sub = {
+    sub-name = version;
+    sub-text = 's/#VERSION#/<<version>>/g';
+};

diff --git a/sntp/sntp-opts.def b/sntp/sntp-opts.def
index 105ec43fdf21eb8d3f87336cf3a2c116688c4736..c7d94dc22d91658d163f6e33c6c00ac61933bd3f 100644 (file)
--- a/sntp/sntp-opts.def
+++ b/sntp/sntp-opts.def
@@ -284,52 +284,6 @@ of the host is reported.
        _END_PROG_MDOC_DESCRIP;
 };
 
-prog-info-descrip = <<- _END_PROG_INFO_DESCRIP
-@code{sntp}
-can be used as an SNTP client to query a NTP or SNTP server and either display
-the time or set the local system's time (given suitable privilege).  It can be
-run as an interactive command or in a
-@code{cron}
-job.
-
-NTP (the Network Time Protocol) and SNTP (the Simple Network Time Protocol)
-are defined and described by RFC 5905.
-
-@indent
-The default is to write the estimated correct local date and time (i.e. not
-UTC) to the standard output in a format like
-@example
-1996-10-15 20:17:25.123 (+0800) +4.567 +/- 0.089 [host] IP sN
-@end example
-where the
-@example
-(+0800)
-@end example
-means that to get to UTC from the reported local time one must
-add 8 hours and 0 minutes,
-the
-@example
-+4.567
-@end example
-indicates the local clock is 4.567 seconds behind the correct time
-(so 4.567 seconds must be added to the local clock to get it to be correct).
-Note that the number of decimals printed for this value will change
-based on the reported precision of the server.
-@example
-+/- 0.089
-@end example
-is the reported @file{synchronization distance} (in seconds),
-which represents the maximum error due to all causes.
-If the server does not report valid data needed to calculate the
-synchronization distance, this will be reported as
-@example
-+/- ?
-@end example
-If the @file{host} is different from the @file{IP}, both will be displayed.
-Otherwise, only the @file{IP} is displayed.
-Finally, the @file{stratum} is reported.
-       _END_PROG_INFO_DESCRIP;
-
 doc-section    = {
   ds-type      = 'USAGE';
   ds-format    = 'mdoc';
@@ -370,7 +324,7 @@ doc-section = {
   ds-type      = 'NOTES';
   ds-format    = 'mdoc';
   ds-text      = <<- _END_MDOC_NOTES
-This document corresponds to version @VERSION@ of
+This document corresponds to version #VERSION# of
 .Nm .
        _END_MDOC_NOTES;
 };

diff --git a/util/ntp-keygen-opts.def b/util/ntp-keygen-opts.def
index c9982389e6845a1276a90ca236e1016e4ff56701..d377b90a67e4ad221ccaac86c5bc8f68c6ee0446 100644 (file)
--- a/util/ntp-keygen-opts.def
+++ b/util/ntp-keygen-opts.def
@@ -1098,11 +1098,6 @@ utilities.
        _END_PROG_MDOC_DESCRIP;
 };
 
-/*
-prog-info-descrip = <<- _END_PROG_INFO_DESCRIP
-       _END_PROG_INFO_DESCRIP;
-*/
-
 doc-section    = {
   ds-type      = 'USAGE';
   ds-format    = 'mdoc';
@@ -1126,7 +1121,7 @@ doc-section       = {
   ds-type      = 'NOTES';
   ds-format    = 'mdoc';
   ds-text      = <<- _END_MDOC_NOTES
-This document corresponds to version @VERSION@ of NTP.
+This document corresponds to version #VERSION# of NTP.
 Portions of this document came from FreeBSD.
        _END_MDOC_NOTES;
 };