Thu May 19 22:46:30 UTC 2011

4 files changed, 33 insertions, 33 deletions

diff --git a/extra/acpid/PKGBUILD b/extra/acpid/PKGBUILD
index fd927c84c..f6cefe7b7 100644
--- a/extra/acpid/PKGBUILD
+++ b/extra/acpid/PKGBUILD
@@ -1,42 +1,43 @@
-# $Id: PKGBUILD 65410 2010-01-28 20:47:17Z ibiru $
-# Maintainer: Thayer Williams <thayer@archlinux.org>
+# $Id: PKGBUILD 124267 2011-05-18 16:31:02Z andrea $
+# Maintainer:
+# Contributor: xduugu
 # Contributor: Manolis Tzanidakis
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
+# Contributor: Jonathan Schmidt <j.schmidt@archlinux.us
 
 pkgname=acpid
-pkgver=1.0.10
-pkgrel=3
-pkgdesc="A daemon for delivering ACPI power management events"
+pkgver=2.0.10
+pkgrel=1
+pkgdesc="A daemon for delivering ACPI power management events with netlink support"
 arch=('i686' 'x86_64')
-url="http://acpid.sourceforge.net"
+url="http://tedfelix.com/linux/acpid-netlink.html"
 license=('GPL')
-depends=(glibc)
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
-    acpid
-    acpid.conf.d
-    anything
-    handler.sh)
+depends=('bash')
+source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.gz"
+        'acpid'
+        'anything'
+        'handler.sh'
+        'acpid.conf.d')
+replaces=('acpid2')
 backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything' 'etc/conf.d/acpid')
 
 build() {
-    cd $srcdir/$pkgname-$pkgver
-    /usr/bin/make || return 1
-    /bin/install -d -m0755 $pkgdir/usr/bin || return 1
-    /usr/bin/make INSTPREFIX=$pkgdir \
-        MAN8DIR=$pkgdir/usr/share/man/man8 install || return 1
+  cd "${srcdir}"/$pkgname-$pkgver
+  make
+}
 
-    # install our supplementary scripts
-    /bin/install -D -m0755 $srcdir/acpid $pkgdir/etc/rc.d/acpid || return 1
-    /bin/install -D -m0644 $srcdir/acpid.conf.d $pkgdir/etc/conf.d/acpid || return 1
-    /bin/install -D -m0644 $srcdir/anything $pkgdir/etc/acpi/events/anything || return 1
-    /bin/install -D -m0755 $srcdir/handler.sh $pkgdir/etc/acpi/handler.sh || return 1
+package() {
+  cd "${srcdir}"/$pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
 
-    # set world readable bit on the acpid binary
-    /bin/chmod 755 $pkgdir/usr/sbin/acpid || return 1
-}
+  install -Dm755 "$srcdir/acpid" "$pkgdir/etc/rc.d/acpid"
+  install -Dm644 "$srcdir/anything" "$pkgdir/etc/acpi/events/anything"
+  install -Dm755 "$srcdir/handler.sh" "$pkgdir/etc/acpi/handler.sh"
+  install -Dm644 "$srcdir/acpid.conf.d" "$pkgdir/etc/conf.d/acpid"
 
-md5sums=('61156ef32015c56dc0f2e3317f4ae09e'
-         'd9ca7f71f520238a0448fab105a23fe9'
-         '91fdb3709c878eed757d192a420251a1'
+  chmod 755 "${pkgdir}"/usr/sbin/acpid
+}
+md5sums=('d5dd88bcfaa4a0bf51905e95115da6df'
+         '955490c4db5233ec44461db694b873a4'
          '2d37b98d6e74bab815604b8b48c6cfd4'
-         '0e8dd13793b1baa79a745f4034888367')
+         '7b2e4c299af5eb87e1a81c07b6916c97'
+         '929c6d2e91295c22ed9ec6212d7eabef')
diff --git a/extra/acpid/acpid b/extra/acpid/acpid
index 9a4ab8ac7..9177c8207 100644
--- a/extra/acpid/acpid
+++ b/extra/acpid/acpid
@@ -19,7 +19,7 @@ case "$1" in
     ;;
   stop)
     stat_busy "Stopping acpid"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
     if [ $? -gt 0 ]; then
       stat_fail
     else
diff --git a/extra/acpid/acpid.conf.d b/extra/acpid/acpid.conf.d
index 25c9cc1ef..b60103a2d 100644
--- a/extra/acpid/acpid.conf.d
+++ b/extra/acpid/acpid.conf.d
@@ -3,4 +3,3 @@
 #
 
 ACPID_ARGS=""
-
diff --git a/extra/acpid/handler.sh b/extra/acpid/handler.sh
index ad31d1aa9..518a62dea 100644
--- a/extra/acpid/handler.sh
+++ b/extra/acpid/handler.sh
@@ -26,7 +26,7 @@ case "$1" in
         ;;
     ac_adapter)
         case "$2" in
-            AC)
+            AC|ACAD|ADP0)
                 case "$4" in
                     00000000)
                         echo -n $minspeed >$setspeed