From 4e955d4aeaed9b3151abbf0e4e7f7c17ae7a279d Mon Sep 17 00:00:00 2001
From: David Spencer <baildon.research@googlemail.com>
Date: Mon, 27 Jul 2015 23:14:05 +0100
Subject: network/varnish: Updated for version 4.0.3.

Fixes build failure on -current.

Signed-off-by: David Spencer <baildon.research@googlemail.com>
---
 network/varnish/varnish.SlackBuild | 22 +++++++++++-----------
 network/varnish/varnish.info       |  8 ++++----
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'network/varnish')

diff --git a/network/varnish/varnish.SlackBuild b/network/varnish/varnish.SlackBuild
index a58eb7116b..950474649c 100644
--- a/network/varnish/varnish.SlackBuild
+++ b/network/varnish/varnish.SlackBuild
@@ -5,7 +5,7 @@
 # Written by Matt Schurenko <matt.schurenko@gmail.com>
 
 PRGNAM=varnish
-VERSION=${VERSION:-2.1.5}
+VERSION=${VERSION:-4.0.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -46,20 +46,20 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+sh ./autogen.sh
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-./autogen.sh
-
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
-  --localstatedir=/var \
+  --localstatedir=/var/lib \
   --mandir=/usr/man \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
   --build=$ARCH-slackware-linux
@@ -81,10 +81,10 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
-# copy rc.varnish into ./etc/rc.d/
-mkdir $PKG/etc/rc.d/
+mkdir -p $PKG/etc/varnish/
+cp $PKG/usr/doc/$PRGNAM-$VERSION/example.vcl $PKG/etc/varnish/default.vcl.new
+mkdir -p $PKG/etc/rc.d/
 cp -p $CWD/rc.varnishd $PKG/etc/rc.d/rc.varnishd.new
-mv $PKG/etc/varnish/default.vcl{,.new}
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/varnish/varnish.info b/network/varnish/varnish.info
index bf791b653f..16a1cbae82 100644
--- a/network/varnish/varnish.info
+++ b/network/varnish/varnish.info
@@ -1,10 +1,10 @@
 PRGNAM="varnish"
-VERSION="2.1.5"
+VERSION="4.0.3"
 HOMEPAGE="https://www.varnish-cache.org/"
-DOWNLOAD="http://repo.varnish-cache.org/source/varnish-2.1.5.tar.gz"
-MD5SUM="2d2f227da36a2a240c475304c717b8e3"
+DOWNLOAD="https://repo.varnish-cache.org/source/varnish-4.0.3.tar.gz"
+MD5SUM="16a683f2e41f7d80219cec5d4649380c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="docutils"
 MAINTAINER="Matt Schurenko"
 EMAIL="matt.schurenko@gmail.com"
-- 
cgit v1.2.3