From 5dcbd147559ee79a34f5f065c7ac59dd2564c9c6 Mon Sep 17 00:00:00 2001
From: rillig <rillig>
Date: Fri, 4 Feb 2005 13:00:09 +0000
Subject: Replaced the call to killall(1) by a call to pgrep(1)/kill(1) to make
 the "Restart" button work on NetBSD (and still on Linux). Bumped PKGREVISION.

Reviewed by wiz.
---
 wm/icepref/Makefile         | 4 ++--
 wm/icepref/distinfo         | 4 ++--
 wm/icepref/patches/patch-ab | 9 ++++-----
 3 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'wm')

diff --git a/wm/icepref/Makefile b/wm/icepref/Makefile
index b5efeb44263..2866f1ef680 100644
--- a/wm/icepref/Makefile
+++ b/wm/icepref/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2004/12/15 17:03:58 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2005/02/04 13:00:09 rillig Exp $
 #
 
 DISTNAME=	icepref-1.1
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	wm
 MASTER_SITES=	ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/
 
diff --git a/wm/icepref/distinfo b/wm/icepref/distinfo
index 77bc693d6e0..afa2f431d08 100644
--- a/wm/icepref/distinfo
+++ b/wm/icepref/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2002/11/23 23:23:52 wiz Exp $
+$NetBSD: distinfo,v 1.5 2005/02/04 13:00:09 rillig Exp $
 
 SHA1 (icepref-1.1.tar.gz) = 025c0390f7acb6768ee0b41c733bf9a3e59949b8
 Size (icepref-1.1.tar.gz) = 29418 bytes
 SHA1 (patch-aa) = 0dd492ea8cf440a0076986245f61ddf1281a526a
-SHA1 (patch-ab) = d10a096c1a15a1ea4e56283c44276492a2d39b80
+SHA1 (patch-ab) = 6e0f9cfff26daceeaff1233d7b34e0a264a58f70
diff --git a/wm/icepref/patches/patch-ab b/wm/icepref/patches/patch-ab
index 6b17913e5a8..3661dbac503 100644
--- a/wm/icepref/patches/patch-ab
+++ b/wm/icepref/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.2 2002/11/23 23:23:53 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2005/02/04 13:00:10 rillig Exp $
 
 --- icepref.orig	Thu Jan  6 00:16:04 2000
 +++ icepref
@@ -11,18 +11,17 @@ $NetBSD: patch-ab,v 1.2 2002/11/23 23:23:53 wiz Exp $
  	    
  	    if DEBUG:
  		print 'The icewm execuatable is located at %s' % exec_path
-@@ -1898,8 +1898,8 @@
+@@ -1898,8 +1898,7 @@
  		# work on other non Linux systems.  Under Debian, this function requires
  		# the installation of the psmisc package.
  		
 -		os.system('killall -HUP -q icewm')
 -		os.system('killall -HUP -q icewm-gnome')
-+		os.system('killall -HUP icewm')
-+		os.system('killall -HUP icewm-gnome')
++		os.system('kill -HUP `pgrep icewm; pgrep icewm-gnome`')
  	
  	# this is the callback for the OK button
  	
-@@ -2090,7 +2090,7 @@
+@@ -2090,7 +2089,7 @@
  			button.show()
  			
  			# Disable the Restart button in the OS is BSD or the user is root
-- 
cgit v1.2.3