diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index 60a979bc9ad..d7ca921d60a 100644
--- a/games/gtetrinet/Makefile
+++ b/games/gtetrinet/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.22 2011/01/18 20:22:55 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.23 2011/07/06 23:56:08 ajacoutot Exp $
 
 MULTI_PACKAGES=	-main -themes
 
@@ -6,7 +6,7 @@ COMMENT-main=	tetrinet client
 COMMENT-themes=	collection of gtetrinet themes
 DISTNAME=	gtetrinet-0.7.11
 PKGNAME-main=	${DISTNAME}
-REVISION-main=	13
+REVISION-main=	14
 PKGNAME-themes=	gtetrinet-themes-20070623
 REVISION-themes=1
 CATEGORIES=	x11 games
@@ -37,7 +37,8 @@ PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
 MODULES=		textproc/intltool \
-			devel/gconf2
+			devel/gconf2 \
+			devel/gettext
 
 LIB_DEPENDS-main=	${MODGCONF2_LIB_DEPENDS} \
 			x11/gnome/libgnome \
@@ -57,9 +58,10 @@ WANTLIB-main += audiofile bonobo-2 bonobo-activation bonoboui-2 c cairo
 WANTLIB-main += expat fontconfig freetype gailutil gdk-x11-2.0
 WANTLIB-main += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gnome-keyring
 WANTLIB-main += gnomecanvas-2 gnomevfs-2 gobject-2.0 gthread-2.0 gtk-x11-2.0
-WANTLIB-main += iconv intl m pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB-main += m pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB-main += pixman-1 png popt pthread pthread-stubs sndio xcb xml2 z
-WANTLIB-main += GL Xxf86vm canberra drm xcb-render xcb-shm
+WANTLIB-main += GL Xxf86vm canberra drm xcb-render xcb-shm ${MODGETTEXT_WANTLIB}
+
 WANTLIB-themes =
 
 MODGCONF2_SCHEMAS_DIR= gtetrinet
diff --git a/games/rftg/Makefile b/games/rftg/Makefile
index 7e4e5b110e1..c4c3f9bf34f 100644
--- a/games/rftg/Makefile
+++ b/games/rftg/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2011/04/05 08:13:37 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2011/07/06 23:56:08 ajacoutot Exp $
 
 V = 0.8.1
 COMMENT-client = race for the galaxy card game
@@ -13,6 +13,8 @@ MASTER_SITES = http://warpcore.org/rftg/
 MULTI_PACKAGES = -client #-server
 SUBPACKAGE ?= -client
 
+REVISION-client =	0
+
 # Licence: GPL
 # official authorization from the game publisher (Rio Grande)
 PERMIT_DISTFILES_CDROM = Yes
@@ -36,16 +38,18 @@ post-install:
 	${INSTALL_PROGRAM} ${WRKBUILD}/server ${PREFIX}/bin/rftg-server
 .endif
 
+MODULES =	devel/gettext
 
-WANTLIB = c m pthread
-WANTLIB-client = ${WANTLIB} X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
+cWANTLIB = c m pthread
+
+WANTLIB-client = ${cWANTLIB} X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
 	Xfixes Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig \
 	freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 \
-	gobject-2.0 gthread-2.0 gtk-x11-2.0 iconv intl pango-1.0 \
+	gobject-2.0 gthread-2.0 gtk-x11-2.0 pango-1.0 \
 	pangocairo-1.0 pangoft2-1.0 pixman-1 png pthread-stubs xcb xcb-render \
-	xcb-render-util z
+	xcb-render-util z ${MODGETTEXT_WANTLIB}
 
-WANTLIB-server = ${WANTLIB} c m pthread mysqlclient
+WANTLIB-server = ${cWANTLIB} c m pthread mysqlclient
 
 
 .include <bsd.port.mk>
diff --git a/geo/mapserver/Makefile b/geo/mapserver/Makefile
index da4eb2f019c..329222bbe63 100644
--- a/geo/mapserver/Makefile
+++ b/geo/mapserver/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2011/06/22 20:16:43 landry Exp $
+# $OpenBSD: Makefile,v 1.11 2011/07/06 23:56:08 ajacoutot Exp $
 
 MULTI_PACKAGES=	-utils -main -php -perl
 SHARED_ONLY=	Yes
@@ -15,6 +15,11 @@ PKGNAME-utils=	mapserver-utils-${V}
 PKGNAME-php=	php5-mapscript-${V}
 PKGNAME-perl=	p5-mapscript-${V}
 
+REVISION-main=	0
+REVISION-utils=	0
+REVISION-php=	0
+REVISION-perl=	0
+
 CATEGORIES=	geo www
 
 HOMEPAGE=	http://www.mapserver.org/
@@ -28,6 +33,8 @@ MAINTAINER=	Landry Breuil <landry@openbsd.org>
 
 MASTER_SITES=	http://download.osgeo.org/mapserver/
 
+MODULES=	devel/gettext
+
 BUILD_DEPENDS=	www/php5/core \
 		graphics/agg
 
@@ -40,12 +47,11 @@ LIB_DEPENDS=	devel/proj \
 RUN_DEPENDS-php=	www/php5/core
 
 
-WANTLIB=	crypto curl expat freetype iconv idn jpeg \
-		m png pq ssl xml2 z proj gdal geos_c gd stdc++
-
+WANTLIB += crypto curl expat freetype idn jpeg m png pq ssl xml2 z proj
+WANTLIB += gdal geos_c gd stdc++
 WANTLIB += GL X11 Xau Xdamage Xdmcp Xext Xfixes Xrender Xxf86vm
 WANTLIB += cairo drm fontconfig glib-2.0 gobject-2.0 gthread-2.0
-WANTLIB += intl pixman-1 pthread-stubs xcb xcb-render xcb-shm
+WANTLIB += pixman-1 pthread-stubs xcb xcb-render xcb-shm
 
 WANTLIB-main=	${WANTLIB} pthread c gif
 WANTLIB-utils=	${WANTLIB} pthread c gif
diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile
index 133c7ce3eb9..7ccf665770a 100644
--- a/graphics/camlimages/Makefile
+++ b/graphics/camlimages/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2011/01/13 10:22:54 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.15 2011/07/06 23:56:08 ajacoutot Exp $
 
 COMMENT=	image manipulation functions for Objective Caml
 CATEGORIES=	graphics
@@ -7,6 +7,8 @@ DISTNAME=	camlimages-3.0.2
 EXTRACT_SUFX=	.tgz
 MASTER_SITES=	http://caml.inria.fr/distrib/bazar-ocaml/
 
+REVISION=	0
+
 MAINTAINER=	Anil Madhavapeddy <avsm@openbsd.org>
 HOMEPAGE=	http://cristal.inria.fr/camlimages/
 
@@ -19,8 +21,7 @@ MODULES=	lang/ocaml
 
 WANTLIB+=	ICE SM X11 Xpm freetype gif jpeg m png tiff z
 
-LIB_DEPENDS=	graphics/jpeg \
-		graphics/libungif \
+LIB_DEPENDS=	graphics/libungif \
 		graphics/png \
 		graphics/tiff
 RUN_DEPENDS=	print/ghostscript/gnu \
@@ -50,11 +51,12 @@ post-install:
 .include <bsd.port.mk>
 
 .if ${MODOCAML_NATIVE:L} == "yes"
+MODULES +=	devel/gettext
 WANTLIB+=	GL Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi \
 		Xinerama Xrandr Xrender Xxf86vm atk-1.0 c cairo drm \
 		expat fontconfig gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 \
 		glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
-		gtk-x11-2.0 iconv intl pango-1.0 pangocairo-1.0 \
+		gtk-x11-2.0 pango-1.0 pangocairo-1.0 \
 		pangoft2-1.0 pixman-1 pthread pthread-stubs xcb \
 		xcb-render xcb-shm
 .endif
diff --git a/lang/classpath/Makefile b/lang/classpath/Makefile
index 9260ba3cc4f..ef56af7661c 100644
--- a/lang/classpath/Makefile
+++ b/lang/classpath/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.20 2010/11/17 08:05:17 espie Exp $
+# $OpenBSD: Makefile,v 1.21 2011/07/06 23:56:08 ajacoutot Exp $
 
 # uses gcj which is only supported on select archs
 ONLY_FOR_ARCHS=	i386 amd64 sparc64
@@ -6,7 +6,7 @@ ONLY_FOR_ARCHS=	i386 amd64 sparc64
 COMMENT=	essential libraries for java
 
 DISTNAME=	classpath-0.98
-REVISION=	3
+REVISION=	4
 
 CATEGORIES=	lang java
 
@@ -27,7 +27,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MODULES=	converters/libiconv gcc4
+MODULES=	devel/gettext gcc4
 MODGCC4_ARCHES=	*
 MODGCC4_LANGS=	java
 USE_GROFF =	Yes
@@ -48,7 +48,7 @@ LIB_DEPENDS=	x11/gtk+2 \
 WANTLIB=	ICE SM X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
 		Xfixes Xi Xinerama Xrandr Xrender Xtst atk-1.0 cairo \
 		dbus-1 expat fontconfig freetype gio-2.0 glib-2.0 \
-		gmodule-2.0 gobject-2.0 gthread-2.0 intl m pango-1.0 \
+		gmodule-2.0 gobject-2.0 gthread-2.0 m pango-1.0 \
 		pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread-stubs \
 		xcb xcb-render xcb-render-util ORBit-2 gconf-2 magic gmp z \
 		gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0
diff --git a/lang/php/Makefile.inc b/lang/php/Makefile.inc
index 44a2bd81a1d..6466905abe6 100644
--- a/lang/php/Makefile.inc
+++ b/lang/php/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.12 2011/06/18 19:49:50 sthen Exp $
+# $OpenBSD: Makefile.inc,v 1.13 2011/07/06 23:56:08 ajacoutot Exp $
 
 # This port currently only works with archs supporting dynamic loading
 # and has Apache that supports DSO's.
@@ -10,6 +10,11 @@ COMMENT-fastcgi=	stand-alone FastCGI version of PHP
 PKGNAME-main?=		php-${V}
 PKGNAME-fastcgi?=	php-fastcgi-${V}
 
+REVISION-main=		0
+REVISION-soap=		0
+REVISION-xmlrpc=	0
+REVISION-xsl=		0
+
 DISTFILES=		php-${V}.tar.gz
 
 DISTNAME?=		php-${V}
@@ -247,7 +252,7 @@ MULTI_PACKAGES+=	-soap
 COMMENT-soap=		SOAP functions for php5
 CONFIGURE_ARGS+=	--enable-soap=shared,${LOCALBASE}
 LIB_DEPENDS-soap=	textproc/libxml
-WANTLIB-soap=		iconv m z xml2>=8
+WANTLIB-soap=		${MODLIBICONV_WANTLIB} m z xml2>=8
 
 # snmp
 MULTI_PACKAGES+=	-snmp
@@ -289,14 +294,14 @@ MULTI_PACKAGES+=	-xmlrpc
 COMMENT-xmlrpc=		XML RPC functions for php5
 CONFIGURE_ARGS+=	--with-xmlrpc=shared
 LIB_DEPENDS-xmlrpc=	textproc/libxml
-WANTLIB-xmlrpc=		iconv m z xml2>=8
+WANTLIB-xmlrpc=		${MODLIBICONV_WANTLIB} m z xml2>=8
 
 # xsl
 MULTI_PACKAGES+=	-xsl
 COMMENT-xsl=		XSL functions for php5
 CONFIGURE_ARGS+=	--with-xsl=shared --enable-dom
 LIB_DEPENDS-xsl=	textproc/libxslt
-WANTLIB-xsl=		iconv m xml2 z xslt>=3 exslt
+WANTLIB-xsl=		${MODLIBICONV_WANTLIB} m xml2 z xslt>=3 exslt
 
 # some variables to substitute
 SUBST_VARS=	PHP_CONFIG_FILE PHP_CONFIG_PATH PV ^MODULE_NAME
@@ -306,10 +311,10 @@ PHP_VERSION=	${V}
 PHPXS_SUBST+= -e 's,${i},${${i}},'
 .endfor
 
-MODULES=		devel/gettext
+MODULES=		converters/libiconv devel/gettext
 
-WANTLIB-main=		c crypto ssl z pthread gssapi iconv krb5 xml2>=8 \
-			intl m
+WANTLIB-main=		c crypto ssl z pthread gssapi krb5 xml2>=8 \
+			m ${MODGETTEXT_WANTLIB}
 WANTLIB-fastcgi=	${WANTLIB-main}
 LIB_DEPENDS-main=	textproc/libxml
 RUN_DEPENDS-main=	${MODGETTEXT_RUN_DEPENDS} \
diff --git a/math/gnuplot/Makefile b/math/gnuplot/Makefile
index f7299e756c4..34f20870b09 100644
--- a/math/gnuplot/Makefile
+++ b/math/gnuplot/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.49 2011/06/25 06:54:35 rpointel Exp $
+# $OpenBSD: Makefile,v 1.50 2011/07/06 23:56:08 ajacoutot Exp $
 
 COMMENT =	command-driven interactive function plotting program
 
 V =		4.4
 PATCHLEVEL =	3
-REVISION =	0
+REVISION =	1
 DISTNAME =	gnuplot-${V}.${PATCHLEVEL}
 CATEGORIES =	math graphics
 MASTER_SITES =	${MASTER_SITE_SOURCEFORGE:=gnuplot/}
@@ -45,19 +45,21 @@ SUBST_VARS =	V
 CONFIGURE_ARGS += --without-x \
 		  --without-gd
 .else
+MODULES +=	converters/libiconv
 LIB_DEPENDS +=	graphics/gd
 USE_GROFF =	Yes
-WANTLIB +=	X11 fontconfig freetype iconv jpeg png gd>=20
+WANTLIB +=	X11 fontconfig freetype ${MODLIBICONV_WANTLIB} jpeg png gd>=20
 CONFIGURE_ARGS += --with-x
 .endif
 
 .if ${FLAVOR:L:Mno_cairo} || ${FLAVOR:L:Mno_x11}
 CONFIGURE_ARGS += --without-cairo
 .else
+MODULES +=	devel/gettext
 LIB_DEPENDS +=	devel/pango	\
 		graphics/cairo
 WANTLIB +=	GL Xau Xdamage Xdmcp Xext Xfixes Xrender Xxf86vm drm \
-		expat gmodule-2.0 gobject-2.0 gthread-2.0 intl pixman-1 \
+		expat gmodule-2.0 gobject-2.0 gthread-2.0 pixman-1 \
 		pthread pthread-stubs xcb xcb-render xcb-shm \
 		pangocairo-1.0 cairo glib-2.0 pango-1.0 pangoft2-1.0
 .endif
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index a3bd0bb618e..8e85fce8e73 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.46 2010/11/19 22:31:34 espie Exp $
+# $OpenBSD: Makefile,v 1.47 2011/07/06 23:56:08 ajacoutot Exp $
 
 COMMENT=	Matt's traceroute - network diagnostic tool
 
 DISTNAME=	mtr-0.80
-REVISION=	0
+REVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=     Jakob Schlyter <jakob@openbsd.org>
@@ -29,13 +29,14 @@ FLAVOR?=
 .if ${FLAVOR:L} == "no_x11"
 CONFIGURE_ARGS+=	--without-gtk
 .else
+MODULES +=		devel/gettext
 CONFIGURE_ARGS+=	--with-gtk-prefix=${LOCALBASE}
 LIB_DEPENDS+=		x11/gtk+2
 
 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 += gthread-2.0 iconv intl pango-1.0 pangocairo-1.0 pangoft2-1.0
+WANTLIB += gthread-2.0 pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += pixman-1 png pthread pthread-stubs xcb xcb-render xcb-render-util
 WANTLIB += z gtk-x11-2.0
 .endif
diff --git a/net/olsrd/Makefile b/net/olsrd/Makefile
index 84d660adcdd..fc2a461f2c0 100644
--- a/net/olsrd/Makefile
+++ b/net/olsrd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.15 2010/11/19 22:31:35 espie Exp $
+# $OpenBSD: Makefile,v 1.16 2011/07/06 23:56:08 ajacoutot Exp $
 
 COMMENT-main=		OLSR routing daemon
 COMMENT-gui=		OLSR routing daemon GUI
@@ -9,9 +9,9 @@ DISTNAME=		olsrd-${VERSION}
 PKGNAME-main=		olsrd-${VERSION}
 PKGNAME-gui=		olsrd-gui-${VERSION}
 PKGNAME-plugins=	olsrd-plugins-${VERSION}
-REVISION-main=		0
-REVISION-gui=		1
-REVISION-plugins=	0
+REVISION-main=		1
+REVISION-gui=		2
+REVISION-plugins=	1
 
 CATEGORIES=	net
 
@@ -29,25 +29,28 @@ PERMIT_DISTFILES_FTP=	Yes
 MULTI_PACKAGES= -main -gui -plugins
 
 BUILD_DEPENDS=	devel/bison
+
+LIB_DEPENDS-main=	# empty
 WANTLIB-main=	c
 
 LIB_DEPENDS-gui= x11/gtk+2
-
 WANTLIB-gui=	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
 		Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig \
 		freetype gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 \
-		gthread-2.0 iconv intl m pango-1.0 pangocairo-1.0 \
+		gthread-2.0 m pango-1.0 pangocairo-1.0 \
 		pangoft2-1.0 pixman-1 png pthread pthread-stubs xcb \
 		xcb-render xcb-render-util z gdk_pixbuf-2.0 gtk-x11-2.0 \
-		gdk-x11-2.0
+		gdk-x11-2.0 ${MODGETTEXT_WANTLIB}
 
-RUN_DEPENDS-plugins= olsrd-${VERSION}:net/olsrd
+WANTLIB-plugins=	# empty
+LIB_DEPENDS-plugins=	# empty
+RUN_DEPENDS-plugins=	olsrd-${VERSION}:net/olsrd
 
 USE_GMAKE=	Yes
 USE_GROFF =	Yes
 NO_REGRESS=	Yes
 
-MODULES=	gcc3
+MODULES=	gcc3 devel/gettext
 MODGCC3_ARCHES=	sparc
 
 ALL_TARGET=	build_all
diff --git a/net/putty/Makefile b/net/putty/Makefile
index bcc9717bd39..eb3b02fb677 100644
--- a/net/putty/Makefile
+++ b/net/putty/Makefile
@@ -1,13 +1,13 @@
-# $OpenBSD: Makefile,v 1.8 2010/11/19 22:31:37 espie Exp $
+# $OpenBSD: Makefile,v 1.9 2011/07/06 23:56:08 ajacoutot Exp $
 
 COMMENT-main=	SSH and telnet client
 COMMENT-gui=	PuTTY GUI clients
 
 DISTNAME=       putty-0.60
 PKGNAME-main=	${DISTNAME}
-REVISION-main=	0
+REVISION-main=	1
 PKGNAME-gui=	${DISTNAME:S/putty/putty-gui/}
-REVISION-gui=	1
+REVISION-gui=	2
 CATEGORIES=	net security
 
 HOMEPAGE=	http://www.chiark.greenend.org.uk/~sgtatham/putty/
@@ -28,9 +28,13 @@ USE_GROFF =		Yes
 
 MULTI_PACKAGES= 	-main -gui
 
-WANTLIB=		c
-WANTLIB-gui=		X11 Xext Xi c glib gmodule iconv intl m \
+MODULES=		devel/gettext
+
+WANTLIB-main=		c
+WANTLIB-gui=		X11 Xext Xi c glib gmodule m ${MODGETTEXT_WANTLIB} \
 			pthread-stubs xcb gtk>=1 gdk>=1
+
+LIB_DEPENDS-main=	# empty
 LIB_DEPENDS-gui=	x11/gtk+
 
 pre-configure:
diff --git a/x11/gnustep/back/Makefile b/x11/gnustep/back/Makefile
index 6b9c582ebf2..8083c2fdc28 100644
--- a/x11/gnustep/back/Makefile
+++ b/x11/gnustep/back/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.27 2011/06/24 10:51:48 sebastia Exp $
+# $OpenBSD: Makefile,v 1.28 2011/07/06 23:56:08 ajacoutot Exp $
 
 COMMENT=	GNUstep gui backend
 
 V =		0.20.1
 DISTNAME=	gnustep-back-${V}
-REVISION =	0
+REVISION =	1
 
 CATEGORIES=	devel
 
@@ -17,8 +17,8 @@ MODGNUSTEP_NEEDS_BACK=	No
 WANTLIB+= 	Xau Xdmcp Xft Xrender expat fontconfig pixman-1
 WANTLIB+= 	png cairo pthread-stubs xcb xcb-render xcb-shm
 WANTLIB+= 	Xdamage Xfixes Xxf86vm drm glib-2.0 gobject-2.0
-WANTLIB+= 	gthread-2.0 intl freetype z
-WANTLIB+=	GL X11 Xext Xmu Xt c m pthread
+WANTLIB+= 	gthread-2.0 freetype z GL X11 Xext Xmu Xt c m pthread
+
 LIB_DEPENDS=	graphics/cairo
 
 BACKENDV=	${V:C/([0-9])*[.]([0-9]*).*/\1\2/1}