diff -uNr --exclude=CVS ../sysutils/conky/Makefile conky/Makefile
--- ../sysutils/conky/Makefile	Wed Nov 14 05:52:40 2007
+++ conky/Makefile	Thu Jan 10 11:32:04 2008
@@ -1,18 +1,17 @@
-# $OpenBSD: Makefile,v 1.3 2007/11/13 20:05:00 jasper Exp $
+# $OpenBSD$
 
 # needs apmvar.h
-ONLY_FOR_ARCHS= 	amd64 arm i386 macppc sparc
+ONLY_FOR_ARCHS=	amd64 arm i386 macppc sparc
 
-COMMENT=		light-weight system monitor
+COMMENT=	light-weight system monitor
 
-DISTNAME=		conky-1.4.7
-PKGNAME=		${DISTNAME}p1
-CATEGORIES=		sysutils
-HOMEPAGE=		http://conky.sourceforge.net/
+DISTNAME=	conky-1.4.9
+CATEGORIES=	sysutils
+HOMEPAGE=	http://conky.sourceforge.net/
 
-MAINTAINER=		Vlad Glagolev <stealth@sourcemage.org>
+MAINTAINER=	Vlad Glagolev <stealth@sourcemage.org>
 
-MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=conky/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=conky/}
 
 # GPL
 PERMIT_PACKAGE_CDROM=   Yes
@@ -23,19 +22,21 @@
 WANTLIB=	X11 Xau Xdamage Xdmcp Xext Xfixes Xft Xrender c crypto \
 		expat fontconfig freetype kvm m ossaudio pthread ssl z
 
-MODULES=		devel/gettext
+MODULES=	devel/gettext
 
-LIB_DEPENDS=		glib-2.0::devel/glib2 \
-			curl,idn::net/curl \
-			xml2::textproc/libxml
+LIB_DEPENDS=	glib-2.0::devel/glib2 \
+		pcre::devel/pcre \
+		curl,idn::net/curl \
+		xml2::textproc/libxml
 
-USE_LIBTOOL=		Yes
-USE_X11=		Yes
-CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS+=	--enable-mpd \
-			--enable-rss \
-			--disable-portmon
+USE_LIBTOOL=	Yes
+USE_X11=	Yes
 
+CONFIGURE_STYLE=gnu
+CONFIGURE_ARGS+=--enable-mpd \
+		--enable-rss \
+		--disable-portmon
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/conky
 	${INSTALL_DATA} ${WRKSRC}/doc/conkyrc.sample \
@@ -43,5 +44,7 @@
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/conky
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${PREFIX}/share/doc/conky
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/conky
+
+FAKE_FLAGS=	configdir=${PREFIX}/share/examples/conky
 
 .include <bsd.port.mk>
diff -uNr --exclude=CVS ../sysutils/conky/distinfo conky/distinfo
--- ../sysutils/conky/distinfo	Thu Oct 11 01:20:23 2007
+++ conky/distinfo	Sun Nov 25 21:47:42 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.9.tar.gz) = i75GuPdwXNGB9dqgvEgP+Q==
+RMD160 (conky-1.4.9.tar.gz) = hCbAPqZAjoUzpRdGQRyssO4cymA=
+SHA1 (conky-1.4.9.tar.gz) = Oz5QzxEfyhKXgEPoTMiaOFD6mag=
+SHA256 (conky-1.4.9.tar.gz) = cvJqWyKUMGQtel0cviCSIbHdibhTsjPihd2ox6DlQ9g=
+SIZE (conky-1.4.9.tar.gz) = 560961
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	Thu Jan 10 11:31:53 2008
@@ -1,4 +1,4 @@
-$OpenBSD: patch-src_conky_c,v 1.1.1.1 2007/10/10 21:20:23 jasper Exp $
+$OpenBSD$
 --- src/conky.c.orig	Fri Aug 31 04:05:03 2007
 +++ src/conky.c	Fri Sep 28 18:57:07 2007
 @@ -3602,7 +3602,12 @@ static void generate_text_internal(char *p, int p_max_
@@ -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
- }
- 
diff -uNr --exclude=CVS ../sysutils/conky/pkg/PLIST conky/pkg/PLIST
--- ../sysutils/conky/pkg/PLIST	Thu Oct 11 01:20:23 2007
+++ conky/pkg/PLIST	Tue Dec 11 15:39:37 2007
@@ -6,4 +6,7 @@
 share/doc/conky/docs.html
 share/doc/conky/variables.html
 share/examples/conky/
+@sample ${SYSCONFDIR}/conky/
+share/examples/conky/conky.conf
+@sample ${SYSCONFDIR}/conky/conky.conf
 share/examples/conky/conkyrc.sample