git: 9e47fe9f65ed - main - www/(x)caddy: Fix rc(8) script

The branch main has been updated by adamw:

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

commit 9e47fe9f65ed633d956ee2f6e19ea9ff6e8a95ff
Author:     Adam Weinberger <adamw@FreeBSD.org>
AuthorDate: 2022-09-30 13:36:55 +0000
Commit:     Adam Weinberger <adamw@FreeBSD.org>
CommitDate: 2022-09-30 13:39:02 +0000

    www/(x)caddy: Fix rc(8) script
    
    rc.subr(8) needs $command to be set or it can't inspect the pidfile.
    Without it, rc.d/caddy never believes that caddy is running which
    impedes stopping.
    
    Thanks to scf for figuring out what was going wrong here.
---
 www/caddy/Makefile        | 2 +-
 www/caddy/files/caddy.in  | 1 +
 www/xcaddy/Makefile       | 2 +-
 www/xcaddy/files/caddy.in | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/www/caddy/Makefile b/www/caddy/Makefile
index b2b10dce42cb..996886ebdf08 100644
--- a/www/caddy/Makefile
+++ b/www/caddy/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	caddy
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.6.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 DIST_SUBDIR=	caddy
 
diff --git a/www/caddy/files/caddy.in b/www/caddy/files/caddy.in
index 45c6b83dafb8..85251ab1c02a 100644
--- a/www/caddy/files/caddy.in
+++ b/www/caddy/files/caddy.in
@@ -53,6 +53,7 @@ load_rc_config $name
 : ${XDG_DATA_HOME:="${caddy_directory}/data"}
 export XDG_CONFIG_HOME XDG_DATA_HOME
 
+command="${caddy_command}"
 caddy_flags="--config ${caddy_config} --adapter ${caddy_adapter}"
 pidfile="/var/run/${name}/${name}.pid"
 
diff --git a/www/xcaddy/Makefile b/www/xcaddy/Makefile
index 3bc889dbe9db..645499c8aae3 100644
--- a/www/xcaddy/Makefile
+++ b/www/xcaddy/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	xcaddy
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 DIST_SUBDIR=	xcaddy
 
diff --git a/www/xcaddy/files/caddy.in b/www/xcaddy/files/caddy.in
index e1b137b37380..1fc835401889 100644
--- a/www/xcaddy/files/caddy.in
+++ b/www/xcaddy/files/caddy.in
@@ -53,6 +53,7 @@ load_rc_config $name
 : ${XDG_DATA_HOME:="${caddy_directory}/data"}
 export XDG_CONFIG_HOME XDG_DATA_HOME
 
+command="${caddy_command}"
 caddy_flags="--config ${caddy_config} --adapter ${caddy_adapter}"
 pidfile="/var/run/${name}/${name}.pid"