Updated www/varnish to 2.0.6.

2.0.6:
- Fix off-by-one error in ESI handling
- Bug fixes related to session lingering
- Backend probes should now work correctly with more servers
- Portability fixes
- Make it possible to specify the per-thread stack size, useful for 32 bit
  systems

2.0.5:
- Performance improvements, particularly on Linux.
- Implement support for HTTP continuation lines
- Handle illegal responses from the backend better by serving a 503 page
  rather than panic-ing
- Add backtrace to assertion errors. This requires Varnish to be installed
  unstripped
- Consume less memory when processing ESI
- Better standards compliance with If-None-Match support and emitting more
  headers on 304 responses
- Add a FetchError? log tag which makes it easier to understand why a
  backend fetch failed.

pkgsrc changes:
- Proper EGDIR/SYSCONFDIR support.
- Default user, directory, ownership and permissions support.
- Rudimentary fix for gcc vs. sunpro on Solaris, as used by varnish
  to compile config files.

3 files changed, 44 insertions, 8 deletions

diff --git a/www/varnish/Makefile b/www/varnish/Makefile
index af60a7d05f3..e36bac7328d 100644
--- a/www/varnish/Makefile
+++ b/www/varnish/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2009/05/19 08:59:38 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2010/03/08 13:24:01 fhajny Exp $
 #
 
-DISTNAME=	varnish-2.0.4
+DISTNAME=	varnish-2.0.6
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=varnish/}
 
@@ -15,6 +15,42 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 USE_TOOLS+=	autoconf
+BUILD_DEFS+=	VARBASE
+
+EGDIR=			${PREFIX}/share/examples/varnish
+PKG_SYSCONFSUBDIR=	varnish
+CONF_FILES=		${EGDIR}/default.vcl ${PKG_SYSCONFDIR}/default.vcl
+
+VRNUSER?=		varnish
+VRNGROUP?=		${VRNUSER}
+STATEDIR=		${VARBASE}/db
+VRNDIR=			${STATEDIR}/${PKGBASE}
+
+CONFIGURE_ARGS+=	--localstatedir=${STATEDIR}
+OWN_DIRS+=		${VRNDIR}
+OWN_DIRS_PERMS+=	${VRNDIR} ${VRNUSER} ${VRNGROUP} 0770
+
+PKG_GROUPS+=		${VRNGROUP}
+PKG_USERS+=		${VRNUSER}:${VRNGROUP}
+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},'
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "SunOS"
+.  if ${PKGSRC_COMPILER} == "sunpro"
+CONFIGURE_ENV+=	VCC="cc -Kpic -G -o %o %s"
+.  else
+CONFIGURE_ENV+=	VCC_CC="gcc -fpic -shared -o %o %s"
+.  endif
+.endif
 
 pre-configure:
 	cd ${WRKSRC} && autoconf
diff --git a/www/varnish/PLIST b/www/varnish/PLIST
index 64e555c328d..41837cae702 100644
--- a/www/varnish/PLIST
+++ b/www/varnish/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 22:00:39 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/03/08 13:24:01 fhajny Exp $
 bin/varnishadm
 bin/varnishhist
 bin/varnishlog
@@ -7,7 +7,6 @@ bin/varnishreplay
 bin/varnishstat
 bin/varnishtest
 bin/varnishtop
-etc/varnish/default.vcl
 include/varnish/shmlog.h
 include/varnish/shmlog_tags.h
 include/varnish/stat_field.h
@@ -29,3 +28,4 @@ man/man1/varnishtest.1
 man/man1/varnishtop.1
 man/man7/vcl.7
 sbin/varnishd
+share/examples/varnish/default.vcl
diff --git a/www/varnish/distinfo b/www/varnish/distinfo
index cb96b52833c..c618701455c 100644
--- a/www/varnish/distinfo
+++ b/www/varnish/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2009/04/11 19:03:53 spz Exp $
+$NetBSD: distinfo,v 1.4 2010/03/08 13:24:01 fhajny Exp $
 
-SHA1 (varnish-2.0.4.tar.gz) = 7a7b1ce657b64c89025d61983b84d6ebf88dfbb2
-RMD160 (varnish-2.0.4.tar.gz) = 93f94555f42205ff5f324e76acb121c8da71f6e9
-Size (varnish-2.0.4.tar.gz) = 786945 bytes
+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 (patch-aa) = c0216a4b4c73b43567a6402a14a64c7597d5c4b9