Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 10 Dec 2024 06:14:08 GMT
From:      Cy Schubert <cy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: c9d07ce2a970 - main - ntp: Improve descriptions in manual pages
Message-ID:  <202412100614.4BA6E81H082879@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by cy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c9d07ce2a970644c4e78a0e12e32753e19c16c5c

commit c9d07ce2a970644c4e78a0e12e32753e19c16c5c
Author:     Alexander Ziaee <concussious@runbox.com>
AuthorDate: 2024-10-18 21:13:08 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2024-12-10 06:13:50 +0000

    ntp: Improve descriptions in manual pages
    
    + ntpd added to ntp.conf(5) description (search keywords)
    + expand NTP so these pages are shown when `apropos time`
    + "standard" => "reference" for increased consistency
    - removed redundant or duplicated search keywords
    
    freebsd-src:    c7a33fe3 (ntp: Improve descriptions)
    ntp.org bug:    https://bugs.ntp.org/show_bug.cgi?id=3936
    Reviewed by:    Harlan Stenn <stenn@nwtime.org>
    Reviewed by:    Cy Schubert <cy@nwtime.org, cy@FreeBSD.org>
---
 net/ntp/Makefile                             |  1 +
 net/ntp/files/patch-ntpd_ntp.conf.def        | 11 +++++++++++
 net/ntp/files/patch-ntpd_ntp.keys.def        | 11 +++++++++++
 net/ntp/files/patch-ntpd_ntpd-opts.def       | 11 +++++++++++
 net/ntp/files/patch-ntpq_ntpq-opts.def       | 11 +++++++++++
 net/ntp/files/patch-sntp_sntp-opts.def       | 11 +++++++++++
 net/ntp/files/patch-util_ntp-keygen-opts.def | 11 +++++++++++
 7 files changed, 67 insertions(+)

diff --git a/net/ntp/Makefile b/net/ntp/Makefile
index b9101f5874c8..eedd057fd5d4 100644
--- a/net/ntp/Makefile
+++ b/net/ntp/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ntp
 PORTVERSION=	4.2.8p18
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ \
 		http://archive.ntp.org/ntp4/ntp-4.2/
diff --git a/net/ntp/files/patch-ntpd_ntp.conf.def b/net/ntp/files/patch-ntpd_ntp.conf.def
new file mode 100644
index 000000000000..e071306b956f
--- /dev/null
+++ b/net/ntp/files/patch-ntpd_ntp.conf.def
@@ -0,0 +1,11 @@
+--- ntpd/ntp.conf.def.orig	2024-05-07 11:21:37 UTC
++++ ntpd/ntp.conf.def
+@@ -9,7 +9,7 @@ file-path	= "/etc/ntp.conf";
+ // file name.
+ prog-name	= "ntp.conf";
+ file-path	= "/etc/ntp.conf";
+-prog-title	= "Network Time Protocol (NTP) daemon configuration file format";
++prog-title	= "Network Time Protocol daemon (ntpd) configuration format";
+ 
+ /* explain: Additional information whenever the usage routine is invoked */
+ explain = <<- _END_EXPLAIN
diff --git a/net/ntp/files/patch-ntpd_ntp.keys.def b/net/ntp/files/patch-ntpd_ntp.keys.def
new file mode 100644
index 000000000000..fad121262752
--- /dev/null
+++ b/net/ntp/files/patch-ntpd_ntp.keys.def
@@ -0,0 +1,11 @@
+--- ntpd/ntp.keys.def.orig	2018-08-14 11:51:07 UTC
++++ ntpd/ntp.keys.def
+@@ -10,7 +10,7 @@ file-path	= "/etc/ntp.keys";
+ // file name.
+ prog-name	= "ntp.keys";
+ file-path	= "/etc/ntp.keys";
+-prog-title	= "NTP symmetric key file format";
++prog-title	= "Network Time Protocol symmetric key format";
+ 
+ /* explain: Additional information whenever the usage routine is invoked */
+ explain = <<- _END_EXPLAIN
diff --git a/net/ntp/files/patch-ntpd_ntpd-opts.def b/net/ntp/files/patch-ntpd_ntpd-opts.def
new file mode 100644
index 000000000000..64bfe7f8b9aa
--- /dev/null
+++ b/net/ntp/files/patch-ntpd_ntpd-opts.def
@@ -0,0 +1,11 @@
+--- ntpd/ntpd-opts.def.orig	2015-07-27 04:10:58 UTC
++++ ntpd/ntpd-opts.def
+@@ -5,7 +5,7 @@ prog-name	= "ntpd";
+ #include copyright.def
+ 
+ prog-name	= "ntpd";
+-prog-title	= "NTP daemon program";
++prog-title	= "set clock via Network Time Protocol daemon";
+ argument	= "[ <server1> ... <serverN> ]";
+ 
+ #include ntpdbase-opts.def
diff --git a/net/ntp/files/patch-ntpq_ntpq-opts.def b/net/ntp/files/patch-ntpq_ntpq-opts.def
new file mode 100644
index 000000000000..4a202acf2ee2
--- /dev/null
+++ b/net/ntp/files/patch-ntpq_ntpq-opts.def
@@ -0,0 +1,11 @@
+--- ntpq/ntpq-opts.def.orig	2023-05-31 10:31:39 UTC
++++ ntpq/ntpq-opts.def
+@@ -7,7 +7,7 @@ prog-name      = "ntpq";
+ #include autogen-version.def
+ 
+ prog-name      = "ntpq";
+-prog-title     = "standard NTP query program";
++prog-title     = "query Network Time Protocol servers";
+ argument       = '[ host ...]';
+ 
+ flag = {
diff --git a/net/ntp/files/patch-sntp_sntp-opts.def b/net/ntp/files/patch-sntp_sntp-opts.def
new file mode 100644
index 000000000000..6025d7497984
--- /dev/null
+++ b/net/ntp/files/patch-sntp_sntp-opts.def
@@ -0,0 +1,11 @@
+--- sntp/sntp-opts.def.orig	2018-02-27 15:15:25 UTC
++++ sntp/sntp-opts.def
+@@ -6,7 +6,7 @@ prog-name      = "sntp";
+ #include copyright.def
+ 
+ prog-name      = "sntp";
+-prog-title	= "standard Simple Network Time Protocol client program";
++prog-title	= "reference Simple Network Time Protocol client";
+ argument	= '[ hostname-or-IP ...]';
+ 
+ #include homerc.def
diff --git a/net/ntp/files/patch-util_ntp-keygen-opts.def b/net/ntp/files/patch-util_ntp-keygen-opts.def
new file mode 100644
index 000000000000..b785997ec798
--- /dev/null
+++ b/net/ntp/files/patch-util_ntp-keygen-opts.def
@@ -0,0 +1,11 @@
+--- util/ntp-keygen-opts.def.orig	2023-05-31 10:31:39 UTC
++++ util/ntp-keygen-opts.def
+@@ -7,7 +7,7 @@ prog-name      = "ntp-keygen";
+ #include autogen-version.def
+ 
+ prog-name      = "ntp-keygen";
+-prog-title     = "Create a NTP host key";
++prog-title     = "Create a Network Time Protocol host key";
+ package        = ntp;
+ 
+ include        = '#include <stdlib.h>';



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202412100614.4BA6E81H082879>