cleanup: Remove expired ports:

2022-12-31 www/varnish4: End of life upstream, users are recommended to upgrade to 6.x or higher

12 files changed, 1 insertions, 494 deletions

diff --git a/MOVED b/MOVED
index c3e55a482d38..fddbea019219 100644
--- a/MOVED
+++ b/MOVED
@@ -17718,3 +17718,4 @@ games/scorched3d||2022-12-31|Has expired: Abandoned project and use deprecated w
 comms/hylafax||2022-12-31|Has expired: dead upstream, someone port hylafax+ from sourceforge.net instead
 comms/tkhylafax||2022-12-31|Has expired: Depends on expired comms/hylafax
 lang/ponyc||2022-12-31|Has expired: Very outdated and unsupported upstream, depends on end of life devel/llvm70
+www/varnish4|www/varnish6|2022-12-31|Has expired: End of life upstream, users are recommended to upgrade to 6.x or higher
diff --git a/www/Makefile b/www/Makefile
index a05b55b8b6fe..03f35d7bfd2f 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -2341,7 +2341,6 @@
     SUBDIR += varnish-libvmod-redis
     SUBDIR += varnish-modules
     SUBDIR += varnish-nagios
-    SUBDIR += varnish4
     SUBDIR += varnish6
     SUBDIR += varnish7
     SUBDIR += varnish_exporter
diff --git a/www/varnish4/Makefile b/www/varnish4/Makefile
deleted file mode 100644
index 6087afc57e57..000000000000
--- a/www/varnish4/Makefile
+++ /dev/null
@@ -1,57 +0,0 @@
-PORTNAME=	varnish
-PORTVERSION=	4.1.11
-DISTVERSIONPREFIX=	varnish-
-PORTREVISION=	1
-CATEGORIES=	www
-PKGNAMESUFFIX=	4
-
-MAINTAINER=	feld@FreeBSD.org
-COMMENT=	High-performance HTTP accelerator
-WWW=		https://www.varnish-cache.org/
-
-LICENSE=	BSD2CLAUSE
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-DEPRECATED=	End of life upstream, users are recommended to upgrade to 6.x or higher
-EXPIRATION_DATE=2022-12-31
-
-BUILD_DEPENDS=	rst2man:textproc/py-docutils
-LIB_DEPENDS=	libpcre.so:devel/pcre
-
-CONFLICTS=	varnish6 varnish7
-
-USES=		autoreconf:2.69 cpe gmake libedit libtool ncurses pathfix \
-		pkgconfig python:build readline shebangfix
-SHEBANG_FILES=	lib/libvcc/vmodtool.py
-CPE_VENDOR=	varnish-cache
-CPE_PRODUCT=	varnish_cache
-CFLAGS+=	-I${LOCALBASE}/include -Wno-error
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--localstatedir=${PREFIX} --enable-tests
-USE_LDCONFIG=	yes
-INSTALL_TARGET=	install-strip
-TEST_TARGET=	check  # some tests fail
-TEST_ARGS=	TESTS_PARALLELISM=1
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	varnishcache
-GH_PROJECT=	varnish-cache
-
-USERS=		varnish varnishlog
-GROUPS=		varnish
-
-USE_RC_SUBR=	varnishd varnishlog varnishncsa
-SUB_FILES=	pkg-message
-.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/varnish4/distinfo b/www/varnish4/distinfo
deleted file mode 100644
index 241af5597e21..000000000000
--- a/www/varnish4/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1589821255
-SHA256 (varnishcache-varnish-cache-varnish-4.1.11_GH0.tar.gz) = eb2ad84cc1fb8d2a0e80cb4d9c43b1b79cd56b839440258de9f3d10854564cab
-SIZE (varnishcache-varnish-cache-varnish-4.1.11_GH0.tar.gz) = 956466
diff --git a/www/varnish4/files/no-inet6.patch b/www/varnish4/files/no-inet6.patch
deleted file mode 100644
index 56d16e63b100..000000000000
--- a/www/varnish4/files/no-inet6.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- bin/varnishtest/tests/c00005.vtc	2012-08-20 05:20:39.000000000 -0400
-+++ bin/varnishtest/tests/c00005.vtc	2012-09-26 12:09:59.000000000 -0400
-@@ -32,5 +32,4 @@
- 		! "localhost";
- 		"0.0.0.0" / 0;
--		"::" / 0;
- 	}
- 
diff --git a/www/varnish4/files/patch-lib_libvmod__std_vmod__std__conversions.c b/www/varnish4/files/patch-lib_libvmod__std_vmod__std__conversions.c
deleted file mode 100644
index 69bb4ada710f..000000000000
--- a/www/varnish4/files/patch-lib_libvmod__std_vmod__std__conversions.c
+++ /dev/null
@@ -1,42 +0,0 @@
---- lib/libvmod_std/vmod_std_conversions.c.orig	2019-02-11 14:06:27 UTC
-+++ lib/libvmod_std/vmod_std_conversions.c
-@@ -45,6 +45,21 @@
- #include "vtim.h"
- #include "vcc_if.h"
- 
-+/*
-+ * technically, as our VCL_INT is int64_t, its limits are INT64_MIN/INT64_MAX.
-+ *
-+ * Yet, for conversions, we use VNUMpfx with a double intermediate, so above
-+ * 2^53 we see rounding errors. In order to catch a potential floor rounding
-+ * error, we make our limit 2^53-1
-+ *
-+ * Ref: https://stackoverflow.com/a/1848762
-+ */
-+#define VCL_INT_MAX ((INT64_C(1)<<53)-1)
-+#define VCL_INT_MIN (-VCL_INT_MAX)
-+
-+#define VCL_BYTES_MAX VCL_INT_MAX
-+#define VCL_BYTES_MIN 0
-+
- VCL_DURATION __match_proto__(td_std_duration)
- vmod_duration(VRT_CTX, VCL_STRING p, VCL_DURATION d)
- {
-@@ -195,7 +210,7 @@ vmod_real2integer(VRT_CTX, VCL_REAL r, VCL_INT i)
- 	if (!isfinite(r))
- 		return (i);
- 	r = round(r);
--	if (r > LONG_MAX || r < LONG_MIN)
-+	if (r > VCL_INT_MAX || r < VCL_INT_MIN)
- 		return(i);
- 	return ((long)r);
- }
-@@ -219,7 +234,7 @@ vmod_time2integer(VRT_CTX, VCL_TIME t, VCL_INT i)
- 	if (!isfinite(t))
- 		return (i);
- 	t = round(t);
--	if (t > LONG_MAX || t < LONG_MIN)
-+	if (t > VCL_INT_MAX || t < VCL_INT_MIN)
- 		return(i);
- 	return ((long)t);
- }
diff --git a/www/varnish4/files/pkg-message.in b/www/varnish4/files/pkg-message.in
deleted file mode 100644
index 8a90ea1f5c63..000000000000
--- a/www/varnish4/files/pkg-message.in
+++ /dev/null
@@ -1,18 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-QUICK-START GUIDE
-
-It's two in the morning and someone posted a link to your website on
-slashdot.  Don't panic, it takes only a minute to set up Varnish in
-front of your web server:
-
-1) Install Varnish
-2) Reconfigure your web server to listen on localhost:8080
-3) echo 'varnishd_enable="YES"' >>/etc/rc.conf
-4) %%PREFIX%%/etc/rc.d/varnishd start
-
-Refer to the documentation for more advanced configuration.
-EOM
-}
-]
diff --git a/www/varnish4/files/varnishd.in b/www/varnish4/files/varnishd.in
deleted file mode 100644
index 53ba7d80c4da..000000000000
--- a/www/varnish4/files/varnishd.in
+++ /dev/null
@@ -1,125 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: varnishd
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-
-#
-# Add the following line to /etc/rc.conf to enable varnishd:
-#
-# varnishd_enable="YES"
-#
-# Configuration variables and their default values:
-#
-# varnishd_pidfile - full path to the PID file.
-#	default: "/var/run/varnishd.pid"
-#
-# varnishd_listen - address and port at which varnishd will listen for
-#	client requests.
-#	default: ":80"
-#
-# varnishd_admin - address and port at which varnishd will listen for
-#	administrative commands.
-#	default: "localhost:81"
-#
-# varnishd_backend - address of the backend server.
-#	default: "localhost:8080"
-#
-# varnishd_config - name of the varnishd config file.
-#	default: unset.
-#
-# varnishd_hash - hash algorithm
-#       default: "critbit"
-#
-# varnishd_storage - storage method and parameters.
-#	default: "file,/tmp,100M"
-#
-# varnishd_jailuser - unprivileged user for the child process.
-#	default: "varnish"
-#
-# varnishd_flags - complete command line arguments.
-#	default if varnishd_config is unset: "-j unix,user=${varnishd_jailuser} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_hash} ${varnishd_extra_flags}"
-#	default if varnishd_config is set: "-j unix,user=${varnishd_jailuser} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_hash} ${varnishd_extra_flags}"
-#
-# See varnishd(1) for a detailed overview of command-line options.
-#
-
-. /etc/rc.subr
-
-name=varnishd
-rcvar=varnishd_enable
-
-load_rc_config ${name}
-
-: ${varnishd_enable:=NO}
-: ${varnishd_pidfile=/var/run/${name}.pid}
-: ${varnishd_listen=:80}
-: ${varnishd_admin=localhost:81}
-: ${varnishd_backend=localhost:8080}
-: ${varnishd_storage=file,/tmp,100M}
-: ${varnishd_hash=critbit}
-: ${varnishd_jailuser=varnish}
-
-command="%%PREFIX%%/sbin/${name}"
-pidfile="${varnishd_pidfile}"
-configtest_cmd="varnishd_checkconfig"
-reload_cmd="varnishd_reload"
-restart_precmd="varnishd_checkconfig"
-start_precmd="varnishd_precmd"
-extra_commands="status reload configtest"
-
-if [ -n "${varnishd_config}" ] ; then
-	: ${varnishd_flags:="-j unix,user=${varnishd_jailuser} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -f ${varnishd_config} -s ${varnishd_storage} -h ${varnishd_hash} ${varnishd_extra_flags}"}
-else
-	: ${varnishd_flags:="-j unix,user=${varnishd_jailuser} -P ${varnishd_pidfile} -a ${varnishd_listen} -T ${varnishd_admin} -b ${varnishd_backend} -s ${varnishd_storage} -h ${varnishd_hash} ${varnishd_extra_flags}"}
-fi
-
-varnishd_checkconfig()
-{
-	if [ -z "${varnishd_config}" ]; then
-		echo "${name}: nothing to check, no configuration file defined, builtin VCL used"
-	else
-		echo "Performing sanity check on ${name} configuration:"
-		if eval ${command} -C -f "${varnishd_config}" 2> /dev/null ; then
-			echo "${name}: the configuration file ${varnishd_config} syntax is ok"
-		else
-			err 1 "${name}: the configuration file ${varnishd_config} syntax is NOT ok"
-		fi
-	fi
-}
-
-# Adapted from work done by Ingvar Hagelund <ingvar@redpill-linpro.com> (see redhat/varnish_reload_vcl)
-varnishd_reload()
-{
-	local _current_config_name _new_config_name _varnishadm_cmd
-
-	if [ -z "${varnishd_config}" ]; then
-		echo "${name}: nothing to reload, no configuration file defined, builtin VCL used"
-	else
-		_new_config_name="rc.d_reloaded@$(date +%Y%m%d%H%M%S)"
-		_varnishadm_cmd="%%PREFIX%%/bin/varnishadm ${varnish_cli_flags}"
-		if ! eval ${_varnishadm_cmd} vcl.list > /dev/null; then
-			err 1 "${name}: can't connect to varnishadm"
-		fi
-		_current_config_name=$(${_varnishadm_cmd} vcl.list | awk ' /^active/ { print $3 } ')
-		if ! eval ${_varnishadm_cmd} vcl.load ${_new_config_name} ${varnishd_config} > /dev/null; then
-			err 1 "${name}: vcl.load failed, you're still using previous rules (${_current_config_name})"
-		fi
-		if eval ${_varnishadm_cmd} vcl.use ${_new_config_name} > /dev/null; then
-			echo "VCL file \"${varnishd_config}\" has been successfully loaded as \"${_new_config_name}\""
-			echo "To remove previous loaded configurations, you should run \"${_varnishadm_cmd} vcl.discard <configname>\" by yourself"
-		else
-			err 1 "${name}: vcl.use failed, you're still using previous rules (${_current_config_name})"
-		fi
-	fi
-
-	return 0
-}
-
-varnishd_precmd()
-{
-	# Check config before starting
-	varnishd_checkconfig
-}
-
-run_rc_command "$1"
diff --git a/www/varnish4/files/varnishlog.in b/www/varnish4/files/varnishlog.in
deleted file mode 100644
index 619ca7e9030b..000000000000
--- a/www/varnish4/files/varnishlog.in
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: varnishlog
-# REQUIRE: DAEMON varnishd
-# KEYWORD: shutdown
-
-#
-# Add the following line to /etc/rc.conf to enable varnishlog:
-#
-# varnishlog_enable="YES"
-#
-# Configuration variables and their default values:
-#
-# varnishlog_pidfile - full path to the PID file.
-#	default: "/var/run/varnishlog.pid"
-#
-# varnishlog_file - full path to the log file.
-#	default: "/var/log/varnish.log"
-#
-# varnishlog_flags - command line arguments.
-#	default: "-t off -P ${varnishlog_pidfile} -D -a -A -w ${varnishlog_file}"
-#
-# Add the following line to /etc/newsyslog.conf to rotate the log file
-# once a day:
-#
-# /var/log/varnish.log varnishlog:varnish 640 7 * @T00 JB /var/run/varnishlog.pid
-#
-# See varnishlog(1) for a detailed overview of command-line options.
-#
-
-. /etc/rc.subr
-
-name=varnishlog
-rcvar=varnishlog_enable
-
-load_rc_config ${name}
-: ${varnishlog_enable:=NO}
-: ${varnishlog_pidfile=/var/run/${name}.pid}
-: ${varnishlog_file=/var/log/varnish.log}
-: ${varnishlog_flags="-t off -P ${varnishlog_pidfile} -D -a -A -w ${varnishlog_file}"}
-
-procname="%%PREFIX%%/bin/${name}"
-command="/usr/sbin/daemon"
-command_args="-f -u varnishlog ${procname} ${varnishlog_flags}"
-pidfile=${varnishlog_pidfile}
-start_precmd=precmd
-
-precmd()
-{
-        # varnishlog_flags gets applied too early if we don't do this.
-        rc_flags=""
-
-	if [ ! -e ${pidfile} ]; then
-		install -o varnishlog -g varnish -m 644 /dev/null ${pidfile};
-	fi
-
-	if [ ! -e ${varnishlog_file} ]; then
-		install -o varnishlog -g varnish -m 640 /dev/null ${varnishlog_file};
-	fi
-}
-
-run_rc_command "$1"
diff --git a/www/varnish4/files/varnishncsa.in b/www/varnish4/files/varnishncsa.in
deleted file mode 100644
index f4ead0d6bb67..000000000000
--- a/www/varnish4/files/varnishncsa.in
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-
-# PROVIDE: varnishncsa
-# REQUIRE: DAEMON varnishd
-# KEYWORD: shutdown
-
-#
-# Add the following line to /etc/rc.conf to enable varnishncsa:
-#
-# varnishncsa_enable="YES"
-#
-# Configuration variables and their default values:
-#
-# varnishncsa_pidfile - full path to the PID file.
-#	default: "/var/run/varnishncsa.pid"
-#
-# varnishncsa_file - full path to the log file.
-#	default: "/var/log/varnishncsa.log"
-#
-# varnishncsa_flags - command line arguments.
-#	default: "-t off -P ${varnishncsa_pidfile} -D -a -w ${varnishncsa_file}${varnishncsa_logformat:+ -F \"$varnishncsa_logformat\"}"
-#
-# varnishncsa_logformat - log file format.
-#       default: "" (uses varnishncsa's default format)
-#       example: "%h %l %u %t %r %s %b %{Referer}i %{User-agent}i"
-#
-# Add the following line to /etc/newsyslog.conf to rotate the log file
-# once a day:
-#
-# /var/log/varnishncsa.log varnishlog:varnish 640 7 * @T00 JB /var/run/varnishncsa.pid
-#
-# See varnishncsa(1) for a detailed overview of command-line options.
-#
-
-. /etc/rc.subr
-
-name=varnishncsa
-rcvar=varnishncsa_enable
-
-load_rc_config ${name}
-
-: ${varnishncsa_enable:=NO}
-: ${varnishncsa_pidfile=/var/run/${name}.pid}
-: ${varnishncsa_file=/var/log/${name}.log}
-: ${varnishncsa_flags="-t off -P ${varnishncsa_pidfile} -D -a -w ${varnishncsa_file} ${varnishncsa_logformat:+-F \"$varnishncsa_logformat\"}"}
-
-procname="%%PREFIX%%/bin/${name}"
-command="/usr/sbin/daemon"
-command_args="-f -u varnishlog ${procname} ${varnishncsa_flags}"
-pidfile=${varnishncsa_pidfile}
-start_precmd=precmd
-
-precmd()
-{
-        # $varnishncsa_flags gets applied too early if we don't do this.
-        rc_flags=""
-
-	if [ ! -e ${pidfile} ]; then
-		install -o varnishlog -g varnish -m 644 /dev/null ${pidfile};
-	fi
-
-	if [ ! -e ${varnishncsa_file} ]; then
-		install -o varnishlog -g varnish -m 640 /dev/null ${varnishncsa_file};
-	fi
-}
-
-run_rc_command "$1"
diff --git a/www/varnish4/pkg-descr b/www/varnish4/pkg-descr
deleted file mode 100644
index f14445905db0..000000000000
--- a/www/varnish4/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-This is the Varnish high-performance HTTP accelerator.
-
-Documentation and additional information about Varnish is available on
-http://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/varnish4/pkg-plist b/www/varnish4/pkg-plist
deleted file mode 100644
index b38d0e43b4ad..000000000000
--- a/www/varnish4/pkg-plist
+++ /dev/null
@@ -1,101 +0,0 @@
-bin/varnishadm
-bin/varnishhist
-bin/varnishlog
-bin/varnishncsa
-bin/varnishstat
-bin/varnishtest
-bin/varnishtop
-include/varnish/cache/cache.h
-include/varnish/cache/cache_backend.h
-include/varnish/cache/cache_director.h
-include/varnish/cache/cache_filter.h
-include/varnish/common/common.h
-include/varnish/common/params.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_vars.h
-include/varnish/tbl/bo_flags.h
-include/varnish/tbl/body_status.h
-include/varnish/tbl/debug_bits.h
-include/varnish/tbl/feature_bits.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/params.h
-include/varnish/tbl/req_body.h
-include/varnish/tbl/req_flags.h
-include/varnish/tbl/sess_attr.h
-include/varnish/tbl/sess_close.h
-include/varnish/tbl/steps.h
-include/varnish/tbl/symbol_kind.h
-include/varnish/tbl/vcc_types.h
-include/varnish/tbl/vcl_returns.h
-include/varnish/tbl/vrt_stv_var.h
-include/varnish/tbl/vsc_all.h
-include/varnish/tbl/vsc_f_main.h
-include/varnish/tbl/vsc_fields.h
-include/varnish/tbl/vsc_levels.h
-include/varnish/tbl/vsc_types.h
-include/varnish/tbl/vsl_tags.h
-include/varnish/tbl/vsl_tags_http.h
-include/varnish/vapi/vapi_options.h
-include/varnish/vapi/voptget.h
-include/varnish/vapi/vsc.h
-include/varnish/vapi/vsc_int.h
-include/varnish/vapi/vsl.h
-include/varnish/vapi/vsl_int.h
-include/varnish/vapi/vsm.h
-include/varnish/vapi/vsm_int.h
-include/varnish/waiter/waiter.h
-include/varnish/vas.h
-include/varnish/vav.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/vtcp.h
-include/varnish/vtim.h
-include/varnish/vqueue.h
-include/varnish/vre.h
-include/varnish/vrt.h
-include/varnish/vrt_obj.h
-include/varnish/vsa.h
-include/varnish/vsb.h
-include/varnish/vsha256.h
-lib/libvarnishapi.so
-lib/libvarnishapi.so.1
-lib/libvarnishapi.so.1.0.4
-lib/varnish/libvarnish.so
-lib/varnish/libvarnishcompat.so
-lib/varnish/libvcc.so
-lib/varnish/libvgz.so
-lib/varnish/vmods/libvmod_directors.so
-lib/varnish/vmods/libvmod_std.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_directors.3.gz
-man/man3/vmod_std.3.gz
-man/man7/varnish-cli.7.gz
-man/man7/varnish-counters.7.gz
-man/man7/vcl.7.gz
-man/man7/vsl-query.7.gz
-man/man7/vsl.7.gz
-sbin/varnishd
-share/aclocal/varnish.m4
-share/aclocal/varnish-legacy.m4
-%%PORTDOCS%%%%DOCSDIR%%/builtin.vcl
-%%PORTDOCS%%%%DOCSDIR%%/example.vcl
-%%DATADIR%%/vmodtool.py
-@dir varnish