- Convert USE_ICONV=yes to USES=iconv

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

Reviewed by:	zeising

22 files changed, 23 insertions, 35 deletions

diff --git a/multimedia/aegisub/Makefile b/multimedia/aegisub/Makefile
index b26dccb0c46d..a50000254146 100644
--- a/multimedia/aegisub/Makefile
+++ b/multimedia/aegisub/Makefile
@@ -28,14 +28,13 @@ EFENCE_DESC=	Electric Fence (require profiling)
 ASS_DESC=	libASS subtitle provider
 HUNSPELL_DESC=	Spell checking via Hunspell
 
-USES=		pkgconfig gettext
+USES=		pkgconfig gettext iconv
 USE_GNOME=	intltool
 USE_WX=		2.8
 WX_COMPS=	wx contrib
 WX_UNICODE=	yes
 WX_CONF_ARGS=	absolute
 USE_GL=		glu
-USE_ICONV=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-gcc-prec --without-lua50
diff --git a/multimedia/audacious/Makefile b/multimedia/audacious/Makefile
index d3ebe94d93e8..f13c8e872664 100644
--- a/multimedia/audacious/Makefile
+++ b/multimedia/audacious/Makefile
@@ -53,7 +53,7 @@ CONFIGURE_ARGS+=--enable-gconf
 .endif
 
 .if  ${PORT_OPTIONS:MICONV} || exists(${LOCALBASE}/lib/libiconv.so)
-USE_ICONV=	yes
+USES+=		iconv
 .endif
 
 .if  ${PORT_OPTIONS:MNLS}
diff --git a/multimedia/devede/Makefile b/multimedia/devede/Makefile
index af9e30e89033..cb4af8d4102f 100644
--- a/multimedia/devede/Makefile
+++ b/multimedia/devede/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS=	ffmpeg:${PORTSDIR}/multimedia/ffmpeg \
 
 USE_BZIP2=	yes
 USE_GNOME=	pygtk2
-USE_ICONV=	yes
+USES=		iconv
 USE_PYTHON=	yes
 NO_BUILD=	yes
 
diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index c9b0e695469f..73432c8c3518 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -20,11 +20,10 @@ LIB_DEPENDS=	dvdread:${PORTSDIR}/multimedia/libdvdread \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USES=		pkgconfig
+USES=		pkgconfig iconv
 USE_GNOME=	libxml2
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 
 DOCSRCDIR1=	${WRKSRC}
diff --git a/multimedia/ffmpeg2theora/Makefile b/multimedia/ffmpeg2theora/Makefile
index 86684489ba8a..c2f3c71f88bd 100644
--- a/multimedia/ffmpeg2theora/Makefile
+++ b/multimedia/ffmpeg2theora/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	avcodec:${PORTSDIR}/multimedia/ffmpeg \
 		theora:${PORTSDIR}/multimedia/libtheora
 
 USE_BZIP2=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_SCONS=	yes
 SCONS_BUILDENV=	CC="${CC}" CCFLAGS="${CFLAGS}" \
 		APPEND_CCFLAGS="${CPPFLAGS}" APPEND_LINKFLAGS="${LDFLAGS}"
diff --git a/multimedia/freetuxtv/Makefile b/multimedia/freetuxtv/Makefile
index e54364a879fd..abbeaa56bfda 100644
--- a/multimedia/freetuxtv/Makefile
+++ b/multimedia/freetuxtv/Makefile
@@ -30,8 +30,7 @@ USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
 		xi xinerama xrandr xrender
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USES=		pkgconfig
-USE_ICONV=	yes
+USES=		pkgconfig iconv
 INSTALLS_ICONS=	yes
 
 CONFIGURE_ARGS+=--with-gtk=2.0
diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile
index 774386024875..92a8749de034 100644
--- a/multimedia/kino/Makefile
+++ b/multimedia/kino/Makefile
@@ -23,9 +23,8 @@ FFMPEG_KINO_DESC=	With ffmpeg-kino
 USE_XORG=	x11 xv ice
 USE_AUTOTOOLS=	autoconf
 USE_GMAKE=	yes
-USES=        pathfix gettext
+USES=		pathfix gettext iconv
 USE_GNOME=	gnomeprefix libglade2 libxml2
-USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
 CPPFLAGS+=	-I${LOCALBASE}/include/lqt		\
diff --git a/multimedia/kissdx/Makefile b/multimedia/kissdx/Makefile
index 737a11d58575..43cf12825c68 100644
--- a/multimedia/kissdx/Makefile
+++ b/multimedia/kissdx/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	gd:${PORTSDIR}/graphics/gd \
 		jpeg:${PORTSDIR}/graphics/jpeg \
 		dvdread:${PORTSDIR}/multimedia/libdvdread
 
-USE_ICONV=	yes
+USES=		iconv
 
 # Man pages
 MAN1=		kissdx.1
diff --git a/multimedia/libaacs/Makefile b/multimedia/libaacs/Makefile
index 3e6e5fa49a85..949198cddfef 100644
--- a/multimedia/libaacs/Makefile
+++ b/multimedia/libaacs/Makefile
@@ -14,11 +14,10 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
 LIB_DEPENDS=	gcrypt.18:${PORTSDIR}/security/libgcrypt \
 		gpg-error.0:${PORTSDIR}/security/libgpg-error
 
-USE_ICONV=	yes
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	autoconf aclocal automake libtool
-USES=		bison gettext
+USES=		bison gettext iconv
 
 MAKE_JOBS_SAFE=	yes
 HAS_CONFIGURE=	yes
diff --git a/multimedia/libbluray/Makefile b/multimedia/libbluray/Makefile
index d68857635192..26abf0a49082 100644
--- a/multimedia/libbluray/Makefile
+++ b/multimedia/libbluray/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
 # dlopen dependencies, libbdplus not yet available
 LIB_DEPENDS+=	aacs.1:${PORTSDIR}/multimedia/libaacs
 
-USE_ICONV=	yes
+USES=		iconv
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	autoconf aclocal automake libtool
diff --git a/multimedia/libquvi/Makefile b/multimedia/libquvi/Makefile
index 8153b5c9e6c9..68d4364c2729 100644
--- a/multimedia/libquvi/Makefile
+++ b/multimedia/libquvi/Makefile
@@ -19,11 +19,10 @@ OPTIONS_DEFINE=	DOCS
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 GNU_CONFIGURE=	yes
-USE_ICONV=	yes
 USE_LDCONFIG=	yes
 USE_LUA=	yes
 USE_XZ=		yes
-USES=		pathfix pkgconfig
+USES=		pathfix pkgconfig iconv
 
 MAN3=		libquvi.3
 
diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile
index b227474f54b6..6bab7ae42c9e 100644
--- a/multimedia/libxine/Makefile
+++ b/multimedia/libxine/Makefile
@@ -37,12 +37,10 @@ BUILD_DEPENDS+=	v4l_compat>=1.0.20100321:${PORTSDIR}/multimedia/v4l_compat
 LIB_DEPENDS+=	dvdcss.${DVDCSS_LIBVERSION}:${PORTSDIR}/multimedia/libdvdcss
 .endif
 
-USES=		pkgconfig
+USES=		pathfix pkgconfig iconv
 USE_XZ=		yes
-USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 WANT_GNOME=	yes
-USE_GNOME=	gnomehack
 USE_GMAKE=	yes
 USE_XORG=	sm x11 xv xinerama
 USE_GL=		gl glu
diff --git a/multimedia/mkclean/Makefile b/multimedia/mkclean/Makefile
index 19ea614bf002..aadfb918718e 100644
--- a/multimedia/mkclean/Makefile
+++ b/multimedia/mkclean/Makefile
@@ -14,7 +14,7 @@ USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
 
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -liconv
diff --git a/multimedia/mkvalidator/Makefile b/multimedia/mkvalidator/Makefile
index 4fa040d07f74..d1271d255789 100644
--- a/multimedia/mkvalidator/Makefile
+++ b/multimedia/mkvalidator/Makefile
@@ -14,7 +14,7 @@ USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
 
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -liconv
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index 5a6de9aae401..d77efd3fbee4 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -24,10 +24,9 @@ LIB_DEPENDS=	FLAC:${PORTSDIR}/audio/flac \
 		ebml:${PORTSDIR}/textproc/libebml \
 		matroska:${PORTSDIR}/multimedia/libmatroska
 
-USES=		pkgconfig gettext
+USES=		pkgconfig gettext iconv
 USE_BZIP2=	yes
 USE_GCC=	4.6+
-USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 USE_RAKE=	yes
 USE_RUBY=	yes
diff --git a/multimedia/mplayer2/Makefile b/multimedia/mplayer2/Makefile
index 33a31b0120e5..5055298fb060 100644
--- a/multimedia/mplayer2/Makefile
+++ b/multimedia/mplayer2/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS=	ffmpeg1:${PORTSDIR}/multimedia/ffmpeg1
 USE_XZ=		yes
 USE_GMAKE=	yes
 USE_PYTHON=	3.1+
-USE_ICONV=	yes
+USES=		iconv
 USE_NCURSES=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
diff --git a/multimedia/mplayerxp/Makefile b/multimedia/mplayerxp/Makefile
index ebfacf8f5599..c5f050595dd0 100644
--- a/multimedia/mplayerxp/Makefile
+++ b/multimedia/mplayerxp/Makefile
@@ -25,7 +25,7 @@ ONLY_FOR_ARCHS=	i386
 
 USE_BZIP2=	yes
 USE_XORG=	xinerama xv xxf86dga xxf86vm
-USE_ICONV=	yes
+USES=		iconv
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
 WANT_SDL=	yes
diff --git a/multimedia/sabbu/Makefile b/multimedia/sabbu/Makefile
index 65f3dd17a457..58f388db472e 100644
--- a/multimedia/sabbu/Makefile
+++ b/multimedia/sabbu/Makefile
@@ -12,10 +12,9 @@ COMMENT=	Program used to time subtitles
 LIB_DEPENDS=	avcodec:${PORTSDIR}/multimedia/ffmpeg \
 		sndfile:${PORTSDIR}/audio/libsndfile
 
-USES=		pkgconfig
+USES=		pkgconfig iconv
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 
 USE_GNOME=	gtk20
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index d04628e22579..7908473066a2 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -200,7 +200,7 @@ CONFIGURE_ARGS+=	--disable-libjpeg
 .endif
 
 .if ${PORT_OPTIONS:MICONV}
-USE_ICONV=	yes
+USES+=		iconv
 CONFIGURE_ARGS+=	--with-iconv-prefix=${LOCALBASE} --enable-iconv
 .else
 CONFIGURE_ARGS+=	--disable-iconv
diff --git a/multimedia/vdr/Makefile b/multimedia/vdr/Makefile
index 07221cf7e4e6..a44f76d12000 100644
--- a/multimedia/vdr/Makefile
+++ b/multimedia/vdr/Makefile
@@ -22,11 +22,10 @@ DVBPATCH_DESC=		DVB audio patch for some countries
 STB0899_SIGNAL_DESC=	STB0899 signal strength patch
 OPTIONS_DEFAULT=	IPTVPATCH TTXPATCH
 
-USES=		pkgconfig gettext
+USES=		pkgconfig gettext iconv
 DIST_SUBDIR=	vdr
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
 PORTDOCS=	COPYING INSTALL MANUAL README HISTORY
 MAKE_JOBS_SAFE=	yes
 MAN1=		vdr.1
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index e677a7585ef8..55ae014096f0 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -63,7 +63,7 @@ NO_DVD_DESC=	disable DVD specific features
 
 USE_XZ=		yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_PERL5_BUILD=yes
 USE_GL=yes
 USE_CSTD=	gnu99
diff --git a/multimedia/xmms/Makefile b/multimedia/xmms/Makefile
index 05864728f556..ee501d08702f 100644
--- a/multimedia/xmms/Makefile
+++ b/multimedia/xmms/Makefile
@@ -15,10 +15,9 @@ COMMENT?=	X Multimedia System -- An audio player with Winamp GUI
 
 USE_BZIP2=	yes
 USE_GL=		gl
-USE_GNOME=	desktopfileutils gtk12 gnomehack
+USE_GNOME=	desktopfileutils gtk12
 USE_GMAKE=	yes
-USES=		gettext
-USE_ICONV=	yes
+USES=		pathfix gettext iconv
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	automake autoconf libtool
 AUTOTOOLSFILES=	aclocal.m4