diff --git a/databases/keximdb/Makefile b/databases/keximdb/Makefile
index 65851819c9c..553175d7728 100644
--- a/databases/keximdb/Makefile
+++ b/databases/keximdb/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2010/11/15 13:08:38 espie Exp $
+# $OpenBSD: Makefile,v 1.8 2011/01/03 19:47:11 jasper Exp $
 
 CATEGORIES=	databases x11 x11/kde
 COMMENT=	MDB (access) file migration driver for kexi
@@ -7,12 +7,13 @@ VERSION=	1.6.1
 MASTER_SITES=	${MASTER_SITE_KDE:S@$@stable/koffice-${VERSION}/src/@}
 DISTNAME=	keximdb-1.1.0
 DIST_SUBDIR=	kde
-REVISION=	2
+REVISION=	3
 HOMEPAGE=	http://www.kexi-project.org/wiki/wikiview/index.php?MDBDriver
 
 SHARED_ONLY=	Yes
 
-MODULES=		x11/kde
+MODULES=		devel/gettext \
+			x11/kde
 MODKDE_VERSION=		3.5.7
 CONFIGURE_STYLE=	autoconf
 AUTOCONF_VERSION=	2.60
@@ -34,7 +35,7 @@ LIB_DEPENDS +=	x11/kde/libs3 \
 		databases/mdbtools/snapshot
 
 WANTLIB += ICE SM X11 Xau Xdmcp Xext Xrender jpeg m png rpcsvc
-WANTLIB += stdc++ util z art_lgpl_2 fam glib-2.0 iconv idn intl
+WANTLIB += stdc++ util z art_lgpl_2 fam glib-2.0 idn
 WANTLIB += pcre pthread-stubs xcb kdecore>=7 DCOP kabc kdefx
 WANTLIB += kdeprint kdesu kdeui kparts kutils kwalletclient kio
 WANTLIB += kmdi knewstuff kresources ktexteditor vcard kofficecore>=3
diff --git a/devel/asp2php/Makefile b/devel/asp2php/Makefile
index 8c77a575f47..06f1ff61fb2 100644
--- a/devel/asp2php/Makefile
+++ b/devel/asp2php/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.29 2010/11/15 19:45:56 espie Exp $
+# $OpenBSD: Makefile,v 1.30 2011/01/03 19:47:11 jasper Exp $
 
 COMMENT=	convert ASP code to PHP code
 
 DISTNAME=	asp2php-0.77.3
-REVISION=	4
+REVISION=	5
 CATEGORIES=	devel www
 
 HOMEPAGE=	http://asp2php.naken.cc/
@@ -25,10 +25,12 @@ LIB_DEPENDS +=	x11/gtk+2
 WANTLIB +=	gdk-x11-2.0 gtk-x11-2.0
 ALL_TARGET =	all gui
 
+MODULES =	devel/gettext
+
 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
 WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig
 WANTLIB += freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
-WANTLIB += iconv intl m pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += pixman-1 png pthread-stubs xcb z gdk_pixbuf-2.0
 .endif
 
diff --git a/devel/beediff/Makefile b/devel/beediff/Makefile
index eb627042afb..6e2a4c5068e 100644
--- a/devel/beediff/Makefile
+++ b/devel/beediff/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.8 2010/11/15 19:45:56 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2011/01/03 19:47:11 jasper Exp $
 
 COMMENT=	graphical file comparator
 
 V=		1.9
 DISTNAME=	beediff_${V}_src
 PKGNAME=	beediff-${V}
-REVISION =	1
+REVISION =	2
 CATEGORIES=	textproc x11 devel
 
 HOMEPAGE=	http://www.beesoft.pl/index.php?id=beediff
@@ -18,13 +18,14 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender c expat fontconfig
-WANTLIB += freetype glib-2.0 gobject-2.0 gthread-2.0 iconv intl
+WANTLIB += freetype glib-2.0 gobject-2.0 gthread-2.0
 WANTLIB += m png pthread pthread-stubs stdc++ xcb z
 WANTLIB += lib/qt4/QtGui
 
 WRKDIST=	${WRKDIR}/beediff
 
-MODULES=	x11/qt4
+MODULES=	devel/gettext \
+		x11/qt4
 NO_REGRESS=	Yes
 
 MAKE_FLAGS=	CXX=${CXX} \
diff --git a/devel/gtkparasite/Makefile b/devel/gtkparasite/Makefile
index 700e1121868..24daa295476 100644
--- a/devel/gtkparasite/Makefile
+++ b/devel/gtkparasite/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2010/11/15 19:45:58 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2011/01/03 19:47:11 jasper Exp $
 
 COMMENT =	Gtk debugging tool
 
 DISTNAME =	gtkparasite-0.0.1
-REVISION=	3
+REVISION=	4
 CATEGORIES =	devel
 
 HOMEPAGE =	http://chipx86.github.com/gtkparasite/
@@ -19,7 +19,8 @@ PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =	Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-MODULES =	lang/python
+MODULES =	devel/gettext \
+		lang/python
 USE_LIBTOOL =	Yes
 
 LIB_DEPENDS =	${MODPY_LIB_DEPENDS} \
@@ -30,10 +31,11 @@ BUILD_DEPENDS+=	${RUN_DEPENDS}
 
 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
 WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo expat ffi fontconfig
-WANTLIB += freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
-WANTLIB += iconv intl m pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 xcb-shm
+WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 gthread-2.0
 WANTLIB += pcre pixman-1 png pthread-stubs util xcb z gdk_pixbuf-2.0
-WANTLIB += ${MODPY_WANTLIB} gtk-x11-2.0 gdk-x11-2.0
+WANTLIB += ${MODPY_WANTLIB} gtk-x11-2.0 gdk-x11-2.0 drm xcb-render
+WANTLIB += GL Xxf86vm
 
 CONFIGURE_STYLE =	gnu
 
diff --git a/devel/guilib/Makefile b/devel/guilib/Makefile
index a5631b8ba8a..1d41360e01b 100644
--- a/devel/guilib/Makefile
+++ b/devel/guilib/Makefile
@@ -1,15 +1,15 @@
-# $OpenBSD: Makefile,v 1.27 2010/11/15 19:45:58 espie Exp $
+# $OpenBSD: Makefile,v 1.28 2011/01/03 19:47:11 jasper Exp $
 
 COMMENT=	SDL C++ GUI widget library
 
 DISTNAME=	GUIlib-1.1.1
 PKGNAME=	${DISTNAME:L}
-REVISION=	8
+REVISION=	9
 
 SHARED_LIBS +=	GUI                  1.0      # .0.1
 
 CATEGORIES=	devel graphics
-MASTER_SITES=	http://www.libsdl.org/projects/GUIlib/src/
+MASTER_SITES=	${HOMEPAGE}/src/
 
 HOMEPAGE=	http://www.libsdl.org/projects/GUIlib/
 
@@ -19,11 +19,13 @@ PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 
-WANTLIB=	X11 Xau Xrandr Xrender iconv Xdmcp Xext m pthread-stubs sndio \
+WANTLIB=	X11 Xau Xrandr Xrender Xdmcp Xext m pthread-stubs sndio \
 		stdc++ usbhid xcb SDL
 
 LIB_DEPENDS=	devel/sdl
 
+MODULES=	converters/libiconv
+
 USE_LIBTOOL=	Yes
 SEPARATE_BUILD=		concurrent
 CONFIGURE_STYLE=	gnu
diff --git a/devel/libuta/Makefile b/devel/libuta/Makefile
index 8ce5c2d1350..3afceb9417a 100644
--- a/devel/libuta/Makefile
+++ b/devel/libuta/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.32 2010/11/26 15:00:45 espie Exp $
+# $OpenBSD: Makefile,v 1.33 2011/01/03 19:47:11 jasper Exp $
 
 COMMENT=	graphical user interface library for C++
 
 DISTNAME=	libuta-0.4.4
-REVISION =	8
+REVISION =	9
 SHARED_LIBS=		uta 42.0
 MODGNU_SHARED_LIBS=	uta ''
 
@@ -19,12 +19,14 @@ PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 
 WANTLIB=	SDL X11 Xau Xdmcp Xext m mikmod ogg pthread stdc++ usbhid \
-		Xrandr Xrender iconv sndio vorbis vorbisfile z \
+		Xrandr Xrender sndio vorbis vorbisfile z \
 		pthread-stubs xcb smpeg>=1.3 SDL_mixer png>=2 \
 		sigc ttf>=1.3
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libuta/}
 
+MODULES=	converters/libiconv
+
 LIB_DEPENDS=	devel/smpeg \
 		devel/sdl-mixer \
 		graphics/png \
diff --git a/devel/smpeg/Makefile b/devel/smpeg/Makefile
index bbfd2d2ab0e..58dfc69220c 100644
--- a/devel/smpeg/Makefile
+++ b/devel/smpeg/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.35 2010/11/15 19:46:09 espie Exp $
+# $OpenBSD: Makefile,v 1.36 2011/01/03 19:47:11 jasper Exp $
 
 COMMENT=	mpeg video player library with sound support
 
 DISTNAME=	smpeg-0.4.4
 PKGNAME=	${DISTNAME}
-REVISION =	10
+REVISION =	11
 SHARED_LIBS=	smpeg 2.0
 CATEGORIES=	devel graphics
 
@@ -17,12 +17,14 @@ PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 WANTLIB=		X11 Xau Xdmcp Xext Xrandr Xrender SDL \
-			c iconv m pthread pthread-stubs sndio usbhid xcb
+			c m pthread pthread-stubs sndio usbhid xcb
 
 MASTER_SITES=	http://www.dulug.de/loki/open-source/smpeg/ \
 		http://gd.tuwien.ac.at/video/lib/smpeg/ \
 		http://mirrors.sunsite.dk/lokigames/open-source/smpeg/
 
+MODULES=	converters/libiconv
+
 LIB_DEPENDS=	devel/sdl
 
 USE_LIBTOOL=	Yes