From 285011f145a99341eb95a5eeaee0cb2b69a4381c Mon Sep 17 00:00:00 2001
From: chris <chris>
Date: Fri, 4 Oct 2002 00:14:18 +0000
Subject: Make klaptopdaemon build with __NetBSD_APM__ where appropriate.

Also update patch-an so that 1.6 and -current systems work.

Based on and should fix pkg/18447.
---
 misc/kdeutils3/Makefile         |  7 ++++++-
 misc/kdeutils3/distinfo         |  4 ++--
 misc/kdeutils3/patches/patch-an | 11 +++++++----
 3 files changed, 15 insertions(+), 7 deletions(-)

(limited to 'misc/kdeutils3')

diff --git a/misc/kdeutils3/Makefile b/misc/kdeutils3/Makefile
index 779b71ca731..21ee8b88adf 100644
--- a/misc/kdeutils3/Makefile
+++ b/misc/kdeutils3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/10/02 04:46:46 markd Exp $
+# $NetBSD: Makefile,v 1.6 2002/10/04 00:14:18 chris Exp $
 
 DISTNAME=	kdeutils-3.0.3
 COMMENT=	Utilities for the KDE integrated X11 desktop
@@ -15,6 +15,11 @@ LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
 post-install:
 	${CHMOD} -s ${PREFIX}/bin/efax
 
+.if ${OPSYS} == "NetBSD" && exists(/usr/include/machine/apmvar.h)
+CPPFLAGS+=             -D__NetBSD_APM__
+.endif
+
+
 .include "../../x11/kde3/buildlink2.mk"
 .include "../../x11/kdebase3/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/kdeutils3/distinfo b/misc/kdeutils3/distinfo
index 9711ef5144b..64ebdb8abaf 100644
--- a/misc/kdeutils3/distinfo
+++ b/misc/kdeutils3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2002/08/28 07:15:37 skrll Exp $
+$NetBSD: distinfo,v 1.5 2002/10/04 00:14:19 chris Exp $
 
 SHA1 (kdeutils-3.0.3.tar.bz2) = 5fccce1430fc4203a03feed4e9851ba0b01cb293
 Size (kdeutils-3.0.3.tar.bz2) = 1515313 bytes
@@ -15,4 +15,4 @@ SHA1 (patch-aj) = 1e6833cfb320f353e62e7be5ccae18deac8b8aef
 SHA1 (patch-ak) = 1199959fd27b5084094c065f377cd48747bd8102
 SHA1 (patch-al) = 289d94cf7ae64565639250a0e29662074466c8b3
 SHA1 (patch-am) = 1f9931d683654159686151206db4c628253e875e
-SHA1 (patch-an) = ecb2787f4bff098723095823cee190872db06321
+SHA1 (patch-an) = ffd5589988aaa4e581cdfa9bfb7bdb9067f505fe
diff --git a/misc/kdeutils3/patches/patch-an b/misc/kdeutils3/patches/patch-an
index e455dcbecad..b0e801b7bea 100644
--- a/misc/kdeutils3/patches/patch-an
+++ b/misc/kdeutils3/patches/patch-an
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
+$NetBSD: patch-an,v 1.2 2002/10/04 00:14:19 chris Exp $
 
---- klaptopdaemon/portable.cpp.orig	Wed Jan  9 12:11:32 2002
-+++ klaptopdaemon/portable.cpp
-@@ -857,6 +857,238 @@
+--- klaptopdaemon/portable.cpp.orig	Sat Jan 26 17:58:32 2002
++++ klaptopdaemon/portable.cpp	Thu Oct  3 23:42:47 2002
+@@ -857,6 +857,241 @@
  {
  	return(1);
  }
@@ -41,6 +41,7 @@ $NetBSD: patch-an,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
 +	}
 +
 +	struct apm_power_info info;
++	memset(&info, 0, sizeof(info));
 +	ret=ioctl(fd, APM_IOC_GETPOWER, &info);
 +	::close(fd);
 +
@@ -62,6 +63,7 @@ $NetBSD: patch-an,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
 +	  return 0;
 +
 +	struct apm_power_info info;
++	memset(&info, 0, sizeof(info));
 +	ret=ioctl(fd, APM_IOC_GETPOWER, &info);
 +	::close(fd);
 +
@@ -212,6 +214,7 @@ $NetBSD: patch-an,v 1.1.1.1 2002/05/31 13:42:36 skrll Exp $
 +         	goto bad;
 +
 +       	struct apm_power_info info;
++	memset(&info, 0, sizeof(info));
 +       	ret=ioctl(fd, APM_IOC_GETPOWER, &info);
 +       	::close(fd);
 +	
-- 
cgit v1.2.3