diff --git a/www/varnish7/Makefile b/www/varnish7/Makefile
index 14e9dc42e141..f362ce89c236 100644
--- a/www/varnish7/Makefile
+++ b/www/varnish7/Makefile
@@ -1,54 +1,53 @@
 PORTNAME=	varnish
-DISTVERSION=	7.3.0
-PORTREVISION=	1
+DISTVERSION=	7.4.1
 CATEGORIES=	www
 MASTER_SITES=	https://varnish-cache.org/downloads/
 PKGNAMESUFFIX=	7
 
 MAINTAINER=	dbaio@FreeBSD.org
 COMMENT=	High-performance HTTP accelerator
 WWW=		https://varnish-cache.org/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	rst2man:textproc/py-docutils@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR}
 LIB_DEPENDS=	libpcre2-8.so:devel/pcre2
 
 USES=		cpe libedit libtool localbase ncurses pathfix \
 		pkgconfig python:build shebangfix tar:tgz
 CPE_VENDOR=	varnish-cache
 CPE_PRODUCT=	varnish_cache
 GNU_CONFIGURE=	yes
 SHEBANG_FILES=	lib/libvcc/*.py lib/libvsc/*.py
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	varnishd varnishlog varnishncsa
 CONFLICTS=	varnish4 varnish6
 
 SUB_FILES=	pkg-message
 
 USERS=		varnish varnishlog
 GROUPS=		varnish
 
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 TEST_ARGS=	TESTS_PARALLELISM=1
 
 CONFIGURE_ARGS=	--localstatedir=${PREFIX} --without-dot
 # Needed for clang 15 (#268814)
 CONFIGURE_ENV+=	ax_cv_check_cflags___Werror=no
 
 .if defined(NO_INET6) || defined(WITHOUT_INET6)
 BAD_TESTS=	r00832
 EXTRA_PATCHES=	${FILESDIR}/no-inet6.patch
 .endif
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 .if defined(BAD_TESTS)
 	${RM} ${BAD_TESTS:C|.+|${WRKSRC}/bin/varnishtest/tests/\0.vtc|}
 .endif
 
 .include <bsd.port.mk>
diff --git a/www/varnish7/distinfo b/www/varnish7/distinfo
index 1146fe0d83dd..47408604c814 100644
--- a/www/varnish7/distinfo
+++ b/www/varnish7/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1679820905
-SHA256 (varnish-7.3.0.tgz) = e2dbbb0ec270a90647c386866e6e226993aed46e48de751a72bb819737f14ae7
-SIZE (varnish-7.3.0.tgz) = 3938449
+TIMESTAMP = 1696208682
+SHA256 (varnish-7.4.1.tgz) = 874d837aaf49b8f2718cb60b8c8c7900e9ea10c264f218c88cd672d596f4b89f
+SIZE (varnish-7.4.1.tgz) = 3970921
diff --git a/www/varnish7/files/patch-bin_varnishd_http2_cache__http2__hpack.c b/www/varnish7/files/patch-bin_varnishd_http2_cache__http2__hpack.c
deleted file mode 100644
index 5c3310815192..000000000000
--- a/www/varnish7/files/patch-bin_varnishd_http2_cache__http2__hpack.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- bin/varnishd/http2/cache_http2_hpack.c.orig	2023-03-15 08:52:02 UTC
-+++ bin/varnishd/http2/cache_http2_hpack.c
-@@ -135,10 +135,9 @@ h2h_addhdr(struct http *hp, char *b, size_t namelen, s
- 			n = HTTP_HDR_URL;
- 			disallow_empty = 1;
- 
--			// rfc7540,l,3060,3071
--			if (((len > 0 && *b != '/') ||
--			    (len > 1 && *(b+1) == '/')) &&
--			    (strncmp(b, "*", len) != 0)) {
-+			// rfc9113,l,2693,2705
-+			if (len > 0 && *b != '/' &&
-+			    strncmp(b, "*", len) != 0) {
- 				VSLb(hp->vsl, SLT_BogoHeader,
- 				    "Illegal :path pseudo-header %.*s",
- 				    (int)len, b);
diff --git a/www/varnish7/files/pkg-message.in b/www/varnish7/files/pkg-message.in
index 735801e03c39..369014d32215 100644
--- a/www/varnish7/files/pkg-message.in
+++ b/www/varnish7/files/pkg-message.in
@@ -1,26 +1,39 @@
 [
 {
 	message: <<EOM
 For information about updating your current Varnish deployment to the new
 version, see Upgrading to Varnish 7.2:
   https://varnish-cache.org/docs/7.2/whats-new/upgrading-7.2.html
 
 For the complete release information, see the Varnish Cache 7.2.0 release page:
   https://varnish-cache.org/releases/rel7.2.0.html
 EOM
 	type: upgrade
 	maximum_version: "7.2.0"
 }
 {
 	message: <<EOM
 For information about updating your current Varnish deployment to the new
 version, see Upgrading to Varnish 7.3:
   https://varnish-cache.org/docs/7.3/whats-new/upgrading-7.3.html
 
 For the complete release information, see the Varnish Cache 7.3.0 release page:
   https://varnish-cache.org/releases/rel7.3.0.html
 EOM
 	type: upgrade
 	maximum_version: "7.3.0"
 }
+{
+	message: <<EOM
+For information about updating your current Varnish deployment to the new
+version, see Upgrading to Varnish 7.4:
+  https://varnish-cache.org/docs/7.4/whats-new/upgrading-7.4.html
+
+For the complete release information, see the Varnish Cache 7.4.X release pages:
+  https://varnish-cache.org/releases/rel7.4.0.html
+  https://varnish-cache.org/releases/rel7.4.1.html
+EOM
+	type: upgrade
+	maximum_version: "7.4.1"
+}
 ]
diff --git a/www/varnish7/pkg-descr b/www/varnish7/pkg-descr
index 4eb34e28d0e8..f9fe81558771 100644
--- a/www/varnish7/pkg-descr
+++ b/www/varnish7/pkg-descr
@@ -1,10 +1,10 @@
 This is the Varnish high-performance HTTP accelerator.
 
 Documentation and additional information about Varnish is available on
-http://varnish-cache.org/docs/index.html
+https://varnish-cache.org/docs/index.html
 
 Technical questions about Varnish and this release should be addressed
 to <varnish-dev@varnish-cache.org>
 
 Questions about commercial support and services related to Varnish
 can be directed here: https://www.varnish-software.com/contact-us/
diff --git a/www/varnish7/pkg-plist b/www/varnish7/pkg-plist
index 504e25257693..22080ba4ceb2 100644
--- a/www/varnish7/pkg-plist
+++ b/www/varnish7/pkg-plist
@@ -1,139 +1,150 @@
 bin/varnishadm
 bin/varnishhist
 bin/varnishlog
 bin/varnishncsa
 bin/varnishstat
 bin/varnishstat_help_gen
 bin/varnishtest
 bin/varnishtop
 include/varnish/cache/cache_backend.h
 include/varnish/cache/cache_director.h
 include/varnish/cache/cache_filter.h
 include/varnish/cache/cache_varnishd.h
 include/varnish/cache/cache.h
 include/varnish/common/common_param.h
 include/varnish/miniobj.h
 include/varnish/tbl/acct_fields_bereq.h
 include/varnish/tbl/acct_fields_req.h
 include/varnish/tbl/backend_poll.h
 include/varnish/tbl/ban_arg_oper.h
 include/varnish/tbl/ban_oper.h
 include/varnish/tbl/ban_vars.h
 include/varnish/tbl/bereq_flags.h
 include/varnish/tbl/beresp_flags.h
 include/varnish/tbl/boc_state.h
 include/varnish/tbl/body_status.h
 include/varnish/tbl/cli_cmds.h
 include/varnish/tbl/debug_bits.h
 include/varnish/tbl/experimental_bits.h
 include/varnish/tbl/feature_bits.h
 include/varnish/tbl/h2_error.h
 include/varnish/tbl/h2_frames.h
 include/varnish/tbl/h2_settings.h
 include/varnish/tbl/h2_stream.h
 include/varnish/tbl/htc.h
 include/varnish/tbl/http_headers.h
 include/varnish/tbl/http_response.h
 include/varnish/tbl/locks.h
 include/varnish/tbl/obj_attr.h
 include/varnish/tbl/oc_exp_flags.h
 include/varnish/tbl/oc_flags.h
 include/varnish/tbl/params.h
 include/varnish/tbl/req_bereq_flags.h
 include/varnish/tbl/req_flags.h
 include/varnish/tbl/sess_attr.h
 include/varnish/tbl/sess_close.h
 include/varnish/tbl/symbol_kind.h
+include/varnish/tbl/vcl_context.h
 include/varnish/tbl/vcc_feature_bits.h
 include/varnish/tbl/vcl_returns.h
 include/varnish/tbl/vcl_states.h
 include/varnish/tbl/vhd_fsm_funcs.h
 include/varnish/tbl/vhd_fsm.h
 include/varnish/tbl/vhd_return.h
 include/varnish/tbl/vhp_huffman.h
 include/varnish/tbl/vhp_static.h
 include/varnish/tbl/vrt_stv_var.h
 include/varnish/tbl/vsc_levels.h
 include/varnish/tbl/vsig_list.h
 include/varnish/tbl/vsl_tags_http.h
 include/varnish/tbl/vsl_tags.h
 include/varnish/tbl/waiters.h
 include/varnish/vapi/vapi_options.h
 include/varnish/vapi/voptget.h
 include/varnish/vapi/vsc.h
 include/varnish/vapi/vsig.h
 include/varnish/vapi/vsl_int.h
 include/varnish/vapi/vsl.h
 include/varnish/vapi/vsm.h
 include/varnish/vas.h
 include/varnish/vav.h
 include/varnish/vbh.h
 include/varnish/vbm.h
 include/varnish/vcl.h
 include/varnish/vcli.h
 include/varnish/vcs.h
 include/varnish/vdef.h
 include/varnish/vmod_abi.h
 include/varnish/vnum.h
 include/varnish/vqueue.h
 include/varnish/vre.h
 include/varnish/vre_pcre2.h
 include/varnish/vrnd.h
 include/varnish/vrt_obj.h
 include/varnish/vrt.h
 include/varnish/vsa.h
 include/varnish/vsb.h
 include/varnish/vsha256.h
 include/varnish/vtcp.h
+include/varnish/vte.h
 include/varnish/vtim.h
 include/varnish/vtree.h
 include/varnish/vut_options.h
 include/varnish/vut.h
 include/varnish/waiter/waiter.h
 lib/libvarnishapi.so
 lib/libvarnishapi.so.3
-lib/libvarnishapi.so.3.0.0
+lib/libvarnishapi.so.3.1.0
 lib/varnish/vmods/libvmod_blob.so
 lib/varnish/vmods/libvmod_cookie.so
 lib/varnish/vmods/libvmod_debug.so
 lib/varnish/vmods/libvmod_directors.so
 lib/varnish/vmods/libvmod_proxy.so
 lib/varnish/vmods/libvmod_purge.so
 lib/varnish/vmods/libvmod_std.so
 lib/varnish/vmods/libvmod_unix.so
 lib/varnish/vmods/libvmod_vtc.so
 libdata/pkgconfig/varnishapi.pc
 man/man1/varnishadm.1.gz
 man/man1/varnishd.1.gz
 man/man1/varnishhist.1.gz
 man/man1/varnishlog.1.gz
 man/man1/varnishncsa.1.gz
 man/man1/varnishstat.1.gz
 man/man1/varnishtest.1.gz
 man/man1/varnishtop.1.gz
 man/man3/vmod_blob.3.gz
 man/man3/vmod_cookie.3.gz
 man/man3/vmod_directors.3.gz
 man/man3/vmod_proxy.3.gz
 man/man3/vmod_purge.3.gz
 man/man3/vmod_std.3.gz
 man/man3/vmod_unix.3.gz
 man/man3/vmod_vtc.3.gz
 man/man7/varnish-cli.7.gz
 man/man7/varnish-counters.7.gz
 man/man7/vcl-backend.7.gz
 man/man7/vcl-probe.7.gz
+man/man7/vcl-step.7.gz
 man/man7/vcl-var.7.gz
 man/man7/vcl.7.gz
 man/man7/vsl-query.7.gz
 man/man7/vsl.7.gz
 man/man7/vtc.7.gz
 sbin/varnishd
 share/aclocal/varnish-legacy.m4
 share/aclocal/varnish.m4
 %%PORTDOCS%%%%DOCSDIR%%/builtin.vcl
 %%PORTDOCS%%%%DOCSDIR%%/example.vcl
+%%DATADIR%%/vcc/vmod_blob.vcc
+%%DATADIR%%/vcc/vmod_cookie.vcc
+%%DATADIR%%/vcc/vmod_directors.vcc
+%%DATADIR%%/vcc/vmod_proxy.vcc
+%%DATADIR%%/vcc/vmod_purge.vcc
+%%DATADIR%%/vcc/vmod_std.vcc
+%%DATADIR%%/vcc/vmod_unix.vcc
+%%DATADIR%%/vcc/vmod_vtc.vcc
 %%DATADIR%%/vcl/devicedetect.vcl
 %%DATADIR%%/vmodtool.py
 %%DATADIR%%/vsctool.py
 @dir varnish