4 files changed, 67 insertions, 1 deletions
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index c23041544434..f8130fc231fc 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -48,7 +48,7 @@ CONFIGURE_ARGS+=	--disable-double-buffer
 .endif
 
 post-extract:
-	${REINPLACE_CMD} -e "s|== xyes|= xyes|g" ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e "s|== xyes|= xyes|g" ${WRKSRC}/configure
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/conky ${PREFIX}/bin
diff --git a/sysutils/conky/files/patch-src-conky.c b/sysutils/conky/files/patch-src-conky.c
new file mode 100644
index 000000000000..830f4a377f27
--- /dev/null
+++ b/sysutils/conky/files/patch-src-conky.c
@@ -0,0 +1,31 @@
+--- src/conky.c.orig	Fri Sep  2 21:55:33 2005
++++ src/conky.c	Fri Sep  2 21:54:07 2005
+@@ -846,7 +846,7 @@
+ 	OBJ_upspeedgraph,
+ 	OBJ_uptime,
+ 	OBJ_uptime_short,
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(i386) || defined(__i386__)
+ 	OBJ_apm_adapter,
+ 	OBJ_apm_battery_time,
+ 	OBJ_apm_battery_life,
+@@ -1688,8 +1688,8 @@
+ 	}
+ 	END OBJ(uptime_short, INFO_UPTIME) END OBJ(uptime, INFO_UPTIME) END
+ 	    OBJ(adt746xcpu, 0) END OBJ(adt746xfan, 0) END
+-#ifdef __FreeBSD__
+-	OBJ(apm_adapter, 0) END
++#if defined(__FreeBSD__) || defined(i386) || defined(__i386__)
++        OBJ(apm_adapter, 0) END
+ 	OBJ(apm_battery_life, 0) END
+ 	OBJ(apm_battery_time, 0) END
+ #endif /* __FreeBSD__ */
+@@ -2715,7 +2715,7 @@
+ 				format_seconds(p, n, (int) cur->uptime);
+ 			}
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(i386) || defined(__i386__)
+ 			OBJ(apm_adapter) {
+ 				snprintf(p, n, "%s", get_apm_adapter());
+ 			}
diff --git a/sysutils/conky/files/patch-src-conky.h b/sysutils/conky/files/patch-src-conky.h
new file mode 100644
index 000000000000..285e3ce8412a
--- /dev/null
+++ b/sysutils/conky/files/patch-src-conky.h
@@ -0,0 +1,20 @@
+--- src/conky.h.orig	Fri Sep  2 21:46:54 2005
++++ src/conky.h	Fri Sep  2 21:47:46 2005
+@@ -30,7 +30,7 @@
+ #endif
+ #endif /* X11 */
+ 
+-#if defined(__FreeBSD__)
++#if defined(__FreeBSD__) || defined(i386) || defined(__i386__)
+ #include <machine/apm_bios.h>
+ #endif /* __FreeBSD__ */
+ 
+@@ -360,7 +360,7 @@
+ #endif
+ 
+ /* in freebsd.c */
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(i386) || defined(__i386__)
+ int apm_getinfo(int fd, apm_info_t aip);
+ char *get_apm_adapter(void);
+ char *get_apm_battery_life(void);
diff --git a/sysutils/conky/files/patch-src-freebsd.c b/sysutils/conky/files/patch-src-freebsd.c
new file mode 100644
index 000000000000..cd8607ca2a48
--- /dev/null
+++ b/sysutils/conky/files/patch-src-freebsd.c
@@ -0,0 +1,15 @@
+--- src/freebsd.c.orig	Fri Sep  2 21:43:44 2005
++++ src/freebsd.c	Fri Sep  2 21:48:28 2005
+@@ -590,6 +590,7 @@
+ 		return;
+ }
+ 
++#if defined(i386) || defined(__i386__)
+ #define APMDEV  "/dev/apm"
+ #define APM_UNKNOWN     255
+ 
+@@ -706,3 +707,4 @@
+ 
+ 	return out;
+ }
++#endif