varnish: update to 7.0.1

New in varnish 7:
- switch from PCRE to PCRE2
- RFC8941 Structured Fields
- increased default values for memory settings
- bit flags in ACLs

4 files changed, 12 insertions, 11 deletions

diff --git a/www/varnish/Makefile b/www/varnish/Makefile
index c40ab85e57f..329e2debc6d 100644
--- a/www/varnish/Makefile
+++ b/www/varnish/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2021/07/19 12:47:31 tnn Exp $
+# $NetBSD: Makefile,v 1.33 2022/01/09 02:55:08 tnn Exp $
 
-DISTNAME=	varnish-6.6.1
+DISTNAME=	varnish-7.0.1
 CATEGORIES=	www
 MASTER_SITES=	https://varnish-cache.org/_downloads/
 EXTRACT_SUFX=	.tgz
@@ -76,7 +76,7 @@ RCD_SCRIPTS=		varnishd varnishlog varnishncsa
 
 TEST_TARGET=		check
 
-.include "../../devel/pcre/buildlink3.mk"
+.include "../../devel/pcre2/buildlink3.mk"
 .include "../../devel/libexecinfo/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../lang/python/versioned_dependencies.mk"
diff --git a/www/varnish/PLIST b/www/varnish/PLIST
index 3272a6a648e..ad32b1dadfa 100644
--- a/www/varnish/PLIST
+++ b/www/varnish/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2021/06/25 12:21:08 tnn Exp $
+@comment $NetBSD: PLIST,v 1.11 2022/01/09 02:55:08 tnn Exp $
 bin/varnishadm
 bin/varnishhist
 bin/varnishlog
@@ -74,6 +74,7 @@ include/varnish/vdef.h
 include/varnish/vmod_abi.h
 include/varnish/vqueue.h
 include/varnish/vre.h
+include/varnish/vre_pcre2.h
 include/varnish/vrnd.h
 include/varnish/vrt.h
 include/varnish/vrt_obj.h
diff --git a/www/varnish/buildlink3.mk b/www/varnish/buildlink3.mk
index 7d4d4571637..413a53aa32d 100644
--- a/www/varnish/buildlink3.mk
+++ b/www/varnish/buildlink3.mk
@@ -1,15 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.2 2021/06/25 12:21:08 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2022/01/09 02:55:08 tnn Exp $
 
 BUILDLINK_TREE+=	varnish
 
 .if !defined(VARNISH_BUILDLINK3_MK)
 VARNISH_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.varnish+=	varnish>=6.6.0
+BUILDLINK_API_DEPENDS.varnish+=	varnish>=7.0.1
 BUILDLINK_PKGSRCDIR.varnish?=	../../www/varnish
 
 .include "../../devel/libexecinfo/buildlink3.mk"
-.include "../../devel/pcre/buildlink3.mk"
+.include "../../devel/pcre2/buildlink3.mk"
 
 .endif	# VARNISH_BUILDLINK3_MK
 
diff --git a/www/varnish/distinfo b/www/varnish/distinfo
index bdbb40ed192..f1b1730dfa7 100644
--- a/www/varnish/distinfo
+++ b/www/varnish/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.18 2021/10/26 11:31:12 nia Exp $
+$NetBSD: distinfo,v 1.19 2022/01/09 02:55:08 tnn Exp $
 
-BLAKE2s (varnish-6.6.1.tgz) = 3e1e87379c7509ac43143d2699b63339b43066c9c7f125ad917abe2cd078b983
-SHA512 (varnish-6.6.1.tgz) = af3ee1743af2ede2d3efbb73e5aa9b42c7bbd5f86163ec338c8afd1989c3e51ff3e1b40bed6b72224b5d339a74f22d6e5f3c3faf2fedee8ab4715307ed5d871b
-Size (varnish-6.6.1.tgz) = 3518308 bytes
+BLAKE2s (varnish-7.0.1.tgz) = f09454c68b5c33c98b3718ec183ef18f55072a2255f74dd0709a48812425198b
+SHA512 (varnish-7.0.1.tgz) = 7541d50b03a113f0a13660d459cc4c2eb45d57fb19380ab56a5413a4e5d702f9c0856585f09aeea6084a239ad8c69017af3805a864540b4697e0eac29f00b408
+Size (varnish-7.0.1.tgz) = 3712763 bytes
 SHA1 (patch-bin_varnishd_cache_cache__panic.c) = cf2b9c1f2c3ba15c7e20baca3c9af607a3e1fa82
 SHA1 (patch-etc_Makefile.in) = f4407cad5f9f6c6402ab3b7fce0e1577d70b36be
 SHA1 (patch-include_tbl_params.h) = 7a52ef6a98ec29409c7284876adffdb5c53facff