13 files changed, 13 insertions, 16 deletions

diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index fcd118648b65..b9e5ff460797 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -26,8 +26,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_GMAKE=	yes
-USE_ICONV=	yes
-USES=		pathfix gettext
+USES=		pathfix gettext iconv
 USE_GNOME=	libxml2 gtk20 desktopfileutils librsvg2 libxslt
 MAKE_JOBS_SAFE=	yes
 GNU_CONFIGURE=	yes
diff --git a/editors/biew/Makefile b/editors/biew/Makefile
index e6c23ee90461..103c7fff54c1 100644
--- a/editors/biew/Makefile
+++ b/editors/biew/Makefile
@@ -19,7 +19,7 @@ CONFIGURE_ARGS=	--cc="${CC}" --with-extraincdir="${LOCALBASE}/include" \
 		--prefix="${PREFIX}" --datadir="${DATADIR}"
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_DOS2UNIX=	${PORTDOCS}
 MAKEFILE=	makefile
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.//g}
diff --git a/editors/calligra/Makefile b/editors/calligra/Makefile
index c4314e103577..898705f2888c 100644
--- a/editors/calligra/Makefile
+++ b/editors/calligra/Makefile
@@ -38,7 +38,6 @@ CONFLICTS_BUILD=qt-3.*
 
 USE_GL=		glew
 USE_GNOME=	glib20 libxml2 libxslt
-USE_ICONV=	yes
 USE_KDE4=	kactivities kdehier kdelibs kdeprefix libkdcraw nepomuk-core \
 		okular pimlibs attica automoc4 sharedmime soprano
 USE_PERL5=	yes
@@ -47,7 +46,7 @@ USE_QT4=	dbus designer_build gui opengl phonon porting_build qt3support \
 		moc_build qmake_build rcc_build uic_build uic3_build
 USE_SQLITE=	3
 USE_BZIP2=	yes
-USES=		cmake:outsource pkgconfig
+USES=		cmake:outsource pkgconfig iconv
 CMAKE_ARGS=	-DCMAKE_INCLUDE_PATH:STRING="${QT_INCDIR} ${LOCALBASE}/include" \
 		-DIHAVEPATCHEDQT:BOOL=TRUE # To be removed with Qt 4.8.2.
 MAKE_JOBS_SAFE=	yes
diff --git a/editors/joe/Makefile b/editors/joe/Makefile
index 071b35aeb98e..81d1eee2bfa5 100644
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@@ -22,7 +22,7 @@ CONFLICTS=	joe-2.*
 
 LICENSE=	GPLv1
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_NCURSES=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -liconv"
diff --git a/editors/joe2/Makefile b/editors/joe2/Makefile
index 4036229d9f69..9bcf0014a4d4 100644
--- a/editors/joe2/Makefile
+++ b/editors/joe2/Makefile
@@ -20,7 +20,7 @@ CONFLICTS=	joe-3*
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -liconv"
 CPPFLAGS+=	-I${LOCALBASE}/include
 
diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile
index daa71f6dac4a..bf42d2cee02c 100644
--- a/editors/lazarus/Makefile
+++ b/editors/lazarus/Makefile
@@ -63,8 +63,7 @@ RUN_DEPENDS+=	fpcres:${PORTSDIR}/lang/fpc-utils \
 		${LCL_UNITS_DIR}/alllclunits.ppu:${PORTSDIR}/editors/lazarus-lcl-units \
 		${LCL_UNITS_DIR}/nogui/interfaces.ppu:${PORTSDIR}/editors/lazarus-lcl-nogui
 
-USE_ICONV=	yes
-USES+=	gettext
+USES+=	gettext iconv
 
 MAN1=		lazarus-ide.1 lazbuild.1 startlazarus.1
 SUB_FILES=	pkg-message
diff --git a/editors/mp/Makefile b/editors/mp/Makefile
index 6cdbaaf9be1d..fc3256809a74 100644
--- a/editors/mp/Makefile
+++ b/editors/mp/Makefile
@@ -17,7 +17,7 @@ OPTIONS_RADIO_GUI=	GTK3 GTK2 QT4
 OPTIONS_DEFAULT=	PCRE
 
 USE_NCURSES=	yes
-USE_ICONV=	yes
+USES=		iconv
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	config.sh
 CONFIGURE_ARGS=	--prefix=${PREFIX} --without-win32 --without-kde4
diff --git a/editors/nvi-devel/Makefile b/editors/nvi-devel/Makefile
index 1e45e5892df7..740d822115e7 100644
--- a/editors/nvi-devel/Makefile
+++ b/editors/nvi-devel/Makefile
@@ -24,7 +24,7 @@ USE_BZIP2=		yes
 WRKSRC=			${WRKDIR}/${DISTNAME}/build.unix
 USE_AUTOTOOLS=		libtool
 USE_LDCONFIG=		yes
-USE_ICONV=		yes
+USES=			iconv
 USE_BDB=		42+
 CONFIGURE_ARGS+=	--with-db-prefix=${LOCALBASE} \
 			--program-prefix=n
diff --git a/editors/ted/Makefile b/editors/ted/Makefile
index 3e5ae63fd5d0..f5add35fa439 100644
--- a/editors/ted/Makefile
+++ b/editors/ted/Makefile
@@ -25,7 +25,7 @@ GTK2_DESC=	Use GTK2 instead of MOTIF
 WRKSRC=		${WRKDIR}/Ted-${PORTVERSION}
 
 USE_XORG=	xext xft
-USE_ICONV=	yes
+USES=		iconv
 USE_GHOSTSCRIPT_RUN=	yes
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include/libpng15
diff --git a/editors/texmacs/Makefile b/editors/texmacs/Makefile
index 899f532f2cd5..172732e678ee 100644
--- a/editors/texmacs/Makefile
+++ b/editors/texmacs/Makefile
@@ -58,7 +58,7 @@ CONFIGURE_ARGS+=	--without-gs
 .endif
 
 .if ${PORT_OPTIONS:MICONV}
-USE_ICONV=	yes
+USES+=			iconv
 CONFIGURE_ARGS+=	--with-iconv="${LOCALBASE}"
 .else
 CONFIGURE_ARGS+=	--without-iconv
diff --git a/editors/vile/Makefile b/editors/vile/Makefile
index d56c613370b8..63ef6a6190fa 100644
--- a/editors/vile/Makefile
+++ b/editors/vile/Makefile
@@ -37,7 +37,7 @@ PLIST_SUB+=	SO_EXT=""
 .endif
 
 .if ${PORT_OPTIONS:MICONV}
-USE_ICONV=	yes
+USES+=		iconv
 CONFIGURE_ARGS+=	--with-iconv
 PLIST_SUB+=	ICONV=""
 .else
diff --git a/editors/vim/Makefile b/editors/vim/Makefile
index 5f7a7a87eb66..6c2174db29ce 100644
--- a/editors/vim/Makefile
+++ b/editors/vim/Makefile
@@ -166,7 +166,7 @@ MAKE_ARGS+=	CONF_OPT_GUI=${CONF_OPT_GUI} ${I18N}
 
 
 .if exists(${LOCALBASE}/lib/libiconv.so)
-USE_ICONV=	yes
+USES+=	iconv
 .endif
 
 
diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile
index 2a91786d117f..22081523a30f 100644
--- a/editors/xvile/Makefile
+++ b/editors/xvile/Makefile
@@ -48,7 +48,7 @@ PLIST_SUB+=	SO_EXT=""
 .endif
 
 .if ${PORT_OPTIONS:MICONV}
-USE_ICONV=	yes
+USES+=		iconv
 CONFIGURE_ARGS+=	--with-iconv
 PLIST_SUB+=	ICONV=""
 .else