diff --git a/www/forgejo/Makefile b/www/forgejo/Makefile
index 214a695bbdf2..a23e09ec68d9 100644
--- a/www/forgejo/Makefile
+++ b/www/forgejo/Makefile
@@ -1,87 +1,89 @@
 PORTNAME=	forgejo
 DISTVERSIONPREFIX=	v
 DISTVERSION=	8.0.2
 CATEGORIES=	www
 MASTER_SITES=	https://codeberg.org/forgejo/forgejo/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
 DISTNAME=	forgejo-src-${DISTVERSION}
 
 MAINTAINER=	stb@lassitu.de
 COMMENT=	Compact self-hosted Git service
 WWW=		https://forgejo.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	git:devel/git
 
 USES=		cpe gmake go:1.22,no_targets
 USE_RC_SUBR=	forgejo
 
+CONFLICTS_INSTALL=	forgejo[0-79]*
+
 EXTRACT_AFTER_ARGS=	--strip-components 1
 SUB_FILES=	app.ini.sample pkg-message
 SUB_LIST=	GITUSER=${USERS}
 
 NO_WRKSUBDIR=	yes
 
 USERS=		git
 GROUPS=		git
 
 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"
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD
 DAEMONARGS=	-S -l \$${forgejo_facility} -s \$${forgejo_priority} -T \
 		\$${name}
 .else
 DAEMONARGS=	-f
 .endif
 
 SUB_LIST+=	DAEMONARGS="${DAEMONARGS}"
 
 SSP_UNSAFE=	true
 LDFLAGS+=	"'-X "code.gitea.io/gitea/modules/setting.CustomPath=${PREFIX}/etc/forgejo"'"
 LDFLAGS+=	"'-X "code.gitea.io/gitea/modules/setting.AppWorkPath=${PREFIX}/share/forgejo"'"
 MAKE_ARGS=	GOPATH=${WRKDIR} \
 		TAGS="${GO_TAGS}" \
 		GOFLAGS="-buildvcs=false"
 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
 # INSTALL_SCRIPT.
 	${INSTALL_SCRIPT} ${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}${DATADIR}
 	${MKDIR} ${STAGEDIR}/var/db/forgejo/data
 	${MKDIR} ${STAGEDIR}/var/db/forgejo/forgejo-repositories
 	${MKDIR} ${STAGEDIR}/var/log/forgejo
 
 do-install-BINDATA-off:
 	cd ${WRKSRC} && \
 		${COPYTREE_SHARE} "options public templates" ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/www/forgejo7/Makefile b/www/forgejo7/Makefile
index a923be71c492..7419c1d81513 100644
--- a/www/forgejo7/Makefile
+++ b/www/forgejo7/Makefile
@@ -1,87 +1,90 @@
 PORTNAME=	forgejo
 DISTVERSIONPREFIX=	v
-DISTVERSION=	7.0.4
+DISTVERSION=	7.0.8
 CATEGORIES=	www
 MASTER_SITES=	https://codeberg.org/forgejo/forgejo/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
+PKGNAMESUFFIX=	7
 DISTNAME=	forgejo-src-${DISTVERSION}
 
-MAINTAINER=	stb@lassitu.de
+MAINTAINER=	marko.cupac@mimar.rs
 COMMENT=	Compact self-hosted Git service
 WWW=		https://forgejo.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	git:devel/git
 
 USES=		cpe gmake go:1.22,no_targets
 USE_RC_SUBR=	forgejo
 
+CONFLICTS_INSTALL=	forgejo forgejo[0-689]*
+
 EXTRACT_AFTER_ARGS=	--strip-components 1
 SUB_FILES=	app.ini.sample pkg-message
 SUB_LIST=	GITUSER=${USERS}
 
 NO_WRKSUBDIR=	yes
 
 USERS=		git
 GROUPS=		git
 
 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"
 
 .include <bsd.port.options.mk>
 
 .if ${OPSYS} == FreeBSD
 DAEMONARGS=	-S -l \$${forgejo_facility} -s \$${forgejo_priority} -T \
 		\$${name}
 .else
 DAEMONARGS=	-f
 .endif
 
 SUB_LIST+=	DAEMONARGS="${DAEMONARGS}"
 
 SSP_UNSAFE=	true
 LDFLAGS+=	"'-X "code.gitea.io/gitea/modules/setting.CustomPath=${PREFIX}/etc/forgejo"'"
 LDFLAGS+=	"'-X "code.gitea.io/gitea/modules/setting.AppWorkPath=${PREFIX}/share/forgejo"'"
 MAKE_ARGS=	GOPATH=${WRKDIR} \
 		TAGS="${GO_TAGS}" \
 		GOFLAGS="-buildvcs=false"
 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
 # INSTALL_SCRIPT.
 	${INSTALL_SCRIPT} ${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}${DATADIR}
 	${MKDIR} ${STAGEDIR}/var/db/forgejo/data
 	${MKDIR} ${STAGEDIR}/var/db/forgejo/forgejo-repositories
 	${MKDIR} ${STAGEDIR}/var/log/forgejo
 
 do-install-BINDATA-off:
 	cd ${WRKSRC} && \
 		${COPYTREE_SHARE} "options public templates" ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/www/forgejo7/distinfo b/www/forgejo7/distinfo
index e60439031aae..32433e09899b 100644
--- a/www/forgejo7/distinfo
+++ b/www/forgejo7/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1718527772
-SHA256 (forgejo-src-7.0.4.tar.gz) = 881e55d92a4145238a8e7a39dd5c64d547c7629361005ded0393f33ec9e6bba4
-SIZE (forgejo-src-7.0.4.tar.gz) = 54935871
+TIMESTAMP = 1725437538
+SHA256 (forgejo-src-7.0.8.tar.gz) = 0c57d120842bfea9ee1f89747c6b0f48f90dfec279e65b31f82882ffcd6af88a
+SIZE (forgejo-src-7.0.8.tar.gz) = 53588043