- 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

12 files changed, 12 insertions, 18 deletions

diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile
index f4fb56f4cae..5513b338dc2 100644
--- a/x11-wm/afterstep-stable/Makefile
+++ b/x11-wm/afterstep-stable/Makefile
@@ -29,7 +29,7 @@ RUN_DEPENDS=	xli:${PORTSDIR}/graphics/xli
 
 USE_BZIP2=	yes
 USE_GNOME=	glib20 gtk20 pango
-USE_ICONV=	yes
+USES=		iconv
 USE_XORG+=	ice sm x11 xcursor xext xfixes xi xinerama xrandr xrender
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
diff --git a/x11-wm/awesome/Makefile b/x11-wm/awesome/Makefile
index deac1745d12..2ff88241712 100644
--- a/x11-wm/awesome/Makefile
+++ b/x11-wm/awesome/Makefile
@@ -35,8 +35,7 @@ LIB_DEPENDS=	cairo:${PORTSDIR}/graphics/cairo \
 		execinfo:${PORTSDIR}/devel/libexecinfo
 
 USE_XZ=		yes
-USE_ICONV=	yes
-USES=		cmake
+USES=		cmake iconv
 CMAKE_ARGS+=	-DSYSCONFDIR=${PREFIX}/etc
 USE_EFL=	imlib2
 USE_GNOME=	glib20 pango
diff --git a/x11-wm/awesome2/Makefile b/x11-wm/awesome2/Makefile
index afedc37c4b6..a7eb6bd7a84 100644
--- a/x11-wm/awesome2/Makefile
+++ b/x11-wm/awesome2/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	confuse.0:${PORTSDIR}/devel/libconfuse \
 		cairo.2:${PORTSDIR}/graphics/cairo \
 		freetype.9:${PORTSDIR}/print/freetype2
 
-USE_ICONV=	yes
+USES=		iconv
 GNU_CONFIGURE=	yes
 USE_EFL=	imlib2
 USE_GNOME=	pango
diff --git a/x11-wm/blackbox/Makefile b/x11-wm/blackbox/Makefile
index 9615f883a2b..de7247c69f9 100644
--- a/x11-wm/blackbox/Makefile
+++ b/x11-wm/blackbox/Makefile
@@ -17,8 +17,7 @@ COMMENT=	A small and fast window manager for X11R6
 LICENSE=	MIT
 
 GNU_CONFIGURE=	yes
-USE_ICONV=	yes
-USE_GNOME=	gnomehack pkgconfig
+USES=		pathfix pkgconfig iconv
 USE_XORG=	x11 xft
 
 MAN1=		bsetbg.1 bsetroot.1
diff --git a/x11-wm/e16/Makefile b/x11-wm/e16/Makefile
index 3b33682e104..09fee574166 100644
--- a/x11-wm/e16/Makefile
+++ b/x11-wm/e16/Makefile
@@ -14,8 +14,7 @@ SOUND_DESC=	Sound support via pulseaudio/libsndfile
 
 USE_XORG=	compositeproto damageproto xextproto x11 xbitmaps xcomposite xdamage \
 		xext xfixes xft xinerama xrandr xrender xxf86vm
-USE_ICONV=	yes
-USES=		gettext
+USES=		gettext iconv
 USE_GMAKE=	yes
 USE_EFL=	imlib2
 USE_AUTOTOOLS=	libtool
diff --git a/x11-wm/enlightenment/Makefile b/x11-wm/enlightenment/Makefile
index 571e13d5910..93ca1b28a20 100644
--- a/x11-wm/enlightenment/Makefile
+++ b/x11-wm/enlightenment/Makefile
@@ -19,14 +19,13 @@ LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo \
 DIST_SUBDIR=	e17
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USES=		pathfix
+USES=		pathfix iconv
 USE_GMAKE=	yes
 USE_EFL=	eina eet evas ecore eio edbus efreet edje \
 		libtool_hack librt_hack modarch_hack
 USE_EFL_EVAS_LOADERS=	eet jpeg png
 USE_EFL_EVAS_ENGINES=	buffer
 USE_EFL_ECORE=	ipc
-USE_ICONV=	yes
 USE_LDCONFIG=	yes
 SUB_FILES=	pkg-message
 
diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile
index e5ac8152798..d3350ecb2e7 100644
--- a/x11-wm/fluxbox/Makefile
+++ b/x11-wm/fluxbox/Makefile
@@ -74,7 +74,7 @@ CONFIGURE_ARGS+=	--enable-xinerama
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USE_ICONV=		yes
+USES+=			iconv
 CONFIGURE_ENV=		LIBS="-L${LOCALBASE}/lib -liconv"
 CPPFLAGS+=		-I${LOCALBASE}/include
 CONFIGURE_ARGS+=	--enable-nls
diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile
index c4d4147629a..aedd6206e3a 100644
--- a/x11-wm/fvwm2/Makefile
+++ b/x11-wm/fvwm2/Makefile
@@ -47,7 +47,7 @@ DISTFILES+=	${FVWM_ICONS}.tar.bz2
 .if ! ${PORT_OPTIONS:MICONV}
 CONFIGURE_ARGS+=	--disable-iconv
 .else
-USE_ICONV=		yes
+USES+=			iconv
 CONFIGURE_ARGS+=	--with-iconv-library=${LOCALBASE}/lib \
 			--with-iconv-includes=${LOCALBASE}/include
 .endif
diff --git a/x11-wm/i3/Makefile b/x11-wm/i3/Makefile
index 0fc29db8559..d5a42547bbb 100644
--- a/x11-wm/i3/Makefile
+++ b/x11-wm/i3/Makefile
@@ -31,10 +31,9 @@ RUN_DEPENDS=	p5-IPC-Run>=0:${PORTSDIR}/devel/p5-IPC-Run \
 
 USE_PERL5_RUN=	yes
 USE_XORG=	x11 xcursor
-USES=		bison pkgconfig
+USES=		bison pkgconfig iconv
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 PLIST_FILES=	bin/i3 \
diff --git a/x11-wm/lxsession/Makefile b/x11-wm/lxsession/Makefile
index f3db0dc54ca..40a2e5b9fee 100644
--- a/x11-wm/lxsession/Makefile
+++ b/x11-wm/lxsession/Makefile
@@ -22,7 +22,7 @@ CONFLICTS=	lxsession-lite-[0-9]*
 USE_GNOME=	gtk20 intlhack
 
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/x11-wm/pekwm/Makefile b/x11-wm/pekwm/Makefile
index 65599d460dc..c3c92c26c42 100644
--- a/x11-wm/pekwm/Makefile
+++ b/x11-wm/pekwm/Makefile
@@ -13,10 +13,9 @@ COMMENT=	Light, Unobtrusive, and configurable windowmanager
 LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 		png15:${PORTSDIR}/graphics/png
 
-USES=		pkgconfig
+USES=		pkgconfig iconv
 USE_XORG=	xft xpm x11
 USE_GMAKE=	yes
-USE_ICONV=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-shape --enable-xinerama --enable-xrandr \
diff --git a/x11-wm/wmii/Makefile b/x11-wm/wmii/Makefile
index 432fc91ed5b..7ce2875d1fb 100644
--- a/x11-wm/wmii/Makefile
+++ b/x11-wm/wmii/Makefile
@@ -31,7 +31,7 @@ SLIM_LAYOUT_BOX_DESC=	Build with slim layout boxes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MUTF8}
-USE_ICONV=	yes
+USES+=		iconv
 MAKE_ARGS+=	LIBICONV="-liconv"
 .else
 MAKE_ARGS+=	-DNO_UTF8