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

[Kevin Piché]

    Date: Monday, March 2, 2009 @ 21:14:48
  Author: kevin
Revision: 28938

Merged revisions 21710,28937 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/squid/trunk

........
  r21710 | giovanni | 2008-12-15 04:13:00 -0500 (Mon, 15 Dec 2008) | 1 line
  
  upgpkg: squid 2.7.STABLE5-1
........
  r28937 | kevin | 2009-03-02 21:14:26 -0500 (Mon, 02 Mar 2009) | 1 line
  
  upgpkg: squid 2.7.STABLE6-1
........

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

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


Property changes on: squid/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /squid/trunk:1-21699
   + /squid/trunk:1-28937

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-03-03 02:14:26 UTC (rev 28937)
+++ extra-i686/PKGBUILD	2009-03-03 02:14:48 UTC (rev 28938)
@@ -3,7 +3,7 @@
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
 pkgname=squid
-pkgver=2.7.STABLE5
+pkgver=2.7.STABLE6
 pkgrel=1
 pkgdesc="A full-featured Web proxy cache server."
 arch=(i686 x86_64)
@@ -15,14 +15,13 @@
 source=(http://www.squid-cache.org/Versions/v2/2.7/${pkgname}-${pkgver}.tar.bz2
         squid-makefiles.patch squid squid.conf.d squid.pam
         squid.cron)
-md5sums=('5d495d285b3b951a5859c660463e9832' '082e53bb6e2c79bc44ac95c3d69145da'
+md5sums=('6de3a6a7a56a7ecae092f2d31a04f039' '082e53bb6e2c79bc44ac95c3d69145da'
          'd213b0cc1db72b749bb8c88716fdab39' '81f9a446d143f42c6a3f30304e91c39f'
          '270977cdd9b47ef44c0c427ab9034777' 'f47bb20c7be3089d78e6d2b491f7923b')
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  /usr/bin/patch -Np1 -i ../squid-makefiles.patch
-  exit
+  cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np1 -i ../squid-makefiles.patch
 
   ./configure --prefix=/usr --datadir=/usr/share/squid \
       --sysconfdir=/etc/squid --libexecdir=/usr/lib/squid \
@@ -41,17 +40,17 @@
 #some versions have build problems with both async and truncate enabled:
 #      --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
+  make || return 1
+  make DESTDIR=${pkgdir} install || return 1
+  rm -rf ${pkgdir}/var
+  mv ${pkgdir}/usr/bin/Run* ${startdir}/pkg/usr/lib/squid
+  mkdir -p ${pkgdir}/var/cache/squid
+  mkdir -p ${pkgdir}/var/log/squid
+  install -D -m755 ${srcdir}/squid ${pkgdir}/etc/rc.d/squid
+  install -D -m755 ${srcdir}/squid.cron ${pkgdir}/etc/cron.weekly/squid
+  install -D -m644 ${srcdir}/squid.conf.d ${pkgdir}/etc/conf.d/squid
+  install -D -m644 ${srcdir}/squid.pam ${pkgdir}/etc/pam.d/squid
+  install -D -m644 ${pkgdir}/etc/squid/squid.conf \
+                   ${pkgdir}/etc/squid/squid.conf.default
 }
 # vim: ts=2 sw=2 et ft=sh