45 files changed, 47 insertions, 63 deletions

diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 275fc0fae7ec..b63ebf0b6c9c 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -24,7 +24,7 @@ CONFIGURE_ARGS=		--enable-dict-dir=${DATADIR}	\
 			--enable-static
 
 USE_GMAKE=		yes
-USE_ICONV=		yes
+USES=			iconv
 USE_PERL5_BUILD=	yes
 USE_LDCONFIG=		yes
 
diff --git a/textproc/clucene/Makefile b/textproc/clucene/Makefile
index 6ca77986fc42..d0963db7fadd 100644
--- a/textproc/clucene/Makefile
+++ b/textproc/clucene/Makefile
@@ -16,8 +16,7 @@ LICENSE_COMB=	dual
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libboost_regex.a:${PORTSDIR}/devel/boost-libs
 
-USES=		cmake
-USE_ICONV=	yes
+USES=		cmake iconv
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DBUILD_CONTRIBS_LIB=ON
diff --git a/textproc/ctpp2/Makefile b/textproc/ctpp2/Makefile
index 0b9f451a5fa9..0528883524dd 100644
--- a/textproc/ctpp2/Makefile
+++ b/textproc/ctpp2/Makefile
@@ -9,9 +9,8 @@ MASTER_SITES=	http://ctpp.havoc.ru/download/
 MAINTAINER=	reki@reki.ru
 COMMENT=	C++ library to use templates in C/C++ projects, version 2
 
-USES=		cmake gettext
+USES=		cmake gettext iconv
 USE_LDCONFIG=	yes
-USE_ICONV=	yes
 
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
diff --git a/textproc/docbook2X/Makefile b/textproc/docbook2X/Makefile
index 106d2efc84de..590c27bec358 100644
--- a/textproc/docbook2X/Makefile
+++ b/textproc/docbook2X/Makefile
@@ -29,7 +29,7 @@ CONFLICTS=	docbook-utils-*
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_ICONV=	yes
+USES=		iconv
 
 .if defined(NOPORTDOCS)
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-doc__Makefile.in
diff --git a/textproc/estraier/Makefile b/textproc/estraier/Makefile
index af2227ac8ff9..e3745356bc88 100644
--- a/textproc/estraier/Makefile
+++ b/textproc/estraier/Makefile
@@ -22,7 +22,7 @@ CHASEN_DESC=	Japanese Morphological Analysis Support
 MECAB_DESC=	Part-of-Speech and Morphological Analyzer
 KAKASI_DESC=	Language processing filter/converter
 
-USE_ICONV=	yes
+USES=		iconv
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-sysqdbm \
 		--enable-dlfilter \
diff --git a/textproc/exempi/Makefile b/textproc/exempi/Makefile
index ce459b3806d7..bd59fb72e744 100644
--- a/textproc/exempi/Makefile
+++ b/textproc/exempi/Makefile
@@ -17,12 +17,12 @@ COMMENT=	A port of Adobe XMP SDK to work on UNIX
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	ltverhack gnomehack
+USE_GNOME=	ltverhack
 CONFIGURE_ARGS=	--enable-unittest=no
 CONFIGURE_ENV=	LIBS="-liconv"
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-USE_ICONV=	yes
+USES=		pathfix iconv
 USE_LDCONFIG=	yes
 
 post-patch:
diff --git a/textproc/flex/Makefile b/textproc/flex/Makefile
index eabea8b253fd..9f32ae5f8553 100644
--- a/textproc/flex/Makefile
+++ b/textproc/flex/Makefile
@@ -23,8 +23,7 @@ INFO=		flex
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_ICONV=	yes
-USES+=		gettext
+USES+=		gettext iconv
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/textproc/freexl/Makefile b/textproc/freexl/Makefile
index a67d596c5a16..ce0f9caeb6cc 100644
--- a/textproc/freexl/Makefile
+++ b/textproc/freexl/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Library to extract valid data from within an Excel (.xls) spreadsheet
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -liconv
diff --git a/textproc/gsed/Makefile b/textproc/gsed/Makefile
index 6fea24020a08..8286201e9e10 100644
--- a/textproc/gsed/Makefile
+++ b/textproc/gsed/Makefile
@@ -29,8 +29,7 @@ MAN1=		gsed.1
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_ICONV=	yes
-USE_GETTEXT=	yes
+USES+=		gettext iconv
 PLIST_SUB=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/textproc/hunspell/Makefile b/textproc/hunspell/Makefile
index c4fef8fd6c77..e5a254127d9a 100644
--- a/textproc/hunspell/Makefile
+++ b/textproc/hunspell/Makefile
@@ -17,8 +17,7 @@ LICENSE_COMB=	dual
 CONFIGURE_ARGS=	--disable-nls --with-libiconv-prefix=${LOCALBASE} --with-readline --with-ui
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
-USES=	pathfix
-USE_ICONV=	yes
+USES=		pathfix iconv
 USE_LDCONFIG=	yes
 USE_NCURSES=	yes
 
diff --git a/textproc/hyperestraier/Makefile b/textproc/hyperestraier/Makefile
index f67c7d84cf73..5d39b1a9c0c3 100644
--- a/textproc/hyperestraier/Makefile
+++ b/textproc/hyperestraier/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	qdbm>=1.8.77:${PORTSDIR}/databases/qdbm
 # check configure for min version of qdbm.
 LIB_DEPENDS=	qdbm.14:${PORTSDIR}/databases/qdbm
 
-USE_ICONV=	yes
+USES=		iconv
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-bzip2 --disable-zlib
diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile
index 359828e335fa..8d33475f7d49 100644
--- a/textproc/intltool/Makefile
+++ b/textproc/intltool/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 RUN_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libdir="${PREFIX}/libdata"
diff --git a/textproc/kmflcomp/Makefile b/textproc/kmflcomp/Makefile
index 7fcffe0bda4b..05a2b066fd5f 100644
--- a/textproc/kmflcomp/Makefile
+++ b/textproc/kmflcomp/Makefile
@@ -23,7 +23,7 @@ BUILD_DEPENDS=	bison:${PORTSDIR}/devel/bison
 
 USE_XORG=	x11
 USE_LDCONFIG=	yes
-USE_ICONV=	yes
+USES=		iconv
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -liconv
diff --git a/textproc/liblrdf/Makefile b/textproc/liblrdf/Makefile
index d14023fe6628..632d8e5216f8 100644
--- a/textproc/liblrdf/Makefile
+++ b/textproc/liblrdf/Makefile
@@ -20,8 +20,7 @@ USE_AUTOTOOLS=	libtoolize automake autoconf aclocal
 ACLOCAL_ARGS=	-I${LOCALBASE}/share/aclocal
 AUTOMAKE_ARGS=	--add-missing
 GNU_CONFIGURE=	yes
-USE_ICONV=	yes
-USES=		pathfix pkgconfig
+USES=		pathfix pkgconfig iconv
 USE_GNOME=	libxml2 libxslt
 GNOME_MAKEFILEIN=	Makefile.am
 USE_LDCONFIG=	yes
diff --git a/textproc/libparsifal/Makefile b/textproc/libparsifal/Makefile
index 86b77533a576..d4d77436130d 100644
--- a/textproc/libparsifal/Makefile
+++ b/textproc/libparsifal/Makefile
@@ -15,7 +15,7 @@ MAINTAINER=	yzlin@FreeBSD.org
 COMMENT=	Lightweight XML Parser
 
 USE_AUTOTOOLS=	libtool
-USE_ICONV=	yes
+USES=		iconv
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 7c42905d89f7..166708860508 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -19,9 +19,8 @@ COMMENT?=	XML parser library for GNOME
 USE_CSTD=	gnu89
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
-USE_ICONV=	yes
 GNU_CONFIGURE=	yes
-USES=		pathfix
+USES=		pathfix iconv
 USE_GNOME?=	pkgconfig
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS?=--with-iconv=${LOCALBASE} \
diff --git a/textproc/mifluz/Makefile b/textproc/mifluz/Makefile
index 9e5bc0dffee5..7bbca7adbf46 100644
--- a/textproc/mifluz/Makefile
+++ b/textproc/mifluz/Makefile
@@ -12,8 +12,7 @@ COMMENT=	C++ library to build and query a full text inverted index
 LICENSE=	GPLv3
 
 USE_GCC=	any
-USES=		bison pathfix
-USE_ICONV=	yes
+USES=		bison pathfix iconv
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--without-unac
 USE_LDCONFIG=	yes
diff --git a/textproc/odt2txt/Makefile b/textproc/odt2txt/Makefile
index d173f04d3973..f18dac99c4d1 100644
--- a/textproc/odt2txt/Makefile
+++ b/textproc/odt2txt/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A simple converter from OpenDocument Text to plain text
 LICENSE=	GPLv2
 
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
diff --git a/textproc/opensp/Makefile b/textproc/opensp/Makefile
index 76dacdeb8105..be6ff5b06108 100644
--- a/textproc/opensp/Makefile
+++ b/textproc/opensp/Makefile
@@ -16,7 +16,7 @@ COMMENT=	This package is a collection of SGML/XML tools called OpenSP
 
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_ICONV=	yes
+USES=		iconv
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
 CONFIGURE_ARGS=	--enable-default-catalog=${PREFIX}/share/sgml/catalog \
diff --git a/textproc/p5-Text-Unaccent/Makefile b/textproc/p5-Text-Unaccent/Makefile
index 75450eebb665..8d28c3a7631a 100644
--- a/textproc/p5-Text-Unaccent/Makefile
+++ b/textproc/p5-Text-Unaccent/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Remove accents from a string
 
 MAN3=	Text::Unaccent.3
 
-USE_ICONV=	yes
+USES=		iconv
 PERL_CONFIGURE=	yes
 CFLAGS+=	-DICONV_CONST=const
 
diff --git a/textproc/p5-XML-Sablotron/Makefile b/textproc/p5-XML-Sablotron/Makefile
index c9114289caa2..f52d0984d2ef 100644
--- a/textproc/p5-XML-Sablotron/Makefile
+++ b/textproc/p5-XML-Sablotron/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Perl interface to the Sablotron XSLT processor
 
 LIB_DEPENDS=	sablot.70:${PORTSDIR}/textproc/sablotron
 
-USE_ICONV=	yes
+USES=		iconv
 PERL_CONFIGURE=	yes
 CONFIGURE_ARGS=	LIBS='-L${LOCALBASE}/lib -lexpat -lsablot -liconv' \
 		INC='-I${LOCALBASE}/include' \
diff --git a/textproc/p5-XML-TinyXML/Makefile b/textproc/p5-XML-TinyXML/Makefile
index a8e05dc64d91..5845f201f333 100644
--- a/textproc/p5-XML-TinyXML/Makefile
+++ b/textproc/p5-XML-TinyXML/Makefile
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	info@rickvanderzwet.nl
 COMMENT=	Little and efficient Perl module to manage xml data
 
-USE_ICONV=	yes
+USEs=		iconv
 
 MAKE_ARGS+=	LIBS='-L${LOCALBASE}/lib' INC='-I. -I${LOCALBASE}/include'
 PERL_CONFIGURE=	yes
diff --git a/textproc/refdb/Makefile b/textproc/refdb/Makefile
index 0471b9711707..c9d57d311276 100644
--- a/textproc/refdb/Makefile
+++ b/textproc/refdb/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
 		dbi.1:${PORTSDIR}/databases/libdbi
 
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_PERL5=	yes
 HAS_CONFIGURE=	yes
 ALL_TARGET=
diff --git a/textproc/ruby-libxml/Makefile b/textproc/ruby-libxml/Makefile
index 1282497e8990..5a7bfa500fab 100644
--- a/textproc/ruby-libxml/Makefile
+++ b/textproc/ruby-libxml/Makefile
@@ -18,7 +18,7 @@ EXPIRATION_DATE=	2013-05-02
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
 
 USE_RUBY=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_LDCONFIG=	${RUBY_SITEARCHLIBDIR}/xml
 
 EXT_ARGS=	--with-iconv-dir=${LOCALBASE} \
diff --git a/textproc/ruby-sablot/Makefile b/textproc/ruby-sablot/Makefile
index dbc0d83436d6..8b188c84df54 100644
--- a/textproc/ruby-sablot/Makefile
+++ b/textproc/ruby-sablot/Makefile
@@ -18,7 +18,7 @@ EXPIRATION_DATE=	2013-05-02
 LIB_DEPENDS=	sablot.70:${PORTSDIR}/textproc/sablotron \
 		expat.6:${PORTSDIR}/textproc/expat2
 
-USE_ICONV=	yes
+USES=		iconv
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
 
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index 9b1f781fe40a..50f65a007287 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -30,7 +30,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lexpat -liconv
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 GNU_CONFIGURE=	yes
 USE_PERL5_BUILD=	yes
 
diff --git a/textproc/scim-kmfl-imengine/Makefile b/textproc/scim-kmfl-imengine/Makefile
index 408253bb491e..c530e8c9f6b0 100644
--- a/textproc/scim-kmfl-imengine/Makefile
+++ b/textproc/scim-kmfl-imengine/Makefile
@@ -28,8 +28,7 @@ RUN_DEPENDS=	kmflcomp:${PORTSDIR}/textproc/kmflcomp \
 USE_XORG=	x11 xkbfile xproto
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	glib20 gtk20 intlhack
-USES=		gettext
-USE_ICONV=	yes
+USES=		gettext iconv
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/textproc/scim-openvanilla/Makefile b/textproc/scim-openvanilla/Makefile
index 6e505c0652e8..891e283d5376 100644
--- a/textproc/scim-openvanilla/Makefile
+++ b/textproc/scim-openvanilla/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 USE_AUTOTOOLS=	libltdl
 WRKSRC=		${WRKDIR}/${DISTNAME}/Loaders/SCIM
 USE_GMAKE=	yes
-USE_ICONV=	yes
-USES=		pkgconfig gettext
+USES=		pkgconfig gettext iconv
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	OV_MODULEDIR=${PREFIX}/lib/openvanilla/
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/textproc/scim/Makefile b/textproc/scim/Makefile
index 09e954561c81..f97b7f39b46a 100644
--- a/textproc/scim/Makefile
+++ b/textproc/scim/Makefile
@@ -18,11 +18,10 @@ USE_GNOME=	gnomehack gnomehier gtk20 intlhack
 
 USE_AUTOTOOLS=	libtool
 USE_GCC=	any
-USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_XORG=	x11 xpm
 USE_LDCONFIG=	yes
-USES=		gettext
+USES=		gettext iconv
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
diff --git a/textproc/sdcv/Makefile b/textproc/sdcv/Makefile
index 092e5b544066..b34c548ce3d4 100644
--- a/textproc/sdcv/Makefile
+++ b/textproc/sdcv/Makefile
@@ -11,11 +11,10 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A text-based utility for work with dictionaries in StarDict's format
 
 USE_BZIP2=	yes
-USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	glib20
-USES=		pkgconfig
+USES=		pkgconfig iconv
 SUB_FILES=	pkg-message
 
 .if !defined(WITHOUT_NLS)
diff --git a/textproc/simplexml/Makefile b/textproc/simplexml/Makefile
index ce4410b223da..4aad9d4f33dc 100644
--- a/textproc/simplexml/Makefile
+++ b/textproc/simplexml/Makefile
@@ -17,8 +17,7 @@ COMMENT=	C++ XML parser library
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
-USES=		cmake
-USE_ICONV=	yes
+USES=		cmake iconv
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
diff --git a/textproc/skim/Makefile b/textproc/skim/Makefile
index 7b399fbb603d..773f7eea25e1 100644
--- a/textproc/skim/Makefile
+++ b/textproc/skim/Makefile
@@ -22,7 +22,7 @@ EXPIRATION_DATE=	2013-07-01
 USE_KDELIBS_VER=3
 USE_PYTHON=	yes
 USE_BZIP2=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 PYDISTUTILS_NOEGGINFO=	yes
diff --git a/textproc/sphinxsearch-devel/Makefile b/textproc/sphinxsearch-devel/Makefile
index dd5c9edd3f82..f17158fae85b 100644
--- a/textproc/sphinxsearch-devel/Makefile
+++ b/textproc/sphinxsearch-devel/Makefile
@@ -56,7 +56,7 @@ CONFIGURE_ARGS+=	--without-pgsql
 
 .if ${PORT_OPTIONS:MICONV}
 CONFIGURE_ARGS+=        --with-iconv
-USE_ICONV=              yes
+USES+=              	iconv
 .else
 CONFIGURE_ARGS+=        --without-iconv
 .endif
diff --git a/textproc/sphinxsearch/Makefile b/textproc/sphinxsearch/Makefile
index 9d98f9fd1c43..c5e140e367e3 100644
--- a/textproc/sphinxsearch/Makefile
+++ b/textproc/sphinxsearch/Makefile
@@ -64,7 +64,7 @@ CONFIGURE_ARGS+=	--without-pgsql
 
 .if ${PORT_OPTIONS:MICONV}
 CONFIGURE_ARGS+=	--with-iconv
-USE_ICONV=		yes
+USES+=			iconv
 .else
 CONFIGURE_ARGS+=	--without-iconv
 .endif
diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile
index 4b84937f050e..f9a410f97cfe 100644
--- a/textproc/uim-el/Makefile
+++ b/textproc/uim-el/Makefile
@@ -27,7 +27,7 @@ USE_BZIP2=	yes
 USE_PERL5_BUILD=yes
 USE_GNOME=	intltool
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_EMACS=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/textproc/uim-qt4/Makefile b/textproc/uim-qt4/Makefile
index d0ae1c606a49..a9edaf13ec18 100644
--- a/textproc/uim-qt4/Makefile
+++ b/textproc/uim-qt4/Makefile
@@ -13,7 +13,7 @@ LIB_DEPENDS=	uim.8:${PORTSDIR}/textproc/uim
 
 USE_QT4=	qmake_build moc_build qt3support uic
 USE_AUTOTOOLS=	libtool
-USE_ICONV=	yes
+USES=		iconv
 
 MASTERDIR=	${.CURDIR}/../../textproc/uim
 PKGDIR=		${.CURDIR}
diff --git a/textproc/uim/Makefile b/textproc/uim/Makefile
index d6869fc5e85b..58535126fea7 100644
--- a/textproc/uim/Makefile
+++ b/textproc/uim/Makefile
@@ -22,8 +22,7 @@ WANT_GNOME=	yes
 USE_GNOME+=	glib20 intltool
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-USES=		gettext
-USE_ICONV=	yes
+USES=		gettext iconv
 USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
 
diff --git a/textproc/unrtf/Makefile b/textproc/unrtf/Makefile
index 1636a6894fc4..e8fd6d258749 100644
--- a/textproc/unrtf/Makefile
+++ b/textproc/unrtf/Makefile
@@ -11,7 +11,7 @@ COMMENT=	A converter from RTF to several formats, including HTML and LaTeX
 
 LICENSE=	GPLv3
 
-USE_ICONV=	yes
+USES=		iconv
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libdir=${PREFIX}/share
diff --git a/textproc/wv2/Makefile b/textproc/wv2/Makefile
index a7115df87219..7e1478b96fc0 100644
--- a/textproc/wv2/Makefile
+++ b/textproc/wv2/Makefile
@@ -15,9 +15,8 @@ MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	A library providing routines to access Microsoft Word files
 
 USE_GNOME=	libgsf
-USE_ICONV=	yes
 USE_BZIP2=	yes
-USES=		cmake
+USES=		cmake iconv
 USE_LDCONFIG=	yes
 
 post-patch:
diff --git a/textproc/xalan-c/Makefile b/textproc/xalan-c/Makefile
index 0bdeff1abf78..b821a6c57d1b 100644
--- a/textproc/xalan-c/Makefile
+++ b/textproc/xalan-c/Makefile
@@ -88,7 +88,7 @@ MAKE_ENV+=		XALAN_USE_ICU=1
 MAKE_ENV+=		ICUROOT=${ICUROOT}
 PLIST_SUB+=		ICUDEP=""
 .else
-USE_ICONV=		yes
+USES+=			iconv
 LDFLAGS+=		-L${LOCALBASE}/lib -liconv
 PLIST_SUB+=		ICUDEP="@comment "
 .endif
diff --git a/textproc/xerces-c2-devel/Makefile b/textproc/xerces-c2-devel/Makefile
index 7fc04422b97a..5127a11fc70e 100644
--- a/textproc/xerces-c2-devel/Makefile
+++ b/textproc/xerces-c2-devel/Makefile
@@ -37,7 +37,7 @@ TRANSCODER=		IconvFBSD
 .endif
 
 .if !defined(TRANSCODER)
-USE_ICONV=		yes
+USES+=			iconv
 TRANSCODER=		IconvFBSD
 ICONVROOT?=		${LOCALBASE}
 CONFIGURE_ENV+=		ICONVROOT=${ICONVROOT}
@@ -58,7 +58,7 @@ PKGNAMESUFFIX+=		-native
 PLIST_SUB+=		TRANSICONV=""
 PLIST_SUB+=		TRANSICU="@comment "
 .else
-USE_ICONV=		yes
+USES+=			iconv
 TRANSCODER=		IconvFBSD
 ICONVROOT?=		${LOCALBASE}
 CONFIGURE_ENV+=		ICONVROOT=${ICONVROOT}
diff --git a/textproc/xerces-c2/Makefile b/textproc/xerces-c2/Makefile
index d309d233b1b8..85080c1b2801 100644
--- a/textproc/xerces-c2/Makefile
+++ b/textproc/xerces-c2/Makefile
@@ -39,7 +39,7 @@ PLIST_SUB+=		TRANSICU="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MICONVFBSD}
-USE_ICONV=		yes
+USES+=			iconv
 TRANSCODER=		IconvFBSD
 ICONVROOT?=		${LOCALBASE}
 CONFIGURE_ENV+=		ICONVROOT=${ICONVROOT}
diff --git a/textproc/xmlppm/Makefile b/textproc/xmlppm/Makefile
index 54af8a30c8d5..64fa5c3f8115 100644
--- a/textproc/xmlppm/Makefile
+++ b/textproc/xmlppm/Makefile
@@ -18,7 +18,7 @@ COMMENT=	XML-Conscious PPM Compression
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
-USE_ICONV=	yes
+USES=		iconv
 USE_GMAKE=	yes
 MAKE_ARGS=	CC="${CXX}" CFLAGS="${CXXFLAGS}" \
 		CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/textproc/xmlstarlet/Makefile b/textproc/xmlstarlet/Makefile
index 16355caa9f7d..62d89d38763e 100644
--- a/textproc/xmlstarlet/Makefile
+++ b/textproc/xmlstarlet/Makefile
@@ -13,7 +13,7 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_GNOME=	libxslt
-USE_ICONV=	yes
+USES=		iconv
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-libxml-prefix=${LOCALBASE} \
 		--with-libxslt-prefix=${LOCALBASE} \
diff --git a/textproc/zorba/Makefile b/textproc/zorba/Makefile
index ad6564f7d44c..904b9f8efddb 100644
--- a/textproc/zorba/Makefile
+++ b/textproc/zorba/Makefile
@@ -29,9 +29,8 @@ OPTIONS_DEFINE=	PHP PYTHON RUBY JAVA DOCS
 CONFLICTS=	xqilla-[0-9]*
 
 USE_GNOME=	libxml2 libxslt
-USE_ICONV=	yes
 USE_LDCONFIG=	yes
-USES=		cmake:outsource
+USES=		cmake:outsource iconv
 CXXFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CMAKE_ARGS=	-DCMAKE_REQUIRED_FLAGS:STRING="-I${LOCALBASE}/include -L${LOCALBASE}/lib"