[arch-commits] Commit in bash/trunk (PKGBUILD)

[Allan McRae]

    Date: Saturday, October 30, 2010 @ 05:23:09
  Author: allan
Revision: 97433

upgpkg: bash 4.1.009-1
upstream patch level bump

Modified:
  bash/trunk/PKGBUILD

----------+
 PKGBUILD |   28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-10-30 09:20:36 UTC (rev 97432)
+++ PKGBUILD	2010-10-30 09:23:09 UTC (rev 97433)
@@ -1,8 +1,9 @@
 # $Id$
 # Maintainer: Aaron Griffin <aaron at archlinux.org>
+# Maintainer: Allan McRae <allan at archlinux.org>
 
 pkgname=bash
-_patchlevel=007 #prepare for some patches
+_patchlevel=009 #prepare for some patches
 pkgver=4.1.$_patchlevel
 pkgrel=1
 pkgdesc="The GNU Bourne Again shell"
@@ -12,7 +13,6 @@
 groups=('base')
 backup=(etc/profile.bash etc/skel/.bashrc etc/skel/.bash_profile)
 depends=('readline>=6.1' 'glibc')
-makedepends=(gzip)
 provides=('sh')
 install=bash.install
 source=(http://ftp.gnu.org/gnu/bash/bash-4.1.tar.gz
@@ -21,7 +21,7 @@
         enable-system-config-files.patch
         system.bashrc)
 if [ $_patchlevel -gt 000 ]; then
-    for (( p=1; p<=$_patchlevel; p++ )); do
+    for (( p=1; p<=$((10#${_patchlevel})); p++ )); do
         source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-4.1-patches/bash41-$(printf "%03d" $p))
     done
 fi
@@ -31,19 +31,24 @@
   for p in ../bash41-*; do
     [ -e "$p" ] || continue
     msg "applying patch ${p}"
-    patch -Np0 -i ${p} || return 1
+    patch -Np0 -i ${p}
   done
 
-  patch -Np0 -i $srcdir/enable-system-config-files.patch || return 1
+  patch -Np0 -i $srcdir/enable-system-config-files.patch
 
   ./configure --prefix=/usr --with-curses --enable-readline \
     --without-bash-malloc --with-installed-readline \
     --bindir=/bin --mandir=/usr/share/man --infodir=/usr/share/info
-  make || return 1
+  make
+  make check
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-4.1
   make DESTDIR=${pkgdir} install
 
-  install -D -m644 ${srcdir}/profile.bash ${pkgdir}/etc/profile.bash || return 1
-  install -D -m644 ${srcdir}/system.bashrc ${pkgdir}/etc/bash.bashrc || return 1
+  install -Dm644 ${srcdir}/profile.bash ${pkgdir}/etc/profile.bash
+  install -Dm644 ${srcdir}/system.bashrc ${pkgdir}/etc/bash.bashrc
 
   # for now, bash is our default /bin/sh
   cd ${pkgdir}/bin
@@ -53,7 +58,7 @@
   install -D -m644 ${srcdir}/bashrc ${pkgdir}/etc/skel/.bashrc
   echo ". \$HOME/.bashrc" >${pkgdir}/etc/skel/.bash_profile
 }
-
+    
 md5sums=('9800d8724815fd84994d9be65ab5e7b8'
          '17f20ec69535a2f50f2112a8c700630d'
          '3d2837e84645eac9bde399b58014bafa'
@@ -65,5 +70,6 @@
          '336ee037fc2cc1e2350b05097fbdc87c'
          '9471e666797f0b03eb2175ed752a9550'
          'fb80ccd58cb1e34940f3adf4ce6e4a1e'
-         '192a8b161d419a1d0d211169f1d1046e')
-
+         '192a8b161d419a1d0d211169f1d1046e'
+         '1dc5a0253827decbe6aa529cde83e154'
+         'ea361b842b7405a7f5ebbabbdf74372f')