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

[Stéphane Gaudreault]

    Date: Tuesday, March 8, 2011 @ 09:24:47
  Author: stephane
Revision: 113400

upgpkg: pcmciautils 017-2
Rebuild of old package, Tidy up PKGBUILD

Modified:
  pcmciautils/trunk/PKGBUILD

----------+
 PKGBUILD |   20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-03-08 14:23:39 UTC (rev 113399)
+++ PKGBUILD	2011-03-08 14:24:47 UTC (rev 113400)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=pcmciautils
 pkgver=017
-pkgrel=1
+pkgrel=2
 pkgdesc="Utilities for inserting and removing PCMCIA cards"
 arch=(i686 x86_64)
 url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html"
@@ -10,19 +10,23 @@
 groups=('base')
 depends=('glibc' 'sysfsutils' 'module-init-tools>=3.2pre9')
 conflicts=('pcmcia-cs')
-source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-$pkgver.tar.bz2 
-	60-pcmcia.rules)
+source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${pkgver}.tar.bz2
+        60-pcmcia.rules)
 options=(!makeflags)
 md5sums=('5245af28eeba57ec0606a874d44d10f7'
          'f88ac464ab9c75fe1565af551e6553a2')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "${srcdir}/${pkgname}-${pkgver}"
   sed -i -e 's,/usr/bin/install,/bin/install,g' Makefile
-  make || return 1
-  make DESTDIR=$pkgdir install || return 1
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
   # fix lspcmcia symlink
-  ln -sf pccardctl $pkgdir/sbin/lspcmcia
+  ln -sf pccardctl "${pkgdir}"/sbin/lspcmcia
   # add fixed rules file
-  install -D -m644 $srcdir/60-pcmcia.rules $pkgdir/lib/udev/rules.d/
+  install -D -m644 "${srcdir}"/60-pcmcia.rules "${pkgdir}"/lib/udev/rules.d/
 }