[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Trivial fix for kde/utils3/klaptopdaemon on macppc
This is essentially a one-line change, plus a few comment fixes,
that lets klaptopdaemon work on macppc.
Ian
Index: patches/patch-klaptopdaemon_portable_cpp
===================================================================
RCS file: /cvs/ports/x11/kde/utils3/patches/patch-klaptopdaemon_portable_cpp,v
retrieving revision 1.1
diff -u -r1.1 patch-klaptopdaemon_portable_cpp
--- patches/patch-klaptopdaemon_portable_cpp 2003/01/27 20:05:50 1.1
+++ patches/patch-klaptopdaemon_portable_cpp 2003/02/26 23:20:13
@@ -1,19 +1,30 @@
$OpenBSD: patch-klaptopdaemon_portable_cpp,v 1.1 2003/01/27 20:05:50 espie Exp $
---- klaptopdaemon/portable.cpp.orig Sun Oct 27 00:23:22 2002
-+++ klaptopdaemon/portable.cpp Wed Jan 1 15:36:18 2003
-@@ -1321,6 +1321,245 @@ int laptop_portable::poll_activity()
+--- klaptopdaemon/portable.cpp.orig Fri Jan 3 00:07:53 2003
++++ klaptopdaemon/portable.cpp Wed Feb 26 18:19:51 2003
+@@ -40,6 +40,7 @@
+ // Linux (#if __linux__)
+ // FreeBSD (#elif __FreeBSD__)
+ // NetBSD (#elif __NetBSD_APM__)
++// OpenBSD (#elif __OpenBSD__)
+ // generic nothing (#else)
+ //
+ //
+@@ -1327,6 +1328,248 @@ int laptop_portable::poll_activity()
{
return(1);
}
+
-+#elif (__OpenBSD__ && (__i386__ || __macppc__))
++#elif (__OpenBSD__ && (__i386__ || _ARCH_PPC))
++ /* This tries to get OpenBSD i386 and MacPPC, but will
++ * cause some grumpies on other PPC-based arches.
++ */
+
+/*
+ * OpenBSD support for klaptopdaemon by Ian Darwin
+ * based on my KDE2 "kapm" program; some error handling
+ * patterned on the FreeBSD code above.
+ *
-+ * Note that you must NOT run apmd as this code uses the
++ * Note that you must NOT run apmd because this code uses the
+ * APM control device directly; maybe a later version
+ * will talk to apmd instead.
+ */