From 310edcaf84cb593049e2881413207f854539476d Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Sat, 18 Feb 2006 14:17:23 +0000
Subject: [PATCH] prevent kinfocenter from crashing on pcmcia

---
 x11/kde/utils3/Makefile                                 | 4 ++--
 x11/kde/utils3/patches/patch-klaptopdaemon_portable_cpp | 9 +++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/x11/kde/utils3/Makefile b/x11/kde/utils3/Makefile
index 9c9efb1c365..ca23b191670 100644
--- a/x11/kde/utils3/Makefile
+++ b/x11/kde/utils3/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.37 2006/02/18 13:56:26 espie Exp $
+# $OpenBSD: Makefile,v 1.38 2006/02/18 14:17:23 espie Exp $
 
 COMMENT= 		"K Desktop Environment, utilities"
 CATEGORIES=		x11 x11/kde
 VERSION=		3.5.1
 DISTNAME=		kdeutils-${VERSION}
-PKGNAME=		${DISTNAME}p0
+PKGNAME=		${DISTNAME}p1
 MODKDE_VERSION=		3.5
 SHARED_LIBS=		kcmlaptop		1.0 \
 			khexeditcommon		1.0 \
diff --git a/x11/kde/utils3/patches/patch-klaptopdaemon_portable_cpp b/x11/kde/utils3/patches/patch-klaptopdaemon_portable_cpp
index f7fa06c81e0..b2635663268 100644
--- a/x11/kde/utils3/patches/patch-klaptopdaemon_portable_cpp
+++ b/x11/kde/utils3/patches/patch-klaptopdaemon_portable_cpp
@@ -1,6 +1,6 @@
-$OpenBSD: patch-klaptopdaemon_portable_cpp,v 1.6 2006/02/18 13:56:26 espie Exp $
+$OpenBSD: patch-klaptopdaemon_portable_cpp,v 1.7 2006/02/18 14:17:23 espie Exp $
 --- klaptopdaemon/portable.cpp.orig	Thu Jan 19 17:49:17 2006
-+++ klaptopdaemon/portable.cpp	Sat Feb 18 14:52:52 2006
++++ klaptopdaemon/portable.cpp	Sat Feb 18 15:15:11 2006
 @@ -40,6 +40,7 @@
  //	Linux 		(#if __linux__)
  //	FreeBSD		(#elif __FreeBSD__)
@@ -9,7 +9,7 @@ $OpenBSD: patch-klaptopdaemon_portable_cpp,v 1.6 2006/02/18 13:56:26 espie Exp $
  //	generic nothing	(#else)
  //
  //
-@@ -2769,6 +2770,326 @@ laptop_portable::get_button(LaptopButton
+@@ -2769,6 +2770,323 @@ laptop_portable::get_button(LaptopButton
  	return(0);
  }
  
@@ -196,10 +196,7 @@ $OpenBSD: patch-klaptopdaemon_portable_cpp,v 1.6 2006/02/18 13:56:26 espie Exp $
 +//
 +QLabel *laptop_portable::pcmcia_info(int x, QWidget *parent)
 +{
-+	if (x == 0)
 +		return(new QLabel(i18n("No PCMCIA controller detected"), parent));
-+	else
-+		return 0;
 +}
 +
 +//	puts the system into standby mode