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

Jan de Groot jgc at archlinux.org
Wed Dec 26 09:07:41 EST 2007


    Date: Wednesday, December 26, 2007 @ 09:07:41
  Author: jgc
    Path: /home/cvs-extra/extra/system/pm-utils

   Added: 11netcfg (1.1) pm-utils-0.99.3-cfg.patch (1.1)
Modified: PKGBUILD (1.3 -> 1.4) no-usleep.patch (1.1 -> 1.2)

upgpkg: pm-utils 0.99.4-1
Update to 0.99.4
- Fix homepage
- Remove 60sysfont, as it requires redhatisms
- Add 11netcfg for Netcfg2 support
- Add vbetool and procps dependencies
- Remove conflict/provide/replace on powersaved, some people really use it


---------------------------+
 11netcfg                  |   26 ++++++++++++++++++++++++++
 PKGBUILD                  |   35 +++++++++++++++++++----------------
 no-usleep.patch           |   36 +++++++++++++++++-------------------
 pm-utils-0.99.3-cfg.patch |   11 +++++++++++
 4 files changed, 73 insertions(+), 35 deletions(-)


Index: extra/system/pm-utils/11netcfg
diff -u /dev/null extra/system/pm-utils/11netcfg:1.1
--- /dev/null	Wed Dec 26 09:07:41 2007
+++ extra/system/pm-utils/11netcfg	Wed Dec 26 09:07:40 2007
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+. /usr/lib/pm-utils/functions
+
+suspend_netcfg() {
+	netcfg2 all-suspend
+}
+
+resume_netcfg() {
+	netcfg2 all-resume
+}
+
+if [ -x /usr/bin/netcfg2 ]; then
+	case "$1" in
+		hibernate|suspend)
+			suspend_netcfg
+			;;
+		thaw|resume)
+			resume_netcfg
+			;;
+		*)
+			;;
+	esac
+fi
+
+exit $?
Index: extra/system/pm-utils/PKGBUILD
diff -u extra/system/pm-utils/PKGBUILD:1.3 extra/system/pm-utils/PKGBUILD:1.4
--- extra/system/pm-utils/PKGBUILD:1.3	Sat Aug 25 06:05:56 2007
+++ extra/system/pm-utils/PKGBUILD	Wed Dec 26 09:07:40 2007
@@ -1,29 +1,32 @@
-#$Id: PKGBUILD,v 1.3 2007/08/25 10:05:56 jgc Exp $
+#$Id: PKGBUILD,v 1.4 2007/12/26 14:07:40 jgc Exp $
 #Maintainer: Jan de Groot <jgc at archlinux.org>
 pkgname=pm-utils
-pkgver=0.99.3
-pkgrel=2
+pkgver=0.99.4
+pkgrel=1
 pkgdesc="Utilities and scripts for power management"
 arch=('i686' 'x86_64')
-url="http://en.opensuse.org/Pm-utils"
+url="http://pm-utils.freedesktop.org"
 license=('GPL')
-depends=('glibc')
-conflicts=('powersave')
-replaces=('powersave')
-provides=('powersave')
+depends=('glibc' 'vbetool' 'procps')
 install=pm-utils.install
-source=(http://www.archlinux.org/~jgc/pm-utils/${pkgname}-${pkgver}.tar.bz2
+source=(http://ftp.archlinux.org/other/pm-utils/${pkgname}-${pkgver}.tar.gz
+	pm-utils-0.99.3-cfg.patch
 	no-usleep.patch
-	service.patch)
-md5sums=('e363d72a5ede525e225b40fb7e399c4c'
-         'd4c163a61d37a0e46d23d13cdecad9bb'
-         'b5bc7f0c50f4405d7dee53e365d7adca')
+	service.patch
+	11netcfg)
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np0 -i ${startdir}/src/no-usleep.patch || return 1
+  patch -Np1 -i ${startdir}/src/pm-utils-0.99.3-cfg.patch || return 1
+  patch -Np1 -i ${startdir}/src/no-usleep.patch || return 1
   patch -Np0 -i ${startdir}/src/service.patch || return 1
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var || return 1
   make || return 1
-  make DESTDIR=${startdir}/pkg install
+  make DESTDIR=${startdir}/pkg install || return 1
+
+  #Remove unsupported hooks
+  rm -f ${startdir}/pkg/usr/lib/pm-utils/sleep.d/60sysfont || return 1
+
+  #Install additional hooks
+  install -m755 ${startdir}/src/11netcfg ${startdir}/pkg/usr/lib/pm-utils/sleep.d/11netcfg || return 1
 }
Index: extra/system/pm-utils/no-usleep.patch
diff -u extra/system/pm-utils/no-usleep.patch:1.1 extra/system/pm-utils/no-usleep.patch:1.2
--- extra/system/pm-utils/no-usleep.patch:1.1	Sat Aug 25 06:05:59 2007
+++ extra/system/pm-utils/no-usleep.patch	Wed Dec 26 09:07:40 2007
@@ -1,21 +1,7 @@
-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 @@
+diff -ruN pm-utils-0.99.4.orig/pm/functions pm-utils-0.99.4/pm/functions
+--- pm-utils-0.99.4.orig/pm/functions	2007-05-15 14:55:58.000000000 +0000
++++ pm-utils-0.99.4/pm/functions	2007-12-26 13:17:15.000000000 +0000
+@@ -52,7 +52,7 @@
  	rm -f /var/run/pm-suspend
  	chvt 1
  	chvt $VT
@@ -24,7 +10,7 @@
  }
  
  find_sleepd_files()
-@@ -167,7 +197,7 @@
+@@ -153,7 +153,7 @@
  
  	run_hooks "$2" reverse
  
@@ -33,3 +19,15 @@
  
  	return 0
  }
+diff -ruN pm-utils-0.99.4.orig/pm/hooks/99video pm-utils-0.99.4/pm/hooks/99video
+--- pm-utils-0.99.4.orig/pm/hooks/99video	2007-06-18 20:39:53.000000000 +0000
++++ pm-utils-0.99.4/pm/hooks/99video	2007-12-26 13:17:53.000000000 +0000
+@@ -47,7 +47,7 @@
+ 	# We might need to do one or many of these quirks
+ 	if [ "${DISPLAY_QUIRK_VBE_POST}" == "true" ]; then
+ 		vbe post
+-		usleep 100000
++		usleep 0.1
+ 	fi
+ 	if [ "${DISPLAY_QUIRK_VBESTATE_RESTORE}" == "true" ]; then
+ 		vbe vbestate restore < /var/run/vbestate
Index: extra/system/pm-utils/pm-utils-0.99.3-cfg.patch
diff -u /dev/null extra/system/pm-utils/pm-utils-0.99.3-cfg.patch:1.1
--- /dev/null	Wed Dec 26 09:07:41 2007
+++ extra/system/pm-utils/pm-utils-0.99.3-cfg.patch	Wed Dec 26 09:07:41 2007
@@ -0,0 +1,11 @@
+--- pm-utils-0.99.3/pm/functions.cfg	2007-05-29 15:40:55.000000000 +0200
++++ pm-utils-0.99.3/pm/functions	2007-05-29 15:41:22.000000000 +0200
+@@ -24,7 +24,7 @@
+ {
+ 	cfgs="/etc/pm/config.d/*[^~]"
+ 	for cfg in $cfgs ; do
+-		[ -f $cfgs ] || continue
++		[ -f $cfg ] || continue
+ 		set -a
+ 		. $cfg
+ 		set +a




More information about the arch-commits mailing list