From: Harlan Stenn Date: Fri, 4 Jan 2013 08:12:48 +0000 (+0000) Subject: Update several .def files to use autogen-5.17 feature set X-Git-Tag: NTP_4_2_7P345~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a1d2ea35ee3cd3470d7ccbf24a982d9f8d6944f6;p=thirdparty%2Fntp.git Update several .def files to use autogen-5.17 feature set bk: 50e68f008Xs2oo6K2VUvxci7gj3mYQ --- diff --git a/ChangeLog b/ChangeLog index 233220840..0faa31a89 100644 --- 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 * 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 bf3ff441c..a3fe4d3c8 100644 --- 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 88f537f67..68d140289 100644 --- 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 503dc976a..94157fdcf 100644 --- 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 b80e4b26f..cb949b0a1 100644 --- 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 8980a8fee..0daa6c67e 100644 --- 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 ebb6f8ede..6c44d69de 100644 --- 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 64955801c..923c3a877 100644 --- 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#/<>/g'; +}; diff --git a/sntp/sntp-opts.def b/sntp/sntp-opts.def index 105ec43fd..c7d94dc22 100644 --- 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 c9982389e..d377b90a6 100644 --- 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; };