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

[Eric Bélanger]

    Date: Sunday, December 7, 2008 @ 20:01:39
  Author: eric
Revision: 20932

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

........
  r20793 | thayer | 2008-12-06 16:48:35 -0500 (Sat, 06 Dec 2008) | 2 lines
  
  upgpkg: pm-utils 1.2.3-1
      upstream modularized the init system--Yay one less patch
........
  r20925 | thayer | 2008-12-07 15:56:15 -0500 (Sun, 07 Dec 2008) | 2 lines
  
  upgpkg: pm-utils 1.2.3-2
      patched daemon detection method
........
  r20927 | thayer | 2008-12-07 15:57:56 -0500 (Sun, 07 Dec 2008) | 2 lines
  
  upgpkg: pm-utils 1.2.3-3
      pkgbuild cosmetics
........

Added:
  pm-utils/repos/extra-x86_64/daemons.patch
    (from rev 20927, pm-utils/trunk/daemons.patch)
Modified:
  pm-utils/repos/extra-x86_64/	(properties)
  pm-utils/repos/extra-x86_64/PKGBUILD
Deleted:
  pm-utils/repos/extra-x86_64/service.patch

---------------+
 PKGBUILD      |   25 ++++++++++++++-----------
 daemons.patch |   11 +++++++++++
 service.patch |   15 ---------------
 3 files changed, 25 insertions(+), 26 deletions(-)


Property changes on: pm-utils/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /pm-utils/trunk:1-19265
   + /pm-utils/trunk:1-20931

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-12-08 01:00:41 UTC (rev 20931)
+++ extra-x86_64/PKGBUILD	2008-12-08 01:01:39 UTC (rev 20932)
@@ -2,29 +2,32 @@
 #Maintainer: Thayer Williams <thayer at archlinux.org>
 
 pkgname=pm-utils
-pkgver=1.2.2.1
-pkgrel=2
-pkgdesc="Utilities and scripts for power management"
+pkgver=1.2.3
+pkgrel=3
+pkgdesc="Utilities and scripts for suspend and hibernate power management"
 arch=('i686' 'x86_64')
 url="http://pm-utils.freedesktop.org"
 license=('GPL')
 depends=('glibc' 'vbetool' 'procps')
 makedepends=('xmlto')
 source=(http://pm-utils.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
-	service.patch
-	11netcfg)
-md5sums=('dcc7bde623d0bae207158e153b7394a8'
-         'bf6560934c4efa79143c91dcca5a07b8'
-         '9839687c8787d99fd4ff36aa3238c27b')
+	11netcfg
+    daemons.patch)
+md5sums=('2a9a9e3de8bcda43c88a9e346866fd55'
+         '9839687c8787d99fd4ff36aa3238c27b'
+         '67bafe375f385e66bae432b9db914aaf')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  patch -Np0 -i $srcdir/service.patch || return 1
-  ./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-x86_64/daemons.patch (from rev 20927, pm-utils/trunk/daemons.patch)
===================================================================
--- extra-x86_64/daemons.patch	                        (rev 0)
+++ extra-x86_64/daemons.patch	2008-12-08 01:01:39 UTC (rev 20932)
@@ -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

Deleted: extra-x86_64/service.patch
===================================================================
--- extra-x86_64/service.patch	2008-12-08 01:00:41 UTC (rev 20931)
+++ extra-x86_64/service.patch	2008-12-08 01:01:39 UTC (rev 20932)
@@ -1,15 +0,0 @@
---- pm/functions.in	2008-10-03 19:14:35.000000000 -0700
-+++ pm/functions.in~	2008-10-04 16:44:21.000000000 -0700
-@@ -129,10 +129,10 @@
- if ! command_exists service; then
- 	service()
- 	{
--		if [ -x "/etc/init.d/$1" ]; then
-+		if [ -x "/etc/rc.d/$1" ]; then
- 			svc="$1"
- 			shift
--			"/etc/init.d/$svc" "$@"
-+			"/etc/rc.d/$svc" "$@"
- 		else
- 			log "${1}: unrecognized service"
- 			return 1