[arch-commits] Commit in squid/repos (extra-i686 extra-i686/PKGBUILD)

[Kevin Piche]

    Date: Tuesday, May 20, 2008 @ 20:13:48
  Author: kevin
Revision: 1818

Merged revisions 2-1817 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/squid/trunk

........
  r356 | aaron | 2008-04-18 18:56:27 -0400 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r1817 | kevin | 2008-05-20 20:13:32 -0400 (Tue, 20 May 2008) | 1 line
  
  upgpkg: squid 2.6.STABLE20-1
........

Modified:
  squid/repos/extra-i686/	(properties)
  squid/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)


Property changes on: squid/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /squid/trunk:1
   + /squid/trunk:1-1817

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-05-21 00:13:32 UTC (rev 1817)
+++ extra-i686/PKGBUILD	2008-05-21 00:13:48 UTC (rev 1818)
@@ -3,7 +3,7 @@
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
 pkgname=squid
-pkgver=2.6.STABLE19
+pkgver=2.6.STABLE20
 pkgrel=1
 pkgdesc="A full-featured Web proxy cache server."
 arch=(i686 x86_64)
@@ -12,15 +12,15 @@
 license=('GPL')
 backup=(etc/squid/squid.conf etc/squid/mime.conf etc/conf.d/squid)
 install=$pkgname.install
-source=(http://www.squid-cache.org/Versions/v2/2.6/$pkgname-$pkgver.tar.bz2 \
-        squid-makefiles.patch squid squid.conf.d squid.pam \
+source=(http://www.squid-cache.org/Versions/v2/2.6/${pkgname}-${pkgver}.tar.bz2
+        squid-makefiles.patch squid squid.conf.d squid.pam
         squid.cron)
-md5sums=('e1f355ab907369903b5e28aff0fe8386' '935309e73d2a9c34cf9871cf1ff2f893'
+md5sums=('6e1d87e9ae47f825c814a954a6febc36' '935309e73d2a9c34cf9871cf1ff2f893'
          'd213b0cc1db72b749bb8c88716fdab39' '81f9a446d143f42c6a3f30304e91c39f'
          '270977cdd9b47ef44c0c427ab9034777' 'f47bb20c7be3089d78e6d2b491f7923b')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
+  cd ${startdir}/src/${pkgname}-${pkgver}
   /usr/bin/patch -Np1 -i ../squid-makefiles.patch
 
   ./configure --prefix=/usr --datadir=/usr/share/squid \
@@ -41,16 +41,16 @@
 #      --enable-async-io --enable-arp-acl \
 
   /usr/bin/make || return 1
-  /usr/bin/make DESTDIR=$startdir/pkg install || return 1
-  /bin/rm -rf $startdir/pkg/var
-  /bin/mv $startdir/pkg/usr/bin/Run* $startdir/pkg/usr/lib/squid
-  /bin/mkdir -p $startdir/pkg/var/cache/squid
-  /bin/mkdir -p $startdir/pkg/var/log/squid
-  /bin/install -D -m755 $startdir/src/squid $startdir/pkg/etc/rc.d/squid
-  /bin/install -D -m755 $startdir/src/squid.cron $startdir/pkg/etc/cron.weekly/squid
-  /bin/install -D -m644 $startdir/src/squid.conf.d $startdir/pkg/etc/conf.d/squid
-  /bin/install -D -m644 $startdir/src/squid.pam $startdir/pkg/etc/pam.d/squid
-  cp $startdir/pkg/etc/squid/squid.conf \
-     $startdir/pkg/etc/squid/squid.conf.default
+  /usr/bin/make DESTDIR=${startdir}/pkg install || return 1
+  /bin/rm -rf ${startdir}/pkg/var
+  /bin/mv ${startdir}/pkg/usr/bin/Run* ${startdir}/pkg/usr/lib/squid
+  /bin/mkdir -p ${startdir}/pkg/var/cache/squid
+  /bin/mkdir -p ${startdir}/pkg/var/log/squid
+  /bin/install -D -m755 ${startdir}/src/squid ${startdir}/pkg/etc/rc.d/squid
+  /bin/install -D -m755 ${startdir}/src/squid.cron ${startdir}/pkg/etc/cron.weekly/squid
+  /bin/install -D -m644 ${startdir}/src/squid.conf.d ${startdir}/pkg/etc/conf.d/squid
+  /bin/install -D -m644 ${startdir}/src/squid.pam ${startdir}/pkg/etc/pam.d/squid
+  cp ${startdir}/pkg/etc/squid/squid.conf \
+     ${startdir}/pkg/etc/squid/squid.conf.default
 }
 # vim: ts=2 sw=2 et ft=sh