5 files changed, 37 insertions, 39 deletions
diff --git a/www/forgejo/Makefile b/www/forgejo/Makefile
index 4081b8af0ea9..1b2111c3be11 100644
--- a/www/forgejo/Makefile
+++ b/www/forgejo/Makefile
@@ -1,13 +1,12 @@
 PORTNAME=	forgejo
 DISTVERSIONPREFIX=	v
-DISTVERSION=	12.0.4
-PORTREVISION=	2
+DISTVERSION=	13.0.1
 CATEGORIES=	www
 MASTER_SITES=	https://codeberg.org/forgejo/forgejo/releases/download/${DISTVERSIONFULL}/
 DISTNAME=	forgejo-src-${DISTVERSION}
 
-MAINTAINER=	stb@lassitu.de
-COMMENT=	Compact self-hosted Git service
+MAINTAINER=	des@FreeBSD.org
+COMMENT=	Compact self-hosted Git forge
 WWW=		https://forgejo.org/
 
 LICENSE=	MIT
@@ -23,8 +22,11 @@ PIE_UNSAFE=	yes
 CONFLICTS_INSTALL=	forgejo[0-79]*
 
 EXTRACT_AFTER_ARGS=	--strip-components 1
+DBDIR=		/var/db/forgejo
+LOGDIR=		/var/log/forgejo
 SUB_FILES=	app.ini.sample pkg-message
-SUB_LIST=	GITUSER=${USERS}
+SUB_LIST=	GITUSER=${USERS} DBDIR=${DBDIR} LOGDIR=${LOGDIR}
+PLIST_SUB=	DBDIR=${DBDIR} LOGDIR=${LOGDIR}
 
 NO_WRKSUBDIR=	yes
 
@@ -46,6 +48,15 @@ GIT_LFS_RUN_DEPENDS=	git-lfs:devel/git-lfs
 PAM_VARS=		GO_TAGS+=pam
 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}"'"
+MAKE_ARGS=	GOFLAGS="-buildvcs=false" \
+		GOPATH=${WRKDIR} \
+		TAGS="${GO_TAGS}"
+ALL_TARGET=	backend
+MAKE_JOBS_UNSAFE=	yes
+
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD
@@ -54,21 +65,8 @@ DAEMONARGS=	-S -l \$${forgejo_facility} -s \$${forgejo_priority} -T \
 .else
 DAEMONARGS=	-f
 .endif
-
 SUB_LIST+=	DAEMONARGS="${DAEMONARGS}"
 
-SSP_UNSAFE=	true
-LDFLAGS+=	"'-X "forgejo.org/modules/setting.CustomPath=${PREFIX}/etc/forgejo"'" \
-		"'-X "forgejo.org/modules/setting.AppWorkPath=${PREFIX}/share/forgejo"'"
-MAKE_ARGS=	GOFLAGS="-buildvcs=false" \
-		GOPATH=${WRKDIR} \
-		TAGS="${GO_TAGS}"
-ALL_TARGET=	backend
-MAKE_JOBS_UNSAFE=	yes
-
-post-patch:
-	${ECHO_CMD} ${DISTVERSION} >${WRKSRC}/VERSION
-
 # Too lazy to figure out why go install won't work.
 do-install:
 # Go binary is statically linked and cannot be stripped, so use
@@ -81,9 +79,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/custom/conf/app.example.ini \
 		${STAGEDIR}${ETCDIR}/conf/app.ini.defaults
 	${MKDIR} ${STAGEDIR}${DATADIR}
-	${MKDIR} ${STAGEDIR}/var/db/forgejo/data
-	${MKDIR} ${STAGEDIR}/var/db/forgejo/forgejo-repositories
-	${MKDIR} ${STAGEDIR}/var/log/forgejo
+	${MKDIR} ${STAGEDIR}${DBDIR}/data
+	${MKDIR} ${STAGEDIR}${DBDIR}/forgejo-repositories
+	${MKDIR} ${STAGEDIR}${LOGDIR}
 
 do-install-BINDATA-off:
 	cd ${WRKSRC} && \
diff --git a/www/forgejo/distinfo b/www/forgejo/distinfo
index fd739adc9fdf..4c444383e3ce 100644
--- a/www/forgejo/distinfo
+++ b/www/forgejo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1758356864
-SHA256 (forgejo-src-12.0.4.tar.gz) = b1adeec3f5f446c63996250a334be62baf0cd8fbb9ad71a3316a5896cb327d08
-SIZE (forgejo-src-12.0.4.tar.gz) = 54124346
+TIMESTAMP = 1761217700
+SHA256 (forgejo-src-13.0.1.tar.gz) = 98cb495cd07881d90aa32cf143facef4abba2b732684ab1d938af9fa3ab12f26
+SIZE (forgejo-src-13.0.1.tar.gz) = 55449730
diff --git a/www/forgejo/files/app.ini.sample.in b/www/forgejo/files/app.ini.sample.in
index b54e756578be..f06b9819cc84 100644
--- a/www/forgejo/files/app.ini.sample.in
+++ b/www/forgejo/files/app.ini.sample.in
@@ -23,7 +23,7 @@
 # localhost.
 #
 # If you'd rather use the web-based installer, remove this conf/app.ini file
-# and make %%PREFIX%%/etc/forgejo/conf writeable to the git user.
+# and make %%ETCDIR%%/conf writeable to the git user.
 
 APP_NAME = Forgejo: A self-hosted lightweight software forge
 RUN_MODE = prod
@@ -34,17 +34,17 @@ DB_TYPE  = sqlite3
 HOST     = 127.0.0.1:3306
 NAME     = forgejo
 PASSWD   =
-PATH     = /var/db/forgejo/forgejo.db
+PATH     = %%DBDIR%%/forgejo.db
 SSL_MODE = disable
 USER     = root
 
 [indexer]
-ISSUE_INDEXER_PATH = /var/db/forgejo/indexers/issues.bleve
+ISSUE_INDEXER_PATH = %%DBDIR%%/indexers/issues.bleve
 
 [log]
 LEVEL     = Info
 MODE      = file
-ROOT_PATH = /var/log/forgejo
+ROOT_PATH = %%LOGDIR%%
 
 [mailer]
 ENABLED = false
@@ -53,18 +53,18 @@ ENABLED = false
 JWT_SECRET = CHANGE_ME
 
 [picture]
-AVATAR_UPLOAD_PATH      = /var/db/forgejo/data/avatars
+AVATAR_UPLOAD_PATH      = %%DBDIR%%/data/avatars
 DISABLE_GRAVATAR        = true
 ENABLE_FEDERATED_AVATAR = false
 
 [repository]
-ROOT = /var/db/forgejo/forgejo-repositories
+ROOT = %%DBDIR%%/forgejo-repositories
 # Forgejo's default is 'bash', so if you have bash installed, you can comment
 # this out.
 SCRIPT_TYPE = sh
 
 [repository.upload]
-TEMP_PATH = /var/db/forgejo/data/tmp/uploads
+TEMP_PATH = %%DBDIR%%/data/tmp/uploads
 
 [security]
 INSTALL_LOCK   = true
@@ -73,10 +73,10 @@ SECRET_KEY     = CHANGE_ME
 
 [session]
 PROVIDER        = file
-PROVIDER_CONFIG = /var/db/forgejo/data/sessions
+PROVIDER_CONFIG = %%DBDIR%%/data/sessions
 
 [server]
-APP_DATA_PATH = /var/db/forgejo/data
+APP_DATA_PATH = %%DBDIR%%/data
 DISABLE_SSH   = false
 DOMAIN        = localhost
 HTTP_ADDR     = 127.0.0.1
diff --git a/www/forgejo/files/forgejo.in b/www/forgejo/files/forgejo.in
index 026fed82b0b2..516f63862e60 100644
--- a/www/forgejo/files/forgejo.in
+++ b/www/forgejo/files/forgejo.in
@@ -33,7 +33,7 @@ start_cmd="${name}_start"
 start_precmd="${name}_prestart"
 
 forgejo_start() {
-	for d in /var/db/forgejo /var/log/forgejo; do
+	for d in %%DBDIR%% %%LOGDIR%%; do
 		if [ ! -e "$d" ]; then
 			mkdir "$d"
 			chown ${forgejo_user} "$d"
diff --git a/www/forgejo/pkg-plist b/www/forgejo/pkg-plist
index cfdd317d833c..133c23b66678 100644
--- a/www/forgejo/pkg-plist
+++ b/www/forgejo/pkg-plist
@@ -1,8 +1,8 @@
 @sample %%ETCDIR%%/conf/app.ini.sample
 %%ETCDIR%%/conf/app.ini.defaults
 sbin/forgejo
-@dir share/forgejo
-@dir(git,git,755) /var/db/forgejo
-@dir(git,git,755) /var/db/forgejo/data
-@dir(git,git,755) /var/db/forgejo/forgejo-repositories
-@dir(git,git,755) /var/log/forgejo
+@dir %%DATADIR%%
+@dir(git,git,755) %%DBDIR%%
+@dir(git,git,755) %%DBDIR%%/data
+@dir(git,git,755) %%DBDIR%%/forgejo-repositories
+@dir(git,git,755) %%LOGDIR%%