net/openntpd: update to 7.9p1

Miscellaneous minor bug fixes.

Changelog:
https://www.openntpd.org/txt/release-7.9p1.txt

5 files changed, 46 insertions, 87 deletions

diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile
index abcc1a4e4225..99246c207aa7 100644
--- a/net/openntpd/Makefile
+++ b/net/openntpd/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	openntpd
-PORTVERSION=	6.8p1
-PORTREVISION=	10
+PORTVERSION=	7.9p1
 PORTEPOCH=	2
 CATEGORIES=	net
 MASTER_SITES=	OPENBSD/OpenNTPD
@@ -20,13 +19,11 @@ USERS=		_ntp
 GROUPS=		_ntp
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--localstatedir=/var/db \
+		--runstatedir=/var/run
 
 SUB_FILES=	480.status-openntpd pkg-message
 
-pre-build:
-	${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
-	    ${WRKSRC}/src/ntpd.conf.5 ${WRKSRC}/src/ntpd.8
-
 post-install:
 	cd ${STAGEDIR}${PREFIX}/etc && ${MV} ntpd.conf ntpd.conf.sample
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily
diff --git a/net/openntpd/distinfo b/net/openntpd/distinfo
index dcbc144420fd..6b890e1db866 100644
--- a/net/openntpd/distinfo
+++ b/net/openntpd/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1607439518
-SHA256 (openntpd-6.8p1.tar.gz) = 8582db838a399153d4a17f2a76518b638cc3020f58028575bf54127518f55a46
-SIZE (openntpd-6.8p1.tar.gz) = 443997
+TIMESTAMP = 1783551801
+SHA256 (openntpd-7.9p1.tar.gz) = 091eeb3f4e358e28c3ab2ea58f93d7a0b5758a20d7c8a0418e162e9b2c27addc
+SIZE (openntpd-7.9p1.tar.gz) = 469499
diff --git a/net/openntpd/files/patch-src_ntpd.8 b/net/openntpd/files/patch-src_ntpd.8
deleted file mode 100644
index 61a3b8eed88c..000000000000
--- a/net/openntpd/files/patch-src_ntpd.8
+++ /dev/null
@@ -1,60 +0,0 @@
---- src/ntpd.8.orig	2017-09-07 19:12:02 UTC
-+++ src/ntpd.8
-@@ -56,7 +56,7 @@ Use
- .Ar file
- as the configuration file,
- instead of the default
--.Pa /etc/ntpd.conf .
-+.Pa %%PREFIX%%/etc/ntpd.conf .
- .It Fl n
- Configtest mode.
- Only check the configuration file for validity.
-@@ -99,18 +99,18 @@ will be logged.
- After the local clock is synchronized,
- .Nm
- adjusts the clock frequency using the
--.Xr adjfreq 2
-+.Xr ntp_adjtime 2
- system call to compensate for systematic drift.
- .Pp
- .Nm
--is started at boot time by default via
--.Va ntpd_flags
-+is usually started at boot time, and can be enabled by setting
-+.Va openntpd_flags
- in
- .Pa /etc/rc.conf .
- See
- .Xr rc 8
- and
--.Xr rc.conf 8
-+.Xr rc.conf 5
- for more information on the boot process
- and enabling daemons.
- .Pp
-@@ -123,8 +123,8 @@ and its initial clock drift from
- .Pa /var/db/ntpd.drift .
- Clock drift is periodically written to the drift file thereafter.
- .Sh FILES
--.Bl -tag -width "/var/db/ntpd.driftXXX" -compact
--.It Pa /etc/ntpd.conf
-+.Bl -tag -width "%%PREFIX%%/etc/ntpd.confXXX" -compact
-+.It Pa %%PREFIX%%/etc/ntpd.conf
- Default configuration file.
- .It Pa /var/db/ntpd.drift
- Drift file.
-@@ -134,12 +134,12 @@ Socket file for communication with
- .El
- .Sh SEE ALSO
- .Xr date 1 ,
--.Xr adjfreq 2 ,
- .Xr adjtime 2 ,
-+.Xr ntp_adjtime 2 ,
- .Xr ntpd.conf 5 ,
-+.Xr rc.conf 5 ,
- .Xr ntpctl 8 ,
- .Xr rc 8 ,
--.Xr rc.conf 8 ,
- .Xr rdate 8
- .Sh STANDARDS
- .Rs
diff --git a/net/openntpd/files/patch-src_ntpd.8.in b/net/openntpd/files/patch-src_ntpd.8.in
new file mode 100644
index 000000000000..3bfe9d0a3810
--- /dev/null
+++ b/net/openntpd/files/patch-src_ntpd.8.in
@@ -0,0 +1,40 @@
+--- src/ntpd.8.in.orig	2026-05-17 16:35:14 UTC
++++ src/ntpd.8.in
+@@ -97,18 +97,18 @@ adjusts the clock frequency using the
+ After the local clock is synchronized,
+ .Nm
+ adjusts the clock frequency using the
+-.Xr adjfreq 2
++.Xr ntp_adjtime 2
+ system call to compensate for systematic drift.
+ .Pp
+ .Nm
+-is started at boot time by default via
+-.Va ntpd_flags
++is usually started at boot time, and can be enabled by setting
++.Va openntpd_flags
+ in
+ .Pa /etc/rc.conf .
+ See
+ .Xr rc 8
+ and
+-.Xr rc.conf 8
++.Xr rc.conf 5
+ for more information on the boot process
+ and enabling daemons.
+ .Pp
+@@ -132,12 +132,12 @@ Socket file for communication with
+ .El
+ .Sh SEE ALSO
+ .Xr date 1 ,
+-.Xr adjfreq 2 ,
+ .Xr adjtime 2 ,
++.Xr ntp_adjtime 2 ,
+ .Xr ntpd.conf 5 ,
++.Xr rc.conf 5 ,
+ .Xr ntpctl 8 ,
+ .Xr rc 8 ,
+-.Xr rc.conf 8 ,
+ .Xr rdate 8
+ .Sh STANDARDS
+ .Rs
diff --git a/net/openntpd/files/patch-src_ntpd.conf.5 b/net/openntpd/files/patch-src_ntpd.conf.5
deleted file mode 100644
index 18e68a470117..000000000000
--- a/net/openntpd/files/patch-src_ntpd.conf.5
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/ntpd.conf.5.orig	2020-12-07 08:20:35 UTC
-+++ src/ntpd.conf.5
-@@ -258,13 +258,11 @@ constraints from "https://www.google.com/"
- .Ed
- .El
- .Sh FILES
--.Bl -tag -width /etc/examples/ntpd.conf -compact
--.It Pa /etc/ntpd.conf
-+.Bl -tag -width "%%PREFIX%%/etc/ntpd.confXXX" -compact
-+.It Pa %%PREFIX%%/etc/ntpd.conf
- Default
- .Xr ntpd 8
- configuration file.
--.It Pa /etc/examples/ntpd.conf
--Example configuration file.
- .El
- .Sh SEE ALSO
- .Xr ntpctl 8 ,