diff -uNr --exclude=CVS ../sysutils/conky/Makefile conky/Makefile
--- ../sysutils/conky/Makefile	Fri Oct 19 20:47:28 2007
+++ conky/Makefile	Fri Oct 19 20:33:25 2007
@@ -1,12 +1,8 @@
-# $OpenBSD: Makefile,v 1.2 2007/10/19 12:12:33 jasper Exp $
+# $OpenBSD: Makefile,v 1.1.1.1 2007/10/10 21:20:23 jasper Exp $
 
-# needs apmvar.h
-ONLY_FOR_ARCHS= 	amd64 arm i386 macppc sparc
-
 COMMENT=		light-weight system monitor
 
-DISTNAME=		conky-1.4.7
-PKGNAME=		${DISTNAME}p0
+DISTNAME=		conky-1.4.8
 CATEGORIES=		sysutils
 HOMEPAGE=		http://conky.sourceforge.net/
 
@@ -35,7 +31,6 @@
 CONFIGURE_ARGS+=	--enable-mpd \
 			--enable-rss \
 			--disable-portmon
-
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/conky
 	${INSTALL_DATA} ${WRKSRC}/doc/conkyrc.sample \
diff -uNr --exclude=CVS ../sysutils/conky/distinfo conky/distinfo
--- ../sysutils/conky/distinfo	Thu Oct 11 01:20:23 2007
+++ conky/distinfo	Fri Oct 19 20:33:49 2007
@@ -1,5 +1,5 @@
-MD5 (conky-1.4.7.tar.gz) = SHUICS7aiYpzI3T8FwMrsw==
-RMD160 (conky-1.4.7.tar.gz) = 25bZxnf/7Ze9/enWp4omDmweVV8=
-SHA1 (conky-1.4.7.tar.gz) = fYa+OYAtS/o2DBxBLkIYPXOdcvI=
-SHA256 (conky-1.4.7.tar.gz) = qdjNkLQbU1y8bRwxzMhYvYyh6sAReGjrf6RL/8YSCZo=
-SIZE (conky-1.4.7.tar.gz) = 552600
+MD5 (conky-1.4.8.tar.gz) = a1+op4lj89x5XCkDyWrAVQ==
+RMD160 (conky-1.4.8.tar.gz) = czRApWQRMvNqGVkCO5pM+SeEDxQ=
+SHA1 (conky-1.4.8.tar.gz) = MX2LHoDO3URYTYO6ntbYmmAbpYw=
+SHA256 (conky-1.4.8.tar.gz) = neM4GqoW4vVGkf9uKuufAFPIPq1d80gFCaezuJR4/kk=
+SIZE (conky-1.4.8.tar.gz) = 553556
diff -uNr --exclude=CVS ../sysutils/conky/patches/patch-src_conky_c conky/patches/patch-src_conky_c
--- ../sysutils/conky/patches/patch-src_conky_c	Thu Oct 11 01:20:23 2007
+++ conky/patches/patch-src_conky_c	Fri Oct 19 20:39:52 2007
@@ -15,24 +15,3 @@
  					}
  				}
  				OBJ(freq_g) {
-@@ -3670,9 +3675,17 @@ static void generate_text_internal(char *p, int p_max_
- 				}
- 				OBJ(freq_dyn_g) {
- 					if (use_spacer) {
--						get_freq_dynamic(p, 6, "%'.2f     ", 1000); 
--					} else {
--						get_freq_dynamic(p, p_max_size, "%'.2f", 1000); 
-+#ifndef __OpenBSD__
-+ 						get_freq_dynamic(p, 6, "%'.2f     ", 1000);
-+#else
-+						get_freq_dynamic(p, 6, "%.2f     ", 1000);
-+#endif
-+ 					} else {
-+#ifndef __OpenBSD__
-+ 						get_freq_dynamic(p, p_max_size, "%'.2f", 1000);
-+#else
-+						get_freq_dynamic(p, p_max_size, "%.2f", 1000);
-+#endif
- 					}
- 				}
- #ifndef __OpenBSD__
diff -uNr --exclude=CVS ../sysutils/conky/patches/patch-src_openbsd_c conky/patches/patch-src_openbsd_c
--- ../sysutils/conky/patches/patch-src_openbsd_c	Fri Oct 19 20:47:28 2007
+++ conky/patches/patch-src_openbsd_c	Thu Jan  1 03:00:00 1970
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_openbsd_c,v 1.2 2007/10/19 12:12:33 jasper Exp $
---- src/openbsd.c.orig	Tue Aug 28 21:12:38 2007
-+++ src/openbsd.c	Fri Oct 19 06:09:55 2007
-@@ -497,7 +497,7 @@ get_freq_dynamic(char *p_client_buffer, size_t client_
- 	snprintf(p_client_buffer, client_buffer_size, p_format,
- 		(float)((cycles[1] - cycles[0]) / microseconds) / divisor);
- #else
--	get_freq(p_client_buffer, client_buffer_size, p_format, divisor);
-+	get_freq(p_client_buffer, client_buffer_size, p_format, divisor, 1);
- #endif
- }
-