[arch-commits] Commit in acpid/trunk (PKGBUILD acpid acpid.conf.d)

[Andrea Scarpino]

    Date: Sunday, May 15, 2011 @ 06:48:01
  Author: andrea
Revision: 123976

upgpkg: acpid 2.0.9-1
switch to acpid2

Modified:
  acpid/trunk/PKGBUILD
  acpid/trunk/acpid
Deleted:
  acpid/trunk/acpid.conf.d

--------------+
 PKGBUILD     |   55 ++++++++++++++++++++++++++-----------------------------
 acpid        |    6 ++----
 acpid.conf.d |    6 ------
 3 files changed, 28 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-05-15 10:43:51 UTC (rev 123975)
+++ PKGBUILD	2011-05-15 10:48:01 UTC (rev 123976)
@@ -1,42 +1,39 @@
 # $Id$
-# Maintainer: Thayer Williams <thayer at archlinux.org>
+# Maintainer:
+# Contributor: xduugu
 # Contributor: Manolis Tzanidakis
-# Contributor: Judd Vinet <jvinet at zeroflux.org>
+# Contributor: Jonathan Schmidt <j.schmidt at archlinux.us
 
 pkgname=acpid
-pkgver=1.0.10
-pkgrel=3
-pkgdesc="A daemon for delivering ACPI power management events"
+pkgver=2.0.9
+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)
-backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything' 'etc/conf.d/acpid')
+depends=('bash')
+source=("http://www.tedfelix.com/linux/$pkgname-$pkgver.tar.gz"
+        'acpid'
+        'anything'
+        'handler.sh')
+backup=('etc/acpi/handler.sh' 'etc/acpi/events/anything')
 
 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"
 
-md5sums=('61156ef32015c56dc0f2e3317f4ae09e'
-         'd9ca7f71f520238a0448fab105a23fe9'
-         '91fdb3709c878eed757d192a420251a1'
+  chmod 755 "${pkgdir}"/usr/sbin/acpid
+}
+md5sums=('8b30aa1b31f607161745a4ac7a19699b'
+         '277d6f5199650ac83fd3ad3612f79d2f'
          '2d37b98d6e74bab815604b8b48c6cfd4'
          '0e8dd13793b1baa79a745f4034888367')

Modified: acpid
===================================================================
--- acpid	2011-05-15 10:43:51 UTC (rev 123975)
+++ acpid	2011-05-15 10:48:01 UTC (rev 123976)
@@ -3,13 +3,11 @@
 . /etc/rc.conf
 . /etc/rc.d/functions
 
-[ -f /etc/conf.d/acpid ] && . /etc/conf.d/acpid
-
 PID=`pidof -o %PPID /usr/sbin/acpid`
 case "$1" in
   start)
     stat_busy "Starting acpid"
-    [ -z "$PID" ] && /usr/sbin/acpid $ACPID_ARGS
+    [ -z "$PID" ] && /usr/sbin/acpid
     if [ $? -gt 0 ]; then
       stat_fail
     else
@@ -19,7 +17,7 @@
     ;;
   stop)
     stat_busy "Stopping acpid"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    [ ! -z "$PID" ] && kill $PID &> /dev/null
     if [ $? -gt 0 ]; then
       stat_fail
     else

Deleted: acpid.conf.d
===================================================================
--- acpid.conf.d	2011-05-15 10:43:51 UTC (rev 123975)
+++ acpid.conf.d	2011-05-15 10:48:01 UTC (rev 123976)
@@ -1,6 +0,0 @@
-#
-# Arguments to be passed to the acpid daemon
-#
-
-ACPID_ARGS=""
-