diff --git a/devel/viewvc-devel/Makefile b/devel/viewvc-devel/Makefile
index e071c145016c..d168df9463e7 100644
--- a/devel/viewvc-devel/Makefile
+++ b/devel/viewvc-devel/Makefile
@@ -1,79 +1,82 @@
 PORTNAME=	viewvc
-DISTVERSION=	1.3.0-20251023
+DISTVERSION=	1.4.0-20260528
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	dvl@FreeBSD.org
 COMMENT=	Web-based Version Control Repository Browsing
 WWW=		https://www.viewvc.org/
 
 LICENSE=	BSD2CLAUSE
 
 USES=		cpe python
 USE_PYTHON=	flavors
 USE_GITHUB=	yes
 GH_ACCOUNT=	viewvc
-GH_TAGNAME=	f743be3d4f0aeee2ca7ae05e24e17a6620b5c06e
+GH_TAGNAME=	f9e5718b4ee1d359cc01ef82e0f04ec7d2bd872f
 USE_RC_SUBR=	viewvc
 
 NO_BUILD=		yes
 NO_OPTIONS_SORT=	yes
 OPTIONS_DEFINE=		APMOD HTPASSWD SUBVERSION WEBSRV
 OPTIONS_DEFAULT=	APACHE SUBVERSION WEBSRV
 
 OPTIONS_SINGLE=		APMOD WEBSRV
 OPTIONS_SINGLE_WEBSRV=	APACHE LIGHTTPD
 OPTIONS_SINGLE_APMOD=	MODWSGI
 
-WEBSRV_DESC=		Enable web server support
-APMOD_DESC=		depend on Apache module
+WEBSRV_DESC=	Enable web server support
+APMOD_DESC=	depend on Apache module
 
-HTPASSWD_DESC=		Use htpasswd feature on standalone server
-MODWSGI_DESC=		Add mod_wsgi to the list of package dependencies
-APACHE_USES=		apache:run
+HTPASSWD_DESC=	Use htpasswd feature on standalone server
+MODWSGI_DESC=	Add mod_wsgi to the list of package dependencies
+APACHE_USES=	apache:run
 
 HTPASSWD_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}passlib>=1.7.0:security/py-passlib@${PY_FLAVOR}
 LIGHTTPD_RUN_DEPENDS=	lighttpd:www/lighttpd
 MODWSGI_RUN_DEPENDS=	${APACHE_PKGNAMEPREFIX}${PYTHON_PKGNAMEPREFIX}mod_wsgi>=4.4.13:www/mod_wsgi@${PY_FLAVOR}
 
 .if ${WITH_SUBVERSION_VER:U} == LTS
 SUBVERSION_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subversion-lts>=0:devel/py-subversion@${PY_FLAVOR}
 .else
 SUBVERSION_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}subversion>=0:devel/py-subversion@${PY_FLAVOR}
 .endif
 
-RUN_DEPENDS+=		${PYTHON_PKGNAMEPREFIX}pygments>=1.1:textproc/py-pygments@${PY_FLAVOR}
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}pygments>=1.1:textproc/py-pygments@${PY_FLAVOR}
 
-CONFLICTS_INSTALL=	viewvc-1.[12].[0-9]*
+CONFLICTS_INSTALL=	viewvc-1.[1-3].[0-9]*
 
 .include <bsd.port.options.mk>
 
 SUB_FILES=	pkg-message
-SUB_LIST=	PYTHON_CMD=${PYTHON_CMD} \
-		ECHO=${ECHO} EGREP=${EGREP} TOUCH=${TOUCH} \
-		CHOWN=${CHOWN} RM=${RM:Q}
+SUB_LIST=	CHOWN=${CHOWN} \
+		ECHO=${ECHO} \
+		EGREP=${EGREP} \
+		PYTHON_CMD=${PYTHON_CMD} \
+		RM=${RM:Q} \
+		TOUCH=${TOUCH}
 
 pre-everything::
 .if ${PORT_OPTIONS:MAPMOD} && !${PORT_OPTIONS:MAPACHE}
-IGNORE=	apache module needs Apache server, please re-run 'make config' then choose WEBSRV and APACHE
+IGNORE=		apache module needs Apache server, please re-run 'make config' then choose WEBSRV and APACHE
 .endif
 
 post-patch:
 .for i in cvsgraph.conf mimetypes.conf viewvc.conf
 	${MV} ${WRKSRC}/conf/${i}.dist ${WRKSRC}/conf/${i}.sample
 	${REINPLACE_CMD} -e '/"${i}"/d' ${WRKSRC}/viewvc-install
 .endfor
 	${REINPLACE_CMD} -e 's/conf.dist/conf.sample/g' \
 		${WRKSRC}/viewvc-install \
 		${WRKSRC}/bin/standalone.py
 # to much files, use own shebangfix
 	${FIND} ${WRKSRC} -type f | ${GREP} -v -e 'png' -e 'images' \
 		| ${XARGS} ${SED} -i '' \
 		-e '1s|^\#![[:space:]]*/usr/bin/env python|\#!${PYTHON_CMD}|' \
 		-e '1s|^\#![[:space:]]*/usr/bin/python|\#!${PYTHON_CMD}|'
 
 do-install:
 	@(cd ${WRKSRC} && ${PYTHON_CMD} viewvc-install --prefix=${PREFIX}/${PORTNAME} --destdir="${STAGEDIR}" --clean-mode=false)
 
 .include <bsd.port.mk>
diff --git a/devel/viewvc-devel/distinfo b/devel/viewvc-devel/distinfo
index ae025f52ea82..dac5747e857e 100644
--- a/devel/viewvc-devel/distinfo
+++ b/devel/viewvc-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1775042322
-SHA256 (viewvc-viewvc-1.3.0-20251023-f743be3d4f0aeee2ca7ae05e24e17a6620b5c06e_GH0.tar.gz) = 631638e3bb858a88626382c1b1bd1201dc9edd256b67497e684638a05472e8b0
-SIZE (viewvc-viewvc-1.3.0-20251023-f743be3d4f0aeee2ca7ae05e24e17a6620b5c06e_GH0.tar.gz) = 346634
+TIMESTAMP = 1780159284
+SHA256 (viewvc-viewvc-1.4.0-20260528-f9e5718b4ee1d359cc01ef82e0f04ec7d2bd872f_GH0.tar.gz) = 25f3bc581c19b368ebdfa6801a0e0af9c6ec1c43f86115b3a2112097203445a0
+SIZE (viewvc-viewvc-1.4.0-20260528-f9e5718b4ee1d359cc01ef82e0f04ec7d2bd872f_GH0.tar.gz) = 349896
diff --git a/devel/viewvc-devel/files/patch-conf_viewvc.conf.dist b/devel/viewvc-devel/files/patch-conf_viewvc.conf.dist
deleted file mode 100644
index 9ff0f708da9d..000000000000
--- a/devel/viewvc-devel/files/patch-conf_viewvc.conf.dist
+++ /dev/null
@@ -1,13 +0,0 @@
---- conf/viewvc.conf.dist.orig	2026-04-01 13:33:42 UTC
-+++ conf/viewvc.conf.dist
-@@ -335,6 +335,10 @@
- ## diff: Location of the GNU diff program, used for showing file
- ## version differences.
- ##
-+## If you want to use side-by-side diff or full colored diff on FreeBSD 12
-+## or later, you need to install GNU diff via diffutils packge and to
-+## specify it here.
-+##
- ## Example:
- ## diff = /usr/bin/diff
- ##