diff --git a/www/forgejo15/Makefile b/www/forgejo15/Makefile
index 4c3259d5dc3b..6b798bb6a98f 100644
--- a/www/forgejo15/Makefile
+++ b/www/forgejo15/Makefile
@@ -1,96 +1,93 @@
 PORTNAME=	forgejo
 DISTVERSIONPREFIX=	v
 DISTVERSION=	15.0.1
 CATEGORIES=	www
 MASTER_SITES=	https://codeberg.org/forgejo/forgejo/releases/download/${DISTVERSIONFULL}/
 PKGNAMESUFFIX=	${PORTVERSION:C/([0-9]+).*/\1/}
 DISTNAME=	forgejo-src-${DISTVERSION}
 
 MAINTAINER=	des@FreeBSD.org
 COMMENT=	Compact self-hosted Git forge
 WWW=		https://forgejo.org/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	git:devel/git
 
 USES=		cpe gmake go:1.26+,no_targets
 USE_RC_SUBR=	forgejo
 
 PIE_UNSAFE=	yes
 
 CONFLICTS_INSTALL=	forgejo[0-9]*
 
 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} DBDIR=${DBDIR} LOGDIR=${LOGDIR}
 PLIST_SUB=	DBDIR=${DBDIR} LOGDIR=${LOGDIR}
 
 NO_WRKSUBDIR=	yes
 
 USERS=		git
 GROUPS=		git
 
 # If the BINDATA option is off, we will install assets into DATADIR
 # and this line ensures that they are included in the packing list.
 # Otherwise, assets are compiled into the binary, DATADIR remains
 # empty, and this line has no effect.
 PORTDATA=	*
 
 OPTIONS_DEFINE=		BINDATA GIT_LFS PAM SQLITE
 OPTIONS_DEFAULT=	BINDATA GIT_LFS PAM SQLITE
 OPTIONS_SUB=		yes
 
 BINDATA_DESC=	Build a single monolithic binary, with all assets included
 GIT_LFS_DESC=	Support for Git Large File Storage (LFS)
 PAM_DESC=	Enable support for PAM
 
 BINDATA_VARS=		GO_TAGS+=bindata
 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.StaticRootPath=${DATADIR}"'" \
 		"'-X "forgejo.org/modules/setting.AppWorkPath=${DBDIR}"'"
 MAKE_ARGS=	GOFLAGS="-buildvcs=false" \
 		GOPATH=${WRKDIR} \
 		TAGS="${GO_TAGS}"
 MAKE_JOBS_UNSAFE=	yes
 
 # The default build target builds both the frontend and the backend.
 # However, release tarballs include a prebuilt frontend, so save a
 # little time by explicitly building only the backend.
 ALL_TARGET=	backend
 
 # Go binaries are statically linked
 STRIP=		#
 
-DAEMONARGS=	-S -l \$${forgejo_facility} -s \$${forgejo_priority} -T \
-		\$${name}
-SUB_LIST+=	DAEMONARGS="${DAEMONARGS}"
 
 # The provided Makefile does not include an install target.
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gitea \
 		${STAGEDIR}${PREFIX}/sbin/forgejo
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/conf
 	${INSTALL_DATA} ${WRKDIR}/app.ini.sample \
 		${STAGEDIR}${ETCDIR}/conf/app.ini.sample
 	${INSTALL_DATA} ${WRKSRC}/custom/conf/app.example.ini \
 		${STAGEDIR}${ETCDIR}/conf/app.ini.defaults
 	${MKDIR} ${STAGEDIR}${DBDIR}/data
 	${MKDIR} ${STAGEDIR}${DBDIR}/forgejo-repositories
 	${MKDIR} ${STAGEDIR}${LOGDIR}
 
 # If the BINDATA option is off, install assets into DATADIR.
 do-install-BINDATA-off:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC} && \
 		${COPYTREE_SHARE} "options public templates" ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/www/forgejo15/files/forgejo.in b/www/forgejo15/files/forgejo.in
index 1d70da60532b..cb9bbf14bb8b 100644
--- a/www/forgejo15/files/forgejo.in
+++ b/www/forgejo15/files/forgejo.in
@@ -1,67 +1,68 @@
 #!/bin/sh
 
 # PROVIDE: forgejo
 # REQUIRE: DAEMON
 # KEYWORD: shutdown
 #
 # Add the following lines to /etc/rc.conf to enable forgejo:
 #
 #forgejo_enable="YES"
 
 . /etc/rc.subr
 
 name="forgejo"
 rcvar="forgejo_enable"
 
 load_rc_config $name
 
 : ${forgejo_user:="%%GITUSER%%"}
 : ${forgejo_enable:="NO"}
 : ${forgejo_configcheck_enable:="YES"}
 : ${forgejo_facility:="daemon"}
 : ${forgejo_priority:="info"}
 : ${forgejo_custom:="%%PREFIX%%/etc/${name}"}
 
 command="%%PREFIX%%/sbin/${name} web"
 procname="%%PREFIX%%/sbin/${name}"
 githome="$(eval echo ~${forgejo_user})"
 
 pidfile="/var/run/${name}.pid"
 
 start_cmd="${name}_start"
 start_precmd="${name}_prestart"
 
 forgejo_start() {
 	for d in %%DBDIR%% %%LOGDIR%%; do
 		if [ ! -e "$d" ]; then
 			mkdir "$d"
 			chown ${forgejo_user} "$d"
 		fi
 	done
-	/usr/sbin/daemon %%DAEMONARGS%% \
+	/usr/sbin/daemon \
+		-S -l ${forgejo_facility} -s ${forgejo_priority} -T ${name} \
 		-u ${forgejo_user} -p ${pidfile} \
 		/usr/bin/env -i \
 		"FORGEJO_CUSTOM=${forgejo_custom}" \
 		"HOME=${githome}" \
 		"PATH=%%PREFIX%%/bin:${PATH}" \
 		"USER=${forgejo_user}" \
 		$command
 }
 
 forgejo_prestart() {
 	if checkyesno forgejo_configcheck_enable; then
 		if ! errstr=$(/usr/bin/env -i \
 		    "FORGEJO_CUSTOM=${forgejo_custom}" \
 		    "HOME=${githome}" \
 		    "PATH=%%PREFIX%%/bin:${PATH}" \
 		    "USER=${forgejo_user}" \
 		    /usr/bin/su -m ${forgejo_user} -c \
 		    "%%PREFIX%%/sbin/${name} doctor check" 2>&1); then
 			rc=$?
 			echo "$errstr" >&2
 			return $rc
 		fi
 	fi
 }
 
 run_rc_command "$1"