git: 5b39c611152d - main - sysutils/froxlor: pkg-plist typo fix and option/path fixes

The branch main has been updated by nc:

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

commit 5b39c611152d1ceb15d30837866038422e0e5685
Author:     No Name <ek@purplehat.org>
AuthorDate: 2025-05-08 00:17:10 +0000
Commit:     Neel Chauhan <nc@FreeBSD.org>
CommitDate: 2025-05-08 00:17:10 +0000

    sysutils/froxlor: pkg-plist typo fix and option/path fixes
    
    PR:             286642
    Reported by:    ek@purplehat.org
    Approved by:    self (maintainer)
---
 sysutils/froxlor/Makefile                                     |  1 +
 .../files/patch-froxlor_lib_Froxlor_Cli_MasterCron.php        | 11 +++++++++++
 .../patch-froxlor_lib_Froxlor_Cron_Traffic_TrafficCron.php    | 11 +++++++++++
 sysutils/froxlor/pkg-plist                                    |  2 +-
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/sysutils/froxlor/Makefile b/sysutils/froxlor/Makefile
index 1f3ca4da854d..1cc391cb5026 100644
--- a/sysutils/froxlor/Makefile
+++ b/sysutils/froxlor/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	froxlor
 DISTVERSION=	2.2.7
+PORTREVISION=	2
 CATEGORIES=	sysutils www
 MASTER_SITES=	https://files.froxlor.org/releases/
 
diff --git a/sysutils/froxlor/files/patch-froxlor_lib_Froxlor_Cli_MasterCron.php b/sysutils/froxlor/files/patch-froxlor_lib_Froxlor_Cli_MasterCron.php
new file mode 100644
index 000000000000..16c063a76a12
--- /dev/null
+++ b/sysutils/froxlor/files/patch-froxlor_lib_Froxlor_Cli_MasterCron.php
@@ -0,0 +1,11 @@
+--- froxlor/lib/Froxlor/Cli/MasterCron.php.orig	2025-05-07 03:26:39 UTC
++++ froxlor/lib/Froxlor/Cli/MasterCron.php
+@@ -211,7 +211,7 @@ final class MasterCron extends CliCommand
+ 	private function lockJob(string $job, OutputInterface $output): bool
+ 	{
+ 
+-		$this->lockFile = '/run/lock/froxlor_' . $job . '.lock';
++		$this->lockFile = '/var/run/froxlor_' . $job . '.lock';
+ 
+ 		if (file_exists($this->lockFile)) {
+ 			$jobinfo = json_decode(file_get_contents($this->lockFile), true);
diff --git a/sysutils/froxlor/files/patch-froxlor_lib_Froxlor_Cron_Traffic_TrafficCron.php b/sysutils/froxlor/files/patch-froxlor_lib_Froxlor_Cron_Traffic_TrafficCron.php
new file mode 100644
index 000000000000..56bc0ee1600e
--- /dev/null
+++ b/sysutils/froxlor/files/patch-froxlor_lib_Froxlor_Cron_Traffic_TrafficCron.php
@@ -0,0 +1,11 @@
+--- froxlor/lib/Froxlor/Cron/Traffic/TrafficCron.php.orig	2025-05-07 03:27:51 UTC
++++ froxlor/lib/Froxlor/Cron/Traffic/TrafficCron.php
+@@ -861,7 +861,7 @@ class TrafficCron extends FroxlorCron
+ 			// the default selection is 'current',
+ 			// so link the latest dir to it
+ 			$new_current = FileDir::makeCorrectFile($outputdir . '/current');
+-			FileDir::safe_exec('ln -fTs ' . escapeshellarg($staticOutputdir) . ' ' . escapeshellarg($new_current));
++			FileDir::safe_exec('ln -fFs ' . escapeshellarg($staticOutputdir) . ' ' . escapeshellarg($new_current));
+ 
+ 			// statistics file looks like: 'awstats[month][year].[domain].txt'
+ 			$file = FileDir::makeCorrectFile($outputdir . '/awstats' . date('mY', time()) . '.' . $domain . '.txt');
diff --git a/sysutils/froxlor/pkg-plist b/sysutils/froxlor/pkg-plist
index 19ff5f28973b..1f61b033da55 100644
--- a/sysutils/froxlor/pkg-plist
+++ b/sysutils/froxlor/pkg-plist
@@ -1997,7 +1997,7 @@
 %%WWWDIR%%/vendor/voku/portable-ascii/src/voku/helper/data/x1d7.php
 %%WWWDIR%%/vendor/voku/portable-ascii/src/voku/helper/data/x1f1.php
 %%WWWDIR%%/vendor/voku/portable-utf8/CHANGELOG.md
-%%WWWDIR%%/vendor/voku/portable-utf8/LICENSE%%AP_MOD_EN%%PACHE
+%%WWWDIR%%/vendor/voku/portable-utf8/LICENSE-APACHE
 %%WWWDIR%%/vendor/voku/portable-utf8/LICENSE-GPL
 %%WWWDIR%%/vendor/voku/portable-utf8/README.md
 %%WWWDIR%%/vendor/voku/portable-utf8/SECURITY.md