- Convert USE_ICONV=yes to USES=iconv

- Change USE_GNOME=pkgconfig|gnomehack to USES=pathfix|pkgconfig and
  USE_GETTEXT=yes to USES=gettext while here

11 files changed, 11 insertions, 16 deletions

diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile
index 9310810e40b8..cdf0fcc31688 100644
--- a/x11/eterm/Makefile
+++ b/x11/eterm/Makefile
@@ -27,7 +27,7 @@ LDFLAGS+=	-L${LOCALBASE}/lib
 OPTIONS_DEFINE=	MMX
 
 USE_XORG=	x11 xt
-USE_ICONV=	yes
+USES=		iconv
 USE_EFL=	imlib2
 
 MAN1=		Eterm.1
diff --git a/x11/florence/Makefile b/x11/florence/Makefile
index 08762e3b7ba9..24270afe036e 100644
--- a/x11/florence/Makefile
+++ b/x11/florence/Makefile
@@ -21,9 +21,8 @@ USE_XORG=	xtst
 USE_GNOME=	gtk20 intlhack gnomedocutils gconf2 librsvg2 gnomepanel
 
 USE_BZIP2=	yes
-USES=		gettext
+USES=		gettext iconv
 USE_GMAKE=	yes
-USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 INSTALLS_OMF=	yes
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index a1fced9290ee..8cb9312c9a23 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gtk12
-USE_ICONV=	yes
+USES=		iconv
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib -lgnuregex -liconv
 CFLAGS+=	`pkg-config xft --cflags`
diff --git a/x11/ggiterm/Makefile b/x11/ggiterm/Makefile
index a58d3070ee7e..2904726adb2d 100644
--- a/x11/ggiterm/Makefile
+++ b/x11/ggiterm/Makefile
@@ -37,7 +37,7 @@ BROKEN=		fails to build with new utmpx
 
 .if ${PORT_OPTIONS:MFREETYPE}
 LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
-USE_ICONV=	yes
+USES+=		iconv
 CONFIGURE_ARGS+=--with-ft-prefix=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=--without-freetype
diff --git a/x11/i3lock/Makefile b/x11/i3lock/Makefile
index 254cfd010de3..9809144d0c67 100644
--- a/x11/i3lock/Makefile
+++ b/x11/i3lock/Makefile
@@ -35,6 +35,6 @@ MAKE_JOBS_SAFE=	yes
 USE_XORG=	x11 xt xproto xext
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 
 .include <bsd.port.mk>
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 3d787908ebc2..30b772221786 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -44,10 +44,9 @@ CONFLICTS=	kdeaccessibility-4.[0-6].* kdebase-workspace-4.[0-6].*
 
 USE_GL=		glu
 USE_GNOME=	glib20
-USE_ICONV=	yes
 USE_KDE4=	kactivities kdehier kdelibs kdeprefix oxygen pimlibs \
 		akonadi automoc4 ontologies qimageblitz soprano strigi
-USES=		cmake:outsource pkgconfig gettext
+USES=		cmake:outsource pkgconfig gettext iconv
 USE_QT4=	corelib dbus declarative designer_build gui network \
 		opengl phonon qtestlib script sql webkit xml \
 		moc_build qmake_build rcc_build uic_build
diff --git a/x11/trayer/Makefile b/x11/trayer/Makefile
index 047f8b3576d6..57b35bbe8396 100644
--- a/x11/trayer/Makefile
+++ b/x11/trayer/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Lightweight GTK2-based systray for UNIX desktop
 GITVERSION=	0-g5353f80
 FETCH_ARGS=	-pRr
 USE_GNOME=	gtk20 glib20 pango atk
-USE_ICONV=	yes
+USES=		iconv
 USE_XORG=	xmu
 USE_GMAKE=	yes
 MAKE_ARGS=	"PREFIX=${PREFIX}"
diff --git a/x11/x3270/Makefile b/x11/x3270/Makefile
index 7c6eaec720e5..221fdbf4206c 100644
--- a/x11/x3270/Makefile
+++ b/x11/x3270/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
 		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
 
 USE_IMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_XORG=	ice sm x11 xaw xext xmu xt
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-fontdir=${PREFIX}/lib/X11/fonts/local --disable-dbcs
diff --git a/x11/xfree86_xkb_xml/Makefile b/x11/xfree86_xkb_xml/Makefile
index af92391cab41..d42fc8504841 100644
--- a/x11/xfree86_xkb_xml/Makefile
+++ b/x11/xfree86_xkb_xml/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES=	SF/gswitchit/OldFiles
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A little set of XML files useful for dealing with XKB rules
 
-USE_ICONV=	yes
-USES=		gettext
+USES=		gettext iconv
 USE_XORG=	x11
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/x11/xkeyboard-config/Makefile b/x11/xkeyboard-config/Makefile
index 16e08cc52dea..c92b694835ac 100644
--- a/x11/xkeyboard-config/Makefile
+++ b/x11/xkeyboard-config/Makefile
@@ -30,8 +30,7 @@ MAN7=		xkeyboard-config.7
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNLS}
-USE_ICONV=	yes
-USES+=		gettext
+USES+=		gettext iconv
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
diff --git a/x11/xnee/Makefile b/x11/xnee/Makefile
index 63c3c6ba1d13..f1a00360a3d8 100644
--- a/x11/xnee/Makefile
+++ b/x11/xnee/Makefile
@@ -41,8 +41,7 @@ LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
 
 CONFIGURE_ARGS+=--enable-gui
-USES+=		gettext
-USE_ICONV=	yes
+USES+=		gettext iconv
 USE_XORG+=	pixman xcomposite xcursor xdamage xfixes xinerama xrandr xrender
 USE_GNOME+=	gdkpixbuf2 gtk20 libgnomeui
 MAN1+=		gnee.1