From 4aef0a374e20e36cf2bf6e779d93789d9a5791ae Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Mon, 10 Dec 2012 02:17:21 -0800
Subject: Mon Dec 10 02:14:35 PST 2012

---
 core/pcmciautils/PKGBUILD                | 21 ++++++++++-----------
 core/pcmciautils/initcpio-install-pcmcia |  8 ++++----
 2 files changed, 14 insertions(+), 15 deletions(-)

(limited to 'core/pcmciautils')

diff --git a/core/pcmciautils/PKGBUILD b/core/pcmciautils/PKGBUILD
index fcc599665..8cf902069 100644
--- a/core/pcmciautils/PKGBUILD
+++ b/core/pcmciautils/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 155725 2012-04-06 00:03:55Z tomegun $
+# $Id: PKGBUILD 173074 2012-12-10 03:04:40Z dreisner $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=pcmciautils
 pkgver=018
-pkgrel=4
+pkgrel=5
 pkgdesc="Utilities for inserting and removing PCMCIA cards"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 url="http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html"
 license=('GPL')
 groups=('base')
@@ -13,23 +13,22 @@ groups=('base')
 depends=('udev' 'sysfsutils')
 conflicts=('pcmcia-cs')
 # source=(http://kernel.org/pub/linux/utils/kernel/pcmcia/${pkgname}-${pkgver}.tar.bz2) broken due to breakin
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz
-	initcpio-install-pcmcia)
+source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz
+        initcpio-install-pcmcia)
 options=(!makeflags)
+md5sums=('964c802994677a71b38ec56554aa229f'
+         '041af04025daee5b3b05812ac3896c8f')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "$pkgname-$pkgver"
   sed -i -e 's,/usr/bin/install,install,g;
              s,/lib/udev,/usr/lib/udev,g' Makefile
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
+  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
 
   # install the mkinitpcio hook
-  install -D -m644 ../initcpio-install-pcmcia ${pkgdir}/usr/lib/initcpio/install/pcmcia
+  install -Dm644 initcpio-install-pcmcia "$pkgdir/usr/lib/initcpio/install/pcmcia"
 }
-md5sums=('964c802994677a71b38ec56554aa229f'
-         '2659576a4637c58c4e79a96f8e43e316')
diff --git a/core/pcmciautils/initcpio-install-pcmcia b/core/pcmciautils/initcpio-install-pcmcia
index 71052d6b2..af89c4c9c 100644
--- a/core/pcmciautils/initcpio-install-pcmcia
+++ b/core/pcmciautils/initcpio-install-pcmcia
@@ -1,14 +1,14 @@
 #!/bin/bash
 
 build() {
-    FILES="/etc/pcmcia/config.opts"
-    MODULES=" $(checked_modules '/drivers/pcmcia/' | grep -ve 'sound' -e 'net') $(checked_modules '/ide/legacy')"
-
-    [[ $MODULES ]] && MODULES+=" sd_mod?"
+    if add_checked_modules -f 'sound|net' '/drivers/pcmcia/'; then
+        add_module 'sd_mod?'
+    fi
 
     add_binary "/usr/lib/udev/pcmcia-socket-startup"
     add_binary "/usr/lib/udev/pcmcia-check-broken-cis"
     add_file "/usr/lib/udev/rules.d/60-pcmcia.rules"
+    add_file "/etc/pcmcia/config.opts"
 }
 
 help() {
-- 
cgit v1.2.3-54-g00ecf