- Convert USE_ICONV=yes to USES=iconv

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

Reviewed by:	bapt, kwm

8 files changed, 9 insertions, 12 deletions

diff --git a/chinese/docproj/Makefile b/chinese/docproj/Makefile
index 0d4ee703eabe..dc2fc66811c1 100644
--- a/chinese/docproj/Makefile
+++ b/chinese/docproj/Makefile
@@ -22,7 +22,7 @@ COMMENT=	Supportive tools for Chinese docproj build
 
 RUN_DEPENDS=	gbklatex:${PORTSDIR}/print/latex-cjk
 
-USE_ICONV=	yes
+USES=	iconv
 
 WRKSRC=		${WRKDIR}/src
 
diff --git a/chinese/miniChinput/Makefile b/chinese/miniChinput/Makefile
index c9077a06da2e..b59504b07c18 100644
--- a/chinese/miniChinput/Makefile
+++ b/chinese/miniChinput/Makefile
@@ -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
diff --git a/chinese/oto/Makefile b/chinese/oto/Makefile
index 266c94f5281f..a1a6bed0eb41 100644
--- a/chinese/oto/Makefile
+++ b/chinese/oto/Makefile
@@ -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
diff --git a/chinese/oxim/Makefile b/chinese/oxim/Makefile
index bd7612059b3e..4db7827ca5ed 100644
--- a/chinese/oxim/Makefile
+++ b/chinese/oxim/Makefile
@@ -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
 
diff --git a/chinese/pcmanx/Makefile b/chinese/pcmanx/Makefile
index 1e806aa2af01..1f260b65ac3f 100644
--- a/chinese/pcmanx/Makefile
+++ b/chinese/pcmanx/Makefile
@@ -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
diff --git a/chinese/scim-array/Makefile b/chinese/scim-array/Makefile
index ff06883999d5..62a9ddb15fb9 100644
--- a/chinese/scim-array/Makefile
+++ b/chinese/scim-array/Makefile
@@ -19,9 +19,7 @@ RUN_DEPENDS=	scim:${PORTSDIR}/textproc/scim
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	pkgconfig
-USES=		gettext
-USE_ICONV=	yes
+USES=		gettext pkgconfig iconv
 
 CFLAGS+=	-fPIC
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/chinese/scim-pinyin/Makefile b/chinese/scim-pinyin/Makefile
index d23f3c1b381e..be337d36c429 100644
--- a/chinese/scim-pinyin/Makefile
+++ b/chinese/scim-pinyin/Makefile
@@ -12,8 +12,8 @@ COMMENT=	SCIM Chinese Smart Pinyin input method
 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
 
diff --git a/chinese/zhcon/Makefile b/chinese/zhcon/Makefile
index 7c3156f1a353..c425ac1e999c 100644
--- a/chinese/zhcon/Makefile
+++ b/chinese/zhcon/Makefile
@@ -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