Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 19 Apr 2026 15:07:32 +0000
From:      Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav <des@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 7c546a3a09e0 - main - www/forgejo-lts: Correct AppWorkPAth
Message-ID:  <69e4efb4.2646e.53cf89d8@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by des:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7c546a3a09e0e09f2fa1e5695057410e52a15dfb

commit 7c546a3a09e0e09f2fa1e5695057410e52a15dfb
Author:     Dag-Erling Smørgrav <des@FreeBSD.org>
AuthorDate: 2026-04-19 15:06:39 +0000
Commit:     Dag-Erling Smørgrav <des@FreeBSD.org>
CommitDate: 2026-04-19 15:07:19 +0000

    www/forgejo-lts: Correct AppWorkPAth
    
    We were incorrectly setting AppWorkPath to DATADIR and creating DATADIR
    on installation.  Set it to DBDIR instead to match the app.ini and rc
    script we generate.  This should be a nop for anyone with a working
    configuration, and should allow forgejo-cli to work without explicitly
    specifying the correct work directory.
    
    PR:             294619
    MFH:            2026Q2
---
 www/forgejo-lts/Makefile  | 3 ++-
 www/forgejo-lts/pkg-plist | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/forgejo-lts/Makefile b/www/forgejo-lts/Makefile
index a39ae18d81f0..c693df0c8e49 100644
--- a/www/forgejo-lts/Makefile
+++ b/www/forgejo-lts/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	forgejo
 DISTVERSIONPREFIX=	v
 DISTVERSION=	11.0.12
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	https://codeberg.org/forgejo/forgejo/releases/download/${DISTVERSIONFULL}/
 PKGNAMESUFFIX=	-lts
@@ -54,7 +55,7 @@ SQLITE_VARS=		GO_TAGS+="sqlite sqlite_unlock_notify"
 
 SSP_UNSAFE=	true
 LDFLAGS=	"'-X "forgejo.org/modules/setting.CustomPath=${PREFIX}/etc/forgejo"'" \
-		"'-X "forgejo.org/modules/setting.AppWorkPath=${DATADIR}"'"
+		"'-X "forgejo.org/modules/setting.AppWorkPath=${DBDIR}"'"
 MAKE_ARGS=	GOFLAGS="-buildvcs=false" \
 		GOPATH=${WRKDIR} \
 		TAGS="${GO_TAGS}"
diff --git a/www/forgejo-lts/pkg-plist b/www/forgejo-lts/pkg-plist
index 133c23b66678..1c3cf47e64ce 100644
--- a/www/forgejo-lts/pkg-plist
+++ b/www/forgejo-lts/pkg-plist
@@ -1,7 +1,6 @@
 @sample %%ETCDIR%%/conf/app.ini.sample
 %%ETCDIR%%/conf/app.ini.defaults
 sbin/forgejo
-@dir %%DATADIR%%
 @dir(git,git,755) %%DBDIR%%
 @dir(git,git,755) %%DBDIR%%/data
 @dir(git,git,755) %%DBDIR%%/forgejo-repositories


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69e4efb4.2646e.53cf89d8>