pkg/44165: varnish upgrade

[msporleder%gmail.com@localhost]

>Number:         44165
>Category:       pkg
>Synopsis:       varnish upgrade
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Nov 28 20:45:02 +0000 2010
>Originator:     Matthew Sporleder
>Release:        5
>Organization:
mspo.com
>Environment:
netbsd
>Description:
www/varnish is out of date
>How-To-Repeat:

>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/varnish/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile    17 Mar 2010 17:45:44 -0000      1.7
+++ Makefile    28 Nov 2010 20:36:39 -0000
@@ -1,10 +1,10 @@
 # $NetBSD: Makefile,v 1.7 2010/03/17 17:45:44 fhajny Exp $
 #
 
-DISTNAME=      varnish-2.0.6
+DISTNAME=      varnish-2.1.4
 PKGREVISION=   1
 CATEGORIES=    www
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=varnish/}
+MASTER_SITES=  http://www.varnish-software.com/sites/default/files/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://varnish-cache.org/
@@ -15,7 +15,7 @@
 
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
-USE_TOOLS+=    autoconf
+USE_TOOLS+=    autoconf pkg-config gmake
 BUILD_DEFS+=   VARBASE
 
 EGDIR=                 ${PREFIX}/share/examples/varnish
@@ -43,6 +43,10 @@
 SUBST_FILES.pkg=       etc/Makefile.in
 SUBST_SED.pkg=         -e 's,@EGDIR@,${EGDIR},'

+.include "../../lang/python/pyversion.mk"
+DEPENDS+=       ${PYPKGPREFIX}-docutils>=0.5:../../textproc/py-docutils
+
+.include "../../devel/pcre/buildlink3.mk"
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/www/varnish/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- PLIST       8 Mar 2010 13:24:01 -0000       1.4
+++ PLIST       28 Nov 2010 20:36:39 -0000
@@ -7,6 +7,9 @@
 bin/varnishstat
 bin/varnishtest
 bin/varnishtop
+bin/varnishtest
+bin/varnishsizes
+
 include/varnish/shmlog.h
 include/varnish/shmlog_tags.h
 include/varnish/stat_field.h
@@ -17,6 +20,7 @@
 lib/libvarnishcompat.la
 lib/libvcl.la
 lib/pkgconfig/varnishapi.pc
+

 man/man1/varnishadm.1
 man/man1/varnishd.1
 man/man1/varnishhist.1
@@ -26,6 +30,9 @@
 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
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/www/varnish/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo    17 Mar 2010 17:45:44 -0000      1.5
+++ distinfo    28 Nov 2010 20:36:39 -0000
@@ -1,7 +1,8 @@
 $NetBSD: distinfo,v 1.5 2010/03/17 17:45:44 fhajny 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) = 053dc9706c3fb843c56f72aa323ac1b81e3989a3

Index: patches/patch-ac
===================================================================
RCS file: patches/patch-ac
diff -N patches/patch-ac
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-ac    28 Nov 2010 20:36:39 -0000
@@ -0,0 +1,11 @@
+--- configure.ac.orig  2010-11-28 15:22:39.000000000 -0500
++++ configure.ac
+@@ -30,7 +30,7 @@
+    AC_MSG_WARN([xsltproc not found â<80><93> 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 â<80><93> not building man pages])
+ fi