diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index ff0e83edd72..c3e01435958 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2010/11/19 07:23:06 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2011/07/06 18:57:09 ajacoutot Exp $
 
 COMMENT=	mail purpose library
 
 DISTNAME=	libetpan-1.0
+REVISION=	0
 CATEGORIES=	mail devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libetpan/}
 
@@ -18,9 +19,9 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MODULES=	converters/libiconv
+MODULES=	devel/gettext
 
-WANTLIB=	crypto expat intl m ssl stdc++ z curl idn sasl2
+WANTLIB=	crypto expat m ssl stdc++ z curl idn sasl2
 
 LIB_DEPENDS+=	net/curl \
 		devel/libidn \
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 9ca153708eb..df1e137c53a 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.93 2011/05/08 08:18:10 rpointel Exp $
+# $OpenBSD: Makefile,v 1.94 2011/07/06 18:57:09 ajacoutot Exp $
 
 COMMENT =		lightweight and user-friendly e-mail client
 
 DISTNAME =		sylpheed-3.1.1
+REVISION =		0
 
 SHARED_LIBS += 	 	sylph-0                   2.0 # 2.0
 SHARED_LIBS += 		sylpheed-plugin-0         2.0 # 2.0
@@ -25,7 +26,7 @@ WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi
 WANTLIB += Xinerama Xrandr Xrender Xxf86vm c crypto atk-1.0 cairo gdk_pixbuf-2.0
 WANTLIB += pango-1.0 pangocairo-1.0 dbus-1 dbus-glib-1 gio-2.0 glib-2.0
 WANTLIB += gmodule-2.0 gobject-2.0 drm expat fontconfig freetype m pixman-1
-WANTLIB += pthread pthread-stubs gthread-2.0 iconv intl pcre enchant pangoft2-1.0
+WANTLIB += pthread pthread-stubs gthread-2.0 pcre enchant pangoft2-1.0
 WANTLIB += png gpgme gpg-error gtkspell ssl stdc++ xcb xcb-render xcb-shm z
 WANTLIB += gtk-x11-2.0 gdk-x11-2.0 gtkspell
 
diff --git a/math/qtoctave/Makefile b/math/qtoctave/Makefile
index 568b2ddefd6..1550983a2a1 100644
--- a/math/qtoctave/Makefile
+++ b/math/qtoctave/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.10 2010/11/19 07:23:11 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2011/07/06 18:57:09 ajacoutot Exp $
 
 COMMENT=	graphical front-end for octave
 
 DISTNAME=	qtoctave-0.8.1
-REVISION=	1
+REVISION=	2
 CATEGORIES=	math
 
 HOMEPAGE=	http://qtoctave.wordpress.com/
@@ -16,12 +16,13 @@ PERMIT_DISTFILES_FTP=	Yes
 
 MASTER_SITES=	https://forja.rediris.es/frs/download.php/352/
 
-MODULES=	x11/qt4
+MODULES=	x11/qt4 \
+		devel/gettext
 
 RUN_DEPENDS=	math/octave
 LIB_DEPENDS=	x11/qt4
 WANTLIB=	ICE SM X11 Xext Xi Xinerama Xrender \
-		c fontconfig freetype glib-2.0 gthread-2.0 iconv intl \
+		c fontconfig freetype glib-2.0 gthread-2.0 \
 		m png pthread pthread-stubs stdc++ xcb z expat gobject-2.0 \
 		QtGui QtXml
 
diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
index 4330d849801..8b1ab6cd339 100644
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.23 2010/11/19 07:23:13 espie Exp $
+# $OpenBSD: Makefile,v 1.24 2011/07/06 18:57:09 ajacoutot Exp $
 
 COMMENT=	video player for KDE
 
 VERSION=	0.8.8
 DISTNAME=	kaffeine-${VERSION}
-REVISION=	3
+REVISION=	4
 CATEGORIES=	multimedia x11 x11/kde
 MASTER_SITES=	http://hftom.free.fr/ \
 		${MASTER_SITE_SOURCEFORGE:=kaffeine/}
@@ -22,7 +22,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += ICE SM X11 Xau Xdmcp Xext Xinerama Xrender Xtst art_lgpl_2
-WANTLIB += c expat fam fontconfig freetype iconv idn intl jpeg m ogg
+WANTLIB += c expat fam fontconfig freetype idn jpeg m ogg
 WANTLIB += pcre pcreposix png pthread pthread-stubs rpcsvc stdc++
 WANTLIB += util xcb z kdecore DCOP kdesu kio kdefx kparts kutils
 WANTLIB += kdeprint kdeui kwalletclient khtml kjs vorbis vorbisenc
@@ -36,7 +36,7 @@ LIB_DEPENDS=	x11/kde/libs3 \
 
 SUBST_VARS=	VERSION
 
-MODULES=	x11/kde
+MODULES=	x11/kde devel/gettext
 MODKDE_VERSION=	3.5.7
 
 PORTHOME=	${WRKDIR}
diff --git a/multimedia/pspvc/Makefile b/multimedia/pspvc/Makefile
index 3c1da5a7f64..0255e55e235 100644
--- a/multimedia/pspvc/Makefile
+++ b/multimedia/pspvc/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.9 2010/11/19 07:23:15 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2011/07/06 18:57:09 ajacoutot Exp $
 
 COMMENT=	video converter for the Playstation Portable
 
 V=		0.3
 DISTNAME=	pspvc-${V}
-REVISION=	5
+REVISION=	6
 DISTFILES=	pspvc-install-${V}.tar.gz
 CATEGORIES=	multimedia
 
@@ -20,12 +20,14 @@ PERMIT_DISTFILES_FTP=	Yes
 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
 WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c 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 += pcre pixman-1 png pthread-stubs xcb z gdk_pixbuf-2.0
 WANTLIB += gdk-x11-2.0 gtk-x11-2.0
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pspvc/}
 
+MODULES=	devel/gettext
+
 RUN_DEPENDS=	graphics/ffmpeg
 LIB_DEPENDS+=	x11/gtk+2
 
diff --git a/net/mldonkey/stable/Makefile b/net/mldonkey/stable/Makefile
index 1651dc352ab..ad404c87e65 100644
--- a/net/mldonkey/stable/Makefile
+++ b/net/mldonkey/stable/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.41 2011/04/16 12:10:07 sthen Exp $
+# $OpenBSD: Makefile,v 1.42 2011/07/06 18:57:09 ajacoutot Exp $
 
 COMMENT =	e-donkey client
 DISTNAME =	mldonkey-3.0.7
 CATEGORIES =	net
 
-REVISION =	0
+REVISION =	1
 
 HOMEPAGE =	http://mldonkey.sourceforge.net/Main_Page
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=mldonkey/}
@@ -24,7 +24,7 @@ WANTLIB +=		Xfixes Xi Xinerama Xrandr Xrender Xxf86vm
 WANTLIB +=		atk-1.0 bz2 c cairo charset curses drm expat
 WANTLIB +=		fontconfig freetype gd gdk-x11-2.0
 WANTLIB +=		gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
-WANTLIB +=		gobject-2.0 gthread-2.0 gtk-x11-2.0 iconv intl
+WANTLIB +=		gobject-2.0 gthread-2.0 gtk-x11-2.0
 WANTLIB +=		jpeg m magic pixman-1 pango-1.0 pangocairo-1.0
 WANTLIB +=		pangoft2-1.0 png pthread pthread-stubs rsvg-2
 WANTLIB +=		stdc++ xcb xcb-render xcb-shm z
@@ -40,7 +40,7 @@ CONFIGURE_ENV +=	CPPFLAGS='-I${LOCALBASE}/include/libpng\
 CONFIGURE_ENV +=	LDFLAGS='-L${LOCALBASE}/lib -L${X11BASE}/lib'
 
 USE_GMAKE =	Yes
-MODULES =	lang/ocaml
+MODULES =	lang/ocaml devel/gettext
 BUILD_DEPENDS =	x11/lablgtk2
 LIB_DEPENDS =	x11/gnome/librsvg \
 		archivers/bzip2 \
diff --git a/net/nepenthes/Makefile b/net/nepenthes/Makefile
index 4ddae209c10..cb03c0d63a2 100644
--- a/net/nepenthes/Makefile
+++ b/net/nepenthes/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.27 2011/05/11 12:03:19 jasper Exp $
+# $OpenBSD: Makefile,v 1.28 2011/07/06 18:57:09 ajacoutot Exp $
 SHARED_ONLY=	Yes
 
 COMMENT=	determine the malware activity on a network
 
 DISTNAME=	nepenthes-0.2.2 
-REVISION=	2
+REVISION=	3
 CATEGORIES=	net
 
 HOMEPAGE=	http://nepenthes.mwcollect.org/
@@ -23,12 +23,14 @@ USE_LIBTOOL=	Yes
 LIBTOOL_FLAGS+=	--tag=disable-static
 USE_GROFF =	Yes
 
+MODULES=	devel/gettext
+
 LIB_DEPENDS=	net/adns \
 		net/curl \
 		devel/libmagic \
 		devel/pcre
 
-WANTLIB=	c crypto iconv intl idn m ssl stdc++ pcap z \
+WANTLIB=	c crypto idn m ssl stdc++ pcap z \
 		adns>=1 curl>=3 magic>=1 pcre>=1
 
 FAKE_FLAGS+=	localstatedir='/var/nepenthes' \
@@ -52,7 +54,7 @@ LIB_DEPENDS+=   security/prelude/libprelude
 CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include  \
                 -I${LOCALBASE}/include/libprelude/" \
 		LDFLAGS="-L${LOCALBASE}/lib -pthread"
-WANTLIB+=	gcrypt gnutls gpg-error iconv intl pthread tasn1 prelude>=8
+WANTLIB+=	gcrypt gnutls gpg-error pthread tasn1 prelude>=8
 CONFIGURE_ARGS+=--enable-prelude
 MESSAGE=        ${PKGDIR}/MESSAGE-prelude
 .else
diff --git a/net/rtorrent/Makefile b/net/rtorrent/Makefile
index ddb67c26a52..2d8cdddaeac 100644
--- a/net/rtorrent/Makefile
+++ b/net/rtorrent/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.27 2011/06/02 13:41:40 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.28 2011/07/06 18:57:09 ajacoutot Exp $
 
 COMMENT=		ncurses BitTorrent client based on libTorrent
 
 DISTNAME=		rtorrent-0.8.6
-REVISION=		1
+REVISION=		2
 CATEGORIES=		net
 
 HOMEPAGE=		http://libtorrent.rakshasa.no/
@@ -16,11 +16,13 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=		c crypto iconv intl idn m ncurses sigc-2.0 ssl \
+WANTLIB=		c crypto idn m ncurses sigc-2.0 ssl \
 			stdc++ z torrent>=17 curl>=14
 
 MASTER_SITES=		${HOMEPAGE}downloads/
 
+MODULES=		devel/gettext
+
 LIB_DEPENDS=		net/libtorrent \
 			net/curl
 
diff --git a/net/yaz/Makefile b/net/yaz/Makefile
index 4806bcc6c67..415ec708a0c 100644
--- a/net/yaz/Makefile
+++ b/net/yaz/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.9 2010/11/19 22:31:39 espie Exp $
+# $OpenBSD: Makefile,v 1.10 2011/07/06 18:57:09 ajacoutot Exp $
 
 COMMENT=		Z39.50/SR client and API library
 DISTNAME=		yaz-3.0.49
 CATEGORIES=		net
+REVISION=		0
 
 SHARED_LIBS+=		yaz		1.1	# 3.0
 SHARED_LIBS+=		yaz_icu		1.2	# 3.0
@@ -21,7 +22,9 @@ PERMIT_DISTFILES_FTP=	Yes
 USE_LIBTOOL=		Yes
 USE_GROFF =		Yes
 
-WANTLIB=		c m ncurses pthread readline z iconv intl \
+MODULES=		devel/gettext
+
+WANTLIB=		c m ncurses pthread readline z \
 			xml2 gpg-error gcrypt exslt xslt icudata \
 			icui18n icuuc
 
diff --git a/print/apvlv/Makefile b/print/apvlv/Makefile
index 8e28afeb412..90bd2c6997f 100644
--- a/print/apvlv/Makefile
+++ b/print/apvlv/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2011/06/04 19:04:24 kili Exp $
+# $OpenBSD: Makefile,v 1.8 2011/07/06 18:57:09 ajacoutot Exp $
 
 COMMENT=	lightweight PDF document viewer with vi bindings
 
 DISTNAME=	apvlv-0.0.9.6
-REVISION=	3
+REVISION=	4
 CATEGORIES=	print
 HOMEPAGE=	http://code.google.com/p/apvlv/
 
@@ -19,10 +19,11 @@ WANTLIB +=	GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi
 WANTLIB +=	Xinerama Xrandr Xrender Xxf86vm atk-1.0 c cairo drm expat
 WANTLIB +=	fontconfig freetype gdk-x11-2.0>=0.14 gdk_pixbuf-2.0>=0.14
 WANTLIB +=	gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
-WANTLIB +=	gtk-x11-2.0>=0.14 iconv intl m pango-1.0 pangocairo-1.0
+WANTLIB +=	gtk-x11-2.0>=0.14 m pango-1.0 pangocairo-1.0
 WANTLIB +=	pangoft2-1.0 pixman-1 png poppler-glib>=3 poppler>=3
 WANTLIB +=	pthread pthread-stubs stdc++ xcb xcb-shm xcb-render z
 
+MODULES=	devel/gettext
 
 LIB_DEPENDS=	x11/gtk+2 \
 		print/poppler
diff --git a/productivity/taskjuggler/Makefile b/productivity/taskjuggler/Makefile
index 2dac531570a..a4ac4ebab21 100644
--- a/productivity/taskjuggler/Makefile
+++ b/productivity/taskjuggler/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.18 2010/11/20 09:48:40 espie Exp $
+# $OpenBSD: Makefile,v 1.19 2011/07/06 18:57:09 ajacoutot Exp $
 
 COMMENT=	project management tool
 
 DISTNAME=	taskjuggler-2.4.1
-REVISION=	2
+REVISION=	3
 
 CATEGORIES=	productivity
 
@@ -18,7 +18,7 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB += DCOP ICE SM X11 Xau Xdmcp Xext Xrender art_lgpl_2 c
-WANTLIB += fam iconv idn intl jpeg kabc kdecore kdefx kdeprint
+WANTLIB += fam idn jpeg kabc kdecore kdefx kdeprint
 WANTLIB += kdesu kdeui khtml kio kjs kparts kresources ktexteditor
 WANTLIB += kutils kwalletclient m pcre pcreposix png pthread pthread-stubs
 WANTLIB += rpcsvc stdc++ util vcard xcb z kcal kmime ktnef
@@ -26,7 +26,7 @@ WANTLIB += rpcsvc stdc++ util vcard xcb z kcal kmime ktnef
 MASTER_SITES=	${HOMEPAGE}/download/
 EXTRACT_SUFX=	.tar.bz2
 
-MODULES=	x11/kde
+MODULES=	x11/kde devel/gettext
 MODKDE_VERSION=	3.4
 USE_LIBTOOL=	Yes
 USE_GMAKE=	Yes