diff --git a/sysutils/gkrellm/gkrellm/Makefile b/sysutils/gkrellm/gkrellm/Makefile
index c3c01d82b69..6788d89add7 100644
--- a/sysutils/gkrellm/gkrellm/Makefile
+++ b/sysutils/gkrellm/gkrellm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.45 2009/03/05 08:06:28 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.46 2009/03/09 22:42:07 sthen Exp $
 
 SHARED_ONLY=	Yes
 
@@ -7,8 +7,8 @@ COMMENT-client=	single process stack of system monitors for GTK+2
 
 V=		2.3.2
 DISTNAME=	gkrellm-${V}
-PKGNAME-main=	gkrellm-server-${V}p2
-PKGNAME-client=	gkrellm-${V}p2
+PKGNAME-main=	gkrellm-server-${V}p3
+PKGNAME-client=	gkrellm-${V}p3
 CATEGORIES=	sysutils sysutils/gkrellm
 
 MAINTAINER=	Antoine Jacoutot <ajacoutot@openbsd.org>
@@ -38,15 +38,14 @@ WRKBUILD=	${WRKDIST}/server
 .endif
 
 MODULES=		devel/gettext
-LIB_DEPENDS=		glib-2.0,gmodule-2.0,gthread-2.0::devel/glib2
+LIB_DEPENDS=		gio-2.0,glib-2.0,gmodule-2.0,gobject-2.0,gthread-2.0::devel/glib2
 LIB_DEPENDS-client=	${LIB_DEPENDS} \
 			gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2
 
-WANTLIB-client=		${WANTLIB} ICE SM X11 Xau Xcursor Xdmcp Xfixes Xi \
-			Xinerama Xrandr crypto expat fontconfig freetype \
-			Xext Xrender glitz png z Xcomposite Xdamage \
-			atk-1.0 gobject-2.0 m pango-1.0 \
-			pangocairo-1.0 pangoft2-1.0 ssl cairo pixman-1
+WANTLIB-client += ${WANTLIB} ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp
+WANTLIB-client += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 cairo crypto
+WANTLIB-client += expat fontconfig freetype glitz m pango-1.0 pangocairo-1.0
+WANTLIB-client += pangoft2-1.0 pixman-1 png ssl z
 
 NO_REGRESS=	Yes
 USE_GMAKE=	Yes
diff --git a/sysutils/gkrellm/plugins/aclock/Makefile b/sysutils/gkrellm/plugins/aclock/Makefile
index 80cf7fcba05..6d8230b22bd 100644
--- a/sysutils/gkrellm/plugins/aclock/Makefile
+++ b/sysutils/gkrellm/plugins/aclock/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.14 2008/06/06 10:27:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2009/03/09 22:42:07 sthen Exp $
 
 COMMENT=	analog clock for GkrellM2
 
 V=		0.3.3
 DISTNAME=	gkrellaclock-${V}
-PKGNAME=	${DISTNAME}p8
+PKGNAME=	${DISTNAME}p9
 CATEGORIES=	misc
 
 HOMEPAGE=	http://www.geocities.com/m_muthukumar/gkrellaclock.html
diff --git a/sysutils/gkrellm/plugins/bgchg/Makefile b/sysutils/gkrellm/plugins/bgchg/Makefile
index fc8f5aaf577..08b1b4f6683 100644
--- a/sysutils/gkrellm/plugins/bgchg/Makefile
+++ b/sysutils/gkrellm/plugins/bgchg/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.18 2008/06/06 10:27:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.19 2009/03/09 22:42:07 sthen Exp $
 
 COMMENT=	change background image with GkrellM2
 
 DISTNAME=	gkrellmbgchg2-0.1.3
-PKGNAME=	${DISTNAME}p9
+PKGNAME=	${DISTNAME}p10
 CATEGORIES=	x11
 
 HOMEPAGE=	http://www.bender-suhl.de/stefan/english/comp/gkrellmbgchg.html
diff --git a/sysutils/gkrellm/plugins/itime/Makefile b/sysutils/gkrellm/plugins/itime/Makefile
index 15946efedbb..7ad2477077a 100644
--- a/sysutils/gkrellm/plugins/itime/Makefile
+++ b/sysutils/gkrellm/plugins/itime/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2008/06/06 10:27:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2009/03/09 22:42:07 sthen Exp $
 
 COMMENT=	GkrellM2 plugin that shows Internet time
 
 V=		1.0.1
 DISTNAME=	gkrellmitime-${V}
-PKGNAME=	${DISTNAME}p9
+PKGNAME=	${DISTNAME}p10
 CATEGORIES=	net
 
 ALL_TARGET=	gkrellm_itime.so
diff --git a/sysutils/gkrellm/plugins/launch/Makefile b/sysutils/gkrellm/plugins/launch/Makefile
index aea4e0cb973..881f25126ca 100644
--- a/sysutils/gkrellm/plugins/launch/Makefile
+++ b/sysutils/gkrellm/plugins/launch/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2008/06/06 10:27:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2009/03/09 22:42:07 sthen Exp $
 
 COMMENT=	launch commonly used apps from GkrellM2
 
 DISTNAME=	gkrellmlaunch-0.5
-PKGNAME=	${DISTNAME}p9
+PKGNAME=	${DISTNAME}p10
 CATEGORIES=	x11
 
 HOMEPAGE=	http://gkrellmlaunch.sourceforge.net/
diff --git a/sysutils/gkrellm/plugins/mailwatch/Makefile b/sysutils/gkrellm/plugins/mailwatch/Makefile
index 66f5568627c..9d5bf76dcde 100644
--- a/sysutils/gkrellm/plugins/mailwatch/Makefile
+++ b/sysutils/gkrellm/plugins/mailwatch/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.14 2008/06/06 10:27:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2009/03/09 22:42:07 sthen Exp $
 
 COMMENT=	GkrellM2 plugin to monitor multiple mailboxes
 
 V=		2.4.3
 DISTNAME=	gkrellm-mailwatch-${V}
-PKGNAME=	gkrellmmailwatch-${V}p0
+PKGNAME=	gkrellmmailwatch-${V}p1
 CATEGORIES=	mail
 
 HOMEPAGE=	http://gkrellm.luon.net/mailwatch.phtml
diff --git a/sysutils/gkrellm/plugins/mms/Makefile b/sysutils/gkrellm/plugins/mms/Makefile
index 6f5d2f58aae..88e773516bf 100644
--- a/sysutils/gkrellm/plugins/mms/Makefile
+++ b/sysutils/gkrellm/plugins/mms/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.17 2008/06/06 10:27:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.18 2009/03/09 22:42:07 sthen Exp $
 
 COMMENT=	XMMS plugin for Gkrellm2
 
 DISTNAME=	gkrellmms-2.1.21
-PKGNAME=	${DISTNAME}p8
+PKGNAME=	${DISTNAME}p9
 CATEGORIES=	audio
 
 HOMEPAGE=	http://gkrellm.luon.net/gkrellmms.phtml
diff --git a/sysutils/gkrellm/plugins/moon/Makefile b/sysutils/gkrellm/plugins/moon/Makefile
index 76bf052ef87..7d8966a09a9 100644
--- a/sysutils/gkrellm/plugins/moon/Makefile
+++ b/sysutils/gkrellm/plugins/moon/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2008/06/06 10:27:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2009/03/09 22:42:07 sthen Exp $
 
 COMMENT=	phase of the Moon for GkrellM2
 
 DISTNAME=	gkrellmoon-0.6
-PKGNAME=	${DISTNAME}p9
+PKGNAME=	${DISTNAME}p10
 CATEGORIES=	astro
 
 HOMEPAGE=	http://gkrellmoon.sourceforge.net/
diff --git a/sysutils/gkrellm/plugins/mss/Makefile b/sysutils/gkrellm/plugins/mss/Makefile
index d078915cbbd..542fff08a1e 100644
--- a/sysutils/gkrellm/plugins/mss/Makefile
+++ b/sysutils/gkrellm/plugins/mss/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.19 2008/06/06 10:27:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.20 2009/03/09 22:42:07 sthen Exp $
 
 COMMENT=	soundscope for GkrellM2 using ESD
 
 DISTNAME=	gkrellmss-2.6
-PKGNAME=	${DISTNAME}p9
+PKGNAME=	${DISTNAME}p10
 CATEGORIES=	audio
 
 HOMEPAGE=http://members.dslextreme.com/users/billw/gkrellmss/gkrellmss.html
@@ -19,6 +19,6 @@ PLUGIN=		${WRKSRC}/src/gkrellmss.so
 CONFIGURE_STYLE=	gnu
 WRKCONF=${WRKSRC}/src
 
-EXTRA_WANTLIB=	audiofile
+EXTRA_WANTLIB=	audiofile sndio
 
 .include <bsd.port.mk>
diff --git a/sysutils/gkrellm/plugins/reminder/Makefile b/sysutils/gkrellm/plugins/reminder/Makefile
index ad5f24712b1..3959f00c0c1 100644
--- a/sysutils/gkrellm/plugins/reminder/Makefile
+++ b/sysutils/gkrellm/plugins/reminder/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2008/06/06 10:27:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2009/03/09 22:42:07 sthen Exp $
 
 COMMENT=	GKrellM2 will remind you to do important events
 
 V=		2.0.0
 DISTNAME=	gkrellm-reminder-${V}
-PKGNAME=	gkrellmreminder-${V}p0
+PKGNAME=	gkrellmreminder-${V}p1
 CATEGORIES=	misc
 
 HOMEPAGE=	http://members.dslextreme.com/users/billw/gkrellm/Plugins.html\#REMINDER
diff --git a/sysutils/gkrellm/plugins/shoot/Makefile b/sysutils/gkrellm/plugins/shoot/Makefile
index d207a43f1d5..12013ba74f7 100644
--- a/sysutils/gkrellm/plugins/shoot/Makefile
+++ b/sysutils/gkrellm/plugins/shoot/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.12 2008/06/06 10:27:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2009/03/09 22:42:07 sthen Exp $
 
 COMMENT=	snapshot and background plugin for Gkrellm2
 
 V=		0.4.3
 DISTNAME=	gkrellshoot-${V}
-PKGNAME=	${DISTNAME}p10
+PKGNAME=	${DISTNAME}p11
 CATEGORIES=	x11
 
 HOMEPAGE=	http://gkrellshoot.sourceforge.net
diff --git a/sysutils/gkrellm/plugins/stock/Makefile b/sysutils/gkrellm/plugins/stock/Makefile
index 3fd072b05d1..2849fd4eef0 100644
--- a/sysutils/gkrellm/plugins/stock/Makefile
+++ b/sysutils/gkrellm/plugins/stock/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.12 2008/06/06 10:27:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.13 2009/03/09 22:42:08 sthen Exp $
 
 COMMENT=	stock ticker for GkrellM2
 
 V=		0.5.1
 DISTNAME=	gkrellstock-${V}
-PKGNAME=	${DISTNAME}p9
+PKGNAME=	${DISTNAME}p10
 CATEGORIES=	misc
 
 HOMEPAGE=	http://gkrellstock.sourceforge.net/
diff --git a/sysutils/gkrellm/plugins/sun/Makefile b/sysutils/gkrellm/plugins/sun/Makefile
index d8009888b96..7314727f3a2 100644
--- a/sysutils/gkrellm/plugins/sun/Makefile
+++ b/sysutils/gkrellm/plugins/sun/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.14 2008/06/06 10:27:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2009/03/09 22:42:08 sthen Exp $
 
 COMMENT=	GkrellM2 plugin to display sun rise/set times
 
 DISTNAME=	gkrellsun-0.12.1
-PKGNAME=	${DISTNAME}p9
+PKGNAME=	${DISTNAME}p10
 CATEGORIES=	astro
 
 HOMEPAGE=	http://gkrellsun.sourceforge.net/
diff --git a/sysutils/gkrellm/plugins/volume/Makefile b/sysutils/gkrellm/plugins/volume/Makefile
index db81a9cf26c..d0f7c25d04f 100644
--- a/sysutils/gkrellm/plugins/volume/Makefile
+++ b/sysutils/gkrellm/plugins/volume/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.14 2008/06/06 10:27:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.15 2009/03/09 22:42:08 sthen Exp $
 
 COMMENT=	Volume dial for Gkrellm2
 
 V=		2.1.13
 DISTNAME=	gkrellm-volume-${V}
-PKGNAME=	gkrellmvolume-${V}p0
+PKGNAME=	gkrellmvolume-${V}p1
 CATEGORIES=	audio
 
 HOMEPAGE=	http://gkrellm.luon.net/volume.phtml
diff --git a/sysutils/gkrellm/plugins/weather/Makefile b/sysutils/gkrellm/plugins/weather/Makefile
index 53c34c046cf..165a408f166 100644
--- a/sysutils/gkrellm/plugins/weather/Makefile
+++ b/sysutils/gkrellm/plugins/weather/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2008/07/05 08:36:47 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.16 2009/03/09 22:42:08 sthen Exp $
 
 COMMENT=	Weather plugin for GkrellM2
 
 DISTNAME=	gkrellweather-2.0.7
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	x11
 EXTRACT_SUFX=	.tgz
 
diff --git a/sysutils/gkrellm/plugins/wireless/Makefile b/sysutils/gkrellm/plugins/wireless/Makefile
index 63608e9a07c..6c4d5e8d403 100644
--- a/sysutils/gkrellm/plugins/wireless/Makefile
+++ b/sysutils/gkrellm/plugins/wireless/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2008/06/06 10:27:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.14 2009/03/09 22:42:08 sthen Exp $
 
 COMMENT=	GkrellM2 plugin to monitor wireless strength
 
 DISTNAME=	gkrellmwireless-2.0.3
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	net
 
 HOMEPAGE=	http://gkrellm.luon.net/gkrellmwireless.phtml
diff --git a/sysutils/god/Makefile b/sysutils/god/Makefile
index 97fb6a660fd..da7d4e263e5 100644
--- a/sysutils/god/Makefile
+++ b/sysutils/god/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2008/10/16 19:40:31 jcs Exp $
+# $OpenBSD: Makefile,v 1.3 2009/03/09 22:42:08 sthen Exp $
 
 COMMENT=	system monitoring framework written in Ruby
 
 DISTNAME=	god-0.7.3
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	sysutils
 
 # mit
@@ -14,6 +14,9 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	${MASTER_SITE_RUBYFORGE:=god/}
 
+WANTLIB=	c m
+LIB_DEPENDS=	ruby::lang/ruby
+
 MODULES=	lang/ruby
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile
index 0a3f2eb3c58..c9f3d688127 100644
--- a/sysutils/heartbeat/Makefile
+++ b/sysutils/heartbeat/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2008/09/18 13:37:41 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.5 2009/03/09 22:42:08 sthen Exp $
 
 SHARED_ONLY=	Yes
 
@@ -9,8 +9,8 @@ COMMENT-snmp=	snmp agent for heartbeat
 VERSION=	2.1.2-15
 DISTNAME=	obs-${VERSION}
 PKGNAME=	heartbeat-${VERSION}
-PKGNAME-main=	heartbeat-${VERSION}
-PKGNAME-gui=	heartbeat-gui-${VERSION}
+PKGNAME-main=	heartbeat-${VERSION}p0
+PKGNAME-gui=	heartbeat-gui-${VERSION}p0
 PKGNAME-snmp=	heartbeat-snmp-${VERSION}
 
 EXTRACT_SUFX=   .tar.bz2
@@ -44,7 +44,7 @@ BUILD_DEPENDS=	${MODGNU_AUTOCONF_DEPENDS} \
 		${MODGNU_AUTOMAKE_DEPENDS} \
 		::devel/swig
 
-WANTLIB-main=	${WANTLIB} crypto gcrypt gpg-error idn ncurses ssl
+WANTLIB-main=	${WANTLIB} crypto gcrypt gpg-error idn ncurses ssl tasn1
 LIB_DEPENDS-main=${LIB_DEPENDS} \
 		uuid.>=1:e2fs-uuid-*:sysutils/e2fsprogs,-uuid \
 		gnutls.>=12::security/gnutls \
@@ -57,7 +57,7 @@ LIB_DEPENDS-main=${LIB_DEPENDS} \
 RUN_DEPENDS-main=${MODPY_RUN_DEPENDS} \
 		::devel/p5-Time-TimeDate
 
-WANTLIB-gui=	gcrypt gpg-error m util xml2 z
+WANTLIB-gui=	gcrypt gpg-error m tasn1 util xml2 z
 LIB_DEPENDS-gui=${LIB_DEPENDS} \
 		bz2.>=10::archivers/bzip2 \
 		gnutls.>=12::security/gnutls \
diff --git a/sysutils/hot-babe/Makefile b/sysutils/hot-babe/Makefile
index 19f41bcef31..b4f27016bc6 100644
--- a/sysutils/hot-babe/Makefile
+++ b/sysutils/hot-babe/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2008/06/06 10:27:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.12 2009/03/09 22:42:08 sthen Exp $
 
 COMMENT=	small utility which displays system activity
 
 DISTNAME=	hot-babe-0.2.2
-PKGNAME=	${DISTNAME}p5
+PKGNAME=	${DISTNAME}p6
 CATEGORIES=	sysutils
 
 HOMEPAGE=	http://dindinx.net/hotbabe/
@@ -15,10 +15,12 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=	Xau Xcomposite Xcursor Xdamage Xdmcp Xfixes Xi Xinerama \
-		Xrandr expat pixman-1 X11 Xext Xrender c fontconfig freetype \
-		m z glib-2.0 gmodule-2.0 gobject-2.0 pango-1.0 glitz png \
-		pangocairo-1.0 pangoft2-1.0 cairo
+
+WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
+WANTLIB += Xi Xinerama Xrandr Xrender c cairo expat fontconfig
+WANTLIB += freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0
+WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png
+WANTLIB += z
 
 MASTER_SITES=	${HOMEPAGE}/downloads/