[arch-commits] Commit in pm-utils/repos (3 files)

[Thayer Williams]

    Date: Sunday, December 7, 2008 @ 15:56:43
  Author: thayer
Revision: 20926

Merged revisions 20925 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/pm-utils/trunk

........
  r20925 | thayer | 2008-12-07 12:56:15 -0800 (Sun, 07 Dec 2008) | 2 lines
  
  upgpkg: pm-utils 1.2.3-2
      patched daemon detection method
........

Added:
  pm-utils/repos/extra-i686/daemons.patch
    (from rev 20925, pm-utils/trunk/daemons.patch)
Modified:
  pm-utils/repos/extra-i686/	(properties)
  pm-utils/repos/extra-i686/PKGBUILD

---------------+
 PKGBUILD      |   17 ++++++++++++-----
 daemons.patch |   11 +++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)


Property changes on: pm-utils/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /pm-utils/trunk:1-20793
   + /pm-utils/trunk:1-20925

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-12-07 20:56:15 UTC (rev 20925)
+++ extra-i686/PKGBUILD	2008-12-07 20:56:43 UTC (rev 20926)
@@ -3,7 +3,7 @@
 
 pkgname=pm-utils
 pkgver=1.2.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Utilities and scripts for suspend and hibernate power management"
 url="http://pm-utils.freedesktop.org"
 license=('GPL')
@@ -11,16 +11,23 @@
 depends=('glibc' 'vbetool' 'procps')
 makedepends=('xmlto')
 source=(http://pm-utils.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
-	11netcfg)
-md5sums=('2a9a9e3de8bcda43c88a9e346866fd55' '9839687c8787d99fd4ff36aa3238c27b')
+	11netcfg
+    daemons.patch)
+md5sums=('2a9a9e3de8bcda43c88a9e346866fd55'
+         '9839687c8787d99fd4ff36aa3238c27b'
+         '67bafe375f385e66bae432b9db914aaf')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
+
+  # make sure Arch Linux daemons are properly handled
+  patch -Np0 -i $srcdir/daemons.patch || return 1
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make || return 1
   make DESTDIR=$pkgdir install || return 1
 
   # install additional hooks
-  install -m755 $srcdir/11netcfg $pkgdir/usr/lib/pm-utils/sleep.d/11netcfg || return 1
+  install -m755 $srcdir/11netcfg $pkgdir/usr/lib/pm-utils/sleep.d/11netcfg
 }
 

Copied: pm-utils/repos/extra-i686/daemons.patch (from rev 20925, pm-utils/trunk/daemons.patch)
===================================================================
--- extra-i686/daemons.patch	                        (rev 0)
+++ extra-i686/daemons.patch	2008-12-07 20:56:43 UTC (rev 20926)
@@ -0,0 +1,11 @@
+--- ./pm/functions.in.bak	2008-12-07 12:05:33.000000000 -0800
++++ ./pm/functions.in	2008-12-07 12:15:20.000000000 -0800
+@@ -141,7 +141,7 @@
+ 
+ stopservice()
+ {
+-	if service "$1" status 2>/dev/null | grep -c -q running; then
++	if [[ -e "/var/run/daemons/$1" ]] || service "$1" status 2>/dev/null | grep -c -q running; then
+ 		touch "${STORAGEDIR}/service:$1"
+ 		service "$1" stop
+ 	fi