Clifford Wolf:

package/x86/apmd/skip_xapm.patch → package/x86/apmd/makefile-fixes.patch

@@ -1,24 +1,24 @@
 # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
+#
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 # Please add additional copyright information _after_ the line containing
 # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
 # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/x86/apmd/skip_xapm.patch
+#
+# ROCK Linux: rock-src/package/x86/apmd/makefile-fixes.patch
 # ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
-# 
+#
 # This patch file is dual-licensed. It is available under the license the
 # patched project is licensed under, as long as it is an OpenSource license
 # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
 # of the GNU General Public License as published by the Free Software
 # Foundation; either version 2 of the License, or (at your option) any later
 # version.
-# 
+#
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
---- ./Makefile.orig	2002-07-25 08:37:45.000000000 +0200
-+++ ./Makefile	2002-07-25 08:39:39.000000000 +0200
+--- ./Makefile.orig	2005-12-20 12:13:15.000000000 +0100
++++ ./Makefile	2005-12-20 12:13:49.000000000 +0100
 @@ -28,7 +28,10 @@
  .SUFFIXES:
  
@@ -31,9 +31,22 @@
  HEADERS=apm.h
  
  PREFIX=/usr
-@@ -94,8 +97,10 @@
+@@ -37,8 +40,7 @@
+ 
+ CC=gcc
+ CFLAGS=-O -g
+-XTRACFLAGS=-Wall -pipe -I. -I/usr/src/linux/include \
+-		-I/usr/src/linux-2.2/include -I /usr/src/linux-2.0/include \
++XTRACFLAGS=-Wall -pipe -I. -I/usr/include \
+ 		-DVERSION=\"$(VERSION)\" \
+ 		-DAPMD_PROXY_NAME=\"$(APMD_PROXY_DIR)/apmd_proxy\"
+ LDFLAGS=
+@@ -92,10 +94,12 @@
+ 	install        on_ac_power     ${PREFIX}/bin
+ 	install -m 644 apm.1           ${MANDIR}/man1
  	install        apmd            ${PREFIX}/sbin
- 	install -b -Vt apmd_proxy      ${APMD_PROXY_DIR}
+-	install -b -Vt apmd_proxy      ${APMD_PROXY_DIR}
++	install -b     apmd_proxy      ${APMD_PROXY_DIR}
  	install -m 644 apmd.8          ${MANDIR}/man8
 +ifndef SKIP_XAPM
  	install        xapm            ${PREFIX}/bin

package/x86/apmd/z-afterskipxapm-makefile-notdirectlyusing-kernelheaders.patch

@@ -1,32 +0,0 @@
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-# 
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-# 
-# ROCK Linux: rock-src/package/x86/apmd/z-afterskipxapm-makefile-notdirectlyusing-kernelheaders.patch
-# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
-# 
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-# 
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-diff -Nur ../apmd-orig/Makefile ./Makefile
---- ../apmd-orig/Makefile	2004-11-17 15:39:40.257616840 +0100
-+++ ./Makefile	2004-11-17 15:41:42.929967808 +0100
-@@ -37,8 +37,7 @@
- 
- CC=gcc
- CFLAGS=-O -g
--XTRACFLAGS=-Wall -pipe -I. -I/usr/src/linux/include \
--		-I/usr/src/linux-2.2/include -I /usr/src/linux-2.0/include \
-+XTRACFLAGS=-Wall -pipe -I. -I/usr/include \
- 		-DVERSION=\"$(VERSION)\" \
- 		-DAPMD_PROXY_NAME=\"$(APMD_PROXY_DIR)/apmd_proxy\"
- LDFLAGS=