diff --git a/sysutils/bubblemon/Makefile b/sysutils/bubblemon/Makefile
index d08301a575f..35bd9e7ca7c 100644
--- a/sysutils/bubblemon/Makefile
+++ b/sysutils/bubblemon/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.27 2008/02/04 12:53:52 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.28 2008/06/06 10:27:55 sthen Exp $
 
 COMMENT=		GNOME panel applet that displays the CPU + memory load
 
 DISTNAME=		bubblemon-2.0.1
-PKGNAME=		${DISTNAME}p5
+PKGNAME=		${DISTNAME}p6
 CATEGORIES=		sysutils x11/gnome
 
 HOMEPAGE=		http://www.d.kth.se/~d92-jwa/code/
@@ -27,7 +27,8 @@ WANTLIB=	ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage \
 		gdk_pixbuf-2.0 glib-2.0 glitz gmodule-2.0 gnome-2 \
 		gnome-keyring gnomecanvas-2 gnomeui-2 gnomevfs-2 \
 		gobject-2.0 gthread-2.0 gtk-x11-2.0 m pango-1.0 \
-		pangocairo-1.0 pangoft2-1.0 png popt pthread xml2 z
+		pangocairo-1.0 pangoft2-1.0 pixman-1 png popt \
+		pthread xml2 z
 
 MODULES=		devel/gettext \
 			textproc/intltool
diff --git a/sysutils/contool/Makefile b/sysutils/contool/Makefile
index c040da61117..9a6f1fd3059 100644
--- a/sysutils/contool/Makefile
+++ b/sysutils/contool/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.26 2007/09/15 21:14:01 merdely Exp $
+# $OpenBSD: Makefile,v 1.27 2008/06/06 10:27:55 sthen Exp $
 
 COMMENT=	console tool for openlook
 
 DISTNAME=	contool-3.3a
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	sysutils
 
 MASTER_SITES=	ftp://ftp.kfu.com/pub/
@@ -14,7 +14,7 @@ PERMIT_PACKAGE_CDROM=	NOFEE
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	NOFEE
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		X11 Xext c
+WANTLIB=		X11 Xau Xdmcp Xext c
 
 LIB_DEPENDS=	xview.>=3,olgx.>=3::x11/xview/lib
 BUILD_DEPENDS=	::x11/xview/config
diff --git a/sysutils/filelight/Makefile b/sysutils/filelight/Makefile
index 40b39c9387c..a390c1ffb00 100644
--- a/sysutils/filelight/Makefile
+++ b/sysutils/filelight/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.3 2007/12/16 00:04:27 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.4 2008/06/06 10:27:55 sthen Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	concentric segmented-rings disk usage visualisation
 
 DISTNAME=	filelight-1.0
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	sysutils x11/kde
 
 EXTRACT_SUFX=	.tar.bz2
@@ -22,8 +22,8 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	http://www.methylblue.com/filelight/packages/
 
-WANTLIB=	ICE SM X11 Xau Xdmcp Xext Xrender art_lgpl_2 c iconv \
-		idn jpeg m png pthread stdc++ util z
+WANTLIB=	ICE SM X11 Xau Xdmcp Xext Xrender art_lgpl_2 c fam \
+		iconv idn intl jpeg m png pthread rpcsvc stdc++ util z
 
 MODULES=	x11/kde
 
diff --git a/sysutils/gkrellm/gkrellm/Makefile b/sysutils/gkrellm/gkrellm/Makefile
index 0fe78d21c98..499aa70ffc2 100644
--- a/sysutils/gkrellm/gkrellm/Makefile
+++ b/sysutils/gkrellm/gkrellm/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.36 2007/12/10 20:07:26 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.37 2008/06/06 10:27:55 sthen Exp $
 
 SHARED_ONLY=	Yes
 
@@ -8,7 +8,7 @@ COMMENT-client=	single process stack of system monitors for GTK+2
 V=		2.3.1
 DISTNAME=	gkrellm-${V}
 PKGNAME-main=	gkrellm-server-${V}
-PKGNAME-client=	gkrellm-${V}
+PKGNAME-client=	gkrellm-${V}p0
 CATEGORIES=	sysutils sysutils/gkrellm
 
 MAINTAINER=	Antoine Jacoutot <ajacoutot@openbsd.org>
@@ -46,7 +46,7 @@ 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
+			pangocairo-1.0 pangoft2-1.0 ssl cairo pixman-1
 
 NO_REGRESS=	Yes
 USE_GMAKE=	Yes
diff --git a/sysutils/gkrellm/plugins/Makefile.inc b/sysutils/gkrellm/plugins/Makefile.inc
index 6c46c2c3ad3..3c9976041b5 100644
--- a/sysutils/gkrellm/plugins/Makefile.inc
+++ b/sysutils/gkrellm/plugins/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.17 2007/10/25 15:15:54 ajacoutot Exp $
+# $OpenBSD: Makefile.inc,v 1.18 2008/06/06 10:27:55 sthen Exp $
 
 MAINTAINER?=	Antoine Jacoutot <ajacoutot@openbsd.org>
 
@@ -15,7 +15,7 @@ WANTLIB?=		X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr \
 			glib-2.0 gmodule-2.0 gobject-2.0 glitz png \
 			gthread-2.0 gtk-x11-2.0 iconv intl m \
 			pango-1.0 pangocairo-1.0 pangoft2-1.0 \
-			cairo Xcomposite Xdamage
+			pixman-1 cairo Xcomposite Xdamage
 .if defined(EXTRA_WANTLIB)
 WANTLIB+=	${EXTRA_WANTLIB}
 .endif
diff --git a/sysutils/gkrellm/plugins/aclock/Makefile b/sysutils/gkrellm/plugins/aclock/Makefile
index aaf1443ff22..80cf7fcba05 100644
--- a/sysutils/gkrellm/plugins/aclock/Makefile
+++ b/sysutils/gkrellm/plugins/aclock/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2007/10/25 15:15:54 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2008/06/06 10:27:55 sthen Exp $
 
 COMMENT=	analog clock for GkrellM2
 
 V=		0.3.3
 DISTNAME=	gkrellaclock-${V}
-PKGNAME=	${DISTNAME}p7
+PKGNAME=	${DISTNAME}p8
 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 bcf3d17dc52..fc8f5aaf577 100644
--- a/sysutils/gkrellm/plugins/bgchg/Makefile
+++ b/sysutils/gkrellm/plugins/bgchg/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.17 2007/10/25 15:15:54 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.18 2008/06/06 10:27:55 sthen Exp $
 
 COMMENT=	change background image with GkrellM2
 
 DISTNAME=	gkrellmbgchg2-0.1.3
-PKGNAME=	${DISTNAME}p8
+PKGNAME=	${DISTNAME}p9
 CATEGORIES=	x11
 
 HOMEPAGE=	http://www.bender-suhl.de/stefan/english/comp/gkrellmbgchg.html
diff --git a/sysutils/gkrellm/plugins/flynn/Makefile b/sysutils/gkrellm/plugins/flynn/Makefile
index 3b919848091..0b02f6e878d 100644
--- a/sysutils/gkrellm/plugins/flynn/Makefile
+++ b/sysutils/gkrellm/plugins/flynn/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2007/10/25 15:15:54 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.10 2008/06/06 10:27:55 sthen Exp $
 
 COMMENT=	GkrellM2 load meter with a familiar face
 
 DISTNAME=	gkrellflynn-0.8
-PKGNAME=	${DISTNAME}p4
+PKGNAME=	${DISTNAME}p5
 CATEGORIES=	x11
 
 ALL_TARGET=	gkrellm2
diff --git a/sysutils/gkrellm/plugins/itime/Makefile b/sysutils/gkrellm/plugins/itime/Makefile
index 83c3a7e5bbe..15946efedbb 100644
--- a/sysutils/gkrellm/plugins/itime/Makefile
+++ b/sysutils/gkrellm/plugins/itime/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.12 2007/10/25 15:15:54 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.13 2008/06/06 10:27:55 sthen Exp $
 
 COMMENT=	GkrellM2 plugin that shows Internet time
 
 V=		1.0.1
 DISTNAME=	gkrellmitime-${V}
-PKGNAME=	${DISTNAME}p8
+PKGNAME=	${DISTNAME}p9
 CATEGORIES=	net
 
 ALL_TARGET=	gkrellm_itime.so
diff --git a/sysutils/gkrellm/plugins/kam/Makefile b/sysutils/gkrellm/plugins/kam/Makefile
index 5977788d9d1..cfa4bc60c05 100644
--- a/sysutils/gkrellm/plugins/kam/Makefile
+++ b/sysutils/gkrellm/plugins/kam/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2007/10/25 15:15:54 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.9 2008/06/06 10:27:55 sthen Exp $
 
 COMMENT=	webcam plugin for GkrellM2
 
 V=		2.0.0
 DISTNAME=	gkrellkam-${V}
-PKGNAME=	${DISTNAME}p4
+PKGNAME=	${DISTNAME}p5
 CATEGORIES=	graphics
 
 HOMEPAGE=	http://gkrellkam.sourceforge.net
diff --git a/sysutils/gkrellm/plugins/launch/Makefile b/sysutils/gkrellm/plugins/launch/Makefile
index 162796b9222..aea4e0cb973 100644
--- a/sysutils/gkrellm/plugins/launch/Makefile
+++ b/sysutils/gkrellm/plugins/launch/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2007/10/25 15:15:54 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2008/06/06 10:27:55 sthen Exp $
 
 COMMENT=	launch commonly used apps from GkrellM2
 
 DISTNAME=	gkrellmlaunch-0.5
-PKGNAME=	${DISTNAME}p8
+PKGNAME=	${DISTNAME}p9
 CATEGORIES=	x11
 
 HOMEPAGE=	http://gkrellmlaunch.sourceforge.net/
diff --git a/sysutils/gkrellm/plugins/mailwatch/Makefile b/sysutils/gkrellm/plugins/mailwatch/Makefile
index f741ec46769..66f5568627c 100644
--- a/sysutils/gkrellm/plugins/mailwatch/Makefile
+++ b/sysutils/gkrellm/plugins/mailwatch/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2007/10/25 15:15:54 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2008/06/06 10:27:55 sthen Exp $
 
 COMMENT=	GkrellM2 plugin to monitor multiple mailboxes
 
 V=		2.4.3
 DISTNAME=	gkrellm-mailwatch-${V}
-PKGNAME=	gkrellmmailwatch-${V}
+PKGNAME=	gkrellmmailwatch-${V}p0
 CATEGORIES=	mail
 
 HOMEPAGE=	http://gkrellm.luon.net/mailwatch.phtml
diff --git a/sysutils/gkrellm/plugins/mms/Makefile b/sysutils/gkrellm/plugins/mms/Makefile
index 6071b18b8f5..6f5d2f58aae 100644
--- a/sysutils/gkrellm/plugins/mms/Makefile
+++ b/sysutils/gkrellm/plugins/mms/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.16 2007/10/25 15:15:54 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.17 2008/06/06 10:27:55 sthen Exp $
 
 COMMENT=	XMMS plugin for Gkrellm2
 
 DISTNAME=	gkrellmms-2.1.21
-PKGNAME=	${DISTNAME}p7
+PKGNAME=	${DISTNAME}p8
 CATEGORIES=	audio
 
 HOMEPAGE=	http://gkrellm.luon.net/gkrellmms.phtml
diff --git a/sysutils/gkrellm/plugins/moon/Makefile b/sysutils/gkrellm/plugins/moon/Makefile
index 8c9ea0c0aee..76bf052ef87 100644
--- a/sysutils/gkrellm/plugins/moon/Makefile
+++ b/sysutils/gkrellm/plugins/moon/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.11 2007/10/25 15:15:54 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2008/06/06 10:27:55 sthen Exp $
 
 COMMENT=	phase of the Moon for GkrellM2
 
 DISTNAME=	gkrellmoon-0.6
-PKGNAME=	${DISTNAME}p8
+PKGNAME=	${DISTNAME}p9
 CATEGORIES=	astro
 
 HOMEPAGE=	http://gkrellmoon.sourceforge.net/
diff --git a/sysutils/gkrellm/plugins/mss/Makefile b/sysutils/gkrellm/plugins/mss/Makefile
index d35710489b1..d078915cbbd 100644
--- a/sysutils/gkrellm/plugins/mss/Makefile
+++ b/sysutils/gkrellm/plugins/mss/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.18 2007/10/25 15:15:54 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.19 2008/06/06 10:27:55 sthen Exp $
 
 COMMENT=	soundscope for GkrellM2 using ESD
 
 DISTNAME=	gkrellmss-2.6
-PKGNAME=	${DISTNAME}p8
+PKGNAME=	${DISTNAME}p9
 CATEGORIES=	audio
 
 HOMEPAGE=http://members.dslextreme.com/users/billw/gkrellmss/gkrellmss.html
diff --git a/sysutils/gkrellm/plugins/reminder/Makefile b/sysutils/gkrellm/plugins/reminder/Makefile
index 2e2453e4507..ad5f24712b1 100644
--- a/sysutils/gkrellm/plugins/reminder/Makefile
+++ b/sysutils/gkrellm/plugins/reminder/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.12 2007/10/25 15:15:54 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.13 2008/06/06 10:27:55 sthen Exp $
 
 COMMENT=	GKrellM2 will remind you to do important events
 
 V=		2.0.0
 DISTNAME=	gkrellm-reminder-${V}
-PKGNAME=	gkrellmreminder-${V}
+PKGNAME=	gkrellmreminder-${V}p0
 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 016ffefa0b7..d207a43f1d5 100644
--- a/sysutils/gkrellm/plugins/shoot/Makefile
+++ b/sysutils/gkrellm/plugins/shoot/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2007/10/25 15:15:54 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2008/06/06 10:27:55 sthen Exp $
 
 COMMENT=	snapshot and background plugin for Gkrellm2
 
 V=		0.4.3
 DISTNAME=	gkrellshoot-${V}
-PKGNAME=	${DISTNAME}p9
+PKGNAME=	${DISTNAME}p10
 CATEGORIES=	x11
 
 HOMEPAGE=	http://gkrellshoot.sourceforge.net
diff --git a/sysutils/gkrellm/plugins/stock/Makefile b/sysutils/gkrellm/plugins/stock/Makefile
index ae6dab6cc32..3fd072b05d1 100644
--- a/sysutils/gkrellm/plugins/stock/Makefile
+++ b/sysutils/gkrellm/plugins/stock/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.11 2007/10/25 15:15:54 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.12 2008/06/06 10:27:55 sthen Exp $
 
 COMMENT=	stock ticker for GkrellM2
 
 V=		0.5.1
 DISTNAME=	gkrellstock-${V}
-PKGNAME=	${DISTNAME}p8
+PKGNAME=	${DISTNAME}p9
 CATEGORIES=	misc
 
 HOMEPAGE=	http://gkrellstock.sourceforge.net/
diff --git a/sysutils/gkrellm/plugins/sun/Makefile b/sysutils/gkrellm/plugins/sun/Makefile
index fe8c5dfed73..d8009888b96 100644
--- a/sysutils/gkrellm/plugins/sun/Makefile
+++ b/sysutils/gkrellm/plugins/sun/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2007/10/25 15:15:54 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2008/06/06 10:27:55 sthen Exp $
 
 COMMENT=	GkrellM2 plugin to display sun rise/set times
 
 DISTNAME=	gkrellsun-0.12.1
-PKGNAME=	${DISTNAME}p8
+PKGNAME=	${DISTNAME}p9
 CATEGORIES=	astro
 
 HOMEPAGE=	http://gkrellsun.sourceforge.net/
diff --git a/sysutils/gkrellm/plugins/volume/Makefile b/sysutils/gkrellm/plugins/volume/Makefile
index c1dfa16e62f..db81a9cf26c 100644
--- a/sysutils/gkrellm/plugins/volume/Makefile
+++ b/sysutils/gkrellm/plugins/volume/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.13 2007/10/25 15:15:54 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2008/06/06 10:27:55 sthen Exp $
 
 COMMENT=	Volume dial for Gkrellm2
 
 V=		2.1.13
 DISTNAME=	gkrellm-volume-${V}
-PKGNAME=	gkrellmvolume-${V}
+PKGNAME=	gkrellmvolume-${V}p0
 CATEGORIES=	audio
 
 HOMEPAGE=	http://gkrellm.luon.net/volume.phtml
diff --git a/sysutils/gkrellm/plugins/weather/Makefile b/sysutils/gkrellm/plugins/weather/Makefile
index 79e00106679..b47307000c4 100644
--- a/sysutils/gkrellm/plugins/weather/Makefile
+++ b/sysutils/gkrellm/plugins/weather/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.13 2007/10/25 15:15:54 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2008/06/06 10:27:55 sthen Exp $
 
 COMMENT=	Weather plugin for GkrellM2
 
 DISTNAME=	gkrellweather-2.0.6
-PKGNAME=	${DISTNAME}p8
+PKGNAME=	${DISTNAME}p9
 CATEGORIES=	x11
 EXTRACT_SUFX=	.tgz
 
diff --git a/sysutils/gkrellm/plugins/wireless/Makefile b/sysutils/gkrellm/plugins/wireless/Makefile
index 967bde2ed6e..63608e9a07c 100644
--- a/sysutils/gkrellm/plugins/wireless/Makefile
+++ b/sysutils/gkrellm/plugins/wireless/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2007/10/25 15:15:55 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.13 2008/06/06 10:27:55 sthen Exp $
 
 COMMENT=	GkrellM2 plugin to monitor wireless strength
 
 DISTNAME=	gkrellmwireless-2.0.3
-PKGNAME=	${DISTNAME}
+PKGNAME=	${DISTNAME}p0
 CATEGORIES=	net
 
 HOMEPAGE=	http://gkrellm.luon.net/gkrellmwireless.phtml
diff --git a/sysutils/hot-babe/Makefile b/sysutils/hot-babe/Makefile
index a596dbc3b28..19f41bcef31 100644
--- a/sysutils/hot-babe/Makefile
+++ b/sysutils/hot-babe/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2007/09/15 21:14:01 merdely Exp $
+# $OpenBSD: Makefile,v 1.11 2008/06/06 10:27:55 sthen Exp $
 
 COMMENT=	small utility which displays system activity
 
 DISTNAME=	hot-babe-0.2.2
-PKGNAME=	${DISTNAME}p4
+PKGNAME=	${DISTNAME}p5
 CATEGORIES=	sysutils
 
 HOMEPAGE=	http://dindinx.net/hotbabe/
@@ -15,8 +15,9 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=	X11 Xext Xrender c fontconfig freetype m z \
-		glib-2.0 gmodule-2.0 gobject-2.0 pango-1.0 glitz png \
+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
 
 MASTER_SITES=	${HOMEPAGE}/downloads/
diff --git a/sysutils/knutclient/Makefile b/sysutils/knutclient/Makefile
index 1ef883d841e..b678ab9c414 100644
--- a/sysutils/knutclient/Makefile
+++ b/sysutils/knutclient/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2007/09/15 21:14:01 merdely Exp $
+# $OpenBSD: Makefile,v 1.9 2008/06/06 10:27:55 sthen Exp $
 
 COMMENT=		KDE UPS Monitoring tool
 
 RELEASE=		0.6.0
 DISTNAME=		knutclient-${RELEASE}
-PKGNAME=		${DISTNAME}p0
+PKGNAME=		${DISTNAME}p1
 CATEGORIES=		sysutils x11 x11/kde
 
 HOMEPAGE=		http://www.alo.cz/knutclient-pop-en.html
@@ -16,8 +16,8 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		jpeg ICE SM X11 Xext Xrender c m png pthread stdc++ \
-			util z idn iconv
+WANTLIB=		jpeg ICE SM X11 Xau Xdmcp Xext Xrender c m png \
+			pthread stdc++ util z idn iconv intl
 
 MASTER_SITES=		ftp://ftp.buzuluk.cz/pub/alo/knutclient/
 
diff --git a/sysutils/libgksu/Makefile b/sysutils/libgksu/Makefile
index 5630e81c27c..c1343f15534 100644
--- a/sysutils/libgksu/Makefile
+++ b/sysutils/libgksu/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.3 2008/02/02 20:42:04 jasper Exp $
+# $OpenBSD: Makefile,v 1.4 2008/06/06 10:27:56 sthen Exp $
 
 COMMENT=		library providing su and sudo functionality
 
 DISTNAME=		libgksu-2.0.5
-PKGNAME=		${DISTNAME}p1
+PKGNAME=		${DISTNAME}p2
 SHARED_LIBS=		gksu2		0.0	# .0.1
 CATEGORIES=             sysutils
 
@@ -20,7 +20,7 @@ WANTLIB=	ICE ORBit-2 SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp \
 		dbus-1 expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 \
 		glib-2.0 glitz gmodule-2.0 gobject-2.0 gthread-2.0 \
 		gtk-x11-2.0 kvm m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
-		pcre png pthread util xml2 z
+		pcre png pixman-1 pthread util xml2 z
 
 MASTER_SITES=		http://people.debian.org/~kov/gksu/
 
diff --git a/sysutils/libgksuui/Makefile b/sysutils/libgksuui/Makefile
index f74b10df2f2..ca4192e8439 100644
--- a/sysutils/libgksuui/Makefile
+++ b/sysutils/libgksuui/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2008/01/17 18:47:18 jasper Exp $
+# $OpenBSD: Makefile,v 1.2 2008/06/06 10:27:56 sthen Exp $
 
 COMMENT=		graphical frontend to su (library to the interface)
 
 V=			1.0.7
 DISTNAME=		libgksuui1.0-$V
-PKGNAME=		libgksuui-$V
+PKGNAME=		libgksuui-$Vp0
 SHARED_LIBS=		gksuui1.0         0.0            # .1.0
 CATEGORIES=		sysutils
 
@@ -19,7 +19,7 @@ PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
 		Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig \
 		freetype glib-2.0 glitz gmodule-2.0 gobject-2.0 m pango-1.0 \
-		pangocairo-1.0 pangoft2-1.0 pcre png z
+		pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png z
 
 MASTER_SITES=		http://people.debian.org/~kov/gksu/old_stuff/libgksuui1.0/
 
diff --git a/sysutils/notification-daemon/Makefile b/sysutils/notification-daemon/Makefile
index 65223305ffe..e7388db90cc 100644
--- a/sysutils/notification-daemon/Makefile
+++ b/sysutils/notification-daemon/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2008/06/03 14:56:09 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.3 2008/06/06 10:27:56 sthen Exp $
 
 COMMENT=		send small notifications to your desktop
 
 DISTNAME=		notification-daemon-0.3.7
+PKGNAME=		${DISTNAME}p0
 CATEGORIES=		sysutils net
 
 HOMEPAGE=		http://www.galago-project.org/
@@ -17,8 +18,8 @@ WANTLIB=	ICE ORBit-2 SM X11 XRes Xau Xcursor Xdmcp Xext Xfixes \
 		Xi Xinerama Xrandr Xrender atk-1.0 c cairo dbus-1 expat \
 		fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0 \
 		glitz gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 \
-		m pango-1.0 pangocairo-1.0 pangoft2-1.0 png pthread \
-		startup-notification-1 xml2 z
+		m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 \
+		png pthread startup-notification-1 xml2 z Xcomposite Xdamage
 
 MASTER_SITES=		${HOMEPAGE}/files/releases/source/notification-daemon/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/sysutils/xbatt/Makefile b/sysutils/xbatt/Makefile
index 7a9ee8a2965..2f76cc5f057 100644
--- a/sysutils/xbatt/Makefile
+++ b/sysutils/xbatt/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.17 2008/04/14 14:05:55 jasper Exp $
+# $OpenBSD: Makefile,v 1.18 2008/06/06 10:27:56 sthen Exp $
 # $FreeBSD: Makefile,v 1.4 1997/03/10 12:07:35 asami Exp $
 
 # we use "macppc" and not "powerpc" on purpose here ; i.e. apm(4) needed
@@ -7,7 +7,7 @@ ONLY_FOR_ARCHS= amd64 arm i386 macppc sparc
 COMMENT=	laptop battery status display for X11
 
 DISTNAME=	xbatt-1.2.1
-PKGNAME=	${DISTNAME}p0
+PKGNAME=	${DISTNAME}p1
 CATEGORIES=	sysutils x11
 
 MASTER_SITES=	http://www.clave.gr.jp/~eto/xbatt/
@@ -18,7 +18,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		ICE SM X11 Xaw Xext Xmu Xpm Xt c 
+WANTLIB=		ICE SM X11 Xau Xaw Xdmcp Xext Xmu Xpm Xt c 
 
 CONFIGURE_STYLE=	imake noman