Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 27 Apr 2013 08:50:47 +0000 (UTC)
From:      Marcus von Appen <mva@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r316654 - in head: archivers/dpkg archivers/gtar archivers/liborange archivers/rpm4 archivers/rpm5 archivers/star archivers/unalz archivers/unrar-iconv archivers/unzip astro/stellarium ...
Message-ID:  <201304270850.r3R8olcP001170@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mva
Date: Sat Apr 27 08:50:46 2013
New Revision: 316654
URL: http://svnweb.freebsd.org/changeset/ports/316654

Log:
  - Convert USE_ICONV=yes to USES=iconv
  - Change USE_GNOME=pkgconfig|gnomehack to USES=pathfix|pkgconfig while here
  
  Reviewed by:	bapt, kwm

Modified:
  head/archivers/dpkg/Makefile
  head/archivers/gtar/Makefile
  head/archivers/liborange/Makefile
  head/archivers/rpm4/Makefile
  head/archivers/rpm5/Makefile
  head/archivers/star/Makefile
  head/archivers/unalz/Makefile
  head/archivers/unrar-iconv/Makefile   (contents, props changed)
  head/archivers/unzip/Makefile   (contents, props changed)
  head/astro/stellarium/Makefile
  head/astro/viking/Makefile
  head/audio/arts/Makefile
  head/audio/cmus/Makefile
  head/audio/cowbell/Makefile
  head/audio/cuberok/Makefile
  head/audio/deadbeef/Makefile
  head/audio/ezstream/Makefile
  head/audio/festival-freebsoft-utils/Makefile   (contents, props changed)
  head/audio/firefly/Makefile
  head/audio/flac/Makefile
  head/audio/ices/Makefile
  head/audio/id3lib/Makefile   (contents, props changed)
  head/audio/ifp-line/Makefile
  head/audio/julius/Makefile   (contents, props changed)
  head/audio/lame/Makefile   (contents, props changed)
  head/audio/libcddb/Makefile   (contents, props changed)
  head/audio/libmtp/Makefile
  head/audio/mp3unicode/Makefile
  head/audio/mpc/Makefile   (contents, props changed)
  head/audio/mpdbrowser/Makefile
  head/audio/mpiosh/Makefile   (contents, props changed)
  head/audio/ncmpc/Makefile
  head/audio/ncmpcpp/Makefile   (contents, props changed)
  head/audio/py-karaoke/Makefile
  head/audio/scrobbler/Makefile   (contents, props changed)
  head/audio/streamripper/Makefile
  head/audio/teamspeak3-server/Makefile
  head/audio/vorbis-tools/Makefile
  head/audio/wavpack/Makefile   (contents, props changed)
  head/audio/xmms-curses/Makefile
  head/audio/xmms-flac/Makefile
  head/audio/xmms-wma/Makefile   (contents, props changed)
  head/benchmarks/gtkperf/Makefile
  head/biology/embassy/Makefile
  head/cad/openvsp/Makefile
  head/cad/pdnmesh/Makefile
  head/cad/repsnapper/Makefile
  head/chinese/docproj/Makefile   (contents, props changed)
  head/chinese/miniChinput/Makefile   (contents, props changed)
  head/chinese/oto/Makefile   (contents, props changed)
  head/chinese/oxim/Makefile
  head/chinese/pcmanx/Makefile
  head/chinese/scim-array/Makefile
  head/chinese/scim-pinyin/Makefile
  head/chinese/zhcon/Makefile
  head/converters/cocot/Makefile   (contents, props changed)
  head/converters/enca/Makefile   (contents, props changed)
  head/converters/lua-iconv/Makefile   (contents, props changed)
  head/converters/p5-Text-Iconv/Makefile   (contents, props changed)
  head/converters/py-iconv/Makefile   (contents, props changed)
  head/converters/recode/Makefile
  head/converters/ruby-iconv/Makefile   (contents, props changed)
  head/databases/drizzle/Makefile
  head/databases/freetds-devel/Makefile   (contents, props changed)
  head/databases/freetds/Makefile   (contents, props changed)
  head/databases/grass/Makefile
  head/databases/hk_classes/Makefile
  head/databases/libmongo-client/Makefile
  head/databases/mysql-proxy/Makefile
  head/databases/namazu2/Makefile
  head/databases/postgis/Makefile
  head/databases/postgis20/Makefile
  head/databases/pxlib/Makefile
  head/databases/qdbm/Makefile   (contents, props changed)
  head/databases/ruby-sybct/Makefile   (contents, props changed)
  head/databases/spatialite/Makefile   (contents, props changed)
  head/databases/spatialite_gui/Makefile   (contents, props changed)
  head/databases/unixODBC/Makefile   (contents, props changed)
  head/deskutils/adesklets/Makefile   (contents, props changed)
  head/deskutils/glipper/Makefile
  head/deskutils/kdepim4/Makefile
  head/deskutils/libopensync-plugin-vformat-devel/Makefile
  head/deskutils/libstreamanalyzer/Makefile
  head/deskutils/libstreams/Makefile
  head/deskutils/ljclive/Makefile   (contents, props changed)
  head/deskutils/nagaina/Makefile
  head/deskutils/recoll/Makefile
  head/deskutils/tpb/Makefile
  head/deskutils/xneur/Makefile   (contents, props changed)
  head/devel/apr1/Makefile
  head/devel/apr2/Makefile
  head/devel/automoc4/Makefile
  head/devel/boost-libs/Makefile
  head/devel/cgit/Makefile
  head/devel/cxxtools/Makefile
  head/devel/doxygen/Makefile
  head/devel/ecore-main/Makefile
  head/devel/eina/Makefile   (contents, props changed)
  head/devel/gdb/Makefile
  head/devel/gdb66/Makefile
  head/devel/gettext/Makefile   (contents, props changed)
  head/devel/git/Makefile
  head/devel/glib20/Makefile
  head/devel/gnome-vfs1/Makefile
  head/devel/hs-haskeline/Makefile   (contents, props changed)
  head/devel/hwloc/Makefile
  head/devel/ice/Makefile
  head/devel/libconfuse/Makefile   (contents, props changed)
  head/devel/libdatrie/Makefile   (contents, props changed)
  head/devel/libevt/Makefile
  head/devel/libevtx/Makefile
  head/devel/libewf/Makefile
  head/devel/libhtp/Makefile
  head/devel/libisofs/Makefile
  head/devel/liblnk/Makefile
  head/devel/libmsiecf/Makefile
  head/devel/libpff/Makefile
  head/devel/libplist/Makefile
  head/devel/librcc/Makefile
  head/devel/libregf/Makefile
  head/devel/libslang2/Makefile   (contents, props changed)
  head/devel/libunistring/Makefile   (contents, props changed)
  head/devel/libvshadow/Makefile
  head/devel/mingw32-binutils/Makefile   (contents, props changed)
  head/devel/mingw32-gcc/Makefile
  head/devel/monotone/Makefile   (contents, props changed)
  head/devel/motor/Makefile
  head/devel/msp430-gcc/Makefile   (contents, props changed)
  head/devel/objectivelib/Makefile   (contents, props changed)
  head/devel/popt/Makefile
  head/devel/py-fusefs/Makefile
  head/devel/sdl12/Makefile
  head/devel/sdl20/Makefile
  head/devel/stfl/Makefile
  head/devel/styx/Makefile
  head/devel/tig/Makefile   (contents, props changed)
  head/devel/xdg-user-dirs/Makefile
  head/devel/yasm/Makefile   (contents, props changed)
  head/dns/idnkit/Makefile   (contents, props changed)
  head/dns/idnkit2/Makefile   (contents, props changed)
  head/dns/libidn/Makefile
  head/dns/mydns-ng/Makefile
  head/dns/mydns/Makefile
  head/editors/abiword/Makefile
  head/editors/biew/Makefile   (contents, props changed)
  head/editors/calligra/Makefile
  head/editors/joe/Makefile   (contents, props changed)
  head/editors/joe2/Makefile   (contents, props changed)
  head/editors/lazarus/Makefile   (contents, props changed)
  head/editors/mp/Makefile
  head/editors/nvi-devel/Makefile   (contents, props changed)
  head/editors/ted/Makefile
  head/editors/texmacs/Makefile
  head/editors/vile/Makefile
  head/editors/vim/Makefile
  head/editors/xvile/Makefile
  head/emulators/catapult/Makefile
  head/emulators/dolphin-emu-devel/Makefile
  head/emulators/mtools/Makefile   (contents, props changed)
  head/emulators/pcsxr/Makefile
  head/emulators/tme/Makefile
  head/emulators/vmw/Makefile   (contents, props changed)
  head/emulators/xcpc/Makefile
  head/finance/eqonomize-kde4/Makefile
  head/finance/grisbi/Makefile
  head/finance/homebank/Makefile
  head/finance/libofx/Makefile   (contents, props changed)
  head/french/verbiste/Makefile
  head/ftp/axel/Makefile
  head/ftp/lftp/Makefile
  head/ftp/pure-ftpd/Makefile   (contents, props changed)
  head/ftp/smbftpd/Makefile   (contents, props changed)
  head/ftp/wput/Makefile
  head/ftp/wzdftpd/Makefile   (contents, props changed)
  head/games/briquolo/Makefile
  head/games/capitalism/Makefile
  head/games/cosmosmash/Makefile
  head/games/cuyo/Makefile   (contents, props changed)
  head/games/freedroid/Makefile
  head/games/gnmm/Makefile
  head/games/heroes/Makefile
  head/games/instead/Makefile   (contents, props changed)
  head/games/kajaani-kombat/Makefile
  head/games/klavaro/Makefile
  head/games/ldmud/Makefile   (contents, props changed)
  head/games/netwalk/Makefile
  head/games/openalchemist/Makefile
  head/games/pingus/Makefile
  head/games/pokerth/Makefile
  head/games/rocksndiamonds/Makefile
  head/games/scorched3d/Makefile   (contents, props changed)
  head/games/spellathon/Makefile
  head/games/starfighter/Makefile
  head/games/stepmania-devel/Makefile
  head/games/tuxmath/Makefile
  head/games/tuxtype/Makefile

Modified: head/archivers/dpkg/Makefile
==============================================================================
--- head/archivers/dpkg/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/archivers/dpkg/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -19,10 +19,10 @@ BUILD_DEPENDS=	po4a:${PORTSDIR}/textproc
 RUN_DEPENDS=	gmd5sum:${PORTSDIR}/sysutils/coreutils \
 		gpatch:${PORTSDIR}/devel/patch
 
+USES=	iconv
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
 USE_PERL5=	yes
 MAKE_JOBS_SAFE=	yes
 WRKSRC=		${WRKDIR}/dpkg-${PORTVERSION}

Modified: head/archivers/gtar/Makefile
==============================================================================
--- head/archivers/gtar/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/archivers/gtar/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -16,9 +16,9 @@ COMMENT=	GNU version of the traditional 
 
 INFO=		tar
 
+USES=	iconv
 USE_AUTOTOOLS=	autoconf:env	# autom4te
 USE_XZ=		yes
-USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 CONFIGURE_ARGS=	--program-prefix=g \

Modified: head/archivers/liborange/Makefile
==============================================================================
--- head/archivers/liborange/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/archivers/liborange/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -25,7 +25,7 @@ MAKE_JOBS_SAFE=	yes
 
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
-USES=	pathfix pkgconfig
+USES=	iconv pathfix pkgconfig
 USE_ICONV=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib

Modified: head/archivers/rpm4/Makefile
==============================================================================
--- head/archivers/rpm4/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/archivers/rpm4/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -61,8 +61,7 @@ PLIST_SUB+=	PYTHON="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-USE_ICONV=	yes
+USES+=		gettext iconv
 PLIST_SUB+=	NLS=""
 .else
 CONFIGURE_ARGS+=--disable-nls

Modified: head/archivers/rpm5/Makefile
==============================================================================
--- head/archivers/rpm5/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/archivers/rpm5/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -76,8 +76,7 @@ PLIST_SUB+=	PYTHON="@comment "
 
 .if ${PORT_OPTIONS:MNLS}
 CONFIGURE_ARGS+=--enable-nls
-USES+=		gettext
-USE_ICONV=	yes
+USES+=		gettext iconv
 .else
 CONFIGURE_ARGS+=--disable-nls
 .endif

Modified: head/archivers/star/Makefile
==============================================================================
--- head/archivers/star/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/archivers/star/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -12,8 +12,7 @@ COMMENT=	Unique standard tape archiver w
 BUILD_DEPENDS=	smake:${PORTSDIR}/devel/smake
 
 USE_BZIP2=	yes
-USES=		gettext
-USE_ICONV=	yes
+USES=		gettext iconv
 
 .if !defined(NO_INSTALL_MANPAGES)
 MAN1=		scpio.1 spax.1 srmt.1 star.1 suntar.1 tartest.1

Modified: head/archivers/unalz/Makefile
==============================================================================
--- head/archivers/unalz/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/archivers/unalz/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -14,7 +14,7 @@ COMMENT=	Extracts AlZip archives
 LICENSE_FILE=	${WRKSRC}/readme.txt
 
 BROKEN=		fails to build
-USE_ICONV=	yes
+USES=		iconv
 PLIST_FILES=	bin/unalz
 MAKEFILE=	Makefile.freebsd
 CPPFLAGS+=	-I${LOCALBASE}/include

Modified: head/archivers/unrar-iconv/Makefile
==============================================================================
--- head/archivers/unrar-iconv/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/archivers/unrar-iconv/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -15,7 +15,7 @@ EXTRA_PATCHES=	${.CURDIR}/files/patch-ic
 
 CPPFLAGS+=	-DWITH_ICONV -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -liconv
-USE_ICONV=	yes
+USES+=		iconv
 
 CONFLICTS=	unrar-[0-9]* zh-unrar-[0-9]*
 

Modified: head/archivers/unzip/Makefile
==============================================================================
--- head/archivers/unzip/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/archivers/unzip/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -50,7 +50,7 @@ PATCH_SITES+=		${MASTER_SITE_LOCAL}
 PATCH_SITE_SUBDIR=	nork
 PATCHFILES+=		unzip60-alt-iconv-utf8.patch
 PATCH_DIST_STRIP+=	-p1
-USE_ICONV=		yes
+USES=			iconv
 CFLAGS+=		-I${LOCALBASE}/include -DNATIVE
 MAKE_ARGS+=		LFLAGS1="-L${LOCALBASE}/lib -liconv"
 .endif

Modified: head/astro/stellarium/Makefile
==============================================================================
--- head/astro/stellarium/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/astro/stellarium/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -13,9 +13,8 @@ COMMENT=	3D photo-realistic sky renderer
 
 LICENSE=	GPLv2
 
-USES=		cmake gettext
+USES=		cmake gettext iconv
 USE_GL=		glu
-USE_ICONV=	yes
 USE_QT4=	moc_build rcc_build uic_build qmake_build \
 		corelib gui network opengl script
 MAKE_JOBS_SAFE=	yes

Modified: head/astro/viking/Makefile
==============================================================================
--- head/astro/viking/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/astro/viking/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -23,7 +23,7 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/d
 		xcb:${PORTSDIR}/x11/libxcb
 RUN_DEPENDS=	gpsbabel:${PORTSDIR}/astro/gpsbabel
 
-USES=		pkgconfig
+USES=		iconv pkgconfig
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_ICONV=	yes

Modified: head/audio/arts/Makefile
==============================================================================
--- head/audio/arts/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/audio/arts/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -35,12 +35,11 @@ EXPIRATION_DATE=	2013-07-01
 
 PREFIX=		${KDE_PREFIX}
 WANT_GNOME=	yes
-USES=		pkgconfig gettext
+USES=		pkgconfig gettext iconv
 USE_QT_VER=	3
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
 USE_GMAKE=	yes
-USE_ICONV=	yes
 USE_XORG=	ice sm x11 xau xcursor xdmcp xext xfixes xft xi \
 		xinerama xrandr xrender xt
 USE_LDCONFIG=	yes

Modified: head/audio/cmus/Makefile
==============================================================================
--- head/audio/cmus/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/audio/cmus/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -10,10 +10,9 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	h.skuhra@gmail.com
 COMMENT=	Console-based music player with really cool features
 
-USES=		pkgconfig
+USES=		pkgconfig iconv
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
 USE_NCURSES=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV+=	HOSTCC=${CC}

Modified: head/audio/cowbell/Makefile
==============================================================================
--- head/audio/cowbell/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/audio/cowbell/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -12,12 +12,11 @@ COMMENT=	Elegant music organizer
 
 LIB_DEPENDS=	tag:${PORTSDIR}/audio/taglib
 
-USES=        pathfix gettext
+USES=        pathfix gettext iconv
 USE_GNOME=	gnomeprefix intltool gtksharp20
 INSTALLS_ICONS=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 

Modified: head/audio/cuberok/Makefile
==============================================================================
--- head/audio/cuberok/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/audio/cuberok/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -24,8 +24,7 @@ LIB_DEPENDS=	avcodec.1:${PORTSDIR}/multi
 USE_LDCONFIG=	yes
 USE_QT4=	gui xml qmake_build uic_build moc_build rcc_build \
 		network phonon-gst sql
-USE_ICONV=	yes
-USES=		gettext
+USES=		gettext iconv
 USE_SDL=	sdl
 QMAKEFLAGS+=	"CONFIG+=player_phonon"
 MAKE_ENV+=	INSTALL_ROOT=${PREFIX}

Modified: head/audio/deadbeef/Makefile
==============================================================================
--- head/audio/deadbeef/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/audio/deadbeef/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -18,11 +18,10 @@ LIB_DEPENDS=	samplerate:${PORTSDIR}/audi
 		execinfo:${PORTSDIR}/devel/libexecinfo
 
 GNU_CONFIGURE=	yes
-USES=		pkgconfig gettext
+USES=		pkgconfig gettext iconv
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 USE_BZIP2=	yes
-USE_ICONV=	yes
 CONFIGURE_ARGS=	--disable-alsa --disable-nullout \
 		CPPFLAGS="-I../dumb/dumb-kode54/include -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lexecinfo -lintl"

Modified: head/audio/ezstream/Makefile
==============================================================================
--- head/audio/ezstream/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/audio/ezstream/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -19,8 +19,8 @@ OPTIONS_DEFAULT=	TAGLIB
 
 TAGLIB_DESC=	TagLib support
 
+USES=		iconv
 USE_GNOME=	libxml2
-USE_ICONV=	yes
 USE_RC_SUBR=	${PORTNAME}
 GNU_CONFIGURE=	yes
 

Modified: head/audio/festival-freebsoft-utils/Makefile
==============================================================================
--- head/audio/festival-freebsoft-utils/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/audio/festival-freebsoft-utils/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -17,7 +17,7 @@ RUN_DEPENDS=	festival:${PORTSDIR}/audio/
 		sox:${PORTSDIR}/audio/sox
 
 NO_BUILD=	yes
-USE_ICONV=	yes
+USES=		iconv
 
 PORTDOCS=	ANNOUNCE NEWS README
 

Modified: head/audio/firefly/Makefile
==============================================================================
--- head/audio/firefly/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/audio/firefly/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -52,7 +52,7 @@ JAPANESE_DESC=	Japanese support in ID3 t
 
 .if ${PORT_OPTIONS:MJAPANESE}
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-src_scan-mp3.c
-USE_ICONV=	yes
+USES=		iconv
 CONFIGURE_ARGS+=	--enable-iconv
 .endif
 

Modified: head/audio/flac/Makefile
==============================================================================
--- head/audio/flac/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/audio/flac/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -27,7 +27,7 @@ OPTIONS_DEFAULT=ICONV
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MICONV}
-USE_ICONV=	yes
+USES+=		iconv
 CONFIGURE_ARGS+=--with-libiconv-prefix="${LOCALBASE}"
 .else
 CONFIGURE_ARGS+=--without-libiconv-prefix

Modified: head/audio/ices/Makefile
==============================================================================
--- head/audio/ices/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/audio/ices/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -21,11 +21,10 @@ LIB_DEPENDS=	ogg:${PORTSDIR}/audio/libog
 
 OPTIONS_DEFINE=	ALSA
 
-USES=		pkgconfig
+USES=		pkgconfig iconv
 USE_BZIP2=	yes
 USE_GNOME=	libxml2
 USE_GMAKE=	yes
-USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-roaraudio --disable-sun-audio
 MAKE_JOBS_SAFE=	yes

Modified: head/audio/id3lib/Makefile
==============================================================================
--- head/audio/id3lib/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/audio/id3lib/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -15,7 +15,7 @@ MAINTAINER=	kaeru@inigo-tech.com
 COMMENT=	Library for manipulating ID3v1/v1.1 and ID3v2 tags
 
 USE_AUTOTOOLS=	libtool
-USE_ICONV=	yes
+USES=		iconv
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 

Modified: head/audio/ifp-line/Makefile
==============================================================================
--- head/audio/ifp-line/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/audio/ifp-line/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -11,7 +11,7 @@ COMMENT=	Command line interface to iRive
 
 LICENSE=	GPLv2
 
-USE_ICONV=	yes
+USES=		iconv
 USE_AUTOTOOLS=	aclocal autoheader automake autoconf
 ACLOCAL_ARGS=	-I m4
 MAKE_JOBS_UNSAFE=	yes

Modified: head/audio/julius/Makefile
==============================================================================
--- head/audio/julius/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/audio/julius/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -19,7 +19,7 @@ RUN_DEPENDS=	ja-p5-Jcode>=0:${PORTSDIR}/
 
 MANCOMPRESSED=	no
 GNU_CONFIGURE=	yes
-USE_ICONV=	yes
+USES=		iconv
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -liconv

Modified: head/audio/lame/Makefile
==============================================================================
--- head/audio/lame/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/audio/lame/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -14,11 +14,11 @@ MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAM
 MAINTAINER=	netchild@FreeBSD.org
 COMMENT=	Fast MP3 encoder kit
 
+USES=		iconv
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
 MAKE_JOBS_SAFE=	yes
 CONFIGURE_ARGS=	--enable-nasm --enable-mp3rtp --disable-gtktest
 

Modified: head/audio/libcddb/Makefile
==============================================================================
--- head/audio/libcddb/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/audio/libcddb/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -12,8 +12,7 @@ COMMENT=	A library to access data on a C
 
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USES=	pathfix pkgconfig
-USE_ICONV=	yes
+USES=	pathfix pkgconfig iconv
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--without-cdio
 CPPFLAGS+=	-DICONV_CONST="const" -I${LOCALBASE}/include

Modified: head/audio/libmtp/Makefile
==============================================================================
--- head/audio/libmtp/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/audio/libmtp/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -15,8 +15,7 @@ OPTIONS_DEFINE=	MTPZ
 OPTIONS_DEFAULT=	MTPZ
 MTPZ_DESC=	Enable functionality to connect to MTPZ devices
 
-USES=		pathfix pkgconfig
-USE_ICONV=	yes
+USES=		pathfix pkgconfig iconv
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes

Modified: head/audio/mp3unicode/Makefile
==============================================================================
--- head/audio/mp3unicode/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/audio/mp3unicode/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -17,8 +17,7 @@ COMMENT=	ID3 tags charset converter
 LIB_DEPENDS=	tag.1:${PORTSDIR}/audio/taglib
 
 USE_BZIP2=	yes
-USE_ICONV=	yes
-USE_GNOME=	pkgconfig
+USES=		iconv pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ICONV_CFLAGS="-I${LOCALBASE}/include" \
 		ICONV_LIBS="-L${LOCALBASE}/lib -liconv"

Modified: head/audio/mpc/Makefile
==============================================================================
--- head/audio/mpc/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/audio/mpc/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -36,7 +36,7 @@ MAN1=		${PORTNAME}.1
 .endif
 
 .if ${PORT_OPTIONS:MICONV}
-USE_ICONV=	yes
+USES=	iconv
 .else
 CONFIGURE_ARGS+=--disable-iconv
 .endif

Modified: head/audio/mpdbrowser/Makefile
==============================================================================
--- head/audio/mpdbrowser/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/audio/mpdbrowser/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -16,8 +16,7 @@ COMMENT=	GTK+ client for the Music Playe
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}mpd>=0.2.0:${PORTSDIR}/audio/py-mpd
 
 PYDISTUTILS_PKGNAME=	mpdBrowser
-USES=		gettext
-USE_ICONV=	yes
+USES=		gettext iconv
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 USE_GNOME=	intltool pygtk2

Modified: head/audio/mpiosh/Makefile
==============================================================================
--- head/audio/mpiosh/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/audio/mpiosh/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -15,7 +15,7 @@ DISTNAME=	mpio-${PORTVERSION:S|.p|_pre|}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Digit@lway MPIO MP3 player tool
 
-USE_ICONV=	yes
+USES=		iconv
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 

Modified: head/audio/ncmpc/Makefile
==============================================================================
--- head/audio/ncmpc/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/audio/ncmpc/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -22,7 +22,7 @@ LYRICS_DESC=	Compile with lyrics screen
 
 .include <bsd.port.options.mk>
 
-USE_ICONV=	yes
+USES=		iconv
 PLIST_FILES=	bin/ncmpc \
 		%%EXAMPLESDIR%%/config \
 		%%EXAMPLESDIR%%/keys \

Modified: head/audio/ncmpcpp/Makefile
==============================================================================
--- head/audio/ncmpcpp/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/audio/ncmpcpp/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -13,9 +13,9 @@ COMMENT=	A ncurses mpd client, clone of 
 LIB_DEPENDS=	mpdclient:${PORTSDIR}/audio/libmpdclient \
 		fftw3:${PORTSDIR}/math/fftw3
 
+USES=		iconv
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_ICONV=	yes
 USE_NCURSES=	yes
 USE_GNOME=	glib20
 USE_AUTOTOOLS=	automake aclocal libtool

Modified: head/audio/py-karaoke/Makefile
==============================================================================
--- head/audio/py-karaoke/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/audio/py-karaoke/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -24,8 +24,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}game
 OPTIONS_DEFINE=	MUTAGEN
 MUTAGEN_DESC=	Enable Mutagen support
 
+USES=		iconv
 USE_ZIP=	yes
-USE_ICONV=	yes
 USE_SDL=	sdl
 USE_XORG=	x11 xau xdmcp
 USE_WX=		2.6+

Modified: head/audio/scrobbler/Makefile
==============================================================================
--- head/audio/scrobbler/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/audio/scrobbler/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -59,7 +59,7 @@ CONFIGURE_ARGS+=	--enable-prefer-ape
 .endif
 
 .if defined(WITH_ENCODINGS_PATCH)
-USE_ICONV=	yes
+USES+=	iconv
 .endif
 
 post-patch::

Modified: head/audio/streamripper/Makefile
==============================================================================
--- head/audio/streamripper/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/audio/streamripper/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -22,8 +22,8 @@ OPTIONS_DEFAULT=	FAAD VORBIS
 
 LICENSE=	GPLv2
 
+USES=		iconv
 USE_GNOME=	glib20
-USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-included-libmad \
 		--without-included-tre \

Modified: head/audio/teamspeak3-server/Makefile
==============================================================================
--- head/audio/teamspeak3-server/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/audio/teamspeak3-server/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -21,7 +21,7 @@ LICENSE_PERMS=	no-dist-mirror no-dist-se
 IGNORE=		license ${LICENSE} needs confirmation, but BATCH is defined
 .endif
 
-USE_ICONV=	yes
+USES=		iconv
 USE_LDCONFIG=	${PREFIX}/lib/teamspeak/server
 USE_RC_SUBR=	teamspeak
 SUB_FILES=	pkg-message

Modified: head/audio/vorbis-tools/Makefile
==============================================================================
--- head/audio/vorbis-tools/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/audio/vorbis-tools/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -31,7 +31,7 @@ MAKE_JOBS_SAFE=	yes
 USES+=		gettext
 PLIST_SUB+=     NLS=""
 .else
-USE_ICONV=	yes
+USES+=		iconv
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=     NLS="@comment "
 .endif

Modified: head/audio/wavpack/Makefile
==============================================================================
--- head/audio/wavpack/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/audio/wavpack/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -16,8 +16,7 @@ COMMENT=	Audio codec for lossless, lossy
 LICENSE=	BSD
 
 USE_BZIP2=	yes
-USE_GNOME=	gnomehack pkgconfig
-USE_ICONV=	yes
+USES=		pathfix pkgconfig iconv
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include

Modified: head/audio/xmms-curses/Makefile
==============================================================================
--- head/audio/xmms-curses/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/audio/xmms-curses/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -19,9 +19,8 @@ RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia
 LIB_DEPENDS=	pthread-stubs.0:${PORTSDIR}/devel/libpthread-stubs \
 		xcb.2:${PORTSDIR}/x11/libxcb
 
-USES=		gettext
+USES=		gettext iconv
 USE_GNOME=	gtk12
-USE_ICONV=	yes
 USE_XORG=	x11 xau xdmcp xext xi
 
 MAN1=	${PORTNAME}.1

Modified: head/audio/xmms-flac/Makefile
==============================================================================
--- head/audio/xmms-flac/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/audio/xmms-flac/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -17,9 +17,8 @@ LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimed
 		xcb.2:${PORTSDIR}/x11/libxcb
 
 USE_AUTOTOOLS=	libtool
-USES=		gettext
+USES=		gettext iconv
 USE_GNOME=	gtk12
-USE_ICONV=	yes
 USE_XORG=	x11 xau xdmcp xext xi
 CONFIGURE_ARGS=	--with-libiconv-prefix="${LOCALBASE}" \
 		--with-ogg="${LOCALBASE}" \

Modified: head/audio/xmms-wma/Makefile
==============================================================================
--- head/audio/xmms-wma/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/audio/xmms-wma/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -23,7 +23,7 @@ USE_LDCONFIG=	yes
 
 .if defined(WITH_ICONV)
 CFLAGS+=	-DUSE_ICONV
-USE_ICONV=	yes
+USES=		iconv
 .endif
 
 .include <bsd.port.pre.mk>

Modified: head/benchmarks/gtkperf/Makefile
==============================================================================
--- head/benchmarks/gtkperf/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/benchmarks/gtkperf/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -21,8 +21,7 @@ GNU_CONFIGURE=		yes
 USE_GNOME=		gtk20 gnomeprefix
 
 .if !defined(WITHOUT_NLS)
-USES+=		gettext
-USE_ICONV=		yes
+USES+=		gettext iconv
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS+=	--enable-nls

Modified: head/biology/embassy/Makefile
==============================================================================
--- head/biology/embassy/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/biology/embassy/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -16,7 +16,7 @@ LIB_DEPENDS=	nucleus.6:${PORTSDIR}/biolo
 PREFIX?=	${LOCALBASE}/emboss
 NO_MTREE=	yes
 USE_SUBMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_XORG=	x11

Modified: head/cad/openvsp/Makefile
==============================================================================
--- head/cad/openvsp/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/cad/openvsp/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -26,9 +26,8 @@ GH_TAGNAME=	${GH_PROJECT}_${PORTVERSION}
 GH_COMMIT=	fb52aa2
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/src
-USES=		cmake:outsource
+USES=		cmake:outsource iconv
 USE_DOS2UNIX=	yes
-USE_ICONV=	yes
 USE_XORG=	ice sm x11 xau xdamage xdmcp xext xfixes xft \
 		xinerama xrender xxf86vm
 USE_GL=		glu

Modified: head/cad/pdnmesh/Makefile
==============================================================================
--- head/cad/pdnmesh/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/cad/pdnmesh/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -26,10 +26,9 @@ LIB_DEPENDS=	pthread-stubs:${PORTSDIR}/d
 OPTIONS_DEFINE=	ATLAS DOCS EXAMPLES
 ATLAS_DESC=	Enable ATLAS support
 
-USES=		pkgconfig gettext
+USES=		pkgconfig gettext iconv
 USE_FORTRAN=	yes
 USE_GL=		glu
-USE_ICONV=	yes
 USE_GNOME=	gdkpixbuf2 gtk20
 USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 		xfixes xmu xi xinerama xrandr xrender xt xxf86vm

Modified: head/cad/repsnapper/Makefile
==============================================================================
--- head/cad/repsnapper/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/cad/repsnapper/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -37,12 +37,11 @@ LIB_DEPENDS=	gtkglext:${PORTSDIR}/x11-to
 		xcb:${PORTSDIR}/x11/libxcb
 
 MAKE_JOBS_SAFE=	yes
-USES=		pkgconfig
+USES=		pkgconfig iconv
 USE_GNOME=	gdkpixbuf2 gtk20 libxml2
 USE_GL=		glu glut
 USE_AUTOTOOLS=	automake libtool
 USE_GMAKE=	yes
-USE_ICONV=	yes
 USE_XORG=	ice pixman sm x11 xau xcomposite xcursor xdamage xdmcp xext \
 		xfixes xi xinerama xmu xrandr xrender xt xxf86vm
 

Modified: head/chinese/docproj/Makefile
==============================================================================
--- head/chinese/docproj/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/chinese/docproj/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -22,7 +22,7 @@ COMMENT=	Supportive tools for Chinese do
 
 RUN_DEPENDS=	gbklatex:${PORTSDIR}/print/latex-cjk
 
-USE_ICONV=	yes
+USES=	iconv
 
 WRKSRC=		${WRKDIR}/src
 

Modified: head/chinese/miniChinput/Makefile
==============================================================================
--- head/chinese/miniChinput/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/chinese/miniChinput/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -17,7 +17,7 @@ COMMENT=	A tiny version of Chinput
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_XORG=	x11 xt
 USE_LDCONFIG=	yes
 ALL_TARGET=	all data

Modified: head/chinese/oto/Makefile
==============================================================================
--- head/chinese/oto/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/chinese/oto/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -13,7 +13,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Show you font info and add new 'name' and 'cmap' tables
 
-USE_ICONV=	yes
+USES=		iconv
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 CPPFLAGS+=	-I${LOCALBASE}/include

Modified: head/chinese/oxim/Makefile
==============================================================================
--- head/chinese/oxim/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/chinese/oxim/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -19,7 +19,7 @@ GTK2_DESC=	 GTK2 input method module
 CHEWING_DESC=	 Chewing input module
 UNICODE_DESC=	 Unicode input module
 
-USE_ICONV=	yes
+USES=		iconv
 USE_XORG=	x11 xft xpm xtst
 WANT_GNOME=	yes
 

Modified: head/chinese/pcmanx/Makefile
==============================================================================
--- head/chinese/pcmanx/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/chinese/pcmanx/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -15,7 +15,7 @@ LICENSE=	GPLv2
 USE_XZ=		yes
 USE_GNOME=	gtk20 intlhack
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 GNU_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	NLS DEBUG DOCKLET NOTIFIER LIBNOTIFY NANCY MOUSE EXTERNAL IPLOOKUP PROXY

Modified: head/chinese/scim-array/Makefile
==============================================================================
--- head/chinese/scim-array/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/chinese/scim-array/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -19,9 +19,7 @@ RUN_DEPENDS=	scim:${PORTSDIR}/textproc/s
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
-USES=		gettext
-USE_ICONV=	yes
+USES=		gettext pkgconfig iconv
 
 CFLAGS+=	-fPIC
 CPPFLAGS+=	-I${LOCALBASE}/include

Modified: head/chinese/scim-pinyin/Makefile
==============================================================================
--- head/chinese/scim-pinyin/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/chinese/scim-pinyin/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -12,8 +12,8 @@ COMMENT=	SCIM Chinese Smart Pinyin input
 BUILD_DEPENDS=	scim>=1.2.0:${PORTSDIR}/textproc/scim
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_GNOME=	gnomehack lthack
-USE_ICONV=	yes
+USE_GNOME=	lthack
+USES=		pathfix iconv
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 

Modified: head/chinese/zhcon/Makefile
==============================================================================
--- head/chinese/zhcon/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/chinese/zhcon/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -23,9 +23,8 @@ LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
 ONLY_FOR_ARCHS=	i386
-USE_ICONV=	yes
 # Don't bother to add ".if !defined(WITHOUT_NLS)", zhcon requires libintl
-USES=		gettext
+USES=		gettext iconv
 CONFIGURE_ARGS=	--with-libintl-prefix=${LOCALBASE}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib

Modified: head/converters/cocot/Makefile
==============================================================================
--- head/converters/cocot/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/converters/cocot/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -17,7 +17,7 @@ MAINTAINER=	knu@FreeBSD.org
 COMMENT=	Code Converter on TTY
 
 USE_ZIP=	yes
-USE_ICONV=	yes
+USES=		iconv
 WRKSRC=		${WRKDIR}/vmi-${PORTNAME}-8bc9f64
 GNU_CONFIGURE=	yes
 

Modified: head/converters/enca/Makefile
==============================================================================
--- head/converters/enca/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/converters/enca/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -20,8 +20,7 @@ RUN_DEPENDS=	umap:${PORTSDIR}/converters
 LICENSE=	GPLv2
 
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	pkgconfig
-USE_ICONV=	yes
+USES=		pkgconfig iconv
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes

Modified: head/converters/lua-iconv/Makefile
==============================================================================
--- head/converters/lua-iconv/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/converters/lua-iconv/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -16,8 +16,7 @@ COMMENT=	Iconv binding for Lua 5
 
 WRKSRC=		${WRKDIR}/lua-${PORTNAME}-${PORTVERSION}
 USE_LUA?=	5.1
-USE_GNOME=	pkgconfig
-USE_ICONV=	yes
+USES=		pkgconfig iconv
 
 PLIST_FILES=	%%LUA_MODLIBDIR%%/iconv.so
 

Modified: head/converters/p5-Text-Iconv/Makefile
==============================================================================
--- head/converters/p5-Text-Iconv/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/converters/p5-Text-Iconv/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -14,7 +14,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	Perl interface to iconv() codeset conversion function
 
-USE_ICONV=	yes
+USES=	iconv
 
 PERL_CONFIGURE=	yes
 CONFIGURE_ARGS+=	INC="-I${LOCALBASE}/include" \

Modified: head/converters/py-iconv/Makefile
==============================================================================
--- head/converters/py-iconv/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/converters/py-iconv/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -16,7 +16,7 @@ DIST_SUBDIR=	python
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An iconv wrapper with Unicode codec for Python
 
-USE_ICONV=	yes
+USES=		iconv
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PLIST_SUB=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S|^${LOCALBASE}/||g}

Modified: head/converters/recode/Makefile
==============================================================================
--- head/converters/recode/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/converters/recode/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -11,11 +11,10 @@ MASTER_SITE_SUBDIR=	recode
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Converts files between character sets and usages
 
-USES=		gettext
+USES=		gettext iconv
 USE_AUTOTOOLS=	libtool
 USE_PERL5=	yes
 USE_LDCONFIG=	yes
-USE_ICONV=	yes
 CONFIGURE_ARGS=	--without-included-gettext
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib

Modified: head/converters/ruby-iconv/Makefile
==============================================================================
--- head/converters/ruby-iconv/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/converters/ruby-iconv/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -20,7 +20,7 @@ COMMENT=	An iconv wrapper class for Ruby
 
 FETCH_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/${RUBY_PORT}:patch
 
-USE_ICONV=	yes
+USES=		iconv
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes

Modified: head/databases/drizzle/Makefile
==============================================================================
--- head/databases/drizzle/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/databases/drizzle/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -20,7 +20,7 @@ USE_LDCONFIG=	${PREFIX}/lib/drizzle
 
 BROKEN=		fails to build
 
-USE_ICONV=	yes
+USES=	iconv
 
 .if defined(MAINTAINER_MODE)
 UID_FILES+=	../../UIDs

Modified: head/databases/freetds-devel/Makefile
==============================================================================
--- head/databases/freetds-devel/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/databases/freetds-devel/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -14,7 +14,7 @@ COMMENT=	Sybase/Microsoft TDS protocol l
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 TDS_VER?=	5.0
-USE_ICONV=	yes
+USES=		iconv
 USE_GMAKE=	yes
 GNU_GONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf:env libtool

Modified: head/databases/freetds/Makefile
==============================================================================
--- head/databases/freetds/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/databases/freetds/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -14,7 +14,7 @@ COMMENT=	Sybase/Microsoft TDS protocol l
 
 TDS_VER?=	5.0
 
-USE_ICONV=	yes
+USES=		iconv
 USE_GMAKE=	yes
 GNU_GONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf:env libtool

Modified: head/databases/grass/Makefile
==============================================================================
--- head/databases/grass/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/databases/grass/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -32,8 +32,7 @@ LIB_DEPENDS=	gdal:${PORTSDIR}/graphics/g
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 USE_GMAKE=	yes
-USE_ICONV=	yes
-USES=		gettext
+USES=		gettext iconv
 USE_READLINE=	yes
 USE_PERL5=	yes
 USE_XORG=	sm ice xi x11 xt xmu xext

Modified: head/databases/hk_classes/Makefile
==============================================================================
--- head/databases/hk_classes/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/databases/hk_classes/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -13,9 +13,8 @@ BUILD_DEPENDS=	${LOCALBASE}/include/argp
 LIB_DEPENDS=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
 		xml2.5:${PORTSDIR}/textproc/libxml2
 
-USES=	pkgconfig gettext
+USES=	pkgconfig gettext iconv
 USE_BZIP2=	yes
-USE_ICONV=	yes
 USE_PYTHON=	yes
 CXXFLAGS+=	${PTHREAD_CFLAGS}
 LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib -largp -lintl

Modified: head/databases/libmongo-client/Makefile
==============================================================================
--- head/databases/libmongo-client/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/databases/libmongo-client/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -17,9 +17,8 @@ GH_COMMIT=	13cc0ee
 
 USE_AUTOTOOLS=	automake autoconf libtool
 GNU_CONFIGURE=	yes
-USES=		pkgconfig gettext
+USES=		pkgconfig gettext iconv
 USE_GMAKE=	yes
-USE_ICONV=	yes
 USE_GNOME=	glib20
 USE_LDCONFIG=	yes
 CONFIGURE_ENV+=	PKG_CONFIG_DIR=${LOCALBASE}/libdata/pkgconfig

Modified: head/databases/mysql-proxy/Makefile
==============================================================================
--- head/databases/mysql-proxy/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/databases/mysql-proxy/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -22,8 +22,7 @@ CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV+=	PKG_CONFIG_PATH="${LUA_PREFIX}/share/doc/${LUA_SUBDIR}/etc"
 LDFLAGS+=	-L${LOCALBASE}/lib -L${LUA_LIBDIR}
 GNU_CONFIGURE=	yes
-USE_GNOME=	pkgconfig
-USE_ICONV=	yes
+USES=		pkgconfig iconv
 USE_LDCONFIG=	yes
 USE_LUA=	5.1+
 USE_MYSQL=	yes

Modified: head/databases/namazu2/Makefile
==============================================================================
--- head/databases/namazu2/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/databases/namazu2/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -18,8 +18,7 @@ BUILD_DEPENDS=	p5-File-MMagic>=0:${PORTS
 RUN_DEPENDS=	p5-File-MMagic>=0:${PORTSDIR}/devel/p5-File-MMagic
 
 USE_PERL5=	yes
-USE_ICONV=	yes
-USES=		gettext
+USES=		gettext iconv
 USE_AUTOTOOLS=	libtool
 CONFIGURE_ARGS=	--with-perl5="${PERL}" \
 		--with-libintl-prefix=${LOCALBASE} \

Modified: head/databases/postgis/Makefile
==============================================================================
--- head/databases/postgis/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/databases/postgis/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -17,11 +17,10 @@ RUN_DEPENDS=	postmaster:${PORTSDIR}/data
 
 CONFLICTS=	postgis-2.*
 
-USES=		bison
+USES=		bison iconv
 USE_GNOME=	libxml2
 USE_PGSQL=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_PERL5_BUILD=	yes

Modified: head/databases/postgis20/Makefile
==============================================================================
--- head/databases/postgis20/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/databases/postgis20/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -20,7 +20,7 @@ LATEST_LINK=	postgis20
 USE_GNOME=	libxml2
 USE_PGSQL=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
+USES=		iconv
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 USE_PERL5_BUILD=	yes

Modified: head/databases/pxlib/Makefile
==============================================================================
--- head/databases/pxlib/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/databases/pxlib/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -14,8 +14,7 @@ BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSD
 
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
-USE_ICONV=	yes
-USES=		gettext
+USES=		gettext iconv
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include

Modified: head/databases/qdbm/Makefile
==============================================================================
--- head/databases/qdbm/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/databases/qdbm/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -17,7 +17,7 @@ GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
 .if !defined(SLAVEPORT)
-USE_ICONV=	yes
+USES+=		iconv
 CONFIGURE_ARGS=	--enable-zlib \
 		--enable-iconv \
 		--enable-pthread

Modified: head/databases/ruby-sybct/Makefile
==============================================================================
--- head/databases/ruby-sybct/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/databases/ruby-sybct/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -20,7 +20,7 @@ LIB_DEPENDS=	tds.5:${PORTSDIR}/databases
 
 USE_RUBY=	yes
 USE_RUBY_EXTCONF=	yes
-USE_ICONV=	yes
+USES=		iconv
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \

Modified: head/databases/spatialite/Makefile
==============================================================================
--- head/databases/spatialite/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/databases/spatialite/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -24,7 +24,7 @@ WRKSRC=		${WRKDIR}/lib${PORTNAME}-${PORT
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_SQLITE=	yes
-USE_ICONV=	yes
+USES=		iconv
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib

Modified: head/databases/spatialite_gui/Makefile
==============================================================================
--- head/databases/spatialite_gui/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/databases/spatialite_gui/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -22,8 +22,7 @@ USE_WX=		2.8
 WANT_UNICODE=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
-USE_GNOME=	pkgconfig
+USES=		pkgconfig iconv
 CPPFLAGS+=	-I${LOCALBASE}/include `${WX_CONFIG} --cppflags`
 LDFLAGS+=	-L${LOCALBASE}/lib -liconv `${WX_CONFIG} --libs`
 CONFIGURE_ARGS+=CFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"

Modified: head/databases/unixODBC/Makefile
==============================================================================
--- head/databases/unixODBC/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/databases/unixODBC/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -15,7 +15,7 @@ COMMENT=	ODBC library suite for Unix
 
 CONFLICTS=	libiodbc-[0-9]* virtuoso-*
 
-USE_ICONV=	yes
+USES=		iconv
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static --enable-shared \
 		--with-libiconv-prefix=${LOCALBASE}

Modified: head/deskutils/adesklets/Makefile
==============================================================================
--- head/deskutils/adesklets/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/deskutils/adesklets/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -21,7 +21,7 @@ USE_PYTHON=	yes
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_EFL=	imlib2
-USE_ICONV=	yes
+USES=		iconv
 WANT_PERL=	yes
 
 MAN1=		adesklets.1 \

Modified: head/deskutils/glipper/Makefile
==============================================================================
--- head/deskutils/glipper/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/deskutils/glipper/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -11,9 +11,8 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Clipboard manager for the GNOME panel
 
 USE_BZIP2=	yes
-USE_ICONV=	yes
 USE_GMAKE=	yes
-USES=        pathfix gettext
+USES=		pathfix gettext iconv
 USE_GNOME=	gnomeprefix intltool pygnomedesktop pygnomeextras
 USE_PYTHON=	2.5+
 INSTALLS_ICONS=	yes

Modified: head/deskutils/kdepim4/Makefile
==============================================================================
--- head/deskutils/kdepim4/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/deskutils/kdepim4/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -25,10 +25,9 @@ CONFLICTS_INSTALL=	kdepim-4.4.*
 
 USE_XZ=		yes
 USE_GNOME=	libxml2
-USE_ICONV=	yes
 USE_KDE4=	kdehier kdelibs kdeprefix pimlibs \
 		akonadi automoc4 ontologies soprano strigi nepomuk-widgets
-USES=		cmake:outsource
+USES=		cmake:outsource iconv
 USE_OPENLDAP=	yes
 USE_QT4=	corelib dbus declarative designer_build gui network opengl \
 		script sql webkit \

Modified: head/deskutils/libopensync-plugin-vformat-devel/Makefile
==============================================================================
--- head/deskutils/libopensync-plugin-vformat-devel/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/deskutils/libopensync-plugin-vformat-devel/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -20,8 +20,7 @@ LIB_DEPENDS=	opensync.1:${PORTSDIR}/deve
 BROKEN=		fails to build
 
 USE_BZIP2=	yes
-USE_ICONV=	yes
-USES=		cmake
+USES=		cmake iconv
 CMAKE_ARGS+=	-Wno-dev
 CFLAGS+=	"-I${LOCALBASE}/include"
 

Modified: head/deskutils/libstreamanalyzer/Makefile
==============================================================================
--- head/deskutils/libstreamanalyzer/Makefile	Sat Apr 27 08:43:32 2013	(r316653)
+++ head/deskutils/libstreamanalyzer/Makefile	Sat Apr 27 08:50:46 2013	(r316654)
@@ -13,8 +13,7 @@ LIB_DEPENDS=	avcodec${FFMPEG_SUFFIX}:${P
 		exiv2:${PORTSDIR}/graphics/exiv2 \
 		streams:${PORTSDIR}/deskutils/libstreams
 

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304270850.r3R8olcP001170>