Fix build on alpha.

Submitted by:	gallatin

21 files changed, 371 insertions, 0 deletions

diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 8f5f5bac75df..a8e728ba3557 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -59,6 +59,11 @@ post-extract:
 	@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
 	@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
 
+.if ${MACHINE_ARCH} == "alpha"
+pre-configure:
+	${PERL} -pi -e "s@-O2@-O@g" ${WRKSRC}/admin/acinclude.m4.in
+.endif
+
 post-configure:
 	${PERL} -pi -e "s@444@644@g" ${WRKSRC}/kdesktop/init/Templates/Makefile
 
diff --git a/x11/kde4-baseapps/files/patch-ksysguard-ksysguardd-FreeBSD.apm.c b/x11/kde4-baseapps/files/patch-ksysguard-ksysguardd-FreeBSD.apm.c
new file mode 100644
index 000000000000..aa623966039f
--- /dev/null
+++ b/x11/kde4-baseapps/files/patch-ksysguard-ksysguardd-FreeBSD.apm.c
@@ -0,0 +1,16 @@
+--- ksysguard/ksysguardd/FreeBSD/apm.c.orig	Sat May  4 16:53:10 2002
++++ ksysguard/ksysguardd/FreeBSD/apm.c	Sat May  4 16:53:42 2002
+@@ -18,7 +18,7 @@
+ 
+ 	$Id: apm.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $
+ */
+-
++#ifdef __i386__
+ #include <fcntl.h>
+ #include <machine/apm_bios.h>
+ #include <stdio.h>
+@@ -96,3 +96,4 @@
+ {
+ 	fprintf(CurrentClient, "Remaining battery time\t0\t0\tmin\n");
+ }
++#endif /* __i386__ */
diff --git a/x11/kde4-baseapps/files/patch-ksysguard-ksysguardd-modules.h b/x11/kde4-baseapps/files/patch-ksysguard-ksysguardd-modules.h
new file mode 100644
index 000000000000..ef7ca4c0fef2
--- /dev/null
+++ b/x11/kde4-baseapps/files/patch-ksysguard-ksysguardd-modules.h
@@ -0,0 +1,32 @@
+--- ksysguard/ksysguardd/modules.h.orig	Sat May  4 16:49:24 2002
++++ ksysguard/ksysguardd/modules.h	Sat May  4 16:52:34 2002
+@@ -45,7 +45,9 @@
+ #include "CPU.h"
+ #include "Memory.h"
+ #include "ProcessList.h"
++#ifdef __i386__
+ #include "apm.h"
++#endif
+ #include "diskstat.h"
+ #include "loadavg.h"
+ #include "logfile.h"
+@@ -104,13 +106,19 @@
+ 	{ "CpuInfo", initCpuInfo, exitCpuInfo, updateCpuInfo, NULLVVFUNC },
+ 	{ "Memory", initMemory, exitMemory, updateMemory, NULLVVFUNC },
+ 	{ "ProcessList", initProcessList, exitProcessList, updateProcessList, NULLVVFUNC },
++#ifdef __i386__
+ 	{ "Apm", initApm, exitApm, updateApm, NULLVVFUNC },
++#endif
+ 	{ "DiskStat", initDiskStat, exitDiskStat, updateDiskStat, checkDiskStat },
+ 	{ "LoadAvg", initLoadAvg, exitLoadAvg, updateLoadAvg, NULLVVFUNC },
+ 	{ "LogFile", initLogFile, exitLogFile, NULLVVFUNC, NULLVVFUNC },
+ 	{ "NetDev", initNetDev, exitNetDev, updateNetDev, checkNetDev },
+ };
++#ifdef __i386__
+ #define NUM_MODULES 8
++#else
++#define NUM_MODULES 7
++#endif
+ #endif /* OSTYPE_FreeBSD */
+ 
+ #ifdef OSTYPE_Solaris
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 8f5f5bac75df..a8e728ba3557 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -59,6 +59,11 @@ post-extract:
 	@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
 	@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
 
+.if ${MACHINE_ARCH} == "alpha"
+pre-configure:
+	${PERL} -pi -e "s@-O2@-O@g" ${WRKSRC}/admin/acinclude.m4.in
+.endif
+
 post-configure:
 	${PERL} -pi -e "s@444@644@g" ${WRKSRC}/kdesktop/init/Templates/Makefile
 
diff --git a/x11/kde4-runtime/files/patch-ksysguard-ksysguardd-FreeBSD.apm.c b/x11/kde4-runtime/files/patch-ksysguard-ksysguardd-FreeBSD.apm.c
new file mode 100644
index 000000000000..aa623966039f
--- /dev/null
+++ b/x11/kde4-runtime/files/patch-ksysguard-ksysguardd-FreeBSD.apm.c
@@ -0,0 +1,16 @@
+--- ksysguard/ksysguardd/FreeBSD/apm.c.orig	Sat May  4 16:53:10 2002
++++ ksysguard/ksysguardd/FreeBSD/apm.c	Sat May  4 16:53:42 2002
+@@ -18,7 +18,7 @@
+ 
+ 	$Id: apm.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $
+ */
+-
++#ifdef __i386__
+ #include <fcntl.h>
+ #include <machine/apm_bios.h>
+ #include <stdio.h>
+@@ -96,3 +96,4 @@
+ {
+ 	fprintf(CurrentClient, "Remaining battery time\t0\t0\tmin\n");
+ }
++#endif /* __i386__ */
diff --git a/x11/kde4-runtime/files/patch-ksysguard-ksysguardd-modules.h b/x11/kde4-runtime/files/patch-ksysguard-ksysguardd-modules.h
new file mode 100644
index 000000000000..ef7ca4c0fef2
--- /dev/null
+++ b/x11/kde4-runtime/files/patch-ksysguard-ksysguardd-modules.h
@@ -0,0 +1,32 @@
+--- ksysguard/ksysguardd/modules.h.orig	Sat May  4 16:49:24 2002
++++ ksysguard/ksysguardd/modules.h	Sat May  4 16:52:34 2002
+@@ -45,7 +45,9 @@
+ #include "CPU.h"
+ #include "Memory.h"
+ #include "ProcessList.h"
++#ifdef __i386__
+ #include "apm.h"
++#endif
+ #include "diskstat.h"
+ #include "loadavg.h"
+ #include "logfile.h"
+@@ -104,13 +106,19 @@
+ 	{ "CpuInfo", initCpuInfo, exitCpuInfo, updateCpuInfo, NULLVVFUNC },
+ 	{ "Memory", initMemory, exitMemory, updateMemory, NULLVVFUNC },
+ 	{ "ProcessList", initProcessList, exitProcessList, updateProcessList, NULLVVFUNC },
++#ifdef __i386__
+ 	{ "Apm", initApm, exitApm, updateApm, NULLVVFUNC },
++#endif
+ 	{ "DiskStat", initDiskStat, exitDiskStat, updateDiskStat, checkDiskStat },
+ 	{ "LoadAvg", initLoadAvg, exitLoadAvg, updateLoadAvg, NULLVVFUNC },
+ 	{ "LogFile", initLogFile, exitLogFile, NULLVVFUNC, NULLVVFUNC },
+ 	{ "NetDev", initNetDev, exitNetDev, updateNetDev, checkNetDev },
+ };
++#ifdef __i386__
+ #define NUM_MODULES 8
++#else
++#define NUM_MODULES 7
++#endif
+ #endif /* OSTYPE_FreeBSD */
+ 
+ #ifdef OSTYPE_Solaris
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 8f5f5bac75df..a8e728ba3557 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -59,6 +59,11 @@ post-extract:
 	@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
 	@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
 
+.if ${MACHINE_ARCH} == "alpha"
+pre-configure:
+	${PERL} -pi -e "s@-O2@-O@g" ${WRKSRC}/admin/acinclude.m4.in
+.endif
+
 post-configure:
 	${PERL} -pi -e "s@444@644@g" ${WRKSRC}/kdesktop/init/Templates/Makefile
 
diff --git a/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD.apm.c b/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD.apm.c
new file mode 100644
index 000000000000..aa623966039f
--- /dev/null
+++ b/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD.apm.c
@@ -0,0 +1,16 @@
+--- ksysguard/ksysguardd/FreeBSD/apm.c.orig	Sat May  4 16:53:10 2002
++++ ksysguard/ksysguardd/FreeBSD/apm.c	Sat May  4 16:53:42 2002
+@@ -18,7 +18,7 @@
+ 
+ 	$Id: apm.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $
+ */
+-
++#ifdef __i386__
+ #include <fcntl.h>
+ #include <machine/apm_bios.h>
+ #include <stdio.h>
+@@ -96,3 +96,4 @@
+ {
+ 	fprintf(CurrentClient, "Remaining battery time\t0\t0\tmin\n");
+ }
++#endif /* __i386__ */
diff --git a/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-modules.h b/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-modules.h
new file mode 100644
index 000000000000..ef7ca4c0fef2
--- /dev/null
+++ b/x11/kde4-workspace/files/patch-ksysguard-ksysguardd-modules.h
@@ -0,0 +1,32 @@
+--- ksysguard/ksysguardd/modules.h.orig	Sat May  4 16:49:24 2002
++++ ksysguard/ksysguardd/modules.h	Sat May  4 16:52:34 2002
+@@ -45,7 +45,9 @@
+ #include "CPU.h"
+ #include "Memory.h"
+ #include "ProcessList.h"
++#ifdef __i386__
+ #include "apm.h"
++#endif
+ #include "diskstat.h"
+ #include "loadavg.h"
+ #include "logfile.h"
+@@ -104,13 +106,19 @@
+ 	{ "CpuInfo", initCpuInfo, exitCpuInfo, updateCpuInfo, NULLVVFUNC },
+ 	{ "Memory", initMemory, exitMemory, updateMemory, NULLVVFUNC },
+ 	{ "ProcessList", initProcessList, exitProcessList, updateProcessList, NULLVVFUNC },
++#ifdef __i386__
+ 	{ "Apm", initApm, exitApm, updateApm, NULLVVFUNC },
++#endif
+ 	{ "DiskStat", initDiskStat, exitDiskStat, updateDiskStat, checkDiskStat },
+ 	{ "LoadAvg", initLoadAvg, exitLoadAvg, updateLoadAvg, NULLVVFUNC },
+ 	{ "LogFile", initLogFile, exitLogFile, NULLVVFUNC, NULLVVFUNC },
+ 	{ "NetDev", initNetDev, exitNetDev, updateNetDev, checkNetDev },
+ };
++#ifdef __i386__
+ #define NUM_MODULES 8
++#else
++#define NUM_MODULES 7
++#endif
+ #endif /* OSTYPE_FreeBSD */
+ 
+ #ifdef OSTYPE_Solaris
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 8f5f5bac75df..a8e728ba3557 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -59,6 +59,11 @@ post-extract:
 	@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
 	@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
 
+.if ${MACHINE_ARCH} == "alpha"
+pre-configure:
+	${PERL} -pi -e "s@-O2@-O@g" ${WRKSRC}/admin/acinclude.m4.in
+.endif
+
 post-configure:
 	${PERL} -pi -e "s@444@644@g" ${WRKSRC}/kdesktop/init/Templates/Makefile
 
diff --git a/x11/kdebase3/files/patch-ksysguard-ksysguardd-FreeBSD.apm.c b/x11/kdebase3/files/patch-ksysguard-ksysguardd-FreeBSD.apm.c
new file mode 100644
index 000000000000..aa623966039f
--- /dev/null
+++ b/x11/kdebase3/files/patch-ksysguard-ksysguardd-FreeBSD.apm.c
@@ -0,0 +1,16 @@
+--- ksysguard/ksysguardd/FreeBSD/apm.c.orig	Sat May  4 16:53:10 2002
++++ ksysguard/ksysguardd/FreeBSD/apm.c	Sat May  4 16:53:42 2002
+@@ -18,7 +18,7 @@
+ 
+ 	$Id: apm.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $
+ */
+-
++#ifdef __i386__
+ #include <fcntl.h>
+ #include <machine/apm_bios.h>
+ #include <stdio.h>
+@@ -96,3 +96,4 @@
+ {
+ 	fprintf(CurrentClient, "Remaining battery time\t0\t0\tmin\n");
+ }
++#endif /* __i386__ */
diff --git a/x11/kdebase3/files/patch-ksysguard-ksysguardd-modules.h b/x11/kdebase3/files/patch-ksysguard-ksysguardd-modules.h
new file mode 100644
index 000000000000..ef7ca4c0fef2
--- /dev/null
+++ b/x11/kdebase3/files/patch-ksysguard-ksysguardd-modules.h
@@ -0,0 +1,32 @@
+--- ksysguard/ksysguardd/modules.h.orig	Sat May  4 16:49:24 2002
++++ ksysguard/ksysguardd/modules.h	Sat May  4 16:52:34 2002
+@@ -45,7 +45,9 @@
+ #include "CPU.h"
+ #include "Memory.h"
+ #include "ProcessList.h"
++#ifdef __i386__
+ #include "apm.h"
++#endif
+ #include "diskstat.h"
+ #include "loadavg.h"
+ #include "logfile.h"
+@@ -104,13 +106,19 @@
+ 	{ "CpuInfo", initCpuInfo, exitCpuInfo, updateCpuInfo, NULLVVFUNC },
+ 	{ "Memory", initMemory, exitMemory, updateMemory, NULLVVFUNC },
+ 	{ "ProcessList", initProcessList, exitProcessList, updateProcessList, NULLVVFUNC },
++#ifdef __i386__
+ 	{ "Apm", initApm, exitApm, updateApm, NULLVVFUNC },
++#endif
+ 	{ "DiskStat", initDiskStat, exitDiskStat, updateDiskStat, checkDiskStat },
+ 	{ "LoadAvg", initLoadAvg, exitLoadAvg, updateLoadAvg, NULLVVFUNC },
+ 	{ "LogFile", initLogFile, exitLogFile, NULLVVFUNC, NULLVVFUNC },
+ 	{ "NetDev", initNetDev, exitNetDev, updateNetDev, checkNetDev },
+ };
++#ifdef __i386__
+ #define NUM_MODULES 8
++#else
++#define NUM_MODULES 7
++#endif
+ #endif /* OSTYPE_FreeBSD */
+ 
+ #ifdef OSTYPE_Solaris
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 8f5f5bac75df..a8e728ba3557 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -59,6 +59,11 @@ post-extract:
 	@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
 	@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
 
+.if ${MACHINE_ARCH} == "alpha"
+pre-configure:
+	${PERL} -pi -e "s@-O2@-O@g" ${WRKSRC}/admin/acinclude.m4.in
+.endif
+
 post-configure:
 	${PERL} -pi -e "s@444@644@g" ${WRKSRC}/kdesktop/init/Templates/Makefile
 
diff --git a/x11/kdebase4-runtime/files/patch-ksysguard-ksysguardd-FreeBSD.apm.c b/x11/kdebase4-runtime/files/patch-ksysguard-ksysguardd-FreeBSD.apm.c
new file mode 100644
index 000000000000..aa623966039f
--- /dev/null
+++ b/x11/kdebase4-runtime/files/patch-ksysguard-ksysguardd-FreeBSD.apm.c
@@ -0,0 +1,16 @@
+--- ksysguard/ksysguardd/FreeBSD/apm.c.orig	Sat May  4 16:53:10 2002
++++ ksysguard/ksysguardd/FreeBSD/apm.c	Sat May  4 16:53:42 2002
+@@ -18,7 +18,7 @@
+ 
+ 	$Id: apm.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $
+ */
+-
++#ifdef __i386__
+ #include <fcntl.h>
+ #include <machine/apm_bios.h>
+ #include <stdio.h>
+@@ -96,3 +96,4 @@
+ {
+ 	fprintf(CurrentClient, "Remaining battery time\t0\t0\tmin\n");
+ }
++#endif /* __i386__ */
diff --git a/x11/kdebase4-runtime/files/patch-ksysguard-ksysguardd-modules.h b/x11/kdebase4-runtime/files/patch-ksysguard-ksysguardd-modules.h
new file mode 100644
index 000000000000..ef7ca4c0fef2
--- /dev/null
+++ b/x11/kdebase4-runtime/files/patch-ksysguard-ksysguardd-modules.h
@@ -0,0 +1,32 @@
+--- ksysguard/ksysguardd/modules.h.orig	Sat May  4 16:49:24 2002
++++ ksysguard/ksysguardd/modules.h	Sat May  4 16:52:34 2002
+@@ -45,7 +45,9 @@
+ #include "CPU.h"
+ #include "Memory.h"
+ #include "ProcessList.h"
++#ifdef __i386__
+ #include "apm.h"
++#endif
+ #include "diskstat.h"
+ #include "loadavg.h"
+ #include "logfile.h"
+@@ -104,13 +106,19 @@
+ 	{ "CpuInfo", initCpuInfo, exitCpuInfo, updateCpuInfo, NULLVVFUNC },
+ 	{ "Memory", initMemory, exitMemory, updateMemory, NULLVVFUNC },
+ 	{ "ProcessList", initProcessList, exitProcessList, updateProcessList, NULLVVFUNC },
++#ifdef __i386__
+ 	{ "Apm", initApm, exitApm, updateApm, NULLVVFUNC },
++#endif
+ 	{ "DiskStat", initDiskStat, exitDiskStat, updateDiskStat, checkDiskStat },
+ 	{ "LoadAvg", initLoadAvg, exitLoadAvg, updateLoadAvg, NULLVVFUNC },
+ 	{ "LogFile", initLogFile, exitLogFile, NULLVVFUNC, NULLVVFUNC },
+ 	{ "NetDev", initNetDev, exitNetDev, updateNetDev, checkNetDev },
+ };
++#ifdef __i386__
+ #define NUM_MODULES 8
++#else
++#define NUM_MODULES 7
++#endif
+ #endif /* OSTYPE_FreeBSD */
+ 
+ #ifdef OSTYPE_Solaris
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 8f5f5bac75df..a8e728ba3557 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -59,6 +59,11 @@ post-extract:
 	@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
 	@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
 
+.if ${MACHINE_ARCH} == "alpha"
+pre-configure:
+	${PERL} -pi -e "s@-O2@-O@g" ${WRKSRC}/admin/acinclude.m4.in
+.endif
+
 post-configure:
 	${PERL} -pi -e "s@444@644@g" ${WRKSRC}/kdesktop/init/Templates/Makefile
 
diff --git a/x11/kdebase4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD.apm.c b/x11/kdebase4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD.apm.c
new file mode 100644
index 000000000000..aa623966039f
--- /dev/null
+++ b/x11/kdebase4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD.apm.c
@@ -0,0 +1,16 @@
+--- ksysguard/ksysguardd/FreeBSD/apm.c.orig	Sat May  4 16:53:10 2002
++++ ksysguard/ksysguardd/FreeBSD/apm.c	Sat May  4 16:53:42 2002
+@@ -18,7 +18,7 @@
+ 
+ 	$Id: apm.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $
+ */
+-
++#ifdef __i386__
+ #include <fcntl.h>
+ #include <machine/apm_bios.h>
+ #include <stdio.h>
+@@ -96,3 +96,4 @@
+ {
+ 	fprintf(CurrentClient, "Remaining battery time\t0\t0\tmin\n");
+ }
++#endif /* __i386__ */
diff --git a/x11/kdebase4-workspace/files/patch-ksysguard-ksysguardd-modules.h b/x11/kdebase4-workspace/files/patch-ksysguard-ksysguardd-modules.h
new file mode 100644
index 000000000000..ef7ca4c0fef2
--- /dev/null
+++ b/x11/kdebase4-workspace/files/patch-ksysguard-ksysguardd-modules.h
@@ -0,0 +1,32 @@
+--- ksysguard/ksysguardd/modules.h.orig	Sat May  4 16:49:24 2002
++++ ksysguard/ksysguardd/modules.h	Sat May  4 16:52:34 2002
+@@ -45,7 +45,9 @@
+ #include "CPU.h"
+ #include "Memory.h"
+ #include "ProcessList.h"
++#ifdef __i386__
+ #include "apm.h"
++#endif
+ #include "diskstat.h"
+ #include "loadavg.h"
+ #include "logfile.h"
+@@ -104,13 +106,19 @@
+ 	{ "CpuInfo", initCpuInfo, exitCpuInfo, updateCpuInfo, NULLVVFUNC },
+ 	{ "Memory", initMemory, exitMemory, updateMemory, NULLVVFUNC },
+ 	{ "ProcessList", initProcessList, exitProcessList, updateProcessList, NULLVVFUNC },
++#ifdef __i386__
+ 	{ "Apm", initApm, exitApm, updateApm, NULLVVFUNC },
++#endif
+ 	{ "DiskStat", initDiskStat, exitDiskStat, updateDiskStat, checkDiskStat },
+ 	{ "LoadAvg", initLoadAvg, exitLoadAvg, updateLoadAvg, NULLVVFUNC },
+ 	{ "LogFile", initLogFile, exitLogFile, NULLVVFUNC, NULLVVFUNC },
+ 	{ "NetDev", initNetDev, exitNetDev, updateNetDev, checkNetDev },
+ };
++#ifdef __i386__
+ #define NUM_MODULES 8
++#else
++#define NUM_MODULES 7
++#endif
+ #endif /* OSTYPE_FreeBSD */
+ 
+ #ifdef OSTYPE_Solaris
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 8f5f5bac75df..a8e728ba3557 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -59,6 +59,11 @@ post-extract:
 	@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
 	@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
 
+.if ${MACHINE_ARCH} == "alpha"
+pre-configure:
+	${PERL} -pi -e "s@-O2@-O@g" ${WRKSRC}/admin/acinclude.m4.in
+.endif
+
 post-configure:
 	${PERL} -pi -e "s@444@644@g" ${WRKSRC}/kdesktop/init/Templates/Makefile
 
diff --git a/x11/kdebase4/files/patch-ksysguard-ksysguardd-FreeBSD.apm.c b/x11/kdebase4/files/patch-ksysguard-ksysguardd-FreeBSD.apm.c
new file mode 100644
index 000000000000..aa623966039f
--- /dev/null
+++ b/x11/kdebase4/files/patch-ksysguard-ksysguardd-FreeBSD.apm.c
@@ -0,0 +1,16 @@
+--- ksysguard/ksysguardd/FreeBSD/apm.c.orig	Sat May  4 16:53:10 2002
++++ ksysguard/ksysguardd/FreeBSD/apm.c	Sat May  4 16:53:42 2002
+@@ -18,7 +18,7 @@
+ 
+ 	$Id: apm.c,v 1.2 2001/09/18 14:03:53 tokoe Exp $
+ */
+-
++#ifdef __i386__
+ #include <fcntl.h>
+ #include <machine/apm_bios.h>
+ #include <stdio.h>
+@@ -96,3 +96,4 @@
+ {
+ 	fprintf(CurrentClient, "Remaining battery time\t0\t0\tmin\n");
+ }
++#endif /* __i386__ */
diff --git a/x11/kdebase4/files/patch-ksysguard-ksysguardd-modules.h b/x11/kdebase4/files/patch-ksysguard-ksysguardd-modules.h
new file mode 100644
index 000000000000..ef7ca4c0fef2
--- /dev/null
+++ b/x11/kdebase4/files/patch-ksysguard-ksysguardd-modules.h
@@ -0,0 +1,32 @@
+--- ksysguard/ksysguardd/modules.h.orig	Sat May  4 16:49:24 2002
++++ ksysguard/ksysguardd/modules.h	Sat May  4 16:52:34 2002
+@@ -45,7 +45,9 @@
+ #include "CPU.h"
+ #include "Memory.h"
+ #include "ProcessList.h"
++#ifdef __i386__
+ #include "apm.h"
++#endif
+ #include "diskstat.h"
+ #include "loadavg.h"
+ #include "logfile.h"
+@@ -104,13 +106,19 @@
+ 	{ "CpuInfo", initCpuInfo, exitCpuInfo, updateCpuInfo, NULLVVFUNC },
+ 	{ "Memory", initMemory, exitMemory, updateMemory, NULLVVFUNC },
+ 	{ "ProcessList", initProcessList, exitProcessList, updateProcessList, NULLVVFUNC },
++#ifdef __i386__
+ 	{ "Apm", initApm, exitApm, updateApm, NULLVVFUNC },
++#endif
+ 	{ "DiskStat", initDiskStat, exitDiskStat, updateDiskStat, checkDiskStat },
+ 	{ "LoadAvg", initLoadAvg, exitLoadAvg, updateLoadAvg, NULLVVFUNC },
+ 	{ "LogFile", initLogFile, exitLogFile, NULLVVFUNC, NULLVVFUNC },
+ 	{ "NetDev", initNetDev, exitNetDev, updateNetDev, checkNetDev },
+ };
++#ifdef __i386__
+ #define NUM_MODULES 8
++#else
++#define NUM_MODULES 7
++#endif
+ #endif /* OSTYPE_FreeBSD */
+ 
+ #ifdef OSTYPE_Solaris