diff --git a/converters/libiconv/libiconv.port.mk b/converters/libiconv/libiconv.port.mk
index 6408db8c3ce..1e5eb9494d9 100644
--- a/converters/libiconv/libiconv.port.mk
+++ b/converters/libiconv/libiconv.port.mk
@@ -1,10 +1,13 @@
-# $OpenBSD: libiconv.port.mk,v 1.4 2008/10/12 08:52:03 espie Exp $
+# $OpenBSD: libiconv.port.mk,v 1.5 2010/11/06 10:18:39 espie Exp $
 
 # The RUN_DEPENDS entry is to ensure libiconv is installed. This is
 # necessary so that we have charset.alias installed on static archs.
 # Typically installed in PREFIX/lib.
-MODLIBICONV_LIB_DEPENDS =	iconv.>=2::converters/libiconv
+MODLIBICONV_LIB_DEPENDS =	::converters/libiconv
 MODLIBICONV_RUN_DEPENDS =	:libiconv-*:converters/libiconv
 
+MODLIBICONV_WANTLIB =		iconv.>=2
+
 LIB_DEPENDS +=			${MODLIBICONV_LIB_DEPENDS}
 RUN_DEPENDS +=			${MODLIBICONV_RUN_DEPENDS}
+WANTLIB +=			${MODLIBICONV_WANTLIB}
diff --git a/converters/libpst/Makefile b/converters/libpst/Makefile
index dce0c107bc0..90259c9773b 100644
--- a/converters/libpst/Makefile
+++ b/converters/libpst/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.12 2010/10/24 21:06:36 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.13 2010/11/06 10:18:38 espie Exp $
 
 COMMENT-main=		read and convert Microsoft Outlook mail files
 COMMENT-python=		python interface to libpst
@@ -22,6 +22,9 @@ PERMIT_DISTFILES_FTP=	Yes
 
 WANTLIB-main += c expat fontconfig freetype jpeg m png pthread stdc++
 WANTLIB-main += z
+WANTLIB-main += gd.>=20 ${MODLIBICONV_WANTLIB}
+
+WANTLIB-python += pst.>=1 boost_python.>=1 ${MODLIBICONV_WANTLIB}
 
 MASTER_SITES=		${HOMEPAGE}/packages/
 
@@ -33,11 +36,11 @@ MODULES=		converters/libiconv \
 BUILD_DEPENDS=		${RUN_DEPENDS-main}
 RUN_DEPENDS-main=	::graphics/ImageMagick
 LIB_DEPENDS-main=	${MODLIBICONV_LIB_DEPENDS} \
-			gd.>=20::graphics/gd
+			::graphics/gd
 
 LIB_DEPENDS-python=	${MODLIBICONV_LIB_DEPENDS} \
-			pst.>=1::${BASE_PKGPATH} \
-			boost_python.>=1::devel/boost
+			::${BASE_PKGPATH} \
+			::devel/boost
 
 USE_LIBTOOL=		Yes
 USE_GMAKE=		Yes
diff --git a/databases/lbdb/Makefile b/databases/lbdb/Makefile
index 35f6e5e77ba..4e66f45c84c 100644
--- a/databases/lbdb/Makefile
+++ b/databases/lbdb/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2010/10/18 17:06:07 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2010/11/06 10:18:38 espie Exp $
 
 COMMENT-main =		little brother's database, email address query tools
 COMMENT-ldap =		LDAP support for lbdb
@@ -27,8 +27,9 @@ RUN_DEPENDS-ldap =	::databases/p5-ldap \
 			:${PKGNAME-main}:databases/lbdb
 
 MODULES =		converters/libiconv
-WANTLIB-main =		c
+WANTLIB-main =		c ${MODLIBICONV_WANTLIB}
 LIB_DEPENDS-ldap =
+WANTLIB-ldap =
 
 MASTER_SITES =		http://www.spinnaker.de/debian/
 
diff --git a/devel/cpphs/Makefile b/devel/cpphs/Makefile
index dd81fad7b5d..e3fa06f724f 100644
--- a/devel/cpphs/Makefile
+++ b/devel/cpphs/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2010/11/03 22:13:38 kili Exp $
+# $OpenBSD: Makefile,v 1.22 2010/11/06 10:18:38 espie Exp $
 
 COMMENT-main =	liberalised reimplementation of cpp in Haskell
 COMMENT-lib =	cpphs library
@@ -35,6 +35,7 @@ MODGHC_BUILD =		cabal haddock register
 LIB_DEPENDS-main =	${LIB_DEPENDS} ::devel/gmp
 RUN_DEPENDS-main =
 LIB_DEPENDS-lib =
+WANTLIB-lib =
 .else
 # NHC: use the good old makefile for now (though it *should* be possible
 # to build with cabal, too).
diff --git a/devel/git/Makefile b/devel/git/Makefile
index 995432fc5e1..e04a74e33ab 100644
--- a/devel/git/Makefile
+++ b/devel/git/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.72 2010/11/05 08:23:04 bernd Exp $
+# $OpenBSD: Makefile,v 1.73 2010/11/06 10:18:38 espie Exp $
 
 COMMENT-main =	GIT - Tree History Storage Tool
 COMMENT-svn =	GIT - subversion interoperability tools
@@ -41,7 +41,7 @@ BUILD_DEPENDS =		::archivers/gtar \
 
 MULTI_PACKAGES =	-main -svn -x11
 
-WANTLIB-main =		c expat crypto curl ssl z
+WANTLIB-main =		c expat crypto curl ssl z ${MODLIBICONV_WANTLIB}
 RUN_DEPENDS-main =	::net/rsync \
 			::devel/p5-Error \
 			:cvsps-*:devel/cvsps \
@@ -55,11 +55,13 @@ RUN_DEPENDS-svn =	::${BASE_PKGPATH} \
 			::www/p5-URI \
 			::www/p5-libwww
 LIB_DEPENDS-svn =
+WANTLIB-svn =
 PKG_ARCH-svn =		*
 
 RUN_DEPENDS-x11 =	::${BASE_PKGPATH},-main \
 			${MODTK_RUN_DEPENDS}
 LIB_DEPENDS-x11 =
+WANTLIB-x11 =
 PKG_ARCH-x11 =		*
 
 MAKE_ENV =		prefix=${PREFIX} CC="${CC}" CFLAGS="${CFLAGS}" V=1 \
diff --git a/devel/haddock/Makefile b/devel/haddock/Makefile
index e36cb188614..e8536e6f0f3 100644
--- a/devel/haddock/Makefile
+++ b/devel/haddock/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2010/11/03 22:13:38 kili Exp $
+# $OpenBSD: Makefile,v 1.25 2010/11/06 10:18:38 espie Exp $
 
 COMMENT-main =	documentation-generation tool for Haskell libraries
 COMMENT-lib =	haddock library
@@ -34,7 +34,9 @@ LIB_DEPENDS-lib =
 LIB_DEPENDS-main =	${LIB_DEPENDS} \
 			::devel/gmp
 
-WANTLIB-main =		c gmp m pthread util
+WANTLIB-lib =
+WANTLIB-main =		${WANTLIB} \
+			c gmp m pthread util
 
 BUILD_DEPENDS +=	::devel/alex \
 			::devel/happy \
diff --git a/lang/gfortran/Makefile b/lang/gfortran/Makefile
index c7de3baf30c..2ae6e6e63ce 100644
--- a/lang/gfortran/Makefile
+++ b/lang/gfortran/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2010/10/19 19:46:12 naddy Exp $
+# $OpenBSD: Makefile,v 1.5 2010/11/06 10:18:38 espie Exp $
 
 ONLY_FOR_ARCHS = ${GCC4_ARCHS}
 SYSV =		4.2.1
@@ -37,9 +37,10 @@ MULTI_PACKAGES =	-main -lib
 
 MODULES =		converters/libiconv
 
-WANTLIB-main =		c iberty gmp
+WANTLIB-main =		${MODLIBICONV_WANTLIB} c iberty gmp
 LIB_DEPENDS-main =	mpfr::devel/mpfr \
 			${MODLIBICONV_LIB_DEPENDS}
+WANTLIB-lib =
 LIB_DEPENDS-lib =
 RUN_DEPENDS-main =	::${BASE_PKGPATH},-lib
 
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index a5cbb37e254..2e86514508b 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.46 2010/11/05 21:23:46 kili Exp $
+# $OpenBSD: Makefile,v 1.47 2010/11/06 10:18:38 espie Exp $
 
 COMMENT-main =		compiler for the functional language Haskell
 COMMENT-doc =		documentation for GHC
@@ -37,9 +37,10 @@ RUN_DEPENDS-doc =
 RUN_DEPENDS-main =
 
 REVISION-main =		6
-WANTLIB-main =		c gmp m ncursesw pthread util
+WANTLIB-main =		${WANTLIB} c gmp m ncursesw pthread util
 
 REVISION-doc =		2
+WANTLIB-doc =
 
 MASTER_SITES =		http://darcs.haskell.org/download/dist/${MODGHC_VER}/ \
 			${HOMEPAGE}dist/${MODGHC_VER}/ \
diff --git a/lang/ruby/1.8/Makefile b/lang/ruby/1.8/Makefile
index d3289057360..7d1d7164803 100644
--- a/lang/ruby/1.8/Makefile
+++ b/lang/ruby/1.8/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2010/10/24 21:24:04 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.5 2010/11/06 10:18:38 espie Exp $
 
 COMMENT-main=		object oriented script language with threads
 COMMENT-iconv=		libiconv interface for ruby
@@ -36,7 +36,7 @@ FLAVOR?=
 
 MULTI_PACKAGES=		-main -iconv -gdbm
 
-WANTLIB-iconv=		c m ruby18
+WANTLIB-iconv=		${MODLIBICONV_WANTLIB} c m ruby18
 LIB_DEPENDS-iconv=	${MODLIBICONV_LIB_DEPENDS} \
 			:ruby->=1.8,<=1.9:lang/ruby/${REV},-main
 RUN_DEPENDS-iconv=	${MODLIBICONV_RUN_DEPENDS}
diff --git a/lang/ruby/1.9/Makefile b/lang/ruby/1.9/Makefile
index 17ac0bf4fa3..0c8d0a98889 100644
--- a/lang/ruby/1.9/Makefile
+++ b/lang/ruby/1.9/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2010/10/24 21:24:04 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.6 2010/11/06 10:18:38 espie Exp $
 
 COMMENT-main =		object oriented script language with threads
 COMMENT-gdbm =		gdbm interface for Ruby
@@ -30,7 +30,7 @@ MODULES =		converters/libiconv
 USE_GROFF =	Yes
 
 WANTLIB-main =		c crypto ffi m ncurses pthread readline ssl termcap \
-			util yaml z
+			util yaml z ${MODLIBICONV_WANTLIB}
 LIB_DEPENDS-main =	${MODLIBICONV_LIB_DEPENDS} \
 			::devel/libyaml \
 			::devel/libffi
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 904debc0cf3..a6b3ccd9f13 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.152 2010/10/18 19:59:15 espie Exp $
+# $OpenBSD: Makefile,v 1.153 2010/11/06 10:18:38 espie Exp $
 
 SHARED_ONLY=	Yes
 
@@ -39,8 +39,8 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB-server=		bz2 c crypto gssapi krb5 ssl z
-WANTLIB-sieve=		c crypto ssl
+WANTLIB-server=		${MODLIBICONV_WANTLIB} bz2 c crypto gssapi krb5 ssl z
+WANTLIB-sieve=		${MODLIBICONV_WANTLIB} c crypto ssl
 
 MODULES=	converters/libiconv
 LIB_DEPENDS+=	::archivers/bzip2
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index b90a194020d..8fdeae734eb 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.75 2010/10/24 21:25:12 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.76 2010/11/06 10:18:38 espie Exp $
 
 CATEGORIES =		mail
 COMMENT-main =		flexible mail transfer agent
@@ -29,9 +29,9 @@ MULTI_PACKAGES =	-main
 
 MODULES =		converters/libiconv
 LIB_DEPENDS-main =	${LIB_DEPENDS} pcre::devel/pcre
-WANTLIB =		c m
-WANTLIB-main =		${WANTLIB} crypto perl ssl util wrap
-WANTLIB-eximon =		${WANTLIB} X11 Xaw Xext Xmu Xt
+cWANTLIB =		c m
+WANTLIB-main =		${WANTLIB} ${cWANTLIB} crypto perl ssl util wrap
+WANTLIB-eximon =	${cWANTLIB} X11 Xaw Xext Xmu Xt
 RUN_DEPENDS-eximon =	::${PKGPATH},-main
 LIB_DEPENDS-eximon =	pcre::devel/pcre
 
diff --git a/net/pfstat/Makefile b/net/pfstat/Makefile
index 516a13514ba..491b5e8d224 100644
--- a/net/pfstat/Makefile
+++ b/net/pfstat/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2010/10/19 21:04:52 naddy Exp $
+# $OpenBSD: Makefile,v 1.24 2010/11/06 10:18:38 espie Exp $
 
 COMMENT-main=	packet filter statistics visualization
 COMMENT-daemon=	pfstat daemon
@@ -28,9 +28,8 @@ MODULES=		converters/libiconv
 
 MULTI_PACKAGES=		-main -daemon
 
-WANTLIB-main=		c m z jpeg png
-LIB_DEPENDS-main=	gd.>=20::graphics/gd \
-			${MODLIBICONV_LIB_DEPENDS}
+WANTLIB-main=		${MODLIBICONV_WANTLIB} c m z jpeg png gd.>=20
+LIB_DEPENDS-main=	${MODLIBICONV_LIB_DEPENDS} ::graphics/gd
 WANTLIB-daemon=		c
 LIB_DEPENDS-daemon=
 RUN_DEPENDS-daemon=
diff --git a/print/poppler/Makefile b/print/poppler/Makefile
index 72a7c5ecfb7..2d4dcaf9d61 100644
--- a/print/poppler/Makefile
+++ b/print/poppler/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.38 2010/11/05 13:47:46 espie Exp $
+# $OpenBSD: Makefile,v 1.39 2010/11/06 10:18:38 espie Exp $
 .include <bsd.own.mk>
 
 COMMENT-main=	PDF rendering library
@@ -81,7 +81,8 @@ WANTLIB-main=	${cWANTLIB} Xcursor Xext Xfixes Xi Xinerama Xrandr gio-2.0 \
 		pangocairo-1.0 pangoft2-1.0 pixman-1 gdk_pixbuf-2.0 openjpeg \
 		X11 Xau Xcomposite Xdamage Xdmcp Xrender cairo pcre png \
 		pthread-stubs xcb xcb-render xcb-render-util gdk-x11-2.0 lcms
-WANTLIB-qt=	${cWANTLIB} lcms openjpeg xml2 poppler png ${MODQT3_WANTLIB}
+WANTLIB-qt=	${cWANTLIB} lcms openjpeg xml2 poppler png ${MODQT3_WANTLIB} \
+		${MODLIBICONV_WANTLIB}
 WANTLIB-qt4=	${cWANTLIB} ICE QtCore QtGui QtXml SM X11 Xau Xdmcp Xext Xi \
                 Xinerama Xrender glib-2.0 gobject-2.0 gthread-2.0 lcms \
 		openjpeg pcre png poppler pthread-stubs xcb xml2 \
diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile
index de879dabcd0..a85404ead11 100644
--- a/textproc/libxml/Makefile
+++ b/textproc/libxml/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.128 2010/10/24 15:53:55 sthen Exp $
+# $OpenBSD: Makefile,v 1.129 2010/11/06 10:18:38 espie Exp $
 
 COMMENT-main=		XML parsing library
 COMMENT-python=		Python bindings for libxml
@@ -51,7 +51,7 @@ MODULES+=		lang/python
 LIB_DEPENDS-python=	xml2.>=11::textproc/libxml,-main \
 			${MODPY_LIB_DEPENDS} \
 			${MODLIBICONV_LIB_DEPENDS}
-WANTLIB-python=		m z util ${MODPY_WANTLIB}
+WANTLIB-python=		m z util ${MODPY_WANTLIB} ${MODLIBICONV_WANTLIB}
 FAKE_FLAGS=		EXAMPLE_DIR=${PREFIX}/share/examples/libxml2/
 .endif
 
diff --git a/www/sope/Makefile b/www/sope/Makefile
index 1e4a36f084b..6cef85bbda4 100644
--- a/www/sope/Makefile
+++ b/www/sope/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2010/10/26 12:43:41 sebastia Exp $
+# $OpenBSD: Makefile,v 1.5 2010/11/06 10:18:38 espie Exp $
 
 COMMENT-main=		Skyrix Object Publishing Environment
 COMMENT-mysql=		SOPE MySQL adaptor
@@ -34,11 +34,12 @@ MULTI_PACKAGES=	-main -mysql -postgres
 MODULES=	converters/libiconv x11/gnustep apache-module
 MODGNUSTEP_NEEDS_GUI=	No
 
-WANTLIB +=	m
-WANTLIB-main += ${WANTLIB} c pthread crypto ssl z lber ldap xml2
+WANTLIB =		m
+WANTLIB-main = 		${WANTLIB} c pthread crypto ssl z lber ldap xml2
 
-WANTLIB-mysql += ${WANTLIB} GDLAccess EOControl mysqlclient crypto ssl z
-WANTLIB-postgres += ${WANTLIB} GDLAccess EOControl pq
+WANTLIB-mysql = 	${MODGNUSTEP_WANTLIB} m GDLAccess EOControl \
+			mysqlclient crypto ssl z
+WANTLIB-postgres = 	${MODGNUSTEP_WANTLIB} m GDLAccess EOControl pq
 
 LIB_DEPENDS-main=	::x11/gnustep/base \
 			::databases/openldap \
diff --git a/x11/xmonad/Makefile b/x11/xmonad/Makefile
index 48d6a5f7561..670a41e3f60 100644
--- a/x11/xmonad/Makefile
+++ b/x11/xmonad/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2010/11/03 22:19:02 kili Exp $
+# $OpenBSD: Makefile,v 1.22 2010/11/06 10:18:39 espie Exp $
 
 COMMENT-main =		tiling window manager
 COMMENT-lib =		libraries for runtime configuration
@@ -19,7 +19,8 @@ PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-WANTLIB-main =		X11 Xext Xinerama c gmp m pthread util
+WANTLIB-main =		${WANTLIB} X11 Xext Xinerama c gmp m pthread util
+WANTLIB-lib =
 
 MODULES =		lang/ghc converters/libiconv
 MODGHC_BUILD =		cabal hackage haddock register