12 files changed, 12 insertions, 23 deletions

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