From 37ed8131fdcee1300a8733ba2fba0a0501f471d1 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Mon, 29 Aug 2022 19:15:18 +0000
Subject: [PATCH] Use rc_configtest.

---
 net/knot/Makefile              | 2 ++
 net/knot/pkg/knot.rc           | 8 +++++---
 sysutils/sysmon/Makefile       | 2 +-
 sysutils/sysmon/pkg/sysmond.rc | 5 ++---
 www/nginx/Makefile             | 2 ++
 www/nginx/pkg/nginx.rc         | 5 ++---
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/net/knot/Makefile b/net/knot/Makefile
index 56e7c8bf41e..19b6abf724a 100644
--- a/net/knot/Makefile
+++ b/net/knot/Makefile
@@ -3,6 +3,8 @@ COMMENT =		authoritative DNS server
 # update net/py-libknot when updating this
 DISTNAME =		knot-3.2.0
 
+REVISION =		0
+
 SHARED_LIBS +=	dnssec               3.1      # .9.0
 SHARED_LIBS +=	knot                 8.0      # .13.0
 SHARED_LIBS +=	zscanner             1.1      # .4.0
diff --git a/net/knot/pkg/knot.rc b/net/knot/pkg/knot.rc
index 83a8c21ea31..d720d8616c6 100644
--- a/net/knot/pkg/knot.rc
+++ b/net/knot/pkg/knot.rc
@@ -2,13 +2,15 @@
 
 daemon="${PREFIX}/sbin/knotd -d"
 knotc="${PREFIX}/sbin/knotc"
-knotcheckconf="${knotc} conf-check"
 
 . /etc/rc.d/rc.subr
 
+rc_configtest() {
+	${knotc} conf-check
+}
+
 rc_pre() {
 	install -d -o _knot -g wheel -m 750 /var/run/knot/
-	${knotcheckconf}
 }
 
 rc_check() {
@@ -16,7 +18,7 @@ rc_check() {
 }
 
 rc_reload() {
-	${knotcheckconf} && ${knotc} reload
+	${knotc} reload
 }
 
 rc_stop() {
diff --git a/sysutils/sysmon/Makefile b/sysutils/sysmon/Makefile
index d49dccd19a5..2f5932d242f 100644
--- a/sysutils/sysmon/Makefile
+++ b/sysutils/sysmon/Makefile
@@ -4,7 +4,7 @@ CATEGORIES =	sysutils
 
 HOMEPAGE =	https://puck.nether.net/sysmon/
 MAINTAINER =	George Rosamond <george@nycbug.org>
-REVISION =	3
+REVISION =	4
 
 # GPLv2
 PERMIT_PACKAGE =	Yes
diff --git a/sysutils/sysmon/pkg/sysmond.rc b/sysutils/sysmon/pkg/sysmond.rc
index 4d2037fe201..7081c053435 100644
--- a/sysutils/sysmon/pkg/sysmond.rc
+++ b/sysutils/sysmon/pkg/sysmond.rc
@@ -6,9 +6,8 @@ daemon_timeout="60"
 
 . /etc/rc.d/rc.subr
 
-rc_reload() {
-	${daemon} ${daemon_flags} -t && \
-		pkill -HUP -T "${daemon_rtable}" -xf "${pexp}"
+rc_configtest() {
+	${daemon} ${daemon_flags} -t
 }
 
 rc_cmd $1
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 321336143d9..cc6eed8f6ff 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -36,6 +36,8 @@ PKGNAME-passenger=	nginx-passenger-${VERSION}
 PKGNAME-rtmp=		nginx-rtmp-${VERSION}
 PKGNAME-securelink=	nginx-securelink-${VERSION}
 
+REVISION-main=		0
+
 ONLY_FOR_ARCHS-passenger= aarch64 amd64 arm i386
 
 MASTER_SITES=	https://nginx.org/download/
diff --git a/www/nginx/pkg/nginx.rc b/www/nginx/pkg/nginx.rc
index 1a39ef28225..29fa88e9ff2 100755
--- a/www/nginx/pkg/nginx.rc
+++ b/www/nginx/pkg/nginx.rc
@@ -7,9 +7,8 @@ daemon="${TRUEPREFIX}/sbin/nginx"
 pexp="nginx: master process ${daemon}${daemon_flags:+ ${daemon_flags}}"
 rc_stop_signal=QUIT
 
-rc_reload() {
-	${daemon} ${daemon_flags} -t &&
-		pkill -HUP -T "${daemon_rtable}" -xf "${pexp}"
+rc_configtest() {
+	${daemon} ${daemon_flags} -t
 }
 
 rc_cmd $1