aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--graphics/GraphicsMagick/Makefile2
-rw-r--r--graphics/GraphicsMagick12/Makefile2
-rw-r--r--graphics/GraphicsMagick13/Makefile2
-rw-r--r--graphics/albumshaper/Makefile2
-rw-r--r--graphics/blender/Makefile3
-rw-r--r--graphics/converseen/Makefile3
-rw-r--r--graphics/djvulibre/Makefile3
-rw-r--r--graphics/enfle/Makefile2
-rw-r--r--graphics/epdfview/Makefile2
-rw-r--r--graphics/exif/Makefile3
-rw-r--r--graphics/gd/Makefile2
-rw-r--r--graphics/gdal/Makefile2
-rw-r--r--graphics/graphite2/Makefile3
-rw-r--r--graphics/graphviz/Makefile2
-rw-r--r--graphics/ida/Makefile2
-rw-r--r--graphics/inventor/Makefile2
-rw-r--r--graphics/libgaiagraphics/Makefile2
-rw-r--r--graphics/libgphoto2/Makefile2
-rw-r--r--graphics/libiptcdata/Makefile3
-rw-r--r--graphics/librasterlite/Makefile3
-rw-r--r--graphics/libreatlas/Makefile3
-rw-r--r--graphics/libsvg/Makefile4
-rw-r--r--graphics/opennurbs/Makefile2
-rw-r--r--graphics/scantailor/Makefile3
-rw-r--r--graphics/silgraphite/Makefile2
-rw-r--r--graphics/sswf/Makefile3
-rw-r--r--graphics/swfmill/Makefile3
-rw-r--r--graphics/zbar/Makefile2
-rw-r--r--irc/miau/Makefile2
-rw-r--r--irc/scrollz/Makefile2
-rw-r--r--irc/weechat-devel/Makefile3
-rw-r--r--irc/weechat/Makefile3
-rw-r--r--irc/xchat1/Makefile2
-rw-r--r--irc/znc/Makefile3
-rw-r--r--japanese/chasen-base/Makefile2
-rw-r--r--japanese/cmigemo/Makefile2
-rw-r--r--japanese/edict-utf-8/Makefile2
-rw-r--r--japanese/groff/Makefile2
-rw-r--r--japanese/lynx-current/Makefile2
-rw-r--r--japanese/lynx/Makefile2
-rw-r--r--japanese/mecab/Makefile2
-rw-r--r--japanese/mozc-server/Makefile3
-rw-r--r--japanese/mutt-devel/Makefile2
-rw-r--r--japanese/scim-anthy/Makefile2
-rw-r--r--japanese/scim-canna/Makefile2
-rw-r--r--japanese/scim-honoka-plugin-romkan/Makefile5
-rw-r--r--japanese/scim-honoka-plugin-wnn/Makefile5
-rw-r--r--japanese/scim-honoka/Makefile5
-rw-r--r--japanese/scim-prime/Makefile2
-rw-r--r--japanese/scim-skk/Makefile2
-rw-r--r--japanese/scim-tomoe/Makefile3
-rw-r--r--japanese/scim-uim/Makefile2
-rw-r--r--java/classpath/Makefile3
-rw-r--r--java/jikes/Makefile2
-rw-r--r--java/openjdk7/Makefile2
-rw-r--r--java/sablevm/Makefile3
-rw-r--r--korean/ami/Makefile2
-rw-r--r--korean/libhangul/Makefile2
-rw-r--r--lang/clisp/Makefile2
-rw-r--r--lang/gauche/Makefile2
-rw-r--r--lang/gcc/Makefile3
-rw-r--r--lang/gcc34/Makefile3
-rw-r--r--lang/gcc42/Makefile3
-rw-r--r--lang/gcc44/Makefile3
-rw-r--r--lang/gcc46/Makefile3
-rw-r--r--lang/gcc47/Makefile3
-rw-r--r--lang/gcc48/Makefile3
-rw-r--r--lang/gcc49/Makefile3
-rw-r--r--lang/gdc/Makefile3
-rw-r--r--lang/ghc/Makefile2
-rw-r--r--lang/gnat/Makefile3
-rw-r--r--lang/gnustep-base/Makefile3
-rw-r--r--lang/opa/Makefile2
-rw-r--r--lang/petite-chez/Makefile2
-rw-r--r--lang/pypy/Makefile3
-rw-r--r--lang/q/Makefile3
-rw-r--r--lang/qore/Makefile3
-rw-r--r--lang/racket-textual/Makefile2
-rw-r--r--lang/racket/Makefile2
-rw-r--r--lang/smalltalk/Makefile4
-rw-r--r--mail/anubis/Makefile3
-rw-r--r--mail/balsa/Makefile3
-rw-r--r--mail/bogofilter/Makefile2
-rw-r--r--mail/claws-mail-address_keeper/Makefile2
-rw-r--r--mail/claws-mail-attach_warner/Makefile2
-rw-r--r--mail/claws-mail-clamd/Makefile2
-rw-r--r--mail/claws-mail-fancy/Makefile2
-rw-r--r--mail/claws-mail-fetchinfo/Makefile2
-rw-r--r--mail/claws-mail-gdata/Makefile2
-rw-r--r--mail/claws-mail-gtkhtml2_viewer/Makefile2
-rw-r--r--mail/claws-mail-pdf_viewer/Makefile2
-rw-r--r--mail/claws-mail-rssyl/Makefile2
-rw-r--r--mail/claws-mail-vcalendar/Makefile2
-rw-r--r--mail/claws-mail/Makefile3
-rw-r--r--mail/cone/Makefile3
-rw-r--r--mail/crm114/Makefile3
-rw-r--r--mail/dovecot/Makefile2
-rw-r--r--mail/dovecot2/Makefile2
-rw-r--r--mail/elm+ME/Makefile2
-rw-r--r--mail/elmo-devel/Makefile2
-rw-r--r--mail/elmo/Makefile2
-rw-r--r--mail/exim/Makefile2
-rw-r--r--mail/gmime2/Makefile3
-rw-r--r--mail/gmime24/Makefile3
-rw-r--r--mail/gnarwl/Makefile2
-rw-r--r--mail/heirloom-mailx/Makefile2
-rw-r--r--mail/hotwayd/Makefile2
-rw-r--r--mail/libetpan/Makefile2
-rw-r--r--mail/libpst/Makefile2
-rw-r--r--mail/libvmime/Makefile2
-rw-r--r--mail/lurker/Makefile2
-rw-r--r--mail/maildrop/Makefile2
-rw-r--r--mail/mmr/Makefile2
-rw-r--r--mail/mutt/Makefile2
-rw-r--r--mail/mutt14/Makefile5
-rw-r--r--mail/normalizemime/Makefile2
-rw-r--r--mail/prayer/Makefile2
-rw-r--r--mail/rspamd/Makefile3
-rw-r--r--mail/sylpheed/Makefile3
-rw-r--r--math/R/Makefile2
-rw-r--r--math/eukleides/Makefile3
-rw-r--r--math/fricas/Makefile3
-rw-r--r--math/hs-Agda/Makefile2
-rw-r--r--math/open-axiom/Makefile3
-rw-r--r--math/pspp/Makefile2
-rw-r--r--math/sage/Makefile2
-rw-r--r--misc/lifelines/Makefile3
-rw-r--r--misc/linm/Makefile3
-rw-r--r--misc/lxde-common/Makefile2
-rw-r--r--misc/mc-light/Makefile3
-rw-r--r--misc/mc/Makefile2
-rw-r--r--misc/wmweather+/Makefile2
-rw-r--r--multimedia/aegisub/Makefile3
-rw-r--r--multimedia/audacious/Makefile2
-rw-r--r--multimedia/devede/Makefile2
-rw-r--r--multimedia/dvdauthor/Makefile3
-rw-r--r--multimedia/ffmpeg2theora/Makefile2
-rw-r--r--multimedia/freetuxtv/Makefile3
-rw-r--r--multimedia/kino/Makefile3
-rw-r--r--multimedia/kissdx/Makefile2
-rw-r--r--multimedia/libaacs/Makefile3
-rw-r--r--multimedia/libbluray/Makefile2
-rw-r--r--multimedia/libquvi/Makefile3
-rw-r--r--multimedia/libxine/Makefile4
-rw-r--r--multimedia/mkclean/Makefile2
-rw-r--r--multimedia/mkvalidator/Makefile2
-rw-r--r--multimedia/mkvtoolnix/Makefile3
-rw-r--r--multimedia/mplayer2/Makefile2
-rw-r--r--multimedia/mplayerxp/Makefile2
-rw-r--r--multimedia/sabbu/Makefile3
-rw-r--r--multimedia/transcode/Makefile2
-rw-r--r--multimedia/vdr/Makefile3
-rw-r--r--multimedia/vlc/Makefile2
-rw-r--r--multimedia/xmms/Makefile5
-rw-r--r--net-im/centericq/Makefile2
-rw-r--r--net-im/centerim-devel/Makefile2
-rw-r--r--net-im/centerim/Makefile2
-rw-r--r--net-im/climm/Makefile2
-rw-r--r--net-im/ejabberd/Makefile2
-rw-r--r--net-im/gale/Makefile2
-rw-r--r--net-im/imspector/Makefile2
-rw-r--r--net-im/jabber/Makefile3
-rw-r--r--net-im/jabberd/Makefile2
-rw-r--r--net-im/libpurple/Makefile3
-rw-r--r--net-im/licq/Makefile3
-rw-r--r--net-im/mcabber/Makefile3
-rw-r--r--net-im/pidgin-pidgimpd/Makefile4
-rw-r--r--net-im/ysm/Makefile2
-rw-r--r--net-im/zephyr/Makefile2
-rw-r--r--net-mgmt/ap-utils/Makefile2
-rw-r--r--net-mgmt/bandwidthd/Makefile2
-rw-r--r--net-mgmt/ettercap/Makefile2
-rw-r--r--net-mgmt/icinga/Makefile2
-rw-r--r--net-mgmt/nagios-devel/Makefile2
-rw-r--r--net-mgmt/nagios/Makefile2
-rw-r--r--net-mgmt/netxms/Makefile2
-rw-r--r--net-mgmt/nfsen/Makefile2
-rw-r--r--net-mgmt/wmi-client/Makefile2
-rw-r--r--net-mgmt/zabbix2-server/Makefile3
-rw-r--r--net-p2p/gnunet-gtk/Makefile3
-rw-r--r--net-p2p/gnunet/Makefile2
-rw-r--r--net-p2p/libtorrent-rasterbar-16/Makefile3
-rw-r--r--net-p2p/linuxdcpp/Makefile2
-rw-r--r--net-p2p/microdc2/Makefile2
-rw-r--r--net-p2p/mldonkey/Makefile2
-rw-r--r--net-p2p/mooseekd/Makefile2
-rw-r--r--net-p2p/retroshare/Makefile3
-rw-r--r--net-p2p/transmission-remote-gui/Makefile2
-rw-r--r--net/boinc-client/Makefile2
-rw-r--r--net/c3270/Makefile2
-rw-r--r--net/g2ipmsg/Makefile3
-rw-r--r--net/gnetcat/Makefile3
-rw-r--r--net/ldapdiff/Makefile2
-rw-r--r--net/ldapscripts/Makefile2
-rw-r--r--net/libmms/Makefile5
-rw-r--r--net/minisapserver/Makefile2
-rw-r--r--net/miredo/Makefile3
-rw-r--r--net/nc6/Makefile2
-rw-r--r--net/netatalk/Makefile2
-rw-r--r--net/netatalk3/Makefile2
-rw-r--r--net/netdude/Makefile3
-rw-r--r--net/rdesktop/Makefile2
-rw-r--r--net/rsync/Makefile2
-rw-r--r--net/ruby-net-geoip/Makefile2
-rw-r--r--net/samba34/Makefile3
-rw-r--r--net/samba36/Makefile3
-rw-r--r--net/samba4/Makefile3
-rw-r--r--net/samba4wins/Makefile2
-rw-r--r--net/silc-client/Makefile2
-rw-r--r--net/ssltunnel-client/Makefile2
-rw-r--r--net/ulxmlrpcpp/Makefile3
-rw-r--r--net/whois/Makefile2
-rw-r--r--net/wire/Makefile2
-rw-r--r--net/wireshark/Makefile2
-rw-r--r--net/wol/Makefile3
-rw-r--r--net/x11vnc/Makefile2
-rw-r--r--net/xmlrpc-epi/Makefile2
-rw-r--r--net/yaz/Makefile5
-rw-r--r--net/zebra-server/Makefile2
219 files changed, 229 insertions, 311 deletions
diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile
index da150cedbb13..eef072262bd3 100644
--- a/graphics/GraphicsMagick/Makefile
+++ b/graphics/GraphicsMagick/Makefile
@@ -34,7 +34,7 @@ TESTS_DESC= Run bundled self-tests after build
OPTIONS_DEFAULT=X11 TESTS DOCS
-USE_ICONV= yes
+USES= iconv
USE_AUTOTOOLS= libtool
USE_BZIP2= yes
USE_GHOSTSCRIPT=yes
diff --git a/graphics/GraphicsMagick12/Makefile b/graphics/GraphicsMagick12/Makefile
index 0c956c71c3c4..0bf9f163d7df 100644
--- a/graphics/GraphicsMagick12/Makefile
+++ b/graphics/GraphicsMagick12/Makefile
@@ -36,7 +36,7 @@ OPTIONS_DEFAULT=FPX DPS OPENMP X11 TESTS DOCS
OPTIONS_SINGLE= X11
OPTIONS_SINGLE_X11= DPS NODPS
-USE_ICONV= yes
+USES= iconv
USE_AUTOTOOLS= libtool libltdl
USE_BZIP2= yes
USE_GHOSTSCRIPT=yes
diff --git a/graphics/GraphicsMagick13/Makefile b/graphics/GraphicsMagick13/Makefile
index 5c0939ef32d9..9ad39d3d0501 100644
--- a/graphics/GraphicsMagick13/Makefile
+++ b/graphics/GraphicsMagick13/Makefile
@@ -37,7 +37,7 @@ OPTIONS_DEFAULT=FPX DPS OPENMP X11 TESTS DOCS
OPTIONS_SINGLE= X11
OPTIONS_SINGLE_X11= DPS NODPS
-USE_ICONV= yes
+USES= iconv
USE_AUTOTOOLS= libtool libltdl
USE_BZIP2= yes
USE_GHOSTSCRIPT=yes
diff --git a/graphics/albumshaper/Makefile b/graphics/albumshaper/Makefile
index 749ec5674a9c..5ba8e11ea348 100644
--- a/graphics/albumshaper/Makefile
+++ b/graphics/albumshaper/Makefile
@@ -17,7 +17,7 @@ DEPRECATED= Depends on QT3; unmaintained
EXPIRATION_DATE= 2013-07-01
USE_BZIP2= yes
-USE_ICONV= yes
+USES= iconv
USE_QT_VER= 3
USE_GNOME= libxml2 libxslt
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 3025cc1c68e3..2e72b459a6eb 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -166,8 +166,7 @@ USE_GNOME= desktopfileutils
.endif
.if ${PORT_OPTIONS:MNLS}
-USES+= gettext
-USE_ICONV= yes
+USES+= gettext iconv
CMAKE_ARGS+= -DWITH_INTERNATIONAL:BOOL=ON
.else
CMAKE_ARGS+= -DWITH_INTERNATIONAL:BOOL=OFF
diff --git a/graphics/converseen/Makefile b/graphics/converseen/Makefile
index e189d2722f56..93b77cb2b325 100644
--- a/graphics/converseen/Makefile
+++ b/graphics/converseen/Makefile
@@ -23,8 +23,7 @@ LIB_DEPENDS= pthread-stubs:${PORTSDIR}/devel/libpthread-stubs \
USE_BZIP2= yes
USE_AUTOTOOLS= libltdl
-USES= cmake gettext
-USE_ICONV= yes
+USES= cmake gettext iconv
USE_XORG= ice sm x11 xau xdmcp xext xrender xt
USE_QT4= corelib gui linguist_build moc_build qmake_build \
rcc_build uic_build
diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile
index dfb8f5a3ffb0..533bd407f51f 100644
--- a/graphics/djvulibre/Makefile
+++ b/graphics/djvulibre/Makefile
@@ -15,8 +15,7 @@ LICENSE= GPLv2
LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg \
tiff:${PORTSDIR}/graphics/tiff
-USE_ICONV= yes
-USES= pathfix
+USES= pathfix iconv
GNU_CONFIGURE= yes
CONFIGURE_ENV= JPEG_CFLAGS="-I${LOCALBASE}/include" \
JPEG_LIBS="-L${LOCALBASE}/lib -ljpeg" \
diff --git a/graphics/enfle/Makefile b/graphics/enfle/Makefile
index 0aa1279b4149..3521ac0bcca3 100644
--- a/graphics/enfle/Makefile
+++ b/graphics/enfle/Makefile
@@ -31,7 +31,7 @@ USE_LDCONFIG= yes
USE_BZIP2= yes
USE_XORG= ice x11 xext xv
USE_GNOME= esound
-USE_ICONV= yes
+USES= iconv
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ENV= ac_cv_header_mpeg_h=no \
diff --git a/graphics/epdfview/Makefile b/graphics/epdfview/Makefile
index d99eceff02b0..dfa03c8a7bba 100644
--- a/graphics/epdfview/Makefile
+++ b/graphics/epdfview/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= poppler-glib.8:${PORTSDIR}/graphics/poppler-glib
USE_BZIP2= yes
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-USE_ICONV= yes
+USES= iconv
USE_GMAKE= yes
USE_GNOME= gtk20 intlhack
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/graphics/exif/Makefile b/graphics/exif/Makefile
index 924340d8422a..6cc1ef7d6b88 100644
--- a/graphics/exif/Makefile
+++ b/graphics/exif/Makefile
@@ -23,8 +23,7 @@ CONFIGURE_ENV+= POPT_CFLAGS=-I${LOCALBASE}/include POPT_LIBS="-L${LOCALBASE}/li
CONFIGURE_ARGS+= --disable-nls --without-libiconv-prefix
PLIST_SUB+= NLS="@comment "
.else
-USE_ICONV= yes
-USES+= gettext
+USES+= gettext iconv
PLIST_SUB+= NLS=""
.endif
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index 795aa0680ba7..7ecf394cd3a4 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -47,7 +47,7 @@ FEATURES+= GD_FONTCONFIG
.endif
.if ${PORT_OPTIONS:MICONV}
-USE_ICONV= yes
+USES+= iconv
CPPFLAGS+= -DHAVE_ICONV -DHAVE_ICONV_H -DHAVE_ICONV_T_DEF
LDFLAGS+= -L${LOCALBASE}/lib -liconv
.endif
diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index 8b3d32674d6e..597a79dd420d 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -91,7 +91,7 @@ CONFIGURE_ARGS+=--with-hdf5=no
.if ${PORT_OPTIONS:MICONV}
CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE}
-USE_ICONV= yes
+USES+= iconv
.else
CONFIGURE_ARGS+=--with-libiconv-prefix=no
.endif
diff --git a/graphics/graphite2/Makefile b/graphics/graphite2/Makefile
index 41b98ef4ed5b..eea364fb8240 100644
--- a/graphics/graphite2/Makefile
+++ b/graphics/graphite2/Makefile
@@ -9,8 +9,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= office@FreeBSD.org
COMMENT= Rendering capabilities for complex non-Roman writing systems
-USES= cmake
-USE_ICONV= yes
+USES= cmake iconv
USE_LDCONFIG= yes
LDFLAGS+= -L${LOCALBASE}/lib -liconv
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index 4b1e68f495f6..f52caa29c127 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -132,7 +132,7 @@ CONFIGURE_ARGS+= --enable-tcl=no
.endif
.if ${PORT_OPTIONS:MICONV}
-USE_ICONV= yes
+USES+= iconv
CONFIGURE_ARGS+= --with-iconvlibdir=${LOCALBASE}/lib
CONFIGURE_ARGS+= --with-iconvincludedir=${LOCALBASE}/include
.else
diff --git a/graphics/ida/Makefile b/graphics/ida/Makefile
index 98d80a678dff..9990088ab95c 100644
--- a/graphics/ida/Makefile
+++ b/graphics/ida/Makefile
@@ -23,7 +23,7 @@ SANE_DESC= Enable SANE support
USE_MOTIF= yes
USE_PERL5_BUILD=yes
-USE_ICONV= yes
+USES= iconv
USE_GMAKE= yes
MAKEFILE= GNUmakefile
MAKE_ARGS= JPEG_VER=80 verbose=yes
diff --git a/graphics/inventor/Makefile b/graphics/inventor/Makefile
index cfd4dc3c77cd..d63a35c81303 100644
--- a/graphics/inventor/Makefile
+++ b/graphics/inventor/Makefile
@@ -25,7 +25,7 @@ CONFLICTS= Coin-* SoXt-*
USE_XORG= x11 xi
USE_GL= glw
USE_GMAKE= yes
-USE_ICONV= yes
+USES= iconv
USE_MOTIF= yes
USE_LDCONFIG= yes
ONLY_FOR_ARCHS= i386 amd64
diff --git a/graphics/libgaiagraphics/Makefile b/graphics/libgaiagraphics/Makefile
index 1f9349a65450..fb44a4573358 100644
--- a/graphics/libgaiagraphics/Makefile
+++ b/graphics/libgaiagraphics/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_ICONV= yes
+USES= iconv
CFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -liconv
diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile
index d4d6278ddd17..fab629249306 100644
--- a/graphics/libgphoto2/Makefile
+++ b/graphics/libgphoto2/Makefile
@@ -28,7 +28,7 @@ MAN3= libgphoto2.3 libgphoto2_port.3
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
-USE_ICONV= yes
+USES+= iconv
.else
USES+= gettext
PLIST_SUB+= NLS=""
diff --git a/graphics/libiptcdata/Makefile b/graphics/libiptcdata/Makefile
index f9311795bed7..f43429b25cc4 100644
--- a/graphics/libiptcdata/Makefile
+++ b/graphics/libiptcdata/Makefile
@@ -14,8 +14,7 @@ MAINTAINER= pav@FreeBSD.org
COMMENT= Library for manipulating IPTC metadata stored in image files
USE_AUTOTOOLS= libtool
-USE_GNOME= pkgconfig
-USE_ICONV= yes
+USES= pkgconfig iconv
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-nls
diff --git a/graphics/librasterlite/Makefile b/graphics/librasterlite/Makefile
index 6ef5eaf0da84..6c9b0e903a2c 100644
--- a/graphics/librasterlite/Makefile
+++ b/graphics/librasterlite/Makefile
@@ -21,9 +21,8 @@ LIB_DEPENDS= spatialite:${PORTSDIR}/databases/spatialite \
freexl:${PORTSDIR}/textproc/freexl
GNU_CONFIGURE= yes
-USES= pkgconfig
+USES= pkgconfig iconv
USE_GMAKE= yes
-USE_ICONV= yes
USE_LDCONFIG= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/graphics/libreatlas/Makefile b/graphics/libreatlas/Makefile
index 0af80c63cc02..6b62dd5aee22 100644
--- a/graphics/libreatlas/Makefile
+++ b/graphics/libreatlas/Makefile
@@ -31,9 +31,8 @@ LIB_DEPENDS= mspack:${PORTSDIR}/archivers/libmspack \
xcb:${PORTSDIR}/x11/libxcb
GNU_CONFIGURE= yes
-USES= pkgconfig gettext
+USES= pkgconfig gettext iconv
USE_GMAKE= yes
-USE_ICONV= yes
USE_XORG= ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
xfixes xi xinerama xrandr xrender xxf86vm
USE_GNOME= atk gdkpixbuf2 glib20 gtk20 pango
diff --git a/graphics/libsvg/Makefile b/graphics/libsvg/Makefile
index 3f3b16d350e8..57e2e4d3851a 100644
--- a/graphics/libsvg/Makefile
+++ b/graphics/libsvg/Makefile
@@ -21,8 +21,8 @@ LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
-USE_GNOME= libxml2 gnomehack
-USE_ICONV= yes
+USE_GNOME= libxml2
+USES= pathfix iconv
USE_LDCONFIG= yes
PLIST_FILES= include/svg.h \
diff --git a/graphics/opennurbs/Makefile b/graphics/opennurbs/Makefile
index e417093da4b8..c60c499e989c 100644
--- a/graphics/opennurbs/Makefile
+++ b/graphics/opennurbs/Makefile
@@ -14,7 +14,7 @@ COMMENT= Tools to accurately transfer 3-D geometry between applications
USE_DOS2UNIX= yes
USE_GMAKE= yes
USE_ZIP= yes
-USE_ICONV= build
+USES= iconv
MAKEFILE= makefile
EXAMPLESDIR= ${PREFIX}/libexec/openNURBS
diff --git a/graphics/scantailor/Makefile b/graphics/scantailor/Makefile
index 47745bf55ceb..6edf2304556e 100644
--- a/graphics/scantailor/Makefile
+++ b/graphics/scantailor/Makefile
@@ -17,8 +17,7 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
png15:${PORTSDIR}/graphics/png
BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
-USES= cmake gettext
-USE_ICONV= yes
+USES= cmake gettext iconv
USE_QT4= gui xml qmake_build uic_build moc_build rcc_build \
linguist_build
MAKE_JOBS_SAFE= yes
diff --git a/graphics/silgraphite/Makefile b/graphics/silgraphite/Makefile
index c7381abce9ed..75316fa76f82 100644
--- a/graphics/silgraphite/Makefile
+++ b/graphics/silgraphite/Makefile
@@ -21,7 +21,7 @@ CONFIGURE_ARGS= --without-xft --without-pangographite
.if ${PORT_OPTIONS:MFREETYPE}
LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2
-USE_ICONV= yes
+USES+= iconv
CONFIGURE_ARGS+= --with-freetype
PLIST_SUB+= WITH_FREETYPE=""
.else
diff --git a/graphics/sswf/Makefile b/graphics/sswf/Makefile
index c2df54a3b497..861e2fcf410d 100644
--- a/graphics/sswf/Makefile
+++ b/graphics/sswf/Makefile
@@ -16,8 +16,7 @@ LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USES= bison pkgconfig
-USE_ICONV= yes
+USES= bison pkgconfig iconv
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
USE_LDCONFIG= yes
diff --git a/graphics/swfmill/Makefile b/graphics/swfmill/Makefile
index 245bb69d99c1..59aaab58a942 100644
--- a/graphics/swfmill/Makefile
+++ b/graphics/swfmill/Makefile
@@ -14,9 +14,8 @@ LICENSE= GPLv2
LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \
freetype:${PORTSDIR}/print/freetype2
-USES= pkgconfig
+USES= pkgconfig iconv
USE_GNOME= libxml2 libxslt
-USE_ICONV= yes
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
MAKE_JOBS_SAFE= yes
diff --git a/graphics/zbar/Makefile b/graphics/zbar/Makefile
index 601f535d5096..d480372a2c43 100644
--- a/graphics/zbar/Makefile
+++ b/graphics/zbar/Makefile
@@ -15,7 +15,7 @@ LICENSE= LGPL21
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_LDCONFIG= yes
-USE_ICONV= yes
+USES= iconv
OPTIONS_DEFINE= X11 IMAGEMAGICK V4L PYTHON GTK2 QT4
OPTIONS_DEFAULT= X11 IMAGEMAGICK
diff --git a/irc/miau/Makefile b/irc/miau/Makefile
index b775d38bbe70..9144dfe135b2 100644
--- a/irc/miau/Makefile
+++ b/irc/miau/Makefile
@@ -14,7 +14,7 @@ MAINTAINER= dhn@FreeBSD.org
COMMENT= A fully featured easy to use IRC-bouncer
USE_BZIP2= yes
-USE_ICONV= yes
+USES= iconv
GNU_CONFIGURE= yes
INFO= miau
diff --git a/irc/scrollz/Makefile b/irc/scrollz/Makefile
index cd28a9d13ef4..67c84d31d234 100644
--- a/irc/scrollz/Makefile
+++ b/irc/scrollz/Makefile
@@ -16,7 +16,7 @@ DISTNAME= ScrollZ-${PORTVERSION}
MAINTAINER= mdv@unsavoury.net
COMMENT= Enhanced ircII client that supports scripts, colors, and more
-USE_ICONV= yes
+USES= iconv
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-ipv6 --enable-regexp --enable-iconv
diff --git a/irc/weechat-devel/Makefile b/irc/weechat-devel/Makefile
index 4c9dade22c97..1c42003246bc 100644
--- a/irc/weechat-devel/Makefile
+++ b/irc/weechat-devel/Makefile
@@ -16,10 +16,9 @@ LICENSE= GPLv3
CONFLICTS= weechat-0.3*
-USE_ICONV= yes
USE_LDCONFIG= yes
USE_NCURSES= yes
-USES= cmake
+USES= cmake iconv
CMAKE_ARGS+= -DENABLE_GUILE=no
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
WANT_PERL= yes
diff --git a/irc/weechat/Makefile b/irc/weechat/Makefile
index dff5058b82d4..f14cac4b063e 100644
--- a/irc/weechat/Makefile
+++ b/irc/weechat/Makefile
@@ -14,10 +14,9 @@ LICENSE= GPLv3
CONFLICTS= weechat-devel-0.*
-USE_ICONV= yes
USE_LDCONFIG= yes
USE_NCURSES= yes
-USES= cmake
+USES= cmake iconv
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
WANT_PERL= yes
diff --git a/irc/xchat1/Makefile b/irc/xchat1/Makefile
index d150ac2e7b1c..8828664425b6 100644
--- a/irc/xchat1/Makefile
+++ b/irc/xchat1/Makefile
@@ -21,7 +21,7 @@ COMMENT= X11 IRC client using the GTK+ toolkit, and optionally, GNOME
USE_BZIP2= yes
USE_GMAKE= yes
-USE_ICONV= yes
+USES= iconv
USE_PERL5= yes
USE_GNOME= gtk12
WANT_GNOME= yes
diff --git a/irc/znc/Makefile b/irc/znc/Makefile
index d58dc1bbc9d3..93f1e2a00865 100644
--- a/irc/znc/Makefile
+++ b/irc/znc/Makefile
@@ -13,9 +13,8 @@ LICENSE= GPLv2
FETCH_ARGS= -Fpr
GNU_CONFIGURE= yes
-USES= pkgconfig
+USES= pkgconfig iconv
USE_GMAKE= yes
-USE_ICONV= yes
WANT_PERL= yes
NO_OPTIONS_SORT= yes
diff --git a/japanese/chasen-base/Makefile b/japanese/chasen-base/Makefile
index d2e9a2cacd34..5227d1f28aff 100644
--- a/japanese/chasen-base/Makefile
+++ b/japanese/chasen-base/Makefile
@@ -21,7 +21,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/darts.h:${PORTSDIR}/devel/darts
USE_AUTOTOOLS= libtool
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-darts=${LOCALBASE}/include --with-libiconv=${LOCALBASE}
-USE_ICONV= yes
+USES= iconv
USE_LDCONFIG= yes
post-install:
diff --git a/japanese/cmigemo/Makefile b/japanese/cmigemo/Makefile
index 5ccb1080b4a8..d55c9f4cbf71 100644
--- a/japanese/cmigemo/Makefile
+++ b/japanese/cmigemo/Makefile
@@ -32,7 +32,7 @@ PORTDOCS= README_j.txt
USE_ZIP= yes
USE_GMAKE= yes
-USE_ICONV= yes
+USES= iconv
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX}
diff --git a/japanese/edict-utf-8/Makefile b/japanese/edict-utf-8/Makefile
index fd1a73648870..f3878e38ed73 100644
--- a/japanese/edict-utf-8/Makefile
+++ b/japanese/edict-utf-8/Makefile
@@ -12,7 +12,7 @@ COMMENT= Japanese-English edict UTF-8 dictionaries
EXTRACT_DEPENDS= ${UNZIP_CMD}:${PORTSDIR}/archivers/unzip
-USE_ICONV= yes
+USES= iconv
ICONV?= iconv
CONVERT_CMD= ${ICONV} -c -f EUC-JP -t UTF-8
diff --git a/japanese/groff/Makefile b/japanese/groff/Makefile
index e8ff345158b3..993a0843424b 100644
--- a/japanese/groff/Makefile
+++ b/japanese/groff/Makefile
@@ -33,7 +33,7 @@ TMAC_DISTNAME= tmac-${TMAC_DATE}_2
USE_GCC= any
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_ICONV= yes
+USES= iconv
CONFLICTS= groff-[0-9]*
diff --git a/japanese/lynx-current/Makefile b/japanese/lynx-current/Makefile
index c03b675b8b73..939f06a9ed1b 100644
--- a/japanese/lynx-current/Makefile
+++ b/japanese/lynx-current/Makefile
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+=--with-screen=ncurses --with-zlib --libdir="${L_LIB}" \
--with-bzlib
.if !defined(WITHOUT_JAPANESE_UTF8)
-USE_ICONV= yes
+USES+= iconv
CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE} \
--enable-japanese-utf8
.else
diff --git a/japanese/lynx/Makefile b/japanese/lynx/Makefile
index 2ed87b78537f..8c6e3e0cb0fe 100644
--- a/japanese/lynx/Makefile
+++ b/japanese/lynx/Makefile
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+=--with-screen=ncurses --with-zlib --libdir="${L_LIB}" \
--with-bzlib
.if !defined(WITHOUT_JAPANESE_UTF8)
-USE_ICONV= yes
+USES+= iconv
CONFIGURE_ARGS+=--with-libiconv-prefix=${LOCALBASE} \
--enable-japanese-utf8
.else
diff --git a/japanese/mecab/Makefile b/japanese/mecab/Makefile
index 998e64ef54e7..e670a443484c 100644
--- a/japanese/mecab/Makefile
+++ b/japanese/mecab/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE_GPLv2= ${WRKSRC}/GPL
LICENSE_FILE_LGPL21= ${WRKSRC}/LGPL
USE_AUTOTOOLS= libtool
-USE_ICONV= yes
+USES= iconv
USE_PERL5_BUILD= yes
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile
index 68753164607b..5adba7e5c232 100644
--- a/japanese/mozc-server/Makefile
+++ b/japanese/mozc-server/Makefile
@@ -15,10 +15,9 @@ COMMENT?= Mozc server for IBus and others
LIB_DEPENDS= protobuf:${PORTSDIR}/devel/protobuf
RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils
-USES= pkgconfig
+USES= pkgconfig iconv
USE_BZIP2= yes
USE_GMAKE= yes
-USE_ICONV= yes
USE_PYTHON= yes
USE_OPENSSL= yes
diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index 98e69cfb89a4..b0fb56a619e0 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -57,7 +57,7 @@ FETCH_BEFORE_ARGS= -A # ha4.seikyou.ne.jp is running broken httpd
NO_LATEST_LINK= yes
USE_GMAKE= yes
-USE_ICONV= yes
+USES= iconv
USE_AUTOTOOLS= automake autoconf
USE_OPENSSL= yes
WRKSRC= ${WRKDIR}/mutt-${VERSION}
diff --git a/japanese/scim-anthy/Makefile b/japanese/scim-anthy/Makefile
index 2ad4038c781d..10a663d8fafc 100644
--- a/japanese/scim-anthy/Makefile
+++ b/japanese/scim-anthy/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} \
kasumi:${PORTSDIR}/japanese/kasumi
USE_GNOME= lthack
-USE_ICONV= yes
+USES= iconv
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/japanese/scim-canna/Makefile b/japanese/scim-canna/Makefile
index 02fe2edccf39..8b13e0f369e1 100644
--- a/japanese/scim-canna/Makefile
+++ b/japanese/scim-canna/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_AUTOTOOLS= libtool
USE_GNOME= lthack
-USE_ICONV= yes
+USES= iconv
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/japanese/scim-honoka-plugin-romkan/Makefile b/japanese/scim-honoka-plugin-romkan/Makefile
index 03c9d312ca0d..a81a3ce7aaa0 100644
--- a/japanese/scim-honoka-plugin-romkan/Makefile
+++ b/japanese/scim-honoka-plugin-romkan/Makefile
@@ -19,9 +19,8 @@ BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim \
${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/honoka.so:${PORTSDIR}/japanese/scim-honoka
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USES= gettext
-USE_GNOME= lthack gnomehack
-USE_ICONV= yes
+USES= gettext iconv pathfix
+USE_GNOME= lthack
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
diff --git a/japanese/scim-honoka-plugin-wnn/Makefile b/japanese/scim-honoka-plugin-wnn/Makefile
index fdb72658ea30..d5dcee4a6229 100644
--- a/japanese/scim-honoka-plugin-wnn/Makefile
+++ b/japanese/scim-honoka-plugin-wnn/Makefile
@@ -22,9 +22,8 @@ RUN_DEPENDS= scim:${PORTSDIR}/textproc/scim \
${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/honoka.so:${PORTSDIR}/japanese/scim-honoka \
${LOCALBASE}/lib/scim-1.0/1.4.0/honoka/plugin-romkan.so:${PORTSDIR}/japanese/scim-honoka-plugin-romkan
-USES= gettext
-USE_GNOME= lthack gnomehack
-USE_ICONV= yes
+USES= gettext iconv pathfix
+USE_GNOME= lthack
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
diff --git a/japanese/scim-honoka/Makefile b/japanese/scim-honoka/Makefile
index 04d077b502da..d0f0a1bc9b31 100644
--- a/japanese/scim-honoka/Makefile
+++ b/japanese/scim-honoka/Makefile
@@ -19,9 +19,8 @@ BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim
RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_LDCONFIG= yes
-USES= gettext
-USE_GNOME= lthack gnomehack
-USE_ICONV= yes
+USES= gettext iconv pathfix
+USE_GNOME= lthack
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
diff --git a/japanese/scim-prime/Makefile b/japanese/scim-prime/Makefile
index 3e80a18fcb72..dedc02e4082d 100644
--- a/japanese/scim-prime/Makefile
+++ b/japanese/scim-prime/Makefile
@@ -20,7 +20,7 @@ BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim \
RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_GNOME= lthack
-USE_ICONV= yes
+USES= iconv
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/japanese/scim-skk/Makefile b/japanese/scim-skk/Makefile
index 4b0600766075..9b265de2c152 100644
--- a/japanese/scim-skk/Makefile
+++ b/japanese/scim-skk/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= scim:${PORTSDIR}/textproc/scim
RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_AUTOTOOLS= libtool
-USE_ICONV= yes
+USES= iconv
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/japanese/scim-tomoe/Makefile b/japanese/scim-tomoe/Makefile
index 10a7da436678..c1200ee12f73 100644
--- a/japanese/scim-tomoe/Makefile
+++ b/japanese/scim-tomoe/Makefile
@@ -19,8 +19,7 @@ LIB_DEPENDS= tomoe.1:${PORTSDIR}/japanese/tomoe \
tomoe-gtk.1:${PORTSDIR}/japanese/libtomoe-gtk
USE_GNOME= lthack intlhack
-USES= gettext
-USE_ICONV= yes
+USES= gettext iconv
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/japanese/scim-uim/Makefile b/japanese/scim-uim/Makefile
index 7a7061e9a6c4..ad8234cadf8b 100644
--- a/japanese/scim-uim/Makefile
+++ b/japanese/scim-uim/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= uim:${PORTSDIR}/textproc/uim
RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_GNOME= lthack
-USE_ICONV= yes
+USES= iconv
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/java/classpath/Makefile b/java/classpath/Makefile
index fb7310e5fd9e..054db015678f 100644
--- a/java/classpath/Makefile
+++ b/java/classpath/Makefile
@@ -17,9 +17,8 @@ COMMENT= A GNU project to create a free Java class library
LICENSE= GPLv2
GNU_CONFIGURE= yes
-USES= pkgconfig
+USES= pkgconfig iconv
USE_GMAKE= yes
-USE_ICONV= yes
USE_LDCONFIG= yes
USE_PERL5_BUILD=yes
USE_XORG= x11 ice xtst xaw xproto xext
diff --git a/java/jikes/Makefile b/java/jikes/Makefile
index 1077e5d6e819..73a1c9ed21de 100644
--- a/java/jikes/Makefile
+++ b/java/jikes/Makefile
@@ -19,7 +19,7 @@ MAN1= jikes.1
PLIST_SUB= PORTVERSION=${PORTVERSION}
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_ICONV= yes
+USES= iconv
USE_BZIP2= yes
CONFIGURE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile
index a516d5ba2da8..1cfabbaed0c6 100644
--- a/java/openjdk7/Makefile
+++ b/java/openjdk7/Makefile
@@ -31,7 +31,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
USE_ZIP= yes
USE_GMAKE= yes
-USE_ICONV= yes
+USES= iconv
USE_XORG+= x11 xext xi xrender xt xtst
MAKE_JOBS_UNSAFE= yes
diff --git a/java/sablevm/Makefile b/java/sablevm/Makefile
index b56b2398c3cf..fa94faa79783 100644
--- a/java/sablevm/Makefile
+++ b/java/sablevm/Makefile
@@ -19,9 +19,8 @@ RUN_DEPENDS= fastjar:${PORTSDIR}/archivers/fastjar
GNU_CONFIGURE= yes
USE_AUTOTOOLS= libltdl
USE_GMAKE= yes
-USE_ICONV= yes
USE_LDCONFIG= yes
-USES= pkgconfig gettext
+USES= pkgconfig gettext iconv
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/korean/ami/Makefile b/korean/ami/Makefile
index 4db98161901d..e392cfb152d2 100644
--- a/korean/ami/Makefile
+++ b/korean/ami/Makefile
@@ -20,7 +20,7 @@ COMMENT= Well-known Korean X11 Input Method
LICENSE= GPLv2
-USE_ICONV= yes
+USES= iconv
USE_GMAKE= yes
USE_GNOME= gtk12 gdkpixbuf
WANT_GNOME= yes
diff --git a/korean/libhangul/Makefile b/korean/libhangul/Makefile
index 0d31e85f7396..8f757045d4ab 100644
--- a/korean/libhangul/Makefile
+++ b/korean/libhangul/Makefile
@@ -15,7 +15,7 @@ COMMENT= Library for Hangul processing
LICENSE= LGPL21
-USE_ICONV= yes
+USES= iconv
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index c1e411baf3ac..b937820371dc 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -22,7 +22,7 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/GNU-GPL
USE_GCC= any
-USE_ICONV= yes
+USES= iconv
USE_LDCONFIG= yes
USE_GHOSTSCRIPT_BUILD= yes
WANT_GNOME= yes
diff --git a/lang/gauche/Makefile b/lang/gauche/Makefile
index b6211658f9df..a659bc94159f 100644
--- a/lang/gauche/Makefile
+++ b/lang/gauche/Makefile
@@ -39,7 +39,7 @@ PLIST_SUB= VERSION="${PORTVERSION}" \
# INFOSECTION="${INFOSECTION}"
-USE_ICONV= yes
+USES= iconv
USE_LDCONFIG= yes
MAN1= gosh.1 gauche-cesconv.1 gauche-config.1 gauche-install.1 \
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index c0cdeead5088..c937a86812e0 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -30,10 +30,9 @@ GCC_VERSION= ${PORTVERSION:C/(.+)\.[0-9]{8}/\1/}
SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
ONLY_FOR_ARCHS= amd64 i386 ia64 powerpc sparc64
USE_BINUTILS= yes
-USES= bison
+USES= bison iconv
USE_BZIP2= yes
USE_GMAKE= yes
-USE_ICONV= yes
USE_PERL5_BUILD=yes
MAKE_JOBS_SAFE= yes
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index a5eca33842fd..e01f5cedd939 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -18,10 +18,9 @@ COMMENT= GNU Compiler Collection 3.4
SUFFIX= 34
LATEST_LINK= gcc${SUFFIX}${PKGNAMESUFFIX}
-USES= bison
+USES= bison iconv
USE_BZIP2= yes
USE_GMAKE= yes
-USE_ICONV= yes
USE_PERL5_BUILD=yes
MAKE_JOBS_SAFE= yes
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 2cf116f14949..7d48556b2059 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -23,11 +23,10 @@ VERSIONSTRING= ${PORTVERSION:C/([0-9]+\.[0-9]+).*\.([0-9]+)/\1-\2/}
SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
LATEST_LINK= gcc${SUFFIX}${PKGNAMESUFFIX}
NOT_FOR_ARCHS= arm powerpc
-USES= bison
+USES= bison iconv
USE_BZIP2= yes
USE_GCC= any
USE_GMAKE= yes
-USE_ICONV= yes
USE_PERL5_BUILD=yes
MAKE_JOBS_SAFE= yes
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 212ee36613d1..f7228181d39f 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -22,11 +22,10 @@ SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
LATEST_LINK= gcc${SUFFIX}${PKGNAMESUFFIX}
ONLY_FOR_ARCHS= amd64 i386 sparc64
USE_BINUTILS= yes
-USES= bison
+USES= bison iconv
USE_BZIP2= yes
USE_GCC= any
USE_GMAKE= yes
-USE_ICONV= yes
USE_PERL5_BUILD=yes
MAKE_JOBS_SAFE= yes
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 7e393d920048..c378435eeea2 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -31,10 +31,9 @@ SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
LATEST_LINK= gcc${SUFFIX}${PKGNAMESUFFIX}
ONLY_FOR_ARCHS= amd64 i386 ia64 powerpc sparc64
USE_BINUTILS= yes
-USES= bison
+USES= bison iconv
USE_BZIP2= yes
USE_GMAKE= yes
-USE_ICONV= yes
USE_PERL5_BUILD=yes
MAKE_JOBS_SAFE= yes
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 06cae83b5ff9..986de670836a 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -29,10 +29,9 @@ SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
LATEST_LINK= gcc${SUFFIX}${PKGNAMESUFFIX}
ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 sparc64
USE_BINUTILS= yes
-USES= bison
+USES= bison iconv
USE_BZIP2= yes
USE_GMAKE= yes
-USE_ICONV= yes
USE_PERL5_BUILD=yes
MAKE_JOBS_SAFE= yes
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 68149a217c03..35de823eb3f2 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -29,10 +29,9 @@ SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
LATEST_LINK= gcc${SUFFIX}${PKGNAMESUFFIX}
ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 sparc64
USE_BINUTILS= yes
-USES= bison
+USES= bison iconv
USE_BZIP2= yes
USE_GMAKE= yes
-USE_ICONV= yes
USE_PERL5_BUILD=yes
MAKE_JOBS_SAFE= yes
diff --git a/lang/gcc49/Makefile b/lang/gcc49/Makefile
index a85acb7233b9..e76a447516f0 100644
--- a/lang/gcc49/Makefile
+++ b/lang/gcc49/Makefile
@@ -29,10 +29,9 @@ SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
LATEST_LINK= gcc${SUFFIX}${PKGNAMESUFFIX}
ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 sparc64
USE_BINUTILS= yes
-USES= bison
+USES= bison iconv
USE_BZIP2= yes
USE_GMAKE= yes
-USE_ICONV= yes
USE_PERL5_BUILD=yes
MAKE_JOBS_SAFE= yes
diff --git a/lang/gdc/Makefile b/lang/gdc/Makefile
index 01cb808a03bb..3776c9a30a03 100644
--- a/lang/gdc/Makefile
+++ b/lang/gdc/Makefile
@@ -19,11 +19,10 @@ ONLY_FOR_ARCHS= i386 amd64
BROKEN= fails to build
-USES= bison
+USES= bison iconv
USE_BZIP2= yes
USE_GMAKE= yes
USE_PERL5= yes
-USE_ICONV= yes
SRCDIR= ${WRKDIR}/gcc-${GCC_VERSIONSTRING}
WRKSRC= ${WRKDIR}/build
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 502c08e9dfaa..10f62cba38d0 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -30,7 +30,7 @@ LIB_DEPENDS+= gmp.10:${PORTSDIR}/math/gmp
USE_AUTOTOOLS= autoconf autoheader
USE_PERL5_BUILD= yes
USE_GMAKE= yes
-USE_ICONV= yes
+USES= iconv
USE_BINUTILS= yes
USE_GCC= 4.6+
USE_NCURSES= yes
diff --git a/lang/gnat/Makefile b/lang/gnat/Makefile
index a7215c7d395f..63ecbfe64448 100644
--- a/lang/gnat/Makefile
+++ b/lang/gnat/Makefile
@@ -26,8 +26,7 @@ LICENSE= GPLv3 LGPL3
ONLY_FOR_ARCHS= i386
USE_GMAKE= yes
-USES= bison
-USE_ICONV= yes
+USES= bison iconv
USE_PERL5_BUILD= yes
WRKSRC= ${WRKDIR}/build
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index 7d40861ed439..02b2773b1f12 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -30,8 +30,7 @@ USE_GNUSTEP_CONFIGURE= yes
USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_SYSTEM_LIBRARIES}
-USE_ICONV= yes
-USES= pkgconfig
+USES= pkgconfig iconv
MAKE_FLAGS= OPTFLAG="${CFLAGS}"
MAKE_ENV+= GNUSTEP_INSTALLATION_DOMAIN=SYSTEM
diff --git a/lang/opa/Makefile b/lang/opa/Makefile
index 986df3632c5c..2b89393f4017 100644
--- a/lang/opa/Makefile
+++ b/lang/opa/Makefile
@@ -29,7 +29,7 @@ GITVER= 2988
USE_JAVA= yes
JAVA_BUILD= yes
USE_GMAKE= yes
-USE_ICONV= yes
+USES= iconv
USE_OCAML= yes
HAS_CONFIGURE= yes
diff --git a/lang/petite-chez/Makefile b/lang/petite-chez/Makefile
index 6d2f76e6fc7d..b92046bfbfbf 100644
--- a/lang/petite-chez/Makefile
+++ b/lang/petite-chez/Makefile
@@ -30,7 +30,7 @@ OPTIONS_DEFINE= THREADS
WRKSRC= ${WRKDIR}/csv${PORTVERSION}/custom
HAS_CONFIGURE= yes
-USE_ICONV= yes
+USES= iconv
CONFIGURE_ARGS= --installprefix=${PREFIX} \
--installman=${MANPREFIX}/man \
--force-relink \
diff --git a/lang/pypy/Makefile b/lang/pypy/Makefile
index 47fb54cc4725..008d66b678ce 100644
--- a/lang/pypy/Makefile
+++ b/lang/pypy/Makefile
@@ -34,8 +34,7 @@ MANUAL_PACKAGE_BUILD= runaway process on pointyhat
ALL_TARGET= ${PYPY_NAMES}
BUILD_WRKSRC= ${WRKDIR}
USE_BZIP2= yes
-USE_ICONV= yes
-USES= gettext
+USES= gettext iconv
MAKE_JOBS_SAFE= yes
MAKEFILE= ${FILESDIR}/Makefile
PKGINSTALL= ${WRKDIR}/pkg-install
diff --git a/lang/q/Makefile b/lang/q/Makefile
index a6c33321bac5..fd7abe390402 100644
--- a/lang/q/Makefile
+++ b/lang/q/Makefile
@@ -20,9 +20,8 @@ LIB_DEPENDS= MagickWand:${PORTSDIR}/graphics/ImageMagick \
xslt.2:${PORTSDIR}/textproc/libxslt \
ggi.2:${PORTSDIR}/graphics/libggi
-USES= bison
+USES= bison iconv
USE_GCC= any
-USE_ICONV= yes
USE_TK= 84+
USE_LDCONFIG= yes
diff --git a/lang/qore/Makefile b/lang/qore/Makefile
index 56be3319b354..c4fbffa80499 100644
--- a/lang/qore/Makefile
+++ b/lang/qore/Makefile
@@ -17,8 +17,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
USE_BZIP2= yes
USE_GMAKE= yes
-USES= pathfix
-USE_ICONV= yes
+USES= pathfix iconv
USE_OPENSSL= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
diff --git a/lang/racket-textual/Makefile b/lang/racket-textual/Makefile
index 84ce46a0c6b7..2f2f9e312304 100644
--- a/lang/racket-textual/Makefile
+++ b/lang/racket-textual/Makefile
@@ -49,7 +49,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src/build
-USE_ICONV= yes
+USES+= iconv
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:env
diff --git a/lang/racket/Makefile b/lang/racket/Makefile
index 847ae399635a..7fbbadf1a5a8 100644
--- a/lang/racket/Makefile
+++ b/lang/racket/Makefile
@@ -58,7 +58,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
CPPFLAGS+= -I${LOCALBASE}/include
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src/build
-USE_ICONV= yes
+USES+= iconv
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool:env
diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index 832d674d7397..672c73ff57e9 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -25,8 +25,8 @@ OPTIONS_DEFINE= TCL PGSQL SDL
OPTIONS_DEFAULT=TCL PGSQL SDL
USE_AUTOTOOLS= libtool
-USE_GNOME= gnomehack pkgconfig pango
-USE_ICONV= yes
+USE_GNOME= pango
+USES= pathfix pkgconfig iconv
USE_SQLITE= yes
USE_GMAKE= yes
USE_XORG= ice xi xmu
diff --git a/mail/anubis/Makefile b/mail/anubis/Makefile
index 2baf505280b4..77a5f396edef 100644
--- a/mail/anubis/Makefile
+++ b/mail/anubis/Makefile
@@ -46,8 +46,7 @@ MAKE_JOBS_UNSAFE= yes
_REQUIRE= mail
.if ${PORT_OPTIONS:MNLS}
-USE_ICONV= yes
-USES+= gettext
+USES+= gettext iconv
PLIST_SUB+= NLS=""
.else
CONFIGURE_ARGS+=--disable-nls
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 34d571390c9a..ede5751e9beb 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -25,12 +25,11 @@ INSTALLS_OMF= yes
INSTALLS_ICONS= yes
USE_PERL5= yes
USE_OPENSSL= yes
-USES= pathfix gettext
+USES= pathfix gettext iconv
USE_GNOME= gnomeprefix intlhack libgnomeui gtkhtml3 \
libgnomeprintui
USE_AUTOTOOLS= libltdl
GNU_CONFIGURE= yes
-USE_ICONV= yes
CONFIGURE_ARGS= --enable-threads \
--disable-more-warnings \
--with-ssl \
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index 660dd3e6deb7..522e46bc8adf 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -40,7 +40,7 @@ BF_CPPFLAGS?= -I${BDB_INCLUDE_DIR} -I${LOCALBASE}/include
CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/etc
.if ${PORT_OPTIONS:MUNICODE}
CONFIGURE_ARGS+= --enable-unicode
-USE_ICONV= yes
+USES+= iconv
BF_LIBS+= -liconv
.endif
.if ${PORT_OPTIONS:MGSL}
diff --git a/mail/claws-mail-address_keeper/Makefile b/mail/claws-mail-address_keeper/Makefile
index 1bbd5f07d60f..6370c77d4bde 100644
--- a/mail/claws-mail-address_keeper/Makefile
+++ b/mail/claws-mail-address_keeper/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_ICONV= yes
+USES= iconv
MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/mail/claws-mail-attach_warner/Makefile b/mail/claws-mail-attach_warner/Makefile
index d6483148fc8c..b0c89f43cd0f 100644
--- a/mail/claws-mail-attach_warner/Makefile
+++ b/mail/claws-mail-attach_warner/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
RUN_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
USE_GMAKE= yes
-USE_ICONV= yes
+USES= iconv
USE_AUTOTOOLS= autoconf
MAKE_JOBS_SAFE= yes
diff --git a/mail/claws-mail-clamd/Makefile b/mail/claws-mail-clamd/Makefile
index 48935b42f7f0..5d75cf30e4d8 100644
--- a/mail/claws-mail-clamd/Makefile
+++ b/mail/claws-mail-clamd/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail \
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_ICONV= yes
+USES= iconv
MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/mail/claws-mail-fancy/Makefile b/mail/claws-mail-fancy/Makefile
index 2b5b10f85371..b64b56e72735 100644
--- a/mail/claws-mail-fancy/Makefile
+++ b/mail/claws-mail-fancy/Makefile
@@ -20,7 +20,7 @@ RUN_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
USE_GMAKE= yes
USE_AUTOTOOLS= autoconf
-USE_ICONV= yes
+USES= iconv
USE_GNOME= gtk20
MAKE_JOBS_SAFE= yes
diff --git a/mail/claws-mail-fetchinfo/Makefile b/mail/claws-mail-fetchinfo/Makefile
index 6d38eeb1a767..a43bfadb21a4 100644
--- a/mail/claws-mail-fetchinfo/Makefile
+++ b/mail/claws-mail-fetchinfo/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
USE_GMAKE= yes
USE_AUTOTOOLS= autoconf
-USE_ICONV= yes
+USES= iconv
MAKE_JOBS_SAFE= yes
.include <bsd.port.options.mk>
diff --git a/mail/claws-mail-gdata/Makefile b/mail/claws-mail-gdata/Makefile
index 1d5fa8d5f056..44a966f10fa8 100644
--- a/mail/claws-mail-gdata/Makefile
+++ b/mail/claws-mail-gdata/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS= gdata:${PORTSDIR}/devel/libgdata
RUN_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
GNU_CONFIGURE= yes
-USE_ICONV= yes
+USES= iconv
USE_GMAKE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/mail/claws-mail-gtkhtml2_viewer/Makefile b/mail/claws-mail-gtkhtml2_viewer/Makefile
index d8494ddec9f1..09b3c043119d 100644
--- a/mail/claws-mail-gtkhtml2_viewer/Makefile
+++ b/mail/claws-mail-gtkhtml2_viewer/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
USE_GMAKE= yes
USE_AUTOTOOLS= autoconf
USE_GNOME= gtk20
-USE_ICONV= yes
+USES= iconv
MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/mail/claws-mail-pdf_viewer/Makefile b/mail/claws-mail-pdf_viewer/Makefile
index 68e00d20cbbc..ff86a1c1a181 100644
--- a/mail/claws-mail-pdf_viewer/Makefile
+++ b/mail/claws-mail-pdf_viewer/Makefile
@@ -17,7 +17,7 @@ BUILD_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
RUN_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
USE_GMAKE= yes
-USE_ICONV= yes
+USES= iconv
USE_GHOSTSCRIPT=yes
USE_AUTOTOOLS= autoconf
MAKE_JOBS_SAFE= yes
diff --git a/mail/claws-mail-rssyl/Makefile b/mail/claws-mail-rssyl/Makefile
index b2684db16823..6ea8e6afe907 100644
--- a/mail/claws-mail-rssyl/Makefile
+++ b/mail/claws-mail-rssyl/Makefile
@@ -18,7 +18,7 @@ BUILD_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
RUN_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
USE_AUTOTOOLS= autoconf
-USE_ICONV= yes
+USES= iconv
MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/mail/claws-mail-vcalendar/Makefile b/mail/claws-mail-vcalendar/Makefile
index e482788bd2f0..49946ca013eb 100644
--- a/mail/claws-mail-vcalendar/Makefile
+++ b/mail/claws-mail-vcalendar/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
RUN_DEPENDS= claws-mail>=3.9.0:${PORTSDIR}/mail/claws-mail
USE_GMAKE= yes
-USE_ICONV= yes
+USES= iconv
USE_AUTOTOOLS= autoconf
MAKE_JOBS_SAFE= yes
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 57dc148642c6..8db58cc0a84f 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -37,12 +37,11 @@ CONFLICTS= sylpheed-claws
USE_BZIP2= yes
USE_GMAKE= yes
-USE_ICONV= yes
USE_XORG= ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
xfixes xi xinerama xrandr xrender
USE_GNOME= atk glib20 gnomehack gtk20 libartlgpl2 libxml2 pango
GNU_CONFIGURE= yes
-USES= pkgconfig
+USES= pkgconfig iconv
INSTALLS_ICONS= yes
MAKE_JOBS_SAFE= yes
diff --git a/mail/cone/Makefile b/mail/cone/Makefile
index d07f5eb09ad8..9ba1522c5f92 100644
--- a/mail/cone/Makefile
+++ b/mail/cone/Makefile
@@ -23,8 +23,7 @@ BUILD_DEPENDS= gpgv:${PORTSDIR}/security/gnupg1
RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_FAM= yes
-USES= gettext
-USE_ICONV= yes
+USES= gettext iconv
USE_GNOME= libxml2
USE_BZIP2= yes
diff --git a/mail/crm114/Makefile b/mail/crm114/Makefile
index 396a02925f8b..d263764e3bc9 100644
--- a/mail/crm114/Makefile
+++ b/mail/crm114/Makefile
@@ -24,8 +24,7 @@ LIB_DEPENDS= tre.5:${PORTSDIR}/textproc/libtre
CRM114RELEASENAME=BlameMichelson
-USES= gettext
-USE_ICONV= yes
+USES= gettext iconv
MAKE_ARGS= CC="${CC}" prefix="${PREFIX}" \
LIBS="${LIBS}" \
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 10f877c37cbe..7751ea548938 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -30,7 +30,7 @@ DOVECOTVERSION= 1.2
# consult the maintainer of those ports before updating this one. #
######################################################################
-USE_ICONV= yes
+USES= iconv
USE_RC_SUBR= dovecot
GNU_CONFIGURE= yes
diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index 997c57703b65..c985d0cc9a86 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -23,7 +23,7 @@ CONFLICTS= dovecot-1.[0-9]*
# port before updating this one. #
######################################################################
-USE_ICONV= yes
+USES= iconv
USE_RC_SUBR= dovecot
MAKE_JOBS_SAFE= yes
diff --git a/mail/elm+ME/Makefile b/mail/elm+ME/Makefile
index a32a4c0e5e95..4e5811023ec5 100644
--- a/mail/elm+ME/Makefile
+++ b/mail/elm+ME/Makefile
@@ -89,7 +89,7 @@ ELM_PATCHDONE= true
.endfor
.if ${PORT_OPTIONS:MICONV}
-USE_ICONV= yes
+USES+= iconv
.endif
.for shlib in iconv smtp tls
diff --git a/mail/elmo-devel/Makefile b/mail/elmo-devel/Makefile
index a23a04271ec1..9f89186bce2a 100644
--- a/mail/elmo-devel/Makefile
+++ b/mail/elmo-devel/Makefile
@@ -14,7 +14,7 @@ COMMENT= Receive, filter, read, compose, and send mail at the text console
CONFLICTS= elmo-[0-9]*
GNU_CONFIGURE= yes
-USE_ICONV= yes
+USES= iconv
USE_OPENSSL= yes
USE_PERL5_RUN= yes
diff --git a/mail/elmo/Makefile b/mail/elmo/Makefile
index 7fc2d880bade..d37e15c0b6a2 100644
--- a/mail/elmo/Makefile
+++ b/mail/elmo/Makefile
@@ -13,7 +13,7 @@ COMMENT= Receive, filter, read, compose, and send mail at the text console
CONFLICTS= elmo-devel-[0-9]*
GNU_CONFIGURE= yes
-USE_ICONV= yes
+USES= iconv
USE_OPENSSL= yes
USE_PERL5_RUN= yes
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 9a3cb7413d4b..230ebedc3817 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -238,7 +238,7 @@ SEDLIST+= -e 's,XX_TCP_WRAPPERS_LIBS_XX,,'
.endif
.if !defined(WITHOUT_ICONV)
-USE_ICONV= yes
+USES= iconv
SEDLIST+= -e 's,XX_ICONV_LIBS_XX,-L${LOCALBASE:S/,/\\,/g}/lib -liconv,' \
-e 's,^\# (HAVE_ICONV=),\1,'
.else
diff --git a/mail/gmime2/Makefile b/mail/gmime2/Makefile
index 7a65d0c7d2d6..cd9768859d97 100644
--- a/mail/gmime2/Makefile
+++ b/mail/gmime2/Makefile
@@ -16,10 +16,9 @@ CONFLICTS= gmime-1.0.* gmime-2.4.*
SLAVEDIRS= mail/gmime2-sharp
-USE_ICONV= yes
USE_GMAKE= yes
USE_GNOME?= gnomehack glib20
-USES= pkgconfig
+USES= pkgconfig iconv
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
# www.freebsd.org/cgi/query-pr.cgi?pr=118092
diff --git a/mail/gmime24/Makefile b/mail/gmime24/Makefile
index 79e163d4639d..4d85e6640147 100644
--- a/mail/gmime24/Makefile
+++ b/mail/gmime24/Makefile
@@ -18,10 +18,9 @@ CONFLICTS= gmime-1.0.*
SLAVEDIRS= mail/gmime2-sharp
DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}24
-USE_ICONV= yes
USE_GMAKE= yes
USE_GNOME?= gnomehack glib20
-USES= pkgconfig
+USES= pkgconfig iconv
USE_LDCONFIG= yes
USE_XZ= yes
GNU_CONFIGURE= yes
diff --git a/mail/gnarwl/Makefile b/mail/gnarwl/Makefile
index 08009513e1cd..854e922bec2e 100644
--- a/mail/gnarwl/Makefile
+++ b/mail/gnarwl/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= gdbm.4:${PORTSDIR}/databases/gdbm
BUILD_DEPENDS= ${LOCALBASE}/bin/gsed:${PORTSDIR}/textproc/gsed
USE_GMAKE= yes
-USE_ICONV= yes
+USES= iconv
USE_OPENLDAP= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} --with-docdir=${DOCSDIR}
diff --git a/mail/heirloom-mailx/Makefile b/mail/heirloom-mailx/Makefile
index f9affc100dfe..4697fc4ba1bc 100644
--- a/mail/heirloom-mailx/Makefile
+++ b/mail/heirloom-mailx/Makefile
@@ -17,7 +17,7 @@ CONFLICTS= mailx-[0-9]*
MAKE_JOBS_UNSAFE= yes
USE_BZIP2= yes
-USE_ICONV= yes
+USES= iconv
USE_OPENSSL= yes
MAKE_ARGS= PREFIX="${PREFIX}" \
SYSCONFDIR="${PREFIX}/etc" \
diff --git a/mail/hotwayd/Makefile b/mail/hotwayd/Makefile
index efa6b897cc8a..ea3ef962ac35 100644
--- a/mail/hotwayd/Makefile
+++ b/mail/hotwayd/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \
USE_BZIP2= yes
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_ICONV= yes
+USES= iconv
MAN1= hotwayd.1 \
hotsmtpd.1
diff --git a/mail/libetpan/Makefile b/mail/libetpan/Makefile
index f50c99f37974..c583da57183e 100644
--- a/mail/libetpan/Makefile
+++ b/mail/libetpan/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
USE_AUTOTOOLS= libtool autoconf
AUTOTOOLSFILES= aclocal.m4
USE_GMAKE= yes
-USE_ICONV= yes
+USES= iconv
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
diff --git a/mail/libpst/Makefile b/mail/libpst/Makefile
index a7894f269558..4fc727603265 100644
--- a/mail/libpst/Makefile
+++ b/mail/libpst/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS= gsf-1:${PORTSDIR}/devel/libgsf
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_ICONV= yes
+USES= iconv
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -liconv
CONFIGURE_ARGS+= --disable-python
diff --git a/mail/libvmime/Makefile b/mail/libvmime/Makefile
index c7a550a039bf..dca3f7efb91d 100644
--- a/mail/libvmime/Makefile
+++ b/mail/libvmime/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS+= gsasl:${PORTSDIR}/security/gsasl
USE_BZIP2= yes
USE_GMAKE= yes
-USE_ICONV= yes
+USES= iconv
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
diff --git a/mail/lurker/Makefile b/mail/lurker/Makefile
index f51eabebba18..9dd2421420d2 100644
--- a/mail/lurker/Makefile
+++ b/mail/lurker/Makefile
@@ -20,7 +20,7 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
MIMELIB_VERSION= 3.1.1
-USE_ICONV= yes
+USES= iconv
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index 265452a669dc..543edf0bec82 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -28,7 +28,7 @@ LICENSE= GPLv3
USE_BZIP2= yes
USE_PERL5= yes
-USE_ICONV= yes
+USES= iconv
GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
CONFIGURE_ARGS= --enable-syslog=1 \
diff --git a/mail/mmr/Makefile b/mail/mmr/Makefile
index 0d96f082c4bb..a0551aab2c25 100644
--- a/mail/mmr/Makefile
+++ b/mail/mmr/Makefile
@@ -17,7 +17,7 @@ COMMENT= Curses based MIME Mail Reader
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
-USE_ICONV= yes
+USES= iconv
MAKE_ARGS= LIBS='${LDFLAGS}' CXX='${CXX}' CXXFLAGS='${CXXFLAGS}'
ALL_TARGET= ${PORTNAME}
MAKE_JOBS_SAFE= yes
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 7c35b15608f2..eba4c86a101f 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -236,7 +236,7 @@ CONFIGURE_ARGS+= --enable-locales-fix
.endif
.if ${PORT_OPTIONS:MICONV}
-USE_ICONV= yes
+USES+= iconv
CONFIGURE_ARGS+= --with-libiconv-prefix=${LOCALBASE}
.else
CONFIGURE_ARGS+= --disable-iconv
diff --git a/mail/mutt14/Makefile b/mail/mutt14/Makefile
index d523f2cd1412..9ff2753b263a 100644
--- a/mail/mutt14/Makefile
+++ b/mail/mutt14/Makefile
@@ -61,14 +61,13 @@ WITH_SGML_DOCS:=no
.endif
.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
-USE_ICONV= yes
+USES+= gettext iconv
.if defined(WITHOUT_MUTT_ICONV)
IGNORE= the WITHOUT_MUTT_ICONV knob of the mutt port only works if \
WITHOUT_NLS is also given
.endif
.elif !defined(WITHOUT_MUTT_ICONV)
-USE_ICONV= yes
+USES+= iconv
.endif
.if defined(WITH_SLANG)
diff --git a/mail/normalizemime/Makefile b/mail/normalizemime/Makefile
index c78972b8ee77..03b8665fcfc7 100644
--- a/mail/normalizemime/Makefile
+++ b/mail/normalizemime/Makefile
@@ -18,7 +18,7 @@ COMMENT= Mime normalizer to be used as a preprocessor for email classification
LICENSE= GPLv2
-USE_ICONV= yes
+USES= iconv
NO_WRKSUBDIR= yes
CXXFLAGS+= -I${LOCALBASE}/include
diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile
index 54016be11fb3..c64ac6b01d02 100644
--- a/mail/prayer/Makefile
+++ b/mail/prayer/Makefile
@@ -14,7 +14,7 @@ LIB_DEPENDS= c-client4:${PORTSDIR}/mail/cclient
USE_GMAKE= yes
USE_PERL5_BUILD=yes
-USE_ICONV= yes
+USES= iconv
LDFLAGS+= -L${LOCALBASE}/lib
MAKE_ENV+= PORTCFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index 9acfc871f35c..659692267c7c 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -25,13 +25,12 @@ PLIST_SUB+= ETCDIR=etc/rspamd \
CMAKE_ARGS+= -DETC_PREFIX=${PREFIX}/etc -DPREFIX=${PREFIX} \
-DBUILD_PORT=yes
-USES= cmake gettext
+USES= cmake gettext iconv
USE_LDCONFIG= yes
USE_GNOME= glib20
USE_LUA= 5.1-
USE_SQLITE= yes
-USE_ICONV= yes
USE_OPENSSL= yes
MAN8= rspamd.8
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index c782cda89189..b8db3948c8df 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -14,10 +14,9 @@ COMMENT= Lightweight, featureful, and fast GTK+ based e-mail client
LIB_DEPENDS= aspell:${PORTSDIR}/textproc/aspell
RUN_DEPENDS= ${LOCALBASE}/etc/mime.types:${PORTSDIR}/misc/mime-support
-USES= gettext
+USES= gettext iconv
USE_BZIP2= yes
USE_GMAKE= yes
-USE_ICONV= yes
USE_GNOME= gtk20
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
diff --git a/math/R/Makefile b/math/R/Makefile
index 0ee0b6c88a7b..f23712a92f91 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -88,7 +88,7 @@ PLIST_SUB= R_SOVERSION="${R_SOVERSION}" \
RBLAS_SOVERSION="${RBLAS_SOVERSION}" \
RLAPACK_SOVERSION="${RLAPACK_SOVERSION}"
R_LD_LIBRARY_PATH= ${_GCC_RUNTIME}:${LOCALBASE}/lib
-USE_ICONV= yes
+USES+= iconv
.endif # LIBRMATH_SLAVEPORT
GNU_CONFIGURE= yes
MAKE_JOBS_UNSAFE= yes
diff --git a/math/eukleides/Makefile b/math/eukleides/Makefile
index 1791cba20ee3..4f6c6fe88bd5 100644
--- a/math/eukleides/Makefile
+++ b/math/eukleides/Makefile
@@ -15,9 +15,8 @@ RUN_DEPENDS= pstoedit:${PORTSDIR}/graphics/pstoedit \
epstopdf:${PORTSDIR}/print/teTeX-base
USE_BZIP2= yes
-USES= bison gettext
+USES= bison gettext iconv
USE_GMAKE= yes
-USE_ICONV= yes
MAN1= eukleides.1 euktoeps.1 euktopdf.1 euktopst.1 euktotex.1
diff --git a/math/fricas/Makefile b/math/fricas/Makefile
index da2bc50edb0f..0a2f59cdf3e9 100644
--- a/math/fricas/Makefile
+++ b/math/fricas/Makefile
@@ -20,8 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_BZIP2= yes
USE_XORG= x11 ice sm xpm
-USE_ICONV= yes
-USES= gettext
+USES= gettext iconv
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-lisp=sbcl
diff --git a/math/hs-Agda/Makefile b/math/hs-Agda/Makefile
index fe2428fe19e6..9de5448ab600 100644
--- a/math/hs-Agda/Makefile
+++ b/math/hs-Agda/Makefile
@@ -17,7 +17,7 @@ USE_CABAL= geniplate>=0.6.0.3 hashable>=1.2 hashtables \
xhtml zlib>=0.4.0.1
USE_ALEX= yes
USE_HAPPY= yes
-USE_ICONV= yes
+USES= iconv
EXECUTABLE= agda-mode agda
diff --git a/math/open-axiom/Makefile b/math/open-axiom/Makefile
index ff0638ed3528..03bee6562282 100644
--- a/math/open-axiom/Makefile
+++ b/math/open-axiom/Makefile
@@ -17,8 +17,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-lisp=sbcl
USE_GMAKE= yes
USE_XORG= x11 ice sm xpm
-USE_ICONV= yes
-USES= gettext
+USES= gettext iconv
MAKE_JOBS_UNSAFE=yes
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib
diff --git a/math/pspp/Makefile b/math/pspp/Makefile
index 60b2b41dd5f7..afc1f6598230 100644
--- a/math/pspp/Makefile
+++ b/math/pspp/Makefile
@@ -17,7 +17,7 @@ OPTIONS_DEFINE= GUI PGSQL
USE_GNOME= libxml2
USE_PERL5_BUILD=yes
-USE_ICONV= yes
+USES= iconv
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
USE_LDCONFIG= yes
diff --git a/math/sage/Makefile b/math/sage/Makefile
index d82ece5dd60e..aba23670b4ae 100644
--- a/math/sage/Makefile
+++ b/math/sage/Makefile
@@ -32,7 +32,7 @@ PLIST_FILES= bin/sage
USE_FORTRAN= yes
USE_TK= yes
USE_GMAKE= yes
-USE_ICONV= yes
+USES= iconv
MAKE_JOBS_SAFE= yes
LDFLAGS:= -Wl,-rpath=${WRKSRC}/local/lib ${LDFLAGS}
FFLAGS+= -Wl,-rpath=${WRKSRC}/local/lib ${FPM_FLAG}
diff --git a/misc/lifelines/Makefile b/misc/lifelines/Makefile
index 615115dc5c14..6c3e92fc9ed1 100644
--- a/misc/lifelines/Makefile
+++ b/misc/lifelines/Makefile
@@ -11,9 +11,8 @@ MAINTAINER= matt@gsicomp.on.ca
COMMENT= An advanced genealogical system
GNU_CONFIGURE= yes
-USE_ICONV= yes
USE_BZIP2= yes
-USES= bison
+USES= bison iconv
MAN1= btedit.1 dbverify.1 llines.1
diff --git a/misc/linm/Makefile b/misc/linm/Makefile
index 96ec801c996c..f7d8f71a0d3e 100644
--- a/misc/linm/Makefile
+++ b/misc/linm/Makefile
@@ -12,9 +12,8 @@ DISTNAME= linm_${LINM_VER}-1
MAINTAINER= ports@FreeBSD.org
COMMENT= Clone of Mdir, mc-style terminal file manager
-USES= pkgconfig
+USES= pkgconfig iconv
USE_AUTOTOOLS= libtool
-USE_ICONV= yes
USE_OPENSSL= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/misc/lxde-common/Makefile b/misc/lxde-common/Makefile
index aa62a671b383..c01e8d086f84 100644
--- a/misc/lxde-common/Makefile
+++ b/misc/lxde-common/Makefile
@@ -16,7 +16,7 @@ COMMENT= LXDE Common files
USE_GNOME= gtk20
USE_GMAKE= yes
-USE_ICONV= yes
+USES= iconv
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} \
CPPFLAGS="-I${LOCALBASE}/include" \
diff --git a/misc/mc-light/Makefile b/misc/mc-light/Makefile
index 5eb782ff31be..7b8386af67ac 100644
--- a/misc/mc-light/Makefile
+++ b/misc/mc-light/Makefile
@@ -19,9 +19,8 @@ OPTIONS_DEFINE= NLS SUBSHELL MC_IN_MC
SUBSHELL_DESC= Build with subshell support (only for bash!)
MC_IN_MC_DESC= Allow run mc inside mc (useful for mcedit)
-USES= pkgconfig
+USES= pkgconfig iconv
USE_GMAKE= yes
-USE_ICONV= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-included-slang \
--with-gettext \
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 53a305005f53..86da5ecc92f2 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -47,7 +47,7 @@ CONFIGURE_ARGS+=--enable-vfs-smb --with-configdir=${LOCALBASE}/etc\
.endif
.if defined(WITH_ICONV) || !(defined(WITHOUT_ICONV) || defined(MINIMAL))
-USE_ICONV= yes
+USES+= iconv
PLIST_SUB= CHARSETS=""
.else
CONFIGURE_ARGS+=--disable-charset
diff --git a/misc/wmweather+/Makefile b/misc/wmweather+/Makefile
index 2a6f28dbc7af..8c9547915e22 100644
--- a/misc/wmweather+/Makefile
+++ b/misc/wmweather+/Makefile
@@ -23,7 +23,7 @@ LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \
WRKSRC= ${WRKDIR}/wmweather+-${PORTVERSION}
GNU_CONFIGURE= yes
-USE_ICONV= yes
+USES= iconv
USE_XORG= xpm
CONFIGURE_ARGS+= --with-libwraster=${LOCALBASE} \
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
diff --git a/net-im/centericq/Makefile b/net-im/centericq/Makefile
index 6f2846aea909..9a19def1f7cd 100644
--- a/net-im/centericq/Makefile
+++ b/net-im/centericq/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= clsung@FreeBSD.org
COMMENT= A text mode menu- and window-driven IM interface
USE_BZIP2= yes
-USE_ICONV= yes
+USES= iconv
USE_OPENSSL= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/net-im/centerim-devel/Makefile b/net-im/centerim-devel/Makefile
index 91e0981bd6a3..888513ec7cee 100644
--- a/net-im/centerim-devel/Makefile
+++ b/net-im/centerim-devel/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
USE_PERL5_RUN= yes
USE_PYTHON_RUN= yes
-USE_ICONV= yes
+USES= iconv
USE_OPENSSL= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/net-im/centerim/Makefile b/net-im/centerim/Makefile
index 6caf24c0f70f..15a88be10107 100644
--- a/net-im/centerim/Makefile
+++ b/net-im/centerim/Makefile
@@ -17,7 +17,7 @@ COMMENT= A text mode menu- and window-driven IM interface
LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl
-USE_ICONV= yes
+USES= iconv
USE_OPENSSL= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/net-im/climm/Makefile b/net-im/climm/Makefile
index 5096af157d40..4a93d000c6f4 100644
--- a/net-im/climm/Makefile
+++ b/net-im/climm/Makefile
@@ -39,7 +39,7 @@ CONFIGURE_ARGS+= --disable-otr
.endif
.if ${PORT_OPTIONS:MICONV}
-USE_ICONV= yes
+USES+= iconv
.else
CONFIGURE_ARGS+= --disable-iconv
.endif
diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile
index d2f0a9f80d9f..da533494d937 100644
--- a/net-im/ejabberd/Makefile
+++ b/net-im/ejabberd/Makefile
@@ -26,7 +26,7 @@ GROUPS= ${USERS}
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_ICONV= yes
+USES= iconv
USE_RC_SUBR= ${PORTNAME}
NOPRECIOUSMAKEVARS= yes
diff --git a/net-im/gale/Makefile b/net-im/gale/Makefile
index 18b671d01578..bb8c25e6879d 100644
--- a/net-im/gale/Makefile
+++ b/net-im/gale/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= gc.1:${PORTSDIR}/devel/boehm-gc \
wwwcore.1:${PORTSDIR}/www/libwww \
adns.1:${PORTSDIR}/dns/adns
-USE_ICONV= yes
+USES= iconv
USE_GNOME= glib12
USE_AUTOTOOLS= libtool
LIBTOOLFILES= configure liboop/configure
diff --git a/net-im/imspector/Makefile b/net-im/imspector/Makefile
index 08418b0fa4a3..b38fc17dff81 100644
--- a/net-im/imspector/Makefile
+++ b/net-im/imspector/Makefile
@@ -14,7 +14,7 @@ LICENSE= GPLv2
CFLAGS+= -fPIC -I ${LOCALBASE}/include -DHAVE_SSL
USE_GMAKE= YES
-USE_ICONV= YES
+USES= iconv
USE_OPENSSL= YES
USE_LDCONFIG= ${LOCALBASE}/lib/imspector
diff --git a/net-im/jabber/Makefile b/net-im/jabber/Makefile
index 84dc48bc4a91..446a2143d33d 100644
--- a/net-im/jabber/Makefile
+++ b/net-im/jabber/Makefile
@@ -31,9 +31,8 @@ LIB_DEPENDS= pth:${PORTSDIR}/devel/pth-hard \
OPTIONS_DEFINE= IPV6 MYSQL PGSQL
USE_RC_SUBR= jabber
-USE_ICONV= yes
USE_GMAKE= yes
-USES= gettext
+USES= gettext iconv
USE_AUTOTOOLS= libtool
USE_LDCONFIG= ${PREFIX}/lib/jabber
MAKE_JOBS_UNSAFE= yes
diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile
index 7641a84a5c6f..ff142ac49736 100644
--- a/net-im/jabberd/Makefile
+++ b/net-im/jabberd/Makefile
@@ -30,7 +30,7 @@ GNU_CONFIGURE= yes
MAKE_JOBS_SAFE= yes
USE_PERL5_RUN= yes
USE_OPENSSL= yes
-USE_ICONV= yes
+USES= iconv
USE_RC_SUBR= jabberd
USE_LDCONFIG= ${PREFIX}/lib/jabberd
CONFIGURE_ARGS+= --localstatedir=/var \
diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile
index e2e59d4e69ca..f100fc176c0a 100644
--- a/net-im/libpurple/Makefile
+++ b/net-im/libpurple/Makefile
@@ -33,8 +33,7 @@ CPPFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
.if !defined(PIDGIN_SLAVE)
# Pidgin slave ports that require the following functionality, must explicitly
# set these macros themselves.
-USES= gettext
-USE_ICONV= yes
+USES= gettext iconv
USE_LDCONFIG= yes
WANT_GNOME= yes
USE_PYTHON= yes
diff --git a/net-im/licq/Makefile b/net-im/licq/Makefile
index cd59f6d02e1f..97275dfe7d86 100644
--- a/net-im/licq/Makefile
+++ b/net-im/licq/Makefile
@@ -14,8 +14,7 @@ LIB_DEPENDS= boost_regex:${PORTSDIR}/devel/boost-libs
LICENSE= GPLv2
-USE_ICONV= yes
-USES= cmake
+USES= cmake iconv
WRKSRC= ${WRKDIR}/${DISTNAME}
LICQ_PORT?= net-im/licq
diff --git a/net-im/mcabber/Makefile b/net-im/mcabber/Makefile
index bdd6f265e4ab..7adaa4574907 100644
--- a/net-im/mcabber/Makefile
+++ b/net-im/mcabber/Makefile
@@ -19,8 +19,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-sigwinch --libdir=${PREFIX}/lib
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-USES= pkgconfig gettext
-USE_ICONV= yes
+USES= pkgconfig gettext iconv
USE_LDCONFIG= yes
USE_NCURSES= yes
USE_GNOME= glib20
diff --git a/net-im/pidgin-pidgimpd/Makefile b/net-im/pidgin-pidgimpd/Makefile
index 52f306e5faa9..2477df25c3d4 100644
--- a/net-im/pidgin-pidgimpd/Makefile
+++ b/net-im/pidgin-pidgimpd/Makefile
@@ -21,8 +21,8 @@ BUILD_DEPENDS= pidgin:${PORTSDIR}/net-im/pidgin
RUN_DEPENDS= pidgin:${PORTSDIR}/net-im/pidgin
USE_BZIP2= yes
-USE_GNOME= pkgconfig gtk20
-USE_ICONV= yes
+USE_GNOME= gtk20
+USES= pkgconfig iconv
GNU_CONFIGURE= yes
PLIST_FILES= lib/pidgin/pidgimpd.so \
diff --git a/net-im/ysm/Makefile b/net-im/ysm/Makefile
index dd2d52b3fabb..0b9f1075efe5 100644
--- a/net-im/ysm/Makefile
+++ b/net-im/ysm/Makefile
@@ -19,7 +19,7 @@ COMMENT= Command line ICQ client with ICQ2000 and recoding support
USE_CSTD= c89
.endif
-USE_ICONV= yes
+USES= iconv
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/net-im/zephyr/Makefile b/net-im/zephyr/Makefile
index e0aa06e409d0..b34e6f8f9f7a 100644
--- a/net-im/zephyr/Makefile
+++ b/net-im/zephyr/Makefile
@@ -16,7 +16,7 @@ CPPFLAGS+= -I${LOCALBASE}/include
USE_RC_SUBR= zhm
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-USE_ICONV= yes
+USES= iconv
MAN1= zephyr.1 zaway.1 zctl.1 zleave.1 zlocate.1 znol.1 zwrite.1 zwgc.1
MAN8= zhm.8 zephyrd.8 zstat.8 zshutdown_notify.8
diff --git a/net-mgmt/ap-utils/Makefile b/net-mgmt/ap-utils/Makefile
index 441286292c52..ca96fec38dc6 100644
--- a/net-mgmt/ap-utils/Makefile
+++ b/net-mgmt/ap-utils/Makefile
@@ -16,7 +16,7 @@ COMMENT= A set of utilities to configure and monitor wireless access points
GNU_CONFIGURE= yes
USE_BZIP2= yes
-USE_ICONV= yes
+USES= iconv
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -lintl -L${LOCALBASE}/lib
diff --git a/net-mgmt/bandwidthd/Makefile b/net-mgmt/bandwidthd/Makefile
index f1851388e2b3..6aaccce900f7 100644
--- a/net-mgmt/bandwidthd/Makefile
+++ b/net-mgmt/bandwidthd/Makefile
@@ -23,7 +23,7 @@ USE_CSTD= c89
USE_GMAKE= YES
GNU_CONFIGURE= YES
-USE_ICONV= YES
+USES= iconv
post-install:
@${INSTALL_SCRIPT} ${FILESDIR}/bandwidthd.sh \
diff --git a/net-mgmt/ettercap/Makefile b/net-mgmt/ettercap/Makefile
index 873ef27054fd..cf335a3f025b 100644
--- a/net-mgmt/ettercap/Makefile
+++ b/net-mgmt/ettercap/Makefile
@@ -52,7 +52,7 @@ CONFIGURE_ARGS+=--disable-gtk
.if ${PORT_OPTIONS:MUTF8}
CONFIGURE_ARGS+=--with-iconv=${LOCALBASE}
-USE_ICONV= yes
+USES+= iconv
.endif
.if ${PORT_OPTIONS:MPCRE}
diff --git a/net-mgmt/icinga/Makefile b/net-mgmt/icinga/Makefile
index ed8c8a8669f3..5159eba254a4 100644
--- a/net-mgmt/icinga/Makefile
+++ b/net-mgmt/icinga/Makefile
@@ -18,7 +18,7 @@ LICENSE= GPLv2
LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd
RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins
-USE_ICONV= yes
+USES= iconv
USE_PERL5_BUILD= yes
USE_AUTOTOOLS= autoconf libltdl
USE_RC_SUBR= icinga
diff --git a/net-mgmt/nagios-devel/Makefile b/net-mgmt/nagios-devel/Makefile
index daa25c79be5e..7654cc16f3b8 100644
--- a/net-mgmt/nagios-devel/Makefile
+++ b/net-mgmt/nagios-devel/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagio
MASTER_SITE_FREEBSD= yes
LATEST_LINK= nagios-devel
-USE_ICONV= yes
+USES= iconv
USE_PERL5_BUILD=yes
USE_AUTOTOOLS= autoconf libltdl
USE_RC_SUBR= nagios
diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile
index 7fe420069deb..cf49fd2452aa 100644
--- a/net-mgmt/nagios/Makefile
+++ b/net-mgmt/nagios/Makefile
@@ -14,7 +14,7 @@ LICENSE= GPLv2
LIB_DEPENDS= gd:${PORTSDIR}/graphics/gd
RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins
-USE_ICONV= yes
+USES= iconv
USE_PERL5_BUILD=yes
USE_AUTOTOOLS= autoconf libltdl
USE_PHP= yes
diff --git a/net-mgmt/netxms/Makefile b/net-mgmt/netxms/Makefile
index 461176028082..50c2e4f8c821 100644
--- a/net-mgmt/netxms/Makefile
+++ b/net-mgmt/netxms/Makefile
@@ -32,7 +32,7 @@ NO_PACKAGE= yes
USE_PERL5= yes
USE_OPENSSL= yes
-USE_ICONV= yes
+USES= iconv
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-silent-rules
diff --git a/net-mgmt/nfsen/Makefile b/net-mgmt/nfsen/Makefile
index fbc06bf14a3d..85d4877593ec 100644
--- a/net-mgmt/nfsen/Makefile
+++ b/net-mgmt/nfsen/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS= rrdtool>=0:${PORTSDIR}/databases/rrdtool \
p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools \
nfdump:${PORTSDIR}/net-mgmt/nfdump
-USE_ICONV= yes
+USES= iconv
USE_PERL5= yes
USE_PHP= session pcre sockets
NO_BUILD= yes
diff --git a/net-mgmt/wmi-client/Makefile b/net-mgmt/wmi-client/Makefile
index de294f7bc06c..a342f7645ccc 100644
--- a/net-mgmt/wmi-client/Makefile
+++ b/net-mgmt/wmi-client/Makefile
@@ -21,7 +21,7 @@ USE_BZIP2= yes
USE_AUTOTOOLS= autoconf:env
USE_PYTHON_BUILD= yes
USE_GMAKE= yes
-USE_ICONV= yes
+USES= iconv
USE_LDCONFIG= yes
#BUILD_DEPENDS+= gnutls.47:${PORTSDIR}/security/gnutls
diff --git a/net-mgmt/zabbix2-server/Makefile b/net-mgmt/zabbix2-server/Makefile
index eac3dce2496a..af110e1e9c8e 100644
--- a/net-mgmt/zabbix2-server/Makefile
+++ b/net-mgmt/zabbix2-server/Makefile
@@ -31,8 +31,7 @@ MAN8+= zabbix_${ZABBIX_BUILD}d.8
USE_RC_SUBR= zabbix_${ZABBIX_BUILD}d
.endif
-USE_ICONV= yes
-USES= pkgconfig
+USES= pkgconfig iconv
USERS= zabbix
GROUPS= zabbix
diff --git a/net-p2p/gnunet-gtk/Makefile b/net-p2p/gnunet-gtk/Makefile
index 25268ecf7022..bf9d65a78b19 100644
--- a/net-p2p/gnunet-gtk/Makefile
+++ b/net-p2p/gnunet-gtk/Makefile
@@ -23,8 +23,7 @@ LIB_DEPENDS= gladeui-1:${PORTSDIR}/devel/glade3 \
INSTALLS_ICONS = yes
USE_AUTOTOOLS= libltdl libtool
USE_GMAKE= yes
-USE_GNOME= gnomehack
-USE_ICONV= yes
+USES= pathfix iconv
USE_LDCONFIG= yes
CONFIGURE_ARGS = --with-extractor=${LOCALBASE} \
diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile
index f7ecebe16f53..d2169b06fbc8 100644
--- a/net-p2p/gnunet/Makefile
+++ b/net-p2p/gnunet/Makefile
@@ -33,7 +33,7 @@ OPTIONS_DEFAULT= SQLITE
USE_AUTOTOOLS= libltdl libtool
USE_GMAKE= yes
-USE_ICONV= yes
+USES= iconv
USE_LDCONFIG= yes
CONFIGURE_ARGS = --with-daemon-home-dir=${GNUNET_DAEMON_DIR} \
diff --git a/net-p2p/libtorrent-rasterbar-16/Makefile b/net-p2p/libtorrent-rasterbar-16/Makefile
index 18ea4cec91d3..c468cbf5dd7c 100644
--- a/net-p2p/libtorrent-rasterbar-16/Makefile
+++ b/net-p2p/libtorrent-rasterbar-16/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS+= boost_date_time:${PORTSDIR}/devel/boost-libs \
GeoIP:${PORTSDIR}/net/GeoIP
GNU_CONFIGURE= yes
-USES= pathfix pkgconfig
-USE_ICONV= yes
+USES= pathfix pkgconfig iconv
USE_LDCONFIG= yes
USE_OPENSSL= yes
diff --git a/net-p2p/linuxdcpp/Makefile b/net-p2p/linuxdcpp/Makefile
index e91a0cb2bbe3..e702e764a63c 100644
--- a/net-p2p/linuxdcpp/Makefile
+++ b/net-p2p/linuxdcpp/Makefile
@@ -15,7 +15,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/boost/version.hpp:${PORTSDIR}/devel/boost-li
USE_BZIP2= yes
USE_GNOME= libglade2
-USE_ICONV= yes
+USES= iconv
USE_SCONS= yes
USE_OPENSSL= yes
PORTDOCS= *
diff --git a/net-p2p/microdc2/Makefile b/net-p2p/microdc2/Makefile
index 21c6b6155fff..76b135010778 100644
--- a/net-p2p/microdc2/Makefile
+++ b/net-p2p/microdc2/Makefile
@@ -18,7 +18,7 @@ COMMENT= A command-line based Direct Connect client
CONFLICTS= tthsum-[0-9]*
GNU_CONFIGURE= yes
-USE_ICONV= yes
+USES= iconv
USE_GNOME= libxml2
.if !defined(WITHOUT_NLS)
diff --git a/net-p2p/mldonkey/Makefile b/net-p2p/mldonkey/Makefile
index f11beaea6061..2fc8f5d9b2f7 100644
--- a/net-p2p/mldonkey/Makefile
+++ b/net-p2p/mldonkey/Makefile
@@ -18,7 +18,7 @@ NO_LATEST_LINK= yes
CONFLICTS= mldonkey{-{core,gui},}-devel-[0-9]*
USE_BZIP2= yes
-USE_ICONV= yes
+USES= iconv
USE_AUTOTOOLS= autoconf:env
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/net-p2p/mooseekd/Makefile b/net-p2p/mooseekd/Makefile
index 4778161a1cb4..a5c5b601abb2 100644
--- a/net-p2p/mooseekd/Makefile
+++ b/net-p2p/mooseekd/Makefile
@@ -23,6 +23,6 @@ GNU_CONFIGURE= yes
LDFLAGS+= -L${LOCALBASE}/lib
CXXFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS}
USE_FAM= yes
-USE_ICONV= yes
+USES= iconv
.include <bsd.port.mk>
diff --git a/net-p2p/retroshare/Makefile b/net-p2p/retroshare/Makefile
index e544af316e19..da3828fcf542 100644
--- a/net-p2p/retroshare/Makefile
+++ b/net-p2p/retroshare/Makefile
@@ -30,8 +30,7 @@ LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus \
RUN_DEPENDS+= pinentry-qt4:${PORTSDIR}/security/pinentry-qt4
WRKSRC= ${WRKDIR}/trunk
-USE_ICONV= yes
-USES= gettext
+USES= gettext iconv
USE_GNOME= glib20
USE_XORG= ice sm x11 xau xdmcp xext xrender
USE_QT4= corelib gui network xml script designer_build uic_build \
diff --git a/net-p2p/transmission-remote-gui/Makefile b/net-p2p/transmission-remote-gui/Makefile
index cb90a50b14e4..9341868338ed 100644
--- a/net-p2p/transmission-remote-gui/Makefile
+++ b/net-p2p/transmission-remote-gui/Makefile
@@ -19,7 +19,7 @@ PROJECTHOST= transmisson-remote-gui
USE_ZIP= yes
USE_FPC= fcl-net
-USE_ICONV= yes
+USES= iconv
USE_GNOME= #
WRKSRC= ${WRKDIR}/TransGUI
diff --git a/net/boinc-client/Makefile b/net/boinc-client/Makefile
index 5f7a439b0289..616f7571687b 100644
--- a/net/boinc-client/Makefile
+++ b/net/boinc-client/Makefile
@@ -87,7 +87,7 @@ PLIST_SUB+= X11="@comment "
.if ${PORT_OPTIONS:MMANAGER}
USE_XORG+= x11
USE_WX= 2.8+
-USE_ICONV= yes
+USES+= iconv
WX_CONF_ARGS= absolute
LIB_DEPENDS+= notify:${PORTSDIR}/devel/libnotify \
sqlite3:${PORTSDIR}/databases/sqlite3
diff --git a/net/c3270/Makefile b/net/c3270/Makefile
index f35939ced77b..c8d1b1e61a59 100644
--- a/net/c3270/Makefile
+++ b/net/c3270/Makefile
@@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:C/([0-9]\.[0-9])(\..*)/\1/}
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_ICONV= yes
+USES= iconv
USE_OPENSSL= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/net/g2ipmsg/Makefile b/net/g2ipmsg/Makefile
index 61adbbd57b3c..ccf34aadd283 100644
--- a/net/g2ipmsg/Makefile
+++ b/net/g2ipmsg/Makefile
@@ -15,11 +15,10 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= A popup style message communication tool for GNOME2
USE_GMAKE= yes
-USES= pathfix pkgconfig gettext
+USES= pathfix pkgconfig gettext iconv
USE_GNOME= gnomeprefix intlhack intltool \
libgnomeui libbonobo desktopfileutils gnomepanel
USE_GSTREAMER= vorbis
-USE_ICONV= yes
USE_OPENSSL= yes
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/net/gnetcat/Makefile b/net/gnetcat/Makefile
index 9b690d281c1a..ad609cf7785e 100644
--- a/net/gnetcat/Makefile
+++ b/net/gnetcat/Makefile
@@ -15,8 +15,7 @@ DISTNAME= netcat-0.7.1
MAINTAINER= ports@FreeBSD.org
COMMENT= GPL'ed re-write of the well known networking tool netcat
-USE_ICONV= yes
-USES= gettext
+USES= gettext iconv
USE_BZIP2= yes
GNU_CONFIGURE= yes
diff --git a/net/ldapdiff/Makefile b/net/ldapdiff/Makefile
index d30d60e54407..f71eac9e517e 100644
--- a/net/ldapdiff/Makefile
+++ b/net/ldapdiff/Makefile
@@ -16,7 +16,7 @@ EXTRACT_SUFX= .tgz
MAINTAINER= sylvio@FreeBSD.org
COMMENT= A utility for patching LDAP directories using LDIF files
-USE_ICONV= yes
+USES= iconv
USE_OPENLDAP= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${LOCALBASE} \
diff --git a/net/ldapscripts/Makefile b/net/ldapscripts/Makefile
index 2ddc3e8d57cb..4d12df03226e 100644
--- a/net/ldapscripts/Makefile
+++ b/net/ldapscripts/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS= ldapadd:${PORTSDIR}/net/openldap${OPENLDAP_VER}-client \
ldappasswd:${PORTSDIR}/net/openldap${OPENLDAP_VER}-client
USE_OPENLDAP= yes
-USE_ICONV= yes
+USES= iconv
LIBDIR= ${PREFIX}/lib/${PORTNAME}
MAKE_ENV+= MANDIR=${MANPREFIX}/man \
ETCDIR=${ETCDIR}
diff --git a/net/libmms/Makefile b/net/libmms/Makefile
index b7781e916cc6..8d4222537d13 100644
--- a/net/libmms/Makefile
+++ b/net/libmms/Makefile
@@ -13,9 +13,8 @@ MASTER_SITES= SF
MAINTAINER= kwm@FreeBSD.org
COMMENT= Library for parsing mms:// and mmsh:// type network streams
-USE_GNOME= gnomehack pkgconfig glib20
-USES= gettext
-USE_ICONV= yes
+USE_GNOME= pkgconfig glib20
+USES= pathfix gettext iconv
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/net/minisapserver/Makefile b/net/minisapserver/Makefile
index 5544daf84140..1c5b09eeff20 100644
--- a/net/minisapserver/Makefile
+++ b/net/minisapserver/Makefile
@@ -16,7 +16,7 @@ COMMENT= SAP and SLP announcement for the VLC Media Player
LICENSE= GPLv2
USE_XZ= yes
-USE_ICONV= yes
+USES= iconv
GNU_CONFIGURE= yes
MAN1= sapserver.1
PLIST_FILES= bin/sapserver etc/sap.cfg-dist
diff --git a/net/miredo/Makefile b/net/miredo/Makefile
index 7c0868a973e8..ec73e3b72578 100644
--- a/net/miredo/Makefile
+++ b/net/miredo/Makefile
@@ -31,8 +31,7 @@ USE_RC_SUBR= miredo_server miredo
LDFLAGS+= -L${LOCALBASE}/lib
.if !defined(WITHOUT_NLS)
-USES+= gettext
-USE_ICONV= yes
+USES+= gettext iconv
CONFIGURE_ARGS+= --enable-nls
PLIST_SUB= NLS=""
.else
diff --git a/net/nc6/Makefile b/net/nc6/Makefile
index 50ac0a063c46..427375c7750c 100644
--- a/net/nc6/Makefile
+++ b/net/nc6/Makefile
@@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Netcat clone with IPv6 support
MAN1= nc6.1
-USE_ICONV= yes
+USES= iconv
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index e25140eb0725..a71dad7f96a9 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS= gcrypt:${PORTSDIR}/security/libgcrypt
USE_AUTOTOOLS= libtool
USE_BDB= 46+
USE_BZIP2= yes
-USE_ICONV= yes
+USES= iconv
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_PERL5= yes
diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile
index 73d1a9c43201..308c98570f3e 100644
--- a/net/netatalk3/Makefile
+++ b/net/netatalk3/Makefile
@@ -22,7 +22,7 @@ LATEST_LINK= netatalk3
USE_AUTOTOOLS= libtool
USE_BDB= 46+
USE_BZIP2= yes
-USE_ICONV= yes
+USES= iconv
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_PERL5= yes
diff --git a/net/netdude/Makefile b/net/netdude/Makefile
index c3d11136ac67..b744709123f7 100644
--- a/net/netdude/Makefile
+++ b/net/netdude/Makefile
@@ -17,8 +17,7 @@ COMMENT= NETwork DUmp data Displayer and Editor for tcpdump tracefiles
LIB_DEPENDS= netdude.0:${PORTSDIR}/net/libnetdude
USE_AUTOTOOLS= libltdl libtool
-USE_ICONV= yes
-USES= gettext
+USES= gettext iconv
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-gtk-doc --with-html-dir=${DOCSDIR}
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib -lltdl"
diff --git a/net/rdesktop/Makefile b/net/rdesktop/Makefile
index 077bb1cc4cf3..992757f29acc 100644
--- a/net/rdesktop/Makefile
+++ b/net/rdesktop/Makefile
@@ -37,7 +37,7 @@ CONFIGURE_ARGS+= --with-ipv6
.endif
.if defined(WITH_ICONV)
-USE_ICONV= yes
+USES+= iconv
CONFIGURE_ARGS+= --with-libiconv-prefix=${LOCALBASE}
.endif
diff --git a/net/rsync/Makefile b/net/rsync/Makefile
index 9ebf33761a2a..c34b96e4ee35 100644
--- a/net/rsync/Makefile
+++ b/net/rsync/Makefile
@@ -70,7 +70,7 @@ CFLAGS+= -I${LOCALBASE}/include
.endif
.if ${PORT_OPTIONS:MICONV}
-USE_ICONV= yes
+USES+= iconv
CONFIGUREDCFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV+= CONFIGUREDCFLAGS="${CONFIGUREDCFLAGS}"
diff --git a/net/ruby-net-geoip/Makefile b/net/ruby-net-geoip/Makefile
index 1753e7862ee4..2e1c7aa9605d 100644
--- a/net/ruby-net-geoip/Makefile
+++ b/net/ruby-net-geoip/Makefile
@@ -18,7 +18,7 @@ COMMENT= A Ruby extension that wraps around libGeoIP
BUILD_DEPENDS= GeoIP>=1.4.6:${PORTSDIR}/net/GeoIP
LIB_DEPENDS= GeoIP.5:${PORTSDIR}/net/GeoIP
-USE_ICONV= yes
+USES= iconv
USE_RUBY= yes
USE_RUBY_EXTCONF= yes
INSTALL_TARGET= site-install
diff --git a/net/samba34/Makefile b/net/samba34/Makefile
index 18dd1b9f9320..ba5d677d1440 100644
--- a/net/samba34/Makefile
+++ b/net/samba34/Makefile
@@ -29,7 +29,6 @@ AUTOHEADER_ARGS= ${IPATHS}
AUTOCONF_ARGS= ${IPATHS}
USE_GMAKE= yes
-USE_ICONV= yes
GNU_CONFIGURE= yes
USE_AUTOTOOLS= autoconf autoheader
# directories
@@ -71,7 +70,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig
PKGCONFIGDIR_REL?= ${PKGCONFIGDIR:S|^${PREFIX}/||}
-USES= pkgconfig
+USES= pkgconfig iconv
# Let process generate meaningful backtrace on a core dump
LIB_DEPENDS+= execinfo.1:${PORTSDIR}/devel/libexecinfo
# Always use external libtalloc
diff --git a/net/samba36/Makefile b/net/samba36/Makefile
index ea830980653f..de5fa8c055a6 100644
--- a/net/samba36/Makefile
+++ b/net/samba36/Makefile
@@ -30,9 +30,8 @@ AUTOHEADER_ARGS= ${IPATHS}
AUTOCONF_ARGS= ${IPATHS}
USE_GMAKE= yes
-USE_ICONV= yes
GNU_CONFIGURE= yes
-USES= pkgconfig
+USES= pkgconfig iconv
USE_AUTOTOOLS= autoconf autoheader
USE_LDCONFIG= ${SAMBA_LIBDIR}
# pkg-config is used to find talloc
diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index 0b96c48a3341..b52a5408976d 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -72,8 +72,7 @@ USE_PERL5_BUILD= yes
USE_GCC= 4.2+
USE_PYTHON= yes
-USE_ICONV= yes
-USES= pkgconfig gettext
+USES= pkgconfig gettext iconv
USE_LDCONFIG= ${SAMBA4_LIBDIR}
PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig
diff --git a/net/samba4wins/Makefile b/net/samba4wins/Makefile
index e7a69f982b5c..f5a145c30980 100644
--- a/net/samba4wins/Makefile
+++ b/net/samba4wins/Makefile
@@ -17,7 +17,7 @@ COMMENT= A full featured replicating WINS server for UNIX
CONFLICTS= ja-samba-2.* ja-samba-4.* samba-2.* samba-4.* sharity-light-1.*
-USE_ICONV= yes
+USES= iconv
USE_PERL5= yes
GNU_CONFIGURE= yes
USE_AUTOTOOLS= autoconf autoheader
diff --git a/net/silc-client/Makefile b/net/silc-client/Makefile
index 13c96be7943a..28ab24705e3f 100644
--- a/net/silc-client/Makefile
+++ b/net/silc-client/Makefile
@@ -88,7 +88,7 @@ CONFIGURE_ARGS+= --disable-ipv6
.endif
.if ${PORT_OPTIONS:MICONV}
-USE_ICONV= yes
+USES+= iconv
CONFIGURE_ARGS+= --with-iconv
.else
CONFIGURE_ARGS+= --without-iconv
diff --git a/net/ssltunnel-client/Makefile b/net/ssltunnel-client/Makefile
index 74583d87f8f9..9f3526d3cf2f 100644
--- a/net/ssltunnel-client/Makefile
+++ b/net/ssltunnel-client/Makefile
@@ -19,7 +19,7 @@ LICENSE= BSD
CONFIGURE_ARGS= --disable-server --with-iconv=${LOCALBASE}
GNU_CONFIGURE= yes
-USE_ICONV= yes
+USES= iconv
MAN1= pppclient.1
MAN5= ssltunnelrc.5
diff --git a/net/ulxmlrpcpp/Makefile b/net/ulxmlrpcpp/Makefile
index faa5304f480d..fd8bfe09bf51 100644
--- a/net/ulxmlrpcpp/Makefile
+++ b/net/ulxmlrpcpp/Makefile
@@ -20,8 +20,7 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
USE_BZIP2= yes
-USES= pathfix
-USE_ICONV= yes
+USES= pathfix iconv
USE_OPENSSL= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
diff --git a/net/whois/Makefile b/net/whois/Makefile
index dde738952271..1308dad91b9d 100644
--- a/net/whois/Makefile
+++ b/net/whois/Makefile
@@ -18,7 +18,7 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
USE_GMAKE= yes
-USE_ICONV= yes
+USES= iconv
USE_PERL5_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/net/wire/Makefile b/net/wire/Makefile
index bdde35a17e7d..29a20f6b66ca 100644
--- a/net/wire/Makefile
+++ b/net/wire/Makefile
@@ -23,7 +23,7 @@ CONFIGURE_ARGS= --libdir="${LOCALBASE}/lib" --includedir="${LOCALBASE}/include"
USE_GMAKE= yes
USE_OPENSSL= yes
-USE_ICONV= yes
+USES= iconv
PLIST_FILES= bin/wire
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index e96f4e2d34d6..ddef89d0d722 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -22,7 +22,7 @@ DATADIR_NAME= wireshark
USE_PERL5_BUILD=yes
USE_PYTHON_BUILD=yes
USE_GETTEXT= yes
-USE_ICONV= yes
+USES= iconv
USE_BZIP2= yes
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
diff --git a/net/wol/Makefile b/net/wol/Makefile
index 318d281c1c43..1d4de7c79266 100644
--- a/net/wol/Makefile
+++ b/net/wol/Makefile
@@ -21,8 +21,7 @@ LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --disable-nls
PLIST_SUB= NLS="@comment "
.else
-USES+= gettext
-USE_ICONV= yes
+USES+= gettext iconv
PLIST_SUB= NLS=""
.endif
diff --git a/net/x11vnc/Makefile b/net/x11vnc/Makefile
index caddb89316f2..28b9cd78bba9 100644
--- a/net/x11vnc/Makefile
+++ b/net/x11vnc/Makefile
@@ -22,7 +22,7 @@ USE_XORG= x11 xdamage xfixes xrandr xinerama xext xtst xau xrender xdmcp recordp
# Sets LDFLAGS and adds to CONFIGURE_ENV, therefore we set LDFLAGS
LDFLAGS+= -L${LOCALBASE}/lib
USE_OPENSSL= yes
-USE_ICONV= yes
+USES= iconv
GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/net/xmlrpc-epi/Makefile b/net/xmlrpc-epi/Makefile
index 8ec3577efc58..2b61c886e428 100644
--- a/net/xmlrpc-epi/Makefile
+++ b/net/xmlrpc-epi/Makefile
@@ -16,7 +16,7 @@ COMMENT= A general purpose implementation of the xmlrpc specification in C
LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
USE_GMAKE= yes
-USE_ICONV= yes
+USES= iconv
USE_LDCONFIG= yes
USE_AUTOTOOLS= libtool
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/net/yaz/Makefile b/net/yaz/Makefile
index 3ca89360eb21..ece4926b26b7 100644
--- a/net/yaz/Makefile
+++ b/net/yaz/Makefile
@@ -11,11 +11,10 @@ COMMENT= Z39.50/SR client and API library
LIB_DEPENDS= icuuc:${PORTSDIR}/devel/icu
-USE_ICONV= yes
USE_OPENSSL= yes
GNU_CONFIGURE= yes
-USES= pkgconfig
-USE_GNOME= libxml2 libxslt gnomehack
+USES= pathfix pkgconfig iconv
+USE_GNOME= libxml2 libxslt
USE_LDCONFIG= yes
MAKE_JOBS_SAFE= yes
diff --git a/net/zebra-server/Makefile b/net/zebra-server/Makefile
index 107551b2e12f..728ae106c2f4 100644
--- a/net/zebra-server/Makefile
+++ b/net/zebra-server/Makefile
@@ -22,7 +22,7 @@ CONFIGURE_ARGS= --with-yaz=${LOCALBASE}/bin \
--with-tclconfig=${TCL_LIBDIR} \
--with-iconv=${LOCALBASE} --with-expat=${LOCALBASE}
-USE_ICONV= yes
+USES= iconv
USE_LDCONFIG= yes
USE_TCL= 84+