pkg/44520: varnish 2.1.5 ugprade

[mspo%mspo.com@localhost]

>Number:         44520
>Category:       pkg
>Synopsis:       upgrade varnish pkg
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sat Feb 05 14:40:00 +0000 2011
>Originator:     msporleder%gmail.com@localhost
>Release:        NetBSD 5.0.2
>Organization:
        
>Environment:
        
        
System: NetBSD vc136-15.vc.panix.com 5.0.2 NetBSD 5.0.2 (PANIX-VC) #2: Tue Oct 
19 16:30:57 EDT 2010 
root%juggler.panix.com@localhost:/misc3/obj/misc2/devel/netbsd/5.0.2/src/sys/arch/amd64/compile/PANIX-VC
 amd64
Architecture: x86_64
Machine: amd64
>Description:
>How-To-Repeat:
>Fix:

patch-ac can be removed

diff -ru varnish-orig/Makefile varnish/Makefile
--- varnish-orig/Makefile       2011-02-04 17:29:23.000000000 -0500
+++ varnish/Makefile    2011-02-05 01:05:06.000000000 -0500
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile,v 1.8 2010/12/06 14:25:44 wiz Exp $
 #
 
-DISTNAME=      varnish-2.1.4
+DISTNAME=      varnish-2.1.5
 CATEGORIES=    www
-MASTER_SITES=  http://www.varnish-software.com/sites/default/files/
+MASTER_SITES=  http://repo.varnish-cache.org/source/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://varnish-cache.org/
@@ -27,6 +27,7 @@
 VRNDIR=                        ${STATEDIR}/${PKGBASE}
 
 CONFIGURE_ARGS+=       --localstatedir=${STATEDIR}
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 OWN_DIRS+=             ${VRNDIR}
 OWN_DIRS_PERMS+=       ${VRNDIR} ${VRNUSER} ${VRNGROUP} 0770
 
diff -ru varnish-orig/PLIST varnish/PLIST
--- varnish-orig/PLIST  2011-02-04 17:29:23.000000000 -0500
+++ varnish/PLIST       2011-02-05 09:18:37.000000000 -0500
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2010/12/06 14:25:44 wiz Exp $
+@comment $NetBSD$
 bin/varnishadm
 bin/varnishhist
 bin/varnishlog
@@ -7,7 +7,6 @@
 bin/varnishstat
 bin/varnishtest
 bin/varnishtop
-bin/varnishtest
 bin/varnishsizes
 include/varnish/shmlog.h
 include/varnish/shmlog_tags.h
@@ -25,11 +24,10 @@
 man/man1/varnishlog.1
 man/man1/varnishncsa.1
 man/man1/varnishreplay.1
+man/man1/varnishsizes.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
diff -ru varnish-orig/distinfo varnish/distinfo
--- varnish-orig/distinfo       2011-02-04 17:29:23.000000000 -0500
+++ varnish/distinfo    2011-02-05 09:04:32.000000000 -0500
@@ -1,8 +1,7 @@
 $NetBSD: distinfo,v 1.6 2010/12/06 14:25:44 wiz Exp $
 
-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
+SHA1 (varnish-2.1.5.tar.gz) = 5c413ee7c4267d9fd4713fbff059d1be5fbba60f
+RMD160 (varnish-2.1.5.tar.gz) = 4619d4be920504388325f06afdbea9b40f5a806a
+Size (varnish-2.1.5.tar.gz) = 1530856 bytes
+SHA1 (patch-aa) = d0bce82fc6bc0bb7e078f61461a21172bb658d4a
+SHA1 (patch-ab) = 30a64ce77354df3f2e0e830f60f4c6d98ef3099c
diff -ru varnish-orig/patches/patch-aa varnish/patches/patch-aa
--- varnish-orig/patches/patch-aa       2011-02-04 17:29:23.000000000 -0500
+++ varnish/patches/patch-aa    2011-02-04 18:51:36.000000000 -0500
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2009/04/11 19:03:53 spz Exp $
+$NetBSD$
 
---- configure.ac.orig  2009-04-01 13:35:15.000000000 +0000
-+++ configure.ac
-@@ -55,6 +55,7 @@ AM_CONDITIONAL([HAVE_CURSES], [test x$ha
+--- configure.ac.orig  2011-01-25 06:48:58.000000000 -0500
++++ configure.ac       2011-02-04 18:38:25.000000000 -0500
+@@ -66,6 +66,7 @@
  save_LIBS="${LIBS}"
  LIBS=""
  AC_SEARCH_LIBS(pthread_create, [thr pthread c_r])
@@ -10,7 +10,7 @@
  PTHREAD_LIBS="${LIBS}"
  LIBS="${save_LIBS}"
  AC_SUBST(PTHREAD_LIBS)
-@@ -195,7 +196,7 @@ AC_ARG_ENABLE(kqueue,
+@@ -257,7 +258,7 @@
  
  if test "$enable_kqueue" = yes; then
        case $target in
diff -ru varnish-orig/patches/patch-ab varnish/patches/patch-ab
--- varnish-orig/patches/patch-ab       2011-02-04 17:29:23.000000000 -0500
+++ varnish/patches/patch-ab    2011-02-05 09:01:28.000000000 -0500
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.3 2010/03/17 17:45:44 fhajny Exp $
+$NetBSD$
 
---- etc/Makefile.in.orig       2010-03-17 17:28:28.257760000 +0000
+--- etc/Makefile.in.orig       2011-02-05 13:57:36.000000000 +0000
 +++ etc/Makefile.in
-@@ -202,7 +202,7 @@ target_vendor = @target_vendor@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+@@ -197,7 +197,7 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
 -varnishconfdir = @varnishconfdir@
 +varnishconfdir = @prefix@/share/examples/@PACKAGE@
  EXTRA_DIST = zope-plone.vcl

>Unformatted: