From ebd1d1551aae67862e9453784a3dff37f427d208 Mon Sep 17 00:00:00 2001
From: David Somero <dsomero@hotmail.com>
Date: Tue, 10 Aug 2010 01:34:37 +0100
Subject: network/squid: Updated for version 3.1.6.

Signed-off-by: Michiel van Wessem <michiel@slackbuilds.org>
---
 network/squid/squid.SlackBuild | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'network/squid/squid.SlackBuild')

diff --git a/network/squid/squid.SlackBuild b/network/squid/squid.SlackBuild
index 83b4597579..5c69c1e71c 100644
--- a/network/squid/squid.SlackBuild
+++ b/network/squid/squid.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=squid
-VERSION=3.0.STABLE24
+VERSION=3.1.6
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -83,7 +83,9 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc/squid \
   --localstatedir=/var/log/squid \
   --datadir=/usr/share/squid \
+  --with-pidfile=/var/run/squid \
   --mandir=/usr/man \
+  --with-logdir=/var/log/squid \
   --enable-snmp \
   --enable-auth="basic" \
   --enable-basic-auth-helpers="NCSA" \
@@ -97,10 +99,8 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $(find $PKG/usr/man -type l); do ln -s $(readlink $i).gz $i.gz; rm $i; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION 
 cp -a \
@@ -124,7 +124,6 @@ rm $PKG/etc/squid/squid.conf
 cat $CWD/squid.conf > $PKG/etc/squid/squid.conf.new
 
 mkdir -p $PKG/var/{cache,run}/squid
-rmdir $PKG/var/log/squid/logs
 chown $SQUIDUSER:$SQUIDGROUP $PKG/var/{cache,log,run}/squid
 
 ## Edit the config file to set the user and group to run as
-- 
cgit v1.2.3