- Convert USE_ICONV=yes to USES=iconv

- Change USE_GNOME=pkgconfig|gnomehack to USES=pathfix|pkgconfig while here

Reviewed by:	bapt, kwm

11 files changed, 11 insertions, 18 deletions

diff --git a/deskutils/adesklets/Makefile b/deskutils/adesklets/Makefile
index 245a1e92fd53..c9b38319a77f 100644
--- a/deskutils/adesklets/Makefile
+++ b/deskutils/adesklets/Makefile
@@ -21,7 +21,7 @@ USE_PYTHON=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_EFL=	imlib2
-USE_ICONV=	yes
+USES=		iconv
 WANT_PERL=	yes
 
 MAN1=		adesklets.1 \
diff --git a/deskutils/glipper/Makefile b/deskutils/glipper/Makefile
index 63aaaf1d0659..2efb106181b9 100644
--- a/deskutils/glipper/Makefile
+++ b/deskutils/glipper/Makefile
@@ -11,9 +11,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Clipboard manager for the GNOME panel
 
 USE_BZIP2=	yes
-USE_ICONV=	yes
 USE_GMAKE=	yes
-USES=        pathfix gettext
+USES=		pathfix gettext iconv
 USE_GNOME=	gnomeprefix intltool pygnomedesktop pygnomeextras
 USE_PYTHON=	2.5+
 INSTALLS_ICONS=	yes
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index 754c30bbd6f3..cb8bbc63e04f 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -25,10 +25,9 @@ CONFLICTS_INSTALL=	kdepim-4.4.*
 
 USE_XZ=		yes
 USE_GNOME=	libxml2
-USE_ICONV=	yes
 USE_KDE4=	kdehier kdelibs kdeprefix pimlibs \
 		akonadi automoc4 ontologies soprano strigi nepomuk-widgets
-USES=		cmake:outsource
+USES=		cmake:outsource iconv
 USE_OPENLDAP=	yes
 USE_QT4=	corelib dbus declarative designer_build gui network opengl \
 		script sql webkit \
diff --git a/deskutils/libopensync-plugin-vformat-devel/Makefile b/deskutils/libopensync-plugin-vformat-devel/Makefile
index 61f26febcb87..12fbf20c6922 100644
--- a/deskutils/libopensync-plugin-vformat-devel/Makefile
+++ b/deskutils/libopensync-plugin-vformat-devel/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS=	opensync.1:${PORTSDIR}/devel/libopensync
 BROKEN=		fails to build
 
 USE_BZIP2=	yes
-USE_ICONV=	yes
-USES=		cmake
+USES=		cmake iconv
 CMAKE_ARGS+=	-Wno-dev
 CFLAGS+=	"-I${LOCALBASE}/include"
 
diff --git a/deskutils/libstreamanalyzer/Makefile b/deskutils/libstreamanalyzer/Makefile
index 83fa63b630a8..0b2d4db44e3d 100644
--- a/deskutils/libstreamanalyzer/Makefile
+++ b/deskutils/libstreamanalyzer/Makefile
@@ -13,8 +13,7 @@ LIB_DEPENDS=	avcodec${FFMPEG_SUFFIX}:${PORTSDIR}/multimedia/ffmpeg${FFMPEG_SUFFI
 		exiv2:${PORTSDIR}/graphics/exiv2 \
 		streams:${PORTSDIR}/deskutils/libstreams
 
-USES=		pkgconfig
-USE_ICONV=	yes
+USES=		pkgconfig iconv
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/deskutils/libstreams/Makefile b/deskutils/libstreams/Makefile
index 1d5178558067..fa4fbaeead6b 100644
--- a/deskutils/libstreams/Makefile
+++ b/deskutils/libstreams/Makefile
@@ -8,7 +8,7 @@ MASTER_SITES=	${STRIGI_MASTER_SITES}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Strigi desktop search: streams library
 
-USE_ICONV=	yes
+USES=		iconv
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
 
diff --git a/deskutils/ljclive/Makefile b/deskutils/ljclive/Makefile
index 05c7b5f9673d..b19d54d85f9b 100644
--- a/deskutils/ljclive/Makefile
+++ b/deskutils/ljclive/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	SF/lj${PORTNAME}/lj${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	A command line client for posting LiveJournal entries
 
-USE_ICONV=	yes
+USES=	iconv
 
 MAN1=	clive.1
 
diff --git a/deskutils/nagaina/Makefile b/deskutils/nagaina/Makefile
index 80d9128445d4..27dfaf249d7a 100644
--- a/deskutils/nagaina/Makefile
+++ b/deskutils/nagaina/Makefile
@@ -25,8 +25,7 @@ OPTIONS_DEFINE=	DOCS
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USES=		gettext
-USE_ICONV=	yes
+USES=		gettext iconv
 USE_GNOME=	glib20
 USE_QT4=	corelib gui xml moc_build qmake_build rcc_build uic_build
 USE_XORG=	ice sm x11 xau xdmcp xext xrender
diff --git a/deskutils/recoll/Makefile b/deskutils/recoll/Makefile
index 8280fb181f14..1be5599127f4 100644
--- a/deskutils/recoll/Makefile
+++ b/deskutils/recoll/Makefile
@@ -18,7 +18,7 @@ LICENSE=	GPLv2
 
 LIB_DEPENDS=	xapian:${PORTSDIR}/databases/xapian-core
 
-USE_ICONV=	yes
+USES=		iconv
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/deskutils/tpb/Makefile b/deskutils/tpb/Makefile
index 3bba3f71bfa0..5f3e0e0cea8a 100644
--- a/deskutils/tpb/Makefile
+++ b/deskutils/tpb/Makefile
@@ -17,8 +17,7 @@ ONLY_FOR_ARCHS=	i386 amd64
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-USE_ICONV=	yes
-USES=		bison
+USES=		bison iconv
 
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE}
 
diff --git a/deskutils/xneur/Makefile b/deskutils/xneur/Makefile
index 81be59b30af3..89690a86934e 100644
--- a/deskutils/xneur/Makefile
+++ b/deskutils/xneur/Makefile
@@ -15,9 +15,8 @@ LIB_DEPENDS=	notify.4:${PORTSDIR}/devel/libnotify \
 		pcre.3:${PORTSDIR}/devel/pcre
 
 USE_BZIP2=	yes
-USES=		pkgconfig pathfix
+USES=		pkgconfig pathfix iconv
 GNU_CONFIGURE=	yes
-USE_ICONV=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
 CONFIGURE_ARGS=	--disable-static --libdir=${PREFIX}/lib/xneur