git: 20e7eeb66417 - main - Mk: unregister expired Varnish 4, bump default to 6.

The branch main has been updated by rene:

URL: https://cgit.FreeBSD.org/ports/commit/?id=20e7eeb66417261bf1346f6d67be82628ff213ca

commit 20e7eeb66417261bf1346f6d67be82628ff213ca
Author:     Rene Ladan <rene@FreeBSD.org>
AuthorDate: 2022-12-31 01:23:56 +0000
Commit:     Rene Ladan <rene@FreeBSD.org>
CommitDate: 2022-12-31 01:23:56 +0000

    Mk: unregister expired Varnish 4, bump default to 6.
---
 Mk/Uses/varnish.mk         | 6 ++----
 Mk/bsd.default-versions.mk | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/Mk/Uses/varnish.mk b/Mk/Uses/varnish.mk
index 495aa1161446..96948774f19f 100644
--- a/Mk/Uses/varnish.mk
+++ b/Mk/Uses/varnish.mk
@@ -2,7 +2,7 @@
 #
 # Feature:      varnish
 # Usage:        USES=varnish
-# Valid ARGS:   4, 6, 7, run
+# Valid ARGS:   6, 7, run
 #
 # MAINTAINER: ports@FreeBSD.org
 
@@ -11,9 +11,7 @@ _INCLUDE_USES_VARNISH_MK=    yes
 
 VARNISH_VERSION=	${VARNISH_DEFAULT}
 
-.  if ${varnish_ARGS:M4}
-VARNISH_VERSION=	4
-.  elif ${varnish_ARGS:M6}
+.  if ${varnish_ARGS:M6}
 VARNISH_VERSION=	6
 .  elif ${varnish_ARGS:M7}
 VARNISH_VERSION=	7
diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index 404eb375a39f..03c358d3ea3f 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -171,6 +171,6 @@ SSL_DEFAULT?=	base
 # Possible values: 8.5, 8.6, 8.7
 TCLTK_DEFAULT?=		8.6
 # Possible values: 4, 6, 7
-VARNISH_DEFAULT?=	4
+VARNISH_DEFAULT?=	6
 
 .endif