15 files changed, 16 insertions, 20 deletions

diff --git a/net-im/centericq/Makefile b/net-im/centericq/Makefile
index 6f2846aea909..9a19def1f7cd 100644
--- a/net-im/centericq/Makefile
+++ b/net-im/centericq/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	A text mode menu- and window-driven IM interface
 
 USE_BZIP2=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/net-im/centerim-devel/Makefile b/net-im/centerim-devel/Makefile
index 91e0981bd6a3..888513ec7cee 100644
--- a/net-im/centerim-devel/Makefile
+++ b/net-im/centerim-devel/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
 
 USE_PERL5_RUN=	yes
 USE_PYTHON_RUN=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/net-im/centerim/Makefile b/net-im/centerim/Makefile
index 6caf24c0f70f..15a88be10107 100644
--- a/net-im/centerim/Makefile
+++ b/net-im/centerim/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A text mode menu- and window-driven IM interface
 
 LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
 
-USE_ICONV=	yes
+USES=		iconv
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/net-im/climm/Makefile b/net-im/climm/Makefile
index 5096af157d40..4a93d000c6f4 100644
--- a/net-im/climm/Makefile
+++ b/net-im/climm/Makefile
@@ -39,7 +39,7 @@ CONFIGURE_ARGS+=	--disable-otr
 .endif
 
 .if ${PORT_OPTIONS:MICONV}
-USE_ICONV=		yes
+USES+=			iconv
 .else
 CONFIGURE_ARGS+=	--disable-iconv
 .endif
diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile
index d2f0a9f80d9f..da533494d937 100644
--- a/net-im/ejabberd/Makefile
+++ b/net-im/ejabberd/Makefile
@@ -26,7 +26,7 @@ GROUPS=		${USERS}
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_RC_SUBR=	${PORTNAME}
 NOPRECIOUSMAKEVARS=	yes
 
diff --git a/net-im/gale/Makefile b/net-im/gale/Makefile
index 18b671d01578..bb8c25e6879d 100644
--- a/net-im/gale/Makefile
+++ b/net-im/gale/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	gc.1:${PORTSDIR}/devel/boehm-gc \
 		wwwcore.1:${PORTSDIR}/www/libwww \
 		adns.1:${PORTSDIR}/dns/adns
 
-USE_ICONV=	yes
+USES=		iconv
 USE_GNOME=	glib12
 USE_AUTOTOOLS=	libtool
 LIBTOOLFILES=	configure liboop/configure
diff --git a/net-im/imspector/Makefile b/net-im/imspector/Makefile
index 08418b0fa4a3..b38fc17dff81 100644
--- a/net-im/imspector/Makefile
+++ b/net-im/imspector/Makefile
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 
 CFLAGS+=	-fPIC -I ${LOCALBASE}/include -DHAVE_SSL
 USE_GMAKE=	YES
-USE_ICONV=	YES
+USES=		iconv
 USE_OPENSSL=	YES
 USE_LDCONFIG=	${LOCALBASE}/lib/imspector
 
diff --git a/net-im/jabber/Makefile b/net-im/jabber/Makefile
index 84dc48bc4a91..446a2143d33d 100644
--- a/net-im/jabber/Makefile
+++ b/net-im/jabber/Makefile
@@ -31,9 +31,8 @@ LIB_DEPENDS=	pth:${PORTSDIR}/devel/pth-hard \
 OPTIONS_DEFINE= IPV6 MYSQL PGSQL
 
 USE_RC_SUBR=	jabber
-USE_ICONV=	yes
 USE_GMAKE=	yes
-USES=		gettext
+USES=		gettext iconv
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	${PREFIX}/lib/jabber
 MAKE_JOBS_UNSAFE=	yes
diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile
index 7641a84a5c6f..ff142ac49736 100644
--- a/net-im/jabberd/Makefile
+++ b/net-im/jabberd/Makefile
@@ -30,7 +30,7 @@ GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 USE_PERL5_RUN=	yes
 USE_OPENSSL=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_RC_SUBR=	jabberd
 USE_LDCONFIG=	${PREFIX}/lib/jabberd
 CONFIGURE_ARGS+=	--localstatedir=/var \
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index e2e59d4e69ca..f100fc176c0a 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -33,8 +33,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 .if !defined(PIDGIN_SLAVE)
 # Pidgin slave ports that require the following functionality, must explicitly
 # set these macros themselves.
-USES=		gettext
-USE_ICONV=	yes
+USES=		gettext iconv
 USE_LDCONFIG=	yes
 WANT_GNOME=	yes
 USE_PYTHON=	yes
diff --git a/net-im/licq/Makefile b/net-im/licq/Makefile
index cd59f6d02e1f..97275dfe7d86 100644
--- a/net-im/licq/Makefile
+++ b/net-im/licq/Makefile
@@ -14,8 +14,7 @@ LIB_DEPENDS=	boost_regex:${PORTSDIR}/devel/boost-libs
 
 LICENSE=	GPLv2
 
-USE_ICONV=	yes
-USES=		cmake
+USES=		cmake iconv
 WRKSRC=		${WRKDIR}/${DISTNAME}
 LICQ_PORT?=	net-im/licq
 
diff --git a/net-im/mcabber/Makefile b/net-im/mcabber/Makefile
index bdd6f265e4ab..7adaa4574907 100644
--- a/net-im/mcabber/Makefile
+++ b/net-im/mcabber/Makefile
@@ -19,8 +19,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-sigwinch --libdir=${PREFIX}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-USES=		pkgconfig gettext
-USE_ICONV=	yes
+USES=		pkgconfig gettext iconv
 USE_LDCONFIG=	yes
 USE_NCURSES=	yes
 USE_GNOME=	glib20
diff --git a/net-im/pidgin-pidgimpd/Makefile b/net-im/pidgin-pidgimpd/Makefile
index 52f306e5faa9..2477df25c3d4 100644
--- a/net-im/pidgin-pidgimpd/Makefile
+++ b/net-im/pidgin-pidgimpd/Makefile
@@ -21,8 +21,8 @@ BUILD_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
 RUN_DEPENDS=	pidgin:${PORTSDIR}/net-im/pidgin
 
 USE_BZIP2=	yes
-USE_GNOME=	pkgconfig gtk20
-USE_ICONV=	yes
+USE_GNOME=	gtk20
+USES=		pkgconfig iconv
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	lib/pidgin/pidgimpd.so \
diff --git a/net-im/ysm/Makefile b/net-im/ysm/Makefile
index dd2d52b3fabb..0b9f1075efe5 100644
--- a/net-im/ysm/Makefile
+++ b/net-im/ysm/Makefile
@@ -19,7 +19,7 @@ COMMENT=	Command line ICQ client with ICQ2000 and recoding support
 USE_CSTD=	c89
 .endif
 
-USE_ICONV=	yes
+USES=		iconv
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/net-im/zephyr/Makefile b/net-im/zephyr/Makefile
index e0aa06e409d0..b34e6f8f9f7a 100644
--- a/net-im/zephyr/Makefile
+++ b/net-im/zephyr/Makefile
@@ -16,7 +16,7 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 USE_RC_SUBR=	zhm
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_ICONV=	yes
+USES=		iconv
 
 MAN1=	zephyr.1 zaway.1 zctl.1 zleave.1 zlocate.1 znol.1 zwrite.1 zwgc.1
 MAN8=	zhm.8 zephyrd.8 zstat.8 zshutdown_notify.8