Update to version 2.0.4 of the package

fixes PR pkg/41118
adds a LICENSE setting

7 files changed, 44 insertions, 78 deletions

diff --git a/www/varnish/Makefile b/www/varnish/Makefile
index 25b48de52ce..edbbd69c178 100644
--- a/www/varnish/Makefile
+++ b/www/varnish/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2008/06/20 01:09:43 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2009/04/11 19:03:53 spz Exp $
 #
 
-DISTNAME=	varnish-1.0.2
+DISTNAME=	varnish-2.0.4
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=varnish/}
 
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://varnish-cache.org/
 COMMENT=	High-performace HTTP accelerator
 
+LICENSE=	modified-bsd
+
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=	yes
diff --git a/www/varnish/PLIST b/www/varnish/PLIST
index b3a8286dfd1..2109fe57596 100644
--- a/www/varnish/PLIST
+++ b/www/varnish/PLIST
@@ -1,17 +1,33 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/12/04 16:04:54 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/04/11 19:03:53 spz Exp $
+bin/varnishadm
 bin/varnishhist
 bin/varnishlog
 bin/varnishncsa
+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
+include/varnish/stats.h
+include/varnish/varnishapi.h
 lib/libvarnish.la
 lib/libvarnishapi.la
+lib/libvarnishcompat.la
 lib/libvcl.la
+lib/pkgconfig/varnishapi.pc
+man/man1/varnishadm.1
 man/man1/varnishd.1
 man/man1/varnishhist.1
 man/man1/varnishlog.1
 man/man1/varnishncsa.1
+man/man1/varnishreplay.1
 man/man1/varnishstat.1
+man/man1/varnishtest.1
 man/man1/varnishtop.1
 man/man7/vcl.7
 sbin/varnishd
+@dirrm include/varnish
+@dirrm etc/varnish
diff --git a/www/varnish/distinfo b/www/varnish/distinfo
index 4b78ac0c2eb..cb96b52833c 100644
--- a/www/varnish/distinfo
+++ b/www/varnish/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.2 2006/12/18 11:35:37 joerg Exp $
+$NetBSD: distinfo,v 1.3 2009/04/11 19:03:53 spz Exp $
 
-SHA1 (varnish-1.0.2.tar.gz) = 88fa343be907088ac29be6fc9d899b352c91bf83
-RMD160 (varnish-1.0.2.tar.gz) = 28aac4f266369c2a3ffb4233b1cd3fd0b3f6ade2
-Size (varnish-1.0.2.tar.gz) = 539059 bytes
-SHA1 (patch-aa) = f49672e842cf01c58e2154a56271ce896a639161
-SHA1 (patch-ab) = ef32cee26f2542a44f2ab117154b58bc69931237
-SHA1 (patch-ac) = f537e46216a67fdf68afe8f9451bdf2aaff89958
-SHA1 (patch-ad) = 5523cd5cbcc29f4f6c85014870356c44c462b8ef
+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 (patch-aa) = c0216a4b4c73b43567a6402a14a64c7597d5c4b9
diff --git a/www/varnish/patches/patch-aa b/www/varnish/patches/patch-aa
index 1c99f90d22a..a4fa97d4314 100644
--- a/www/varnish/patches/patch-aa
+++ b/www/varnish/patches/patch-aa
@@ -1,20 +1,21 @@
-$NetBSD: patch-aa,v 1.2 2006/12/18 11:35:37 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2009/04/11 19:03:53 spz Exp $
 
---- configure.ac.orig	2006-11-07 12:38:11.000000000 +0000
+--- configure.ac.orig	2009-04-01 13:35:15.000000000 +0000
 +++ configure.ac
-@@ -38,13 +38,14 @@ AC_PROG_MAKE_SET
- AC_CHECK_LIB(rt, clock_gettime)
- AC_CHECK_LIB(dl, dlopen)
- #AC_SEARCH_LIBS(initscr, [curses ncurses])
--AC_SEARCH_LIBS(pthread_create, [thr pthread c_r])
-+LIBS="${LIBS} ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
+@@ -55,6 +55,7 @@ AM_CONDITIONAL([HAVE_CURSES], [test x$ha
+ save_LIBS="${LIBS}"
+ LIBS=""
+ AC_SEARCH_LIBS(pthread_create, [thr pthread c_r])
++LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
+ PTHREAD_LIBS="${LIBS}"
+ LIBS="${save_LIBS}"
+ AC_SUBST(PTHREAD_LIBS)
+@@ -195,7 +196,7 @@ AC_ARG_ENABLE(kqueue,
  
- # Checks for header files.
- AC_HEADER_STDC
- AC_HEADER_SYS_WAIT
- AC_HEADER_TIME
- AC_CHECK_HEADERS([sys/socket.h])
-+AC_CHECK_HEADERS([sys/statvfs.h])
- AC_CHECK_HEADERS([sys/vfs.h])
- AC_CHECK_HEADERS([netinet/in.h])
- AC_CHECK_HEADERS([stddef.h])
+ if test "$enable_kqueue" = yes; then
+ 	case $target in
+-	*-*-freebsd* | *-*-darwin9* )
++	*-*-freebsd* | *-*-darwin9* | *-*-netbsd* )
+ 		AC_CHECK_FUNCS([kqueue])
+ 		;;
+ 	*-*-bsd*)
diff --git a/www/varnish/patches/patch-ab b/www/varnish/patches/patch-ab
deleted file mode 100644
index 0479d8e5341..00000000000
--- a/www/varnish/patches/patch-ab
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/12/04 16:04:54 xtraeme Exp $
-
---- bin/varnishd/storage_file.c.orig	2006-12-04 16:49:47.000000000 +0100
-+++ bin/varnishd/storage_file.c	2006-12-04 16:54:44.000000000 +0100
-@@ -37,6 +37,11 @@
- #include <sys/socket.h>
- #include <sys/stat.h>
- 
-+#ifdef HAVE_SYS_STATVFS_H
-+#include <sys/statvfs.h>
-+#define statfs	statvfs
-+#endif
-+
- #ifdef HAVE_SYS_VFS_H
- #include <sys/vfs.h>
- #endif
diff --git a/www/varnish/patches/patch-ac b/www/varnish/patches/patch-ac
deleted file mode 100644
index 65485f10218..00000000000
--- a/www/varnish/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/12/18 11:35:37 joerg Exp $
-
---- bin/varnishd/cache_pool.c.orig	2006-12-18 11:21:45.000000000 +0000
-+++ bin/varnishd/cache_pool.c
-@@ -35,7 +35,7 @@
- #include <sys/uio.h>
- 
- #ifdef HAVE_SENDFILE
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- #include <sys/socket.h>
- #elif defined(__linux__)
- #include <sys/sendfile.h>
-@@ -148,7 +148,7 @@ WRK_Sendfile(struct worker *w, int fd, o
- 	assert(fd >= 0);
- 	assert(len > 0);
- 
--#if defined(__FreeBSD__)
-+#if defined(__FreeBSD__) || defined(__DragonFly__)
- 	do {
- 		struct sf_hdtr sfh;
- 		memset(&sfh, 0, sizeof sfh);
diff --git a/www/varnish/patches/patch-ad b/www/varnish/patches/patch-ad
deleted file mode 100644
index 34340dfd7ec..00000000000
--- a/www/varnish/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2006/12/18 11:35:37 joerg Exp $
-
---- bin/varnishhist/varnishhist.c.orig	2006-12-18 11:25:50.000000000 +0000
-+++ bin/varnishhist/varnishhist.c
-@@ -31,6 +31,7 @@
-  * Log tailer for Varnish
-  */
- 
-+#include <sys/types.h>
- #include <curses.h>
- #include <errno.h>
- #include <math.h>