9 files changed, 9 insertions, 12 deletions

diff --git a/net-p2p/gnunet-gtk/Makefile b/net-p2p/gnunet-gtk/Makefile
index 25268ecf7022..bf9d65a78b19 100644
--- a/net-p2p/gnunet-gtk/Makefile
+++ b/net-p2p/gnunet-gtk/Makefile
@@ -23,8 +23,7 @@ LIB_DEPENDS=	gladeui-1:${PORTSDIR}/devel/glade3 \
 INSTALLS_ICONS =	yes
 USE_AUTOTOOLS=		libltdl libtool
 USE_GMAKE=		yes
-USE_GNOME=		gnomehack
-USE_ICONV=		yes
+USES=			pathfix iconv
 USE_LDCONFIG=		yes
 
 CONFIGURE_ARGS =	--with-extractor=${LOCALBASE} \
diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index f7ecebe16f53..d2169b06fbc8 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -33,7 +33,7 @@ OPTIONS_DEFAULT=	SQLITE
 
 USE_AUTOTOOLS=	libltdl libtool
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_LDCONFIG=	yes
 
 CONFIGURE_ARGS =	--with-daemon-home-dir=${GNUNET_DAEMON_DIR} \
diff --git a/net-p2p/libtorrent-rasterbar-16/Makefile b/net-p2p/libtorrent-rasterbar-16/Makefile
index 18ea4cec91d3..c468cbf5dd7c 100644
--- a/net-p2p/libtorrent-rasterbar-16/Makefile
+++ b/net-p2p/libtorrent-rasterbar-16/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS+=	boost_date_time:${PORTSDIR}/devel/boost-libs \
 		GeoIP:${PORTSDIR}/net/GeoIP
 
 GNU_CONFIGURE=	yes
-USES=	pathfix pkgconfig
-USE_ICONV=	yes
+USES=		pathfix pkgconfig iconv
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
 
diff --git a/net-p2p/linuxdcpp/Makefile b/net-p2p/linuxdcpp/Makefile
index e91a0cb2bbe3..e702e764a63c 100644
--- a/net-p2p/linuxdcpp/Makefile
+++ b/net-p2p/linuxdcpp/Makefile
@@ -15,7 +15,7 @@ BUILD_DEPENDS=	${LOCALBASE}/include/boost/version.hpp:${PORTSDIR}/devel/boost-li
 
 USE_BZIP2=	yes
 USE_GNOME=	libglade2
-USE_ICONV=	yes
+USES=		iconv
 USE_SCONS=	yes
 USE_OPENSSL=	yes
 PORTDOCS=	*
diff --git a/net-p2p/microdc2/Makefile b/net-p2p/microdc2/Makefile
index 21c6b6155fff..76b135010778 100644
--- a/net-p2p/microdc2/Makefile
+++ b/net-p2p/microdc2/Makefile
@@ -18,7 +18,7 @@ COMMENT=	A command-line based Direct Connect client
 CONFLICTS=	tthsum-[0-9]*
 
 GNU_CONFIGURE=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_GNOME=	libxml2
 
 .if !defined(WITHOUT_NLS)
diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile
index f11beaea6061..2fc8f5d9b2f7 100644
--- a/net-p2p/mldonkey/Makefile
+++ b/net-p2p/mldonkey/Makefile
@@ -18,7 +18,7 @@ NO_LATEST_LINK=	yes
 CONFLICTS=	mldonkey{-{core,gui},}-devel-[0-9]*
 
 USE_BZIP2=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_AUTOTOOLS=	autoconf:env
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/net-p2p/mooseekd/Makefile b/net-p2p/mooseekd/Makefile
index 4778161a1cb4..a5c5b601abb2 100644
--- a/net-p2p/mooseekd/Makefile
+++ b/net-p2p/mooseekd/Makefile
@@ -23,6 +23,6 @@ GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 CXXFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 USE_FAM=	yes
-USE_ICONV=	yes
+USES=		iconv
 
 .include <bsd.port.mk>
diff --git a/net-p2p/retroshare/Makefile b/net-p2p/retroshare/Makefile
index e544af316e19..da3828fcf542 100644
--- a/net-p2p/retroshare/Makefile
+++ b/net-p2p/retroshare/Makefile
@@ -30,8 +30,7 @@ LIB_DEPENDS=	dbus-1:${PORTSDIR}/devel/dbus \
 RUN_DEPENDS+=	pinentry-qt4:${PORTSDIR}/security/pinentry-qt4
 
 WRKSRC=		${WRKDIR}/trunk
-USE_ICONV=	yes
-USES=		gettext
+USES=		gettext iconv
 USE_GNOME=	glib20
 USE_XORG=	ice sm x11 xau xdmcp xext xrender
 USE_QT4=	corelib gui network xml script designer_build uic_build \
diff --git a/net-p2p/transmission-remote-gui/Makefile b/net-p2p/transmission-remote-gui/Makefile
index cb90a50b14e4..9341868338ed 100644
--- a/net-p2p/transmission-remote-gui/Makefile
+++ b/net-p2p/transmission-remote-gui/Makefile
@@ -19,7 +19,7 @@ PROJECTHOST=	transmisson-remote-gui
 
 USE_ZIP=	yes
 USE_FPC=	fcl-net
-USE_ICONV=	yes
+USES=		iconv
 USE_GNOME=	#
 
 WRKSRC=		${WRKDIR}/TransGUI