[arch-commits] CVS update of extra/system/pm-utils (3 files)

[Jan de Groot]

    Date: Saturday, August 25, 2007 @ 06:06:00
  Author: jgc
    Path: /home/cvs-extra/extra/system/pm-utils

   Added: no-usleep.patch (1.1) service.patch (1.1)
Modified: PKGBUILD (1.2 -> 1.3)

upgpkg: pm-utils 0.99.3-2


-----------------+
 PKGBUILD        |   13 ++++++++++---
 no-usleep.patch |   35 +++++++++++++++++++++++++++++++++++
 service.patch   |   13 +++++++++++++
 3 files changed, 58 insertions(+), 3 deletions(-)


Index: extra/system/pm-utils/PKGBUILD
diff -u extra/system/pm-utils/PKGBUILD:1.2 extra/system/pm-utils/PKGBUILD:1.3
--- extra/system/pm-utils/PKGBUILD:1.2	Fri Jun 22 09:27:13 2007
+++ extra/system/pm-utils/PKGBUILD	Sat Aug 25 06:05:56 2007
@@ -1,8 +1,8 @@
-#$Id: PKGBUILD,v 1.2 2007/06/22 13:27:13 varun Exp $
+#$Id: PKGBUILD,v 1.3 2007/08/25 10:05:56 jgc Exp $
 #Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=pm-utils
 pkgver=0.99.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Utilities and scripts for power management"
 arch=('i686' 'x86_64')
 url="http://en.opensuse.org/Pm-utils"
@@ -12,10 +12,17 @@
 replaces=('powersave')
 provides=('powersave')
 install=pm-utils.install
-source=(http://www.archlinux.org/~jgc/pm-utils/${pkgname}-${pkgver}.tar.bz2)
+source=(http://www.archlinux.org/~jgc/pm-utils/${pkgname}-${pkgver}.tar.bz2
+	no-usleep.patch
+	service.patch)
+md5sums=('e363d72a5ede525e225b40fb7e399c4c'
+         'd4c163a61d37a0e46d23d13cdecad9bb'
+         'b5bc7f0c50f4405d7dee53e365d7adca')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
+  patch -Np0 -i ${startdir}/src/no-usleep.patch || return 1
+  patch -Np0 -i ${startdir}/src/service.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
   make || return 1
   make DESTDIR=${startdir}/pkg install
Index: extra/system/pm-utils/no-usleep.patch
diff -u /dev/null extra/system/pm-utils/no-usleep.patch:1.1
--- /dev/null	Sat Aug 25 06:05:59 2007
+++ extra/system/pm-utils/no-usleep.patch	Sat Aug 25 06:05:59 2007
@@ -0,0 +1,35 @@
+Index: pm/hooks/99video
+===================================================================
+--- pm/hooks/99video	(Revision 2646)
++++ pm/hooks/99video	(Arbeitskopie)
+@@ -36,7 +36,7 @@
+ 	# We might need to do one or many of these quirks
+ 	if [ "${DISPLAY_QUIRK_VBE_POST}" == "true" ]; then
+ 		vbe post </dev/tty0
+-		usleep 100000
++		sleep 0.1
+ 	fi
+ 	if [ "${DISPLAY_QUIRK_VBESTATE_RESTORE}" == "true" ]; then
+ 		vbe vbestate restore < /var/run/vbestate
+Index: pm/functions
+===================================================================
+--- pm/functions	(revision 2764)
++++ pm/functions	(working copy)
+@@ -66,7 +74,7 @@
+ 	rm -f /var/run/pm-suspend
+ 	chvt 1
+ 	chvt $VT
+-	openvt -- sh -c "usleep $1 ; rm -f /.suspended >/dev/null 2>&1 0<&1" >/dev/null 2>&1 0<&1 &
++	openvt -- sh -c "sleep $1 ; rm -f /.suspended >/dev/null 2>&1 0<&1" >/dev/null 2>&1 0<&1 &
+ }
+ 
+ find_sleepd_files()
+@@ -167,7 +197,7 @@
+ 
+ 	run_hooks "$2" reverse
+ 
+-	remove_suspend_lock 200
++	remove_suspend_lock 0.0002
+ 
+ 	return 0
+ }
Index: extra/system/pm-utils/service.patch
diff -u /dev/null extra/system/pm-utils/service.patch:1.1
--- /dev/null	Sat Aug 25 06:05:59 2007
+++ extra/system/pm-utils/service.patch	Sat Aug 25 06:05:59 2007
@@ -0,0 +1,13 @@
+--- pm/functions~	2007-08-25 10:02:02.000000000 +0000
++++ pm/functions	2007-08-25 10:03:28.000000000 +0000
+@@ -217,8 +217,8 @@
+ _service=$(type -p service)
+ if [ -z "$_service" ]; then
+ 	service() {
+-		if [ -x "/etc/init.d/$1" ]; then
+-			"/etc/init.d/$@"
++		if [ -x "/etc/rc.d/$1" ]; then
++			"/etc/rc.d/$@"
+ 		else
+ 			echo "$1" $": unrecognized service" 1>&2
+ 			return 1