- Convert USE_ICONV=yes to USES=iconv

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

Reviewed by:	bapt, kwm

22 files changed, 24 insertions, 30 deletions

diff --git a/games/briquolo/Makefile b/games/briquolo/Makefile
index 013d07cebebe..4115e2617ff5 100644
--- a/games/briquolo/Makefile
+++ b/games/briquolo/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 LICENSE=	GPLv2
 
 USE_BZIP2=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_GL=		gl
 USE_SDL=	mixer sdl ttf
 USE_GMAKE=	yes
diff --git a/games/capitalism/Makefile b/games/capitalism/Makefile
index ac20b91f86d9..e770ea454552 100644
--- a/games/capitalism/Makefile
+++ b/games/capitalism/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 		xcb:${PORTSDIR}/x11/libxcb
 
-USES=		gettext
-USE_ICONV=	yes
+USES=		gettext iconv
 USE_XORG=	ice sm x11 xau xdmcp xext xrender
 USE_QT4=	moc_build qmake_build rcc_build uic_build iconengines imageformats \
 		corelib gui network script xml
diff --git a/games/cosmosmash/Makefile b/games/cosmosmash/Makefile
index 192db2f353da..94e625d778a2 100644
--- a/games/cosmosmash/Makefile
+++ b/games/cosmosmash/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	flatzebra:${PORTSDIR}/devel/flatzebra \
 
 USE_SDL=	sdl image mixer
 USE_XORG=	x11 xau xdmcp
-USE_ICONV=	yes
+USES=		iconv
 USE_GNOME=	desktopfileutils
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include `${SDL_CONFIG} --cflags`
diff --git a/games/cuyo/Makefile b/games/cuyo/Makefile
index 2577d45f68ae..072017e50645 100644
--- a/games/cuyo/Makefile
+++ b/games/cuyo/Makefile
@@ -21,7 +21,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_SDL=	mixer image
 USE_XORG=	xdmcp xau x11
-USE_ICONV=	yes
+USES=		iconv
 INSTALLS_ICONS=	yes
 
 MAN6=		cuyo.6 cual.6
diff --git a/games/freedroid/Makefile b/games/freedroid/Makefile
index 1f7fb2775782..bcb843238b17 100644
--- a/games/freedroid/Makefile
+++ b/games/freedroid/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Clone of the Commodore game Paradroid
 LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 		png15:${PORTSDIR}/graphics/png
 
-USE_ICONV=	yes
+USES=		iconv
 USE_SDL=	mixer image sdl
 
 GNU_CONFIGURE=	yes
diff --git a/games/gnmm/Makefile b/games/gnmm/Makefile
index 911be93c4ca1..9e3bef8eba1b 100644
--- a/games/gnmm/Makefile
+++ b/games/gnmm/Makefile
@@ -11,9 +11,8 @@ DIST_SUBDIR=	gnome
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A "nine mens' morris" implementation for the GNOME Desktop Environment
 
-USE_ICONV=	yes
 USE_GMAKE=	yes
-USES=        pathfix gettext
+USES=		pathfix gettext iconv
 USE_GNOME=	gnomeprefix gnomelibs gdkpixbuf
 
 GNU_CONFIGURE=	yes
diff --git a/games/heroes/Makefile b/games/heroes/Makefile
index 705965bfaa81..66ceb53ca492 100644
--- a/games/heroes/Makefile
+++ b/games/heroes/Makefile
@@ -36,8 +36,7 @@ MUSICSRC=	${WRKDIR}/${MUSICDISTNAME}
 
 USE_SDL=	mixer sdl
 USE_GMAKE=	yes
-USE_ICONV=	yes
-USES=		gettext
+USES=		gettext iconv
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 CONFIGURE_ARGS=	--with-sdl_mixer=${LOCALBASE} --without-gii --without-ggi
diff --git a/games/instead/Makefile b/games/instead/Makefile
index 37f32938dcc8..08ab214f97e1 100644
--- a/games/instead/Makefile
+++ b/games/instead/Makefile
@@ -13,10 +13,10 @@ COMMENT=	Simple Text Adventure, The Interpreter
 
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig gtk20
+USE_GNOME=	gtk20
 USE_LUA=	5.1
 USE_SDL=	sdl image ttf mixer
-USE_ICONV=	yes
+USES=		pkgconfig iconv
 
 CONFIGURE_SCRIPT=	configure.sh
 CONFIGURE_ENV=	PREFIX="${PREFIX}"
diff --git a/games/kajaani-kombat/Makefile b/games/kajaani-kombat/Makefile
index c3d7a4173f80..8b9a8b2d28e2 100644
--- a/games/kajaani-kombat/Makefile
+++ b/games/kajaani-kombat/Makefile
@@ -17,7 +17,7 @@ LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2
 USE_SDL=	sdl image mixer net ttf
 USE_GMAKE=	yes
 ALL_TARGET=	client server
-USE_ICONV=	yes
+USES=		iconv
 MAKE_JOBS_SAFE=	yes
 
 PORTDOCS=	AUTHORS ChangeLog README
diff --git a/games/klavaro/Makefile b/games/klavaro/Makefile
index 7ea93b2e5337..9fedf73ce24a 100644
--- a/games/klavaro/Makefile
+++ b/games/klavaro/Makefile
@@ -22,10 +22,9 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 		gtkdatabox:${PORTSDIR}/x11-toolkits/gtkdatabox \
 		xcb:${PORTSDIR}/x11/libxcb
 
-USES=		pkgconfig gettext
+USES=		pkgconfig gettext iconv
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
 USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext \
 		xfixes xi xinerama xrandr xrender
 USE_GNOME=	gtk20
diff --git a/games/ldmud/Makefile b/games/ldmud/Makefile
index 5024ebd444c3..2e56ce6d9488 100644
--- a/games/ldmud/Makefile
+++ b/games/ldmud/Makefile
@@ -20,7 +20,7 @@ LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
 
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
-USE_ICONV=	yes
+USES=		iconv
 CONFIGURE_ARGS+=--libdir=${DATADIR} \
 		--bindir=${PREFIX}/sbin \
 		--enable-use-pcre \
diff --git a/games/netwalk/Makefile b/games/netwalk/Makefile
index 381739d4f422..cd901fb965ee 100644
--- a/games/netwalk/Makefile
+++ b/games/netwalk/Makefile
@@ -24,7 +24,7 @@ GH_COMMIT=	634e7c9
 
 USE_SDL=	sdl ttf
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_XORG=	x11 xau xdmcp
 ALL_TARGET=
 MAKE_JOBS_SAFE=	yes
diff --git a/games/openalchemist/Makefile b/games/openalchemist/Makefile
index 08c5519bccf2..3e1b22550b40 100644
--- a/games/openalchemist/Makefile
+++ b/games/openalchemist/Makefile
@@ -28,11 +28,11 @@ ACLOCAL_ARGS+=	-I ${LOCALBASE}/share/aclocal
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 GNU_CONFIGURE=	yes
-USE_GNOME=	pkgconfig pygtk2
+USE_GNOME=	pygtk2
 USE_XORG=	xxf86vm xi x11 xmu xext xdamage xfixes xau xdmcp xt sm ice
 USE_GL=		gl glu
 USE_SDL=	sdl gfx
-USE_ICONV=	yes
+USES=		pkgconfig iconv
 
 PORTDOCS=	AUTHORS ChangeLog README TODO
 
diff --git a/games/pingus/Makefile b/games/pingus/Makefile
index 1f4ae7aaecf5..2db97391d38f 100644
--- a/games/pingus/Makefile
+++ b/games/pingus/Makefile
@@ -15,7 +15,7 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 		physfs.1:${PORTSDIR}/devel/physfs
 
 USE_BZIP2=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_SCONS=	yes
 SCONS_ARGS=	with_linuxusbmouse=0 \
 		with_linuxevdev=0
diff --git a/games/pokerth/Makefile b/games/pokerth/Makefile
index ef8c7075e122..a07d23872c1c 100644
--- a/games/pokerth/Makefile
+++ b/games/pokerth/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	boost_thread:${PORTSDIR}/devel/boost-libs \
 		protobuf:${PORTSDIR}/devel/protobuf
 BUILD_DEPENDS=	${LOCALBASE}/include/libircclient.h:${PORTSDIR}/irc/libircclient
 
-USE_ICONV=	yes
+USES=		iconv
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile
index 4bb4e9bec1e0..2b1ef88918a1 100644
--- a/games/rocksndiamonds/Makefile
+++ b/games/rocksndiamonds/Makefile
@@ -34,7 +34,7 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	smpeg:${PORTSDIR}/multimedia/smpeg
 EXTRACT_DEPENDS=${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
 
-USE_ICONV=	yes
+USES=		iconv
 USE_SDL=	image mixer net sdl
 USE_GMAKE=	yes
 MAKE_ARGS=	CC="${CC}" MAKE="${GMAKE}" OPTIONS="${CFLAGS}" \
diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile
index a60d03313477..00915fc5479f 100644
--- a/games/scorched3d/Makefile
+++ b/games/scorched3d/Makefile
@@ -35,7 +35,7 @@ USE_SDL=	mixer net sdl
 USE_WX=		2.4+
 WX_CONF_ARGS=	absolute
 USE_PERL5=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	aclocal automake autoconf
 ACLOCAL_ARGS=	-I ${LOCALBASE}/share/aclocal
diff --git a/games/spellathon/Makefile b/games/spellathon/Makefile
index c6aa8fdedd83..3b8c885cbf61 100644
--- a/games/spellathon/Makefile
+++ b/games/spellathon/Makefile
@@ -21,8 +21,7 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 		xcb:${PORTSDIR}/x11/libxcb
 
 CXXFLAGS+=	-fPIC
-USES=		gettext
-USE_ICONV=	yes
+USES=		gettext iconv
 USE_GNOME=	glib20
 USE_QT4=	corelib gui moc_build qmake_build rcc_build uic_build
 USE_XORG=	ice sm x11 xau xdmcp xext xrender
diff --git a/games/starfighter/Makefile b/games/starfighter/Makefile
index b385e2cf178e..7605ffdafb03 100644
--- a/games/starfighter/Makefile
+++ b/games/starfighter/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Liberate the universe from the evil company WEAPCO
 
 LICENSE=	GPLv2
 
-USE_ICONV=	yes
+USES=		iconv
 USE_XORG=	x11 xau xdmcp
 USE_SDL=	image mixer
 WITH_ZLIB=	yes
diff --git a/games/stepmania-devel/Makefile b/games/stepmania-devel/Makefile
index 480bbd2fec9f..43a18565ba9a 100644
--- a/games/stepmania-devel/Makefile
+++ b/games/stepmania-devel/Makefile
@@ -28,10 +28,9 @@ PROJECTHOST=	sm-ssc
 USE_BZIP2=	yes
 USE_XORG=	x11 xau xdmcp xext xrandr xrender xtst
 USE_GL=		gl glu
-USES=        pathfix
+USES=        pathfix iconv
 USE_GNOME=	gtk20
 USE_PERL5_BUILD=yes
-USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-ffmpeg
 INSTALLS_ICONS=	yes
diff --git a/games/tuxmath/Makefile b/games/tuxmath/Makefile
index a80e7a74ecaa..c19d326450f4 100644
--- a/games/tuxmath/Makefile
+++ b/games/tuxmath/Makefile
@@ -28,7 +28,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}_w_fonts-${PORTVERSION}
 USE_GNOME=	libxml2
 USE_SDL=	image mixer net pango sdl
 USE_PERL5=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	T4K_COMMON_CFLAGS="-I${T4K_WRKSRC}/src" \
diff --git a/games/tuxtype/Makefile b/games/tuxtype/Makefile
index 4bd48001f704..2bc1ee74cdcc 100644
--- a/games/tuxtype/Makefile
+++ b/games/tuxtype/Makefile
@@ -29,7 +29,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}_w_fonts-${PORTVERSION}
 USE_GNOME=	libxml2
 USE_SDL=	image mixer net pango sdl
 USE_PERL5=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	T4K_COMMON_CFLAGS="-I${T4K_WRKSRC}/src" \