Re: pkg/44165: varnish upgrade

[matthew sporleder <msporleder%gmail.com@localhost>]

The following reply was made to PR pkg/44165; it has been noted by GNATS.

From: matthew sporleder <msporleder%gmail.com@localhost>
To: gnats-bugs%netbsd.org@localhost, gnats-admin%netbsd.org@localhost
Cc: 
Subject: Re: pkg/44165: varnish upgrade
Date: Mon, 29 Nov 2010 20:23:48 -0500

 Index: Makefile
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /cvsroot/pkgsrc/www/varnish/Makefile,v
 retrieving revision 1.7
 diff -u -r1.7 Makefile
 --- Makefile =A0 =A017 Mar 2010 17:45:44 -0000 =A0 =A0 =A01.7
 +++ Makefile =A0 =A029 Nov 2010 22:23:38 -0000
 @@ -1,10 +1,10 @@
 =A0# $NetBSD: Makefile,v 1.7 2010/03/17 17:45:44 fhajny Exp $
 =A0#
 
 -DISTNAME=3D =A0 =A0 =A0varnish-2.0.6
 -PKGREVISION=3D =A0 1
 +DISTNAME=3D =A0 =A0 =A0varnish-2.1.4
 +PKGREVISION=3D =A0 2
 =A0CATEGORIES=3D =A0 =A0www
 -MASTER_SITES=3D =A0${MASTER_SITE_SOURCEFORGE:=3Dvarnish/}
 +MASTER_SITES=3D =A0http://www.varnish-software.com/sites/default/files/
 
 =A0MAINTAINER=3D =A0 =A0pkgsrc-users%NetBSD.org@localhost
 =A0HOMEPAGE=3D =A0 =A0 =A0http://varnish-cache.org/
 @@ -15,7 +15,7 @@
 
 =A0GNU_CONFIGURE=3D yes
 =A0USE_LIBTOOL=3D =A0 yes
 -USE_TOOLS+=3D =A0 =A0autoconf
 +USE_TOOLS+=3D =A0 =A0autoconf pkg-config gmake
 =A0BUILD_DEFS+=3D =A0 VARBASE
 
 =A0EGDIR=3D =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 ${PREFIX}/share/examples/varnis=
 h
 @@ -37,12 +37,18 @@
 =A0PKG_SHELL.${VRNUSER}=3D =A0${SH}
 =A0PKG_GECOS.${VRNUSER}=3D =A0Varnish daemon user
 
 +RCD_SCRIPTS=3D =A0 =A0 =A0 =A0 =A0 =A0varnishd varnishlog varnishncsa
 +
 =A0SUBST_CLASSES+=3D =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0pkg
 :cvs diff: Diffing files
 cvs diff: Diffing patches
 =A0SUBST_STAGE.pkg=3D =A0 =A0 =A0 post-patch
 =A0SUBST_MESSAGE.pkg=3D =A0 =A0 Fixing pkgsrc paths
 =A0SUBST_FILES.pkg=3D =A0 =A0 =A0 etc/Makefile.in
 =A0SUBST_SED.pkg=3D =A0 =A0 =A0 =A0 -e 's,@EGDIR@,${EGDIR},'
 
 +.include "../../lang/python/pyversion.mk"
 +DEPENDS+=3D =A0 =A0 =A0 ${PYPKGPREFIX}-docutils>=3D0.5:../../textproc/py-d=
 ocutils
 +
 +.include "../../devel/pcre/buildlink3.mk"
 =A0.include "../../mk/bsd.prefs.mk"
 
 =A0.if ${OPSYS} =3D=3D "SunOS"
 Index: PLIST
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /cvsroot/pkgsrc/www/varnish/PLIST,v
 retrieving revision 1.4
 diff -u -r1.4 PLIST
 --- PLIST =A0 =A0 =A0 8 Mar 2010 13:24:01 -0000 =A0 =A0 =A0 1.4
 +++ PLIST =A0 =A0 =A0 29 Nov 2010 22:23:38 -0000
 @@ -7,6 +7,8 @@
 =A0bin/varnishstat
 =A0bin/varnishtest
 =A0bin/varnishtop
 +bin/varnishtest
 +bin/varnishsizes
 =A0include/varnish/shmlog.h
 =A0include/varnish/shmlog_tags.h
 =A0include/varnish/stat_field.h
 @@ -26,6 +28,11 @@
 =A0man/man1/varnishstat.1
 =A0man/man1/varnishtest.1
 =A0man/man1/varnishtop.1
 +man/man1/varnishadm.1
 +man/man1/varnishsizes.1
 =A0man/man7/vcl.7
 =A0sbin/varnishd
 =A0share/examples/varnish/default.vcl
 +share/examples/rc.d/varnishd
 +share/examples/rc.d/varnishlog
 +share/examples/rc.d/varnishncsa
 Index: distinfo
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: /cvsroot/pkgsrc/www/varnish/distinfo,v
 retrieving revision 1.5
 diff -u -r1.5 distinfo
 --- distinfo =A0 =A017 Mar 2010 17:45:44 -0000 =A0 =A0 =A01.5
 +++ distinfo =A0 =A029 Nov 2010 22:23:38 -0000
 @@ -1,7 +1,8 @@
 =A0$NetBSD: distinfo,v 1.5 2010/03/17 17:45:44 fhajny Exp $
 
 -SHA1 (varnish-2.0.6.tar.gz) =3D c688d7825d52b2f21a368cb332564abe62227595
 -RMD160 (varnish-2.0.6.tar.gz) =3D 5b3827ae4de7be27442d68283bd8e4bd57a13199
 -Size (varnish-2.0.6.tar.gz) =3D 810518 bytes
 +SHA1 (varnish-2.1.4.tar.gz) =3D 3e3734f7795880a90a0514e9fb40d76fd170221b
 +RMD160 (varnish-2.1.4.tar.gz) =3D f5d9bea792f7d2f9ca8dec8bc96c3ac88f0a45a9
 +Size (varnish-2.1.4.tar.gz) =3D 1539241 bytes
 =A0SHA1 (patch-aa) =3D c0216a4b4c73b43567a6402a14a64c7597d5c4b9
 =A0SHA1 (patch-ab) =3D 5908f0fbeed7ba7261f67088e7bb9f6423d18e26
 +SHA1 (patch-ac) =3D 053dc9706c3fb843c56f72aa323ac1b81e3989a3
 Index: patches/patch-ac
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 RCS file: patches/patch-ac
 diff -N patches/patch-ac
 --- /dev/null =A0 1 Jan 1970 00:00:00 -0000
 +++ patches/patch-ac =A0 =A029 Nov 2010 22:23:38 -0000
 @@ -0,0 +1,11 @@
 +--- configure.ac.orig =A02010-11-28 15:22:39.000000000 -0500
 ++++ configure.ac
 +@@ -30,7 +30,7 @@
 + =A0 =A0AC_MSG_WARN([xsltproc not found =E2<80><93> not building documenta=
 tion])
 + fi
 + AM_CONDITIONAL(HAVE_XSLTPROC,[test "x$XSLTPROC" !=3D "xno"])
 +-AC_CHECK_PROGS(RST2MAN, [rst2man], "no")
 ++AC_CHECK_PROGS(RST2MAN, [rst2man rst2man.py], "no")
 + if test "x$RST2MAN" =3D "xno"; then
 + =A0 =A0AC_MSG_WARN([rst2man not found =E2<80><93> not building man pages]=
 )
 + fi
 Index: files/varnishd.sh
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- /dev/null =A0 2010-11-29 17:19:26.000000000 -0500
 +++ files/varnishd.sh =A0 2010-11-29 16:41:48.000000000 -0500
 @@ -0,0 +1,13 @@
 +#!@RCD_SCRIPTS_SHELL@
 +#
 +# PROVIDE: varnishd
 +# REQUIRE: DAEMON
 +
 +. /etc/rc.subr
 +
 +name=3D"varnishd"
 +rcvar=3D$name
 +command=3D"@PREFIX@/sbin/varnishd"
 +
 +load_rc_config $name
 +run_rc_command "$1"
 Index: files/varnishncsa.sh
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- /dev/null =A0 2010-11-29 17:19:26.000000000 -0500
 +++ files/varnishncsa.sh =A0 =A0 =A0 =A02010-11-29 16:49:12.000000000 -0500
 @@ -0,0 +1,14 @@
 +#!@RCD_SCRIPTS_SHELL@
 +#
 +# PROVIDE: varnishncsa
 +# REQUIRE: varnishd
 +
 +. /etc/rc.subr
 +
 +name=3D"varnishncsa"
 +rcvar=3D$name
 +command=3D"@PREFIX@/bin/varnishncsa"
 +commands_args=3D"-D"
 +
 +load_rc_config $name
 +run_rc_command "$1"
 Index: files/varnishlog.sh
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
 --- /dev/null =A0 2010-11-29 17:19:26.000000000 -0500
 +++ files/varnishlog.sh 2010-11-29 16:47:36.000000000 -0500
 @@ -0,0 +1,14 @@
 +#!@RCD_SCRIPTS_SHELL@
 +#
 +# PROVIDE: varnishlog
 +# REQUIRE: varnishd
 +
 +. /etc/rc.subr
 +
 +name=3D"varnishlog"
 +rcvar=3D$name
 +command=3D"@PREFIX@/bin/varnishlog"
 +commands_args=3D"-D"
 +
 +load_rc_config $name
 +run_rc_command "$1"