- Use USE_ICONV knob

Approved by:	portmgr

79 files changed, 99 insertions, 132 deletions

diff --git a/archivers/dpkg/Makefile b/archivers/dpkg/Makefile
index a0935cc6e5ee..cf73b3d1e560 100644
--- a/archivers/dpkg/Makefile
+++ b/archivers/dpkg/Makefile
@@ -14,11 +14,10 @@ DISTNAME=	dpkg_${PORTVERSION}
 MAINTAINER=	perky@FreeBSD.org
 COMMENT=	Package maintenance system for Debian
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
 GNU_CONFIGURE=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
+USE_ICONV=	yes
 USE_PERL5=	yes
 USE_AUTOCONF_VER=	213
 WRKSRC=		${WRKDIR}/dpkg-${PORTVERSION}
diff --git a/archivers/rpm4/Makefile b/archivers/rpm4/Makefile
index c66f03a4de7b..11e185c0c1fd 100644
--- a/archivers/rpm4/Makefile
+++ b/archivers/rpm4/Makefile
@@ -15,7 +15,6 @@ MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	The RPM Package Manager
 
 LIB_DEPENDS=	db3.3:${PORTSDIR}/databases/db3 \
-		iconv.3:${PORTSDIR}/converters/libiconv \
 		popt.0:${PORTSDIR}/devel/popt
 BUILD_DEPENDS=	${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
 .if !exists(/usr/bin/bzip2)
@@ -28,6 +27,7 @@ BUILD_DEPENDS+=	${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
 USE_LIBTOOL_VER=14
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
+USE_ICONV=	yes
 USE_REINPLACE=	yes
 LATEST_LINK=	rpm4
 CONFLICTS=	beecrypt-* rpm-3.*
diff --git a/archivers/rpm5/Makefile b/archivers/rpm5/Makefile
index c66f03a4de7b..11e185c0c1fd 100644
--- a/archivers/rpm5/Makefile
+++ b/archivers/rpm5/Makefile
@@ -15,7 +15,6 @@ MAINTAINER=	glewis@FreeBSD.org
 COMMENT=	The RPM Package Manager
 
 LIB_DEPENDS=	db3.3:${PORTSDIR}/databases/db3 \
-		iconv.3:${PORTSDIR}/converters/libiconv \
 		popt.0:${PORTSDIR}/devel/popt
 BUILD_DEPENDS=	${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
 .if !exists(/usr/bin/bzip2)
@@ -28,6 +27,7 @@ BUILD_DEPENDS+=	${LOCALBASE}/bin/doxygen:${PORTSDIR}/devel/doxygen
 USE_LIBTOOL_VER=14
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
+USE_ICONV=	yes
 USE_REINPLACE=	yes
 LATEST_LINK=	rpm4
 CONFLICTS=	beecrypt-* rpm-3.*
diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index eb5b2bdcfd9c..45a11c03798f 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -15,13 +15,13 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	naddy@FreeBSD.org
 COMMENT=	Free lossless audio codec
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
-		ogg.5:${PORTSDIR}/audio/libogg
+LIB_DEPENDS=	ogg.5:${PORTSDIR}/audio/libogg
 
 .if ${MACHINE_ARCH} == "i386"
 BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 .endif
 
+USE_ICONV=	yes
 USE_REINPLACE=	yes
 USE_LIBTOOL_VER=	13
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/audio/id3lib/Makefile b/audio/id3lib/Makefile
index d6f83230e34d..89d443352b41 100644
--- a/audio/id3lib/Makefile
+++ b/audio/id3lib/Makefile
@@ -15,8 +15,7 @@ PORTREVISION=	1
 MAINTAINER=	ports@oven.org
 COMMENT=	Library for manipulating ID3v1/v1.1 and ID3v2 tags
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
+USE_ICONV=	yes
 USE_LIBTOOL_VER=	13
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 INSTALLS_SHLIB=	yes
diff --git a/audio/mpg123/Makefile b/audio/mpg123/Makefile
index d114a982f164..fc57819f21f5 100644
--- a/audio/mpg123/Makefile
+++ b/audio/mpg123/Makefile
@@ -31,7 +31,7 @@ MAKE_ARGS+=	WITH_ICONV=yes
 .if defined(DEFAULT_RECODE)
 MAKE_ARGS+=	DEFAULT_RECODE=${DEFAULT_RECODE}
 .endif
-LIB_DEPENDS+=	iconv.3:${PORTSDIR}/converters/libiconv
+USE_ICONV=	yes
 .endif
 
 .if defined(WITH_NAS)
diff --git a/audio/mpiosh/Makefile b/audio/mpiosh/Makefile
index 35772aec2cf0..f89c08da84a2 100644
--- a/audio/mpiosh/Makefile
+++ b/audio/mpiosh/Makefile
@@ -16,10 +16,10 @@ MAINTAINER=	asa@gascom.ru
 COMMENT=	Digit@lway MPIO MP3 player tool
 
 RUN_DEPENDS=	${MODULES}/mpio.ko:${PORTSDIR}/audio/mpio-driver
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 MODULES?=	/modules
 
+USE_ICONV=	yes
 USE_LIBTOOL_VER=	13
 USE_GETOPT_LONG=	yes
 GNU_CONFIGURE=	yes
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index 70a66acb6b59..8582d52c2608 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -69,7 +69,7 @@ CONFIGURE_ARGS+=--disable-aac
 .ifdef(WITHOUT_ICONV)
 CONFIGURE_ARGS+=--disable-iconv
 .else
-LIB_DEPENDS+=	iconv.3:${PORTSDIR}/converters/libiconv
+USE_ICONV=	yes
 .endif
 
 .ifdef(WITHOUT_IPV6)
diff --git a/chinese/oto/Makefile b/chinese/oto/Makefile
index 77fcc778ca69..dd8c984c2613 100644
--- a/chinese/oto/Makefile
+++ b/chinese/oto/Makefile
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Show you font info and add new 'name' and 'cmap' tables
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
+USE_ICONV=	yes
 USE_GETOPT_LONG=yes
 HAS_CONFIGURE=	YES
 USE_GMAKE=	YES
diff --git a/chinese/xcin25/Makefile b/chinese/xcin25/Makefile
index c3a96a252b01..6181a5d49632 100644
--- a/chinese/xcin25/Makefile
+++ b/chinese/xcin25/Makefile
@@ -18,8 +18,8 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} chewing-2002Jan07-snapshot.tar.gz
 MAINTAINER=	kcwu@ck.tp.edu.tw
 COMMENT=	Chinese input method server under X
 
-LIB_DEPENDS=	tabe.2:${PORTSDIR}/chinese/libtabe \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	tabe.2:${PORTSDIR}/chinese/libtabe
+
 .if !defined(USE_DB2)
 LIB_DEPENDS+=	db3.3:${PORTSDIR}/databases/db3
 .else
@@ -30,6 +30,7 @@ RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/local/kc15f.pcf.gz:${PORTSDIR}/chinese/kcf
 
 WRKSRC=		${WRKDIR}/xcin
 USE_GETTEXT=	yes
+USE_ICONV=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL_VER=	13
 INSTALLS_SHLIB=	yes
diff --git a/comms/scmxx/Makefile b/comms/scmxx/Makefile
index 0273664abf67..8c065b74a2c9 100644
--- a/comms/scmxx/Makefile
+++ b/comms/scmxx/Makefile
@@ -15,9 +15,8 @@ MASTER_SITE_SUBDIR=	scmxx
 MAINTAINER=	janos.mohacsi@bsd.hu
 COMMENT=	Data exchange utility for Siemens mobile phones
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
 USE_BZIP2=	yes
+USE_ICONV=	yes
 USE_GETOPT_LONG=yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/converters/enca/Makefile b/converters/enca/Makefile
index c3edb599595b..48f4c4bf53bd 100644
--- a/converters/enca/Makefile
+++ b/converters/enca/Makefile
@@ -14,9 +14,8 @@ MASTER_SITES=	http://kf.fyz.fce.vutbr.cz/~yeti/Ftp/enca/
 MAINTAINER=	never@nevermind.kiev.ua
 COMMENT=	A package for detecting encoding of text files
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
 USE_GNOME=	pkgconfig
+USE_ICONV=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=	13
diff --git a/converters/py-iconv/Makefile b/converters/py-iconv/Makefile
index cd7afbdd4c4c..8b40a84d2ac7 100644
--- a/converters/py-iconv/Makefile
+++ b/converters/py-iconv/Makefile
@@ -16,8 +16,7 @@ DIST_SUBDIR=	python
 MAINTAINER=	perky@FreeBSD.org
 COMMENT=	An iconv wrapper with unicode codec for Python
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
+USE_ICONV=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PLIST_SUB=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S|^${LOCALBASE}/||g}
diff --git a/converters/py-iconvcodec/Makefile b/converters/py-iconvcodec/Makefile
index 9a77c12b8ae2..dbb9d17cd43d 100644
--- a/converters/py-iconvcodec/Makefile
+++ b/converters/py-iconvcodec/Makefile
@@ -13,8 +13,7 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	perky@FreeBSD.org
 COMMENT=	Universal unicode codec using iconv(3) for Python
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
+USE_ICONV=	yes
 USE_PYTHON=	2.1+
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_BUILDARGS=	--with-libiconv=${LOCALBASE}
diff --git a/converters/siconv/Makefile b/converters/siconv/Makefile
index 69f363d89add..f4d854d3978b 100644
--- a/converters/siconv/Makefile
+++ b/converters/siconv/Makefile
@@ -15,8 +15,7 @@ MASTER_SITES=	http://www.technocage.com/~caskey/siconv/download/
 MAINTAINER=	ijliao@FreeBSD.org
 COMMENT=	Convert data from one character set to another
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
+USE_ICONV=	yes
 PLIST_FILES=	bin/siconv
 
 do-build:
diff --git a/databases/clip/Makefile b/databases/clip/Makefile
index e1abaeb9a520..fbe35c2d055c 100644
--- a/databases/clip/Makefile
+++ b/databases/clip/Makefile
@@ -34,8 +34,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg		\
 		png.5:${PORTSDIR}/graphics/png			\
 		freetype.9:${PORTSDIR}/print/freetype2		\
 		gtkextra.17:${PORTSDIR}/x11-toolkits/gtkextra	\
-		gd.4:${PORTSDIR}/graphics/gd			\
-		iconv.3:${PORTSDIR}/converters/libiconv
+		gd.4:${PORTSDIR}/graphics/gd
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash2			\
 		wget:${PORTSDIR}/ftp/wget
 
@@ -72,6 +71,7 @@ PLIST_SUB+=	IBASE="@comment "
 
 USE_BISON=		yes
 USE_GMAKE=		yes
+USE_ICONV=		yes
 USE_REINPLACE=		yes
 REINPLACE_ARGS=		-i ""
 USE_XLIB=		yes
diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index 694330c23754..6baa6014a5ae 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -14,8 +14,7 @@ MASTER_SITE_SUBDIR=	ALPHA/freetds/stable
 MAINTAINER?=	kiesel@schlund.de
 COMMENT=	Sybase/Microsoft TDS protocol library
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
+USE_ICONV=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_GONFIGURE=	yes
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 694330c23754..6baa6014a5ae 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -14,8 +14,7 @@ MASTER_SITE_SUBDIR=	ALPHA/freetds/stable
 MAINTAINER?=	kiesel@schlund.de
 COMMENT=	Sybase/Microsoft TDS protocol library
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
+USE_ICONV=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_GONFIGURE=	yes
diff --git a/databases/grass-i18n/Makefile b/databases/grass-i18n/Makefile
index e09aeaa0b9c2..58c8eba974a7 100644
--- a/databases/grass-i18n/Makefile
+++ b/databases/grass-i18n/Makefile
@@ -23,7 +23,6 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		gd.4:${PORTSDIR}/graphics/gd \
 		fftw.2:${PORTSDIR}/math/fftw \
-		iconv.3:${PORTSDIR}/converters/libiconv \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		gdbm.3:${PORTSDIR}/databases/gdbm \
 		pq.3:${PORTSDIR}/${POSTGRESQL_PORT} \
@@ -38,6 +37,7 @@ EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude *CVS*
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}
 
+USE_ICONV=	yes
 USE_XLIB=	yes
 USE_MESA=	yes
 USE_PERL5=	yes
diff --git a/databases/grass/Makefile b/databases/grass/Makefile
index e09aeaa0b9c2..58c8eba974a7 100644
--- a/databases/grass/Makefile
+++ b/databases/grass/Makefile
@@ -23,7 +23,6 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		gd.4:${PORTSDIR}/graphics/gd \
 		fftw.2:${PORTSDIR}/math/fftw \
-		iconv.3:${PORTSDIR}/converters/libiconv \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		gdbm.3:${PORTSDIR}/databases/gdbm \
 		pq.3:${PORTSDIR}/${POSTGRESQL_PORT} \
@@ -38,6 +37,7 @@ EXTRACT_AFTER_ARGS=	| ${TAR} -xf - --exclude *CVS*
 
 WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}
 
+USE_ICONV=	yes
 USE_XLIB=	yes
 USE_MESA=	yes
 USE_PERL5=	yes
diff --git a/databases/hk_classes/Makefile b/databases/hk_classes/Makefile
index 64c9b2dfc44a..6e50d6ec01f7 100644
--- a/databases/hk_classes/Makefile
+++ b/databases/hk_classes/Makefile
@@ -13,8 +13,7 @@ MASTER_SITE_SUBDIR=	hk-classes
 MAINTAINER=	sem@ciam.ru
 COMMENT=	C++ Library for rapid development of database applications
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
+USE_ICONV=	yes
 USE_PYTHON=	yes
 CONFIGURE_ENV+=	LIBPYTHON="-l${PYTHON_VERSION} ${PTHREAD_LIBS}"
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/databases/namazu2/Makefile b/databases/namazu2/Makefile
index 5c0825dcec07..00203241ab53 100644
--- a/databases/namazu2/Makefile
+++ b/databases/namazu2/Makefile
@@ -21,12 +21,10 @@ COMMENT=	Full-text search system intended for easy use
 
 BUILD_DEPENDS=	${PM_BASE}/File/MMagic.pm:${PORTSDIR}/devel/p5-File-MMagic
 RUN_DEPENDS=	${PM_BASE}/File/MMagic.pm:${PORTSDIR}/devel/p5-File-MMagic
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-#		xlHtml:${PORTSDIR}/textproc/xlhtml \
-#		wvHtml:${PORTSDIR}/textproc/wv
 
 PM_BASE=	${SITE_PERL}
 
+USE_ICONV=	yes
 USE_GETTEXT=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index a4240f207807..4a7c9690ac2c 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -16,9 +16,9 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A persistent DB connection pooling/proxying/load balancing system
 
 LIB_DEPENDS=	rudiments.0:${PORTSDIR}/devel/rudiments \
-		xml2.5:${PORTSDIR}/textproc/libxml2 \
-		iconv.3:${PORTSDIR}/converters/libiconv
+		xml2.5:${PORTSDIR}/textproc/libxml2
 
+USE_ICONV=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/devel/apr/Makefile b/devel/apr/Makefile
index 2b60b96b01cc..533dca15aa60 100644
--- a/devel/apr/Makefile
+++ b/devel/apr/Makefile
@@ -26,9 +26,9 @@ DISTFILES=	apr-APR_0_9_BRANCH_20040113112838.tar.gz apr-util-APU_0_9_BRANCH_2004
 MAINTAINER=	rodrigc@crodrigues.org
 COMMENT=	The Apache Group's Portability Library
 
-LIB_DEPENDS+=	expat.5:${PORTSDIR}/textproc/expat2 \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS+=	expat.5:${PORTSDIR}/textproc/expat2
 
+USE_ICONV=	yes
 USE_AUTOCONF_VER=	257
 USE_PERL5=		yes
 USE_GMAKE=		yes
diff --git a/devel/apr0/Makefile b/devel/apr0/Makefile
index 2b60b96b01cc..533dca15aa60 100644
--- a/devel/apr0/Makefile
+++ b/devel/apr0/Makefile
@@ -26,9 +26,9 @@ DISTFILES=	apr-APR_0_9_BRANCH_20040113112838.tar.gz apr-util-APU_0_9_BRANCH_2004
 MAINTAINER=	rodrigc@crodrigues.org
 COMMENT=	The Apache Group's Portability Library
 
-LIB_DEPENDS+=	expat.5:${PORTSDIR}/textproc/expat2 \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS+=	expat.5:${PORTSDIR}/textproc/expat2
 
+USE_ICONV=	yes
 USE_AUTOCONF_VER=	257
 USE_PERL5=		yes
 USE_GMAKE=		yes
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index 2b60b96b01cc..533dca15aa60 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -26,9 +26,9 @@ DISTFILES=	apr-APR_0_9_BRANCH_20040113112838.tar.gz apr-util-APU_0_9_BRANCH_2004
 MAINTAINER=	rodrigc@crodrigues.org
 COMMENT=	The Apache Group's Portability Library
 
-LIB_DEPENDS+=	expat.5:${PORTSDIR}/textproc/expat2 \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS+=	expat.5:${PORTSDIR}/textproc/expat2
 
+USE_ICONV=	yes
 USE_AUTOCONF_VER=	257
 USE_PERL5=		yes
 USE_GMAKE=		yes
diff --git a/devel/apr2/Makefile b/devel/apr2/Makefile
index 2b60b96b01cc..533dca15aa60 100644
--- a/devel/apr2/Makefile
+++ b/devel/apr2/Makefile
@@ -26,9 +26,9 @@ DISTFILES=	apr-APR_0_9_BRANCH_20040113112838.tar.gz apr-util-APU_0_9_BRANCH_2004
 MAINTAINER=	rodrigc@crodrigues.org
 COMMENT=	The Apache Group's Portability Library
 
-LIB_DEPENDS+=	expat.5:${PORTSDIR}/textproc/expat2 \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS+=	expat.5:${PORTSDIR}/textproc/expat2
 
+USE_ICONV=	yes
 USE_AUTOCONF_VER=	257
 USE_PERL5=		yes
 USE_GMAKE=		yes
diff --git a/devel/gnome-vfs1/Makefile b/devel/gnome-vfs1/Makefile
index e73dec4f8ba2..dfcdc0cd801a 100644
--- a/devel/gnome-vfs1/Makefile
+++ b/devel/gnome-vfs1/Makefile
@@ -17,11 +17,11 @@ DIST_SUBDIR=	gnome
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME Virtual File System
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 .if !exists(/usr/bin/bzip2)
 LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 .endif
 
+USE_ICONV=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
diff --git a/devel/gnomevfs/Makefile b/devel/gnomevfs/Makefile
index e73dec4f8ba2..dfcdc0cd801a 100644
--- a/devel/gnomevfs/Makefile
+++ b/devel/gnomevfs/Makefile
@@ -17,11 +17,11 @@ DIST_SUBDIR=	gnome
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME Virtual File System
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 .if !exists(/usr/bin/bzip2)
 LIB_DEPENDS+=	bz2.1:${PORTSDIR}/archivers/bzip2
 .endif
 
+USE_ICONV=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
diff --git a/devel/yasm/Makefile b/devel/yasm/Makefile
index 8af7f6b457d0..60424068991e 100644
--- a/devel/yasm/Makefile
+++ b/devel/yasm/Makefile
@@ -16,8 +16,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A complete rewrite of the NASM assembler
 
 BUILD_DEPENDS=	re2c:${PORTSDIR}/devel/re2c
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
+USE_ICONV=	yes
 USE_GETTEXT=	yes
 USE_PERL5_BUILD=	yes
 GNU_CONFIGURE=	yes
diff --git a/dns/idnkit/Makefile b/dns/idnkit/Makefile
index 75f89e903609..ea92c07d85e6 100644
--- a/dns/idnkit/Makefile
+++ b/dns/idnkit/Makefile
@@ -15,8 +15,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	knu@FreeBSD.org
 COMMENT=	A library to handle internationalized domain names
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
+USE_ICONV=	yes
 USE_LIBTOOL_VER=	13
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libiconv=${LOCALBASE} \
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index 2e19bf045aa5..b3170dd4562b 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -23,7 +23,6 @@ LIB_DEPENDS=	art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
 		aspell:${PORTSDIR}/textproc/aspell \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 		freetype:${PORTSDIR}/print/freetype2 \
-		iconv.3:${PORTSDIR}/converters/libiconv \
 		paper.2:${PORTSDIR}/print/libpaper \
 		xml2:${PORTSDIR}/textproc/libxml2 \
 		xslt:${PORTSDIR}/textproc/libxslt
@@ -35,6 +34,7 @@ PREFIX=			${KDE_PREFIX}
 KDE_BUILD_PLIST=	yes
 USE_BZIP2=		yes
 USE_GMAKE=		yes
+USE_ICONV=		yes
 USE_PYTHON=		yes
 GNU_CONFIGURE=		yes
 
diff --git a/editors/dedit/Makefile b/editors/dedit/Makefile
index 6610256bb263..14d3fe309345 100644
--- a/editors/dedit/Makefile
+++ b/editors/dedit/Makefile
@@ -15,13 +15,12 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A simple GNOME i18n editor
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	gnomelibs gnomeprefix gnomehack gtk12 glib12 orbit
+USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -liconv"
diff --git a/editors/koffice-kde3/Makefile b/editors/koffice-kde3/Makefile
index 2e19bf045aa5..b3170dd4562b 100644
--- a/editors/koffice-kde3/Makefile
+++ b/editors/koffice-kde3/Makefile
@@ -23,7 +23,6 @@ LIB_DEPENDS=	art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
 		aspell:${PORTSDIR}/textproc/aspell \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 		freetype:${PORTSDIR}/print/freetype2 \
-		iconv.3:${PORTSDIR}/converters/libiconv \
 		paper.2:${PORTSDIR}/print/libpaper \
 		xml2:${PORTSDIR}/textproc/libxml2 \
 		xslt:${PORTSDIR}/textproc/libxslt
@@ -35,6 +34,7 @@ PREFIX=			${KDE_PREFIX}
 KDE_BUILD_PLIST=	yes
 USE_BZIP2=		yes
 USE_GMAKE=		yes
+USE_ICONV=		yes
 USE_PYTHON=		yes
 GNU_CONFIGURE=		yes
 
diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile
index 2e19bf045aa5..b3170dd4562b 100644
--- a/editors/koffice-kde4/Makefile
+++ b/editors/koffice-kde4/Makefile
@@ -23,7 +23,6 @@ LIB_DEPENDS=	art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
 		aspell:${PORTSDIR}/textproc/aspell \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 		freetype:${PORTSDIR}/print/freetype2 \
-		iconv.3:${PORTSDIR}/converters/libiconv \
 		paper.2:${PORTSDIR}/print/libpaper \
 		xml2:${PORTSDIR}/textproc/libxml2 \
 		xslt:${PORTSDIR}/textproc/libxslt
@@ -35,6 +34,7 @@ PREFIX=			${KDE_PREFIX}
 KDE_BUILD_PLIST=	yes
 USE_BZIP2=		yes
 USE_GMAKE=		yes
+USE_ICONV=		yes
 USE_PYTHON=		yes
 GNU_CONFIGURE=		yes
 
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 955cb3122b1e..b6ca4726a674 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -133,7 +133,7 @@ MAKE_ARGS+=	CONF_OPT_PERL="--disable-perlinterp --disable-pythoninterp --disable
 .endif	# LITE
 
 .if exists(${PREFIX}/lib/libiconv.so)
-LIB_DEPENDS+=	iconv.3:${PORTSDIR}/converters/libiconv
+USE_ICONV=	yes
 .endif
 
 pre-configure:
diff --git a/emulators/gxmame/Makefile b/emulators/gxmame/Makefile
index 0c6c88e8dbba..ed47cd05f862 100644
--- a/emulators/gxmame/Makefile
+++ b/emulators/gxmame/Makefile
@@ -16,10 +16,10 @@ MAINTAINER=	tlp@liquidx.org
 COMMENT=	GXmame is a GTK frontend for xmame
 
 RUN_DEPENDS=	xmame:${PORTSDIR}/emulators/xmame
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_GETTEXT=	yes
 USE_GZIP=	yes
+USE_ICONV=	yes
 USE_XLIB=	yes
 USE_GNOME=	gtk20
 USE_REINPLACE=	yes
diff --git a/games/gnmm/Makefile b/games/gnmm/Makefile
index 08f1c55b319b..7ac116f0d532 100644
--- a/games/gnmm/Makefile
+++ b/games/gnmm/Makefile
@@ -17,9 +17,8 @@ DIST_SUBDIR=	gnome
 MAINTAINER=	barner@gmx.de
 COMMENT=	A "nine mens' morris" implementation for the GNOME Desktop Environment
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
 USE_GETTEXT=	yes
+USE_ICONV=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomelibs gdkpixbuf
diff --git a/games/heroes/Makefile b/games/heroes/Makefile
index 709abd6d8f71..c9583ab6132e 100644
--- a/games/heroes/Makefile
+++ b/games/heroes/Makefile
@@ -21,8 +21,6 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 MAINTAINER=	jre@vineyard.net
 COMMENT=	A game of yore similar to the "Tron" and "Nibbles"
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
 DATAVERSION=	1.5
 SOUNDVERSION=	1.0
 MUSICVERSION=	1.0
@@ -37,6 +35,7 @@ USE_X_PREFIX=	yes
 USE_SDL=	mixer sdl
 USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
+USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile
index 48643593b455..a0b635398ffe 100644
--- a/graphics/djvulibre/Makefile
+++ b/graphics/djvulibre/Makefile
@@ -15,8 +15,8 @@ MAINTAINER=	coop9211@uidaho.edu
 
 COMMENT=	DjVu viewers, encoders, browser plugin, and utilities
 
-LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg
+
 .ifndef WITHOUT_X11
 USE_X_PREFIX= yes
 USE_QT_VER=   3
@@ -24,6 +24,7 @@ USE_QT_VER=   3
 PKGNAMESUFFIX=	-nox11
 .endif
 
+USE_ICONV=	yes
 USE_PERL5=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	JPEG_CFLAGS=-I"${LOCALBASE}/include" \
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index afae31604561..9abe3791ea4f 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -17,9 +17,9 @@ COMMENT=	Graph Visualization Software from AT&T and Bell Labs
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		freetype.9:${PORTSDIR}/print/freetype2 \
-		tk84.1:${PORTSDIR}/x11-toolkits/tk84 \
-		iconv.3:${PORTSDIR}/converters/libiconv
+		tk84.1:${PORTSDIR}/x11-toolkits/tk84
 
+USE_ICONV=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
 USE_AUTOMAKE_VER=	14
diff --git a/graphics/inventor/Makefile b/graphics/inventor/Makefile
index 51beb5cfae05..483667c49005 100644
--- a/graphics/inventor/Makefile
+++ b/graphics/inventor/Makefile
@@ -17,12 +17,12 @@ MAINTAINER=	c47g@gmx.at
 COMMENT=	This is SGI's Open Inventor (TM)
 
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
-		iconv.3:${PORTSDIR}/converters/libiconv \
 		jpeg.9:${PORTSDIR}/graphics/jpeg \
 		GLU.1:${PORTSDIR}/x11/XFree86-4-libraries
 
 USE_XLIB=	yes
 USE_GMAKE=	yes
+USE_ICONV=	yes
 USE_MOTIF=	yes
 USE_MESA=	yes
 INSTALLS_SHLIB=	yes
diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile
index 2eaab62c8c50..3215a85352fb 100644
--- a/irc/xchat/Makefile
+++ b/irc/xchat/Makefile
@@ -15,8 +15,6 @@ MASTER_SITES=		http://xchat.org/files/source/1.8/ \
 MAINTAINER?=		ports@FreeBSD.org
 COMMENT=	An X11 IRC client using the GTK+ toolkit, and optionally, GNOME
 
-LIB_DEPENDS=		iconv.3:${PORTSDIR}/converters/libiconv
-
 # This port has a slave port japanese/xchat.  Do not carelessly overwrite
 # the variables or the targets defined in it.  When you need to, please
 # contact its maintainer.
@@ -24,6 +22,7 @@ LIB_DEPENDS=		iconv.3:${PORTSDIR}/converters/libiconv
 USE_X_PREFIX=		yes
 USE_BZIP2=		yes
 USE_GMAKE=		yes
+USE_ICONV=		yes
 USE_PERL5=		yes
 USE_GNOME=		gtk12
 WANT_GNOME=		yes
diff --git a/irc/xchat1/Makefile b/irc/xchat1/Makefile
index 2eaab62c8c50..3215a85352fb 100644
--- a/irc/xchat1/Makefile
+++ b/irc/xchat1/Makefile
@@ -15,8 +15,6 @@ MASTER_SITES=		http://xchat.org/files/source/1.8/ \
 MAINTAINER?=		ports@FreeBSD.org
 COMMENT=	An X11 IRC client using the GTK+ toolkit, and optionally, GNOME
 
-LIB_DEPENDS=		iconv.3:${PORTSDIR}/converters/libiconv
-
 # This port has a slave port japanese/xchat.  Do not carelessly overwrite
 # the variables or the targets defined in it.  When you need to, please
 # contact its maintainer.
@@ -24,6 +22,7 @@ LIB_DEPENDS=		iconv.3:${PORTSDIR}/converters/libiconv
 USE_X_PREFIX=		yes
 USE_BZIP2=		yes
 USE_GMAKE=		yes
+USE_ICONV=		yes
 USE_PERL5=		yes
 USE_GNOME=		gtk12
 WANT_GNOME=		yes
diff --git a/japanese/libjconv/Makefile b/japanese/libjconv/Makefile
index a90144d9f482..4feced0ecaa2 100644
--- a/japanese/libjconv/Makefile
+++ b/japanese/libjconv/Makefile
@@ -13,11 +13,11 @@ MASTER_SITES=	http://ghost.math.sci.hokudai.ac.jp/misc/libjconv/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Japanese charset conversion library powered by iconv(3)
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 #RUN_DEPENDS=	${LOCALBASE}/libexec/iconv/iso-2022-jp.so:${PORTSDIR}/converters/iconv-extra
 
 MAKE_ARGS=	NOPROFILE=true PREFIX=${PREFIX} LOCALBASE=${LOCALBASE}
 INSTALLS_SHLIB=	yes
+USE_ICONV=	yes
 USE_REINPLACE=	yes
 
 post-patch:
diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index 2be83dee0094..86a9b0b3915f 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -24,8 +24,8 @@ DIST_SUBDIR=	mutt
 MAINTAINER=	st@be.to
 COMMENT=	Text-based mail client (Japanised development version)
 
-LIB_DEPENDS=	slang.2:${PORTSDIR}/japanese/libslang \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	slang.2:${PORTSDIR}/japanese/libslang
+
 .if !defined(WITH_GETTEXT)
 USE_GETTEXT=	yes
 .else
@@ -45,6 +45,7 @@ FETCH_BEFORE_ARGS=	-A	# ha4.seikyou.ne.jp is running broken httpd
 NO_LATEST_LINK=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
+USE_ICONV=	yes
 USE_AUTOMAKE_VER=	14
 USE_OPENSSL=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${VERSION}
diff --git a/japanese/mutt/Makefile b/japanese/mutt/Makefile
index 4617e411f2ca..07daf86cb008 100644
--- a/japanese/mutt/Makefile
+++ b/japanese/mutt/Makefile
@@ -26,8 +26,8 @@ COMMENT=	Text-based mail client (Japanised Version)
 
 FORBIDDEN=	http://people.freebsd.org/~eik/portaudit/67c05283-5d62-11d8-80e3-0020ed76ef5a.html
 
-LIB_DEPENDS=	slang.2:${PORTSDIR}/japanese/libslang \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	slang.2:${PORTSDIR}/japanese/libslang
+
 .if !defined(WITH_GETTEXT)
 USE_GETTEXT=	yes
 .else
@@ -46,6 +46,7 @@ FETCH_BEFORE_ARGS=	-A	# ha4.seikyou.ne.jp is running broken httpd
 
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
+USE_ICONV=	yes
 USE_AUTOMAKE_VER=	14
 USE_OPENSSL=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${VERSION}
diff --git a/java/jikes/Makefile b/java/jikes/Makefile
index e28abe99041b..c7e6c17e8fc0 100644
--- a/java/jikes/Makefile
+++ b/java/jikes/Makefile
@@ -14,13 +14,12 @@ MASTER_SITES=	ftp://www-126.ibm.com/pub/jikes/${PORTVERSION}/
 MAINTAINER=	archie@freebsd.org
 COMMENT=	A very fast Java source to byte-code compiler made available by IBM
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
 MAN1=		jikes.1
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_ICONV=	yes
 USE_BZIP2=	yes
 
 CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
diff --git a/korean/ami/Makefile b/korean/ami/Makefile
index 9617d912af40..34b285f6e94f 100644
--- a/korean/ami/Makefile
+++ b/korean/ami/Makefile
@@ -18,9 +18,8 @@ EXTRACT_ONLY=	${DISTNAME}.tar.gz
 MAINTAINER=	cjh@FreeBSD.org
 COMMENT=	Well-known Korean X11 Input Method
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
 USE_GETTEXT=	yes
+USE_ICONV=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12 gdkpixbuf
diff --git a/korean/hanterm-xf86/Makefile b/korean/hanterm-xf86/Makefile
index e9f55b4394ec..bd98290641ec 100644
--- a/korean/hanterm-xf86/Makefile
+++ b/korean/hanterm-xf86/Makefile
@@ -15,9 +15,9 @@ DISTNAME=	hanterm${PKGNAMESUFFIX}-2.0.5-173
 MAINTAINER=	cjh@FreeBSD.org
 COMMENT=	X11R6-based xterm hacked for managing Korean languages
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 RUN_DEPENDS=	${X11BASE}/lib/X11/fonts/local/gulim12.pcf.gz:${PORTSDIR}/korean/baekmukfonts-bdf
 
+USE_ICONV=	yes
 USE_X_PREFIX=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-boxchar --enable-ansi-color \
diff --git a/korean/mod_url/Makefile b/korean/mod_url/Makefile
index 5be0466ddde0..80d29b8d3fbc 100644
--- a/korean/mod_url/Makefile
+++ b/korean/mod_url/Makefile
@@ -13,9 +13,8 @@ DISTFILES=		${PORTNAME}.c readme.${PORTNAME}
 MAINTAINER=		cjh@FreeBSD.org
 COMMENT=		Apache module for manipulating euc-kr encoded URL
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
 USE_APACHE=	yes
+USE_ICONV=	yes
 
 do-extract:
 	${MKDIR} ${WRKSRC}
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index 9cc2e6a930a3..6064c75f10c5 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -16,9 +16,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	henrik.motakef@web.de
 COMMENT=	An ANSI Common Lisp
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
 USE_BZIP2=	yes
+USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 USE_GCC=	2.95
 USE_GETTEXT=	yes
diff --git a/lang/gauche/Makefile b/lang/gauche/Makefile
index 0b634e9cc965..6bd426fd4141 100644
--- a/lang/gauche/Makefile
+++ b/lang/gauche/Makefile
@@ -16,8 +16,6 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	erik@smluc.org
 COMMENT=	Scheme script interpreter with multibyte character handling
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
 # Choices are: "pthreads" and "no", but it seems that FreeBSD does not
 # yet fully support threads with Boehm GC.
 GAUCHE_THREADS?=	no
@@ -39,6 +37,7 @@ CONFIGURE_ARGS=	--enable-threads=${GAUCHE_THREADS} \
 PLIST_SUB=	VERSION="${PORTVERSION}" \
 		TARGET="${CONFIGURE_TARGET}" \
 		INFOSECTION="${INFOSECTION}"
+USE_ICONV=	yes
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 INFO=		gauche-refe gauche-refj
diff --git a/lang/mdk/Makefile b/lang/mdk/Makefile
index 4e2527f8f75d..14a0d2958b5e 100644
--- a/lang/mdk/Makefile
+++ b/lang/mdk/Makefile
@@ -17,10 +17,10 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MIX Development Kit offers an emulation of MIX and MIXAL
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
-		guile.15:${PORTSDIR}/lang/guile
+LIB_DEPENDS=	guile.15:${PORTSDIR}/lang/guile
 
 USE_GETTEXT=	yes
+USE_ICONV=	yes
 USE_REINPLACE=	yes
 USE_GETOPT_LONG=	yes
 USE_X_PREFIX=	yes
diff --git a/lang/php4/Makefile b/lang/php4/Makefile
index bb8efd4e217b..06f4a9cf35b1 100644
--- a/lang/php4/Makefile
+++ b/lang/php4/Makefile
@@ -345,7 +345,7 @@ CONFIGURE_ARGS+=--with-hyperwave
 .endif
 
 .if defined(WITH_ICONV) || defined(WITH_ICONV_DEP)
-LIB_DEPENDS+=	iconv.3:${PORTSDIR}/converters/libiconv
+USE_ICONV=	yes
 CONFIGURE_ARGS+=--with-iconv-dir=${LOCALBASE}
 .endif
 
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 2f9f0a51e952..0cbce7300393 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -327,7 +327,7 @@ CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
 .endif
 
 .if defined(WITH_ICONV) || defined(WITH_ICONV_DEP)
-LIB_DEPENDS+=	iconv.3:${PORTSDIR}/converters/libiconv
+USE_ICONV=	yes
 CONFIGURE_ARGS+=--with-iconv-dir=${LOCALBASE}
 .endif
 
diff --git a/lang/php53/Makefile b/lang/php53/Makefile
index 2f9f0a51e952..0cbce7300393 100644
--- a/lang/php53/Makefile
+++ b/lang/php53/Makefile
@@ -327,7 +327,7 @@ CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
 .endif
 
 .if defined(WITH_ICONV) || defined(WITH_ICONV_DEP)
-LIB_DEPENDS+=	iconv.3:${PORTSDIR}/converters/libiconv
+USE_ICONV=	yes
 CONFIGURE_ARGS+=--with-iconv-dir=${LOCALBASE}
 .endif
 
diff --git a/lang/ruby16_static/Makefile b/lang/ruby16_static/Makefile
index 5e42cc3efecb..3b7a4a5a28e5 100644
--- a/lang/ruby16_static/Makefile
+++ b/lang/ruby16_static/Makefile
@@ -29,8 +29,6 @@ EXT_PORTS=	databases/ruby-bdb1
 _PORTSDIR=	${.CURDIR}/../..
 _RUBY_PORTDIR=	${_PORTSDIR}/${RUBY_PORT}
 
-LIB_DEPENDS+=	iconv.3:${PORTSDIR}/converters/libiconv
-
 .if ${RUBY_VER} < 1.7
 EXT_PORTS+=	${RUBY_SHIM18_PORT}
 .else
@@ -42,6 +40,7 @@ EXTRACT_DEPENDS+=	${NONEXISTENT}:${_PORTSDIR}/${p}:patch
 .endfor
 
 GNU_CONFIGURE=	yes
+USE_ICONV=	yes
 
 WRKSRC=		${RUBY_WRKSRC}
 
diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index d5d510a24dc5..1bb306a9b2b0 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -15,11 +15,11 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNU Smalltalk
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
-		gdbm.3:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
 
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
+USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index cf1d9eaddf96..0047e7cc6538 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -18,14 +18,13 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	A lightweight and very featureful GTK+ based e-mail and news client
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
 THEMEVERSION=	20040206
 THEMEFILE=	sylpheed-iconset-${THEMEVERSION}.tar.gz
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
+USE_ICONV=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL_VER=13
 USE_GNOME=	gnomehack pkgconfig gtk12
diff --git a/mail/dovecot-devel/Makefile b/mail/dovecot-devel/Makefile
index 34976184d68c..f6f18e1663ce 100644
--- a/mail/dovecot-devel/Makefile
+++ b/mail/dovecot-devel/Makefile
@@ -15,8 +15,7 @@ MASTER_SITES=	http://www.dovecot.org/
 MAINTAINER=	robin@isometry.net
 COMMENT=	Secure and compact IMAP and POP3 servers
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
+USE_ICONV=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 34976184d68c..f6f18e1663ce 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -15,8 +15,7 @@ MASTER_SITES=	http://www.dovecot.org/
 MAINTAINER=	robin@isometry.net
 COMMENT=	Secure and compact IMAP and POP3 servers
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
+USE_ICONV=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index db23038f2f63..c51458067e45 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -32,8 +32,6 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	cyrille.lefevre@laposte.net
 COMMENT=	A once-popular mail user agent, unofficial clone
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
 # not needed since config.sh is generated by scripts/pre-configure.
 # BUILD_DEPENDS=	ispell:${PORTSDIR}/textproc/ispell
 # BUILD_DEPENDS=	metamail:${PORTSDIR}/mail/metamail
@@ -46,6 +44,7 @@ LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-//:S/ME+/.ME+./}
 
 HAS_CONFIGURE=	yes
+USE_ICONV=	yes
 USE_REINPLACE=	yes
 
 CONFIGURE_SCRIPT=	Configure
diff --git a/mail/elmo-devel/Makefile b/mail/elmo-devel/Makefile
index 31806f23d190..1c67460e313c 100644
--- a/mail/elmo-devel/Makefile
+++ b/mail/elmo-devel/Makefile
@@ -18,8 +18,6 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:sf,sav
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Receive, filter, read, compose and send mail at the text console
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
 INFO=		elmo
@@ -28,6 +26,7 @@ MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
 MAN1=		elmo.1 elmoconf.pl.1
 PLIST=		${WRKDIR}/pkg-plist
 USE_GETTEXT=	yes
+USE_ICONV=	yes
 USE_PERL5=	yes
 
 pre-extract:
diff --git a/mail/elmo/Makefile b/mail/elmo/Makefile
index 31806f23d190..1c67460e313c 100644
--- a/mail/elmo/Makefile
+++ b/mail/elmo/Makefile
@@ -18,8 +18,6 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:sf,sav
 MAINTAINER=	trevor@FreeBSD.org
 COMMENT=	Receive, filter, read, compose and send mail at the text console
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}"
 INFO=		elmo
@@ -28,6 +26,7 @@ MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
 MAN1=		elmo.1 elmoconf.pl.1
 PLIST=		${WRKDIR}/pkg-plist
 USE_GETTEXT=	yes
+USE_ICONV=	yes
 USE_PERL5=	yes
 
 pre-extract:
diff --git a/mail/gmime/Makefile b/mail/gmime/Makefile
index 7b7acc24652f..1897a2c4842e 100644
--- a/mail/gmime/Makefile
+++ b/mail/gmime/Makefile
@@ -14,13 +14,12 @@ MASTER_SITES=	http://spruce.sourceforge.net/gmime/sources/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library (written in C) for parsing and creating messages using MIME
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
 CONFLICTS= 	gmime-2.1.*
 USE_X_PREFIX=	YES
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 USE_GNOME=	glib12
+USE_ICONV=	yes
 USE_LIBTOOL_VER=13
 CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/mail/hotwayd/Makefile b/mail/hotwayd/Makefile
index b758eec5b7aa..926f1898b426 100644
--- a/mail/hotwayd/Makefile
+++ b/mail/hotwayd/Makefile
@@ -15,12 +15,12 @@ MAINTAINER=	john@jnielsen.net
 COMMENT=	A Hotmail -> POP3 gateway
 
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
-		iconv.3:${PORTSDIR}/converters/libiconv \
 		sasl2.2:${PORTSDIR}/security/cyrus-sasl2
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_ICONV=	yes
 
 MAN1=		hotwayd.1 \
 		hotsmtpd.1
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index 3a157cace8c7..7cbecd2c6c3e 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A mail library
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
+USE_ICONV=	yes
 USE_OPENSSL=	yes
 USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/mail/stuphead/Makefile b/mail/stuphead/Makefile
index 81a47236b195..0aa331e95f03 100644
--- a/mail/stuphead/Makefile
+++ b/mail/stuphead/Makefile
@@ -17,8 +17,7 @@ PATCHFILES=	${PORTNAME}-${PORTVERSION}-1.patch
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A lightweight MUA for X11
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
+USE_ICONV=	yes
 USE_REINPLACE=	yes
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index cf1d9eaddf96..0047e7cc6538 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -18,14 +18,13 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	A lightweight and very featureful GTK+ based e-mail and news client
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
 THEMEVERSION=	20040206
 THEMEFILE=	sylpheed-iconset-${THEMEVERSION}.tar.gz
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
+USE_ICONV=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL_VER=13
 USE_GNOME=	gnomehack pkgconfig gtk12
diff --git a/mail/sylpheed-gtk2/Makefile b/mail/sylpheed-gtk2/Makefile
index 7c3201dda012..684d2c0af08d 100644
--- a/mail/sylpheed-gtk2/Makefile
+++ b/mail/sylpheed-gtk2/Makefile
@@ -15,10 +15,9 @@ DISTNAME=		sylpheed-${PORTVERSION:R}-gtk2-${PORTVERSION:E}
 MAINTAINER=		jylefort@brutele.be
 COMMENT=		The GTK+ 2.0 port of a lightweight, featureful and fast e-mail client
 
-LIB_DEPENDS=		iconv.3:${PORTSDIR}/converters/libiconv
-
 USE_GETTEXT=		yes
 USE_GMAKE=		yes
+USE_ICONV=		yes
 USE_X_PREFIX=		yes
 USE_GNOME=		gtk20
 USE_OPENSSL=		yes
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index c792e12aac44..3939513655a3 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -18,7 +18,6 @@ COMMENT=	The GNOME spreadsheet
 
 LIB_DEPENDS=	gnomeole2.0:${PORTSDIR}/devel/libole2 \
 		gbrun.0:${PORTSDIR}/lang/gnomebasic \
-		iconv.3:${PORTSDIR}/converters/libiconv \
 		psiconv.8:${PORTSDIR}/converters/psiconv
 RUN_DEPENDS=	guppi-gnumeric:${PORTSDIR}/math/guppi
 
@@ -27,6 +26,7 @@ USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomelibs bonobo libglade gal
+USE_ICONV=	yes
 USE_PYTHON=	yes
 USE_LIBTOOL_VER=13
 INSTALLS_SHLIB=	yes
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 8b26e107188b..22a299bed9b3 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -32,7 +32,7 @@ CONFIGURE_ARGS+=--with-samba --with-configdir=${LOCALBASE}/etc \
 
 .if !defined(WITHOUT_ICONV)
 CONFIGURE_ARGS+=--enable-charset
-LIB_DEPENDS+=	iconv.3:${PORTSDIR}/converters/libiconv
+USE_ICONV=	yes
 PLIST_SUB=	CHARSETS=""
 .else
 PLIST_SUB=	CHARSETS="@comment "
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index 23f8f694eb9b..798a15f846f1 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -23,12 +23,12 @@ LIB_DEPENDS=	FLAC.5:${PORTSDIR}/audio/flac \
 		vorbis.3:${PORTSDIR}/audio/libvorbis \
 		mad.2:${PORTSDIR}/audio/libmad \
 		speex.2:${PORTSDIR}/audio/speex \
-		iconv.3:${PORTSDIR}/converters/libiconv \
 		aa.1:${PORTSDIR}/graphics/aalib \
 		mng.1:${PORTSDIR}/graphics/libmng \
 		dvdread.3:${PORTSDIR}/multimedia/libdvdread
 
 USE_GETTEXT=	yes
+USE_ICONV=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 WANT_GNOME=	yes
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 40c2af33b741..36539dc1b753 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -197,11 +197,11 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	riggs@rrr.de
 COMMENT=	High performance media player/encoder supporting many formats
 
-LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_ICONV=	yes
 USE_XLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
diff --git a/multimedia/mplayerxp/Makefile b/multimedia/mplayerxp/Makefile
index 82ecb31f51b4..d0650a70cb7d 100644
--- a/multimedia/mplayerxp/Makefile
+++ b/multimedia/mplayerxp/Makefile
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	Multi-threaded branch of the well known mplayer media player
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		mp3lame.0:${PORTSDIR}/audio/lame \
 		png.5:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/multimedia/mplayer-fonts
@@ -24,6 +23,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/multimedia/mplayer-fon
 ONLY_FOR_ARCHS=	i386
 USE_BZIP2=	yes
 USE_GNOME=	gtk12
+USE_ICONV=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
diff --git a/multimedia/vlc-devel/Makefile b/multimedia/vlc-devel/Makefile
index 5d72fe22c6dd..71d204c7a1dc 100644
--- a/multimedia/vlc-devel/Makefile
+++ b/multimedia/vlc-devel/Makefile
@@ -37,7 +37,6 @@ LIB_DEPENDS=	dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \
 		mad.2:${PORTSDIR}/audio/libmad \
 		avcodec.0:${PORTSDIR}/${FFMPEG_PORT} \
 		a52.0:${PORTSDIR}/audio/liba52 \
-		iconv.3:${PORTSDIR}/converters/libiconv \
 		vorbis.3:${PORTSDIR}/audio/libvorbis \
 		FLAC.5:${PORTSDIR}/audio/flac \
 		faad.0:${PORTSDIR}/audio/faad \
@@ -48,6 +47,7 @@ USE_GETOPT_LONG=yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
+USE_ICONV=	yes
 USE_REINPLACE=	yes
 USE_SDL=	sdl
 USE_XLIB=	yes
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 5d72fe22c6dd..71d204c7a1dc 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -37,7 +37,6 @@ LIB_DEPENDS=	dvdcss.2:${PORTSDIR}/multimedia/libdvdcss \
 		mad.2:${PORTSDIR}/audio/libmad \
 		avcodec.0:${PORTSDIR}/${FFMPEG_PORT} \
 		a52.0:${PORTSDIR}/audio/liba52 \
-		iconv.3:${PORTSDIR}/converters/libiconv \
 		vorbis.3:${PORTSDIR}/audio/libvorbis \
 		FLAC.5:${PORTSDIR}/audio/flac \
 		faad.0:${PORTSDIR}/audio/faad \
@@ -48,6 +47,7 @@ USE_GETOPT_LONG=yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
+USE_ICONV=	yes
 USE_REINPLACE=	yes
 USE_SDL=	sdl
 USE_XLIB=	yes
diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index 6ee2042c6a7e..d9f8c1acd862 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -15,14 +15,13 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER?=	esk@ira.uka.de
 COMMENT?=	X Multimedia System --- An audio player with a Winamp GUI
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12 gnomehack libxml
 USE_REINPLACE=	yes
 WANT_GNOME=	yes
 USE_GMAKE=	yes
+USE_ICONV=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \