Update to 2.1.4, provided by Matthew Sporleder in PR 44165.

Includes new startup scripts.

Summary of changes from 2.1.3 to 2.1.4

    * A bug in the binary heap layout caused inflated object counts, this has been fixed.
    * Much more comprehensive documentation.
    * A DNS director that uses DNS lookups for choosing which backend to route requests to has been added.
    * The client director now uses the variable client.identity for choosing which backend to send a given request to.
    * String representation of now, making it easier to add Expires headers
    * Portability fixes for Solaris.
    * Various bug fixes.

Summary of changes from 2.1.2 to 2.1.3

    * The scalability of critbit, the default hashing method, has been improved.
    * A bug in varnishd would in some cases confuse varnishncsa leading to lost or wrong log lines.
    * Some bugs in the handling of Range requests has been fixed. This only matters if you enable Range support.
    * Add «log» command to VCL which will log to the Varnish log.

Summary of changes from 2.1.1 to 2.1.2

    * When adding Range support in 2.1.1 an error was introduced. Garbage was appended to some objects. This affected some load balancers - but clients seemed not to be affected.

Summary of changes from 2.1.0 to 2.1.1

    * Experimental support for the Range header, must be enabled with the http_range_support parameter.
    * A bug in workspace rollback prevented ESI from working correctly in all situations. This is now fixed.
    * A race condition and a deadlock in the critbit hasher have been fixed.
    * HEAD requests are no longer converted to GET requests for pass and pipe.
    * Support for completely obliterating objects including all variants («nuke»). See http://varnish-cache.org/changeset/4668 for details

Summary of changes from 2.0.6 to 2.1.0

Varnish 2.1.0 has just been released. It contains lots of changes relative to 2.0.6, the most important ones being:

    * Experimental support for persistent cache
    * The regular expression engine is now PCRE
    * Saint mode, where we can serve a cached object if the backend is down or otherwise faulty.
    * A more scalable hashing method called critbit
    * Increased scalability, removing a limitation of maximum 64k connections
    * obj_workspace is removed, this is now scaled automatically
    * Hashing and client IP based directors

Note: The release has some syntaxchanges in VCL, please read the full changelog

7 files changed, 76 insertions, 15 deletions

diff --git a/www/varnish/Makefile b/www/varnish/Makefile
index 6bbbe603809..244621d9443 100644
--- a/www/varnish/Makefile
+++ b/www/varnish/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2010/03/17 17:45:44 fhajny Exp $
+# $NetBSD: Makefile,v 1.8 2010/12/06 14:25:44 wiz Exp $
 #
 
-DISTNAME=	varnish-2.0.6
-PKGREVISION=	1
+DISTNAME=	varnish-2.1.4
 CATEGORIES=	www
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=varnish/}
+MASTER_SITES=	http://www.varnish-software.com/sites/default/files/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://varnish-cache.org/
@@ -15,7 +14,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS+=	autoconf
+USE_TOOLS+=	autoconf pkg-config gmake
 BUILD_DEFS+=	VARBASE
 
 EGDIR=			${PREFIX}/share/examples/varnish
@@ -37,12 +36,12 @@ PKG_HOME.${VRNUSER}=	${VRNDIR}
 PKG_SHELL.${VRNUSER}=	${SH}
 PKG_GECOS.${VRNUSER}=	Varnish daemon user
 
-SUBST_CLASSES+=		pkg
-SUBST_STAGE.pkg=	post-patch
-SUBST_MESSAGE.pkg=	Fixing pkgsrc paths
-SUBST_FILES.pkg=	etc/Makefile.in
-SUBST_SED.pkg=		-e 's,@EGDIR@,${EGDIR},'
+RCD_SCRIPTS=            varnishd varnishlog varnishncsa
 
+.include "../../lang/python/pyversion.mk"
+BUILD_DEPENDS+=       ${PYPKGPREFIX}-docutils>=0.5:../../textproc/py-docutils
+
+.include "../../devel/pcre/buildlink3.mk"
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
diff --git a/www/varnish/PLIST b/www/varnish/PLIST
index 41837cae702..342c7ed652f 100644
--- a/www/varnish/PLIST
+++ b/www/varnish/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2010/03/08 13:24:01 fhajny Exp $
+@comment $NetBSD: PLIST,v 1.5 2010/12/06 14:25:44 wiz Exp $
 bin/varnishadm
 bin/varnishhist
 bin/varnishlog
@@ -7,6 +7,8 @@ bin/varnishreplay
 bin/varnishstat
 bin/varnishtest
 bin/varnishtop
+bin/varnishtest
+bin/varnishsizes
 include/varnish/shmlog.h
 include/varnish/shmlog_tags.h
 include/varnish/stat_field.h
@@ -26,6 +28,11 @@ man/man1/varnishreplay.1
 man/man1/varnishstat.1
 man/man1/varnishtest.1
 man/man1/varnishtop.1
+man/man1/varnishadm.1
+man/man1/varnishsizes.1
 man/man7/vcl.7
 sbin/varnishd
 share/examples/varnish/default.vcl
+share/examples/rc.d/varnishd
+share/examples/rc.d/varnishlog
+share/examples/rc.d/varnishncsa
diff --git a/www/varnish/distinfo b/www/varnish/distinfo
index 0b2295e1009..fce7e2827b4 100644
--- a/www/varnish/distinfo
+++ b/www/varnish/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2010/03/17 17:45:44 fhajny Exp $
+$NetBSD: distinfo,v 1.6 2010/12/06 14:25:44 wiz Exp $
 
-SHA1 (varnish-2.0.6.tar.gz) = c688d7825d52b2f21a368cb332564abe62227595
-RMD160 (varnish-2.0.6.tar.gz) = 5b3827ae4de7be27442d68283bd8e4bd57a13199
-Size (varnish-2.0.6.tar.gz) = 810518 bytes
+SHA1 (varnish-2.1.4.tar.gz) = 3e3734f7795880a90a0514e9fb40d76fd170221b
+RMD160 (varnish-2.1.4.tar.gz) = f5d9bea792f7d2f9ca8dec8bc96c3ac88f0a45a9
+Size (varnish-2.1.4.tar.gz) = 1539241 bytes
 SHA1 (patch-aa) = c0216a4b4c73b43567a6402a14a64c7597d5c4b9
 SHA1 (patch-ab) = 5908f0fbeed7ba7261f67088e7bb9f6423d18e26
+SHA1 (patch-ac) = 796dcbcfaf546e7e7077e59c84f97a38f2ff1edf
diff --git a/www/varnish/files/varnishd.sh b/www/varnish/files/varnishd.sh
new file mode 100644
index 00000000000..01ffc50bf41
--- /dev/null
+++ b/www/varnish/files/varnishd.sh
@@ -0,0 +1,13 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# PROVIDE: varnishd
+# REQUIRE: DAEMON
+
+. /etc/rc.subr
+
+name="varnishd"
+rcvar=$name
+command="@PREFIX@/sbin/varnishd"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/www/varnish/files/varnishlog.sh b/www/varnish/files/varnishlog.sh
new file mode 100644
index 00000000000..b7e27f731a7
--- /dev/null
+++ b/www/varnish/files/varnishlog.sh
@@ -0,0 +1,14 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# PROVIDE: varnishlog
+# REQUIRE: varnishd
+
+. /etc/rc.subr
+
+name="varnishlog"
+rcvar=$name
+command="@PREFIX@/bin/varnishlog"
+commands_args="-D"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/www/varnish/files/varnishncsa.sh b/www/varnish/files/varnishncsa.sh
new file mode 100644
index 00000000000..8dd8cdaa486
--- /dev/null
+++ b/www/varnish/files/varnishncsa.sh
@@ -0,0 +1,14 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# PROVIDE: varnishncsa
+# REQUIRE: varnishd
+
+. /etc/rc.subr
+
+name="varnishncsa"
+rcvar=$name
+command="@PREFIX@/bin/varnishncsa"
+commands_args="-D"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/www/varnish/patches/patch-ac b/www/varnish/patches/patch-ac
new file mode 100644
index 00000000000..fb7da461837
--- /dev/null
+++ b/www/varnish/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.3 2010/12/06 14:25:44 wiz Exp $
+
+--- configure.ac.orig	2010-11-28 15:22:39.000000000 -0500
++++ configure.ac
+@@ -30,7 +30,7 @@
+    AC_MSG_WARN([xsltproc not found – not building documentation])
+ fi
+ AM_CONDITIONAL(HAVE_XSLTPROC,[test "x$XSLTPROC" != "xno"])
+-AC_CHECK_PROGS(RST2MAN, [rst2man], "no")
++AC_CHECK_PROGS(RST2MAN, [rst2man rst2man.py], "no")
+ if test "x$RST2MAN" = "xno"; then
+    AC_MSG_WARN([rst2man not found – not building man pages])
+ fi