- Use USE_ICONV knob

Approved by:	portmgr

54 files changed, 71 insertions, 86 deletions

diff --git a/net-im/centericq/Makefile b/net-im/centericq/Makefile
index fdb6aab501ce..02d908adb5fb 100644
--- a/net-im/centericq/Makefile
+++ b/net-im/centericq/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES=	http://centericq.de/archive/source/releases/
 MAINTAINER=	clsung@dragon2.net
 COMMENT=	A text mode menu- and window-driven IM interface
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
+USE_ICONV=	yes
 USE_OPENSSL=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
diff --git a/net-im/climm/Makefile b/net-im/climm/Makefile
index 4ba3055e591b..80382c0ec62f 100644
--- a/net-im/climm/Makefile
+++ b/net-im/climm/Makefile
@@ -30,7 +30,7 @@ MAN7=		micq.7
 .if defined(WITHOUT_LIBICONV)
 CONFIGURE_ARGS+=	--disable-iconv
 .else
-LIB_DEPENDS+=	iconv.3:${PORTSDIR}/converters/libiconv
+USE_ICONV=	yes
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib -liconv
 .endif
diff --git a/net-im/ickle/Makefile b/net-im/ickle/Makefile
index 61c210296b6b..8f171b87113c 100644
--- a/net-im/ickle/Makefile
+++ b/net-im/ickle/Makefile
@@ -17,12 +17,12 @@ MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	ICQ2000 protocol implementation
 
 LIB_DEPENDS=	gtkmm:${PORTSDIR}/x11-toolkits/gtk-- \
-		iconv.3:${PORTSDIR}/converters/libiconv \
 		icq2000.5:${PORTSDIR}/net/libicq2000
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 WANT_GNOME=	yes
+USE_ICONV=	yes
 USE_REINPLACE=	yes
 USE_SIZE=	yes
 GNU_CONFIGURE=	yes
diff --git a/net-im/jabber-yahoo/Makefile b/net-im/jabber-yahoo/Makefile
index ff1c8969efb0..7a62ef69275d 100644
--- a/net-im/jabber-yahoo/Makefile
+++ b/net-im/jabber-yahoo/Makefile
@@ -17,10 +17,10 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Jabber Yahoo Transport module
 
 BUILD_DEPENDS=	${LOCALBASE}/sbin/jabberd:${PORTSDIR}/net/jabber
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_GNOME=	glib12
 USE_GMAKE=	yes
+USE_ICONV=	yes
 
 WRKSRC=		${WRKDIR}/yahoo-transport-${PORTVERSION}
 
diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile
index e51b4ecf178e..7be6594a25f6 100644
--- a/net-im/jabberd/Makefile
+++ b/net-im/jabberd/Makefile
@@ -15,10 +15,9 @@ DIST_SUBDIR=	jabber
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Online presence and instant messaging server
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
+USE_ICONV=	yes
 CONFIGURE_ARGS= --localstatedir=/var \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--with-openssl=${OPENSSLBASE} \
diff --git a/net-im/micq/Makefile b/net-im/micq/Makefile
index 4ba3055e591b..80382c0ec62f 100644
--- a/net-im/micq/Makefile
+++ b/net-im/micq/Makefile
@@ -30,7 +30,7 @@ MAN7=		micq.7
 .if defined(WITHOUT_LIBICONV)
 CONFIGURE_ARGS+=	--disable-iconv
 .else
-LIB_DEPENDS+=	iconv.3:${PORTSDIR}/converters/libiconv
+USE_ICONV=	yes
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib -liconv
 .endif
diff --git a/net-im/ysm/Makefile b/net-im/ysm/Makefile
index 12af74e43e2d..fa40c8eb5096 100644
--- a/net-im/ysm/Makefile
+++ b/net-im/ysm/Makefile
@@ -16,8 +16,7 @@ DISTNAME=	${PORTNAME}v${PORTVERSION:S/./_/g}
 MAINTAINER=	aquatique@rusunix.org
 COMMENT=	Command line ICQ client with ICQ2000 and recoding support
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
+USE_ICONV=	yes
 USE_REINPLACE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/net-mgmt/bandwidthd/Makefile b/net-mgmt/bandwidthd/Makefile
index 55788e935bc3..1e45518c1061 100644
--- a/net-mgmt/bandwidthd/Makefile
+++ b/net-mgmt/bandwidthd/Makefile
@@ -19,10 +19,10 @@ COMMENT=	Tracks bandwidth usage by IP address
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
-LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd\
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS+=	gd.4:${PORTSDIR}/graphics/gd
 
 USE_GMAKE=	YES
+USE_ICONV=	YES
 USE_REINPLACE=	YES
 
 post-install:
diff --git a/net/centericq/Makefile b/net/centericq/Makefile
index fdb6aab501ce..02d908adb5fb 100644
--- a/net/centericq/Makefile
+++ b/net/centericq/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES=	http://centericq.de/archive/source/releases/
 MAINTAINER=	clsung@dragon2.net
 COMMENT=	A text mode menu- and window-driven IM interface
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
+USE_ICONV=	yes
 USE_OPENSSL=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
diff --git a/net/ickle/Makefile b/net/ickle/Makefile
index 61c210296b6b..8f171b87113c 100644
--- a/net/ickle/Makefile
+++ b/net/ickle/Makefile
@@ -17,12 +17,12 @@ MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	ICQ2000 protocol implementation
 
 LIB_DEPENDS=	gtkmm:${PORTSDIR}/x11-toolkits/gtk-- \
-		iconv.3:${PORTSDIR}/converters/libiconv \
 		icq2000.5:${PORTSDIR}/net/libicq2000
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 WANT_GNOME=	yes
+USE_ICONV=	yes
 USE_REINPLACE=	yes
 USE_SIZE=	yes
 GNU_CONFIGURE=	yes
diff --git a/net/jabber-yahoo/Makefile b/net/jabber-yahoo/Makefile
index ff1c8969efb0..7a62ef69275d 100644
--- a/net/jabber-yahoo/Makefile
+++ b/net/jabber-yahoo/Makefile
@@ -17,10 +17,10 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Jabber Yahoo Transport module
 
 BUILD_DEPENDS=	${LOCALBASE}/sbin/jabberd:${PORTSDIR}/net/jabber
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_GNOME=	glib12
 USE_GMAKE=	yes
+USE_ICONV=	yes
 
 WRKSRC=		${WRKDIR}/yahoo-transport-${PORTVERSION}
 
diff --git a/net/jabberd/Makefile b/net/jabberd/Makefile
index e51b4ecf178e..7be6594a25f6 100644
--- a/net/jabberd/Makefile
+++ b/net/jabberd/Makefile
@@ -15,10 +15,9 @@ DIST_SUBDIR=	jabber
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Online presence and instant messaging server
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
+USE_ICONV=	yes
 CONFIGURE_ARGS= --localstatedir=/var \
 		--with-libiconv-prefix=${LOCALBASE} \
 		--with-openssl=${OPENSSLBASE} \
diff --git a/net/micq/Makefile b/net/micq/Makefile
index 4ba3055e591b..80382c0ec62f 100644
--- a/net/micq/Makefile
+++ b/net/micq/Makefile
@@ -30,7 +30,7 @@ MAN7=		micq.7
 .if defined(WITHOUT_LIBICONV)
 CONFIGURE_ARGS+=	--disable-iconv
 .else
-LIB_DEPENDS+=	iconv.3:${PORTSDIR}/converters/libiconv
+USE_ICONV=	yes
 CPPFLAGS=	-I${LOCALBASE}/include
 LDFLAGS=	-L${LOCALBASE}/lib -liconv
 .endif
diff --git a/net/nc6/Makefile b/net/nc6/Makefile
index d7faf9537711..0bf1a9b2185b 100644
--- a/net/nc6/Makefile
+++ b/net/nc6/Makefile
@@ -15,10 +15,9 @@ MASTER_SITES=	ftp://ftp.deepspace6.net/pub/ds6/sources/nc6/ \
 MAINTAINER=	filippo@widestore.net
 COMMENT=	Netcat clone with IPv6 support
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
 MAN1=	nc6.1
 USE_GETTEXT=	yes
+USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/net/netdude/Makefile b/net/netdude/Makefile
index 7fe1f2cc5a7e..69906ae9d0b1 100644
--- a/net/netdude/Makefile
+++ b/net/netdude/Makefile
@@ -16,10 +16,10 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	NETwork DUmp data Displayer and Editor for tcpdump tracefiles
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
-		ltdl.4:${PORTSDIR}/devel/libltdl
+LIB_DEPENDS=	ltdl.4:${PORTSDIR}/devel/libltdl
 
 USE_GETTEXT=	yes
+USE_ICONV=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	glib12 gtk12
 USE_LIBTOOL_VER=13
diff --git a/net/ruby-net-geoip/Makefile b/net/ruby-net-geoip/Makefile
index d452fa2a3af0..24017959c9af 100644
--- a/net/ruby-net-geoip/Makefile
+++ b/net/ruby-net-geoip/Makefile
@@ -16,10 +16,10 @@ DIST_SUBDIR=	ruby
 MAINTAINER=	seanc@FreeBSD.org
 COMMENT=	A Ruby extension that wraps around libGeoIP
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
-		GeoIP.3:${PORTSDIR}/net/GeoIP
+LIB_DEPENDS=	GeoIP.3:${PORTSDIR}/net/GeoIP
 
 USE_BZIP2=      yes
+USE_ICONV=	yes
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 INSTALL_TARGET=	site-install
diff --git a/net/ssltunnel-client/Makefile b/net/ssltunnel-client/Makefile
index b14634d68dd6..e89bff45e30b 100644
--- a/net/ssltunnel-client/Makefile
+++ b/net/ssltunnel-client/Makefile
@@ -18,7 +18,7 @@ PKGNAMESUFFIX=	-client
 MAINTAINER=	at@rominet.net
 COMMENT=	PPP over SSL virtual private networking (client part)
 
-LIB_DEPENDS+=	iconv.3:${PORTSDIR}/converters/libiconv
+USE_ICONV=	yes
 
 MAN1=		pppclient.1
 MAN5=		ssltunnelrc.5
diff --git a/net/ulxmlrpcpp/Makefile b/net/ulxmlrpcpp/Makefile
index 8c864582da7e..5f41bb6ae7e7 100644
--- a/net/ulxmlrpcpp/Makefile
+++ b/net/ulxmlrpcpp/Makefile
@@ -17,10 +17,10 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A ultra lightweight xml-rpc library written in C++
 
-LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2 \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
 
 USE_BZIP2=	yes
+USE_ICONV=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
diff --git a/net/whois/Makefile b/net/whois/Makefile
index e773f13fec29..a468b9740493 100644
--- a/net/whois/Makefile
+++ b/net/whois/Makefile
@@ -14,11 +14,10 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	filippo@widestore.net
 COMMENT=	Marco d'Itri whois client
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
 MAN1=	whois.1
 
 USE_GETTEXT=	yes
+USE_ICONV=	yes
 USE_PERL5_BUILD=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
diff --git a/net/wol/Makefile b/net/wol/Makefile
index fe19153db497..7c30845bc4de 100644
--- a/net/wol/Makefile
+++ b/net/wol/Makefile
@@ -16,11 +16,10 @@ MASTER_SITE_SUBDIR=	ahh
 MAINTAINER=	sergei@FreeBSD.org
 COMMENT=	Tool to wake up Wake-On-LAN compliant computers
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
 GNU_CONFIGURE=		yes
 USE_GETOPT_LONG=	yes
 USE_GETTEXT=		yes
+USE_ICONV=		yes
 CPPFLAGS=		-I${LOCALBASE}/include
 LDFLAGS=		-L${LOCALBASE}/lib
 CONFIGURE_ENV=		CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
diff --git a/net/yaz/Makefile b/net/yaz/Makefile
index dc4b658fa921..8c29c773e9c2 100644
--- a/net/yaz/Makefile
+++ b/net/yaz/Makefile
@@ -10,12 +10,12 @@ PORTVERSION=	2.0.18
 CATEGORIES=	net
 MASTER_SITES=	http://ftp.indexdata.dk/pub/yaz/
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
-		xml2.5:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
 
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Z39.50/SR client and API library
 
+USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/net/ysm/Makefile b/net/ysm/Makefile
index 12af74e43e2d..fa40c8eb5096 100644
--- a/net/ysm/Makefile
+++ b/net/ysm/Makefile
@@ -16,8 +16,7 @@ DISTNAME=	${PORTNAME}v${PORTVERSION:S/./_/g}
 MAINTAINER=	aquatique@rusunix.org
 COMMENT=	Command line ICQ client with ICQ2000 and recoding support
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
+USE_ICONV=	yes
 USE_REINPLACE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
diff --git a/news/slrn/Makefile b/news/slrn/Makefile
index 4a1435638e4e..ab084d592c63 100644
--- a/news/slrn/Makefile
+++ b/news/slrn/Makefile
@@ -24,11 +24,11 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	petef@FreeBSD.org
 COMMENT=	SLang-based newsreader
 
-LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_ICONV=	yes
 USE_REINPLACE=	yes
 
 .if defined(WITHOUT_NLS)
diff --git a/news/tin/Makefile b/news/tin/Makefile
index 35097105afb4..ba3ffca3cc58 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -18,12 +18,12 @@ MAINTAINER?=	ache@FreeBSD.org
 COMMENT=	Easy-to-use threaded newsreader with NOV/NNTP support
 
 LIB_DEPENDS=	uu.3:${PORTSDIR}/converters/uulib \
-		iconv.3:${PORTSDIR}/converters/libiconv \
 		pcre.0:${PORTSDIR}/devel/pcre
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
+USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 TIN_EDITOR?=	/usr/bin/ee
 
diff --git a/palm/pilot-link-devel/Makefile b/palm/pilot-link-devel/Makefile
index da5a2992a2a1..5d93f7b1a72c 100644
--- a/palm/pilot-link-devel/Makefile
+++ b/palm/pilot-link-devel/Makefile
@@ -15,9 +15,9 @@ MASTER_SITE_SUBDIR=	distfiles
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PalmPilot communications utilities (backup/restore/install/debug/...)
 
-LIB_DEPENDS=	tk83:${PORTSDIR}/x11-toolkits/tk83 \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	tk83:${PORTSDIR}/x11-toolkits/tk83
 
+USE_ICONV=	yes
 USE_GETOPT_LONG=yes
 USE_BZIP2=	yes
 USE_LIBTOOL_VER=13
diff --git a/palm/pilot-link/Makefile b/palm/pilot-link/Makefile
index da5a2992a2a1..5d93f7b1a72c 100644
--- a/palm/pilot-link/Makefile
+++ b/palm/pilot-link/Makefile
@@ -15,9 +15,9 @@ MASTER_SITE_SUBDIR=	distfiles
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PalmPilot communications utilities (backup/restore/install/debug/...)
 
-LIB_DEPENDS=	tk83:${PORTSDIR}/x11-toolkits/tk83 \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	tk83:${PORTSDIR}/x11-toolkits/tk83
 
+USE_ICONV=	yes
 USE_GETOPT_LONG=yes
 USE_BZIP2=	yes
 USE_LIBTOOL_VER=13
diff --git a/palm/synce-libsynce/Makefile b/palm/synce-libsynce/Makefile
index 41a66750a537..6118eb0e62f3 100644
--- a/palm/synce-libsynce/Makefile
+++ b/palm/synce-libsynce/Makefile
@@ -13,10 +13,9 @@ MASTER_SITE_SUBDIR=	synce
 MAINTAINER=	boris@brooknet.com.au
 COMMENT=	Library to support communication with WinCE devices
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
 MAN1=		synce.1
 
+USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 USE_LIBTOOL_VER=13
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
diff --git a/science/vis5d+/Makefile b/science/vis5d+/Makefile
index 1076e27f07ba..abb5af0e376e 100644
--- a/science/vis5d+/Makefile
+++ b/science/vis5d+/Makefile
@@ -18,13 +18,13 @@ COMMENT=	An OpenGL-based volumetric visualization program for scientific dataset
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libmix.a:${PORTSDIR}/graphics/qslim \
 		convert:${PORTSDIR}/graphics/ImageMagick
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
-		netcdf.1:${PORTSDIR}/math/netcdf \
+LIB_DEPENDS=	netcdf.1:${PORTSDIR}/math/netcdf \
 		gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
 RUN_DEPENDS=	convert:${PORTSDIR}/graphics/ImageMagick
 
 USE_GL=		yes
 USE_GNOME=	gnometarget gtk12
+USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--enable-gtk --enable-threads --with-netcdf \
diff --git a/security/gnupg-devel/Makefile b/security/gnupg-devel/Makefile
index e316e0b5ec9e..c7dd8fa6812a 100644
--- a/security/gnupg-devel/Makefile
+++ b/security/gnupg-devel/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	lofi@freebsd.org
 COMMENT=	Prerelease package of GnuPG extensions for GnuPG 2.0
 
 LIB_DEPENDS=	gcrypt.6:${PORTSDIR}/security/libgcrypt \
-		iconv.3:${PORTSDIR}/converters/libiconv \
 		ksba.7:${PORTSDIR}/security/libksba \
 		pth.20:${PORTSDIR}/devel/pth
 RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg \
@@ -27,6 +26,7 @@ USE_AUTOCONF_VER=253
 USE_LIBTOOL_VER=13
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
+USE_ICONV=	yes
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index e880c79c94d0..ed09cd8b7a15 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -32,7 +32,7 @@ MAN7=		gnupg.7
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_LIBICONV) || exists(${PREFIX}/lib/libiconv.so)
-LIB_DEPENDS+=	iconv.3:${PORTSDIR}/converters/libiconv
+USE_ICONV=	yes
 .endif
 .if defined(WITH_LDAP) || exists(${PREFIX}/lib/libldap.so.2)
 USE_OPENLDAP=	yes
diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index e880c79c94d0..ed09cd8b7a15 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -32,7 +32,7 @@ MAN7=		gnupg.7
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_LIBICONV) || exists(${PREFIX}/lib/libiconv.so)
-LIB_DEPENDS+=	iconv.3:${PORTSDIR}/converters/libiconv
+USE_ICONV=	yes
 .endif
 .if defined(WITH_LDAP) || exists(${PREFIX}/lib/libldap.so.2)
 USE_OPENLDAP=	yes
diff --git a/security/newpg/Makefile b/security/newpg/Makefile
index e316e0b5ec9e..c7dd8fa6812a 100644
--- a/security/newpg/Makefile
+++ b/security/newpg/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	lofi@freebsd.org
 COMMENT=	Prerelease package of GnuPG extensions for GnuPG 2.0
 
 LIB_DEPENDS=	gcrypt.6:${PORTSDIR}/security/libgcrypt \
-		iconv.3:${PORTSDIR}/converters/libiconv \
 		ksba.7:${PORTSDIR}/security/libksba \
 		pth.20:${PORTSDIR}/devel/pth
 RUN_DEPENDS=	gpg:${PORTSDIR}/security/gnupg \
@@ -27,6 +26,7 @@ USE_AUTOCONF_VER=253
 USE_LIBTOOL_VER=13
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
+USE_ICONV=	yes
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
diff --git a/sysutils/gtk-imonc/Makefile b/sysutils/gtk-imonc/Makefile
index df98af7ef037..1f217f2dd975 100644
--- a/sysutils/gtk-imonc/Makefile
+++ b/sysutils/gtk-imonc/Makefile
@@ -14,8 +14,6 @@ MASTER_SITES=	http://userpage.fu-berlin.de/~zeank/gtk-imonc/download/
 MAINTAINER=	steffen@vogelreuter.de
 COMMENT=	A gtk based client to control an one disc fli4l router
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libintl-prefix=${LOCALBASE} \
@@ -23,6 +21,7 @@ CONFIGURE_ARGS=	--with-libintl-prefix=${LOCALBASE} \
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gtk12
+USE_ICONV=	yes
 USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index cc6797b8152d..9fa03b15bc05 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -19,12 +19,12 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:src new_configure.tar.gz:patch
 MAINTAINER=	oliver@FreeBSD.org
 COMMENT=	Another X11 frontend to mkisofs/cdrecord
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools \
 		mkisofs:${PORTSDIR}/sysutils/mkisofs
 
 USE_X_PREFIX=	yes
 USE_GETTEXT=	yes
+USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOCONF_VER=	253
 
diff --git a/textproc/iiimf-le-unit/Makefile b/textproc/iiimf-le-unit/Makefile
index 6726387914ba..c64e358faa9d 100644
--- a/textproc/iiimf-le-unit/Makefile
+++ b/textproc/iiimf-le-unit/Makefile
@@ -16,14 +16,13 @@ DISTFILES=	${DISTNAME}.${IIIMF_VER:S/-/./}${EXTRACT_SUFX}
 MAINTAINER=	kcwu@csie.org
 COMMENT=	Internet/Intranet Input Method Framework language engine unit
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
 IIIMF_VER=	r11_4-1467
 WRKSRC=		${WRKDIR}/${DISTNAME}-${IIIMF_VER}/leif
 BUILD_WRKSRC=	${WRKSRC}/unit
 INSTALL_WRKSRC=	${WRKSRC}/unit
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_ICONV=	yes
 USE_XLIB=	yes
 INSTALLS_SHLIB=	yes
 USE_REINPLACE=	yes
diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile
index b119a73ad255..5df3cb1dbcb0 100644
--- a/textproc/intltool/Makefile
+++ b/textproc/intltool/Makefile
@@ -16,11 +16,11 @@ DIST_SUBDIR=	gnome
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Xml internationalization support for GNOME, and others
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/XML/Parser.pm:${PORTSDIR}/textproc/p5-XML-Parser
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_ICONV=	yes
 USE_PERL5=	yes
 USE_GNOME=	gnometarget
 USE_REINPLACE=	yes
diff --git a/textproc/mifluz/Makefile b/textproc/mifluz/Makefile
index ebcbc06a375c..bb4c61e0ffc9 100644
--- a/textproc/mifluz/Makefile
+++ b/textproc/mifluz/Makefile
@@ -15,8 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ library to build and query a full text inverted index
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
+USE_ICONV=	yes
 USE_REINPLACE=	yes
 USE_LIBTOOL_VER=13
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
diff --git a/textproc/minidom/Makefile b/textproc/minidom/Makefile
index af517f86c534..36459a6708f6 100644
--- a/textproc/minidom/Makefile
+++ b/textproc/minidom/Makefile
@@ -15,9 +15,9 @@ MASTER_SITES=	http://helm.cs.unibo.it/mml-widget/sources/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A minimal implementation of the Document Object Model
 
-LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2 \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2
 
+USE_ICONV=	yes
 USE_REINPLACE=	yes
 USE_GNOME=	glib12
 USE_LIBTOOL_VER=13
diff --git a/textproc/opensp/Makefile b/textproc/opensp/Makefile
index 730700788737..9d969cd51609 100644
--- a/textproc/opensp/Makefile
+++ b/textproc/opensp/Makefile
@@ -15,10 +15,9 @@ MASTER_SITE_SUBDIR=	openjade
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	This package is a collection of SGML/XML tools called OpenSP
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
 USE_GETTEXT=	yes
 USE_GMAKE=	YES
+USE_ICONV=	yes
 USE_REINPLACE=	YES
 USE_LIBTOOL_VER=13
 USE_PERL5=	yes
diff --git a/textproc/p5-XML-Sablotron/Makefile b/textproc/p5-XML-Sablotron/Makefile
index 02c063088d5f..ab8da59566d3 100644
--- a/textproc/p5-XML-Sablotron/Makefile
+++ b/textproc/p5-XML-Sablotron/Makefile
@@ -14,9 +14,9 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	A Perl interface to the Sablotron XSLT processor
 
-LIB_DEPENDS=	sablot.70:${PORTSDIR}/textproc/sablotron \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	sablot.70:${PORTSDIR}/textproc/sablotron
 
+USE_ICONV=	yes
 PERL_CONFIGURE=	yes
 CONFIGURE_ARGS=	LIBS='-L${LOCALBASE}/lib -lexpat -lsablot -liconv' \
 		INC='-I${LOCALBASE}/include' \
diff --git a/textproc/ruby-sablot/Makefile b/textproc/ruby-sablot/Makefile
index 4a2bc8176c8c..c405b4326ced 100644
--- a/textproc/ruby-sablot/Makefile
+++ b/textproc/ruby-sablot/Makefile
@@ -17,9 +17,9 @@ MAINTAINER=	knu@FreeBSD.org
 COMMENT=	Ruby interface to the Sablotron XSLT processor
 
 LIB_DEPENDS=	sablot.70:${PORTSDIR}/textproc/sablotron \
-		iconv.3:${PORTSDIR}/converters/libiconv \
 		expat.5:${PORTSDIR}/textproc/expat2
 
+USE_ICONV=	yes
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index 9d78cd52e1cd..6b17b006368f 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES=	http://download-2.gingerall.cz/download/sablot/
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	XML toolkit implementing XSLT 1.0, XPath 1.0 and DOM Level2
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
-		expat.5:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
 
 # If WITH_DISABLE_META is defined sablot will not output the META html tag
 #WITH_DISABLE_META=	yes
@@ -32,6 +31,7 @@ PLIST_SUB+=	SHLIB_MAJOR="${SHLIB_MAJOR}"
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include LIBTOOL=${LIBTOOL} \
 		LDFLAGS="-L${LOCALBASE}/lib -lstdc++"
 USE_GMAKE=	yes
+USE_ICONV=	yes
 USE_LIBTOOL_VER=13
 USE_PERL5_BUILD=	yes
 
diff --git a/textproc/xmlppm/Makefile b/textproc/xmlppm/Makefile
index d83877d2b1a3..029c5089b6d6 100644
--- a/textproc/xmlppm/Makefile
+++ b/textproc/xmlppm/Makefile
@@ -18,12 +18,12 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	XML-Conscious PPM Compression
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
-		expat.5:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
 USE_GMAKE=	yes
+USE_ICONV=	yes
 MAKE_ARGS=	CC="${CXX}" OPT_FLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lexpat -liconv"
 
diff --git a/www/flood/Makefile b/www/flood/Makefile
index 988ecd8b3e6b..2392619d4d14 100644
--- a/www/flood/Makefile
+++ b/www/flood/Makefile
@@ -17,13 +17,13 @@ MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Profile-driven HTTP load tester
 
 LIB_DEPENDS=	expat.5:${PORTSDIR}/textproc/expat2 \
-		iconv.3:${PORTSDIR}/converters/libiconv \
 		apr-0.9:${PORTSDIR}/devel/apr
 
 USE_AUTOCONF_VER=	253
 CONFIGURE_ARGS=	--disable-shared
 CONFIGURE_ENV=	LDFLAGS="-L${PREFIX}/lib"
 USE_GMAKE=	yes
+USE_ICONV=	yes
 
 EX_SCRIPTS=	analyze-relative analyze-relative-ramp
 EX_DATA=	flood.dtd relative-averages-time.awk round-robin-dynamic.xml \
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index c6b6da7fd412..d6197296cb97 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -16,7 +16,6 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A GNOME Web browser based on gecko (the Mozilla rendering engine)
 
 BUILD_DEPENDS=	${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
 
 MOZ_CONFIGURE_ARGS=--with-mozilla-snapshot="trunk"
@@ -38,6 +37,7 @@ HEADERS_SUFX=
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack bonobo libglade gnomevfs gnometarget
 USE_GMAKE=	yes
+USE_ICONV=	yes
 USE_LIBTOOL_VER=13
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--with-mozilla-includes="${X11BASE}/include/mozilla${HEADERS_SUFX}" \
diff --git a/www/mod_encoding/Makefile b/www/mod_encoding/Makefile
index d4257752c458..7b53fcb1e686 100644
--- a/www/mod_encoding/Makefile
+++ b/www/mod_encoding/Makefile
@@ -14,14 +14,13 @@ MASTER_SITES=	http://webdav.todo.gr.jp/download/
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Apache module for non-ascii filename interoperability
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-
 # This port will work with the following version of Apache and anything newer.
 # Mostly because of the dependency of mod_dav.
 APACHE_VERSION=	1.3.6
 
 PLIST_FILES=	libexec/apache/mod_encoding.so
 USE_APACHE=	yes
+USE_ICONV=	yes
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
diff --git a/www/p5-AxKit/Makefile b/www/p5-AxKit/Makefile
index 84881aa05668..434bbc66b818 100644
--- a/www/p5-AxKit/Makefile
+++ b/www/p5-AxKit/Makefile
@@ -14,7 +14,6 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	dom@happygiraffe.net
 COMMENT=	XML Delivery Toolkit for Apache/Perl
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 BUILD_DEPENDS=	\
 		${SITE_PERL}/${PERL_ARCH}/Apache/libapreq.pm:${PORTSDIR}/www/p5-libapreq \
 		${SITE_PERL}/${PERL_ARCH}/Compress/Zlib.pm:${PORTSDIR}/archivers/p5-Compress-Zlib \
@@ -56,6 +55,7 @@ MAN3=		\
 		Apache::AxKit::StyleChooser::UserAgent.3 \
 		AxKit.3
 
+USE_ICONV=	yes
 PERL_CONFIGURE=	yes
 CONFIGURE_ARGS=	INC='-I${LOCALBASE}/include -I${LOCALBASE}/include/libxml2' \
 		LIBS='-L${LOCALBASE}/lib' \
diff --git a/www/snownews/Makefile b/www/snownews/Makefile
index 9b9b134c7d4e..a342c4586f01 100644
--- a/www/snownews/Makefile
+++ b/www/snownews/Makefile
@@ -16,10 +16,10 @@ MAINTAINER=	clsung@dragon2.net
 COMMENT=	A text mode RSS newsreader
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/xml2-config:${PORTSDIR}/textproc/libxml2
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
+USE_ICONV=	yes
 
 MAN1=		snownews.1
 MANLANG=	"" de nl fr it
diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile
index b3f446447233..5814154d7e4e 100644
--- a/x11-toolkits/gal/Makefile
+++ b/x11-toolkits/gal/Makefile
@@ -16,14 +16,14 @@ DIST_SUBDIR=	gnome
 MAINTAINER?=	gnome@FreeBSD.org
 COMMENT=	A collection of widgets taken from GNOME gnumeric and evolution
 
-LIB_DEPENDS=	unicode.0:${PORTSDIR}/devel/libunicode \
-		iconv.3:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	unicode.0:${PORTSDIR}/devel/libunicode
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_PERL5=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix gnomehier libglade gnomevfs
+USE_ICONV=	yes
 GNOME_HTML_DIR=	${PREFIX}/share/doc/gal
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL_VER=13
diff --git a/x11-toolkits/p5-Prima/Makefile b/x11-toolkits/p5-Prima/Makefile
index 4411e87392a3..f461e1167466 100644
--- a/x11-toolkits/p5-Prima/Makefile
+++ b/x11-toolkits/p5-Prima/Makefile
@@ -47,6 +47,6 @@ LIB_DEPENDS+=		Xft.2:${PORTSDIR}/x11-fonts/libXft
 .if defined (WITHOUT_ICONV)
 CONFIGURE_ARGS+=	WITH_ICONV=0
 .else
-LIB_DEPENDS+=		iconv.3:${PORTSDIR}/converters/libiconv
+USE_ICONV=	yes
 .endif
 .endif
diff --git a/x11-toolkits/wxgtk/Makefile b/x11-toolkits/wxgtk/Makefile
index d03dd08a2d5d..8fed5d348a61 100644
--- a/x11-toolkits/wxgtk/Makefile
+++ b/x11-toolkits/wxgtk/Makefile
@@ -19,13 +19,13 @@ MAINTAINER?=	fjoe@FreeBSD.org
 COMMENT?=	The wxWindows GUI toolkit with GTK+ bindings
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		iconv.3:${PORTSDIR}/converters/libiconv
+		tiff.4:${PORTSDIR}/graphics/tiff
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GL=		yes
 USE_GMAKE=	yes
+USE_ICONV=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile
index d03dd08a2d5d..8fed5d348a61 100644
--- a/x11-toolkits/wxgtk24/Makefile
+++ b/x11-toolkits/wxgtk24/Makefile
@@ -19,13 +19,13 @@ MAINTAINER?=	fjoe@FreeBSD.org
 COMMENT?=	The wxWindows GUI toolkit with GTK+ bindings
 
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		iconv.3:${PORTSDIR}/converters/libiconv
+		tiff.4:${PORTSDIR}/graphics/tiff
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GL=		yes
 USE_GMAKE=	yes
+USE_ICONV=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index 97052e09b9f8..bf784f3ce662 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -15,12 +15,12 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An anti-aliased font support for gtk+
 
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv \
-		Xft.2:${PORTSDIR}/x11-fonts/libXft
+LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
 WANT_GNOME=	yes
+USE_ICONV=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
diff --git a/x11/ggiterm/Makefile b/x11/ggiterm/Makefile
index 3ff4bde5dd76..ab3daf02a6aa 100644
--- a/x11/ggiterm/Makefile
+++ b/x11/ggiterm/Makefile
@@ -19,7 +19,7 @@ COMMENT=	A terminal emulator for GGI
 LIB_DEPENDS=	ggi.2:${PORTSDIR}/graphics/libggi
 .if !defined(WITHOUT_FREETYPE)
 LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
-LIB_DEPENDS+=	iconv.3:${PORTSDIR}/converters/libiconv
+USE_ICONV=	yes
 .endif
 
 USE_GMAKE=	yes