Merge remote-tracking branch 'freebsd/main' into lf/main

4 files changed, 18 insertions, 16 deletions

diff --git a/devel/gitea-act_runner/Makefile b/devel/gitea-act_runner/Makefile
index 80f12bfee3ba..71a9305ffea4 100644
--- a/devel/gitea-act_runner/Makefile
+++ b/devel/gitea-act_runner/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	act_runner
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.2.12
+DISTVERSION=	0.2.13
 PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	gitea-
diff --git a/devel/gitea-act_runner/distinfo b/devel/gitea-act_runner/distinfo
index dd85300a99fe..e14495808ea3 100644
--- a/devel/gitea-act_runner/distinfo
+++ b/devel/gitea-act_runner/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1751283659
-SHA256 (go/devel_gitea-act_runner/act_runner-v0.2.12/v0.2.12.mod) = af3158a6edb346e51556484bda235442ec48a5b0d0fcb81525b4f6c1c6fc2c93
-SIZE (go/devel_gitea-act_runner/act_runner-v0.2.12/v0.2.12.mod) = 4647
-SHA256 (go/devel_gitea-act_runner/act_runner-v0.2.12/v0.2.12.zip) = a200dba3166fcd0e85fcd2303d26eb95ff55c488e0784ebd3304edb5b31ef8be
-SIZE (go/devel_gitea-act_runner/act_runner-v0.2.12/v0.2.12.zip) = 77813
+TIMESTAMP = 1756637267
+SHA256 (go/devel_gitea-act_runner/act_runner-v0.2.13/v0.2.13.mod) = 6b277a01675d4f9426cb56122056d2289fa077067f77110a94bc3e23b33fb4c4
+SIZE (go/devel_gitea-act_runner/act_runner-v0.2.13/v0.2.13.mod) = 4647
+SHA256 (go/devel_gitea-act_runner/act_runner-v0.2.13/v0.2.13.zip) = 6b1691deaac9d5e7de553f1e94ddab952a0386aec9711ce94639c3fc5b6d9046
+SIZE (go/devel_gitea-act_runner/act_runner-v0.2.13/v0.2.13.zip) = 78561
diff --git a/devel/gitea-act_runner/files/act_runner.in b/devel/gitea-act_runner/files/act_runner.in
index fa243278cc7e..119b92aca300 100644
--- a/devel/gitea-act_runner/files/act_runner.in
+++ b/devel/gitea-act_runner/files/act_runner.in
@@ -27,14 +27,21 @@ load_rc_config "${name}"
 : ${act_runner_flags:="-c ${act_runner_config} daemon"}
 
 procname="%%PREFIX%%/bin/act_runner"
-command="${procname} ${act_runner_flags}"
+command="/usr/sbin/daemon"
 
 pidfile="/var/run/${name}.pid"
 
-start_cmd="${name}_start"
-sig_stop=KILL
+required_files=${act_runner_config}
+command_args=" -r -S -l ${act_runner_facility} -s ${act_runner_priority} \
+    -T ${name} \
+    -u ${act_runner_user} -p ${pidfile} \
+    -o ${act_runner_log_file} \
+    ${procname} ${act_runner_flags}"
 
-act_runner_start() {
+prestart_cmd="${name}_prestart"
+sig_stop=TERM
+
+act_runner_prestart() {
   #  ensure the log directories are owned by the unprivileged user
   for d in "${act_runner_log_dir}"; do
     if [ ! -e "$d" ]; then
@@ -42,11 +49,6 @@ act_runner_start() {
       chown "${act_runner_user}" "$d"
     fi
   done
-  /usr/sbin/daemon -S -l "${act_runner_facility}" -s "${act_runner_priority}" \
-    -T "${name}" \
-    -u "${act_runner_user}" -p "${pidfile}" \
-    -o "${act_runner_log_file}" \
-    $command
 }
 
 run_rc_command "$1"
diff --git a/devel/gitea-act_runner/pkg-message b/devel/gitea-act_runner/pkg-message
index 7f6b6e6d8c9f..61bf9945e09b 100644
--- a/devel/gitea-act_runner/pkg-message
+++ b/devel/gitea-act_runner/pkg-message
@@ -3,7 +3,7 @@
   message: <<EOM
 FreeBSD does not support Docker.
 When configuring the runner, use 'host' as the label. e.g.
-act-runner register --labels FreeBSD:host,FreeBSD-14.2:host
+act-runner register --labels FreeBSD:host,FreeBSD-14.3:host
 EOM
 }
 ]