39 files changed, 40 insertions, 50 deletions

diff --git a/mail/anubis/Makefile b/mail/anubis/Makefile
index 2baf505280b4..77a5f396edef 100644
--- a/mail/anubis/Makefile
+++ b/mail/anubis/Makefile
@@ -46,8 +46,7 @@ MAKE_JOBS_UNSAFE=	yes
 _REQUIRE=	mail
 
 .if ${PORT_OPTIONS:MNLS}
-USE_ICONV=	yes
-USES+=		gettext
+USES+=		gettext iconv
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 34d571390c9a..ede5751e9beb 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -25,12 +25,11 @@ INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_PERL5=	yes
 USE_OPENSSL=	yes
-USES=		pathfix gettext
+USES=		pathfix gettext iconv
 USE_GNOME=	gnomeprefix intlhack libgnomeui gtkhtml3 \
 		libgnomeprintui
 USE_AUTOTOOLS=	libltdl
 GNU_CONFIGURE=	yes
-USE_ICONV=	yes
 CONFIGURE_ARGS=	--enable-threads \
 		--disable-more-warnings \
 		--with-ssl \
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index 660dd3e6deb7..522e46bc8adf 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -40,7 +40,7 @@ BF_CPPFLAGS?=		-I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/etc
 .if ${PORT_OPTIONS:MUNICODE}
 CONFIGURE_ARGS+=	--enable-unicode
-USE_ICONV=		yes
+USES+=			iconv
 BF_LIBS+=		-liconv
 .endif
 .if ${PORT_OPTIONS:MGSL}
diff --git a/mail/claws-mail-address_keeper/Makefile b/mail/claws-mail-address_keeper/Makefile
index 1bbd5f07d60f..6370c77d4bde 100644
--- a/mail/claws-mail-address_keeper/Makefile
+++ b/mail/claws-mail-address_keeper/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 MAKE_JOBS_SAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/mail/claws-mail-attach_warner/Makefile b/mail/claws-mail-attach_warner/Makefile
index d6483148fc8c..b0c89f43cd0f 100644
--- a/mail/claws-mail-attach_warner/Makefile
+++ b/mail/claws-mail-attach_warner/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
 RUN_DEPENDS=	claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
 
diff --git a/mail/claws-mail-clamd/Makefile b/mail/claws-mail-clamd/Makefile
index 48935b42f7f0..5d75cf30e4d8 100644
--- a/mail/claws-mail-clamd/Makefile
+++ b/mail/claws-mail-clamd/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS=	claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail \
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 MAKE_JOBS_SAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/mail/claws-mail-fancy/Makefile b/mail/claws-mail-fancy/Makefile
index 2b5b10f85371..b64b56e72735 100644
--- a/mail/claws-mail-fancy/Makefile
+++ b/mail/claws-mail-fancy/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf
-USE_ICONV=	yes
+USES=		iconv
 USE_GNOME=	gtk20
 MAKE_JOBS_SAFE=	yes
 
diff --git a/mail/claws-mail-fetchinfo/Makefile b/mail/claws-mail-fetchinfo/Makefile
index 6d38eeb1a767..a43bfadb21a4 100644
--- a/mail/claws-mail-fetchinfo/Makefile
+++ b/mail/claws-mail-fetchinfo/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf
-USE_ICONV=	yes
+USES=		iconv
 MAKE_JOBS_SAFE=	yes
 
 .include <bsd.port.options.mk>
diff --git a/mail/claws-mail-gdata/Makefile b/mail/claws-mail-gdata/Makefile
index 1d5fa8d5f056..44a966f10fa8 100644
--- a/mail/claws-mail-gdata/Makefile
+++ b/mail/claws-mail-gdata/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	gdata:${PORTSDIR}/devel/libgdata
 RUN_DEPENDS=	claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
 
 GNU_CONFIGURE=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_GMAKE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/mail/claws-mail-gtkhtml2_viewer/Makefile b/mail/claws-mail-gtkhtml2_viewer/Makefile
index d8494ddec9f1..09b3c043119d 100644
--- a/mail/claws-mail-gtkhtml2_viewer/Makefile
+++ b/mail/claws-mail-gtkhtml2_viewer/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf
 USE_GNOME=	gtk20
-USE_ICONV=	yes
+USES=		iconv
 MAKE_JOBS_SAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/mail/claws-mail-pdf_viewer/Makefile b/mail/claws-mail-pdf_viewer/Makefile
index 68e00d20cbbc..ff86a1c1a181 100644
--- a/mail/claws-mail-pdf_viewer/Makefile
+++ b/mail/claws-mail-pdf_viewer/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
 RUN_DEPENDS=	claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_GHOSTSCRIPT=yes
 USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
diff --git a/mail/claws-mail-rssyl/Makefile b/mail/claws-mail-rssyl/Makefile
index b2684db16823..6ea8e6afe907 100644
--- a/mail/claws-mail-rssyl/Makefile
+++ b/mail/claws-mail-rssyl/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
 RUN_DEPENDS=	claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
 
 USE_AUTOTOOLS=	autoconf
-USE_ICONV=	yes
+USES=		iconv
 MAKE_JOBS_SAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/mail/claws-mail-vcalendar/Makefile b/mail/claws-mail-vcalendar/Makefile
index e482788bd2f0..49946ca013eb 100644
--- a/mail/claws-mail-vcalendar/Makefile
+++ b/mail/claws-mail-vcalendar/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
 RUN_DEPENDS=	claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
 
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 57dc148642c6..8db58cc0a84f 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -37,12 +37,11 @@ CONFLICTS=	sylpheed-claws
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
 USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 		xfixes xi xinerama xrandr xrender
 USE_GNOME=	atk glib20 gnomehack gtk20 libartlgpl2 libxml2 pango
 GNU_CONFIGURE=	yes
-USES=		pkgconfig
+USES=		pkgconfig iconv
 INSTALLS_ICONS=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/mail/cone/Makefile b/mail/cone/Makefile
index d07f5eb09ad8..9ba1522c5f92 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -23,8 +23,7 @@ BUILD_DEPENDS=	gpgv:${PORTSDIR}/security/gnupg1
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USE_FAM=	yes
-USES=		gettext
-USE_ICONV=	yes
+USES=		gettext iconv
 USE_GNOME=	libxml2
 
 USE_BZIP2=	yes
diff --git a/mail/crm114/Makefile b/mail/crm114/Makefile
index 396a02925f8b..d263764e3bc9 100644
--- a/mail/crm114/Makefile
+++ b/mail/crm114/Makefile
@@ -24,8 +24,7 @@ LIB_DEPENDS=	tre.5:${PORTSDIR}/textproc/libtre
 
 CRM114RELEASENAME=BlameMichelson
 
-USES=		gettext
-USE_ICONV=	yes
+USES=		gettext iconv
 
 MAKE_ARGS=	CC="${CC}" prefix="${PREFIX}" \
 		LIBS="${LIBS}" \
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 10f877c37cbe..7751ea548938 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -30,7 +30,7 @@ DOVECOTVERSION=	1.2
 # consult the maintainer of those ports before updating this one.    #
 ######################################################################
 
-USE_ICONV=	yes
+USES=		iconv
 USE_RC_SUBR=	dovecot
 
 GNU_CONFIGURE=	yes
diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index 997c57703b65..c985d0cc9a86 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -23,7 +23,7 @@ CONFLICTS=	dovecot-1.[0-9]*
 # port before updating this one.                                     #
 ######################################################################
 
-USE_ICONV=	yes
+USES=		iconv
 USE_RC_SUBR=	dovecot
 MAKE_JOBS_SAFE=	yes
 
diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index a32a4c0e5e95..4e5811023ec5 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -89,7 +89,7 @@ ELM_PATCHDONE=	true
 .endfor
 
 .if ${PORT_OPTIONS:MICONV}
-USE_ICONV=	yes
+USES+=	iconv
 .endif
 
 .for shlib in iconv smtp tls
diff --git a/mail/elmo-devel/Makefile b/mail/elmo-devel/Makefile
index a23a04271ec1..9f89186bce2a 100644
--- a/mail/elmo-devel/Makefile
+++ b/mail/elmo-devel/Makefile
@@ -14,7 +14,7 @@ COMMENT=	Receive, filter, read, compose, and send mail at the text console
 CONFLICTS=	elmo-[0-9]*
 
 GNU_CONFIGURE=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_OPENSSL=	yes
 USE_PERL5_RUN=	yes
 
diff --git a/mail/elmo/Makefile b/mail/elmo/Makefile
index 7fc2d880bade..d37e15c0b6a2 100644
--- a/mail/elmo/Makefile
+++ b/mail/elmo/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Receive, filter, read, compose, and send mail at the text console
 CONFLICTS=	elmo-devel-[0-9]*
 
 GNU_CONFIGURE=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_OPENSSL=	yes
 USE_PERL5_RUN=	yes
 
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 9a3cb7413d4b..230ebedc3817 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -238,7 +238,7 @@ SEDLIST+=	-e 's,XX_TCP_WRAPPERS_LIBS_XX,,'
 .endif
 
 .if !defined(WITHOUT_ICONV)
-USE_ICONV=	yes
+USES=		iconv
 SEDLIST+=	-e 's,XX_ICONV_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib -liconv,' \
 		-e 's,^\# (HAVE_ICONV=),\1,'
 .else
diff --git a/mail/gmime2/Makefile b/mail/gmime2/Makefile
index 7a65d0c7d2d6..cd9768859d97 100644
--- a/mail/gmime2/Makefile
+++ b/mail/gmime2/Makefile
@@ -16,10 +16,9 @@ CONFLICTS=	gmime-1.0.* gmime-2.4.*
 
 SLAVEDIRS=	mail/gmime2-sharp
 
-USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_GNOME?=	gnomehack glib20
-USES=		pkgconfig
+USES=		pkgconfig iconv
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 # www.freebsd.org/cgi/query-pr.cgi?pr=118092
diff --git a/mail/gmime24/Makefile b/mail/gmime24/Makefile
index 79e163d4639d..4d85e6640147 100644
--- a/mail/gmime24/Makefile
+++ b/mail/gmime24/Makefile
@@ -18,10 +18,9 @@ CONFLICTS=	gmime-1.0.*
 SLAVEDIRS=	mail/gmime2-sharp
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}24
-USE_ICONV=	yes
 USE_GMAKE=	yes
 USE_GNOME?=	gnomehack glib20
-USES=		pkgconfig
+USES=		pkgconfig iconv
 USE_LDCONFIG=	yes
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
diff --git a/mail/gnarwl/Makefile b/mail/gnarwl/Makefile
index 08009513e1cd..854e922bec2e 100644
--- a/mail/gnarwl/Makefile
+++ b/mail/gnarwl/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	gdbm.4:${PORTSDIR}/databases/gdbm
 BUILD_DEPENDS=	${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
 
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_OPENLDAP=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX} --with-docdir=${DOCSDIR}
diff --git a/mail/heirloom-mailx/Makefile b/mail/heirloom-mailx/Makefile
index f9affc100dfe..4697fc4ba1bc 100644
--- a/mail/heirloom-mailx/Makefile
+++ b/mail/heirloom-mailx/Makefile
@@ -17,7 +17,7 @@ CONFLICTS=	mailx-[0-9]*
 
 MAKE_JOBS_UNSAFE=	yes
 USE_BZIP2=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_OPENSSL=	yes
 MAKE_ARGS=	PREFIX="${PREFIX}" \
 		SYSCONFDIR="${PREFIX}/etc" \
diff --git a/mail/hotwayd/Makefile b/mail/hotwayd/Makefile
index efa6b897cc8a..ea3ef962ac35 100644
--- a/mail/hotwayd/Makefile
+++ b/mail/hotwayd/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 
 MAN1=		hotwayd.1 \
 		hotsmtpd.1
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index f50c99f37974..c583da57183e 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 USE_AUTOTOOLS=	libtool autoconf
 AUTOTOOLSFILES=	aclocal.m4
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/mail/libpst/Makefile b/mail/libpst/Makefile
index a7894f269558..4fc727603265 100644
--- a/mail/libpst/Makefile
+++ b/mail/libpst/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	gsf-1:${PORTSDIR}/devel/libgsf
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -liconv
 CONFIGURE_ARGS+=	--disable-python
diff --git a/mail/libvmime/Makefile b/mail/libvmime/Makefile
index c7a550a039bf..dca3f7efb91d 100644
--- a/mail/libvmime/Makefile
+++ b/mail/libvmime/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS+=	gsasl:${PORTSDIR}/security/gsasl
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/mail/lurker/Makefile b/mail/lurker/Makefile
index f51eabebba18..9dd2421420d2 100644
--- a/mail/lurker/Makefile
+++ b/mail/lurker/Makefile
@@ -20,7 +20,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 MIMELIB_VERSION=	3.1.1
-USE_ICONV=	yes
+USES=		iconv
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 265452a669dc..543edf0bec82 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -28,7 +28,7 @@ LICENSE=	GPLv3
 
 USE_BZIP2=	yes
 USE_PERL5=	yes
-USE_ICONV=	yes
+USES=		iconv
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 CONFIGURE_ARGS=	--enable-syslog=1 \
diff --git a/mail/mmr/Makefile b/mail/mmr/Makefile
index 0d96f082c4bb..a0551aab2c25 100644
--- a/mail/mmr/Makefile
+++ b/mail/mmr/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Curses based MIME Mail Reader
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_ICONV=	yes
+USES=		iconv
 MAKE_ARGS=	LIBS='${LDFLAGS}' CXX='${CXX}' CXXFLAGS='${CXXFLAGS}'
 ALL_TARGET=	${PORTNAME}
 MAKE_JOBS_SAFE=	yes
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 7c35b15608f2..eba4c86a101f 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -236,7 +236,7 @@ CONFIGURE_ARGS+=	--enable-locales-fix
 .endif
 
 .if ${PORT_OPTIONS:MICONV}
-USE_ICONV=	yes
+USES+=			iconv
 CONFIGURE_ARGS+=	--with-libiconv-prefix=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--disable-iconv
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index d523f2cd1412..9ff2753b263a 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -61,14 +61,13 @@ WITH_SGML_DOCS:=no
 .endif
 
 .if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-USE_ICONV=	yes
+USES+=		gettext iconv
 .if defined(WITHOUT_MUTT_ICONV)
 IGNORE=	the WITHOUT_MUTT_ICONV knob of the mutt port only works if \
 	WITHOUT_NLS is also given
 .endif
 .elif !defined(WITHOUT_MUTT_ICONV)
-USE_ICONV=	yes
+USES+=	iconv
 .endif
 
 .if defined(WITH_SLANG)
diff --git a/mail/normalizemime/Makefile b/mail/normalizemime/Makefile
index c78972b8ee77..03b8665fcfc7 100644
--- a/mail/normalizemime/Makefile
+++ b/mail/normalizemime/Makefile
@@ -18,7 +18,7 @@ COMMENT=	Mime normalizer to be used as a preprocessor for email classification
 
 LICENSE=	GPLv2
 
-USE_ICONV=	yes
+USES=		iconv
 NO_WRKSUBDIR=	yes
 
 CXXFLAGS+=	-I${LOCALBASE}/include
diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile
index 54016be11fb3..c64ac6b01d02 100644
--- a/mail/prayer/Makefile
+++ b/mail/prayer/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS=	c-client4:${PORTSDIR}/mail/cclient
 
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
-USE_ICONV=	yes
+USES=		iconv
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 MAKE_ENV+=	PORTCFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index 9acfc871f35c..659692267c7c 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -25,13 +25,12 @@ PLIST_SUB+=	ETCDIR=etc/rspamd \
 CMAKE_ARGS+=	-DETC_PREFIX=${PREFIX}/etc -DPREFIX=${PREFIX} \
 		-DBUILD_PORT=yes
 
-USES=		cmake gettext
+USES=		cmake gettext iconv
 USE_LDCONFIG=	yes
 
 USE_GNOME=	glib20
 USE_LUA=	5.1-
 USE_SQLITE=	yes
-USE_ICONV=	yes
 USE_OPENSSL=	yes
 
 MAN8=	rspamd.8
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index c782cda89189..b8db3948c8df 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -14,10 +14,9 @@ COMMENT=	Lightweight, featureful, and fast GTK+ based e-mail client
 LIB_DEPENDS=	aspell:${PORTSDIR}/textproc/aspell
 RUN_DEPENDS=	${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
 
-USES=		gettext
+USES=		gettext iconv
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
 USE_GNOME=	gtk20
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes