29 files changed, 30 insertions, 51 deletions

diff --git a/sysutils/afflib/Makefile b/sysutils/afflib/Makefile
index c5757822645e..6814e727907f 100644
--- a/sysutils/afflib/Makefile
+++ b/sysutils/afflib/Makefile
@@ -17,8 +17,7 @@ LIB_DEPENDS=	expat:${PORTSDIR}/textproc/expat2 \
 
 USE_LDCONFIG=	yes
 USE_OPENSSL=	yes
-USE_ICONV=	yes
-USES=		fuse pathfix
+USES=		fuse pathfix iconv
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf
diff --git a/sysutils/apt/Makefile b/sysutils/apt/Makefile
index 747d28718973..16904e5fafe0 100644
--- a/sysutils/apt/Makefile
+++ b/sysutils/apt/Makefile
@@ -23,8 +23,7 @@ LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
-USES=		gettext
+USES=		gettext iconv
 USE_BDB=	44+
 USE_LDCONFIG=	yes
 NO_FILTER_SHLIBS=	yes
diff --git a/sysutils/archivemount/Makefile b/sysutils/archivemount/Makefile
index 858d8e0d61ba..e4bd1254e69f 100644
--- a/sysutils/archivemount/Makefile
+++ b/sysutils/archivemount/Makefile
@@ -15,9 +15,8 @@ MAN1=		archivemount.1
 GNU_CONFIGURE=	yes
 
 NO_INSTALL_MANPAGES=	yes
-USES=		fuse pkgconfig
+USES=		fuse pkgconfig iconv
 USE_GMAKE=	yes
-USE_ICONV=	yes
 USE_GCC=	4.2+
 
 .include <bsd.port.mk>
diff --git a/sysutils/cdrkit/Makefile b/sysutils/cdrkit/Makefile
index d85b2db49ec2..97679c7819f1 100644
--- a/sysutils/cdrkit/Makefile
+++ b/sysutils/cdrkit/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES=	http://cdrkit.org/releases/ \
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	Command-line CD/DVD writing suite
 
-USES=		cmake
-USE_ICONV=	yes
+USES=		cmake iconv
 
 MAN1=		cdda2ogg.1 devdump.1 dirsplit.1 genisoimage.1 icedax.1 \
 		isodebug.1 isodump.1 isoinfo.1 isovfy.1 list_audio_tracks.1 \
diff --git a/sysutils/cdrtools-devel/Makefile b/sysutils/cdrtools-devel/Makefile
index c4617893e208..7112e1425ba2 100644
--- a/sysutils/cdrtools-devel/Makefile
+++ b/sysutils/cdrtools-devel/Makefile
@@ -93,8 +93,7 @@ CDRTLSTARGET=	${ARCH:S/powerpc64/powerpc/}-freebsd-cc
 .if exists(${LOCALBASE}/lib/libiconv.a) || \
 	exists(${LOCALBASE}/lib/libintl.a) || !defined(WITHOUT_NLS)
 MAKE_ENV+=	OSDEFS=-I${LOCALBASE}/include
-USE_GETTEXT=	yes
-USE_ICONV=	yes
+USES+=		gettext iconv
 .endif
 
 pre-everything::
diff --git a/sysutils/cdrtools/Makefile b/sysutils/cdrtools/Makefile
index 4cead21f8d6f..9f9e4dbfbc9e 100644
--- a/sysutils/cdrtools/Makefile
+++ b/sysutils/cdrtools/Makefile
@@ -99,8 +99,7 @@ CDRTLSTARGET=	${ARCH:S/powerpc64/powerpc/}-freebsd-cc
 .if exists(${LOCALBASE}/lib/libiconv.a) || \
 	exists(${LOCALBASE}/lib/libintl.a) || !defined(WITHOUT_NLS)
 MAKE_ENV+=	OSDEFS=-I${LOCALBASE}/include
-USE_GETTEXT=	yes
-USE_ICONV=	yes
+USES+=		gettext iconv
 .endif
 
 pre-everything::
diff --git a/sysutils/conky/Makefile b/sysutils/conky/Makefile
index fbc854c6888c..4115e9497b23 100644
--- a/sysutils/conky/Makefile
+++ b/sysutils/conky/Makefile
@@ -13,11 +13,9 @@ COMMENT=	An advanced, highly configurable system monitor for X
 CONFLICTS?=	conky-awesome-[0-9]*
 SLAVEDIRS=	sysutils/conky-awesome
 
-USES=		pkgconfig
-USE_ICONV=	yes
+USES=		pkgconfig iconv
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_ICONV=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS+=	--disable-portmon \
 			--disable-hddtemp \
diff --git a/sysutils/dc3dd/Makefile b/sysutils/dc3dd/Makefile
index ce09ddded6d6..4c5c2c8095b2 100644
--- a/sysutils/dc3dd/Makefile
+++ b/sysutils/dc3dd/Makefile
@@ -14,8 +14,7 @@ MAINTAINER=	nobutaka@FreeBSD.org
 COMMENT=	A dd program useful for computer forensics
 
 USE_BZIP2=	yes
-USES=		gettext
-USE_ICONV=	yes
+USES=		gettext iconv
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="${LIBS} -L${LOCALBASE}/lib"
diff --git a/sysutils/fusefs-exfat/Makefile b/sysutils/fusefs-exfat/Makefile
index 4746da3b8fd1..436f6580f90b 100644
--- a/sysutils/fusefs-exfat/Makefile
+++ b/sysutils/fusefs-exfat/Makefile
@@ -15,8 +15,7 @@ LICENSE=	GPLv3
 
 LIB_DEPENDS=	ublio:${PORTSDIR}/devel/libublio
 
-USES=		fuse
-USE_ICONV=	yes
+USES=		fuse iconv
 USE_SCONS=	yes
 
 MAN8=		mount.exfat-fuse.8
diff --git a/sysutils/fusefs-fur/Makefile b/sysutils/fusefs-fur/Makefile
index 21c1582a9a3d..7a5d0d8bb19e 100644
--- a/sysutils/fusefs-fur/Makefile
+++ b/sysutils/fusefs-fur/Makefile
@@ -20,9 +20,8 @@ VCHMOD_DESC=	Fake hook for chmod that just returns 0
 MAKE_JOBS_SAFE=	yes
 
 GNU_CONFIGURE=	yes
-USES=		fuse pkgconfig
+USES=		fuse pkgconfig iconv
 USE_GMAKE=	yes
-USE_ICONV=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 CFLAGS+=	-I${LOCALBASE}/include -DFUSE_USE_VERSION=26
 
diff --git a/sysutils/fusefs-fusexmp_fh/Makefile b/sysutils/fusefs-fusexmp_fh/Makefile
index 0ecdb8427ccd..3091eb87eaa2 100644
--- a/sysutils/fusefs-fusexmp_fh/Makefile
+++ b/sysutils/fusefs-fusexmp_fh/Makefile
@@ -14,9 +14,8 @@ COMMENT=	Dummy driver from fusefs-libs example
 
 
 USE_AUTOTOOLS=	libtool
-USES=		fuse pathfix
+USES=		fuse pathfix iconv
 USE_LDCONFIG=	yes
-USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-kernel-module --prefix=${PREFIX} \
 		--enable-example
diff --git a/sysutils/fusefs-libs/Makefile b/sysutils/fusefs-libs/Makefile
index 4524dc317605..affa322ee453 100644
--- a/sysutils/fusefs-libs/Makefile
+++ b/sysutils/fusefs-libs/Makefile
@@ -14,8 +14,7 @@ COMMENT=	FUSE allows filesystem implementation in userspace
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MOUNT_FUSE_PATH=${PREFIX}/sbin
 USE_LDCONFIG=	yes
-USES=		pkgconfig
-USE_ICONV=	yes
+USES=		pkgconfig iconv
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
 TXT_DOCS=	how-fuse-works \
diff --git a/sysutils/fusefs-ntfs/Makefile b/sysutils/fusefs-ntfs/Makefile
index 60f439656f10..1c1e9abb6fda 100644
--- a/sysutils/fusefs-ntfs/Makefile
+++ b/sysutils/fusefs-ntfs/Makefile
@@ -16,10 +16,9 @@ LICENSE=	GPLv2
 
 CONFLICTS_BUILD=	bonobo-1.*
 CONFLICTS_INSTALL=	ntfsprogs-*
-USES=		fuse pkgconfig
+USES=		fuse pkgconfig iconv
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-USE_ICONV=	yes
 CONFIGURE_ARGS=	--exec-prefix=${PREFIX} --disable-mount-helper \
 		--disable-mtab --with-fuse=external
 CPPFLAGS+=	-I${WRKSRC}/include/ntfs-3g/ -I${LOCALBASE}/include
diff --git a/sysutils/geomgui/Makefile b/sysutils/geomgui/Makefile
index bb6677842e1c..1292fe63d2b7 100644
--- a/sysutils/geomgui/Makefile
+++ b/sysutils/geomgui/Makefile
@@ -22,7 +22,7 @@ BROKEN=	does not build
 
 USE_AUTOTOOLS=	libtool
 USE_GNOME=	gtk20 librsvg2
-USE_ICONV=	yes
+USES=		iconv
 GNU_CONFIGURE=	yes
 
 MAN1=	geomgui.1
diff --git a/sysutils/gsmartcontrol/Makefile b/sysutils/gsmartcontrol/Makefile
index 123bf25c1e05..6ed0badfd172 100644
--- a/sysutils/gsmartcontrol/Makefile
+++ b/sysutils/gsmartcontrol/Makefile
@@ -28,9 +28,8 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 		smartctl:${PORTSDIR}/sysutils/smartmontools
 
 USE_AUTOTOOLS=	libtool
-USES=		pkgconfig gettext
+USES=		pkgconfig gettext iconv
 USE_BZIP2=	yes
-USE_ICONV=	yes
 USE_GNOME=	gtk20
 USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
 		xi xinerama xrandr xrender 
diff --git a/sysutils/gtk-imonc/Makefile b/sysutils/gtk-imonc/Makefile
index 7a81322f724b..a487a97e5055 100644
--- a/sysutils/gtk-imonc/Makefile
+++ b/sysutils/gtk-imonc/Makefile
@@ -22,8 +22,7 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
 		xcb:${PORTSDIR}/x11/libxcb
 
 GNU_CONFIGURE=	yes
-USE_ICONV=	yes
-USES=		pkgconfig gettext
+USES=		pkgconfig gettext iconv
 USE_GNOME=	gdkpixbuf2 gtk20
 USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext \
 		xfixes xi xinerama xrandr xrender
diff --git a/sysutils/jfbterm/Makefile b/sysutils/jfbterm/Makefile
index 88c245723e40..70a1366441b8 100644
--- a/sysutils/jfbterm/Makefile
+++ b/sysutils/jfbterm/Makefile
@@ -62,7 +62,7 @@ MAKE_ENV+=	WITHOUT_ICONV=
 .if !exists(/usr/include/iconv.h)
 . if ${PORT_OPTIONS:MICONV}
 .  if !defined(NO_SHARED)
-USE_ICONV=	yes
+USES+=		iconv
 .  else
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libiconv.a:${PORTSDIR}/converters/libiconv
 .  endif
diff --git a/sysutils/kiconvtool/Makefile b/sysutils/kiconvtool/Makefile
index 5b2952387d49..b4e52183234f 100644
--- a/sysutils/kiconvtool/Makefile
+++ b/sysutils/kiconvtool/Makefile
@@ -14,7 +14,7 @@ MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/ \
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Tool to preload kernel iconv charset tables
 
-USE_ICONV=	yes	# used by libkiconv, actually
+USES=		iconv	# used by libkiconv, actually
 
 PLIST_FILES=	sbin/kiconvtool etc/rc.d/kiconv
 
diff --git a/sysutils/ldapvi/Makefile b/sysutils/ldapvi/Makefile
index d4e200737eb1..c057ffeccd7b 100644
--- a/sysutils/ldapvi/Makefile
+++ b/sysutils/ldapvi/Makefile
@@ -21,8 +21,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	popt:${PORTSDIR}/devel/popt
 
 USE_OPENLDAP=	yes
-USE_GNOME=	pkgconfig glib20
-USE_ICONV=	yes
+USE_GNOME=	glib20
+USES=		pkgconfig iconv
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 MAKEFILE=	GNUmakefile
diff --git a/sysutils/libcdio/Makefile b/sysutils/libcdio/Makefile
index 9f958e418b66..0528ee5047d1 100644
--- a/sysutils/libcdio/Makefile
+++ b/sysutils/libcdio/Makefile
@@ -22,9 +22,8 @@ LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
-USE_GNOME=	pkgconfig gnomehack
+USES=		pathfix pkgconfig iconv
 USE_GMAKE=	yes
-USE_ICONV=	yes
 USE_LDCONFIG=	yes
 USE_NCURSES=	yes
 CONFIGURE_ARGS+=	--with-libpopt-prefix=${LOCALBASE} \
diff --git a/sysutils/lxinput/Makefile b/sysutils/lxinput/Makefile
index 81c9aa15f309..5c3c0bb99396 100644
--- a/sysutils/lxinput/Makefile
+++ b/sysutils/lxinput/Makefile
@@ -16,7 +16,7 @@ COMMENT=	A keyboard and mouse config tool from the LXDE project
 
 USE_GNOME=	gtk20 intlhack
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
diff --git a/sysutils/lxtask/Makefile b/sysutils/lxtask/Makefile
index f8c7a939ff67..3dfc8c071154 100644
--- a/sysutils/lxtask/Makefile
+++ b/sysutils/lxtask/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Lightweight desktop-independent task manager
 
 USE_GNOME=	gtk20 intlhack
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
diff --git a/sysutils/lxterminal/Makefile b/sysutils/lxterminal/Makefile
index 4494a41b40eb..a93fee7404ec 100644
--- a/sysutils/lxterminal/Makefile
+++ b/sysutils/lxterminal/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	vte.9:${PORTSDIR}/x11-toolkits/vte
 
 USE_GNOME=	gtk20 intlhack
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
diff --git a/sysutils/nitrogen/Makefile b/sysutils/nitrogen/Makefile
index 84f4117d2f42..39c5c680fe95 100644
--- a/sysutils/nitrogen/Makefile
+++ b/sysutils/nitrogen/Makefile
@@ -33,8 +33,7 @@ RUN_DEPENDS=	gnome-icon-theme>0:${PORTSDIR}/misc/gnome-icon-theme \
 OPTIONS_DEFINE=	XINERAMA
 OPTIONS_DEFAULT=XINERAMA
 
-USES=		gettext
-USE_ICONV=	yes
+USES=		gettext iconv
 USE_GNOME=	gtk20
 USE_XORG=	pixman x11 xau xcomposite xcursor xdamage xdmcp xext xfixes \
 		xrandr xrender
diff --git a/sysutils/pfstat/Makefile b/sysutils/pfstat/Makefile
index 5d4c1494adfc..c54cc47fdca6 100644
--- a/sysutils/pfstat/Makefile
+++ b/sysutils/pfstat/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
 MAKE_ARGS=	"LD_GD=gd"
 MAKE_ENV+=	__MAKE_CONF=/dev/null
-USE_ICONV=	yes
+USES=		iconv
 
 USE_RC_SUBR=	pfstatd
 MAN8=		pfstat.8 \
diff --git a/sysutils/quicksynergy/Makefile b/sysutils/quicksynergy/Makefile
index 59de55db643d..76ae042898ba 100644
--- a/sysutils/quicksynergy/Makefile
+++ b/sysutils/quicksynergy/Makefile
@@ -13,8 +13,7 @@ COMMENT=	A graphical interface for easily configuring Synergy2
 BUILD_DEPENDS=	synergys:${PORTSDIR}/sysutils/synergy
 
 GNU_CONFIGURE=	yes
-USE_ICONV=	yes
-USES=		pathfix pkgconfig gettext
+USES=		pathfix pkgconfig gettext iconv
 USE_GNOME=	gnomeprefix libglade2
 
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/sysutils/shmcat/Makefile b/sysutils/shmcat/Makefile
index 36b331732295..7c3d8ab1726a 100644
--- a/sysutils/shmcat/Makefile
+++ b/sysutils/shmcat/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	gasol.wu@gmail.com
 COMMENT=	Simple tool that dumps System V shared memory segments
 
 USE_BZIP2=	yes
-USE_ICONV=	yes
+USEs=		iconv
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	NLS
diff --git a/sysutils/unieject/Makefile b/sysutils/unieject/Makefile
index 383a2e545cb9..f7f42267d304 100644
--- a/sysutils/unieject/Makefile
+++ b/sysutils/unieject/Makefile
@@ -17,9 +17,8 @@ LIB_DEPENDS=	confuse:${PORTSDIR}/devel/libconfuse \
 		cdio:${PORTSDIR}/sysutils/libcdio
 
 USE_BZIP2=	yes
-USES=		pathfix pkgconfig gettext
+USES=		pathfix pkgconfig gettext iconv
 USE_GNOME=	glib20
-USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-silent-rules \
 		--disable-doc
diff --git a/sysutils/xorriso/Makefile b/sysutils/xorriso/Makefile
index c897f1c6741b..fe101d01b67a 100644
--- a/sysutils/xorriso/Makefile
+++ b/sysutils/xorriso/Makefile
@@ -19,8 +19,7 @@ RUN_DEPENDS=	libburn>=1.1.0:${PORTSDIR}/devel/libburn \
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack pkgconfig
-USE_ICONV=	yes
+USES=		pathfix pkgconfig iconv
 USE_LDCONFIG=	yes
 WANT_GNOME=	yes